4319 files changed, 84334 insertions, 113443 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index bc83d2fb8e..1bf74bd4f7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,2611 @@
+Fri Sep  2 22:59:21 UTC 2016
+multimedia/flashplayer-plugin: Updated for version 11.2.202.632.
+network/nginx: Updated for version 1.8.1
+python/apsw: Switch source to github.
++--------------------------+
+Wed Jun 29 09:45:07 UTC 2016
+multimedia/vlc: Remove Decklink support
+office/MasterPDFEditor: Updated for version 3.7.10.
++--------------------------+
+Tue Jun 28 01:34:49 UTC 2016
+network/youtube-dl: Updated for version 2016.06.26.
++--------------------------+
+Mon Jun 27 00:42:08 UTC 2016
+multimedia/devede: Re-added. devedeng doesn't work on 14.1.
+multimedia/devedeng: Removed (gtk3 version too old on 14.1)
+system/xen: Updated for version 4.6.3.
++--------------------------+
+Sat Jun 25 04:28:27 UTC 2016
+libraries/SDL2_image: Fix VERSION in .info.
+libraries/SDL2_mixer: Fix VERSION in .info.
+network/youtube-dl: Updated for version 2016.06.23.1.
+system/slpkg: Updated for version 3.1.5.
++--------------------------+
+Thu Jun 23 16:43:20 UTC 2016
+office/libreoffice-helppack: Updated for version 5.1.4.
+office/libreoffice-langpack: Updated for version 5.1.4.
+office/libreoffice: Updated for version 5.1.4.
+system/xen: Updated for version 4.6.1.
++--------------------------+
+Sun Jun 19 16:30:36 UTC 2016
+libraries/libfilteraudio: Updated for version 20160614_2fc6695.
+network/qTox: Updated for version 20160619_fd2e585.
+network/toxcore: Updated for version 20160319_532629d.
++--------------------------+
+Sun Jun 19 06:35:34 UTC 2016
+development/Arduino: Updated for version 1.6.9.
+development/arduino: Updated for version 1.6.9.
+multimedia/flashplayer-plugin: Updated for version 11.2.202.626.
++--------------------------+
+Thu May 12 14:45:11 UTC 2016
+multimedia/flashplayer-plugin: Updated for version 11.2.202.621.
+office/libreoffice-helppack: Updated for version 5.1.3.
+office/libreoffice-langpack: Updated for version 5.1.3.
+office/libreoffice: Updated for version 5.1.3.
++--------------------------+
+Tue Apr 19 15:27:15 UTC 2016
+libraries/qt5: Added a patch for the newer mozilla-nss.
+office/libreoffice-helppack: Updated for version 5.1.2.
+office/libreoffice-langpack: Updated for version 5.1.2.
+office/libreoffice: Updated for version 5.1.2.
++--------------------------+
+Thu Apr  7 23:58:54 UTC 2016
+multimedia/flashplayer-plugin: Updated for version 11.2.202.616.
++--------------------------+
+Sun Apr  3 07:28:04 UTC 2016
+network/cyrus-imapd: Updated for version 2.5.7.
+system/xen: Updated for version 4.5.3.
++--------------------------+
+Mon Mar 21 04:32:07 UTC 2016
+multimedia/flashplayer-plugin: Updated for version 11.2.202.577.
+network/mailman: Updated for version 2.1.21.
+system/nvidia-kernel: Fix variable.
++--------------------------+
+Sat Feb 27 17:32:14 UTC 2016
+desktop/wmctrl: Fix for x86_64
+games/frozen-bubble: Update maintainer information.
+ham/chirp: Updated for version 20160215.
+libraries/php-pgsql: Updated for version 5.6.18.
+multimedia/flashplayer-plugin: Updated for version 11.2.202.569.
++--------------------------+
+Sun Jan 17 02:28:42 UTC 2016
+desktop/awoken-icon-theme: Fix file ownership.
+desktop/mimi: Fixed VERSION in .info and typos in README.
+desktop/ssr: Fixed manpages.
+desktop/trayer-srg: Fixed SLKCFLAGS.
+desktop/wmxss: Fixed file ownership.
+desktop/xonclock: Updated for version 0.0.9.4.
+development/asl: Updated for version 142_bld98.
+development/astyle: Fixed PKGTYPE.
+development/colordiff: Fix DOWNLOAD url.
+development/kompozer: Fixed slack-desc.
+development/leo: Fixed VERSION in .info.
+development/mit-scheme: Fixed file ownership.
+development/monotone: Compress manpages.
+development/ninja-ide: Support alternate tarball name.
+development/npm2tgz: Support alternate tarball name.
+development/ola: Compress manpages.
+development/pyside-tools: Support alternate tarball name.
+development/zeal: Support alternate tarball name.
+games/BeastieWorker-levels: Fix VERSION in .info.
+games/Pyfa: Fixed ARCH.
+games/ags: Support alternate tarball name.
+libraries/botocore: Updated for version 1.3.18.
+network/awscli: Updated for version 1.9.18.
+network/tor-browser: Simplify SlackBuild script.
+network/tor-browser: Updated for version 5.0.7.
+python/colorama: Updated for version 0.3.6.
+python/ipaddr-py: Fixed homepage
+system/letsencrypt: Updated for version 0.2.0.
++--------------------------+
+Wed Jan 13 03:59:58 UTC 2016
+audio/abcde: Updated for version 2.7.1 + new maintainer.
+audio/distrho-mini-series: Fixed build on i486.
+audio/distrho-ports: Fixed build on i486.
+audio/mkcue: Added (generates cue sheets from a CD TOC).
+desktop/xfce4-places-plugin: Updated for version 1.7.0.
+desktop/xfce4-sensors-plugin: Updated for version 1.2.6.
+development/ParadisEO: Fixed VERSION in .info.
+development/WebStorm: Fixed slack-desc.
+development/checkbashisms: Support alternate download names.
+development/fossil: Updated for version 1.34.
+development/gpsim: Fixed VERSION in .info.
+development/newtonsoft-json: Updated for version 8.0.2.
+development/npm2tgz: Updated for version 1.3.2.1.
+development/pylint: Updated for version 1.5.2.
+development/pyvim: Updated for version 0.0.13.
+games/assaultcube-reloaded: Updated for version 2.6.3.
+games/dhewm3: Added (Doom 3 GPL source port).
+games/nuvie: Update README.
+games/prboom-plus: Updated for version 2.5.1.4.
+graphics/pdf2png: Support alternate tarball name.
+ham/aprx: Fixed PKGTYPE.
+ham/baudline: Fixed ARCH and PKGTYPE.
+ham/chirp: Updated DOWNLOAD.
+ham/cwdaemon: Fixed PKGTYPE.
+ham/cwstation: Updated DOWNLOAD.
+ham/direwolf: Fixed patch and PKGTYPE, updated DOWNLOAD.
+ham/fldigi: Updated DOWNLOAD.
+ham/grig: Fixed PKGTYPE.
+ham/klog: Fixed PKGTYPE.
+ham/linlogbook: Fixed PKGTYPE.
+ham/linpsk: Fixed PKGTYPE.
+ham/nec2c: Fixed PKGTYPE.
+ham/psk31lx: Fixed PKGTYPE.
+ham/qradiopredict: Support alternate tarball name, fix PKGTYPE.
+ham/svxlink-sounds-en_US-heather-16k: Support alt tarball name.
+ham/svxlink: Support alternate tarball name.
+ham/tqsl: Fixed PKGTYPE, updated DOWNLOAD.
+ham/twhamqth: Fixed PKGTYPE.
+ham/unixcw: Fixed PKGTYPE.
+ham/wxapt: Fixed PKGTYPE.
+ham/xanalyser: Fixed PKGTYPE.
+ham/xdemorse: Fixed PKGTYPE.
+ham/xfhell: Fixed PKGTYPE.
+ham/xgridloc: Fixed PKGTYPE.
+ham/xnec2c: Fixed PKGTYPE.
+ham/xpsk31: Fixed PKGTYPE, updated MD5SUM.
+ham/xwxapt: Fixed PKGTYPE.
+libraries/libzrtpcpp: Support alternate tarball name.
+libraries/live555: Updated for version 2015.12.22.
+libraries/lua-zlib: Support alternate tarball name.
+libraries/luasec: Support alternate tarball name.
+libraries/luasocket: Support alternate tarball name.
+libraries/mariadb_client: Fixed VERSION in .info.
+libraries/pyte: Added (VTXXX-compatible terminal emulator).
+misc/Colormake: Support alternate tarball name.
+misc/abduco: Updated for version 0.5.
+misc/cups-windows: Killed unnecessary creation of /var/spool/samba
+misc/grc: Support alternate tarball name.
+misc/xcape: Support alternate tarball name.
+network/gui-ufw: Added (GUI for Uncomplicated Firewall).
+network/hylafax+: Updated for version 5.5.7.
+network/pptpd: Updated for version 1.4.0.
+network/r8168: Added (Driver for Realtek Ethernet controllers).
+network/t38modem: Added (H.323/SIP endpoint with T.38 fax support).
+network/teamviewer: Script cleanup.
+network/vimb: Updated for version 2.11.
+network/weechat: Updated for version 1.4.
+network/xtables-addons: Updated for version 2.10.
+network/you-get: Updated for version 0.4.245.
+network/youtube-dl: Updated for version 2016.01.09.
+perl/perl-Encode-ISO2022: Fix VERSION in .info.
+perl/perl-MusicBrainz-DiscID: Add optional dep + new maintainer.
+perl/perl-Text-CharWidth: Fix VERSION in .info.
+perl/perl-WebService-MusicBrainz: Added (retrieve music metadata).
+python/ply: Updated for version 3.8.
+python/prompt_toolkit: Updated for version 0.57.
+python/ptpython: Updated for version 0.28.
+python/regex: Updated for version 2016.01.10.
+python/wcwidth: Updated for version 0.1.6.
+system/autojump: Support alternate tarball name.
+system/fdupes: Support alternate tarball name.
+system/kafka: Added (high-throughput distributed messaging system).
+system/pymux: Added (Python terminal multiplexer).
+system/uhd: Fixed VERSION in .info.
+system/xonsh: Added (Python BASHwards-compatible shell)
+system/yash: Updated for version 2.40.
+system/zookeeper: Added (distributed coordination server).
++--------------------------+
+Mon Jan 11 03:38:35 UTC 2016
+libraries/libvirt-glib: Updated for version 0.2.3.
+office/moneydance: Updated for version 2015.1299.
+network/b43-firmware: Updated for version 6.30.163.46.
+network/b43-fwcutter: Updated for version 019.
+system/xfe: Updated for version 1.41.
+libraries/fox-toolkit: Updated for version 1.6.50.
+system/chrpath: Rework build system to use nondebified source
+ham/chirp: Updated for version 20151225.
+graphics/fotoxx: Updated for version 16.01.1.
+development/patchutils: Updated for version 0.3.4.
+development/docutils: Updated for version 0.12.
+desktop/slock: Added some patches from upstream git
+desktop/menumaker: Updated for version 0.99.9.
+desktop/icewm: Updated for version 1.3.12 (new upstream)
+network/leafnode: Updated for version 2.0.0.alpha20140727b.
+academic/spatialite-tools: Fixed download link
+libraries/libcue: Updated homepage and download links.
+system/udiskie: Updated for version 1.4.7.
+office/pyspread: Updated for version 1.0.1.
+system/patool: Updated for version 1.11.
+python/Flask-SQLAlchemy: Remove white line from .info file.
+desktop/fvwm-crystal: Updated for version 3.4.1.
+gis/pgrouting: Fix alternate tarball name.
+desktop/mousepad: Fix typo in slack-desc.
+development/fsharp: Support alternate tarball name.
+desktop/faience-icon-theme: Fix file ownership.
+desktop/fbmenugen: Support alternate tarball name.
+desktop/clearlooks-classic-themes: Fix file ownership.
+development/menhir: Install menhirLib to $PKG.
+graphics/vips: Use /usr/lib64 on x86_64.
+libraries/jai-imageio: Fix file ownership.
+graphics/GPS: Fix file ownership.
+libraries/jai: Fix file ownership.
+desktop/obkey: Support alternate tarball name.
+desktop/obbrowser: Support alternate tarball name.
+desktop/elementary-xfce: Support alternate tarball name.
+desktop/conky-manager: Fixed slack-desc.
+desktop/compton-conf: Support alternate tarball name.
+desktop/clearlooks-phenix-theme: Support alternate tarball name.
+audio/ncmpcpp: Support alternate tarball name.
+audio/luppp: Support alternate tarball name.
+audio/hydrogen: Support alternate tarball name.
+audio/fabla: Support alternate tarball name.
+desktop/moka-icon-theme: Support alternate tarball name.
+desktop/orchis-gtk-theme: Support alternate tarball name.
+desktop/faenza-icon-theme: Fix file ownership.
+desktop/faba-icon-theme: Support alternate tarball name.
+accessibility/svkbd: Updated DOWNLOAD url.
+academic/fet: Fixed typo in slack-desc.
+development/pylint: Update DEP.
+misc/moedict-desktop.app: Added (Traditional Chinese Dictionary).
+games/nuvie: Added (New Ultima VI Engine).
+system/zfs-on-linux: Updated for version 0.6.5.4.
+system/spl-solaris: Updated for version 0.6.5.4.
+network/isync: Updated for version 1.2.1 + new maintainer.
+games/openmw: Update DEP.
+development/p4: Updated for version 2015.2.1319959.
+desktop/openbox-simple-theme: Updated for version 20160104.
+system/phoronix-test-suite: Updated for version 6.0.1.
++--------------------------+
+Sat Jan  9 00:14:37 UTC 2016
+academic/amd: BUILD bump for SuiteSparse 4.4.6.
+academic/antiprism: Compress man pages.
+academic/btf: BUILD bump for SuiteSparse 4.4.6.
+academic/camd: BUILD bump for SuiteSparse 4.4.6.
+academic/cblas: Updated for version 3.6.0 + new maintainer.
+academic/ccolamd: BUILD bump for SuiteSparse 4.4.6.
+academic/cholmod: Updated for version 3.0.6.
+academic/cld2: Fix file ownership.
+academic/colamd: BUILD bump for SuiteSparse 4.4.6.
+academic/csparse: BUILD bump for SuiteSparse 4.4.6.
+academic/cxsparse: BUILD bump for SuiteSparse 4.4.6.
+academic/fann: Fix .pc file location.
+academic/klu: Updated for version 1.3.3.
+academic/ldl: BUILD bump for SuiteSparse 4.4.6.
+academic/openmodelica: Fix build failure.
+academic/rbio: BUILD bump for SuiteSparse 4.4.6.
+academic/scilab: Fix .pc file location.
+academic/spqr: Updated for version 2.0.2.
+academic/suitesparseconfig: Updated for version 4.4.6.
+academic/sundials: Use /usr/lib64 on x86_64.
+academic/sword-data-kjv: Update MD5SUM.
+academic/umfpack: BUILD bump for SuiteSparse 4.4.6.
+audio/SuperCollider: Fix doinst.sh setup in SlackBuild.
+audio/caps: Fix file ownership.
+audio/chuck: Fix file ownership.
+audio/flacon: Support alternate tarball name.
+audio/jost_bin: Fixed slack-desc.
+audio/jvmetro: Fix DESTDIR handling.
+audio/miniAudicle: Fix file ownership.
+audio/musepack-tools: Fixed slack-desc.
+audio/non: Fix VERSION in .info.
+audio/pasystray: Compress manpage.
+audio/pd: Compress man pages.
+audio/qmidinet: Move manpage.
+audio/sfarkxtc: Update DOWNLOAD url.
+audio/soundkonverter: Use $TMP.
+desktop/conky-manager: Update DOWNLOAD url.
+desktop/fvwm-crystal: Updated for version 3.4.0.
+desktop/numix-icon-theme-bevel: Fix DOWNLOAD url.
+desktop/py3status: Updated for version 2.8.
+desktop/xxkb: Removed hidden .notes file
+development/avr8-burn-o-mat: Remove non-existence doc.
+development/bas55: Updated for version 1.08.
+development/fsharp: Updated for version 4.0.1.1.
+development/gitstats: Added (git history statistics generator).
+development/lazarus: Move manpages.
+development/leiningen: Add jdk as DEP.
+development/ocaml: Fix file ownership.
+development/pyclewn: Fix doinst.sh.
+development/pyvim: Updated for version 0.0.12.
+development/racket: Updated for version 6.3.
+development/scala: Updated for version 2.11.7 + new maintainer.
+development/spyder: Updated for version 2.3.8.
+development/textadept: Updated for version 8.5.
+development/vala: Downgraded to 0.26.2.
+development/xmlcopyeditor: Updated for version 1.2.1.3.
+development/zeal: Fix build with new Qt5.
+games/doomsday: Updated for version 1.15.7.
+games/exult: Added (game engine for running Ultima7).
+games/game_1945: Add alternate source.
+games/nethack: Updated for version 3.6.0.
+games/openmw: Updated for version 0.37.0.
+games/qstat: Updated for version 2d84188.
+games/supertux2: Removed (replaced by an updated supertux)
+games/supertux: Updated for version 0.4.0.
+graphics/Blender: Patched for Python 3.5.
+graphics/pygraphviz: Update DEPS.
+graphics/yagf: Update HOMEPAGE url.
+libraries/Kivy: Updated for version 1.9.1.
+libraries/SDL2: Updated for version 2.0.4 (Moved from Development).
+libraries/SDL2_image: Updated for version 2.0.1 (from Development).
+libraries/SDL2_mixer: Updated for version 2.0.1 (from Development).
+libraries/SDL2_net: Updated for version 2.0.1 (from Development).
+libraries/SDL2_ttf: Updated for version 2.0.13 (from Desktop).
+libraries/bamf: Disable introspection.
+libraries/blas: Updated for version 3.6.0.
+libraries/botocore: Updated for version 1.3.17.
+libraries/cdk: Updated for version 5.0_20150928.
+libraries/dbus-sharp: Specify GMCS for mono 4.
+libraries/jansson: Updated for version 2.7.
+libraries/lapack: Updated for version 3.6.0.
+libraries/libbluray: Updated for version 0.9.2.
+libraries/libdc1394: Updated for version 2.2.3.
+libraries/libnfs: Updated for version 1.9.8.
+libraries/libsidplayfp: Updated for version 1.8.3.
+libraries/manubulon-snmp-plugins: Updated for version 20151112.
+libraries/ogre: Update MD5SUM.
+libraries/php-mssql: Updated for version 5.4.45.
+libraries/php-pdo_dblib: Updated for version 5.4.45.
+libraries/php-pgsql: Updated for version 5.4.45.
+misc/qtkeychain: Updated for version 0.5.0.
+multimedia/xmltv: Update DEPS and script cleanup.
+multimedia/xvst: Fix build with Qt 5.5.1.
+network/Pafy: Updated for version 0.4.3.
+network/aria2: Update HOMEPAGE url.
+network/awscli: Updated for version 1.9.17.
+network/choqok: Updated for version 1.5 + new maintainer.
+network/gajim: Updated for version 0.16.5.
+network/mps-youtube: Updated for version 0.2.6.
+network/nagios: Updated for version 4.1.1.
+network/openl2tp: Script cleanup.
+network/pentadactyl: Updated for version 20160101.
+network/pidgin-skypeweb: Updated for version 1.1.
+network/pidgin-whatsapp: Updated for version 0.8.6.
+network/purple-facebook: Updated for version ad2ee74b913a.
+network/qTox: Updated for version 20160102.
+network/socat: Updated for version 1.7.3.0.
+network/strongswan: Updated for version 5.3.4.
+network/telegram: Updated for version 0.9.18.
+network/tor: Updated for version 0.2.7.6.
+network/toxcore: Updated for version 20151216.
+network/vivaldi: Updated for version 1.0.365.3_1.
+network/youtube-dl: Updated for version 2016.01.01.
+office/MasterPDFEditor: Updated for version 3.5.81.
+office/qpdfview: Updated for version 0.4.16.
+office/timetrap: Updated for version 1.10.0.
+perl/perl-CPANPLUS: Update DEPS.
+perl/perl-ExtUtils-ModuleMaker: Updated for version 0.55.
+perl/perl-Package-Constants: Added (perl module).
+perl/perl-Sidef: Updated for version 2.20.
+perl/perl-XML-TreePP: Added (perl module).
+python/Flask-SQLAlchemy: Added (SQLAlchemy support to your Flask).
+python/prompt_toolkit: Updated for version 0.56.
+python/ptpython: Updated for version 0.27.
+python/python-keyutils: Added (keyutils bindings for Python).
+python/python-magic: Added missing LICENSE file.
+python/python-nbxmpp: Updated for version 0.5.3.
+python/python-requests: Updated for version 2.9.1.
+python/python-scandir: Added (directory iterator).
+python/python3-sip: Updated for version 4.17.
+system/cantarell-fonts: Updated for version 0.0.20.1.
+system/fr: Updated for version 1.33.
+system/lbrate: Add missing patch.
+system/monitoring-plugins: Updated for version 2.1.2.
+system/nagios-plugins: Updated for version 2.1.1.
+system/nomarch: Add missing patch.
+system/nvidia-firmware: Update DOWNLOAD url.
+system/pwgen: Updated for version 2.07.
+system/slpkg: Updated for version 3.0.5.
+system/tmuxp: Updated for version 0.9.3.
+system/ttf-ubuntu-font-family: Updated for version 0.83.
+system/udiskie: Updated for version 1.4.6.
+system/wine-staging: Updated for version 1.9.0.
+system/wine: Updated for version 1.8.
++--------------------------+
+Fri Jan  1 00:14:54 UTC 2016
+academic/freechartgeany: Updated for version 2.0.2.
+academic/wxMaxima: Updated for version 15.08.2.
+accessibility/easystroke: Update HOMEPAGE.
+desktop/cathexis-suite-themes: Change txz -> tgz.
+development/apitrace: Added (Tools for tracing Graphics APIs).
+development/git-lfs: Updated for version 1.1.0.
+development/global: Updated for version 6.5.2.
+development/kaaedit: Updated for version 0.48.0.
+development/mono-addins: Specify mcs for mono 4.
+development/mono: Updated for version 4.2.2.10.
+development/nodejs: Updated for version 4.2.4.
+games/mame: Fix maintainer/email in .info.
+games/openttd: Updated for version 1.5.3.
+games/peg-e: Updated for version 1.2.1.
+games/solarus-quest-editor: Added (GUI to edit quests for Solarus).
+games/solarus: Added (an ARPG game engine).
+games/tome4: Updated for version 1.3.3.
+games/zelda-roth-se: Added (Zelda fangame for the Solarus engine).
+games/zsdx: Added (Zelda fangame for the solarus engine).
+gis/proj: Updated for version 4.9.2.
+graphics/fim: Update MD5SUM.
+graphics/flpsed: Updated for version 0.7.3, new maintainer.
+graphics/qcad: Updated for version 3.12.4.8.
+libraries/bcdoc: Updated for version 0.16.0.
+libraries/botocore: Updated for version 1.3.15.
+libraries/edelib: Update DOWNLOAD url.
+libraries/ipaddress: Updated for version 1.0.16.
+libraries/libkvkontakte: Comment patch that should go for -current.
+libraries/oath-toolkit: Updated for version 2.6.1.
+libraries/pugixml: Updated for version 1.7.
+libraries/qmltermwidget: Added (QML terminal widget).
+libraries/vte3: Updated for version 0.36.5.
+libraries/xulrunner: Fix DOWNLOAD url.
+misc/keychain: Updated for version 2.8.2.
+multimedia/beets: Updated for version 1.3.16.
+multimedia/flashplayer-plugin: Updated for version 11.2.202.559.
+multimedia/parole: Noted optional dependencies.
+network/awscli: Updated for version 1.9.15.
+network/iojs: Add note about nodejs.
+network/sshfs-fuse: Update HOMEPAGE and DOWNLOAD url.
+network/suricata: Updated for version 2.0.11.
+network/vivaldi: Updated for version 1.0.357.5_1.
+network/you-get: Updated for version 0.4.232.
+network/youtube-dl: Updated for version 2015.12.29.
+office/MasterPDFEditor: Updated for version 3.5.16.
+office/gummi: Script cleanup.
+perl/perl-Sidef: Updated for version 2.13.
+python/astroid: Updated for version 1.4.3.
+python/boto3: Updated for version 1.2.3.
+python/boto: Updated for version 2.38.0.
+python/cssutils: Updated for version 1.0.1>
+python/filechunkio: Updated for version 1.6.
+python/pyinotify: Updated for version 0.9.6.
+python/pymysql: Updated for version 0.6.7.
+python/python-keyczar: Updated for version 0.715.
+python/python-lazy-object-proxy: Added (Python lazy object proxy).
+python/python-libnacl: Updated for version 1.4.3.
+python/python-magic: Updated for version 0.4.10>
+python/python-wrapt: Added (A Python module for decorators).
+python/requirements-detector: Updated for version 0.4.1.
+python/rope: Updated for version 0.10.3.
+python/simplejson: Updated for version 3.8.1.
+system/cantarell-fonts: Updated for version 0.0.19.
+system/cool-retro-term: Added (old school terminal emulator).
+system/fr: Updated for version 1.30.
+system/inxi: Updated for version 2.2.31.
+system/nvidia-firmware: Added (video firmware for nouveau).
+system/nvidia-kernel: Fix crash on x86 architecture.
+system/openrc: Updated for version 0.19.1.
+system/rabbitmq-server: Added (multi-protocol messaging broker).
+system/rover: Added (simple file browser for the terminal).
+system/slpkg: Updated for version 3.0.4.
+system/sysdig: Updated for version 0.6.0.
+system/tpm: Added (Tiny password manager).
+system/udiskie: Updated for version 1.4.5.
+system/usermin: Updated for version 1.690.
+system/vagrant: Updated for version 1.8.1.
+system/webmin: Updated for version 1.780.
+system/wiimms-iso-tools: Added (command line ISO and WBFS tools).
+system/wiimms-wbfs-tool: Removed (replaced with wiimms-iso-tools).
++--------------------------+
+Fri Dec 25 03:24:58 UTC 2015
+network/uTox: Added missing gtk2.diff.
++--------------------------+
+Fri Dec 25 02:35:35 UTC 2015
+academic/sage: Updated for version 6.10.
+audio/apulse: Updated for version 20151219.
+audio/lmms: Updated for version 1.1.3.
+development/SQLAlchemy: Updated for version 1.0.11.
+development/flow: Added (A static type checker for JavaScript).
+development/gnats: Added (set of tools for tracking bugs).
+development/lighttable: Fix indentation.
+development/pycharm: Updated for version 5.0.3.
+development/watchman: Added (A file watching service).
+games/angband: Updated for version.
+games/atanks: Updated for version 6.4.
+games/jackhammer: Updated for version 11855.
+games/mednafen: Fix indentation.
+games/roccat-tools: Added (Roccat common files).
+games/supertuxkart: Updated for version 0.9.1.
+games/warsow: Updated for version 2.01.
+gis/cligj: Updated for version 0.4.0.
+gis/osm-gps-map: Added (gtk mapping widget).
+gis/rasterio: Updated for version 0.31.0.
+graphics/pngquant: Updated for version 2.5.2.
+graphics/potrace: Updated for version 1.13.
+libraries/OpenAL: Updated for version 1.17.1.
+libraries/batinfo: Removes python3 support.
+libraries/botocore: Updated for version 1.3.14.
+libraries/cffi: Updated for version 1.4.2.
+libraries/enum34: Updated for version 1.1.2.
+libraries/libewf: Patch for newer GCC.
+libraries/liblangtag: Fix VERSION.
+libraries/libmseed: Added (C library framework).
+libraries/libva: Updated for version 1.6.2.
+libraries/png++: Added (C++ wrapper for libpng).
+libraries/pymdstat: Removes python3 support.
+libraries/wxSQLite3: Updated for version 3.3.0.
+misc/fcitx-mozc: Added (Mozc engine for fcitx).
+multimedia/lives: Updated for version 2.4.6.
+network/awscli: Updated for version 1.9.14.
+network/bottle: Removes python3 support.
+network/claws-mail: Updated for version 3.13.1.
+network/clipgrab: Updated for version 3.5.6.
+network/dropbox: Updated for version 3.12.6.
+network/gtk-gnutella: Updated for version 1.1.8.
+network/hylafax+: Updated for version 5.5.6.
+network/icecat: Updated for version 38.5.0.
+network/mumble: Updated for version 1.2.11.
+network/murmur: Updated for version 1.2.11.
+network/pentadactyl: Updated for version 20151223.
+network/purple-facebook: Updated for version 078fbf8d1a4e.
+network/tixati: Updated for version 2.31_1.
+network/uTox: Updated for version 078fbf8d1a4e.
+network/vivaldi: Updated for version 1.0.352.3_1.
+network/you-get: Updated for version 0.4.217.
+network/youtube-dl: Updated for version 2015.12.18.
+perl/perl-CPAN-Meta-YAML: Updated for version 0.018.
+python/psutil: Updated for version 3.3.0.
+python/py3sensors: Removes python3 support.
+system/Iosevka: Updated for version 1.5.1.
+system/adobe-source-code-pro-font: Update DOWNLOAD url.
+system/colord-gtk: Added (GTK integration for libcolord).
+system/glances: Removes python3 support.
+system/hardinfo: Patched for newer GCC.
+system/letsencrypt: Updated for version 0.1.1.
+system/mksh: Updated for version R52.
+system/parallel: Updated for version 20151222.
+system/sqlcipher: Added (256 bit AES encryption SQLite extension).
+system/udiskie: Updated for version 1.4.1.
+system/vagrant: Updated for version 1.8.0.
+system/wine-staging: Added (Wine Is Not an Emulator Staging).
+system/z: Updated for version 1.9.
++--------------------------+
+Sat Dec 19 00:27:04 UTC 2015
+desktop/mimi: Added (xdg-open alternative).
+development/SQLAlchemy: Updated for version 1.0.10.
+development/hhvm-pgsql: Updated for version 3.11.0.
+development/kicad: Updated for version 4.0.0 + new maintainer.
+development/leiningen: Updated for version 2.5.3.
+development/lighttable: Updated for version 0.8.0.
+development/pycharm: Updated for version 5.0.2.
+development/rust: Updated for version 1.5.0.
+development/tyrutils-ericw: Added (Map Compiling Tools).
+development/ucpp: Added (C preprocessor compliant to ISO-C99).
+development/vispatch: Added (VIS Patching for Quake BSPs).
+games/mgba: Updated for version 0.3.2.
+games/pioneer: Updated for version 20151214.
+games/ut2004: Update launcher.
+games/yamagi-quake2: Updated for version 5.32.
+graphics/brlcad: Add note about qt5 conflict.
+graphics/shutter: Fix .info.
+libraries/CondConfigParser: Addec (Python library).
+libraries/activemq-cpp: Updated for version 3.9.1.
+libraries/agg: Fixed download url and homepage.
+libraries/botocore: Updated for version 1.3.13.
+libraries/cffi: Updated for version 1.4.1.
+libraries/libcmis: Update script.
+libraries/libcpuid: Updated for version 0.2.2.
+libraries/libeot: Added (Embedded OpenType Import Library).
+libraries/libgaminggear: Added (Libraries for gaming input devices).
+libraries/libkvkontakte: Patched to work with newer cmake.
+libraries/liblangtag: Added (access tags for identifying languages).
+libraries/libmspub: Added (Microsoft Publisher Import Library).
+libraries/libmwaw: Added (Import library).
+libraries/liborcus: Added (documents processing library).
+libraries/libpagemaker: Added (Adobe PageMaker Import Library).
+libraries/libsodium: Updated for version 1.0.7.
+libraries/libtermkey: Updated for version 0.18.
+libraries/libuv: Updated for version 1.8.0.
+libraries/libvisio: Added (Microsoft Visio Import Library).
+libraries/libwps: Added (Microsoft Works format import library).
+libraries/msgpack-c: Updated for version 1.3.0.
+libraries/python3-pillow: Added (Python3 support for python-pillow).
+libraries/trader: Added (Technical Analysis for traders).
+libraries/unibilium: Updated for version 1.2.0.
+misc/abduco: Added (session manager).
+misc/fcitx-configtool: Updated for version 0.4.8.
+misc/fcitx: Updated for version 4.2.8.6.
+misc/kcm-fcitx: Updated for version 0.4.3.
+multimedia/minidlna: Updated for version 1.1.5.
+multimedia/x265: Updated for version 1.8.
+network/aldryn-client: Updated for version 2.0.5.
+network/aria2: Updated for version 1.19.3.
+network/awscli: Updated for version 1.9.13.
+network/memcached: Updated for version 1.4.25.
+network/owncloud-client: Updated for version 2.1.0.
+network/pentadactyl: Updated for version 20151215.
+network/qTox: Updated for version 20151212.
+network/teamviewer: Updated for version 11.0.53191.
+network/tor-browser: Updated for version 5.0.6.
+network/toxcore: Updated for version 20151211.
+network/uTox: Added (The lightest and fluffiest Tox client).
+network/vivaldi: Updated for version 1.0.344.5_1.
+network/you-get: Updated for version 0.4.210.
+network/youtube-dl: Updated for version 2015.12.13.
+office/impressive: Updated for version 0.11.1.
+office/keepassx: Updated for version 0.4.4.
+office/libreoffice-helppack: Updated for version 5.0.4.
+office/libreoffice-langpack: Updated for version 5.0.4.
+office/libreoffice: Updated for version 5.0.4.
+office/mythes: Added (simple thesaurus).
+office/pdf2djvu: Updated for version 0.9.3.
+office/texstudio: Updated for version 2.10.4.
+python/colorama: Updated for version 0.3.5.
+python/pilkit: Update MD5SUM.
+python/pyperclip: Updated for version 1.5.25.
+python/pytest: Updated for version 2.8.5.
+python/python3: Updated for version 3.5.1.
+python/tox: Updated for version 2.3.1.
+ruby/heroku-client: Updated for version 3.42.25.
+system/fio: Updated for version 2.2.13.
+system/gencfs: Updated for version 1.2.
+system/gnome-disk-utility: Added (storage device manipulation tools)
+system/gparted: Updated for version 0.24.0.
+system/jenkins: Updated for version 1.641.
+system/mlterm: Updated for version 3.6.1.
+system/nvidia-driver: Updated for version 352.63.
+system/nvidia-kernel: Updated for version 352.63.
+system/nvidia-legacy304-driver: Updated for version 304.131.
+system/nvidia-legacy304-kernel: Updated for version 304.131.
+system/nvidia-legacy340-driver: Updated for version 340.96.
+system/nvidia-legacy340-kernel: Updated for version 340.96.
+system/patool: Updated for version 1.10.
+system/qemu: Updated for version 2.4.1.
++--------------------------+
+Sat Dec 12 00:21:30 UTC 2015
+academic/fet: Updated for version 5.28.3.
+academic/sundials: Updated for version 2.6.2.
+audio/kradio: Updated for version 4.0.8.
+desktop/jwm: Updated for version 2.3.4.
+desktop/tint2: Updated for version 0.12.3.
+desktop/wmxss: Added (XScreenSaver DockApp).
+development/android-studio: Updated for version 1.5.1_141_2456560.
+development/atom: Updated for version 1.3.0.
+development/guile-json: Added (JSON module for Guile).
+development/hhvm: Updated for version 3.11.0.
+development/kaaedit: Updated for version 0.47.0.
+development/monodevelop-database: Updated for version 5.10.1.1.
+development/monodevelop: Updated for version 5.10.1.1.
+development/neovim: Updated for version 0.1.1.
+development/p4: Updated for version 2015.2.1311674.
+development/sbcl: Updated for version 1.3.1.
+development/universal-ctags: Updated for version 8efa556.
+games/SLADE: Updated for version 3.1.0.5.
+games/atari++: Updated for version 1.80.
+games/chocolate_duke3D: Update script.
+games/crispy-doom: Added (Doom source port).
+games/jackhammer: Added (Jackhammer Level Editor).
+games/mednafen: Only set CLANGFLAGS on affected version of clang.
+games/ut2004: Added (Unreal Tournament 2004).
+games/warsow: Hardcoded x86 ARCH to i686
+games/wmquake: Update script.
+games/zod-engine: Fix version in .info file.
+graphics/GraphicsMagick: Fix compile issue.
+graphics/Shellpic: Updated for version 1.6.2.
+graphics/advancecomp: Updated for version 1.20.
+graphics/findimagedupes: Add perl-Inline-C to REQUIRES.
+graphics/graphite2: Added (rendering engine).
+graphics/phototonic: Updated for version 1.7.
+libraries/CoinMP: Added (C-API library).
+libraries/botocore: Updated for version 1.3.11.
+libraries/dropbox-python: Updated for version 4.0.
+libraries/htmlcxx: Updated for version 0.86.
+libraries/hyphen: Added (hyphenation library).
+libraries/libabw: Added (AbiWord Import Library).
+libraries/libcdr: Added (CorelDRAW Import Library).
+libraries/libcmis: Added (C++ client library).
+libraries/libe-book: Added (reflowable e-book import library).
+libraries/libetonyek: Added (Apple Keynote Import Library).
+libraries/libexttextcat: Added (Text Categorization library).
+libraries/libfreehand: Added (Adobe FreeHand Import Library).
+libraries/libgltf: Added (rendering library for glTF models).
+libraries/libhtp: Updated for version 0.5.18.
+libraries/libixion: Added (formula parser & interpreter).
+libraries/librevenge: Added (REVerse ENGineered formats filters).
+libraries/mdds: Added (Multi-Dimensional Data Structure).
+libraries/yaml-cpp0.3: Update download URL and homepage.
+multimedia/beets: Updated for version 1.3.15.
+multimedia/flashplayer-plugin: Updated for version 11.2.202.554.
+multimedia/gpodder: Updated for version 3.8.5.
+multimedia/lives: Updated for version 2.4.5.
+multimedia/mpv: Fix .info.
+multimedia/obs-studio: Updated for version 0.12.3.
+multimedia/vivaldi-codecs-ffmpeg-extra: Updated for version 47.0.x.
+network/CherryMusic: Updated for version 0.36.0.
+network/aldryn-client: Updated for version 2.0.4.
+network/awscli: Updated for version 1.9.11.
+network/broadcom-sta: Remove doinst.sh.
+network/telegram: Updated for version 0.9.15.
+network/tixati: Updated for version 2.28_1.
+network/vivaldi: Updated for version 1.0.340.7_1.
+network/you-get: Updated for version 0.4.192.
+network/youtube-dl: Updated for version 2015.12.06.
+office/CherryTree: Updated for version 0.36.1.
+office/LanguageTool: Updated for version 3.1.
+office/MasterPDFEditor: Updated for version 3.5.10.
+office/tellico: Updated for version 2.3.11.
+office/texlive: Fix .info.
+perl/perl-Sidef: Updated for version 2.12.
+perl/perl-file-desktopentry: Updated for version 0.22.
+python/PyGithub: Updated for version 1.26.0.
+python/pytest: Updated for version 2.8.4.
+python/python-pillow: Update README.
+python/python-swiftclient: Updated for version 2.7.0.
+python/stevedore: Updated for version 1.10.0.
+python/tox: Updated for version 2.3.0.
+system/Iosevka: Updated for version 1.2.0.
+system/forkstat: Updated for version 0.01.13.
+system/glances: Update README.
+system/guix: Update README and Fix UID/GID.
+system/innoextract: Updated for version 1.5.
+system/letsencrypt: Added (Manage X.509 certificates).
+system/lxdm: Fix localization detection.
+system/mongo-tools: Updated for version 3.2.0.
+system/mongodb: Updated for version 3.2.0.
+system/ofono: Use bluez4.
+system/patool: Updated for version 1.9.
+system/pcsc-tools: Updated for version 1.4.25.
+system/slpkg: Updated for version 3.0.3.
++--------------------------+
+Sat Dec  5 01:00:40 UTC 2015
+academic/gwyddion: Updated for version 2.43.
+academic/spatialite-tools: Update DOWNLOAD url.
+audio/opus: Updated for version 1.1.1.
+desktop/dmenu: Updated for version 4.6.
+desktop/menutray: Updated for version 0.44.
+desktop/openbox-menu: Updated for version 0.8.0.
+development/asm6809: Added (6809/6309 cross assmbler).
+development/eagle: Updated for version 7.5.0.
+development/hub: Updated for version 2.2.2.
+development/lwtools: Added (6809/6309 cross-development tools).
+development/nodejs: Updated for version 4.2.3.
+development/poedit: Updated for version 1.8.6.
+development/scons: Updated for version 2.4.1.
+games/Tempus-Irae: Added (game data).
+games/marathon-eternal-data: Added (game data).
+games/marathon-evil-data: Added (game data).
+games/marathon-red-data: Added (game data).
+games/marathon-rubicon-data: Added (game data).
+games/pioneer: Updated for version 20151130.
+games/warsow: Updated for version 2.0 + new maintainer.
+graphics/fritzing: Updated for version 0.9.2b.
+graphics/pngcrush: Updated for version 1.7.88.
+graphics/qelectrotech: Updated for version 0.5.
+libraries/activemq-cpp: Added (ActiveMQ CPP Library).
+libraries/bcdoc: Update DEP.
+libraries/enum34: Updated for version 1.1.1.
+libraries/libbonobo: Added new patch.
+libraries/libgit2: Updated for version 0.23.4.
+misc/dos2unix: Updated for version 7.3.2.
+misc/sigrok-firmware-fx2lafw: Updated for version 0.1.3.
+misc/wcd: Updated for version 5.3.1.
+multimedia/pitivi: Updated for version 0.95.
+network/ClusterSSH: Updated for version 4.05.
+network/Electrum: Updated for version 2.5.4.
+network/broadcom-sta: Updated for version 6.30.223.271.
+network/guacamole-client: Updated for version 0.9.8.
+network/guacamole-server: Updated for version 0.9.8.
+network/icecat: Updated for version 38.4.0.
+network/icinga2: Updated for version 2.4.0.
+network/icingaweb2: Updated for version 2.1.0.
+network/ii: Added (minimalist IRC client).
+network/palemoon: Updated for version 25.8.1.
+network/pentadactyl: Updated for version 20151201.
+network/teamviewer: Updated for version 11.0.52520.
+network/vivaldi: Updated for version 1.0.334.3_1.
+network/you-get: Updated for version 0.4.176.
+network/youtube-dl: Updated for version 2015.11.27.1.
+office/MasterPDFEditor: Updated for version 3.5.02.
+office/libreoffice-langpack: Update README.
+office/minidjvu: Added (bitonal DjVu encoder/decoder).
+office/qpdf: Updated for version 6.0.0.
+office/xtrkcad: Updated for version 4.2.2.
+perl/perl-AnyEvent-HTTP: Fix download url.
+perl/perl-Class-MethodMaker: Fix download url.
+perl/perl-File-Copy-Recursive: Added (perl extension).
+perl/perl-File-ShareDir-Install: Added (install shared files).
+perl/perl-IO-All: Added (IO modules).
+perl/perl-IO-Socket-IP: Fix download url.
+perl/perl-IO-Socket-SSL: Avoid waiting user input.
+perl/perl-Inline-C: Added (C language support for Inline).
+perl/perl-Inline: Update README.
+perl/perl-Lingua-EN-Numbers-Ordinate: Fix download url.
+perl/perl-NetPacket: Fix download url.
+perl/perl-Pegex: Added (Acmeist PEG Parser Framework).
+perl/perl-Test-MockObject: Fix download url.
+perl/perl-YAML-LibYAML: Added (Perl YAML Serialization).
+python/click: Updated for version 6.2.
+python/idna: Update DEP.
+python/netlib: Added (Network utilities).
+python/py: Updated for version 1.4.31.
+python/pyperclip: Added (Python copy and paste clipboard functions).
+python/python-certifi: Updated for version 2015.11.20.1
+python/python-pillow: Added (Python Imaging Library).
+system/Iosevka: Updated for version 1.0.0.
+system/clamav: Updated for version 0.99.
+system/distorm3: Added (Disassembler Library).
+system/gpart: Add support to LVMS2 and btrfs.
+system/hack-font-ttf: Updated for version 2.018.
+system/lxdm: Updated for version 0.5.3.
+system/unison: Fix MD5SUM.
+system/virt-manager: Reverted to version 1.2.1.
+system/volatility: Added (memory extraction utility framework).
+system/winetricks: Updated for version 20151116.
+system/wmconfig: Updated for version 1.4.11.
++--------------------------+
+Sat Nov 28 00:29:19 UTC 2015
+academic/units: Updated for version 2.12.
+accessibility/xdotool: Fix include permissions.
+audio/clam: Updated for version r15456.
+audio/clam_annotator: Fix compile issue.
+audio/clam_voice2midi: Fix compile issue.
+audio/flake: Fix buffer overrun.
+audio/grip2: Fix compile issue.
+audio/horgand: Fix compile issue.
+audio/match-vamp-plugin: Fix compile issue.
+audio/rakarrack: Fix compile issue.
+desktop/dwm: Updated for version 6.1.
+desktop/numix-gtk-theme: Added (modern flat theme).
+desktop/numix-icon-theme-bevel: Added (icon theme).
+desktop/numix-icon-theme-circle: Added (icon theme).
+desktop/numix-icon-theme: Added (icon theme).
+desktop/openbox-simple-theme: Updated for version 20151121.
+desktop/wmmon: Updated for version 1.1+20131205.
+development/atom: Updated for version 1.2.3.
+development/bas55: Updated for version 1.07.
+development/ltrace: Fix compile issue.
+development/makedepf90: Added (Makefile-style dependency generator).
+games/generator_cbiere: Fix compile issue.
+games/glbsp: Fix compile issue.
+games/gtklife: Fix compile issue.
+games/jezzball-kazzmir: Fix compile issue.
+games/pioneer: Added (A game of lonely space adventure).
+games/supermariowar: Fix compile issue.
+games/ufoai: Fix compile issue.
+games/uqm: Fix compile issue.
+games/wesnoth: Do not build tests.
+games/wmquake: Added (Quake DockApp).
+games/wmwebcam: Added (Webcam DockApp).
+games/yae: Fix compile issue.
+gis/pdal: Updated for version 1.1.0.
+graphics/dvisvgm: Remove deps that are part of Slackware.
+graphics/fbv: Fix compile issue.
+graphics/vips: Update MD5SUM.
+libraries/DevIL: Add patch for gcc 5.
+libraries/botocore: Updated for version 1.3.9.
+libraries/cchardet: Updated for version 1.0.0.
+libraries/dropbox-python: Updated for version 3.42.
+libraries/libevhtp: Updated for version 1.2.11n.
+libraries/libtorrent: Updated for version 0.13.6.
+libraries/msx264: Updated for version 1.5.2.
+libraries/php-redis: Added (Redis bindings for PHP).
+libraries/plumbum: Updated for version 1.6.0.
+libraries/pycparser: Updated for version 2.14.
+misc/grc: Added (generic colouriser).
+multimedia/aegisub: Fix build on -current.
+multimedia/devedeng: Updated for version 4.4.0.
+multimedia/lives: Updated for version 2.4.4.
+multimedia/obs-studio: Updated for version 0.12.2.
+multimedia/spotify32: Improve icon install.
+multimedia/spotify64: Improve icon install.
+multimedia/vivaldi-codecs-ffmpeg-extra: Change source to latest deb.
+network/ClusterSSH: Updated for version 4.04_01.
+network/awscli: Updated for version 1.9.9.
+network/darkhttpd: Updated for version 1.11.
+network/elemental-ircd: Added (high performance irc daemon).
+network/pidgin-skypeweb: Updated for version 1.0.
+network/qbittorrent: Added qbittorrent-nox + an rc init script.
+network/rtorrent: Updated for version 0.9.6.
+network/telegram: Updated for version 0.9.13 + new maintainer.
+network/tixati: Updated for version 2.27_1.
+network/vivaldi: Updated for version 1.0.330.3_1.
+network/you-get: Updated for version 0.4.167.
+network/youtube-dl: Updated for version 2015.11.19.
+office/CherryTree: Updated for version 0.36.0.
+office/pdfshuffler: Built against newer PyPDF + new maintainer.
+office/unoconv: Update deps.
+office/xpad: Remove upstream patch + new maintainer.
+perl/perl-Test-Differences: Updated for version 0.64.
+perl/perl-file-desktopentry: Updated for version 0.21.
+perl/perl-text-aspell: Added (Interface to the GNU Aspell library).
+python/click: Updated for version 6.0.
+python/cryptography: Updated for version 1.1.1.
+python/hpack: Added (HPACK header compression).
+python/idna: Added (Internationalized Domain Names in Applications).
+python/monty: Updated for version 0.7.2.
+python/passlib: Added (comprehensive password hashing framework).
+python/pilkit: Updated for version 1.1.13.
+python/python-ndg_httpsclient: Removed (duplicate).
+python/regex: Updated for version 2015.11.22.
+system/foomatic-db-engine: Added (Foomatic's database engine).
+system/foomatic-db: Added (Foomatic's XML database).
+system/fsviewer: Fix compile issue.
+system/gpart: Added (Guess PC-type hard disk partitions).
+system/guix: Added (package manager).
+system/man-db: Fix compile issue.
+system/multibootusb: Added (Install live linux on a USB disk).
+system/parallel: Updated for version 20151122.
+system/sbotools: Updated for version 1.9 + new maintainer.
+system/spacefm: Updated for version 1.0.4 + optional gdb support.
+system/systrace: Fix compile issue.
+system/virt-manager: Updated for version 1.3.0.
++--------------------------+
+Sat Nov 21 04:45:59 UTC 2015
+academic/squizz: Fix VERSION.
+audio/apulse: Updated for version 20151031.
+audio/ncmpcpp: Updated for version 0.6.8.
+audio/xmms-mp4: Fix compile for -current.
+desktop/obsession: Update script.
+desktop/py3status: Updated for version 2.7.
+development/atom: Updated for version 1.2.1.
+development/bas55: Updated for version 1.06.
+development/composer: Updated for version 1.0.0_alpha11.
+development/luajit: Updated for version 2.0.4.
+development/nodejs: Add additional DOCS.
+development/p4: Updated for version 2015.2.1264740.
+development/pandas: Updated for version 0.17.1.
+development/pycharm: Updated for version 5.0.1.
+development/universal-ctags: Updated for version 4d32ace.
+games/ace: Added (Unix/X solitaire games).
+games/openjazz: Fix compile issue.
+gis/grass: Updated for version 7.0.2.
+gis/rasterio: Updated for version 0.30.0.
+graphics/PyMOL: Updated for version 1.8.0.0.
+graphics/blender: Updated for version 2.76b.
+graphics/dvisvgm: Updated for version 1.12 + new maintainer.
+graphics/vips: Added (Free Image Processing System).
+libraries/LibRaw: Updated for version 0.17.0.
+libraries/OpenSceneGraph: Fixed download url.
+libraries/PyYAML: Updated for version 3.11.
+libraries/belle-sip: Updated for version 1.4.2.
+libraries/bzrtp: Added (ZRTP Key Exchange Library).
+libraries/cffi: Updated for version 1.3.1.
+libraries/cln: Updated for version 1.3.4 + new maintainer.
+libraries/dropbox-python: Updated for version 3.41.
+libraries/ipaddress: Updated for version 1.0.15.
+libraries/mbedtls: Added (Cryptographic and SSL/TLS library).
+libraries/mpir: Updated for version 2.7.2.
+libraries/python-ntlm: Added (Python NTLM Support).
+libraries/python3-PyYAML: Added (YAML parser and emitter).
+libraries/qt5: Updated for version 5.5.1.
+misc/opencc: Added (Open Chinese Convert).
+misc/tegaki-zinnia-japanese: Added (Japanese handwriting model).
+misc/zinnia: Added (hand recognition system).
+multimedia/bdtools: Added (Blu-ray disc utilities).
+multimedia/cuetools: Updated for version 1.4.1.
+multimedia/lives: Updated for version 2.4.3.
+multimedia/pitivi: Update to .xz DOWNLOADs.
+multimedia/plexmediaserver: Updated for version 0.9.14.1.1544.
+network/Pafy: Updated for version 0.4.2.
+network/bitcoin: Updated for version 0.11.2.
+network/cicb: Minor fix for -current.
+network/clipgrab: Updated for version 3.5.5.
+network/google-cli: Updated for version 1.9.
+network/linphone: Updated for version 3.9.1.
+network/nbd: Updated for version 3.12.1.
+network/owncloud-server: Updated for version 8.2.1.
+network/palemoon: Updated for version 25.8.0.
+network/qTox: Updated for version 20151114.
+network/scapy: Updated for version 2.3.1.
+network/shorewall-core: Updated for version 4.6.13.2.
+network/shorewall6: Updated for version 4.6.13.2.
+network/shorewall: Updated for version 4.6.13.2.
+network/suricata: Updated for version 2.0.9.
+network/synergy: Updated for version 1.7.5.
+network/tmate: Added (instant terminal sharing).
+network/toxcore: Updated for version 20151119.
+network/you-get: Updated for version 0.4.156.
+network/youtube-dl: Updated for version 2015.11.18.
+office/rednotebook: Updated for version 1.11.
+python/darts.util.lru: Added (Dictionary with LRU behaviour).
+python/halberd: Added (HTTP load balancer detector).
+python/lxml: Updated for version 3.5.0.
+python/phply: Added (PHP lexer and parser in Python).
+python/pyrfc3339: Added (Python module).
+python/pytest: Updated for version 2.8.3.
+python/python-certifi: Updated for version 2015.11.20.
+python/python-clamd: Update DEP.
+python/python-configargparse: Added (Python module).
+python/python-esmre: Added (Regular expression accelerator).
+python/python-futures: Added (Backport concurrent.futures package).
+python/python-ndg_httpsclient: Added (Python module).
+python/python-oauth2client: Updated for version 1.5.2.
+python/python-parsedatetime: Added (Python module).
+python/python-pdfminer: Added (PDF parser and analyzer).
+python/python-tblib: Added (Traceback fiddling library).
+python/python-vulndb: Added (vulndb Python SDK).
+python/regex: Updated for version 2015.11.14.
+python/rsa: Updated for version 3.2.3.
+python/stopit: Added (Raise asynchronous exceptions).
+system/barman: Updated for version 1.5.1.
+system/driconf: Added .desktop file.
+system/forkstat: Updated for version 0.01.12.
+system/intel-microcode: Updated for version 20151106.
+system/jmtpfs: Add alternate source.
+system/lirc: Updated for version 0.9.3a + new maintainer.
+system/secure-delete: Add more patches.
+system/slpkg: Updated for version 3.0.2.
+system/sysdig: Updated for version 0.5.1.
++--------------------------+
+Sat Nov 14 00:09:50 UTC 2015
+academic/bedtools: Updated for version 2.25.0.
+academic/cutadapt: Updated for version 1.9.
+academic/genometools: Updated for version 1.5.7.
+academic/ij-plugins-LOCI: Updated for version 5.1.5.
+academic/io_lib: Updated for version 1.14.6.
+academic/jalview: Updated for version 2.9.
+academic/ncbi-blast-plus: Updated for version 2.2.31.
+academic/sequence-analysis: Updated for version 1.7.2.
+academic/snpEff: Updated for version 4.1l.
+academic/spades: Updated for version 3.6.1.
+academic/squizz: Updated for version 0.99c.
+academic/tophat: Updated for version 2.1.0.
+academic/vcftools: Updated for version 0.1.14_2_g78add55.
+academic/zotero: Updated for version 4.0.28.
+audio/calf-ladspa: Added (legacy audio plugin pack).
+audio/calf: Updated for version 0.0.60.
+audio/guitarix: Updated for version 0.34.0.
+audio/jack-tools: Updated for version 20141211.
+audio/lv2-mda-metapiano: Updated for version 0.0.2.
+audio/morituri: Update DEPS and added patch.
+audio/vocoder-ladspa: Updated for version 0.4.
+desktop/openbox-menu: Update DEP.
+desktop/plank: Add DEP.
+desktop/seafile-gui: Updated for version 4.4.2.
+desktop/wmclock: Updated for version 1.0.14.
+development/eagle: Updated for version 7.4.0.
+development/gnuradio: Fix VERSION.
+development/hhvm-pgsql: Added (Postgres Extension for HipHop).
+development/hhvm: (VM to execute Hack and PHP).
+development/jdk: Updated for version 8u66.
+development/kaaedit: Updated for version 0.46.0.
+development/nodejs: Added (JavaScript runtime).
+development/openjdk: Updated for version 7u91b1.
+development/pycharm: Updated for version 5.0.
+development/textadept: Updated for version 8.4.
+development/zed: Fix .desktop file.
+games/mame: Updated for version 0.167.
+games/mgba: Change HOMEPAGE url.
+games/wesnoth: Updated for version 1.12.5.
+graphics/dvisvgm: Fix DOWNLOAD url + update script.
+graphics/feh: Updated for version 2.14.
+graphics/qcad: Updated for version 3.12.1.0.
+libraries/Impacket: Updated for version 0.9.13.
+libraries/SFML: Updated for version 2.3.2.
+libraries/http-parser: Updated for version 2.6.0.
+libraries/libb64: Added (C routines for base64 encoding/decoding)
+libraries/libbluray: Updated for version 0.9.1.
+libraries/libgit2: Updated for version 0.23.3.
+libraries/librelp: Updated for version 1.2.8.
+libraries/libsodium: Updated for version 1.0.6.
+libraries/libvirt-python: Updated for version 1.2.21.
+libraries/libvirt: Updated for version 1.2.21.
+libraries/libwhisker2: New maintainer.
+libraries/libwnck3: Remove DEP.
+libraries/live555: Updated for version 2015.11.09.
+libraries/lvtk: Updated for version 1.2.0.
+libraries/pybloomfiltermmap: Added (bloom filter for python).
+libraries/webkitgtk: Bring back -j1.
+misc/mosquitto: Updated for version 1.4.5.
+multimedia/cuetools: Added alternative untarring routine.
+multimedia/flashplayer-plugin: Updated for version 11.2.202.548.
+multimedia/kodi: Updated for version 15.2.
+multimedia/plexmediaserver: Updated for version 0.9.12.18.1520.
+network/NetworkManager-openconnect: Updated for version 0.9.8.6.
+network/ccnet: Updated for version 4.4.6.
+network/clipgrab: Updated for version 3.5.4.
+network/davmail: Fix path.
+network/dovecot-pigeonhole: Updated for version 0.4.9.
+network/dovecot: Updated for version 2.2.19.
+network/dsniff: Add more patches.
+network/haproxy: Updated for version 1.6.2.
+network/hping3: Add more patches + new maintainer.
+network/icinga2: Updated for version 2.3.11.
+network/insync: Updated for version 1.3.3.36056.
+network/iojs: Updated for version 3.3.1.
+network/kde-networkmanagement-openconnect: Updated for version 0.9.0.12.
+network/nikto: Updated for version 2.1.5.
+network/openconnect: Updated for version 7.06.
+network/otter: Fix font size.
+network/packit: Update DOWNLOAD url + new maintainer.
+network/polipo: Updated for version 1.1.1.
+network/postfix: Updated for version 3.0.3.
+network/putty: Updated for version 0.66.
+network/qTox: Updated for version 20151108.
+network/seafile-client: Updated for version 4.4.6.
+network/seafile-server: Updated for version 4.4.6.
+network/seahub: Updated for version 4.4.6.
+network/spamassassin: Updated for version 3.4.1.
+network/sqlmap: Misc tweaks and new maintainer
+network/tor-browser: Updated for version 5.0.4.
+network/toxcore: Updated for version 20151103.
+network/viber: Update script.
+network/vivaldi: Updated for version 1.0.321.3_1.
+network/xtables-addons: Updated for version 2.9.
+network/you-get: Updated for version 0.4.136.
+network/youtube-dl: Updated for version 2015.11.10.
+office/abiword: Updated for version 3.0.1.
+office/mu: Updated for version 0.9.15.
+office/notmuch: Updated for version 0.21.
+office/task: Updated for version 2.5.0.
+office/texmaker: Updated for version 4.5.
+office/zim: Updated for version 0.65 + new maintainer.
+perl/libwww-perl: Updated for version 6.13.
+perl/perl-Test-Differences: Update DEPS.
+perl/perl-Time-Piece: Updated for version 1.31.
+perl/perl-encode-locale: Updated for version 1.05.
+perl/perl-http-message: Updated for version 6.11.
+perl/perl-net-dns: Updated for version 1.02.
+perl/perl-net-http: Updated for version 6.09.
+python/html2text: Updated for version 2015.11.4.
+python/numexpr: Updated for version 2.4.6.
+python/pyPdf: Updated for version 1.25.1.
+python/pyflakes: Updated for version 1.0.0.
+python/pytables: Updated for version 3.2.0.
+python/python-clamd: Added (python interface to Clamav).
+python/regex: Updated for version 2015.11.09.
+python/tox: Updated for version 2.2.1.
+system/Iosevka: Updated for version 1.0_beta7.
+system/apache-activemq: Updated for version 5.12.1.
+system/cantarell-fonts: Updated for version 0.0.18.1.
+system/ccid: Updated for version 1.4.21.
+system/clamtk: Updated for version 5.20.
+system/drbd-utils: Updated for version 8.9.4.
+system/evilvte: Added (highly customizable terminal emulator).
+system/gencfs: Added (Graphical Front End for Encfs).
+system/icingaweb2: Updated for version 2.0.0.
+system/irqbalance: Updated for version 1.0.9.
+system/monitorix: Updated for version 3.8.1.
+system/rar2fs: Updated for version 1.21.0.
+system/rar: Updated for version 5.3.b6.
+system/rsyslog: Updated for version 8.14.0.
+system/sysdig: Updated for version 0.5.0.
+system/unrar: Updated for version 5.3.7.
+system/virt-manager: Updated for version 1.2.1.
+system/xen: Updated for version 4.5.2.
++--------------------------+
+Sat Nov  7 03:34:36 UTC 2015
+academic/gcompris: Updated for version 15.10.
+academic/wxmacmolplt: Update DOWNLOAD url.
+accessibility/xdotool: Update DEP.
+audio/tap_plugins: Updated for version 0.7.3, add desktop/setcap.
+audio/zita-ajbridge: Updated for version 0.6.0.
+desktop/luna-wallpapers: Update DOWNLOAD url.
+desktop/ssr: Updated for version 0.3.6.
+development/bas55: Updated for version 1.05.
+development/gnuradio: Updated for version 3.7.5.1.
+development/lazarus: Updated for version 1.4.4.
+development/monodevelop-database: Add patch.
+development/neovim: Updated for version 0.1.0.
+development/portaudio: Updated for version v19_20140130.
+development/qt-creator3: Updated for version 3.5.1.
+development/re2c: Updated for version 0.14.3.
+development/rust: Updated for version 1.4.0.
+development/vstudio: Updated for version 6.0.13.
+development/zed: Fix build issues.
+games/hedgewars: Updated for version 0.9.22.
+games/mgba: Updated for version 0.3.1.
+graphics/CairoSVG: Updated for version 1.0.19.
+graphics/blender: Add note about other Blender.
+graphics/tesseract: Updated for version 3.04.00.
+libraries/c++-gtk-utils: Updated for version 2.0.29.
+libraries/hdf5: Updated for version 1.8.15_patch1.
+libraries/libevhtp: Updated for version 1.2.11.
+libraries/libnids: New maintainer.
+libraries/libsodium: Updated for version 1.0.5.
+libraries/live555: Updated for version 2015.10.29.
+libraries/nltk: Updated for version 3.1 + new maintainer.
+libraries/reportlab: Updated for version 3.2.0.
+libraries/tcllib: Updated for version 1.17.
+multimedia/TeamSpeak3: Updated for version 3.0.18.2.
+multimedia/kdenlive: Fix locale.
+multimedia/lwks: Update DEP.
+multimedia/smplayer: Updated for version 15.9.0.
+multimedia/smtube: Updated for version 15.9.0.
+network/ClusterSSH: Updated for version 4.04.
+network/Electrum: Updated for version 2.5.2.
+network/SocksiPy: New maintainer.
+network/amap: New maintainer.
+network/bozohttpd: Update DOWNLOAD url and remove DEP.
+network/clipgrab: Updated for version 3.5.2.
+network/corkscrew: New maintainer.
+network/davmail: Added (Mail Gateway).
+network/deluge: Updated for version 1.3.12 + new maintainer.
+network/dsniff: New maintainer.
+network/google-cli: Update script.
+network/haproxy: Updated for version 1.6.1.
+network/iojs: Updated for version 4.2.2.
+network/jabberd2: Fix startup script.
+network/pentadactyl: Updated to work with Firefox 42.
+network/pyzor: Updated for version 1.0.0.
+network/skylable-sx: Updated for version 1.2.
+network/telegram: Updated for version 0.9.10.
+network/vivaldi: Updated for version 1.0.303.48_1.
+network/you-get: Updated for version 0.4.125.
+network/youtube-dl: Updated for version 2015.11.02.
+office/ProjectLibre: Updated for version 1.6.2.
+office/impressive: Update DEP.
+office/libreoffice-helppack: Updated for version 5.0.3.
+office/libreoffice-langpack: Updated for version 5.0.3.
+office/libreoffice: Updated for version 5.0.3.
+office/pdf2djvu: Updated for version 0.9.2.
+perl/Net-SSLeay: Updated for version 1.72 + new maintainer.
+perl/perl-CPANPLUS-Dist-Slackware: Updated for version 1.023.
+perl/perl-IO-Socket-SSL: Updated for version 2.020 + new maintainer.
+perl/perl-NetAddr-IP: Updated for version 4.078.
+perl/perl-Sidef: Updated for version 2.10.
+perl/perl-tk: Updated for version 804.033.
+perl/perl-tree-dagnode: Updated for version 1.27.
+python/py3cairo: Fix building with the newer python.
+python/pyliblo: Updated for version 0.10.0.
+python/regex: Updated for version 2015.10.29.
+ruby/heroku-client: Updated for version 3.41.5.
+system/anything-sync-daemon: Updated for version 5.76.
+system/autojump: Updated for version 22.2.4.
+system/gnu-unifont: Updated for version 8.0.01.
+system/lxdm: Updated for version 0.5.2.
+system/pcsc-tools: Updated for version 1.4.24.
+system/srm: Updated for version 1.2.15 + new maintainer.
+system/swatch: Updated for version 3.2.4.
+system/unp: Updated for version 2.0~pre7+nmu1.
+system/uptimed: Updated for version 0.4.0.
+system/xar: Updated for version 1.6.1 + New maintainer.
++--------------------------+
+Sat Oct 31 01:34:24 UTC 2015
+academic/arpack-ng: Updated for version 3.3.0.
+academic/evopedia_qt: Fix MD5SUM.
+academic/fet: Updated for version 5.28.2.
+academic/gretl: Updated for version 2015d.
+academic/jalview: Fix DOWNLOAD.
+academic/sequence-analysis: Fix DOWNLOAD.
+academic/speedcrunch: Fix DOWNLOAD.
+academic/wmcalc: Fix MD5SUM.
+academic/wxmacmolplt: Updated for version 7.6.1.
+accessibility/xdotool: Updated for version 3.20150503.1.
+audio/aj-snapshot: Fix DOWNLOAD.
+audio/puddletag: Fix DOWNLOAD.
+audio/qjackctl: Updated for version 0.4.1.
+business/openerp-client: Fix DOWNLOAD.
+business/openerp-server: Fix DOWNLOAD.
+desktop/gmusicbrowser-art: Update SOURCE.
+desktop/musca: Fix DOWNLOAD.
+desktop/obkey: Update SOURCE url.
+desktop/openbox-simple-theme: Updated for version 20151025.
+development/Cython: Updated for version 0.23.4.
+development/LLgen: Fix DOWNLOAD.
+development/bmake: Updated for version 20151020.
+development/dfu-programmer: Fix DOWNLOAD.
+development/dwarf: Added (produce DWARF debug information).
+development/google-appengine-gosdk: Updated for version 1.9.27.
+development/google-appengine-pysdk: Updated for version 1.9.27.
+development/gpsim: Fix DOWNLOAD.
+development/idea: Fix DOWNLOAD.
+development/ioncube-loader: Fix DOWNLOAD.
+development/jsmin: Added (The JavaScript Minifier).
+development/kconfig-frontends: Added (kconfig language frontends).
+development/monodevelop-database: Updated for version 5.9.8.0.
+development/monodevelop: Updated for version 5.9.8.0.
+development/ninja: Added (small build system with a focus on speed).
+development/nuget: Added (Package manager).
+development/oniguruma: Added (Regular expressions library).
+development/p4: Updated for version 2015.2.1252060.
+development/php-apcu: Added (userland caching).
+development/pyvim: Updated for version 0.0.11.
+development/scons: Updated for version 2.4.0.
+development/universal-ctags: Updated for version b9f911c.
+development/visual-studio-code: Added (Development IDE).
+development/zed: Added (text and code editor).
+games/UrbanTerror: Fix DOWNLOAD.
+games/adom: Updated for version r60.
+games/bluemoon: Fix DOWNLOAD and MD5SUM.
+games/galaxyv2: Fix MD5SUM, add -j1.
+games/goonies: Fix DOWNLOAD.
+games/lgogdownloader: Updated for version 2.26.
+games/mgba: Fix MD5SUM.
+games/mog: Fix DOWNLOAD.
+games/nsudoku: Updated for version 1.3.
+games/roadfighter: Fix DOWNLOAD.
+games/taipan: Added (turn-based strategy game).
+gis/rasterio: Updated for version 0.29.0.
+graphics/freewrl: Fix MD5SUM.
+graphics/phatch: Fix DOWNLOAD.
+graphics/xcalib: Fix DOWNLOAD.
+graphics/yed: Fix DOWNLOAD.
+ham/dxcc: Fix DOWNLOAD and MD5SUM.
+ham/tqsl: Fix DOWNLOAD.
+ham/xdemorse: Fix MD5SUM.
+ham/xfhell: Fix MD5SUM.
+ham/xpsk31: Fix MD5SUM.
+ham/xwxapt: Fix MD5SUM.
+libraries/DirectFB: Fix DOWNLOAD.
+libraries/HawkNL: Fix DOWNLOAD.
+libraries/botocore: Updated for version 1.3.1.
+libraries/dropbox-python: Updated for version 3.38.
+libraries/gallerize: Fix DOWNLOAD.
+libraries/libsearpc: Updated for version 3.0.7.
+libraries/libsidplayfp: Updated for version 1.8.2.
+libraries/mujs: Added (javascript interpreter).
+libraries/pyPEG2: Updated for version 2.15.2.
+libraries/pyqode.widgets: Fix DOWNLOAD.
+libraries/rhino: Fix DOWNLOAD.
+libraries/utfcpp: Fix MD5SUM.
+misc/moreutils: Added (unix tools).
+misc/par2cmdline-tbb: Fix DOWNLOAD.
+misc/par: Fix DOWNLOAD.
+multimedia/HandBrake: Fix DOWNLOAD.
+multimedia/cinelerra: Updated to use internal ffmpeg by default.
+multimedia/lwks: Updated for version 12.5.0.
+multimedia/mythplugins: Fix DOWNLOAD.
+multimedia/mythtv: Fix DOWNLOAD.
+multimedia/picard-plugins: Updated for version 20151029.
+multimedia/plexmediaserver: Updated for version 0.9.12.18.1520.
+multimedia/vivaldi-codecs-ffmpeg-extra: Added (ffmpeg codec).
+network/FireWorks: Fix DOWNLOAD.
+network/awscli: Updated for version 1.9.1.
+network/bozohttpd: Added (simple and lightweight HTTP server).
+network/ccnet: Updated for version 4.4.4.
+network/glassfish: Fix DOWNLOAD.
+network/hostapd: Updated for version 2.5.
+network/insync: Updated for version 1.3.2.36049.
+network/kasp_updater: Fix DOWNLOAD.
+network/kcm_ufw: Fix DOWNLOAD.
+network/konversation: Fix DOWNLOAD.
+network/loiq: Fix DOWNLOAD.
+network/malheur: Added (automatic analysis of malware behaviour).
+network/megasync: Revert back to Debian 7 packages.
+network/netperf: Fix DOWNLOAD.
+network/owncloud-client: Updated for version 2.0.2.
+network/policyd2: Fix DOWNLOAD.
+network/prosody: Updated for version 0.9.8.
+network/seafile-client: Updated for version 4.4.4.
+network/seafile-server: Updated for version 4.4.4.
+network/seahub: Updated for version 4.4.4.
+network/tornado: Updated for version 4.2.1.
+network/unicornscan: Fix DOWNLOAD.
+network/verlihub: Fix DOWNLOAD.
+network/vivaldi: Updated for version 1.0.303.27_1.
+network/you-get: Updated for version 0.4.111.
+network/youtube-dl: Updated for version 2015.10.24.
+office/kate-latex-plugin: Added (LaTeX plugin for Kate).
+office/openoffice.org: Updated for version 4.1.2.
+office/pyspread: Updated for version 1.0.
+office/verbiste: Fix DOWNLOAD.
+office/xmind: Fix DOWNLOAD.
+perl/perl-WWW-Curl: Added (RDBMS perl module).
+perl/perl-config-general: Updated for version 2.60.
+perl/perl-text-unaccent: Added (perl module).
+python/monty: Updated for version 0.7.1.
+python/plaso: Fix DOWNLOAD.
+python/prompt_toolkit: Updated for version 0.54.
+python/ps_mem: Added (list processes by memory usage).
+python/ptpython: Updated for version 0.25.
+python/python3: Updated for version 3.5.0.
+python/regex: Updated for version 2015.10.22.
+system/adobe-source-code-pro-font: Fix DOWNLOAD.
+system/asbt: Updated for version 1.7.2.
+system/barman: Fix DOWNLOAD.
+system/fs-uae-arcade: Updated for version 2.6.2.
+system/fs-uae-launcher: Updated for version 2.6.2.
+system/fs-uae: Updated for version 2.6.2.
+system/glances: Updated for version 2.5.1.
+system/hebe: Fix DOWNLOAD.
+system/herculesstudio: Fix DOWNLOAD.
+system/i2c-tools: Fix DOWNLOAD.
+system/lbrate: Fix DOWNLOAD.
+system/logtool: Added (log analyzer).
+system/mdocml: Updated for version 1.13.3.
+system/mlterm: Updated for version 3.6.0.
+system/monit: Updated for version 5.15.
+system/ms-sys: Added (writes Microsoft compatible boot records).
+system/nix: Added (package manager).
+system/nomarch: Fix DOWNLOAD.
+system/parallel: Updated for version 20151022.
+system/s3ql: Fixed README.
+system/samhain: Fix DOWNLOAD.
+system/slack: Removed obsolete package.
+system/unac: Added (remove accents from text).
++--------------------------+
+Sat Oct 24 00:57:52 UTC 2015
+academic/Xyce: Update README.
+academic/labplot2: Update DOWNLOAD url.
+academic/maxima: Updated for version 5.37.2.
+academic/mendeleydesktop: Updated for version 1.15.
+audio/xmms-scrobbler: Update DOWNLOAD url.
+desktop/anki: Updated for version 2.0.33.
+desktop/awemenugen: Added (Awesome Menu Generator).
+desktop/openbox-simple-theme: Added (Desktop themes).
+desktop/velox: Added (simple window manager).
+development/SQLAlchemy: Updated for version 1.0.9.
+development/cgit: Fixed download url.
+development/cppcms: Update DOWNLOAD url.
+development/cppdb: Update DOWNLOAD url.
+development/google-webdesigner: Updated for version 1.1.7.0.
+development/ign-math2: Added (math library).
+development/ignition-math: Added (math library).
+development/universal-ctags: Added (generate tag files).
+games/KoboDeluxe: Update EMAIL.
+games/hedgewars: Update EMAIL.
+games/instead: Updated for version 2.3.0.
+gis/postgis: Fix possible parallel build failure and update README.
+graphics/CairoSVG: Updated for version 1.0.18.
+graphics/darktable: Updated for version 1.6.9.
+graphics/freewrl: Added (3D Viewer).
+graphics/paraview: Update README.
+libraries/cffi: Updated for version 1.3.0.
+libraries/collada-dom: Update DOWNLOAD url.
+libraries/ffms2: Updated for version 2.22.
+libraries/leptonica: Updated for version 1.72.
+libraries/libkvkontakte: Fix typo.
+libraries/liburcu: Updated for version 0.9.1.
+libraries/pexpect: Updated for version 4.0.1.
+multimedia/TeamSpeak3: Updated for version 3.0.18.1.
+multimedia/cinelerra: Updated for version cv_2.3.
+multimedia/gpac: Updated for version git20151020.
+network/bwm-ng: Updated for version 0.6.1.
+network/megasync: Updated for version 2.3.1.
+network/owncloud-server: Updated for version 8.2.0.
+network/python-onedrive: Updated for version 15.10.5.
+network/telegram: Updated for version 0.9.6.
+network/vivaldi: Updated for version 1.0.300.5_1.
+network/wput: Update DOWNLOAD url.
+network/youtube-dl: Updated for version 2015.10.18.
+office/dymo-cups-drivers: Added (CUPS drivers and filters).
+perl/perl-CPANPLUS: Updated for version 0.9156.
+perl/perl-Sidef: Updated for version 0.11.
+perl/perl-Sys-Mmap: Updated for version 0.17 + new maintainer.
+python/dhcpy6d: Update README about optional dependencies.
+python/s3cmd: Updated for version 1.6.0.
+system/Iosevka: Updated for version 0.1.15.
+system/advcopy: Added (mod for the GNU cp and GNU mv tools).
+system/cantarell-fonts: Updated for version 0.0.17.2.
+system/netatop: Updated for version 0.7.
+system/ohsnap: Added (monospaced font).
+system/passwordsafe: Updated for version 0.97BETA.
+system/pdfgrep: Updated for version 1.4.1.
+system/pngcrush: Updated for version 1.7.87.
+system/postgresql: Updated for version 9.4.5.
+system/tmuxp: Updated for version 0.9.2.
+system/unhide: Update EMAIL.
+system/xdiskusage: Added (show disk usage).
+system/yash: Added (POSIX-compliant command line shell).
++--------------------------+
+Sun Oct 18 00:24:08 UTC 2015
+academic/Mnemosyne: Updated for version 2.3.4.
+academic/gwyddion: Updated for version 2.42.
+academic/stellarium: Updated for version 0.13.3.
+audio/ff8dls: Fix download URL.
+audio/pulseaudio: Handle bash-completion.
+audio/vocoder-ladspa: Update download URL.
+desktop/awesome-extra: Added (additional modules for awesome WM).
+desktop/openbox-simple-theme: Updated for version 20151010.
+desktop/plank: Updated for version 0.10.1.
+desktop/recoll: Updated for version 1.21.2.
+desktop/xfce4-timer-plugin: Added (Timer Plugin).
+desktop/yad: Updated for version 0.31.2.
+development/brackets: Updated for version 1.5.
+development/eclipse-cpp: Updated for version 4.5.1.
+development/eclipse-java: Updated for version 4.5.1.
+development/eclipse-jee: Updated for version 4.5.1.
+development/jam: Update DOWNLOAD url.
+development/monodevelop-database: Updated for version 5.7.0.660.
+development/monodevelop-debugger-gdb: Removed (Now in monodevelop).
+development/monodevelop: Updated for version 5.7.0.660.
+development/xtruss: Updated for version 20150926.f43ba98.
+games/ags: Updated for version 3.3.4.2.
+games/mednafen: Updated for version 0.9.38.7.
+games/nestopia: Update README.
+games/qstat: Updated for version 585f4c1.
+games/teeworlds: Update script.
+gis/OTB: Remove mapnik as an optional dependency.
+gis/postgis: Updated for version 2.2.0.
+graphics/CairoSVG: Updated for version 1.0.17.
+graphics/blender: Updated for version 2.76.
+graphics/dia: Build HTML documentation.
+graphics/digikam: Updated to version 4.14.0.
+graphics/gimp-plugin-bimp: Updated for version 1.16.
+haskell/hscolour: Update DOWNLOAD url.
+libraries/botocore: Updated for version 1.2.10.
+libraries/dropbox-python: Updated for version 3.37.
+libraries/hidapi: Added (Library to access HID devices).
+libraries/irrlicht: Updated for version 1.8.3.
+libraries/libaacs: Updated for version 0.8.1.
+libraries/libbluray: Updated for version 0.9.0.
+libraries/libkface: Added (KDE face recognition wrapper library).
+libraries/libkvkontakte: Updated for version 4.12.0.
+libraries/libu2f-host: Added (Yubico 2UF C Library).
+libraries/live555: Updated for version 2015.10.12.
+libraries/xapian-core: Updated for version 1.2.21.
+misc/po4a: Update VERSION.
+multimedia/bino: Added (3D video player).
+multimedia/flashplayer-plugin: Updated for version 11.2.202.540.
+multimedia/obs-studio: Updated for version 0.12.0.
+network/awscli: Updated for version 1.8.12.
+network/bitcoin: Updated for version 0.11.1.
+network/google-cli: Updated for version 1.8.
+network/gtk-gnutella: Updated for version 1.1.5.
+network/icecat: Updated for version 38.3.0.
+network/iojs: Updated for version 4.2.1.
+network/otter: Updated for version 0.9.07.
+network/palemoon: Updated for version 25.7.3.
+network/pidgin-skypeweb: Updated for version 256e64d.
+network/python-onedrive: Updated for version 15.10.3.
+network/qTox: Updated for version 20151011.
+network/tixati: Updated for version 2.21_1.
+network/vivaldi: Updated for version 1.0.291.18.
+network/youtube-dl: Updated for version 2015.10.13.
+network/znc: Updated for version 1.6.1.
+office/unoconv: Updated for version 0.7.
+python/dhcpy6d: Added (DHCPv6 server daemon).
+python/npyscreen: Updated for version 4.10.5.
+python/pbr: Updated for version 1.8.1.
+python/psutil: Updated for version 3.2.2.
+python/pytest: Updated for version 2.8.2.
+python/python-requests: Updated for version 2.8.1.
+python/regex: Updated for version 2015.10.05.
+python/six: Updated for version 1.10.0.
+python/stevedore: Updated for version 1.9.0.
+system/argyllcms: Added (Argyll Color Management System).
+system/dar: Updated for version 2.5.0.
+system/intel-microcode: Update script.
+system/jq: Update DOWNLOAD url.
+system/openrc-services: Updated for version 20151010.
+system/openrc: Updated for version 0.18.3.
+system/slpkg: Updated for version 3.0.0.
+system/spl-solaris: Updated for version 0.6.5.3.
+system/unrtf: Updated for version 0.21.7.
+system/zfs-on-linux: Updated for version 0.6.5.3.
++--------------------------+
+Sat Oct 10 02:17:27 UTC 2015
+academic/GeoGebra: Updated for version 5.0.156.0.
+academic/fet: Updated for version 5.28.0.
+audio/pulseaudio: Updated for version 7.0.
+desktop/catfish: Updated for version 0.3.2.
+desktop/compton-conf: Update script.
+desktop/openbox-simple-theme: Added (Desktop themes).
+development/FreeBASIC: Update script.
+development/WebStorm: Added (HTML5 + JavaScript IDE).
+development/mono: Updated for version 3.12.1.
+development/p4: Updated for version 2015.1.1240625.
+development/robomongo: Fix build on x86_64.
+development/sbcl: Fix SBCL_HOME variable.
+development/simulavr: Fix VERSION.
+development/textadept: Updated for version 8.3.
+games/glxosd: Updated for version 2.5.0.
+games/ifm: Added (Interactive fiction mapper).
+games/tt: Added note to README.
+games/tworld: Updated for version 1.3.2.
+gis/qgis: Added support for latest qwt.
+graphics/jp2a: Added (Image converter).
+libraries/dropbox-python: Updated for version 3.36.
+libraries/libvirt-python: Updated for version 1.2.20.
+libraries/libvirt: Updated for version 1.2.20.
+libraries/qwt: Updated for version 6.1.2 + new maintainer.
+libraries/qwtpolar: Added (Qwt/Qt Polar Plot Library).
+misc/Colormake: Added (a simple wrapper to colorize the output).
+misc/glogg: Updated for version 1.0.2.
+misc/po4a: Updated for version 0.47.
+misc/yubikey-personalization-gui: Updated for version 3.1.23.
+multimedia/makemkv: Updated for version 1.9.7.
+network/Pafy: Updated for version 0.4.1.
+network/aria2: Updated for version 1.19.2.
+network/dropbox: Updated for version 3.10.7.
+network/flexget: Updated for version 1.2.358.
+network/google-cli: Updated for version 1.7.
+network/iojs: Updated for version 4.1.2.
+network/opensmtpd: Updated for version 5.7.3p1.
+network/python-onedrive: Updated for version 15.10.1.
+network/qTox: Updated for version 20151007.
+network/tnftp: Updated for version 20151004.
+network/toxcore: Updated for version 20150915.
+network/vivaldi: Updated for version 1.0.288.3_1.
+network/you-get: Updated for version 0.3.36.
+network/youtube-dl: Updated for version 2015.10.09.
+office/MasterPDFEditor: Updated for version 3.4.12.
+perl/perl-Encode-JISX0213: Updated for version 0.04.
+perl/perl-MIME-Charset: Updated for version 1.012.
+perl/perl-Module-ScanDeps: Updated for version 1.20.
+perl/perl-Text-Hyphen: Updated for version 0.12.
+perl/perl-Unicode-LineBreak: Updated for version 2015.07.16.
+python/jmespath: Updated for version 0.9.0.
+python/monty: Updated for version 0.7.0.
+python/path.py: Updated for version 8.1.2.
+python/pytest: Updated for version 2.8.1.
+python/regex: Updated for version 2015.10.01.
+python/selenium: Updated for version 2.48.0.
+system/bicon: Added (a Bidirectional Console).
+system/cantarell-fonts: Updated for version 0.0.17.
+system/ciopfs: Added (case insensitive FUSE filesystem).
+system/cool-retro-term: Removed (not compatible with qt-5.5.x).
+system/dahdi-complete: Added (DAHDI hardware drivers for Asterisk).
+system/exfat-utils: Updated for version 1.2.1.
+system/fuse-exfat: Updated for version 1.2.1.
+system/hack-font-ttf: Added (font).
+system/multitail: Updated for version 6.4.2.
+system/munin-node: Added (Statistics gathering client for Munin).
+system/partclone: Added (utility to clone various filesystems).
+system/pyarchey: Updated for version 0.6.7.
+system/trmaid: Updated for version 0.6.2.
+system/usermin: Updated for version 1.680.
+system/webmin: Updated for version 1.770.
++--------------------------+
+Sat Oct  3 02:18:32 UTC 2015
+audio/pogo: Updated for version 0.8.6.
+audio/pyalsaaudio: Fix DOWNLOAD url.
+desktop/gmusicbrowser-art: Added (Additional layouts, icons).
+desktop/tint2: Updated for version 0.12.2.
+development/FreeBASIC: Updated for version 1.04.0.
+development/composer: Added (tool for dependency management in PHP).
+development/git-lfs: Updated for version 1.0.0.
+development/google-go-lang: Updated for version 1.4.3.
+development/ioncube-loader: Updated for version 5.0.18.
+development/poedit: Updated for version 1.8.5.
+development/sbcl: Updated for version 1.2.16 + new maintainer.
+development/simulavr: Updated for version git20150924.
+development/smartgit: Updated for version 7.0.3.
+games/angband: Updated for version 4.0.2.
+games/ggmud: Added (console MUD client).
+games/stone_soup: Updated for version 0.16.2.
+gis/rasterio: Updated for version 0.27.0.
+graphics/ufraw: Updated for version 0.22.
+libraries/BeautifulSoup4: Updated for version 4.4.1.
+libraries/dropbox-python: Updated for version 3.34.
+libraries/luaexpat: Fix slack-desc.
+libraries/php-memcached: Fixed HOMEPAGE.
+misc/ykpers: Updated for version 1.17.2.
+misc/yubikey-personalization-gui: Updated for version 3.1.22.
+multimedia/devedeng: Updated for version 4.2.
+multimedia/kodi: Fix build on x86.
+multimedia/makemkv: Updated for version 1.9.6.
+multimedia/oggconvert: Fixed download link.
+network/aria2: Updated for version 1.19.1.
+network/httptunnel: Fix download link.
+network/libnftnl: Updated for version 1.0.5.
+network/mod_bw: Added (apache module).
+network/nft: Updated for version 0.5.
+network/opensmtpd: Updated for version 5.7.2p1.
+network/palemoon: Updated for version 25.7.1.
+network/phpmyadmin: Updated for version 4.4.15.
+network/python-onedrive: Added (CLI interface for MS OneDrive).
+network/vivaldi: Updated for version 1.0.283.8_1.
+network/youtube-dl: Updated for version 2015.09.28.
+perl/perl-Number-Bites-Human: Added (Perl Modules).
+python/Pygments: Updated for version 2.0.2.
+python/boto3: Updated for version 1.1.4.
+python/pypy: Updated for version 2.6.1.
+python/python-dateutil: Updated for version 2.4.2.
+python/python-oauth2client: Fixed slack-desc.
+python/python-unicodecsv: Updated for version 0.14.1.
+python/regex: Updated for version 2015.09.28.
+system/alien: Updated for version 8.95.
+system/barman: Updated for version 1.5.0.
+system/docker: Updated for version 1.8.2.
+system/opensc: Updated for version 0.15.0.
+system/pcsc-lite: Updated for version 1.8.14.
+system/redis: Updated for version 3.0.4.
+system/slpkg: Updated for version 2.9.5.
+system/spl-solaris: Updated for version 0.6.5.2.
+system/sysdig: Updated for version 0.2.0.
+system/udiskie: Updated for version 1.3.2.
+system/zfs-on-linux: Updated for version 0.6.5.2.
++--------------------------+
+Sat Sep 26 03:06:45 UTC 2015
+academic/copasi: Updated for version 4.16.104.
+desktop/LX-Colors-themes: Added (GTK2/GTK3/Openbox themes).
+desktop/jwm: Updated for version 2.3.2.
+desktop/perwindowlayoutd: Added (Keeps per window keyboard layout).
+desktop/plank: Added (Elegant, simple, clean dock).
+desktop/seafile-gui: Updated for version 4.3.4.
+desktop/superkey-launch: Updated for version 1.6.3.
+development/atom: Updated for version 1.0.19.
+development/kaaedit: Updated for version 0.44.0.
+development/pyvim: Updated for version 0.0.10.
+development/qt-creator3: Updated for version 3.5.0.
+development/rust: Updated for version 1.3.0.
+development/simulavr: Added (Atmel AVR Family Simulator).
+development/wheel: Updated for version 0.26.0.
+games/KAdventure: Fix DOWNLOAD url.
+games/astromenace: Added patch for newer freetype2.
+games/instead: Updated for version 2.2.7.
+games/mgba: Updated for version 0.3.0.
+games/minetest: Updated for version 0.4.13.
+games/minetest_game: Updated for version 0.4.13.
+games/naev: Updated for version 0.6.0.
+games/vbam: Update README.
+gis/Fiona: Updated for version 1.6.2.
+gis/SFCGAL: Updated for version 1.2.0.
+gis/gdal: Updated for version 1.11.3.
+graphics/gnofract4d: Update .info and script.
+libraries/CGAL: Updated for version 4.6.3.
+libraries/bamf: Added (Window matching library).
+libraries/botocore: Updated for version 1.2.5.
+libraries/dropbox-python: Updated for version 3.28.
+libraries/libjpeg-turbo: Updated for version 1.4.2.
+libraries/libspatialite: Update DOWNLOAD url.
+libraries/libwnck3: Added (Window Navigator Construction Kit).
+libraries/live555: Updated for version 2015.09.24.
+libraries/php-memcached: Added (PHP extension for memcached).
+misc/mosquitto: Updated for version 1.4.4.
+misc/rarcrack: Added (Password cracker for rar archives).
+multimedia/flashplayer-plugin: Updated for version 11.2.202.521.
+multimedia/plexmediaserver: Updated for version 0.9.12.
+multimedia/yarock: Updated for version 1.1.4.
+network/Flootty: Updated for version 3.1.7.
+network/awscli: Updated for version 1.8.7.
+network/ccnet: Updated for version 4.4.0.
+network/connman: Updated for version 1.30.
+network/flexget: Updated for version 1.2.354.
+network/iojs: Updated for version 4.1.1.
+network/owncloud-server: Updated for version 8.1.3.
+network/pidgin-opensteamworks: Updated for version 1.6.1.
+network/seafile-client: Updated for version 4.4.0.
+network/seafile-server: Updated for version 4.4.0.
+network/speedtest-cli: Updated for version 0.3.4.
+network/tor-browser: Updated for version 5.0.3.
+network/vivaldi: Updated for version 1.0.279.3_1.
+network/you-get: Updated for version 0.3.35.
+network/youtube-dl: Updated for version 2015.09.22.
+network/youtube-upload: Added (YouTube command-line upload utility).
+office/libreoffice-helppack: Updated for version 5.0.2.
+office/libreoffice-langpack: Updated for version 5.0.2.
+office/libreoffice: Updated for version 5.0.2.
+office/texstudio: Updated for version 2.10.2.
+perl/perl-Term-ReadLine-Gnu: Updated for version 1.28.
+python/APScheduler: Updated for version 3.0.3.
+python/autopep8: Updated for version 1.2.1.
+python/google-api-python-client: Updated for version 1.5.1.
+python/jmespath: Updated for version 0.8.0.
+python/prompt_toolkit: Updated for version 0.52.
+python/ptpython: Updated for version 0.24.
+python/purl: Updated for version 1.1.
+python/python-oauth2client: Added (YouTube CL upload utility).
+python/python-unicodecsv: Updated for version 0.14.0.
+python/python-uri-templates: Added (URI Template).
+python/regex: Updated for version 2015.09.23.
+system/adobe-source-han-sans-fonts: Updated for version 1.004R.
+system/fs-uae-arcade: Updated for version 2.6.1.
+system/fs-uae-launcher: Updated for version 2.6.1.
+system/fs-uae: Updated for version 2.6.1.
+system/geoclue: Fix download url.
+system/gitolite: Fix helper script.
+system/parallel: Updated for version 20150922.
+system/pyarchey: Updated for version 0.6.6.
+system/secure-delete: Update patch.
+system/slackchlog: Added (Slackware's ChangeLog viewer).
+system/slpkg: Updated for version 2.9.4.
+system/spl-solaris: Updated for version 0.6.5.1.
+system/zfs-on-linux: Updated for version 0.6.5.1.
++--------------------------+
+Sat Sep 19 12:50:32 UTC 2015
+academic/Xyce: Added (Xyce Parallel Electronic Simulator).
+academic/galculator: Updated for version 2.1.4.
+audio/gmusicbrowser: Updated for version 1.1.14.
+audio/pulseaudio: Make bash completion script posix friendly.
+audio/sbc: Added (Bluetooth low-complexity, subband codec).
+audio/tta: Added (TTA lossless audio codec).
+audio/ttaenc: Updated for version 3.4.1.
+desktop/ede: Fix build with jam.
+desktop/faba-icon-theme: Updated for version 4.0.8.
+desktop/faba-mono-icons: Update README and DEPS.
+desktop/j4-dmenu-desktop: Updated for version 2.13.
+desktop/moka-icon-theme: Updated for version 5.0.11.
+desktop/moka-minimal: Update script.
+desktop/moka-themes: Update script.
+desktop/orchis-gtk-theme: Added (Modern GTK Theme for Linux).
+desktop/xdgmenumaker: Updated for version 0.8.
+development/eric: Update DOWNLOAD url.
+development/p4: Updated for version 2015.1.1227227.
+development/smartgit: Updated for version 7.0.2.
+development/wheel: Updated for version 0.25.0.
+games/alephone: Updated for version 20150620.
+games/chocolate-doom: Updated for version 2.2.1.
+games/chocolate_duke3D: Updated for version dd8db65.
+games/freeorion: Updated for version 0.4.5.
+games/marathon-data: Updated for version 20150620.
+games/marathon-infinity-data: Updated for version 20150620.
+games/marathon2-data: Updated for version 20150620.
+games/pybik: Added (puzzle game).
+games/qstat: Updated for version 8a7b2d9.
+games/xroar: Updated for version 0.33.2.
+gis/pdal: Updated for version 1.0.1.
+graphics/dia: Updated for version 0.97.3 + new maintainer.
+graphics/grafx2: Added (256-color bitmap paint program).
+graphics/openimageio: Updated for version 1.5.19.
+haskell/hscolour: Updated for version 1.23.
+libraries/DevIL: Builts ILU and ILUT.
+libraries/botocore: Updated for version 1.2.3.
+libraries/discogs-client: Updated for version 2.2.1.
+libraries/dropbox-python: Updated for version 3.27.
+libraries/jbig2dec: Updated for version 0.12, updated HOMEPAGE.
+libraries/libffado: Update DOWNLOAD url.
+libraries/libgme: Added (a video game music library).
+libraries/libharu: Added (library for generating PDF files).
+libraries/libva-intel-driver: Updated for version 1.6.1.
+libraries/pyPEG2: Added (simple intrinsic parser interpreter).
+libraries/qt5: Updated for version 5.5.0.
+libraries/trilinos: Downgraded for version 11.10.2.
+libraries/unixODBC: Updated for version 2.3.4.
+misc/jstock: Updated for version 1.0.7.10.
+multimedia/ExMplayer: Updated for version 5.0.1.
+multimedia/Mopidy: Updated for version 1.1.1.
+multimedia/lives: Updated for version 2.4.2.
+multimedia/whistle: Added (ncurses audio player).
+network/awscli: Updated for version 1.8.5.
+network/bmon: Updated for version 3.8.
+network/flexget: Updated for version 1.2.352.
+network/sftp-cloudfs: Added (SFTP interface).
+network/sphinx: Updated for version 2.2.10.
+network/teamviewer: Updated for version 10.0.46203.
+network/vivaldi: Updated for version 1.0.275.3_1.
+network/weathercli: Update script.
+network/youtube-dl: Updated for version 2015.09.09.
+office/JabRef: Update DOWNLOAD url.
+office/MasterPDFEditor: Updated for version 3.4.03.
+office/fbpdf: Fix build with mupdf-1.7a.
+office/mupdf: Fix build with jbig2dec-0.12
+office/texmacs: Updated for version 1.99.2.
+office/texmaker: Fix for Qt 5.5.x and newer.
+office/texstudio: Updated for version 2.10.0.
+office/zathura-pdf-mupdf: Updated for version 0.2.8.
+perl/perl-Sidef: Updated for version 0.10.
+perl/perl-TeX-Hyphen: Added (hyphenate words using TeX's patterns).
+perl/perl-extutils-makemaker: Updated for version 7.10.
+python/pymysql: Updated for version 0.6.6.
+python/pytest: Updated for version 2.7.3.
+python/python-future: Updated for version 0.15.2.
+python/python-keyring: Added (Python keyring library).
+python/python-requests-kerberos: Added (authentication handler).
+python/regex: Updated for version 2015.09.15.
+python/selenium: Updated for version 2.47.3.
+system/Iosevka: Updated for version 0.1.11.
+system/fio: Updated for version 2.2.10.
+system/goaccess: Updated for version 0.9.4.
+system/mongo-tools: Updated for version 3.1.7.
+system/mongodb: Updated for version 3.0.6.
+system/monitorix: Updated for version 3.8.0.
+system/ofono: Added (open source telephony).
+system/refind: Updated for version 0.9.1.
+system/s3ql: Updated for vesion 2.15.
+system/scanmem: Updated for version 0.15.2.
+system/sdl-jstest: Updated for version 20150806git.
+system/slpkg: Updated for version 2.9.1.
+system/spl-solaris: Updated for version 0.6.5.
+system/sysdig: Fix building against newer jsoncpp.
+system/trmaid: Updated for version 0.5.7.
+system/zfs-on-linux: Updated for version 0.6.5.
++--------------------------+
+Sat Sep 12 01:12:12 UTC 2015
+academic/parmetis: Added (parallel library).
+audio/apulse: Allow GPLv2.
+audio/cmt: Update homepage and download URLs.
+audio/flacon: Added (Audio File Encoder).
+audio/patchage: Allow GPLv2.
+audio/tagtool: Allow GPLv2.
+desktop/cellwriter: Allow GPLv2.
+desktop/enlightenment: Allow GPLv2.
+desktop/kde-gtk-config: Allow GPLv2.
+desktop/neutral: Allow GPLv2.
+desktop/py3status: Updated for version 2.6.
+desktop/sun: Updated for version 1.1.4.
+desktop/superkey-launch: Allow GPLv2.
+development/astyle: Allow GPLv2.
+development/bas55: Updated for version 1.04.
+development/bfg: Allow GPLv2.
+development/bigloo: Allow GPLv2.
+development/brackets: Allow GPLv2.
+development/colordiff: Allow GPLv2.
+development/enki: Allow GPLv2.
+development/gauche: Allow GPLv2.
+development/gisto: Allow GPLv2.
+development/gnustep-startup: Allow GPLv2.
+development/groovy: Allow GPLv2.
+development/hexedit: Allow GPLv2.
+development/jeex: Allow GPLv2.
+development/lighttable: Allow GPLv2.
+development/mcrl2: Allow GPLv2.
+development/mit-scheme: Allow GPLv2.
+development/mlton: Allow GPLv2.
+development/mono2: Allow GPLv2.
+development/rust: Updated for version 1.2.0.
+development/scons: Allow GPLv2.
+development/smalltalk: Allow GPLv2.
+development/spin: Allow GPLv2.
+development/src-vcs: Allow GPLv2.
+development/textadept: Allow GPLv2.
+development/thunderpad: Allow GPLv2.
+development/valgrind: Updated for version 3.10.1.
+development/xtruss: Updated for version 20150529.3149b74.
+games/KAdventure: Added (a simple 2D qt puzzle game).
+games/ValyriaTear: Allow GPLv2.
+games/doomsday: Updated for version 1.15.3.
+games/fgo: Update EMAIL.
+games/freeminer: Update script.
+games/gottet: Allow GPLv2.
+games/lgogdownloader: Updated for version 2.25.
+games/lutris: Allow GPLv2.
+games/xspacewarp: Allow GPLv2.
+games/yahtzee: Updated for version 1.6.
+games/yamagi-quake2: Updated for version 5.31.
+gis/pgrouting: Updated for version 2.1.0.
+graphics/autotrace: Added (Bitmap to vector graphics converter).
+graphics/digikam: Updated for version 4.13.0.
+graphics/jpegoptim: Allow GPLv2.
+graphics/mozjpeg: Allow GPLv2.
+graphics/pygraphviz: Updated for version 1.3.1.
+graphics/scrot: Allow GPLv2.
+libraries/batinfo: Update EMAIL.
+libraries/cracklib: Updated for version 2.9.6.
+libraries/dropbox-python: Updated for version 3.23.
+libraries/e_dbus: Allow GPLv2.
+libraries/ecore: Allow GPLv2.
+libraries/edje: Allow GPLv2.
+libraries/eet: Allow GPLv2.
+libraries/efreet: Allow GPLv2.
+libraries/eina: Allow GPLv2.
+libraries/eio: Allow GPLv2.
+libraries/embryo: Allow GPLv2.
+libraries/evas: Allow GPLv2.
+libraries/frei0r: Fix building against the newer opencv.
+libraries/ftplib: Update EMAIL.
+libraries/ganv: Allow GPLv2.
+libraries/jsoncpp: Updated for version 1.6.5.
+libraries/libdbusmenu: Added (library for passing menus over DBus).
+libraries/libuchardet: Added (encoding detector library).
+libraries/libucil: Update EMAIL.
+libraries/libunicapgtk: Update EMAIL.
+libraries/libva: Updated for version 1.6.1.
+libraries/libzdb: Updated for version 3.1.
+libraries/poco: Updated for version 1.6.1.
+libraries/pymdstat: Update EMAIL.
+libraries/python-e_dbus: Allow GPLv2.
+libraries/python-ecore: Allow GPLv2.
+libraries/python-edje: Allow GPLv2.
+libraries/python-elementary: Allow GPLv2.
+libraries/python-emotion: Allow GPLv2.
+libraries/python-ethumb: Allow GPLv2.
+libraries/python-evas: Allow GPLv2.
+libraries/qutepart: Allow GPLv2.
+misc/wcd: Allow GPLv2.
+multimedia/coriander: Update EMAIL.
+multimedia/dvdauthor: Patched for x86_64.
+multimedia/exaile: Allow GPLv2.
+multimedia/nightingale: Allow GPLv2.
+multimedia/picard-plugins: Updated for version 20150827.
+multimedia/spotify32: Allow GPLv2.
+multimedia/spotify64: Allow GPLv2.
+multimedia/ucview: Update EMAIL.
+multimedia/vlc: Patched for opencv 3.0.
+network/arno-iptables-firewall: Update EMAIL.
+network/bottle: Update EMAIL.
+network/connman: Allow GPLv2.
+network/copy: Allow GPLv2.
+network/econnman: Allow GPLv2.
+network/google-cli: Updated for version 1.6.
+network/hipchat: Allow GPLv2.
+network/iojs: Allow GPLv2.
+network/ipscan: Added (fast and friendly network scanner).
+network/irssi_otr: Handle github vXXX.tar.gz filename.
+network/licq: Allow GPLv2.
+network/openvswitch: Updated for version 2.3.2.
+network/owncloud-client: Updated for version 2.0.1.
+network/shorewall-core: Updated for version 4.6.13.
+network/shorewall6: Updated for version 4.6.13.
+network/shorewall: Updated for version 4.6.13.
+network/uget: Updated for version 2.0.1, updated script.
+network/vivaldi: Updated for version 1.0.270.16_1.
+network/youtube-dl: Updated for version 2015.09.03.
+network/yturl: Updated for version 1.20.0, update man page.
+office/mdp: Allow GPLv2.
+perl/perl-Image-Info: Update DEP.
+perl/perl-Sidef: Updated for version 0.09.
+perl/perl-Term-ReadLine-Gnu: Updated for version 1.27.
+perl/perl-data-dump: Updated for version 1.23.
+perl/perl-extutils-makemaker: Updated for version 7.08.
+python/easygui: Updated for version 0.97.4.
+python/path.py: Updated for version 8.1.1.
+python/psutil: Updated for version 3.2.1.
+python/py3sensors: Update EMAIL.
+python/pyglet: Updated for version 1.2.4.
+python/python-certifi: Updated for version 2015.9.6.2.
+python/python-future: Updated for version 0.15.1.
+python/python-lhafile: Updated for version 0.2.1.
+python/python-swiftclient: Updated for version 2.6.0.
+python/python3-defusedxml: Added (XML bomb protection).
+python/python3-dugong: Added (HTTP 1.1 communication API).
+python/python3-lhafile: Updated for version 0.2.1.
+python/python3-pycrypto: Added (The Python Cryptography Toolkit).
+system/betty: Allow GPLv2.
+system/cabextract: Fix DOWNLOAD url.
+system/ded: Updated for version 20150704.
+system/glances: Update EMAIL.
+system/inxi: Updated for version 2.2.28.
+system/komparator4: Allow GPLv2.
+system/luckybackup: Updated for version 0.4.8 + new maintainer.
+system/man-db: Updated for version 2.7.3.
+system/man-pages-ja: Updated for version 20150815.
+system/openrc-services: Updated for version 20150906.
+system/pdfgrep: Updated for version 1.4.0.
+system/s3ql: Added (Online Storage File System).
+system/slpkg: Updated for version 2.8.7.
+system/sysdig: Updated for version 0.1.104.
+system/the_silver_searcher: Updated for version 0.31.0.
+system/tinyterm: Updated for version 0.5.8.
+system/tinyvm: Allow GPLv2.
+system/trmaid: Updated for version 0.5.6.
+system/vinterm: Update download URL.
++--------------------------+
+Sun Sep  6 06:11:58 UTC 2015
+audio/foo-yc20: Update HOMEPAGE and DOWNLOAD.
+games/opentyrian: Update HOMEPAGE.
+games/snes9x: Updated HOMEPAGE and DOWNLOAD.
+games/supermariowar: Updated HOMEPAGE.
+games/wolf4sdl: Updated HOMEPAGE and DOWNLOAD.
+libraries/libgit2: Updated for version 0.23.2.
+libraries/libvdpau: Updated for version 1.1.1.
+libraries/opencv: Fix path to opencv_contrib modules.
+network/dokuwiki: Updated for version 20150810a.
+network/vivaldi: Updated for version 1.0.264.3_1.
+python/python-certifi: Updated for version 2015.9.6.1.
+python/waitress: Updated for version 0.8.10.
+system/nvidia-driver: Updated for version 352.41.
+system/nvidia-kernel: Updated for version 352.41.
+system/nvidia-legacy304-driver: Updated for version 304.128.
+system/nvidia-legacy304-kernel: Updated for version 304.128.
+system/nvidia-legacy340-driver: Updated for version 340.93.
+system/nvidia-legacy340-kernel: Updated for version 340.93.
+system/qemu: Updated for version 2.4.0.
++--------------------------+
+Sat Sep  5 12:08:56 UTC 2015
+academic/fet: Updated for version 5.27.8.
+academic/suitesparse: Update DOWNLOAD url.
+academic/sword-data-kjv: Updated for version 1.7.4.
+academic/xiphos: Updated for version 4.0.4.
+audio/ladspa_sdk: Fix DOWNLOAD url.
+desktop/lumina: Updated for version 0.8.6.
+desktop/luna-wallpapers: Add more wallpapers.
+development/J-Link: Added (software and documentation for J-Link).
+development/bas55: Updated for version 1.03.
+development/byacc: Updated for version 20150711.
+development/pycharm: Updated for version 4.5.4.
+development/textadept: Updated for version 8.2.
+development/zeal: Update script and README.
+games/freeciv: Updated for version 2.5.1.
+games/freeminer: Updated for version 0.4.13.7.
+games/freeorion: Updated for version 0.4.5_rc3
+games/frotz: Updated for version 2.44.
+games/instead: Updated for version 2.2.5.
+games/openttd: Updated for version 1.5.2.
+games/pinball: Added (open source pinball simulator).
+games/triplea: Updated for version 1.8.0.9.
+games/voxelands: Update DOWNLOAD url.
+graphics/digikam: Patched against opencv 3.0.0.
+libraries/CGAL: Updated for version 4.6.2.
+libraries/exiftool: Updated for version 10.00.
+libraries/gtkhotkey: Added (hotkey handling for Gtk+ applications).
+libraries/jreen: Added (Asynchronious Jabber library).
+libraries/libpwquality: Added (password quality checking).
+libraries/libuv: Updated for version 1.7.3.
+libraries/libvirt-glib: Updated for version 0.2.2.
+libraries/libvirt-python: Updated for version 1.2.19.
+libraries/libvirt: Updated for version 1.2.19.
+libraries/msgpack-c: Updated for version 1.2.0.
+libraries/opencv: Updated for version 3.0.0.
+libraries/trilinos: Added (trilinos project).
+misc/dos2unix: Updated for version 7.3.
+misc/esniper: Added (a lightweight eBay sniping tool).
+multimedia/devede: Removed (replaced with devedeng).
+multimedia/devedeng: Added (create video CDs and DVDs).
+multimedia/farstream: Added (framework for conferencing protocols).
+multimedia/google-earth: Updated for latest version 7.1.4.1529.
+multimedia/mpv: Updated for version 0.10.0.
+multimedia/telepathy-farstream: Added (Telepathy client library).
+multimedia/telepathy-glib: Added (C library for Telepathy Clients).
+multimedia/telepathy-qt: Added (Library for Qt-based Telepathy).
+multimedia/tomahawk: Added (A new kind of music player).
+network/Electrum: Updated for version 2.4.4.
+network/cacti-spine: Updated for version 0.8.8f.
+network/cacti: Updated for version 0.8.8f.
+network/google-cli: Added (Google Search from command line).
+network/node: Updated for version 0.12.7.
+network/offlineimap: Updated for version 6.5.7.
+network/owncloud-client: Updated for version 2.0.0.
+network/owncloud-server: Updated for version 8.1.2.
+network/palemoon: Updated for version 25.7.0.
+network/purple-facebook: Updated for version 6a0a79182ebc.
+network/qTox: Updated for version 20150830.
+network/shibboleth-sp: Fix UID/GID.
+network/tor-browser: Updated for version 5.0.2.
+network/toxcore: Updated for version 20150808.
+network/vivaldi: Updated for version 1.0.258.3_1.
+network/zmap: Updated for version 2.1.0.
+office/MasterPDFEditor: Updated for version 3.3.20.
+office/fop: Updated for version 2.0.
+office/hunspell-pl: Added (Polish hunspell dictionary).
+perl/perl-ExtUtils-Install: Added (Handle perl modules).
+perl/perl-Text-Diff: Updated for version 1.43.
+perl/perl-extutils-makemaker: Updated for version 7.06.
+perl/perl-inc-latest: Update README about optional dependency.
+python/dulwich: Updated for version 0.10.1.
+python/hg-git: Updated for version 0.8.2.
+python/hgsubversion: Updated for version 1.8.2.
+python/path.py: Updated for version 8.1.
+python/pip: Updated for version 7.1.2.
+python/pysetuptools: Updated for version 18.2.
+python/virtualenv: Updated for version 13.1.2.
+ruby/passenger: Updated for version 5.0.16.
+ruby/rubygem-rack: Updated for version 1.6.4.
+system/Iosevka: Updated for version 0.1.10.
+system/adobe-source-serif-pro-font: Fix slack-desc.
+system/dar: Updated for version 2.4.18.
+system/exfat-utils: Updated for version 1.2.0.
+system/fuse-exfat: Updated for version 1.2.0.
+system/mlterm: Updated for version 3.5.1.
+system/mysql-utilities: Updated for version 1.6.2.
+system/pyarchey: Fix README typo.
+system/pycp: Added (cp and mv with a progressbar).
+system/redis: Updated for version 3.0.3.
+system/slpkg: Updated for version 2.8.2.
+system/spacefm: Updated for version 1.0.3.
+system/spl-solaris: Updated for version 0.6.4.2 + new maintainer.
+system/ttf-aller: Added (True Type Font).
+system/ttf-monaco: Added (True Type Font).
+system/ttf-mscorefonts: Removed (similar with webcore-fonts).
+system/ttf-open-sans: Added (True Type Font).
+system/ttf-roboto: Added (True Type Font).
+system/winetricks: Updated for version 20150826.
+system/zfs-on-linux: Updated for version 0.6.4.2 + new maintainer.
+system/zuluCrypt: Added (CLI and GUI frontend to cryptsetup).
++--------------------------+
+Sat Aug 29 09:59:06 UTC 2015
+network/filezilla: Revert slipped changes.
++--------------------------+
+Sat Aug 29 03:08:16 UTC 2015
+audio/minimodem: Updated for version 0.22.
+audio/qmmp-plugin-pack: Updated for version 0.8.6.
+audio/ttaenc: Added (TTA1 lossless audio encoder/decoder).
+audio/xmms-ctl: Added (CLI Controller for XMMS).
+desktop/gxkb: Updated for version 0.7.6.
+desktop/wmtimer: Update README.
+desktop/wmweather+: Update README.
+development/atom: Updated for version 1.0.7.
+development/avr8-burn-o-mat: Update MD5SUM.
+development/fuel: Updated for version 1.0.1.
+development/tiled-qt: Update MD5SUM.
+games/bastet: Update MD5SUM.
+games/bitfighter: Update DOWNLOAD url.
+games/chocolate_duke3D: Set permission.
+games/freeorion: Updated for version 0.4.5_rc1.
+games/pom1: Update MD5SUM.
+games/qstat: Updated for version 2daa7d27.
+games/redeclipse: Update MD5SUM.
+games/yahtzee: Update MD5SUM.
+gis/geos: Updated for version 3.5.0.
+graphics/fim: Update MD5SUM.
+graphics/gimp-plugin-bimp: Added (Batch Image Manipulation Plugin).
+graphics/qcad: Updated for version 3.9.8.0.
+libraries/SFML: Fix BUILD tag.
+libraries/boolstuff: Update MD5SUM.
+libraries/cffi: Updated for version 1.2.1.
+libraries/dropbox-python: Updated for version 3.14.
+libraries/http-parser: Updated for version 2.5.0.
+libraries/ioncube-loader: Update MD5SUM.
+libraries/jcal: Added (Jalali calender).
+libraries/libcec: Updated for version 3.0.1.
+libraries/libgit2: Updated for version 0.23.1.
+libraries/libuv: Updated for version 1.7.2.
+libraries/lua-zlib: Update MD5SUM.
+libraries/opensaml: Updated for version 2.5.5.
+libraries/platform: Added (support library).
+libraries/python-librtmp: Updated for version 0.3.0.
+libraries/xmltooling: Updated for version 1.5.6.
+misc/subsurface: Added patch for newer libgit2.
+multimedia/flvtool2: Update DOWNLOAD url.
+multimedia/kodi: Updated for version 15.1.
+multimedia/shotcut: Added (cross-platform video editor).
+multimedia/tvheadend: Added (PVR server).
+network/bitlbee: Fix restart command.
+network/freerapid: Fix compatibilities with new JDK.
+network/ftp-cloudfs: Updated for version 0.34.
+network/iojs: Downgraded to version 2.5.0.
+network/masscan: Added (Mass IP port scanner).
+network/palemoon: Fix symlink.
+network/pidgin-skypeweb: Updated for version 03ce2fa.
+network/purple-facebook: Updated for version 5727ffb502c7.
+network/remmina: Update MD5SUM.
+network/shibboleth-sp: Updated for version 2.5.5.
+network/vivaldi: Updated for version 1.0.252.3_1.
+network/wmnd: Update README.
+network/xdman: Added (download manager).
+network/youtube-dl: Updated for version 2015.08.23.
+office/libreoffice-helppack: Updated for version 5.0.1.
+office/libreoffice-langpack: Updated for version 5.0.1.
+office/libreoffice: Updated for version 5.0.1.
+perl/perl-Convert-BinHex: Updated for version 1.124.
+perl/perl-Crypt-OpenSSL-Bignum: Updated for version 0.06.
+perl/perl-Crypt-OpenSSL-Random: Updated for version 0.10.
+perl/perl-Date-Calc: Updated for version 6.4.
+perl/perl-IO-stringy: Updated for version 2.111.
+perl/perl-Image-Info: Updated for version 1.38.
+perl/perl-MIME-tools: Updated for version 5.506.
+perl/perl-Test-Pod: Updated for version 1.51.
+python/argcomplete: Updated for version 1.0.0.
+python/path.py: Update MD5SUM.
+python/python-augeas: Added (Python bindings for augeas).
+python/python-pyparted: Added (Python bindings for libparted).
+python/python3-augeas: Added (Python 3 bindings for augeas).
+python/python3-pyparted: Added (Python 3 bindings for libparted).
+system/Iosevka: Updated for version 0.1.7.
+system/augeas: Added (a configuration API).
+system/blocks: Added (Block Devices Conversion Tools).
+system/ddrescue-gui: Added (GUI for ddrescue).
+system/facter: Updated for version 3.0.2.
+system/lz4: Added (compression algorithm).
+system/maintboot: Added (runs commands outside of the current OS).
+system/parallel: Updated for version 20150822.
+system/pyarchey: Updated for version 0.6.2.
+system/slpkg: Updated for version 2.7.6.
+system/sysdig: Updated for version 0.1.103.
+system/tmuxp: Updated for version 0.9.1.
++--------------------------+
+Sat Aug 22 16:43:45 UTC 2015
+academic/R: Updated for version 3.2.2.
+academic/jpicedt: Fix VERSION.
+desktop/pspshrink: Added (ISO compressor for PSP games).
+desktop/seafile-gui: Updated for version 4.3.2.
+development/Cython-Kivy: Added (C bindings for Python).
+development/geany-plugins: Updated for version 1.25.
+development/geany: Updated for version 1.25
+development/jdk: Updated for version 8u60.
+development/meld3: Downgraded to 3.12.3.
+development/poedit: Updated for version 1.8.4.
+development/pyvim: Updated for version 0.0.8.
+development/zeal: Added (offline documentation browser).
+games/triplea: Updated for version 1.8.0.7.
+graphics/enblend-enfuse: Added LDFLAGS.
+graphics/hugin: Updated for version 2015.0.0.
+graphics/pngquant: Updated for version 2.5.1.
+libraries/Kivy: Update REQUIRES.
+libraries/SFML: Updated for version 2.3.1.
+libraries/botocore: Updated for version 1.1.9.
+libraries/cffi: Updated for version 1.2.0.
+libraries/libcangjie: Added (Library for Cangjie input method).
+libraries/libvirt-python: Updated for version 1.2.18.
+libraries/libvirt: Updated for version 1.2.18.
+libraries/tinyxml2: Updated for version 3.0.0.
+misc/mosquitto: Updated for version 1.4.3.
+misc/xca: Updated for version 1.3.0.
+multimedia/Mopidy: Updated for version 1.1.0.
+multimedia/beets: Updated for version 1.3.14.
+multimedia/guvcview: Updated for version 2.0.2.
+multimedia/lives: Updated for version 2.4.1.
+multimedia/picard-plugins: Updated for version 20150819.
+multimedia/yarock: Updated for version 1.1.3.
+network/Electrum: Updated for version 2.4.1.
+network/awscli: Updated for version 1.7.46.
+network/bitlbee-stream: Updated for version 1.3.1.
+network/bitlbee: Updated bitlbee for version 3.4.1.
+network/ccnet: Updated for version 4.3.2.
+network/ftp-cloudfs: Added (FTP interface).
+network/insync: Updated for version 1.2.18.35198.
+network/iojs: Updated for version 3.1.0.
+network/munge: Added (an authentication service).
+network/palemoon: Added (Web browser).
+network/razor-agents: Added patch.
+network/seafile-client: Updated for version 4.3.2.
+network/seafile-server: Updated for version 4.3.2.
+network/seahub: Updated for version 4.3.2.
+network/slurm: Added (workload manager).
+network/tixati: Added (P2P client).
+network/vivaldi: Updated for version 1.0.249.12_1.
+network/weechat: Updated for version 1.3.
+network/you-get: Updated for version 0.3.34.
+network/youtube-dl: Updated for version 2015.08.16.1.
+office/MasterPDFEditor: Updated for version 3.3.00.
+office/ProjectLibre: Updated for version 1.6.1.
+office/mathtex: Update MD5SUM.
+office/mined: Added (A terminal-based text editor).
+office/xtrkcad: Update source.
+perl/perl-CPANPLUS-Dist-Slackware: Updated for version 1.022.
+perl/perl-Capture-Tiny: Updated for version 0.30.
+perl/perl-Date-Manip: Updated for version 6.50.
+perl/perl-Devel-Symdump: Updated for version 2.15.
+perl/perl-ExtUtils-InstallPaths: Updated for version 0.011.
+perl/perl-File-Tail: Updated for version 1.3.
+perl/perl-Moo: Updated for version 2.000002.
+perl/perl-Role-Tiny: Updated for version 2.000001.
+perl/perl-Test-Harness: Updated for version 3.35.
+perl/perl-Test-Inter: Updated for version 1.06.
+perl/perl-strictures: Updated for version 2.000001.
+python/click: Updated for version 5.1.
+python/npyscreen: Updated for version 4.10.0.
+python/path.py: Updated for version 7.6.
+python/prompt_toolkit: Updated for version 0.46.
+python/ptpython: Updated for version 0.21.
+python/pytest-cov: Updated for version 2.0.0.
+python/pytest: Update script.
+python/python-oauthlib: Updated for version 1.0.3.
+ruby/ruby2: Updated for version 2.2.3.
+system/Iosevka: Added (Open source monospace coding font).
+system/apcupsd: Updated for version 3.14.13.
+system/atop: Updated for version 2.2.
+system/exfat-utils: Updated for version 1.1.1.
+system/fuse-exfat: Updated for version 1.1.0.
+system/modules: Added (modification of a user's environment).
+system/netatop: Updated for version 0.6.
+system/openmpi: Updated for version 1.8.8 + new maintainer.
+system/slpkg: Updated for version 2.7.4.
+system/tomb: Updated for version 2.1.1.
+system/wangfonts: Added (Free Chinese TrueType fonts).
++--------------------------+
+Sat Aug 15 08:13:43 UTC 2015
+academic/sword-data-kjv: Update MD5SUM.
+academic/xiphos: Updated for version 4.0.3.
+audio/pogo: Update MAN location.
+audio/qmmp-plugin-pack: Updated for version 0.8.5.
+desktop/ComixCursors: Fix DOWNLOAD and HOMEPAGE.
+desktop/notion: Updated for version 3_2015061300.
+desktop/obmenu-generator: Updated for version 0.66.
+desktop/sun: Updated for version 1.1.3.
+development/atom: Fix typo.
+development/codelite: Updated for version 8.1.
+development/ebe: Updated for version 3.0.3.
+development/geany-plugins: Update DOWNLOAD url.
+development/git-lfs: Added (Git extension).
+games/adom: Fix DOWNLOAD url.
+games/foobillardplus: Fix missing .desktop file.
+games/mednafen: Change CXXFLAGS & updated for 0.9.38.6.
+games/qzdl: Added (Qt Doom Launcher).
+games/scid_vs_pc: Updated for version 4.14.
+gis/Fiona: Updated for version 1.6.1.
+gis/cligj: Updated for version 0.3.0.
+gis/pointcloud: Updated for version 1.0.1.
+gis/rasterio: Updated for version 0.26.0.
+graphics/dia: Update HOMEPAGE.
+graphics/digikam: Updated for version 4.12.0.
+graphics/rawstudio: Patched for newer lensfun.
+libraries/gcab: Added (A GObject library to create cabinet files).
+libraries/lensfun-legacy: Removed.
+libraries/libsidplayfp: Updated for version 1.8.1
+libraries/live555: Updated for version 2015.08.07.
+libraries/python3-PyQt5: Added (Python bindings for Qt).
+libraries/vigra: Add cmake switch.
+misc/KeePass: Updated for version 2.30.
+misc/portecle: Updated for version 1.9.
+multimedia/Mopidy: Update DEP.
+multimedia/flashplayer-plugin: Updated for version 11.2.202.508.
+multimedia/obs-studio: Added (Open Broadcaster Software).
+network/OpenDKIM: Updated for version 2.10.3.
+network/aggregate: Added (optimise a list of route prefixes).
+network/greenbone-security-assistant: Updated for version 6.0.5.
+network/guacamole-client: Added (Guacamole client).
+network/guacamole-server: Added (Guacamole server).
+network/imapproxy: Added (SquirrelMail's IMAP Proxy server).
+network/memcached-init: Added (memcached init and config).
+network/ocsync: Removed (included in owncloud).
+network/openvas-manager: Updated for version 6.0.5.
+network/owncloud-client: Updated for version 1.8.4.
+network/packETH: Added (A Linux GUI packet generator tool).
+network/synergy: Updated for version 1.7.4
+network/tor-browser: Updated for version 5.0.
+network/vmware-horizon-client: Added (VMWare Horizon Client).
+network/vmware-view-client: Removed (renamed vmware-horizon-client).
+office/libreoffice: Fix MD5SUM and path.
+office/xtrkcad: Updated for version 4.2.1.
+perl/perl-BerkeleyDB: Updated for version 0.25.
+perl/perl-Canary-Stability: Added (Canary::Stability).
+perl/perl-Convert-UUlib: Updated for version 1.5.
+perl/perl-Module-Pluggable: Updated for version 5.2.
+perl/perl-Sidef: Added (A modern OOP language).
+perl/perl-Sub-Uplevel: Updated for version 0.25.
+perl/perl-Test-Exception: Updated for version 0.40.
+python/click-plugins: Added (extension to click).
+python/pbr: Updated for version 1.5.0.
+python/pysed: Update DOWNLOAD.
+python/python3-lhafile: Added (Python LHA archive extension).
+python/python3-sip: Added (Tool to generate Python bindings).
+python/snuggs: Added (s-expressions for Numpy).
+system/TLP: Updated for version 0.8.
+system/bicon: Removed (maintainer's request).
+system/blktrace: Added (block layer IO tracing mechanism).
+system/drbd-utils: Fixes for regression of drbd-8.4 pacemaker
+system/firmware-gobi-2000: Added (Qualcomm Gobi 2000 firmware).
+system/msitools: Added (Inspect and build Windows Installer).
+system/openrc-services: Updated for version 20150810.
+system/scrypt: Updated for version 1.2.0.
+system/slpkg: Updated for version 2.7.3.
++--------------------------+
+Sun Aug  9 16:13:36 UTC 2015
+academic/pulseview: Added (GUI for sigrok).
+academic/wmcalc: Added (Calculator DockApp).
+accessibility/Synkron: Added (File/folder synchronization).
+audio/wmusic: Added (XMMS Remote Control DockApp).
+desktop/Window_Manager_Scripts: Added (WM Agnostic Shell Scripts).
+desktop/seafile-gui: Updated for version 4.3.0.
+desktop/sun: Updated for version 1.1.1.
+desktop/wmblob: Added (Fancy Moving Blobs DockApp).
+desktop/wmtimer: Added (Timer DockApp).
+desktop/wmudmount: New maintainer.
+desktop/wmweather+: Added (Weather Monitor DockApp).
+development/apache-jmeter: Updated for version 2.13.
+development/atom: Updated for version 1.0.5.
+development/brackets: Updated for version 1.4.
+development/chicken: Updated for version 4.10.0.
+development/lcov: Fix typo.
+development/p4: Updated for version 2015.1.1204891.
+development/p4v: Updated for version 2014.1.1206753.
+development/scons: Updated for version 2.3.6.
+games/atanks: Updated for version 6.3.
+games/chocolate_duke3D: Added (Faithful Duke Nukem 3D port).
+games/instead: Updated for version 2.2.4.
+games/mednafen: Change CXXFLAGS.
+games/qstat: Updated for version 2a95a5d0.
+games/starfighter: Updated for version 1.4.
+gis/mapnik: Updated for version 3.0.2.
+graphics/Blender: Added (3D Content Creation Suite).
+graphics/CairoSVG: Updated for version 1.0.16.
+graphics/GraphicsMagick: Updated for version 1.3.21.
+graphics/findimagedupes: Added (find visually similar images).
+graphics/openimageio: Update MD5SUM.
+graphics/pngcrush: Updated for version 1.7.86.
+libraries/CGAL: Updated for version 4.6.1.
+libraries/cffi: Updated for version 1.1.2.
+libraries/hiredis: Updated for version 0.13.1.
+libraries/libcpuid: Added (C library for x86 CPU detection).
+libraries/libmicrohttpd: Updated for version 0.9.42.
+libraries/libuv: Updated for version 1.7.0.
+libraries/live555: Updated for version 2015.08.06.
+libraries/wxSQLite3: Added (wxWidgets wrapper for SQLite3).
+misc/bdf2psf: Added (convert fonts from bdf to psf format).
+misc/sigrok-firmware-fx2lafw: Added (Firmware for Cypress FX2).
+multimedia/makemkv: Updated for version 1.9.5.
+multimedia/minidlna: Updated for version 20150730.
+network/allmydata-tahoe: Updated for version 1.10.2.
+network/ccnet: Updated for version 4.3.1.
+network/clipgrab: Updated for version 3.5.1.
+network/dnscrypt-wrapper: Updated for version 0.2.
+network/greenbone-security-assistant: Updated for version 6.0.4.
+network/iojs: Updated for version 3.0.0.
+network/mumble: Update DOWNLOAD url.
+network/murmur: Update DOWNLOAD url.
+network/openvas-cli: Updated for version 1.4.2.
+network/openvas-libraries: Updated for version 8.0.4.
+network/openvas-manager: Updated for version 5.0.4.
+network/openvas-scanner: Updated for version 5.0.4.
+network/pentadactyl: Updated for version 20150808.
+network/pidgin-skypeweb: Updated for version 0c354d57.
+network/pure-ftpd: Updated for version 1.0.42.
+network/purple-facebook: Updated for version 0c354d57.
+network/seafile-client: Updated for version 4.3.1.
+network/seafile-server: Updated for version 4.3.1.
+network/seahub: Updated for version 4.3.1.
+network/vivaldi: Updated for version 1.0.233.3_1.
+network/wmnd: Added (WindowMaker Network Devices DockApp).
+network/youtube-dl: Updated for version 2015.08.06.1.
+office/libreoffice-helppack: Updated for version 5.0.0.
+office/libreoffice-langpack: Updated for version 5.0.0.
+office/libreoffice: Updated for version 5.0.0.
+office/lyx: Updated for version 2.1.4.
+office/remind: Updated for version 03.01.15.
+perl/perl-Astro-SunTime: new maintainer.
+perl/perl-Convert-UUlib: Update DOWNLOAD url.
+perl/perl-DateTime: Fix broken download location.
+perl/perl-Device-SerialPort: new maintainer.
+perl/perl-Email-Date-Format: Updated for version 1.005.
+perl/perl-IO-HTML: Updated for version 1.001.
+perl/perl-Inline: Updated for version 0.80.
+perl/perl-MIME-Lite: New maintainer.
+perl/perl-MusicBrainz-DiscID: New maintainer.
+perl/perl-PHP-Serialization: New maintainer.
+perl/perl-PerlIO-Layers: Updated for version 0.011.
+perl/perl-Proc-Daemon: Updated for version 0.21.
+perl/perl-Sub-Exporter-Progressive: Update EMAIL.
+perl/perl-Test-Exception: Fix broken download location.
+perl/perl-Test-Warnings: Fix broken download location.
+perl/perl-x11-protocol: new maintainer.
+python/astroid: Updated for version 1.3.8.
+python/cairocffi: Updated for version 0.7.2.
+python/path.py: Updated for version 7.5.
+python/psutil: Updated for version 3.1.1.
+python/pyasn1-modules: Updated for version 0.0.6.
+python/pyasn1: Updated for version 0.1.8.
+python/rsa: Updated for version 3.2.
+python/selenium: Updated for version 2.47.1.
+python/stevedore: Updated for version 1.7.0.
+python/websocket-client: Added (WebSocket client for python).
+system/bochs: Updated for version 2.6.8.
+system/crashplan: Updated for version 4.3.0.
+system/dash: Updated for version 0.5.8 + new maintainer.
+system/eaglemode: Added (zoomable user interface).
+system/etckeeper: Updated for version 1.18.2.
+system/nvidia-driver: Fix typo.
+system/profile-cleaner: Updated for version 2.35.
+system/secure-delete: Added new doc.
+system/slpkg: Updated for version 2.7.1.
+system/wipe: Added (Secure data destruction).
+system/wmgtemp: Added (Graphical GPU and SYS Temp Monitor DockApp).
++--------------------------+
+Sat Aug  1 00:54:51 UTC 2015
+academic/GeoGebra: Updated for version 5.0.135.0.
+academic/fet: Updated for version 5.27.5.
+academic/gaw3: Updated for version 20150228.
+academic/knime: Updated for version 2.12.0.
+academic/sage: Updated for version 6.8.
+academic/sigrok-cli: Added (command-line frontend for sigrok).
+audio/coverlovin: Added (Cover Art Downloader).
+audio/sunvox: Updated for version 1.9b.
+desktop/bashish: Added (theme enviroment for text terminals).
+desktop/imgurbash: Added (bash script uploader).
+desktop/luna-wallpapers: Update script.
+development/Arduino: Small fixes and binary version coexistence.
+development/SQLAlchemy: Updated for version 1.0.8.
+development/arduino: Updated for version 1.6.5.
+development/cpan2tgz: Update DOWNLOAD url.
+development/enki: Updated for version 15.05.0.
+development/groovy: Updated for version 2.4.4.
+development/meld3: Updated for version 3.14.0.
+development/neovim: Fix man page installation.
+development/poedit: Updated for version 1.8.3.
+development/thunderpad: Updated for version 20150716.
+games/eureka: Update README.
+games/mednafen: Updated for version 0.9.38.5.
+games/spring: Updated for version 100.0.
+gis/grass: Updated for version 7.0.1.
+graphics/blender: Updated for version 2.75a.
+graphics/darktable: Updated for version 1.6.8.
+graphics/graph-easy: Added (Convert or render graphs).
+graphics/opencollada: Updated for version 0.20150429.
+libraries/discogs-client: Updated for version 2.2.0.
+libraries/hoedown: Updated for version 3.0.3.
+libraries/libepoxy: Updated for version 1.3.1.
+libraries/libsigrok: Added (logic analyzers access library).
+libraries/libtelnet: Added (TELNET protocol handling library).
+libraries/mpir: Updated for version 2.7.0.
+libraries/pugixml: Added: (XML parser for C)
+libraries/qutepart: Updated for version 2.2.2.
+misc/dos2unix: Updated for version 7.2.3.
+misc/wcd: Updated for version 5.2.7.
+multimedia/Mopidy: Updated for version 1.0.8.
+multimedia/dvdauthor: New maintainer.
+multimedia/exaile: Updated for version 3.4.5.
+multimedia/tovid: Updated for version 0.35.2.
+network/chrony: Updated for version 2.1.1.
+network/claws-mail: Updated for version 3.12.0.
+network/ddclient: Updated for version 3.8.3.
+network/dillo: Updated for version 3.0.5.
+network/dropbox: Updated for version 3.8.5.
+network/exim: Updated for version 4.86.
+network/iojs: Updated for version 2.5.0.
+network/keybase-client: Updated for version 0.8.14.
+network/movgrab: Updated for version 1.2.1.
+network/mumble: Updated for version 1.2.10.
+network/murmur: Updated for version 1.2.10.
+network/opensmtpd: Fix dep.
+network/pidgin-facebookchat: Removed (replaced by purple-facebook).
+network/pidgin-whatsapp: Updated for version 0.8.5.
+network/purple-facebook: Added (Facebook Chat for Pidgin).
+network/putty: Updated for version 0.65.
+network/qTox: Updated for version 20150722.
+network/toxcore: Updated for version 20150722.
+network/twitter: Updated for version 1.17.1.
+network/vivaldi: Updated for version 1.0.231.3_1.
+network/youtube-dl: Updated for version 2015.07.28.
+office/ganttproject: Updated for version 2.7.1.
+office/libreoffice-helppack: Updated for version 4.4.5.
+office/libreoffice-langpack: Updated for version 4.4.5.
+office/libreoffice: Updated for version 4.4.5.
+office/mdp: Updated for version 1.0.1.
+office/tellico: New maintainer.
+perl/perl-YAML-Tiny: Updated for version 1.69.
+python/astroid: Updated for version 1.3.7.
+python/autopep8: Updated for version 1.2.
+python/pydf: Added (df clone written in python).
+python/python-future: Updated for version 0.15.0.
+python/python-oauthlib: Updated for version 1.0.1.
+python/selenium: Updated for version 2.47.0.
+system/adobe-source-code-pro-font: Updated for version 1.030.
+system/bicon: Added (Bidirectional Console).
+system/cronie: Updated for version 1.5.0.
+system/fish: Updated for version 2.2.0 + new maintainer.
+system/inxi: Updated for version 2.2.26.
+system/nvidia-driver: Updated for version 352.30.
+system/nvidia-kernel: Updated for version 352.30.
+system/qemu: Patched for CVE-2015-5154.
+system/slpkg: Updated for version 2.6.8.
+system/sysdig: Updated for version 0.1.102.
+system/thermal_daemon: Updated for version 1.4.3.
+system/tilda: Updated for version 1.2.4.
+system/tomb: Added (file encryption)
+system/unace: New download location.
+system/winetricks: Updated for version 20150706.
++--------------------------+
 Sat Jul 25 04:24:03 UTC 2015
 audio/morituri: Added (CD ripper).
 audio/qjackctl: Updated for version 0.4.0.
diff --git a/academic/GeoGebra/GeoGebra.SlackBuild b/academic/GeoGebra/GeoGebra.SlackBuild
index 847db817b3..0a8afb4fb9 100644
--- a/academic/GeoGebra/GeoGebra.SlackBuild
+++ b/academic/GeoGebra/GeoGebra.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=GeoGebra
-VERSION=${VERSION:-5.0.135.0}
+VERSION=${VERSION:-5.0.156.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/GeoGebra/GeoGebra.info b/academic/GeoGebra/GeoGebra.info
index 5abcdaee20..943ded4143 100644
--- a/academic/GeoGebra/GeoGebra.info
+++ b/academic/GeoGebra/GeoGebra.info
@@ -1,8 +1,8 @@
 PRGNAM="GeoGebra"
-VERSION="5.0.135.0"
+VERSION="5.0.156.0"
 HOMEPAGE="http://www.geogebra.org/cms/en/"
-DOWNLOAD="https://www.dropbox.com/s/pobqtihetz7m05e/GeoGebra-Linux-Portable-5.0.135.0.tar.bz2"
-MD5SUM="5eceae7a2782c8338deb0800a2f1c5c2"
+DOWNLOAD="https://www.dropbox.com/s/xgn9zwohrnfbrbs/GeoGebra-Linux-Portable-5.0.156.0.tar.bz2"
+MD5SUM="7bf19cbd33112d116315a0f41e7acfbc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openjdk"
diff --git a/academic/Mnemosyne/Mnemosyne.SlackBuild b/academic/Mnemosyne/Mnemosyne.SlackBuild
index 7cf4fdeaed..5d744ed13b 100644
--- a/academic/Mnemosyne/Mnemosyne.SlackBuild
+++ b/academic/Mnemosyne/Mnemosyne.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Mnemosyne
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-2.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/Mnemosyne/Mnemosyne.info b/academic/Mnemosyne/Mnemosyne.info
index f1dc31fe93..307dd3c138 100644
--- a/academic/Mnemosyne/Mnemosyne.info
+++ b/academic/Mnemosyne/Mnemosyne.info
@@ -1,8 +1,8 @@
 PRGNAM="Mnemosyne"
-VERSION="2.3.3"
+VERSION="2.3.4"
 HOMEPAGE="http://www.mnemosyne-proj.org/download-mnemosyne.php"
-DOWNLOAD="http://downloads.sourceforge.net/project/mnemosyne-proj/mnemosyne/mnemosyne-2.3.3/Mnemosyne-2.3.3.tar.gz"
-MD5SUM="c1594959138b389600be97a99ba15dbd"
+DOWNLOAD="http://downloads.sourceforge.net/project/mnemosyne-proj/mnemosyne/mnemosyne-2.3.4/Mnemosyne-2.3.4.tar.gz"
+MD5SUM="1fa437d173de5b9c822fac0f46a05062"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CherryPy matplotlib WebOb"
diff --git a/academic/R/COPYING b/academic/R/COPYING
deleted file mode 100644
index 94a9ed024d..0000000000
--- a/academic/R/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM 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 PROGRAM (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 THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild
index 754648510d..69f211c2db 100644
--- a/academic/R/R.SlackBuild
+++ b/academic/R/R.SlackBuild
@@ -24,7 +24,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=R
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,7 +81,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAG="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/academic/R/R.info b/academic/R/R.info
index 73cd440902..f9bad4e710 100644
--- a/academic/R/R.info
+++ b/academic/R/R.info
@@ -1,8 +1,8 @@
 PRGNAM="R"
-VERSION="3.2.1"
+VERSION="3.2.2"
 HOMEPAGE="http://www.r-project.org/"
-DOWNLOAD="http://ftp.osuosl.org/pub/cran/src/base/R-3/R-3.2.1.tar.gz"
-MD5SUM="c2aac8b40f84e08e7f8c9068de9239a3"
+DOWNLOAD="http://ftp.osuosl.org/pub/cran/src/base/R-3/R-3.2.2.tar.gz"
+MD5SUM="57cef5c2e210a5454da1979562a10e5b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/Xyce/README b/academic/Xyce/README
new file mode 100644
index 0000000000..3f1058707c
--- /dev/null
+++ b/academic/Xyce/README
@@ -0,0 +1,40 @@
+Xyce is an open source, SPICE-compatible, high-performance analog circuit
+simulator, capable of solving extremely large circuit problems by supporting
+large-scale parallel computing platforms. It also supports serial execution on
+all common desktop platforms, and small-scale parallel runs on Unix-like
+systems. In addition to analog electronic simulation, Xyce has also been used
+to investigate more general network systems, such as neural networks and power
+grids.
+
+The Xyce Parallel Electronic Simulator is a SPICE-compatible circuit simulator,
+developed internally at Sandia National Laboratories and funded by the National
+Nuclear Security Administration's Advanced Simulation and Computing (ASC)
+Campaign. In continuous development since 1999, Xyce is designed to run on
+large-scale parallel computing platforms, though it also executes efficiently on
+a variety of architectures, including single processor workstations. As a mature
+platform for large-scale parallel circuit simulation, Xyce supports standard
+capabilities available from commercial simulators, in addition to a variety of
+devices and models specific to Sandia's needs.
+
+The package is intalled at: /opt/Xyce
+Remember to set the library and path:
+
+PATH=$PATH:/opt/Xyce/bin
+
+For 32-bit:
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Xyce/lib
+
+For 64-bit:
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Xyce/lib64
+
+To run the suite test:
+# cd /opt/Xyce/Xyce_Regression-6.3/TestScripts
+# ./run_xyce_regression
+
+For parallel simulation trilinos must be compiled with MPI.
+
+Additonal requirements:
+ - MPI (openmpi/mpich)
+ - parMETIS
+
+NOTE: Sources are not downloadable via wget. Please download manually via browser.
diff --git a/academic/Xyce/Xyce.SlackBuild b/academic/Xyce/Xyce.SlackBuild
new file mode 100644
index 0000000000..b6390a8af7
--- /dev/null
+++ b/academic/Xyce/Xyce.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for Xyce
+
+# Copyright 2015 Guilherme Calandrini - Madrid (Spain)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Xyce
+VERSION=${VERSION:-6.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$PRGNAM"
+
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM\_Docs-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM\_Regression-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+if [ "${NONFREE:-no}" == yes ]; then
+  COPT_DEPS="-DXyce_NONFREE_MODEL=ON"
+else
+  COPT_DEPS="-DXyce_NONFREE_MODEL=OFF"
+fi
+
+if [ "${PARALLEL:-no}" == yes ]; then
+  COPT_DEPS="$COPTS_DEPS -DXyce_PARALLEL_MPI=ON \
+	  -DLIB_MPI=/usr/lib${LIBDIRSUFFIX} -DINC_MPI=/usr/include"
+else
+  COPT_DEPS="$COPTS_DEPS -DXyce_PARALLEL_MPI=OFF"
+fi
+
+mkdir BUILD
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \
+  $COPT_DEPS \
+  -DXyce_ENABLE_SHARED=yes \
+  -DCMAKE_BUILD_TYPE=Release
+
+make
+make install DESTDIR=$PKG
+
+# Install the test suite manually
+mv $TMP/$PRGNAM\_Regression-$VERSION \
+   $PKG/opt/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $TMP/${PRGNAM}_Docs-$VERSION/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/Xyce/Xyce.info b/academic/Xyce/Xyce.info
new file mode 100644
index 0000000000..3cb282d97f
--- /dev/null
+++ b/academic/Xyce/Xyce.info
@@ -0,0 +1,14 @@
+PRGNAM="Xyce"
+VERSION="6.3"
+HOMEPAGE="https://xyce.sandia.gov/index.html"
+DOWNLOAD="https://xyce.sandia.gov/downloads/_assets/documents/Xyce-6.3.tar.gz \
+ 	  https://xyce.sandia.gov/downloads/_assets/documents/Xyce_Docs-6.3.tar.gz \
+	  https://xyce.sandia.gov/downloads/_assets/documents/Xyce_Regression-6.3.tar.gz"
+MD5SUM="0d390539254cc240967b8df1eee74808 \
+ 	7f0cdb4029c3b713af355641f985f4ca \
+	2bdd10c498f134934910d7cc46b81837"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="trilinos"
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini[at]hotmail[dot].es"
diff --git a/academic/Xyce/slack-desc b/academic/Xyce/slack-desc
new file mode 100644
index 0000000000..4f40769b83
--- /dev/null
+++ b/academic/Xyce/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler--------------------------------------------------------|
+Xyce: Xyce (Xyce Parallel Electronic Simulator)
+Xyce:
+Xyce: The Xyce Parallel Electronic Simulator is a SPICE-compatible circuit
+Xyce: simulator, developed internally at Sandia National Laboratories and
+Xyce: funded by the National Nuclear Security Administration's Advanced
+Xyce: Simulation and Computing (ASC) Campaign. In continuous development
+Xyce: since 1999, Xyce is designed to run on large-scale parallel computing
+Xyce: platforms, though it also executes efficiently on a variety of xyce:
+Xyce: architectures, including single processor workstations.
+Xyce:
diff --git a/academic/amd/amd.SlackBuild b/academic/amd/amd.SlackBuild
index ed8d18fe0f..982a4e26e9 100644
--- a/academic/amd/amd.SlackBuild
+++ b/academic/amd/amd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for AMD
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=amd
 SRCNAM=SuiteSparse
 SUBDIR=AMD
 VERSION=${VERSION:-2.4.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -43,7 +43,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="README.txt Doc/ChangeLog Doc/License Doc/lesser.txt"
+DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/amd/amd.info b/academic/amd/amd.info
index dfa2bae163..2a85f345fa 100644
--- a/academic/amd/amd.info
+++ b/academic/amd/amd.info
@@ -1,8 +1,8 @@
 PRGNAM="amd"
 VERSION="2.4.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/amd/autotoolize.diff b/academic/amd/autotoolize.diff
index 512fb57b0a..5f34c70409 100644
--- a/academic/amd/autotoolize.diff
+++ b/academic/amd/autotoolize.diff
@@ -61,7 +61,7 @@ new file mode 100644
 --- /dev/null
 +++ b/Doc/Makefile.am
 @@ -0,0 +1,27 @@
-+EXTRA_DIST = ChangeLog License lesser.txt
++EXTRA_DIST = ChangeLog License.txt lesser.txt
 +
 +dist_noinst_DATA = AMD_UserGuide.tex AMD_UserGuide.bib
 +dist_pdf_DATA = AMD_UserGuide.pdf
diff --git a/academic/antiprism/antiprism.SlackBuild b/academic/antiprism/antiprism.SlackBuild
index f0c20913d8..271184a166 100644
--- a/academic/antiprism/antiprism.SlackBuild
+++ b/academic/antiprism/antiprism.SlackBuild
@@ -67,6 +67,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/arpack-ng/arpack-ng.SlackBuild b/academic/arpack-ng/arpack-ng.SlackBuild
index 5f9fe0a5a7..c387b95027 100644
--- a/academic/arpack-ng/arpack-ng.SlackBuild
+++ b/academic/arpack-ng/arpack-ng.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=arpack-ng
-VERSION=${VERSION:-3.2.0}
+VERSION=${VERSION:-3.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,10 +67,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# Auto-detect OpenBLAS.
-cat $CWD/patches/ax_blas.m4 > m4/ax_blas.m4
-autoreconf -vif
-
+./bootstrap
 CFLAGS="$SLKCFLAGS" \
 FFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/academic/arpack-ng/arpack-ng.info b/academic/arpack-ng/arpack-ng.info
index c16e985d6b..0c2dfc35f3 100644
--- a/academic/arpack-ng/arpack-ng.info
+++ b/academic/arpack-ng/arpack-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="arpack-ng"
-VERSION="3.2.0"
+VERSION="3.3.0"
 HOMEPAGE="https://github.com/opencollab/arpack-ng"
-DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.2.0.tar.gz"
-MD5SUM="0ae8a0bb796370b06647d9e005c0f3ea"
+DOWNLOAD="https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz"
+MD5SUM="ed3648a23f0a868a43ef44c97a21bad5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack"
diff --git a/academic/arpack-ng/patches/ax_blas.m4 b/academic/arpack-ng/patches/ax_blas.m4
deleted file mode 100644
index 821459d857..0000000000
--- a/academic/arpack-ng/patches/ax_blas.m4
+++ /dev/null
@@ -1,238 +0,0 @@
-# ===========================================================================
-#          http://www.gnu.org/software/autoconf-archive/ax_blas.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro looks for a library that implements the BLAS linear-algebra
-#   interface (see http://www.netlib.org/blas/). On success, it sets the
-#   BLAS_LIBS output variable to hold the requisite library linkages.
-#
-#   To link with BLAS, you should link with:
-#
-#     $BLAS_LIBS $LIBS $FLIBS
-#
-#   in that order. FLIBS is the output variable of the
-#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
-#   sometimes necessary in order to link with F77 libraries. Users will also
-#   need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
-#   reason.
-#
-#   Many libraries are searched for, from ATLAS to CXML to ESSL. The user
-#   may also use --with-blas=<lib> in order to use some specific BLAS
-#   library <lib>. In order to link successfully, however, be aware that you
-#   will probably need to use the same Fortran compiler (which can be set
-#   via the F77 env. var.) as was used to compile the BLAS library.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a BLAS library is
-#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
-#   not found. If ACTION-IF-FOUND is not specified, the default action will
-#   define HAVE_BLAS.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 14
-
-AU_ALIAS([ACX_BLAS], [AX_BLAS])
-AC_DEFUN([AX_BLAS], [
-AC_PREREQ(2.50)
-AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-AC_REQUIRE([AC_CANONICAL_HOST])
-ax_blas_ok=no
-
-AC_ARG_WITH(blas,
-	[AS_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
-case $with_blas in
-	yes | "") ;;
-	no) ax_blas_ok=disable ;;
-	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
-	*) BLAS_LIBS="-l$with_blas" ;;
-esac
-
-# Get fortran linker names of BLAS functions to check for.
-AC_F77_FUNC(sgemm)
-AC_F77_FUNC(dgemm)
-
-ax_blas_save_LIBS="$LIBS"
-LIBS="$LIBS $FLIBS"
-
-# First, check BLAS_LIBS environment variable
-if test $ax_blas_ok = no; then
-if test "x$BLAS_LIBS" != x; then
-	save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-	AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
-	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes], [BLAS_LIBS=""])
-	AC_MSG_RESULT($ax_blas_ok)
-	LIBS="$save_LIBS"
-fi
-fi
-
-# BLAS linked to by default?  (happens on some supercomputers)
-if test $ax_blas_ok = no; then
-	save_LIBS="$LIBS"; LIBS="$LIBS"
-	AC_MSG_CHECKING([if $sgemm is being linked in already])
-	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes])
-	AC_MSG_RESULT($ax_blas_ok)
-	LIBS="$save_LIBS"
-fi
-
-# BLAS in OpenBLAS library? (http://xianyi.github.com/OpenBLAS/)
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(openblas, $sgemm, [ax_blas_ok=yes
-			                BLAS_LIBS="-lopenblas"])
-fi
-
-# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(atlas, ATL_xerbla,
-		[AC_CHECK_LIB(f77blas, $sgemm,
-		[AC_CHECK_LIB(cblas, cblas_dgemm,
-			[ax_blas_ok=yes
-			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
-			[], [-lf77blas -latlas])],
-			[], [-latlas])])
-fi
-
-# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(blas, $sgemm,
-		[AC_CHECK_LIB(dgemm, $dgemm,
-		[AC_CHECK_LIB(sgemm, $sgemm,
-			[ax_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
-			[], [-lblas])],
-			[], [-lblas])])
-fi
-
-# BLAS in Intel MKL library?
-if test $ax_blas_ok = no; then
-	# MKL for gfortran
-	if test x"$ac_cv_fc_compiler_gnu" = xyes; then
-		# 64 bit
-		if test $host_cpu = x86_64; then
-			AC_CHECK_LIB(mkl_gf_lp64, $sgemm,
-			[ax_blas_ok=yes;BLAS_LIBS="-lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread"],,
-			[-lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread])
-		# 32 bit
-		elif test $host_cpu = i686; then
-			AC_CHECK_LIB(mkl_gf, $sgemm,
-				[ax_blas_ok=yes;BLAS_LIBS="-lmkl_gf -lmkl_sequential -lmkl_core -lpthread"],,
-				[-lmkl_gf -lmkl_sequential -lmkl_core -lpthread])
-		fi
-	# MKL for other compilers (Intel, PGI, ...?)
-	else
-		# 64-bit
-		if test $host_cpu = x86_64; then
-			AC_CHECK_LIB(mkl_intel_lp64, $sgemm,
-				[ax_blas_ok=yes;BLAS_LIBS="-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread"],,
-				[-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread])
-		# 32-bit
-		elif test $host_cpu = i686; then
-			AC_CHECK_LIB(mkl_intel, $sgemm,
-				[ax_blas_ok=yes;BLAS_LIBS="-lmkl_intel -lmkl_sequential -lmkl_core -lpthread"],,
-				[-lmkl_intel -lmkl_sequential -lmkl_core -lpthread])
-		fi
-	fi
-fi
-# Old versions of MKL
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(mkl, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lmkl -lguide -lpthread"],,[-lguide -lpthread])
-fi
-
-# BLAS in Apple vecLib library?
-if test $ax_blas_ok = no; then
-	save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS"
-	AC_MSG_CHECKING([for $sgemm in -framework vecLib])
-	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"])
-	AC_MSG_RESULT($ax_blas_ok)
-	LIBS="$save_LIBS"
-fi
-
-# BLAS in Alpha CXML library?
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(cxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lcxml"])
-fi
-
-# BLAS in Alpha DXML library? (now called CXML, see above)
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(dxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-ldxml"])
-fi
-
-# BLAS in Sun Performance library?
-if test $ax_blas_ok = no; then
-	if test "x$GCC" != xyes; then # only works with Sun CC
-		AC_CHECK_LIB(sunmath, acosp,
-			[AC_CHECK_LIB(sunperf, $sgemm,
-				[BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
-                                 ax_blas_ok=yes],[],[-lsunmath])])
-	fi
-fi
-
-# BLAS in SCSL library?  (SGI/Cray Scientific Library)
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(scs, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lscs"])
-fi
-
-# BLAS in SGIMATH library?
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(complib.sgimath, $sgemm,
-		     [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
-fi
-
-# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(blas, $sgemm,
-		[AC_CHECK_LIB(essl, $sgemm,
-			[ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
-			[], [-lblas $FLIBS])])
-fi
-
-# Generic BLAS library?
-if test $ax_blas_ok = no; then
-	AC_CHECK_LIB(blas, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lblas"])
-fi
-
-AC_SUBST(BLAS_LIBS)
-
-LIBS="$ax_blas_save_LIBS"
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$ax_blas_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
-        :
-else
-        ax_blas_ok=no
-        $2
-fi
-])dnl AX_BLAS
diff --git a/academic/bedtools/bedtools.SlackBuild b/academic/bedtools/bedtools.SlackBuild
index e2b16d8fac..b7d82c51c4 100644
--- a/academic/bedtools/bedtools.SlackBuild
+++ b/academic/bedtools/bedtools.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=bedtools
 DIRNAM=bedtools2
-VERSION=${VERSION:-2.23.0}
+VERSION=${VERSION:-2.25.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/bedtools/bedtools.info b/academic/bedtools/bedtools.info
index b0e02292a5..9b08594e19 100644
--- a/academic/bedtools/bedtools.info
+++ b/academic/bedtools/bedtools.info
@@ -1,8 +1,8 @@
 PRGNAM="bedtools"
-VERSION="2.23.0"
+VERSION="2.25.0"
 HOMEPAGE="http://bedtools.readthedocs.org/"
-DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.23.0/bedtools-2.23.0.tar.gz"
-MD5SUM="f7df3d931857f9bb8f79a69a364527d1"
+DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.25.0/bedtools-2.25.0.tar.gz"
+MD5SUM="1a87d311a4edeb9da39742c6d5186715"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/btf/btf.SlackBuild b/academic/btf/btf.SlackBuild
index 1c0021c5a8..46474fcfcd 100644
--- a/academic/btf/btf.SlackBuild
+++ b/academic/btf/btf.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for BTF
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=btf
 SRCNAM=SuiteSparse
 SUBDIR=BTF
 VERSION=${VERSION:-1.2.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/btf/btf.info b/academic/btf/btf.info
index fd0ef87530..e43df4c060 100644
--- a/academic/btf/btf.info
+++ b/academic/btf/btf.info
@@ -1,8 +1,8 @@
 PRGNAM="btf"
 VERSION="1.2.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/camd/camd.SlackBuild b/academic/camd/camd.SlackBuild
index 6f57f16933..331770d32e 100644
--- a/academic/camd/camd.SlackBuild
+++ b/academic/camd/camd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CAMD
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=camd
 SRCNAM=SuiteSparse
 SUBDIR=CAMD
 VERSION=${VERSION:-2.4.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/camd/camd.info b/academic/camd/camd.info
index 7b994d80eb..631d50b6e3 100644
--- a/academic/camd/camd.info
+++ b/academic/camd/camd.info
@@ -1,8 +1,8 @@
 PRGNAM="camd"
 VERSION="2.4.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/cblas/README b/academic/cblas/README
index 1ce4c499c3..200ba0e7d1 100644
--- a/academic/cblas/README
+++ b/academic/cblas/README
@@ -1,5 +1,6 @@
 CBLAS is a collection of wrappers that provide a C interface to the FORTRAN
 BLAS library.  The interface can be consulted by opening /usr/include/cblas.h
 
-An existing FORTRAN BLAS library must be installed if you intend to build this
-package. The reference BLAS from netlib is available at SlackBuilds.org.
+This package is intended for use with the Netlib reference BLAS.  It should
+also work with other BLAS implementations that do not already provide a CBLAS
+implementation.
diff --git a/academic/cblas/cblas.SlackBuild b/academic/cblas/cblas.SlackBuild
index ea1235e122..2aa85d604b 100644
--- a/academic/cblas/cblas.SlackBuild
+++ b/academic/cblas/cblas.SlackBuild
@@ -2,18 +2,37 @@
 
 # Slackware build script for CBLAS
 
-# Written by Eugene Suter <easuter@gmail.com>
+# Copyright 2016 Kyle Guinn <elyk03@gmail.com>, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cblas
-VERSION=${VERSION:-20110120}
+SRCNAM=lapack
+VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
+  case "$(uname -m)" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+       *) ARCH=$(uname -m) ;;
   esac
 fi
 
@@ -22,70 +41,79 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+DOCS="LICENSE CBLAS/README"
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf CBLAS
-tar xvf $CWD/$PRGNAM.tgz
-cd CBLAS
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Manually configure and build
-cp Makefile.LINUX Makefile.in
-make CBDIR=$(pwd) \
-	CBLIBDIR=$(pwd)/lib \
-	CBLIB=$(pwd)/lib/libcblas.a \
-	BLLIB="/usr/lib${LIBDIRSUFFIX}/libblas.a" \
-	CFLAGS="$SLKCFLAGS -DADD_" \
-	FFLAGS="$SLKCFLAGS -DADD_" \
-	FC="gfortran" \
-	RANLIB=ranlib \
-	alllib
-
-cd lib
-ar -x lib$PRGNAM.a
-gcc -fPIC -lgfortran -shared *.o -Wl,-soname,$PRGNAM.so.$VERSION \
-	-o lib$PRGNAM.so.$VERSION
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-cp lib$PRGNAM.a $PKG/usr/lib${LIBDIRSUFFIX}
-cp lib$PRGNAM.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -s lib$PRGNAM.so.$VERSION lib$PRGNAM.so
-)
+chmod -R u+w,go-w,a+rX-st .
+
+# Fix lots of bugs with the cmake build system and .pc files.
+# More importantly, allow building only the CBLAS component.
+patch -p1 < $CWD/patches/generate-pkgconfig.diff
+patch -p1 < $CWD/patches/link-dependencies.diff
+patch -p1 < $CWD/patches/target-cleanup.diff
+patch -p1 < $CWD/patches/cmake-piecewise.diff
+
+# Avoid adding an RPATH entry to the shared lib.  It's unnecessary (except for
+# running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX).
+mkdir -p shared
+cd shared
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_RULE_MESSAGES=OFF \
+    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+    -DUSE_OPTIMIZED_BLAS=ON \
+    -DBUILD_CBLAS=ON \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_SKIP_RPATH=YES \
+    ..
+  make
+  make install/strip DESTDIR=$PKG
 cd ..
 
-mkdir -p $PKG/usr/include
-cp include/* $PKG/usr/include
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# cmake doesn't appear to let us build both shared and static libs
+# at the same time, so build it twice.  This may build a non-PIC library
+# on some architectures, which should be faster.
+mkdir -p static
+cd static
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_RULE_MESSAGES=OFF \
+    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+    -DUSE_OPTIMIZED_BLAS=ON \
+    -DBUILD_CBLAS=ON \
+    -DBUILD_TESTING=OFF \
+    ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README examples \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/cblas/cblas.info b/academic/cblas/cblas.info
index 8123804ce1..d6c4e18d3c 100644
--- a/academic/cblas/cblas.info
+++ b/academic/cblas/cblas.info
@@ -1,10 +1,10 @@
 PRGNAM="cblas"
-VERSION="20110120"
-HOMEPAGE="http://netlib.org/blas/"
-DOWNLOAD="http://netlib.org/blas/blast-forum/cblas.tgz"
-MD5SUM="1e8830f622d2112239a4a8a83b84209a"
+VERSION="3.6.0"
+HOMEPAGE="http://www.netlib.org/blas/"
+DOWNLOAD="http://www.netlib.org/lapack/lapack-3.6.0.tgz"
+MD5SUM="f2f6c67134e851fe189bb3ca1fbb5101"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Eugene Suter"
-EMAIL="easuter@gmail.com"
+REQUIRES="blas"
+MAINTAINER="Kyle Guinn"
+EMAIL="elyk03@gmail.com"
diff --git a/academic/cblas/patches/cmake-piecewise.diff b/academic/cblas/patches/cmake-piecewise.diff
new file mode 100644
index 0000000000..13402a52e7
--- /dev/null
+++ b/academic/cblas/patches/cmake-piecewise.diff
@@ -0,0 +1,615 @@
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ message(STATUS "CBLAS enable")
+ enable_language(C)
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-
+ # Create a header file cblas.h for the routines called in my C programs
+ include(FortranCInterface)
+ FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/cblas_mangling.h 
+@@ -40,51 +38,8 @@
+    add_subdirectory(examples)
+ endif(BUILD_TESTING)
+ 
+-if(NOT BLAS_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-endif(NOT BLAS_FOUND)
+-
+-# Export cblas targets from the
+-# install tree, if any.
+-set(_cblas_config_install_guard_target "")
+-if(ALL_TARGETS)
+-  install(EXPORT cblas-targets
+-    DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
+-  # Choose one of the cblas targets to use as a guard for
+-  # cblas-config.cmake to load targets from the install tree.
+-  list(GET ALL_TARGETS 0 _cblas_config_install_guard_target)
+-endif()
+-
+-# Export cblas targets from the build tree, if any.
+-set(_cblas_config_build_guard_target "")
+-if(ALL_TARGETS)
+-  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-
+-  # Choose one of the cblas targets to use as a guard
+-  # for cblas-config.cmake to load targets from the build tree.
+-  list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
+-endif()
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
+-  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-
+-
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+    )
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
+-  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
+-  DESTINATION lib/cmake/cblas-${LAPACK_VERSION}
+-  )
+-
+-#install(EXPORT cblas-targets
+-#  DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
+-
+diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-build.cmake.in
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "@LAPACK_BINARY_DIR@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapack targets from the build tree, including lapacke targets.
+-if(NOT TARGET lapacke)
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-
+-# Report lapacke header search locations.
+-set(CBLAS_INCLUDE_DIRS "@LAPACK_SOURCE_DIR@/cblas/include")
+-
+-# Report lapacke libraries.
+-set(CBLAS_LIBRARIES cblas)
+diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-install.cmake.in
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake
+-get_filename_component(_CBLAS_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_SELF_DIR}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
+-
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapacke targets from the install tree.
+-if(NOT TARGET cblas)
+-  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-endif()
+-
+-# Report lapacke header search locations.
+-set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
+-
+-# Report lapacke libraries.
+-set(CBLAS_LIBRARIES cblas)
+-
+-unset(_CBLAS_PREFIX)
+-unset(_CBLAS_SELF_DIR)
+diff --git a/CBLAS/cmake/cblas-config-version.cmake.in b/CBLAS/cmake/cblas-config-version.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-version.cmake.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-set(PACKAGE_VERSION "@LAPACK_VERSION@")
+-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+-  set(PACKAGE_VERSION_COMPATIBLE 1)
+-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+-    set(PACKAGE_VERSION_EXACT 1)
+-  endif()
+-endif()
+-
+diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
+deleted file mode 100644
+--- a/CMAKE/lapack-config-build.cmake.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-# Load lapack targets from the build tree if necessary.
+-set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
+-if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-unset(_LAPACK_TARGET)
+-
+-# Report the blas and lapack raw or imported libraries.
+-set(LAPACK_blas_LIBRARIES "@BLAS_LIBRARIES@")
+-set(LAPACK_lapack_LIBRARIES "@LAPACK_LIBRARIES@")
+diff --git a/CMAKE/lapack-config-install.cmake.in b/CMAKE/lapack-config-install.cmake.in
+deleted file mode 100644
+--- a/CMAKE/lapack-config-install.cmake.in
++++ /dev/null
+@@ -1,15 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapack-<v>/<self>.cmake
+-get_filename_component(_LAPACK_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-
+-# Load lapack targets from the install tree if necessary.
+-set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
+-if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
+-  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-endif()
+-unset(_LAPACK_TARGET)
+-
+-# Report the blas and lapack raw or imported libraries.
+-set(LAPACK_blas_LIBRARIES "@BLAS_LIBRARIES@")
+-set(LAPACK_lapack_LIBRARIES "@LAPACK_LIBRARIES@")
+-
+-unset(_LAPACK_SELF_DIR)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,8 +55,6 @@
+ endif()
+ # --------------------------------------------------
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-
+ if (UNIX)
+   include(GNUInstallDirs)
+   set(ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
+@@ -70,7 +68,6 @@
+ 
+ macro(lapack_install_library lib)
+   install(TARGETS ${lib}
+-    EXPORT ${LAPACK_INSTALL_EXPORT_NAME}
+     ARCHIVE DESTINATION ${ARCHIVE_DIR}
+     LIBRARY DESTINATION ${LIBRARY_DIR}
+     RUNTIME DESTINATION ${RUNTIME_DIR}
+@@ -96,20 +93,6 @@
+ include( CheckLAPACKCompilerFlags )
+ CheckLAPACKCompilerFlags()
+ 
+-# --------------------------------------------------
+-# Check second function
+-
+-include(CheckTimeFunction)
+-set(TIME_FUNC NONE ${TIME_FUNC})
+-CHECK_TIME_FUNCTION(NONE TIME_FUNC)
+-CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
+-CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
+-CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
+-CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
+-message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
+-
+-set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
+-set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
+ 
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+@@ -120,6 +103,11 @@
+ endif()
+ 
+ # --------------------------------------------------
++# By default static library
++option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
++option(BUILD_STATIC_LIBS "Build static libraries" ON)
++
++# --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
+ option(BUILD_SINGLE "Build Single Precision" ON)
+@@ -150,236 +138,134 @@
+     Please enable at least one of these: BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
+ endif()
+ 
+-# --------------------------------------------------
+-# Subdirectories that need to be processed
++# deprecated LAPACK routines
++option(BUILD_DEPRECATED "Build deprecated routines" OFF)
+ 
++# --------------------------------------------------
++# BLAS
+ option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
+-
++option(BUILD_BLAS "Build BLAS" OFF)
+ 
+ # Check the usage of the user provided BLAS libraries
+ if(BLAS_LIBRARIES)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
+   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
+-  unset( CMAKE_REQUIRED_LIBRARIES )
++  unset(CMAKE_REQUIRED_LIBRARIES)
+   if(BLAS_FOUND)
+     message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
+-  else(BLAS_FOUND)
+-    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
+-    message(ERROR "-->     Will use REFERENCE BLAS (by default)")
+-    message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
+-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
+-  endif(BLAS_FOUND)
++  else()
++    message(SEND_ERROR "--> BLAS supplied by user is NOT WORKING, cannot use ${BLAS_LIBRARIES}.")
++  endif()
+ 
+ # User did not provide a BLAS Library but specified to search for one
+-elseif( USE_OPTIMIZED_BLAS )
+-  find_package( BLAS )
+-endif (BLAS_LIBRARIES)
++elseif(USE_OPTIMIZED_BLAS)
++  find_package(BLAS)
+ 
+-# Neither user specified or optimized BLAS libraries can be used
+-if(NOT BLAS_FOUND)
+-  message(STATUS "Using supplied NETLIB BLAS implementation")
+-  add_subdirectory(BLAS)
+-  set( BLAS_LIBRARIES blas )
+-else()
+-  set( CMAKE_EXE_LINKER_FLAGS 
+-    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for executables" FORCE)
+-  set( CMAKE_MODULE_LINKER_FLAGS 
+-    "${CMAKE_MODULE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for modules" FORCE)
+-  set( CMAKE_SHARED_LINKER_FLAGS 
+-    "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for shared libs" FORCE)
+-endif( NOT BLAS_FOUND )
++elseif(BUILD_BLAS)
++  set(BLAS_LIBRARIES blas)
++  set(BLAS_FOUND TRUE)
+ 
++  add_subdirectory(BLAS)
++endif()
+ 
+ # --------------------------------------------------
+ # CBLAS
+-option(CBLAS "Build CBLAS" OFF)
++option(BUILD_CBLAS "Build CBLAS" OFF)
+ 
+-if(CBLAS)
++if(BUILD_CBLAS)
++  set(NEED_BLAS TRUE)
+   add_subdirectory(CBLAS)
+-endif(CBLAS)
++endif(BUILD_CBLAS)
+ 
+ # --------------------------------------------------
+ # XBLAS
+-
+ option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
+-if (USE_XBLAS)
++
++if(USE_XBLAS)
+   find_library(XBLAS_LIBRARY NAMES xblas)
+ endif(USE_XBLAS)
+-   
+-option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
+ 
+ # --------------------------------------------------
+ # LAPACK
+-# User did not provide a LAPACK Library but specified to search for one
+-if( USE_OPTIMIZED_LAPACK )
+-  find_package( LAPACK )
+-endif (USE_OPTIMIZED_LAPACK)
++option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
++option(BUILD_LAPACK "Build LAPACK" OFF)
+ 
+ # Check the usage of the user provided or automatically found LAPACK libraries
+ if(LAPACK_LIBRARIES)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
+   # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
+-  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)
+-  unset( CMAKE_REQUIRED_LIBRARIES )
+-  if(LATESTLAPACK_FOUND)
++  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LAPACK_FOUND)
++  unset(CMAKE_REQUIRED_LIBRARIES)
++  if(LAPACK_FOUND)
+     message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
+-  else(LAPACK_FOUND)
+-    message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, 	CANNOT USE ${LAPACK_LIBRARIES}.")
+-    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
+-    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
+-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
+-  endif(LATESTLAPACK_FOUND)
+-endif (LAPACK_LIBRARIES)
++  else()
++    message(SEND_ERROR "--> LAPACK supplied by user is NOT WORKING or is older than LAPACK 3.4.0, cannot use ${LAPACK_LIBRARIES}.")
++  endif()
++
++# User did not provide a LAPACK Library but specified to search for one
++elseif(USE_OPTIMIZED_LAPACK)
++  find_package(LAPACK)
++
++elseif(BUILD_LAPACK)
++  set(LAPACK_LIBRARIES lapack)
++  set(LAPACK_FOUND TRUE)
++
++  set(NEED_BLAS TRUE)
++
++  # Check second function
++  include(CheckTimeFunction)
++  set(TIME_FUNC NONE ${TIME_FUNC})
++  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
++  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
++  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
++  CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
++  CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
++  message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
++
++  set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
++  set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ 
+-# Neither user specified or optimized LAPACK libraries can be used
+-if(NOT LATESTLAPACK_FOUND)
+-  message(STATUS "Using supplied NETLIB LAPACK implementation")
+-  set( LAPACK_LIBRARIES lapack )
+   add_subdirectory(SRC)
+-else()
+-  set( CMAKE_EXE_LINKER_FLAGS 
+-    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for executables" FORCE)
+-  set( CMAKE_MODULE_LINKER_FLAGS 
+-    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for modules" FORCE)
+-  set( CMAKE_SHARED_LINKER_FLAGS 
+-    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for shared libs" FORCE)
+-endif( NOT LATESTLAPACK_FOUND )
+-
+-message(STATUS "BUILD TESTING : ${BUILD_TESTING}" )
+-if(BUILD_TESTING)
+-  add_subdirectory(TESTING)
+-endif(BUILD_TESTING)
+ 
+-# deprecated LAPACK routines
+-option(BUILD_DEPRECATED "Build deprecated routines" OFF)
++  message(STATUS "BUILD TESTING : ${BUILD_TESTING}")
++  if(BUILD_TESTING)
++    add_subdirectory(TESTING)
++  endif()
++
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++    install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    DESTINATION ${PKG_CONFIG_DIR})
++endif()
+ 
+ # --------------------------------------------------
+ # LAPACKE
+-option(LAPACKE "Build LAPACKE" OFF)
++option(BUILD_LAPACKE "Build LAPACKE" OFF)
+ 
+ # LAPACKE has also the interface to some routines from tmglib,
+ # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+ option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
+ if (LAPACKE_WITH_TMG)
+-  set(LAPACKE ON)
++  set(BUILD_LAPACKE ON)
+   if(NOT BUILD_TESTING)
+      add_subdirectory(TESTING/MATGEN)
+    endif(NOT BUILD_TESTING)
+ endif(LAPACKE_WITH_TMG)
+ 
+-if(LAPACKE)
++if(BUILD_LAPACKE)
++  set(NEED_LAPACK TRUE)
+   add_subdirectory(LAPACKE)
+-endif(LAPACKE)
+-
+-# --------------------------------------------------
+-# CPACK Packaging 
+-
+-SET(CPACK_PACKAGE_NAME "LAPACK")
+-SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")
+-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LAPACK- Linear Algebra Package")
+-set(CPACK_PACKAGE_VERSION_MAJOR 3)
+-set(CPACK_PACKAGE_VERSION_MINOR 5)
+-set(CPACK_PACKAGE_VERSION_PATCH 0)
+-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LAPACK")
+-IF(WIN32 AND NOT UNIX)
+-  # There is a bug in NSI that does not handle full unix paths properly. Make
+-  # sure there is at least one set of four (4) backlasshes.
+-  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\http://icl.cs.utk.edu/lapack-forum")
+-  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.netlib.org/lapack")
+-  SET(CPACK_NSIS_CONTACT "lapack@eecs.utk.edu")
+-  SET(CPACK_NSIS_MODIFY_PATH ON)
+-  SET(CPACK_NSIS_DISPLAY_NAME "LAPACK-${LAPACK_VERSION}")
+-  set(CPACK_PACKAGE_RELOCATABLE "true")
+-ELSE(WIN32 AND NOT UNIX)
+-  SET(CPACK_GENERATOR "TGZ")
+-  SET(CPACK_SOURCE_GENERATOR TGZ)
+-  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lapack-${LAPACK_VERSION}" )
+-  SET(CPACK_SOURCE_IGNORE_FILES ~$ .svn ${CPACK_SOURCE_IGNORE_FILES} )
+-ENDIF(WIN32 AND NOT UNIX)
+-INCLUDE(CPack)
++endif(BUILD_LAPACKE)
+ 
+ 
+-# --------------------------------------------------
+-# By default static library
+-OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF )
+-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
+-#OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
+-
+-if(NOT BLAS_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-endif(NOT BLAS_FOUND)
+-
+-if(NOT LATESTLAPACK_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-endif(NOT LATESTLAPACK_FOUND)
+-
+-if(BUILD_TESTING OR LAPACKE_WITH_TMG)
+-  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
+-
+-# Export lapack targets, not including lapacke, from the
+-# install tree, if any.
+-set(_lapack_config_install_guard_target "")
+-if(ALL_TARGETS)
+-  install(EXPORT lapack-targets
+-    DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION})
+-
+-  # Choose one of the lapack targets to use as a guard for
+-  # lapack-config.cmake to load targets from the install tree.
+-  list(GET ALL_TARGETS 0 _lapack_config_install_guard_target)
++# Neither user specified or optimized BLAS libraries can be used
++if(NEED_BLAS AND NOT BLAS_FOUND)
++  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
+ endif()
+ 
+-# Include cblas in targets exported from the build tree.
+-if(CBLAS)
+-  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-endif(CBLAS)
+-
+-# Include lapacke in targets exported from the build tree.
+-if(LAPACKE)
+-  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-endif(LAPACKE)
+-
+-# Export lapack and lapacke targets from the build tree, if any.
+-set(_lapack_config_build_guard_target "")
+-if(ALL_TARGETS)
+-  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-
+-  # Choose one of the lapack or lapacke targets to use as a guard
+-  # for lapack-config.cmake to load targets from the build tree.
+-  list(GET ALL_TARGETS 0 _lapack_config_build_guard_target)
++# Neither user specified or optimized LAPACK libraries can be used
++if(NEED_LAPACK AND NOT LAPACK_FOUND)
++  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
+ endif()
+-
+-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-  install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  DESTINATION ${PKG_CONFIG_DIR}
+-   )
+-
+-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-
+-include(CMakePackageConfigHelpers)
+-write_basic_package_version_file(
+-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  VERSION ${LAPACK_VERSION}
+-  COMPATIBILITY SameMajorVersion
+-  )
+-
+-install(FILES
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
+-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION}
+-  )
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ message(STATUS "LAPACKE enable")
+ enable_language(C)
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-
+ # Create a header file netlib.h for the routines called in my C programs
+ include(FortranCInterface)
+ FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/lapacke_mangling.h 
+@@ -74,19 +72,3 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+    )
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
+-  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
+-  DESTINATION lib/cmake/lapacke-${LAPACK_VERSION}
+-  )
+-
+-install(EXPORT lapacke-targets
+-  DESTINATION lib/cmake/lapacke-${LAPACK_VERSION})
+diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-build.cmake.in
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "@LAPACK_BINARY_DIR@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapack targets from the build tree, including lapacke targets.
+-if(NOT TARGET lapacke)
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-
+-# Report lapacke header search locations.
+-set(LAPACKE_INCLUDE_DIRS "@LAPACK_SOURCE_DIR@/lapacke/include")
+-
+-# Report lapacke libraries.
+-set(LAPACKE_LIBRARIES lapacke)
+diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-install.cmake.in
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake
+-get_filename_component(_LAPACKE_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_SELF_DIR}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
+-
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapacke targets from the install tree.
+-if(NOT TARGET lapacke)
+-  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-endif()
+-
+-# Report lapacke header search locations.
+-set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
+-
+-# Report lapacke libraries.
+-set(LAPACKE_LIBRARIES lapacke)
+-
+-unset(_LAPACKE_PREFIX)
+-unset(_LAPACKE_SELF_DIR)
+diff --git a/LAPACKE/cmake/lapacke-config-version.cmake.in b/LAPACKE/cmake/lapacke-config-version.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-version.cmake.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-set(PACKAGE_VERSION "@LAPACK_VERSION@")
+-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+-  set(PACKAGE_VERSION_COMPATIBLE 1)
+-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+-    set(PACKAGE_VERSION_EXACT 1)
+-  endif()
+-endif()
+-
diff --git a/academic/cblas/patches/generate-pkgconfig.diff b/academic/cblas/patches/generate-pkgconfig.diff
new file mode 100644
index 0000000000..f481ab8085
--- /dev/null
+++ b/academic/cblas/patches/generate-pkgconfig.diff
@@ -0,0 +1,117 @@
+diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
+--- a/BLAS/CMakeLists.txt
++++ b/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: blas
++Name: BLAS
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapacke
+-Description: C Standard Interface to BLAS Linear Algebra PACKage
++Name: CBLAS
++Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+ Version: @LAPACK_VERSION@
+-URL: http://www.netlib.org/lapack/
++URL: http://www.netlib.org/blas/#_cblas
+ Libs: -L${libdir} -lcblas
+ Requires: blas
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,6 +112,13 @@
+ set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
+ 
++set(prefix ${CMAKE_INSTALL_PREFIX})
++if(NOT IS_ABSOLUTE ${LIBRARY_DIR})
++  set(libdir "\${prefix}/${LIBRARY_DIR}")
++else()
++  set(libdir "${LIBRARY_DIR}")
++endif()
++
+ # --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
+@@ -333,7 +340,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapacke
++Name: LAPACKE
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+ Version: @LAPACK_VERSION@
+-URL: http://www.netlib.org/lapack/
++URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
+ Libs: -L${libdir} -llapacke
+ Requires: lapack blas
+diff --git a/lapack.pc.in b/lapack.pc.in
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapack
++Name: LAPACK
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/
diff --git a/academic/cblas/patches/link-dependencies.diff b/academic/cblas/patches/link-dependencies.diff
new file mode 100644
index 0000000000..31a2bcc642
--- /dev/null
+++ b/academic/cblas/patches/link-dependencies.diff
@@ -0,0 +1,232 @@
+diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -137,13 +137,9 @@
+   
+   
+ add_library(blas ${ALLOBJ})
+-#if(UNIX)
+-#  target_link_libraries(blas m)
+-#endif()
+ set_target_properties(
+   blas PROPERTIES
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+-target_link_libraries(blas)
+ lapack_install_library(blas)
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -6,4 +6,3 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/
+ Libs: -L${libdir} -lblas
+-Libs.private: -lm
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/#_cblas
+ Libs: -L${libdir} -lcblas
+-Requires: blas
++Requires.private: blas
+diff --git a/CBLAS/examples/CMakeLists.txt b/CBLAS/examples/CMakeLists.txt
+--- a/CBLAS/examples/CMakeLists.txt
++++ b/CBLAS/examples/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ add_executable(xexample1_CBLAS cblas_example1.c )
+ add_executable(xexample2_CBLAS cblas_example2.c )
+ 
+-target_link_libraries(xexample1_CBLAS cblas ${BLAS_LIBRARIES})
+-target_link_libraries(xexample2_CBLAS cblas ${BLAS_LIBRARIES})
++target_link_libraries(xexample1_CBLAS cblas)
++target_link_libraries(xexample2_CBLAS cblas)
+ 
+ add_test(example1_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample1_CBLAS)
+ add_test(example2_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample2_CBLAS)
+diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
+--- a/CBLAS/src/CMakeLists.txt
++++ b/CBLAS/src/CMakeLists.txt
+@@ -164,5 +164,9 @@
+ endif(CBLAS_COMPLEX16)
+ 
+ add_library(cblas ${ALLOBJ})
+-target_link_libraries(cblas ${BLAS_LIBRARIES} )
++target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
++set_target_properties(
++  cblas PROPERTIES
++  LINKER_LANGUAGE C
++  )
+ lapack_install_library(cblas)
+diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
+--- a/CBLAS/testing/CMakeLists.txt
++++ b/CBLAS/testing/CMakeLists.txt
+@@ -55,9 +55,9 @@
+   add_executable(xscblat2 c_sblat2.f ${STESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xscblat3 c_sblat3.f ${STESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xscblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xscblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xscblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xscblat1 cblas)
++  target_link_libraries(xscblat2 cblas)
++  target_link_libraries(xscblat3 cblas)
+  
+   add_cblas_test(stest1.out ""   xscblat1)
+   add_cblas_test(stest2.out sin2 xscblat2)
+@@ -71,9 +71,9 @@
+   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xdcblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xdcblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xdcblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xdcblat1 cblas)
++  target_link_libraries(xdcblat2 cblas)
++  target_link_libraries(xdcblat3 cblas)
+  
+   add_cblas_test(dtest1.out ""   xdcblat1)
+   add_cblas_test(dtest2.out din2 xdcblat2)
+@@ -87,9 +87,9 @@
+   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xccblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xccblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xccblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xccblat1 cblas)
++  target_link_libraries(xccblat2 cblas)
++  target_link_libraries(xccblat3 cblas)
+  
+   add_cblas_test(ctest1.out ""   xccblat1)
+   add_cblas_test(ctest2.out cin2 xccblat2)
+@@ -103,9 +103,9 @@
+   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xzcblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xzcblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xzcblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xzcblat1 cblas)
++  target_link_libraries(xzcblat2 cblas)
++  target_link_libraries(xzcblat3 cblas)
+  
+   add_cblas_test(ztest1.out ""   xzcblat1)
+   add_cblas_test(ztest2.out zin2 xzcblat2)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 2.8.10)
+-project(LAPACK Fortran)
++project(LAPACK C Fortran)
+ 
+ set(LAPACK_MAJOR_VERSION 3)
+ set(LAPACK_MINOR_VERSION 6)
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -46,17 +46,21 @@
+ 
+ if (USE_XBLAS)
+    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
++   target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+ else (USE_XBLAS)
+   if (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++   target_link_libraries(lapacke PRIVATE tmglib ${LAPACK_LIBRARIES})
+   else (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++   target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+   endif(LAPACKE_WITH_TMG)
+ endif(USE_XBLAS)
+ 
++set_target_properties(
++  lapacke PROPERTIES
++  LINKER_LANGUAGE C
++  )
+ lapack_install_library(lapacke)
+ INSTALL( FILES ${LAPACKE_INCLUDE} DESTINATION include )
+ 
+diff --git a/LAPACKE/example/CMakeLists.txt b/LAPACKE/example/CMakeLists.txt
+--- a/LAPACKE/example/CMakeLists.txt
++++ b/LAPACKE/example/CMakeLists.txt
+@@ -3,10 +3,10 @@
+ add_executable(xexample_DGELS_rowmajor example_DGELS_rowmajor.c lapacke_example_aux.c lapacke_example_aux.h)
+ add_executable(xexample_DGELS_colmajor example_DGELS_colmajor.c lapacke_example_aux.c lapacke_example_aux.h)
+ 
+-target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGESV_colmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGELS_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGELS_colmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++target_link_libraries(xexample_DGESV_rowmajor lapacke)
++target_link_libraries(xexample_DGESV_colmajor lapacke)
++target_link_libraries(xexample_DGELS_rowmajor lapacke)
++target_link_libraries(xexample_DGELS_colmajor lapacke)
+ 
+ add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
+ add_test(example_DGESV_colmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_colmajor)
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
+ Libs: -L${libdir} -llapacke
+-Requires: lapack blas
++Requires.private: lapack
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -455,12 +455,10 @@
+ list(REMOVE_DUPLICATES ALLOBJ)
+ 
+ add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+-
++target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ set_target_properties(
+   lapack PROPERTIES
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+-
+ lapack_install_library(lapack)
+diff --git a/TESTING/EIG/CMakeLists.txt b/TESTING/EIG/CMakeLists.txt
+--- a/TESTING/EIG/CMakeLists.txt
++++ b/TESTING/EIG/CMakeLists.txt
+@@ -119,7 +119,7 @@
+ 
+ macro(add_eig_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endmacro(add_eig_executable)
+ 
+ if (BUILD_SINGLE)
+diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
+--- a/TESTING/LIN/CMakeLists.txt
++++ b/TESTING/LIN/CMakeLists.txt
+@@ -193,7 +193,7 @@
+ 
+ macro(add_lin_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+diff --git a/lapack.pc.in b/lapack.pc.in
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/
+ Libs: -L${libdir} -llapack
+-Requires: blas
++Requires.private: blas
diff --git a/academic/cblas/patches/target-cleanup.diff b/academic/cblas/patches/target-cleanup.diff
new file mode 100644
index 0000000000..8f15294374
--- /dev/null
+++ b/academic/cblas/patches/target-cleanup.diff
@@ -0,0 +1,776 @@
+diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -113,29 +113,22 @@
+ 
+ set(ZBLAS3 zgemm.f zsymm.f zsyrk.f zsyr2k.f ztrmm.f ztrsm.f 
+ 	zhemm.f zherk.f zher2k.f)
+-# default build all of it
+-set(ALLOBJ ${SBLAS1} ${SBLAS2} ${SBLAS3} ${DBLAS1} ${DBLAS2} ${DBLAS3}	
+-	${CBLAS1} ${CBLAS2} ${CBLAS3} ${ZBLAS1} 
+-	${ZBLAS2} ${ZBLAS3} ${ALLBLAS})
+-
+-if(BLAS_SINGLE)
+-  set(ALLOBJ ${SBLAS1} ${ALLBLAS} 
+-	${SBLAS2} ${SBLAS3})
++
++set(ALLOBJ)
++if(BUILD_SINGLE)
++  list(APPEND ALLOBJ ${SBLAS1} ${ALLBLAS} ${SBLAS2} ${SBLAS3})
+ endif()
+-if(BLAS_DOUBLE)
+-  set(ALLOBJ ${DBLAS1} ${ALLBLAS} 
+-	${DBLAS2} ${DBLAS3})
++if(BUILD_DOUBLE)
++  list(APPEND ALLOBJ ${DBLAS1} ${ALLBLAS} ${DBLAS2} ${DBLAS3})
+ endif()
+-if(BLAS_COMPLEX)
+-  set(ALLOBJ  ${BLASLIB} ${CBLAS1} ${CB1AUX} 
+-	${ALLBLAS} ${CBLAS2})
++if(BUILD_COMPLEX)
++  list(APPEND ALLOBJ ${BLASLIB} ${CBLAS1} ${CB1AUX} ${ALLBLAS} ${CBLAS2} ${CBLAS3})
+ endif()
+-if(BLAS_COMPLEX16)
+-  set(ALLOBJ  ${BLASLIB} ${ZBLAS1} ${ZB1AUX} 
+-	${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
++if(BUILD_COMPLEX16)
++  list(APPEND ALLOBJ ${BLASLIB} ${ZBLAS1} ${ZB1AUX} ${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
+ endif()
+-  
+-  
++list(REMOVE_DUPLICATES ALLOBJ)
++
+ add_library(blas ${ALLOBJ})
+ set_target_properties(
+   blas PROPERTIES
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -65,9 +65,9 @@
+   list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
+ endif()
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-version.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
+   ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
+--- a/CBLAS/src/CMakeLists.txt
++++ b/CBLAS/src/CMakeLists.txt
+@@ -28,34 +28,26 @@
+          cblas_ddot.c  cblas_dsdot.c cblas_dnrm2.c cblas_dasum.c 
+          cblas_idamax.c   ddotsub.f   dsdotsub.f       dnrm2sub.f
+          dasumsub.f idamaxsub.f)
+-
+ #
+ # All object files for single complex precision
+ #
+ set (CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
+          cblas_caxpy.c cblas_cdotu_sub.c cblas_cdotc_sub.c
+          cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f)
+-
+ #
+ # All object files for double complex precision
+ #
+ set (ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
+-         cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c cblas_dznrm2.c
+-         cblas_dzasum.c cblas_izamax.c zdotcsub.f zdotusub.f     
+-         dzasumsub.f  dznrm2sub.f  izamaxsub.f)
+-       
+-
++         cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c
++         cblas_izamax.c zdotcsub.f zdotusub.f izamaxsub.f)
+ #
+ # Common files for single complex precision
+ #
+ set (SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)
+-
+-
+ #
+-# All object files
++# Common files for double complex precision
+ #
+-set (ALEV1 ${slev1} ${dlev1} ${clev1} ${zlev1} ${sclev1})
+-
++set (DZLEV1 cblas_dzasum.c dzasumsub.f cblas_dznrm2.c dznrm2sub.f)
+ 
+ #
+ #
+@@ -72,8 +64,6 @@
+         cblas_sspr.c  cblas_sspr2.c cblas_ssymv.c cblas_ssyr.c  cblas_ssyr2.c
+         cblas_stbmv.c cblas_stbsv.c cblas_stpmv.c cblas_stpsv.c  cblas_strmv.c
+         cblas_strsv.c)
+-
+- 
+ #
+ # All object files for double real precision
+ #
+@@ -81,7 +71,6 @@
+         cblas_dspr.c  cblas_dspr2.c cblas_dsymv.c cblas_dsyr.c  cblas_dsyr2.c
+         cblas_dtbmv.c cblas_dtbsv.c cblas_dtpmv.c cblas_dtpsv.c  cblas_dtrmv.c
+         cblas_dtrsv.c)
+-
+ #
+ # All object files for single complex precision
+ #
+@@ -89,7 +78,6 @@
+         cblas_ctrmv.c cblas_ctbmv.c cblas_ctpmv.c cblas_ctrsv.c cblas_ctbsv.c
+         cblas_ctpsv.c cblas_cgeru.c cblas_cgerc.c cblas_cher.c  cblas_cher2.c
+         cblas_chpr.c  cblas_chpr2.c)
+-
+ #
+ # All object files for double complex precision
+ #
+@@ -97,10 +85,6 @@
+         cblas_ztrmv.c cblas_ztbmv.c cblas_ztpmv.c cblas_ztrsv.c cblas_ztbsv.c
+         cblas_ztpsv.c cblas_zgeru.c cblas_zgerc.c cblas_zher.c  cblas_zher2.c
+         cblas_zhpr.c  cblas_zhpr2.c)
+-#
+-# All object files
+-#
+-set (AVEL2 ${slev2} ${dlev2} ${clev2} ${zlev2})
+ 
+ #
+ #
+@@ -132,36 +116,21 @@
+ set (ZLEV3 cblas_zgemm.c cblas_zsymm.c cblas_zhemm.c cblas_zherk.c
+         cblas_zher2k.c cblas_ztrmm.c cblas_ztrsm.c  cblas_zsyrk.c
+         cblas_zsyr2k.c)
+-#
+-# All object files
+-#
+-set (ALEV3 ${slev3} ${dlev3} ${clev3} ${zlev3})
+-
+-# default build all of it
+-set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND}
+-           ${DLEV1} ${DLEV2} ${DLEV3}
+-           ${CLEV1} ${CLEV2} ${CLEV3} 
+-           ${ZLEV1} ${ZLEV2} ${ZLEV3}   )
+-
+-# Single real precision
+-if(CBLAS_SINGLE)
+- set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND})
+-endif(CBLAS_SINGLE)
+-
+-# Double real precision
+-if(CBLAS_DOUBLE)
+- set(ALLOBJ  ${DLEV1} ${DLEV2} ${DLEV3} ${ERRHAND})
+-endif(CBLAS_DOUBLE)
+-	
+-# Single complex precision
+-if (CBLAS_COMPLEX)
+- set(ALLOBJ  ${CLEV1} ${SCLEV1} ${CLEV2} ${CLEV3} ${ERRHAND})
+-endif(CBLAS_COMPLEX)
+ 
+-# Double complex precision
+-if (CBLAS_COMPLEX16) 
+- set(ALLOBJ  ${ZLEV1} ${ZLEV2} ${ZLEV3} ${ERRHAND})
+-endif(CBLAS_COMPLEX16)
++set(ALLOBJ)
++if(BUILD_SINGLE)
++  list(APPEND ALLOBJ ${SLEV1} ${SCLEV1} ${ERRHAND} ${SLEV2} ${SLEV3})
++endif()
++if(BUILD_DOUBLE)
++  list(APPEND ALLOBJ ${DLEV1} ${DZLEV1} ${ERRHAND} ${DLEV2} ${DLEV3})
++endif()
++if(BUILD_COMPLEX)
++  list(APPEND ALLOBJ ${CLEV1} ${SCLEV1} ${ERRHAND} ${CLEV2} ${CLEV3})
++endif()
++if(BUILD_COMPLEX16) 
++  list(APPEND ALLOBJ ${ZLEV1} ${DZLEV1} ${ERRHAND} ${ZLEV2} ${ZLEV3})
++endif()
++list(REMOVE_DUPLICATES ALLOBJ)
+ 
+ add_library(cblas ${ALLOBJ})
+ target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
+diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile
+--- a/CBLAS/src/Makefile
++++ b/CBLAS/src/Makefile
+@@ -52,9 +52,8 @@
+ # All object files for double complex precision
+ #
+ zlev1 = cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
+-         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
+-         cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o      \
+-         dzasumsub.o  dznrm2sub.o  izamaxsub.o 
++         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o \
++         cblas_izamax.o zdotcsub.o zdotusub.o izamaxsub.o 
+ 
+ #
+ # Common files for single / complex precision
+@@ -62,9 +61,14 @@
+ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
+ 
+ #
++# Common files for double / complex precision
++#
++dzlev1 = cblas_dzasum.o dzasumsub.o cblas_dznrm2.o dznrm2sub.o
++
++#
+ # All object files
+ #
+-alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1)
++alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1) $(dzlev1)
+ 
+ 
+ #
+@@ -77,8 +81,8 @@
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Double real precision
+-dlib1: $(dlev1) 
+-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1)
++dlib1: $(dlev1) $(dzlev1)
++	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1) $(dzlev1)
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Single complex precision
+@@ -87,8 +91,8 @@
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Double complex precision
+-zlib1: $(zlev1)
+-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1)
++zlib1: $(zlev1) $(dzlev1)
++	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1) $(dzlev1)
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # All precisions
+diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
+--- a/CBLAS/testing/CMakeLists.txt
++++ b/CBLAS/testing/CMakeLists.txt
+@@ -28,8 +28,6 @@
+ 
+ # Object files for single real precision
+ SET( STESTL1O c_sblas1.c)
+-
+-SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+ SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+ SET( STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c)
+ 
+@@ -62,11 +60,9 @@
+   add_cblas_test(stest1.out ""   xscblat1)
+   add_cblas_test(stest2.out sin2 xscblat2)
+   add_cblas_test(stest3.out sin3 xscblat3)
+- 
+ endif()
+ 
+ if(BUILD_DOUBLE)
+-
+   add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -78,11 +74,9 @@
+   add_cblas_test(dtest1.out ""   xdcblat1)
+   add_cblas_test(dtest2.out din2 xdcblat2)
+   add_cblas_test(dtest3.out din3 xdcblat3)
+-
+ endif()
+ 
+ if(BUILD_COMPLEX)
+-
+   add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -94,11 +88,9 @@
+   add_cblas_test(ctest1.out ""   xccblat1)
+   add_cblas_test(ctest2.out cin2 xccblat2)
+   add_cblas_test(ctest3.out cin3 xccblat3)
+-
+ endif()
+ 
+ if(BUILD_COMPLEX16)
+-
+   add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -110,5 +102,4 @@
+   add_cblas_test(ztest1.out ""   xzcblat1)
+   add_cblas_test(ztest2.out zin2 xzcblat2)
+   add_cblas_test(ztest3.out zin3 xzcblat3)
+-
+ endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,33 @@
+ # --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
++option(BUILD_SINGLE "Build Single Precision" ON)
++option(BUILD_DOUBLE "Build Double Precision" ON)
++option(BUILD_COMPLEX "Build Complex Precision" ON)
++option(BUILD_COMPLEX16 "Build Double Complex Precision" ON)
++
++set(PRECISIONS)
++if(BUILD_SINGLE)
++  message(STATUS "Building Single Precision")
++  list(APPEND PRECISIONS "single")
++endif()
++if(BUILD_DOUBLE)
++  message(STATUS "Building Double Precision")
++  list(APPEND PRECISIONS "double")
++endif()
++if(BUILD_COMPLEX)
++  message(STATUS "Building Complex Precision")
++  list(APPEND PRECISIONS "complex")
++endif()
++if(BUILD_COMPLEX16)
++  message(STATUS "Building Double Complex Precision")
++  list(APPEND PRECISIONS "complex16")
++endif()
+ 
++if(NOT PRECISIONS)
++    message(FATAL_ERROR "--> Nothing to build, no precision selected.
++    Please enable at least one of these: BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
++endif()
+ 
+ # --------------------------------------------------
+ # Subdirectories that need to be processed
+@@ -214,10 +240,6 @@
+ if(NOT LATESTLAPACK_FOUND)
+   message(STATUS "Using supplied NETLIB LAPACK implementation")
+   set( LAPACK_LIBRARIES lapack )
+-  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
+-  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
+-  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
+-  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
+   add_subdirectory(SRC)
+ else()
+   set( CMAKE_EXE_LINKER_FLAGS 
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -1,22 +1,28 @@
+ #######################################################################
+ #  This is the makefile to create a library for LAPACK.
+ #  The files are organized as follows:
+-#       ALLAUX -- Auxiliary routines called from all precisions
+-#       ALLXAUX -- Auxiliary routines called from all precisions but
+-#                  only from routines using extra precision.
+-#       SCLAUX -- Auxiliary routines called from both REAL and COMPLEX
+-#       DZLAUX -- Auxiliary routines called from both DOUBLE PRECISION
+-#                 and COMPLEX*16
+-#       SLASRC -- Single precision real LAPACK routines
++#       ALLAUX  -- Auxiliary routines called from all precisions
++#
++#       SCLAUX  -- Auxiliary routines called from both REAL and COMPLEX.
++#       DZLAUX  -- Auxiliary routines called from both DOUBLE and COMPLEX*16.
++#
++#       DSLASRC -- Double-single mixed precision real routines called from
++#                  single, single-extra and double precision real LAPACK
++#                  routines (i.e. from SLASRC, SXLASRC, DLASRC).
++#       ZCLASRC -- Double-single mixed precision complex routines called from
++#                  single, single-extra and double precision complex LAPACK
++#                  routines (i.e. from CLASRC, CXLASRC, ZLASRC).
++#
++#       SLASRC  -- Single precision real LAPACK routines
+ #       SXLASRC -- Single precision real LAPACK routines using extra
+ #                  precision.
+-#       CLASRC -- Single precision complex LAPACK routines
++#       CLASRC  -- Single precision complex LAPACK routines
+ #       CXLASRC -- Single precision complex LAPACK routines using extra
+ #                  precision.
+-#       DLASRC -- Double precision real LAPACK routines
++#       DLASRC  -- Double precision real LAPACK routines
+ #       DXLASRC -- Double precision real LAPACK routines using extra
+ #                  precision.
+-#       ZLASRC -- Double precision complex LAPACK routines
++#       ZLASRC  -- Double precision complex LAPACK routines
+ #       ZXLASRC -- Double precision complex LAPACK routines using extra
+ #                  precision.
+ #
+@@ -51,8 +57,6 @@
+     ../INSTALL/ilaver.f ../INSTALL/lsame.f xerbla.f xerbla_array.f
+     ../INSTALL/slamch.f)
+ 
+-set(ALLXAUX )
+-
+ set(SCLAUX  
+    sbdsdc.f 
+    sbdsqr.f sdisna.f slabad.f slacpy.f sladiv.f slae2.f  slaebz.f 
+@@ -97,8 +101,8 @@
+    sgels.f  sgelsd.f sgelss.f sgelsy.f sgeql2.f sgeqlf.f 
+    sgeqp3.f sgeqr2.f sgeqr2p.f sgeqrf.f sgeqrfp.f sgerfs.f sgerq2.f sgerqf.f 
+    sgesc2.f sgesdd.f sgesv.f  sgesvd.f sgesvdx.f sgesvx.f sgetc2.f sgetf2.f 
+-   sgetrf.f sgetrf2.f sgetri.f 
+-   sgetrs.f sggbak.f sggbal.f
++   sgetrf2.f sgetri.f 
++   sggbak.f sggbal.f
+    sgges.f  sgges3.f sggesx.f sggev.f  sggev3.f sggevx.f
+    sggglm.f sgghrd.f sgghd3.f sgglse.f sggqrf.f 
+    sggrqf.f sggsvd3.f sggsvp3.f sgtcon.f sgtrfs.f sgtsv.f  
+@@ -123,7 +127,7 @@
+    sormr3.f sormrq.f sormrz.f sormtr.f spbcon.f spbequ.f spbrfs.f 
+    spbstf.f spbsv.f  spbsvx.f 
+    spbtf2.f spbtrf.f spbtrs.f spocon.f spoequ.f sporfs.f sposv.f  
+-   sposvx.f spotf2.f spotrf.f spotrf2.f spotri.f spotrs.f spstrf.f spstf2.f 
++   sposvx.f spotf2.f spotrf2.f spotri.f spstrf.f spstf2.f 
+    sppcon.f sppequ.f 
+    spprfs.f sppsv.f  sppsvx.f spptrf.f spptri.f spptrs.f sptcon.f 
+    spteqr.f sptrfs.f sptsv.f  sptsvx.f spttrs.f sptts2.f srscl.f  
+@@ -172,8 +176,8 @@
+    cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f 
+    cgesc2.f cgesdd.f cgesv.f  cgesvd.f cgesvdx.f
+    cgesvj.f cgejsv.f cgsvj0.f cgsvj1.f
+-   cgesvx.f cgetc2.f cgetf2.f cgetrf.f cgetrf2.f
+-   cgetri.f cgetrs.f 
++   cgesvx.f cgetc2.f cgetf2.f cgetrf2.f
++   cgetri.f 
+    cggbak.f cggbal.f
+    cgges.f  cgges3.f cggesx.f cggev.f  cggev3.f cggevx.f
+    cggglm.f cgghrd.f cgghd3.f cgglse.f cggqrf.f cggrqf.f 
+@@ -207,7 +211,7 @@
+    claswp.f clasyf.f clasyf_rook.f clatbs.f clatdf.f clatps.f clatrd.f clatrs.f clatrz.f 
+    clauu2.f clauum.f cpbcon.f cpbequ.f cpbrfs.f cpbstf.f cpbsv.f  
+    cpbsvx.f cpbtf2.f cpbtrf.f cpbtrs.f cpocon.f cpoequ.f cporfs.f 
+-   cposv.f  cposvx.f cpotf2.f cpotrf.f cpotrf2.f cpotri.f cpotrs.f cpstrf.f cpstf2.f 
++   cposv.f  cposvx.f cpotf2.f cpotrf2.f cpotri.f cpstrf.f cpstf2.f 
+    cppcon.f cppequ.f cpprfs.f cppsv.f  cppsvx.f cpptrf.f cpptri.f cpptrs.f 
+    cptcon.f cpteqr.f cptrfs.f cptsv.f  cptsvx.f cpttrf.f cpttrs.f cptts2.f 
+    crot.f   cspcon.f cspmv.f  cspr.f   csprfs.f cspsv.f  
+@@ -409,52 +413,45 @@
+    zla_heamv.f zla_hercond_c.f zla_hercond_x.f zla_herpvgrw.f		
+    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
+ 
+-
+-if( USE_XBLAS)
+-  set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})
++if(USE_XBLAS)
++  list(APPEND SLASRC ${SXLASRC})
++  list(APPEND DLASRC ${DXLASRC})
++  list(APPEND CLASRC ${CXLASRC})
++  list(APPEND ZLASRC ${ZXLASRC})
+ endif()
+ 
+ if(BUILD_DEPRECATED)
+-	LIST(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
++  LIST(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
+     DEPRECATED/sgeqpf.f DEPRECATED/sgelsx.f DEPRECATED/sggsvd.f
+     DEPRECATED/sggsvp.f DEPRECATED/slahrd.f DEPRECATED/slatzm.f DEPRECATED/stzrqf.f)
+-	LIST(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
++  LIST(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
+     DEPRECATED/dgeqpf.f DEPRECATED/dgelsx.f DEPRECATED/dggsvd.f
+-    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f )
++    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f)
+   LIST(APPEND CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f
+     DEPRECATED/cgeqpf.f DEPRECATED/cgelsx.f DEPRECATED/cggsvd.f
+     DEPRECATED/cggsvp.f DEPRECATED/clahrd.f DEPRECATED/clatzm.f DEPRECATED/ctzrqf.f)
+   LIST(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f
+     DEPRECATED/zgeqpf.f DEPRECATED/zgelsx.f DEPRECATED/zggsvd.f
+     DEPRECATED/zggsvp.f DEPRECATED/zlahrd.f DEPRECATED/zlatzm.f DEPRECATED/ztzrqf.f)
+-	message(STATUS "Building deprecated routines")
++  message(STATUS "Building LAPACK deprecated routines")
+ endif()
+ 
++set(ALLOBJ)
+ if(BUILD_SINGLE)
+-set(ALLOBJ  ${SLASRC} ${ALLAUX}	${SCLAUX} )
+-message(STATUS "Building Single Precision")
++  list(APPEND ALLOBJ ${SLASRC} ${ALLAUX} ${SCLAUX} ${DSLASRC})
+ endif()
+ if(BUILD_DOUBLE)
+-  set(ALLOBJ ${ALLOBJ} ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
+-message(STATUS "Building Double Precision")
++  list(APPEND ALLOBJ ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
+ endif()
+ if(BUILD_COMPLEX)
+-  set(ALLOBJ ${ALLOBJ} ${CLASRC} ${ALLAUX} ${SCLAUX} )
+-message(STATUS "Building Complex Precision")
++  list(APPEND ALLOBJ ${CLASRC} ${ALLAUX} ${SCLAUX} ${ZCLASRC})
+ endif()
+ if(BUILD_COMPLEX16)
+-  set(ALLOBJ  ${ALLOBJ} ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+-message(STATUS "Building Double Complex Precision")
+-endif()
+-
+-if (NOT ALLOBJ)
+-    message(FATAL_ERROR "-->LAPACK SRC BUILD: NOTHING TO BUILD, NO PRECISION SELECTED:
+-     PLEASE ENABLE AT LEAST ONE OF THOSE: BUILD_SINGLE, BUILD_COMPLEX, BUILD_DOUBLE, BUILD_COMPLEX16.")
++  list(APPEND ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+ endif()
+-
+ list(REMOVE_DUPLICATES ALLOBJ)
+ 
+-add_library(lapack ${ALLOBJ} ${ALLXOBJ})
++add_library(lapack ${ALLOBJ})
+ target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ set_target_properties(
+   lapack PROPERTIES
+diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
+--- a/TESTING/CMakeLists.txt
++++ b/TESTING/CMakeLists.txt
+@@ -289,7 +289,7 @@
+ endif()
+ 
+ 
+-if (BUILD_SIMPLE)
++if (BUILD_SINGLE)
+     if (BUILD_DOUBLE)
+ #
+ # ======== SINGLE-DOUBLE PROTO LIN TESTS ==============
+diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
+--- a/TESTING/LIN/CMakeLists.txt
++++ b/TESTING/LIN/CMakeLists.txt
+@@ -13,10 +13,10 @@
+    schksp.f schksy.f schksy_rook.f schktb.f schktp.f schktr.f 
+    schktz.f 
+    sdrvgt.f sdrvls.f sdrvpb.f 
+-   sdrvpp.f sdrvpt.f sdrvsp.f sdrvsy.f sdrvsy_rook.f
++   sdrvpp.f sdrvpt.f sdrvsp.f sdrvsy_rook.f
+    serrgt.f serrlq.f serrls.f 
+-   serrpo.f serrps.f serrql.f serrqp.f serrqr.f 
+-   serrrq.f serrsy.f serrtr.f serrtz.f serrvx.f 
++   serrps.f serrql.f serrqp.f serrqr.f 
++   serrrq.f serrtr.f serrtz.f 
+    sgbt01.f sgbt02.f sgbt05.f sgelqs.f sgeqls.f sgeqrs.f 
+    sgerqs.f sget01.f sget02.f 
+    sget03.f sget04.f sget06.f sget07.f sgtt01.f sgtt02.f 
+@@ -37,9 +37,11 @@
+    sqrt04.f sqrt05.f schkqrt.f serrqrt.f schkqrtp.f serrqrtp.f)
+ 
+ if(USEXBLAS)
+-  list(APPEND SLINTST sdrvgex.f serrgex.f sdrvgbx.f sdrvpox.f sebchvxx.f)
++  list(APPEND SLINTST serrvxx.f sdrvgex.f sdrvsyx.f serrgex.f sdrvgbx.f sdrvpox.f
++    sebchvxx.f serrsyx.f serrpox.f)
+ else()
+-  list(APPEND SLINTST sdrvge.f serrge.f sdrvgb.f sdrvpo.f)
++  list(APPEND SLINTST serrvx.f sdrvge.f sdrvsy.f serrge.f sdrvgb.f sdrvpo.f
++    serrsy.f serrpo.f)
+ endif()
+ 
+ set(CLINTST  cchkaa.f 
+@@ -48,13 +50,12 @@
+    cchkpo.f cchkps.f cchkpp.f cchkpt.f cchkq3.f cchkql.f 
+    cchkqr.f cchkrq.f cchksp.f cchksy.f cchksy_rook.f cchktb.f 
+    cchktp.f cchktr.f cchktz.f 
+-   cdrvgt.f cdrvhe.f cdrvhe_rook.f cdrvhp.f 
++   cdrvgt.f cdrvhe_rook.f cdrvhp.f 
+    cdrvls.f cdrvpb.f cdrvpp.f cdrvpt.f 
+-   cdrvsp.f cdrvsy.f cdrvsy_rook.f
+-   cerrgt.f cerrhe.f cerrlq.f 
++   cdrvsp.f cdrvsy_rook.f
++   cerrgt.f cerrlq.f 
+    cerrls.f cerrps.f cerrql.f cerrqp.f 
+-   cerrqr.f cerrrq.f cerrsy.f cerrtr.f cerrtz.f 
+-   cerrvx.f 
++   cerrqr.f cerrrq.f cerrtr.f cerrtz.f 
+    cgbt01.f cgbt02.f cgbt05.f cgelqs.f cgeqls.f cgeqrs.f 
+    cgerqs.f cget01.f cget02.f 
+    cget03.f cget04.f cget07.f cgtt01.f cgtt02.f 
+@@ -77,10 +78,11 @@
+    cqrt04.f cqrt05.f cchkqrt.f cerrqrt.f cchkqrtp.f cerrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND 
+-    CLINTST cdrvgex.f cdrvgbx.f cerrgex.f cdrvpox.f cerrpox.f cebchvxx.f)
++  list(APPEND CLINTST cerrvxx.f cdrvgex.f cdrvsyx.f cdrvgbx.f cerrgex.f cdrvpox.f
++    cdrvhex.f cerrpox.f cebchvxx.f cerrsyx.f cerrhex.f)
+ else()
+-  list(APPEND CLINTST cdrvge.f cdrvgb.f cerrge.f cdrvpo.f cerrpo.f)
++  list(APPEND CLINTST cerrvx.f cdrvge.f cdrvsy.f cdrvgb.f cerrge.f cdrvpo.f
++    cdrvhe.f cerrpo.f cerrsy.f cerrhe.f)
+ endif()
+ 
+ set(DLINTST  dchkaa.f 
+@@ -90,10 +92,10 @@
+    dchksp.f dchksy.f dchksy_rook.f dchktb.f dchktp.f dchktr.f 
+    dchktz.f 
+    ddrvgt.f ddrvls.f ddrvpb.f 
+-   ddrvpp.f ddrvpt.f ddrvsp.f ddrvsy.f ddrvsy_rook.f
++   ddrvpp.f ddrvpt.f ddrvsp.f ddrvsy_rook.f
+    derrgt.f derrlq.f derrls.f 
+    derrps.f derrql.f derrqp.f derrqr.f 
+-   derrrq.f derrsy.f derrtr.f derrtz.f derrvx.f 
++   derrrq.f derrtr.f derrtz.f 
+    dgbt01.f dgbt02.f dgbt05.f dgelqs.f dgeqls.f dgeqrs.f 
+    dgerqs.f dget01.f dget02.f 
+    dget03.f dget04.f dget06.f dget07.f dgtt01.f dgtt02.f 
+@@ -114,11 +116,11 @@
+    dqrt04.f dqrt05.f dchkqrt.f derrqrt.f dchkqrtp.f derrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND 
+-    DLINTST  ddrvgex.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f debchvxx.f)
++  list(APPEND DLINTST derrvxx.f ddrvgex.f ddrvsyx.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f
++    debchvxx.f derrsyx.f)
+ else()
+-  list(APPEND
+-    DLINTST  ddrvge.f ddrvgb.f derrge.f ddrvpo.f derrpo.f)
++  list(APPEND DLINTST derrvx.f ddrvge.f ddrvsy.f ddrvgb.f derrge.f ddrvpo.f derrpo.f
++    derrsy.f)
+ endif()
+ 
+ set(ZLINTST  zchkaa.f 
+@@ -127,17 +129,16 @@
+    zchkpo.f zchkps.f zchkpp.f zchkpt.f zchkq3.f zchkql.f 
+    zchkqr.f zchkrq.f zchksp.f zchksy.f zchksy_rook.f zchktb.f 
+    zchktp.f zchktr.f zchktz.f 
+-   zdrvgt.f zdrvhe.f zdrvhe_rook.f zdrvhp.f 
++   zdrvgt.f zdrvhe_rook.f zdrvhp.f 
+    zdrvls.f zdrvpb.f zdrvpp.f zdrvpt.f 
+-   zdrvsp.f zdrvsy.f zdrvsy_rook.f 
+-   zerrgt.f zerrhe.f zerrlq.f 
++   zdrvsp.f zdrvsy_rook.f 
++   zerrgt.f zerrlq.f 
+    zerrls.f zerrps.f zerrql.f zerrqp.f 
+-   zerrqr.f zerrrq.f zerrsy.f zerrtr.f zerrtz.f 
+-   zerrvx.f 
++   zerrqr.f zerrrq.f zerrtr.f zerrtz.f 
+    zgbt01.f zgbt02.f zgbt05.f zgelqs.f zgeqls.f zgeqrs.f 
+    zgerqs.f zget01.f zget02.f 
+    zget03.f zget04.f zget07.f zgtt01.f zgtt02.f 
+-   zgtt05.f zhet01.f zhet01.f zhet01_rook.f zhpt01.f zlaipd.f zlaptm.f zlarhs.f zlatb4.f zlatb5.f 
++   zgtt05.f zhet01.f zhet01_rook.f zhpt01.f zlaipd.f zlaptm.f zlarhs.f zlatb4.f zlatb5.f 
+    zlatsp.f zlatsy.f zlattb.f zlattp.f zlattr.f 
+    zlavhe.f zlavhe_rook.f zlavhp.f zlavsp.f zlavsy.f zlavsy_rook.f zlqt01.f 
+    zlqt02.f zlqt03.f zpbt01.f zpbt02.f zpbt05.f 
+@@ -156,11 +157,11 @@
+    zqrt04.f zqrt05.f zchkqrt.f zerrqrt.f zchkqrtp.f zerrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND
+-    ZLINTST  zdrvgex.f zdrvgbx.f zerrgex.f zdrvpox.f zerrpox.f zebchvxx.f)
++  list(APPEND ZLINTST zerrvxx.f zdrvgex.f zdrvsyx.f zdrvgbx.f zerrgex.f zdrvpox.f zdrvhex.f
++    zerrpox.f zebchvxx.f zerrsyx.f zerrhex.f)
+ else()
+-  list(APPEND
+-    ZLINTST  zdrvge.f zdrvgb.f zerrge.f zdrvpo.f zerrpo.f)
++  list(APPEND ZLINTST zerrvx.f zdrvge.f zdrvsy.f zdrvgb.f zerrge.f zdrvpo.f zdrvhe.f
++    zerrpo.f zerrsy.f zerrhe.f)
+ endif()
+ 
+ set(DSLINTST  dchkab.f 
+@@ -197,29 +198,29 @@
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+-add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} ${SECOND_SRC} )
++add_lin_executable(xlintsts ${ALINTST} ${SLINTST} ${SCLNTST} ${SECOND_SRC})
+ add_lin_executable(xlintstrfs ${SLINTSTRFP} ${SECOND_SRC})
+ endif()
+ 
+ if(BUILD_DOUBLE)
+-add_lin_executable(xlintstd  ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
++add_lin_executable(xlintstd ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
+ add_lin_executable(xlintstrfd ${DLINTSTRFP} ${DSECOND_SRC})
+ endif()
+ 
+ IF(BUILD_SINGLE AND BUILD_DOUBLE)
+-add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
++add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC})
+ endif()
+ 
+ if(BUILD_COMPLEX)
+-add_lin_executable(xlintstc  ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC} )
+-add_lin_executable(xlintstrfc  ${CLINTSTRFP} ${SECOND_SRC})
++add_lin_executable(xlintstc ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC})
++add_lin_executable(xlintstrfc ${CLINTSTRFP} ${SECOND_SRC})
+ endif()
+ 
+ if(BUILD_COMPLEX16)
+-add_lin_executable(xlintstz  ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
++add_lin_executable(xlintstz ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
+ add_lin_executable(xlintstrfz ${ZLINTSTRFP} ${DSECOND_SRC})
+ endif()
+ 
+ IF(BUILD_COMPLEX AND BUILD_COMPLEX16)
+-add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
++add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC})
+ endif()
+diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt
+--- a/TESTING/MATGEN/CMakeLists.txt
++++ b/TESTING/MATGEN/CMakeLists.txt
+@@ -31,45 +31,41 @@
+ #
+ #######################################################################
+  
+-set(SCATGEN  slatm1.f slaran.f slarnd.f)
++set(SCATGEN  slatm1.f slatm7.f slaran.f slarnd.f)
+ 
+ set(SMATGEN  slatms.f slatme.f slatmr.f slatmt.f 
+    slagge.f slagsy.f slakf2.f slarge.f slaror.f slarot.f slatm2.f 
+-   slatm3.f slatm5.f slatm6.f slatm7.f slahilb.f)
++   slatm3.f slatm5.f slatm6.f slahilb.f)
+ 
+ set(CMATGEN  clatms.f clatme.f clatmr.f clatmt.f 
+    clagge.f claghe.f clagsy.f clakf2.f clarge.f claror.f clarot.f 
+-   clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f slatm7.f)
++   clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f)
+ 
+-set(DZATGEN  dlatm1.f dlaran.f dlarnd.f)
++set(DZATGEN  dlatm1.f dlatm7.f dlaran.f dlarnd.f)
+ 
+ set(DMATGEN  dlatms.f dlatme.f dlatmr.f dlatmt.f 
+    dlagge.f dlagsy.f dlakf2.f dlarge.f dlaror.f dlarot.f dlatm2.f 
+-   dlatm3.f dlatm5.f dlatm6.f dlatm7.f dlahilb.f)
++   dlatm3.f dlatm5.f dlatm6.f dlahilb.f)
+ 
+ set(ZMATGEN  zlatms.f zlatme.f zlatmr.f zlatmt.f 
+-  zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f 
+-  zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f dlatm7.f)
++   zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f 
++   zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f)
+ 
++set(ALLOBJ)
+ if(BUILD_SINGLE)
+-  set(ALLOBJ ${SMATGEN} ${SCATGEN})
++  list(APPEND ALLOBJ ${SMATGEN} ${SCATGEN})
+ endif()
+ if(BUILD_DOUBLE)
+-  set(ALLOBJ ${ALLOBJ} ${DMATGEN} ${DZATGEN})
++  list(APPEND ALLOBJ ${DMATGEN} ${DZATGEN})
+ endif()
+ if(BUILD_COMPLEX)
+-  set(ALLOBJ  ${ALLOBJ} ${CMATGEN} ${SCATGEN})
++  list(APPEND ALLOBJ ${CMATGEN} ${SCATGEN})
+ endif()
+ if(BUILD_COMPLEX16)
+-  set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
++  LIST(APPEND ALLOBJ ${ZMATGEN} ${DZATGEN})
+ endif()
++list(REMOVE_DUPLICATES ALLOBJ)
+ 
+-if (NOT ALLOBJ)
+-set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
+-  ${DZATGEN})
+-else()
+-  list(REMOVE_DUPLICATES ALLOBJ)
+-endif()
+-add_library(tmglib ${ALLOBJ} )
++add_library(tmglib ${ALLOBJ})
+ target_link_libraries(tmglib ${LAPACK_LIBRARIES})
+ lapack_install_library(tmglib)
+diff --git a/TESTING/MATGEN/Makefile b/TESTING/MATGEN/Makefile
+--- a/TESTING/MATGEN/Makefile
++++ b/TESTING/MATGEN/Makefile
+@@ -33,21 +33,21 @@
+ #
+ #######################################################################
+  
+-SCATGEN = slatm1.o slaran.o slarnd.o
++SCATGEN = slatm1.o slatm7.o slaran.o slarnd.o
+ 
+ SMATGEN = slatms.o slatme.o slatmr.o slatmt.o \
+    slagge.o slagsy.o slakf2.o slarge.o slaror.o slarot.o slatm2.o \
+-   slatm3.o slatm5.o slatm6.o slatm7.o slahilb.o
++   slatm3.o slatm5.o slatm6.o slahilb.o
+ 
+ CMATGEN = clatms.o clatme.o clatmr.o clatmt.o \
+    clagge.o claghe.o clagsy.o clakf2.o clarge.o claror.o clarot.o \
+    clatm1.o clarnd.o clatm2.o clatm3.o clatm5.o clatm6.o clahilb.o
+ 
+-DZATGEN = dlatm1.o dlaran.o dlarnd.o
++DZATGEN = dlatm1.o dlatm7.o dlaran.o dlarnd.o
+ 
+ DMATGEN = dlatms.o dlatme.o dlatmr.o dlatmt.o \
+    dlagge.o dlagsy.o dlakf2.o dlarge.o dlaror.o dlarot.o dlatm2.o \
+-   dlatm3.o dlatm5.o dlatm6.o dlatm7.o dlahilb.o
++   dlatm3.o dlatm5.o dlatm6.o dlahilb.o
+ 
+ ZMATGEN = zlatms.o zlatme.o zlatmr.o zlatmt.o \
+    zlagge.o zlaghe.o zlagsy.o zlakf2.o zlarge.o zlaror.o zlarot.o \
diff --git a/academic/ccolamd/ccolamd.SlackBuild b/academic/ccolamd/ccolamd.SlackBuild
index 1f027a88b3..5781e1e0c0 100644
--- a/academic/ccolamd/ccolamd.SlackBuild
+++ b/academic/ccolamd/ccolamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CCOLAMD
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=ccolamd
 SRCNAM=SuiteSparse
 SUBDIR=CCOLAMD
 VERSION=${VERSION:-2.9.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/ccolamd/ccolamd.info b/academic/ccolamd/ccolamd.info
index 0cad15db5b..73daf166e9 100644
--- a/academic/ccolamd/ccolamd.info
+++ b/academic/ccolamd/ccolamd.info
@@ -1,8 +1,8 @@
 PRGNAM="ccolamd"
 VERSION="2.9.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/cholmod/autotoolize.diff b/academic/cholmod/autotoolize.diff
index 8c87d18771..e25303da87 100644
--- a/academic/cholmod/autotoolize.diff
+++ b/academic/cholmod/autotoolize.diff
@@ -193,7 +193,7 @@ diff --git a/Doc/Makefile.am b/Doc/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/Doc/Makefile.am
-@@ -0,0 +1,436 @@
+@@ -0,0 +1,437 @@
 +EXTRA_DIST = \
 +	ChangeLog
 +
@@ -252,6 +252,7 @@ new file mode 100644
 +	_ldlsolve_m.tex \
 +	_ldlsplit_m.tex \
 +	_ldlupdate_m.tex \
++	_ldlrowmod_m.tex \
 +	_metis_m.tex \
 +	_mread_m.tex \
 +	_mwrite_m.tex \
@@ -760,7 +761,7 @@ diff --git a/MATLAB/Makefile.am b/MATLAB/Makefile.am
 new file mode 100644
 --- /dev/null
 +++ b/MATLAB/Makefile.am
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
 +# Needed by Doc/Makefile.am
 +EXTRA_DIST = \
 +	analyze.m \
@@ -777,6 +778,7 @@ new file mode 100644
 +	ldlsolve.m \
 +	ldlsplit.m \
 +	ldlupdate.m \
++	ldlrowmod.m \
 +	metis.m \
 +	mread.m \
 +	mwrite.m \
@@ -1446,7 +1448,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([CHOLMOD],[3.0.5],[DrTimothyAldenDavis@gmail.com],[cholmod],[http://www.suitesparse.com/])
++AC_INIT([CHOLMOD],[3.0.6],[DrTimothyAldenDavis@gmail.com],[cholmod],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Core/cholmod_common.c])
 +AC_CONFIG_HEADERS([config.h Include/cholmod_config.h])
 +AM_INIT_AUTOMAKE([foreign])
diff --git a/academic/cholmod/cholmod.SlackBuild b/academic/cholmod/cholmod.SlackBuild
index 24dcc2ecac..9b04c77c05 100644
--- a/academic/cholmod/cholmod.SlackBuild
+++ b/academic/cholmod/cholmod.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CHOLMOD
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 PRGNAM=cholmod
 SRCNAM=SuiteSparse
 SUBDIR=CHOLMOD
-VERSION=${VERSION:-3.0.5}
-SRCVER=${SRCVER:-4.4.4}
+VERSION=${VERSION:-3.0.6}
+SRCVER=${SRCVER:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/cholmod/cholmod.info b/academic/cholmod/cholmod.info
index b998ea9b34..6c6c72a93a 100644
--- a/academic/cholmod/cholmod.info
+++ b/academic/cholmod/cholmod.info
@@ -1,8 +1,8 @@
 PRGNAM="cholmod"
-VERSION="3.0.5"
+VERSION="3.0.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack suitesparseconfig amd camd colamd ccolamd"
diff --git a/academic/cld2/cld2.SlackBuild b/academic/cld2/cld2.SlackBuild
index 3f42a1e4ec..30b4ec2d0c 100644
--- a/academic/cld2/cld2.SlackBuild
+++ b/academic/cld2/cld2.SlackBuild
@@ -64,6 +64,7 @@ rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+chown -R root:root .
 
 ( cd internal
   g++ -shared $SLKCFLAGS \
diff --git a/academic/colamd/colamd.SlackBuild b/academic/colamd/colamd.SlackBuild
index 68a52fab71..0f5675bfc5 100644
--- a/academic/colamd/colamd.SlackBuild
+++ b/academic/colamd/colamd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for COLAMD
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=colamd
 SRCNAM=SuiteSparse
 SUBDIR=COLAMD
 VERSION=${VERSION:-2.9.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/colamd/colamd.info b/academic/colamd/colamd.info
index f724197f39..c32425663b 100644
--- a/academic/colamd/colamd.info
+++ b/academic/colamd/colamd.info
@@ -1,8 +1,8 @@
 PRGNAM="colamd"
 VERSION="2.9.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/copasi/copasi.SlackBuild b/academic/copasi/copasi.SlackBuild
index 251bafc8ed..c8d7c71843 100644
--- a/academic/copasi/copasi.SlackBuild
+++ b/academic/copasi/copasi.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=copasi
-VERSION=${VERSION:-4.14.89}
+VERSION=${VERSION:-4.16.104}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/copasi/copasi.info b/academic/copasi/copasi.info
index 493a785552..a7ae0162e4 100644
--- a/academic/copasi/copasi.info
+++ b/academic/copasi/copasi.info
@@ -1,10 +1,10 @@
 PRGNAM="copasi"
-VERSION="4.14.89"
+VERSION="4.16.104"
 HOMEPAGE="http://www.copasi.org"
-DOWNLOAD="http://www.comp-sys-bio.org/mirror.copasi.org/COPASI-4.14.89-Linux-32bit.tar.gz"
-MD5SUM="f03dd4be25d458d9770229ceb6ac1c4d"
-DOWNLOAD_x86_64="http://www.comp-sys-bio.org/mirror.copasi.org/COPASI-4.14.89-Linux-64bit.tar.gz"
-MD5SUM_x86_64="1f8664af02564e3a6b490f80690c6827"
+DOWNLOAD="https://github.com/copasi/COPASI/releases/download/Build-104/COPASI-4.16.104-Linux-32bit.tar.gz"
+MD5SUM="0aba3e72f8c245d306926f271b998da8"
+DOWNLOAD_x86_64="https://github.com/copasi/COPASI/releases/download/Build-104/COPASI-4.16.104-Linux-64bit.tar.gz"
+MD5SUM_x86_64="8525a65d620bafa5da3045fbf12ba6b5"
 REQUIRES=""
 MAINTAINER="Pedro Mendes"
 EMAIL="pedro@gepasi.org"
diff --git a/academic/csparse/csparse.SlackBuild b/academic/csparse/csparse.SlackBuild
index 8be9440b26..525a66f6b0 100644
--- a/academic/csparse/csparse.SlackBuild
+++ b/academic/csparse/csparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CSparse
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=csparse
 SRCNAM=SuiteSparse
 SUBDIR=CSparse
 VERSION=${VERSION:-3.1.4}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/csparse/csparse.info b/academic/csparse/csparse.info
index f205ff0945..4fdd26444f 100644
--- a/academic/csparse/csparse.info
+++ b/academic/csparse/csparse.info
@@ -1,8 +1,8 @@
 PRGNAM="csparse"
 VERSION="3.1.4"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/cutadapt/cutadapt.SlackBuild b/academic/cutadapt/cutadapt.SlackBuild
index b35b4abc96..a7726bb702 100644
--- a/academic/cutadapt/cutadapt.SlackBuild
+++ b/academic/cutadapt/cutadapt.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cutadapt
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/cutadapt/cutadapt.info b/academic/cutadapt/cutadapt.info
index d898344bec..69903433f9 100644
--- a/academic/cutadapt/cutadapt.info
+++ b/academic/cutadapt/cutadapt.info
@@ -1,8 +1,8 @@
 PRGNAM="cutadapt"
-VERSION="1.8.1"
+VERSION="1.9"
 HOMEPAGE="https://pypi.python.org/pypi/cutadapt/"
-DOWNLOAD="https://pypi.python.org/packages/source/c/cutadapt/cutadapt-1.8.1.tar.gz"
-MD5SUM="bcc9cc9d5ac5c8fc5bf91aad42fa7f82"
+DOWNLOAD="https://pypi.python.org/packages/source/c/cutadapt/cutadapt-1.9.tar.gz"
+MD5SUM="9823e4ab3fd493eecae70bb2be9159f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/cutadapt/slack-desc b/academic/cutadapt/slack-desc
index 3f5f023923..a5720ff310 100644
--- a/academic/cutadapt/slack-desc
+++ b/academic/cutadapt/slack-desc
@@ -13,7 +13,7 @@ cutadapt: tails and other types of unwanted sequence from your high-
 cutadapt: throughput sequencing reads.
 cutadapt:
 cutadapt: Home: https://pypi.python.org/pypi/cutadapt/
-cutadapt: Reference: /usr/doc/cutadapt-1.8.1/CITATION
+cutadapt: Reference: /usr/doc/cutadapt-1.9/CITATION
 cutadapt:
 cutadapt:
 cutadapt:
diff --git a/academic/cxsparse/cxsparse.SlackBuild b/academic/cxsparse/cxsparse.SlackBuild
index cae73a0f0d..92aa69728b 100644
--- a/academic/cxsparse/cxsparse.SlackBuild
+++ b/academic/cxsparse/cxsparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CXSparse
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=cxsparse
 SRCNAM=SuiteSparse
 SUBDIR=CXSparse
 VERSION=${VERSION:-3.1.4}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/cxsparse/cxsparse.info b/academic/cxsparse/cxsparse.info
index cce53c17d0..ddf8b52825 100644
--- a/academic/cxsparse/cxsparse.info
+++ b/academic/cxsparse/cxsparse.info
@@ -1,8 +1,8 @@
 PRGNAM="cxsparse"
 VERSION="3.1.4"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/evopedia_qt/evopedia_qt.info b/academic/evopedia_qt/evopedia_qt.info
index 745056024e..bb2828094f 100644
--- a/academic/evopedia_qt/evopedia_qt.info
+++ b/academic/evopedia_qt/evopedia_qt.info
@@ -2,7 +2,7 @@ PRGNAM="evopedia_qt"
 VERSION="0.4.4"
 HOMEPAGE="http://evopedia.info"
 DOWNLOAD="https://github.com/evopedia/evopedia_qt/archive/v0.4.4.zip"
-MD5SUM="5d3745df1e21c6c83ff84eff69da18b9"  
+MD5SUM="3418c22e5d69baa06fe0de7de7c57110"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/fann/fann.SlackBuild b/academic/fann/fann.SlackBuild
index 482ca9365c..cd11930822 100644
--- a/academic/fann/fann.SlackBuild
+++ b/academic/fann/fann.SlackBuild
@@ -53,6 +53,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix install destination of .pc file
+sed -i \
+  -e 's:/lib/pkgconfig:/lib${LIB_SUFFIX}/pkgconfig:' \
+  CMakeLists.txt
+
 mkdir -p build
 cd build
   cmake \
diff --git a/academic/fet/fet.SlackBuild b/academic/fet/fet.SlackBuild
index a8126f10de..0f76c80121 100644
--- a/academic/fet/fet.SlackBuild
+++ b/academic/fet/fet.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fet
-VERSION=${VERSION:-5.27.5}
+VERSION=${VERSION:-5.28.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -78,15 +78,9 @@ mkdir -p $PKG/usr/bin
 cp $TMP/$PRGNAM-$VERSION/fet $PKG/usr/bin/fet
 cp $TMP/$PRGNAM-$VERSION/fet-cl $PKG/usr/bin/fet-cl
 
-#mkdir -p $PKG/usr/man
-#mv $TMP/$PRGNAM-$VERSION/doc/fet.1 $PKG/usr/man
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-#find $PKG/usr/man -type f -exec gzip -9 {} \;
-#for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a REFERENCES COPYING AUTHORS THANKS TRANSLATORS TODO README ChangeLog \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/fet/fet.info b/academic/fet/fet.info
index d5f9511a45..d1a534288f 100644
--- a/academic/fet/fet.info
+++ b/academic/fet/fet.info
@@ -1,8 +1,8 @@
 PRGNAM="fet"
-VERSION="5.27.5"
+VERSION="5.28.3"
 HOMEPAGE="http://www.lalescu.ro/liviu/fet/"
-DOWNLOAD="http://www.lalescu.ro/liviu/fet/download/fet-5.27.5.tar.bz2"
-MD5SUM="909b57df30032f42397f007c83a0278f"
+DOWNLOAD="http://www.lalescu.ro/liviu/fet/download/fet-5.28.3.tar.bz2"
+MD5SUM="8d993402ed5c244984cc124a3eb79d59"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/fet/slack-desc b/academic/fet/slack-desc
index 5f6c7763f6..3f06286e4d 100644
--- a/academic/fet/slack-desc
+++ b/academic/fet/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-fet: fet (scholl timetable)
+fet: fet (school timetable)
 fet:
 fet: FET is open source free software for automatically scheduling
 fet: the timetable of a school, high-school or university.
diff --git a/academic/freechartgeany/freechartgeany.SlackBuild b/academic/freechartgeany/freechartgeany.SlackBuild
index be7b1fe5f4..52d22d3368 100644
--- a/academic/freechartgeany/freechartgeany.SlackBuild
+++ b/academic/freechartgeany/freechartgeany.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for freechartgeany
 
-# Copyright 2012-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=freechartgeany
-VERSION=${VERSION:-1.1.5}
+VERSION=${VERSION:-2.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,15 +67,10 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix paths.
-sed -i \
-  -e "/target.path/s|/usr/libexec/$PRGNAM|/usr/bin|" \
-  -e "/manual.path/s|/usr/libexec/$PRGNAM|/usr/doc/${PRGNAM}-${VERSION}|" \
-  FreeChartGeany.pro
-
-qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" -o Makefile FreeChartGeany.pro
+qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+  -o Makefile FreeChartGeany.pro
 
 make
 make install INSTALL_ROOT=$PKG
@@ -84,13 +79,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Install .desktop item and icons.
-sed -i "/^Icon/s|=.*|=${PRGNAM}|" $PRGNAM.desktop
-install -D -m 0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+sed -i "/^Icon/s|=.*|=${PRGNAM}|" $PKG/usr/share/applications/$PRGNAM.desktop
+rm -rf $PKG/usr/share/pixmaps
 for i in 16 32 64 128; do
   install -D -m 0644 images/icons/logo${i}.png \
     $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
 done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING images/icons/Readme.rtf licenses/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/freechartgeany/freechartgeany.info b/academic/freechartgeany/freechartgeany.info
index 12af7cf666..432a9bf37b 100644
--- a/academic/freechartgeany/freechartgeany.info
+++ b/academic/freechartgeany/freechartgeany.info
@@ -1,8 +1,8 @@
 PRGNAM="freechartgeany"
-VERSION="1.1.5"
+VERSION="2.0.2"
 HOMEPAGE="http://freechartgeany.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/freechartgeany/freechartgeany-1.1.5.tar.gz"
-MD5SUM="97b97e1dffe003a64d63e2b14b3a5e60"
+DOWNLOAD="http://downloads.sourceforge.net/freechartgeany/freechartgeany-2.0.2.tar.gz"
+MD5SUM="a555a88787105921a40c65e2667be560"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/galculator/galculator.SlackBuild b/academic/galculator/galculator.SlackBuild
index 6a35ff15a2..5eab3e17a3 100644
--- a/academic/galculator/galculator.SlackBuild
+++ b/academic/galculator/galculator.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for galculator
 
 # Copyright 2008, 2009  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=galculator
-VERSION=${VERSION:-2.1.3}
+VERSION=${VERSION:-2.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,10 +70,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-LDFLAGS+=' -lm' \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
diff --git a/academic/galculator/galculator.info b/academic/galculator/galculator.info
index 539c48b879..2a2b57062e 100644
--- a/academic/galculator/galculator.info
+++ b/academic/galculator/galculator.info
@@ -1,8 +1,8 @@
 PRGNAM="galculator"
-VERSION="2.1.3"
-HOMEPAGE="http://galculator.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/galculator/galculator-2.1.3.tar.bz2"
-MD5SUM="a7a333cc4c321507434fe3f8e48fcd0a"
+VERSION="2.1.4"
+HOMEPAGE="https://github.com/galculator/galculator"
+DOWNLOAD="https://github.com/galculator/galculator/archive/v2.1.4.tar.gz"
+MD5SUM="179dbce433ca79f0662ec6a02b4ddb56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/galculator/slack-desc b/academic/galculator/slack-desc
index cef2da99ae..994e3a8d87 100644
--- a/academic/galculator/slack-desc
+++ b/academic/galculator/slack-desc
@@ -12,7 +12,7 @@ galculator: galculator is a GTK 2 based calculator with ordinary notation/revers
 galculator: polish notation, a formula entry mode, different number bases (DEC,
 galculator: HEX, OCT, BIN) and different units of angular measure (DEG, RAD, GRAD)
 galculator:
-galculator: Homepage: http://galculator.sourceforge.net/
+galculator: Homepage: https://github.com/galculator/galculator
 galculator:
 galculator:
 galculator:
diff --git a/academic/gcompris/gcompris.SlackBuild b/academic/gcompris/gcompris.SlackBuild
index 70c87b17bb..3fffd13cd0 100644
--- a/academic/gcompris/gcompris.SlackBuild
+++ b/academic/gcompris/gcompris.SlackBuild
@@ -28,7 +28,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gcompris
-VERSION=${VERSION:-15.02}
+VERSION=${VERSION:-15.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/gcompris/gcompris.info b/academic/gcompris/gcompris.info
index 9b4d20b4b3..f35e3fc206 100644
--- a/academic/gcompris/gcompris.info
+++ b/academic/gcompris/gcompris.info
@@ -1,8 +1,8 @@
 PRGNAM="gcompris"
-VERSION="15.02"
+VERSION="15.10"
 HOMEPAGE="http://gcompris.net/"
-DOWNLOAD="http://gcompris.net/download/gcompris-15.02.tar.bz2"
-MD5SUM="aea8bc66d4c359a514b0c89c6fba96ef"
+DOWNLOAD="http://gcompris.net/download/gcompris-15.10.tar.bz2"
+MD5SUM="89a337a23b8da94347e0f03f2e4a863f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/genometools/genometools.SlackBuild b/academic/genometools/genometools.SlackBuild
index 21e0f6aedf..876198a7f3 100644
--- a/academic/genometools/genometools.SlackBuild
+++ b/academic/genometools/genometools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=genometools
-VERSION=${VERSION:-1.5.6}
+VERSION=${VERSION:-1.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/genometools/genometools.info b/academic/genometools/genometools.info
index 155d42693e..9ba7c4dc6f 100644
--- a/academic/genometools/genometools.info
+++ b/academic/genometools/genometools.info
@@ -1,8 +1,8 @@
 PRGNAM="genometools"
-VERSION="1.5.6"
+VERSION="1.5.7"
 HOMEPAGE="http://genometools.org/"
-DOWNLOAD="http://genometools.org/pub/genometools-1.5.6.tar.gz"
-MD5SUM="0f055e6f6222af3dbf01936be7f8ef9b"
+DOWNLOAD="http://genometools.org/pub/genometools-1.5.7.tar.gz"
+MD5SUM="da56d43c2386ff18f5627e9efe5bab7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/genometools/slack-desc b/academic/genometools/slack-desc
index 9731c166b0..07eec7085a 100644
--- a/academic/genometools/slack-desc
+++ b/academic/genometools/slack-desc
@@ -14,6 +14,6 @@ genometools: combined into a single binary named gt. It is based on a C
 genometools: library named "libgenometools" which consists of several modules.
 genometools:
 genometools: Home: http://genometools.org/
-genometools: References: /usr/doc/genometools-1.5.6/References
+genometools: References: /usr/doc/genometools-1.5.7/References
 genometools:
 genometools:
diff --git a/academic/gretl/gretl.SlackBuild b/academic/gretl/gretl.SlackBuild
index bfb32e4ddb..6b741b59ca 100644
--- a/academic/gretl/gretl.SlackBuild
+++ b/academic/gretl/gretl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gretl
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-2015d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -115,7 +115,7 @@ Icon=gretl
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Science
+Categories=Education
 EOF
 
 cd $PKG
diff --git a/academic/gretl/gretl.info b/academic/gretl/gretl.info
index d31764d5dd..0836d14ede 100644
--- a/academic/gretl/gretl.info
+++ b/academic/gretl/gretl.info
@@ -1,12 +1,12 @@
 PRGNAM="gretl"
-VERSION="1.10.1"
+VERSION="2015d"
 HOMEPAGE="http://gretl.sourceforge.net/"
-DOWNLOAD="http://prdownloads.sourceforge.net/gretl/gretl-1.10.1.tar.xz \
-	  http://downloads.sourceforge.net/project/gretl/manual/gretl-ref-a4.pdf \
+DOWNLOAD="http://prdownloads.sourceforge.net/gretl/gretl-2015d.tar.xz \
+	  http://downloads.sourceforge.net/project/gretl/manual/gretl-ref.pdf \
 	  http://downloads.sourceforge.net/project/gretl/manual/gretl-guide.pdf"
-MD5SUM="3dc420e6f8cc4f27181466958bb2b026 \
-	e98dd5c5c24abc56b3afe086b73d13da \
-	0dd9196fa0352920a69c93a449f4c1dc"
+MD5SUM="124f99d1b81b0d2e808c6c03d8133e5c \
+	74dc0e8335e33eb71073e1b46f45d1c5 \
+	422c8e4ad3e3f5e42796557f3b02a7a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtksourceview3 json-glib lapack unixODBC"
diff --git a/academic/gwyddion/README b/academic/gwyddion/README
index 2a148846ec..31d14706f4 100644
--- a/academic/gwyddion/README
+++ b/academic/gwyddion/README
@@ -2,6 +2,6 @@ Gwyddion is a modular program for SPM (scanning probe microscopy) data
 visualization and analysis. Primarily it is intended for analysis of
 height fields obtained by means of scanning probe microscopy techniques
 (AFM, MFM, STM, SNOM/NSOM), however it can be generally used for any other
-height field and image analysis
+height field and image analysis.
 
 libminizip and cfitsio are the optional dependencies.
diff --git a/academic/gwyddion/doinst.sh b/academic/gwyddion/doinst.sh
index 7e15f42bf4..24d14dac14 100644
--- a/academic/gwyddion/doinst.sh
+++ b/academic/gwyddion/doinst.sh
@@ -22,3 +22,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild
index abb060f0bc..575b46a04d 100644
--- a/academic/gwyddion/gwyddion.SlackBuild
+++ b/academic/gwyddion/gwyddion.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gwyddion
-VERSION=${VERSION:-2.41}
+VERSION=${VERSION:-2.43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/gwyddion/gwyddion.info b/academic/gwyddion/gwyddion.info
index cf11fdcc56..6b30839a17 100644
--- a/academic/gwyddion/gwyddion.info
+++ b/academic/gwyddion/gwyddion.info
@@ -1,8 +1,8 @@
 PRGNAM="gwyddion"
-VERSION="2.41"
+VERSION="2.43"
 HOMEPAGE="http://gwyddion.net"
-DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.41.tar.xz"
-MD5SUM="de80e2587ae9f4c8e886ea2e22509f74"
+DOWNLOAD="http://downloads.sourceforge.net/gwyddion/gwyddion-2.43.tar.xz"
+MD5SUM="51510fdf095370670281d682e3f9b1cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkglext"
diff --git a/academic/ij-plugins-LOCI/ij-plugins-LOCI.SlackBuild b/academic/ij-plugins-LOCI/ij-plugins-LOCI.SlackBuild
index c950fff027..17cf7e9e0b 100644
--- a/academic/ij-plugins-LOCI/ij-plugins-LOCI.SlackBuild
+++ b/academic/ij-plugins-LOCI/ij-plugins-LOCI.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ij-plugins-LOCI
-VERSION=${VERSION:-5.1.2}
+VERSION=${VERSION:-5.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/ij-plugins-LOCI/ij-plugins-LOCI.info b/academic/ij-plugins-LOCI/ij-plugins-LOCI.info
index df69bd498d..382f05e8b4 100644
--- a/academic/ij-plugins-LOCI/ij-plugins-LOCI.info
+++ b/academic/ij-plugins-LOCI/ij-plugins-LOCI.info
@@ -1,8 +1,8 @@
 PRGNAM="ij-plugins-LOCI"
-VERSION="5.1.2"
+VERSION="5.1.5"
 HOMEPAGE="http://loci.wisc.edu/bio-formats/imagej"
-DOWNLOAD="http://downloads.openmicroscopy.org/bio-formats/5.1.2/artifacts/loci_tools.jar"
-MD5SUM="0be58a9029f375a145f786b89b4e3542"
+DOWNLOAD="http://downloads.openmicroscopy.org/bio-formats/5.1.5/artifacts/loci_tools.jar"
+MD5SUM="706ef16dbc146a19a54b60954270288c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ImageJ"
diff --git a/academic/io_lib/io_lib.SlackBuild b/academic/io_lib/io_lib.SlackBuild
index 3a503b725f..8ca46acec4 100644
--- a/academic/io_lib/io_lib.SlackBuild
+++ b/academic/io_lib/io_lib.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=io_lib
-VERSION=${VERSION:-1.13.7}
+VERSION=${VERSION:-1.14.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/io_lib/io_lib.info b/academic/io_lib/io_lib.info
index 0312296991..0a39fa7f59 100644
--- a/academic/io_lib/io_lib.info
+++ b/academic/io_lib/io_lib.info
@@ -1,8 +1,8 @@
 PRGNAM="io_lib"
-VERSION="1.13.7"
+VERSION="1.14.6"
 HOMEPAGE="http://staden.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/staden/files/io_lib/1.13.7/io_lib-1.13.7.tar.gz"
-MD5SUM="115c27027133cf12956034fe8227faa4"
+DOWNLOAD="http://sourceforge.net/projects/staden/files/io_lib/1.14.6/io_lib-1.14.6.tar.gz"
+MD5SUM="8411e5993b0863166e449bc908327b6a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/jalview/README b/academic/jalview/README
index abb473680a..e53e932a40 100644
--- a/academic/jalview/README
+++ b/academic/jalview/README
@@ -10,7 +10,10 @@ Waterhouse AM, Procter JB, Martin DMA, Clamp M, Barton GJ (2009)
 Jalview Version 2-a multiple sequence alignment editor and analysis
 workbench. Bioinformatics 25: 1189-1191.
 
-NOTE:
+NOTE1:
 The silly requirement of p7zip is just for extracting the program's
 contents at build time. You do not need it in order to use Jalview
 later on, but it's a nice tool to have anyways... ;)
+
+NOTE2:
+The 'source' is hosted at SourceForge by the SlackBuild maintainer.
diff --git a/academic/jalview/jalview.SlackBuild b/academic/jalview/jalview.SlackBuild
index 739e733738..44978cdac4 100644
--- a/academic/jalview/jalview.SlackBuild
+++ b/academic/jalview/jalview.SlackBuild
@@ -26,7 +26,7 @@
 # https://aur.archlinux.org/packages/jalview/
 
 PRGNAM=jalview
-VERSION=${VERSION:-2.8.2}
+VERSION=${VERSION:-2.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/jalview/jalview.info b/academic/jalview/jalview.info
index f5542c1f78..1036a6e84e 100644
--- a/academic/jalview/jalview.info
+++ b/academic/jalview/jalview.info
@@ -1,9 +1,9 @@
 PRGNAM="jalview"
-VERSION="2.8.2"
+VERSION="2.9"
 HOMEPAGE="http://www.jalview.org/"
-DOWNLOAD="http://www.jalview.org/Web_Installers/InstData/Linux/NoVM/install-jalview.bin \
-	http://www.jalview.org/tutorial/TheJalviewTutorial_screen.pdf"
-MD5SUM="aa0d001db4a0ce315a200f4a24859ab7 \
+DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/JalView/2.9/install-jalview.bin \
+	http://sourceforge.net/projects/sboppetrov/files/JalView/TheJalviewTutorial_screen.pdf"
+MD5SUM="5de4a0daa112e8b6673985aef373bfdd \
 	5e2f8da8f2528049f055263aecd2f8af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/jalview/slack-desc b/academic/jalview/slack-desc
index d6dc0a0f48..cc24b2c547 100644
--- a/academic/jalview/slack-desc
+++ b/academic/jalview/slack-desc
@@ -14,6 +14,6 @@ jalview: It can also work with sequence annotation, secondary structure
 jalview: information, phylogenetic trees and 3D molecular structures.
 jalview:
 jalview: Home: http://www.jalview.org/
-jalview: References: /usr/doc/jalview-2.8.2/References
+jalview: References: /usr/doc/jalview-2.9/References
 jalview:
 jalview:
diff --git a/academic/jpicedt/jpicedt.info b/academic/jpicedt/jpicedt.info
index 6211300545..584e475fdf 100644
--- a/academic/jpicedt/jpicedt.info
+++ b/academic/jpicedt/jpicedt.info
@@ -1,5 +1,5 @@
 PRGNAM="jpicedt"
-VERSION="1.4.1_03_20071021"
+VERSION="1.4.1_03"
 HOMEPAGE="http://jpicedt.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/jpicedt/jpicedt-install_1_4_1_03_20071021.jar"
 MD5SUM="bc1894efbe41c87e5767fb17c8a21d20"
diff --git a/academic/klu/autotoolize.diff b/academic/klu/autotoolize.diff
index 14637bb95d..b664f48fb8 100644
--- a/academic/klu/autotoolize.diff
+++ b/academic/klu/autotoolize.diff
@@ -205,7 +205,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([KLU],[1.3.2],[DrTimothyAldenDavis@gmail.com],[klu],[http://www.suitesparse.com/])
++AC_INIT([KLU],[1.3.3],[DrTimothyAldenDavis@gmail.com],[klu],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Source/klu.c])
 +AC_CONFIG_HEADERS([config.h])
 +AM_INIT_AUTOMAKE([foreign])
diff --git a/academic/klu/klu.SlackBuild b/academic/klu/klu.SlackBuild
index 7eb1edc270..28b2092bbb 100644
--- a/academic/klu/klu.SlackBuild
+++ b/academic/klu/klu.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for KLU
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 PRGNAM=klu
 SRCNAM=SuiteSparse
 SUBDIR=KLU
-VERSION=${VERSION:-1.3.2}
-SRCVER=${SRCVER:-4.4.4}
+VERSION=${VERSION:-1.3.3}
+SRCVER=${SRCVER:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/klu/klu.info b/academic/klu/klu.info
index 37fe1bb524..617b8ccc97 100644
--- a/academic/klu/klu.info
+++ b/academic/klu/klu.info
@@ -1,8 +1,8 @@
 PRGNAM="klu"
-VERSION="1.3.2"
+VERSION="1.3.3"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig amd colamd btf"
diff --git a/academic/labplot2/labplot2.info b/academic/labplot2/labplot2.info
index 77d35a3271..24701ca20c 100644
--- a/academic/labplot2/labplot2.info
+++ b/academic/labplot2/labplot2.info
@@ -1,7 +1,7 @@
 PRGNAM="labplot2"
 VERSION="2.0.1"
 HOMEPAGE="http://labplot.sourceforge.net/"
-DOWNLOAD="http://hivelocity.dl.sourceforge.net/project/labplot/labplot/2.0.0/labplot-2.0.1.tar.bz2"
+DOWNLOAD="http://sourceforge.net/projects/labplot/files/labplot/2.0.0/labplot-2.0.1.tar.bz2"
 MD5SUM="f01a5a6a796429e8a45805cb611e25f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/ldl/ldl.SlackBuild b/academic/ldl/ldl.SlackBuild
index a4f338ae58..28b45b4d88 100644
--- a/academic/ldl/ldl.SlackBuild
+++ b/academic/ldl/ldl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LDL
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=ldl
 SRCNAM=SuiteSparse
 SUBDIR=LDL
 VERSION=${VERSION:-2.2.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/ldl/ldl.info b/academic/ldl/ldl.info
index 62856f62e2..0a80f99767 100644
--- a/academic/ldl/ldl.info
+++ b/academic/ldl/ldl.info
@@ -1,8 +1,8 @@
 PRGNAM="ldl"
 VERSION="2.2.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/maxima/maxima.SlackBuild b/academic/maxima/maxima.SlackBuild
index cc8a0e3acd..54a9090a3f 100644
--- a/academic/maxima/maxima.SlackBuild
+++ b/academic/maxima/maxima.SlackBuild
@@ -26,10 +26,10 @@
 # Modified by the SlackBuilds.org project
 # Modified by Ken Milmore 2009
 # Modified by Glenn Becker to update to version 5.28.0
-# Glenn Becker -> update to version 5.36.1
+# Glenn Becker -> update to version 5.37.2
 
 PRGNAM=maxima
-VERSION=${VERSION:-5.36.1}
+VERSION=${VERSION:-5.37.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/maxima/maxima.info b/academic/maxima/maxima.info
index dca4f336de..f5a65df0d6 100644
--- a/academic/maxima/maxima.info
+++ b/academic/maxima/maxima.info
@@ -1,8 +1,8 @@
 PRGNAM="maxima"
-VERSION="5.36.1"
+VERSION="5.37.2"
 HOMEPAGE="http://maxima.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/maxima/files/Maxima-source/5.36.1-source/maxima-5.36.1.tar.gz"
-MD5SUM="59e6e3d8bc1009a4ddead8c10317a8ec"
+DOWNLOAD="http://sourceforge.net/projects/maxima/files/Maxima-source/5.37.2-source/maxima-5.37.2.tar.gz"
+MD5SUM="1038d68116a9b516e046a76f68ba5115"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/mendeleydesktop/mendeleydesktop.SlackBuild b/academic/mendeleydesktop/mendeleydesktop.SlackBuild
index 5332bcf725..2afab00dc6 100644
--- a/academic/mendeleydesktop/mendeleydesktop.SlackBuild
+++ b/academic/mendeleydesktop/mendeleydesktop.SlackBuild
@@ -3,10 +3,10 @@
 # Slackware build script for mendeleydesktop
 
 # Written by Grissiom <chaos.proton@gmail.com>
-# Updated by Glenn Becker <burningc@sdf.org>
+# Updated by Glenn Becker <glenn.becker@gmail.com>
 
 PRGNAM=mendeleydesktop
-VERSION=${VERSION:-1.13.8}
+VERSION=${VERSION:-1.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/mendeleydesktop/mendeleydesktop.info b/academic/mendeleydesktop/mendeleydesktop.info
index b973d78299..58e025bbdb 100644
--- a/academic/mendeleydesktop/mendeleydesktop.info
+++ b/academic/mendeleydesktop/mendeleydesktop.info
@@ -1,10 +1,10 @@
 PRGNAM="mendeleydesktop"
-VERSION="1.13.8"
+VERSION="1.15"
 HOMEPAGE="http://www.mendeley.com/"
-DOWNLOAD="http://download.mendeley.com/linux/mendeleydesktop-1.13.8-linux-i486.tar.bz2"
-MD5SUM="79a33509d049a4fa5c139708109edc4a"
-DOWNLOAD_x86_64="http://download.mendeley.com/linux/mendeleydesktop-1.13.8-linux-x86_64.tar.bz2"
-MD5SUM_x86_64="850dc2c604d8cd09ffaf1fd8d5cda615"
+DOWNLOAD="http://download.mendeley.com/linux/mendeleydesktop-1.15-linux-i486.tar.bz2"
+MD5SUM="4b19536ef4f59406e6708c223a911b96"
+DOWNLOAD_x86_64="http://download.mendeley.com/linux/mendeleydesktop-1.15-linux-x86_64.tar.bz2"
+MD5SUM_x86_64="98592385aef62734fbe12d5b28e354f2"
 REQUIRES=""
 MAINTAINER="Glenn Becker"
 EMAIL="glenn.becker@gmail.com"
diff --git a/academic/ncbi-blast-plus/README b/academic/ncbi-blast-plus/README
index 0aeda537eb..78b4f98c1c 100644
--- a/academic/ncbi-blast-plus/README
+++ b/academic/ncbi-blast-plus/README
@@ -15,3 +15,9 @@ For details and citation, please see the BLAST+ user manual from the
 program's web site and the article in BMC Bioinformatics. 
 
 This just repackages the binaries provided from upstream.
+
+NOTE ABOUT x86:
+Since version 2.2.31, NCBI does not provide 32-bit executables of
+BLAST+ for Linux. Their reasoning is that the limited memory and
+processing power of 32-bit systems is not suitable for the large
+databases searched by BLAST.
diff --git a/academic/ncbi-blast-plus/ncbi-blast-plus.SlackBuild b/academic/ncbi-blast-plus/ncbi-blast-plus.SlackBuild
index ee43c76a47..cde0c8bf55 100644
--- a/academic/ncbi-blast-plus/ncbi-blast-plus.SlackBuild
+++ b/academic/ncbi-blast-plus/ncbi-blast-plus.SlackBuild
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ncbi-blast-plus
-VERSION=${VERSION:-2.2.30}
+VERSION=${VERSION:-2.2.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=ncbi-blast
-SRCVER=2.2.30+
+SRCVER=2.2.31+
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,7 +45,10 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-if [ "$ARCH" != "i386" ] && [ "$ARCH" != "x86_64" ]; then
+# Check for host architecture. Distribution of 32bit binaries has been
+# dropped from NCBI. For more information, please read:
+# http://www.ncbi.nlm.nih.gov/mailman/pipermail/blast-announce/2015q2/000112.html
+if [ "$ARCH" != "x86_64" ]; then
   printf "\n\n$ARCH is not supported... \n"
   exit 1
 fi
@@ -79,16 +82,16 @@ install -D -m755 blast_formatter	$PKG/usr/bin/blast_formatter
 install -D -m755 blastdb_aliastool	$PKG/usr/bin/blastdb_aliastool
 install -D -m755 blastdbcheck		$PKG/usr/bin/blastdbcheck
 install -D -m755 blastdbcmd		$PKG/usr/bin/blastdbcmd
-install -D -m755 blastn		$PKG/usr/bin/blastn
-install -D -m755 blastp		$PKG/usr/bin/blastp
-install -D -m755 blastx		$PKG/usr/bin/blastx
+install -D -m755 blastn			$PKG/usr/bin/blastn
+install -D -m755 blastp			$PKG/usr/bin/blastp
+install -D -m755 blastx			$PKG/usr/bin/blastx
 install -D -m755 convert2blastmask	$PKG/usr/bin/convert2blastmask
 install -D -m755 deltablast		$PKG/usr/bin/deltablast
 install -D -m755 dustmasker		$PKG/usr/bin/dustmasker
 install -D -m755 legacy_blast.pl	$PKG/usr/bin/legacy_blast.pl
 install -D -m755 makeblastdb		$PKG/usr/bin/makeblastdb
 install -D -m755 makembindex		$PKG/usr/bin/makembindex
-install -D -m755 makeprofiledb	$PKG/usr/bin/makeprofiledb
+install -D -m755 makeprofiledb		$PKG/usr/bin/makeprofiledb
 install -D -m755 psiblast		$PKG/usr/bin/psiblast
 install -D -m755 rpsblast		$PKG/usr/bin/rpsblast
 install -D -m755 rpstblastn		$PKG/usr/bin/rpstblastn
@@ -104,7 +107,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ChangeLog LICENSE README \
+  ChangeLog LICENSE README doc/README.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/ncbi-blast-plus/ncbi-blast-plus.info b/academic/ncbi-blast-plus/ncbi-blast-plus.info
index 90f7048cd5..a63ed3166c 100644
--- a/academic/ncbi-blast-plus/ncbi-blast-plus.info
+++ b/academic/ncbi-blast-plus/ncbi-blast-plus.info
@@ -1,10 +1,10 @@
 PRGNAM="ncbi-blast-plus"
-VERSION="2.2.30"
+VERSION="2.2.31"
 HOMEPAGE="http://blast.ncbi.nlm.nih.gov/"
-DOWNLOAD="ftp://ftp.ncbi.nih.gov/blast/executables/blast+/2.2.30/ncbi-blast-2.2.30+-ia32-linux.tar.gz"
-MD5SUM="658b6643f1e7b46f91642cf841e8462a"
-DOWNLOAD_x86_64="ftp://ftp.ncbi.nih.gov/blast/executables/blast+/2.2.30/ncbi-blast-2.2.30+-x64-linux.tar.gz"
-MD5SUM_x86_64="e767297c9b007d1ca8e3e385246941dd"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="ftp://ftp.ncbi.nih.gov/blast/executables/blast+/2.2.31/ncbi-blast-2.2.31+-x64-linux.tar.gz"
+MD5SUM_x86_64="ae789a5bfb523cef95ac40e5a6b1929e"
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="petar.petrov@student.oulu.fi"
diff --git a/academic/ncbi-blast-plus/slack-desc b/academic/ncbi-blast-plus/slack-desc
index c698328a33..ab449ab00e 100644
--- a/academic/ncbi-blast-plus/slack-desc
+++ b/academic/ncbi-blast-plus/slack-desc
@@ -13,7 +13,7 @@ ncbi-blast-plus: Toolkit. The BLAST+ applications have a number of performance a
 ncbi-blast-plus: feature improvements over the legacy BLAST applications (ncbi-blast).
 ncbi-blast-plus:
 ncbi-blast-plus: Home: http://blast.ncbi.nlm.nih.gov/
-ncbi-blast-plus: References: /usr/doc/ncbi-blast-plus-$VERSION/References
+ncbi-blast-plus: References: /usr/doc/ncbi-blast-plus-2.2.31/References
 ncbi-blast-plus:
 ncbi-blast-plus:
 ncbi-blast-plus:
diff --git a/academic/openmodelica/openmodelica.SlackBuild b/academic/openmodelica/openmodelica.SlackBuild
index b8c4dd6915..acb8788c92 100644
--- a/academic/openmodelica/openmodelica.SlackBuild
+++ b/academic/openmodelica/openmodelica.SlackBuild
@@ -69,6 +69,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# https://trac.openmodelica.org/OpenModelica/ticket/3312
+sed \
+  -e 's#./\${builddir_inc}/\$(host_short)/omc/antlr3#./\${builddir_inc}/../\$(host_short)/omc/antlr3#' \
+  -i Makefile.common
+
 autoconf
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/academic/parmetis/README b/academic/parmetis/README
new file mode 100644
index 0000000000..018f15ca02
--- /dev/null
+++ b/academic/parmetis/README
@@ -0,0 +1,10 @@
+ParMETIS (Parallel Graph Partitioning and Fill-reducing Matrix  Ordering)
+
+ParMETIS is an MPI-based parallel library that implements a variety 
+of algorithms for partitioning unstructured graphs, meshes, and for 
+computing fill-reducing orderings of sparse matrices.
+
+Set precision type:
+DP=yes (for 64-bit, default is 32-bit)
+
+The requirement is a MPI implementation, either mpich or openmpi.
diff --git a/academic/parmetis/parmetis.SlackBuild b/academic/parmetis/parmetis.SlackBuild
new file mode 100644
index 0000000000..b1cfb0dd1c
--- /dev/null
+++ b/academic/parmetis/parmetis.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Slackware build script for parmetis
+
+# Copyright 2015 Guilherme Calandrini - Madrid (Spain)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=parmetis
+VERSION=${VERSION:-4.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf parmetis-$VERSION
+tar xvf $CWD/parmetis-$VERSION.tar.gz
+cd parmetis-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Use double-precision floating-point format
+if [ "${DP:-no}" == "yes" ]; then
+  sed -i 's/#define IDXTYPEWIDTH 32/\#define IDXTYPEWIDTH 64/' metis/include/metis.h
+fi
+
+### Build without MPI doesn't make sense. METIS can also be build
+### from suitesparce slackbuilds.
+# Manual set for MPI implementation goes here
+# defaults is the MPI wrapper
+if [ "${MPI:-yes}" == "no" ]; then
+  OPT_BUILD="cc=mpicc cxx=mpicxx f77=mpif77"
+fi
+
+CFLAGS="$SLKCFLAGS" \
+make config prefix="/usr" shared=1 $OPT_BUILD
+make
+make install DESTDIR=$PKG
+
+cd metis
+CFLAGS="$SLKCFLAGS" \
+make config prefix="/usr" shared=1 $OPT_BUILD
+make
+make install DESTDIR=$PKG
+cd -
+
+# Installing library and include files for version > 4.0, don't
+# have rule to set install location.
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+fi
+
+mkdir -p $PKG/usr/include/parmetis
+mv $PKG/usr/include/{parmetis,metis}.h $PKG/usr/include/parmetis/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/parmetis.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/parmetis/parmetis.info b/academic/parmetis/parmetis.info
new file mode 100644
index 0000000000..6febb6b4a0
--- /dev/null
+++ b/academic/parmetis/parmetis.info
@@ -0,0 +1,10 @@
+PRGNAM="parmetis"
+VERSION="4.0.3"
+HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"
+DOWNLOAD="http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz"
+MD5SUM="f69c479586bf6bb7aff6a9bc0c739628"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="mpich"
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini[at]hotmail[dot]es"
diff --git a/academic/parmetis/slack-desc b/academic/parmetis/slack-desc
new file mode 100644
index 0000000000..08bbd12e90
--- /dev/null
+++ b/academic/parmetis/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+parmetis: parmetis (parallel library) 
+parmetis:
+parmetis:
+parmetis: ParMETIS is an MPI-based parallel library that implements a variety
+parmetis: of algorithms for partitioning unstructured graphs, meshes, and for
+parmetis: computing fill-reducing orderings of sparse matrices.
+parmetis:
+parmetis:
+parmetis:
+parmetis:
+parmetis:
diff --git a/academic/pulseview/README b/academic/pulseview/README
new file mode 100644
index 0000000000..c7a3b6d060
--- /dev/null
+++ b/academic/pulseview/README
@@ -0,0 +1 @@
+PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok.
diff --git a/academic/pulseview/doinst.sh b/academic/pulseview/doinst.sh
new file mode 100644
index 0000000000..5934a15ab1
--- /dev/null
+++ b/academic/pulseview/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/academic/pulseview/pulseview.SlackBuild b/academic/pulseview/pulseview.SlackBuild
new file mode 100644
index 0000000000..f3ab3cfb2b
--- /dev/null
+++ b/academic/pulseview/pulseview.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for PulseView
+
+# Copyright 2015 Andrzej Telszewski, Sabadell
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pulseview
+VERSION=${VERSION:-0.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/share/applications
+cp -a contrib/pulseview.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
+cp -a icons/sigrok-logo-notext.png $PKG/usr/share/icons/hicolor/48x48/apps
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+gzip -9 $PKG/usr/man/man1/pulseview.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/pulseview/pulseview.info b/academic/pulseview/pulseview.info
new file mode 100644
index 0000000000..e327a148ed
--- /dev/null
+++ b/academic/pulseview/pulseview.info
@@ -0,0 +1,10 @@
+PRGNAM="pulseview"
+VERSION="0.2.0"
+HOMEPAGE="http://sigrok.org/wiki/PulseView"
+DOWNLOAD="http://sigrok.org/download/source/pulseview/pulseview-0.2.0.tar.gz"
+MD5SUM="fe5586212671226afafe9d8d80ed10c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libsigrok libsigrokdecode"
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/academic/pulseview/slack-desc b/academic/pulseview/slack-desc
new file mode 100644
index 0000000000..8f34e76481
--- /dev/null
+++ b/academic/pulseview/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pulseview: pulseview (GUI for sigrok)
+pulseview:
+pulseview: PulseView is a Qt based logic analyzer, oscilloscope and
+pulseview: MSO GUI for sigrok.
+pulseview:
+pulseview:
+pulseview:
+pulseview:
+pulseview:
+pulseview: Homepage: http://sigrok.org/wiki/PulseView
+pulseview:
diff --git a/academic/rbio/rbio.SlackBuild b/academic/rbio/rbio.SlackBuild
index 41a321f5e3..0c386bf1a4 100644
--- a/academic/rbio/rbio.SlackBuild
+++ b/academic/rbio/rbio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for RBio
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=rbio
 SRCNAM=SuiteSparse
 SUBDIR=RBio
 VERSION=${VERSION:-2.2.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/rbio/rbio.info b/academic/rbio/rbio.info
index 82de9e4f85..ddfad46151 100644
--- a/academic/rbio/rbio.info
+++ b/academic/rbio/rbio.info
@@ -1,8 +1,8 @@
 PRGNAM="rbio"
 VERSION="2.2.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="suitesparseconfig"
diff --git a/academic/sage/sage-build-root.patch b/academic/sage/sage-build-root.patch
index 40e1572605..0daaca9c33 100644
--- a/academic/sage/sage-build-root.patch
+++ b/academic/sage/sage-build-root.patch
@@ -1,33 +1,24 @@
---- sage-6.5/configure.old	2015-02-19 08:11:31.873711070 +0700
-+++ sage-6.5/configure	2015-02-19 08:12:00.982710447 +0700
-@@ -2942,19 +2942,19 @@
- 
+--- sage-6.10/configure.old	2015-12-19 08:15:37.404497471 +0700
++++ sage-6.10/configure	2015-12-19 08:15:55.691461292 +0700
+@@ -2965,21 +2965,6 @@
  
+ #---------------------------------------------------------
  
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for root user" >&5
 -$as_echo_n "checking for root user... " >&6; }
-+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for root user" >&5
-+#$as_echo_n "checking for root user... " >&6; }
- 
+-
 -uid=`id -u`
 -if test "x$uid" == "x0"; then
 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
--    as_fn_error $? "You cannot build Sage as root, switch to a unpriviledged user" "$LINENO" 5
+-    as_fn_error $? "You cannot build Sage as root, switch to an unpriviledged user" "$LINENO" 5
 -else
 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
-+#uid=`id -u`
-+#if test "x$uid" == "x0"; then
-+#    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+#$as_echo "yes" >&6; }
-+#    as_fn_error $? "You cannot build Sage as root, switch to a unpriviledged user" "$LINENO" 5
-+#else
-+#    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+#$as_echo "no" >&6; }
- 
+-
 -fi;
-+#fi;
- 
- 
- #---------------------------------------------------------
+-
+-
+ # Check whether we are on a supported platform
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
diff --git a/academic/sage/sage.SlackBuild b/academic/sage/sage.SlackBuild
index 2e597de8c5..3baf26f058 100644
--- a/academic/sage/sage.SlackBuild
+++ b/academic/sage/sage.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sage
-VERSION=${VERSION:-6.8}
+VERSION=${VERSION:-6.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -92,20 +92,6 @@ rm -rf $PKG/$SAGEROOT/{upstream,logs}
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Sage installs specific versions of a number of software components which
-# may be different from the system-wide versions of those components. For
-# this reason, the man and info pages are not moved to /usr/man and
-# /usr/info.  To avoid possible conflicts, they are compressed in place.
-find $PKG/$SAGEROOT/local/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/$SAGEROOT/local/man -type l ) ; do
-  ln -s $( readlink $i ).gz $i.gz ; rm $i
-done
-find $PKG/$SAGEROOT/local/share/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/$SAGEROOT/local/share/man -type l ) ; do
-  ln -s $( readlink $i ).gz $i.gz ; rm $i
-done
-gzip -9 $PKG/$SAGEROOT/local/share/info/*.info*
-
 # Add profile scripts
 sed "s%SAGEROOT%${SAGEROOT}%" $CWD/profile.d/sage.sh > $PKG/etc/profile.d/sage.sh
 sed "s%SAGEROOT%${SAGEROOT}%" $CWD/profile.d/sage.csh > $PKG/etc/profile.d/sage.csh
diff --git a/academic/sage/sage.info b/academic/sage/sage.info
index 0869a12e7b..8adeae05ec 100644
--- a/academic/sage/sage.info
+++ b/academic/sage/sage.info
@@ -1,8 +1,8 @@
 PRGNAM="sage"
-VERSION="6.8"
+VERSION="6.10"
 HOMEPAGE="http://www.sagemath.org"
-DOWNLOAD="http://ftp.riken.jp/sagemath/src/sage-6.8.tar.gz"
-MD5SUM="661f2b2b13669c72d16ea8e6831125e4"
+DOWNLOAD="http://ftp.riken.jp/sagemath/src/sage-6.10.tar.gz"
+MD5SUM="ff28cec72f7569bba6c7e00b5a98c45b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/scilab/scilab.SlackBuild b/academic/scilab/scilab.SlackBuild
index 9367017a7a..762d9b2dfa 100644
--- a/academic/scilab/scilab.SlackBuild
+++ b/academic/scilab/scilab.SlackBuild
@@ -40,7 +40,11 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" != "i686" ] && [ "$ARCH" != "x86_64" ]; then
+if [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
   printf "\n\n$ARCH is not supported...\n"
   exit 1
 fi
@@ -60,8 +64,8 @@ cat $CWD/profile.d/$PRGNAM.sh > $PKG/etc/profile.d/$PRGNAM.sh
 cat $CWD/profile.d/$PRGNAM.csh > $PKG/etc/profile.d/$PRGNAM.csh
 chmod 0755 $PKG/etc/profile.d/*
 
-mkdir -p $PKG/usr/lib $PKG/usr/share
-mv lib/pkgconfig $PKG/usr/lib
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} $PKG/usr/share
+mv lib/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}
 mv share/applications share/icons share/mime $PKG/usr/share/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/sequence-analysis/README b/academic/sequence-analysis/README
index 82dab2ac4c..87646b3052 100644
--- a/academic/sequence-analysis/README
+++ b/academic/sequence-analysis/README
@@ -1 +1,20 @@
 A collage of coding projects for biologic sequences analysis.
+
+The upper window panel can hold several sequences, which are both
+editable and selectable. The tabs in the lower analysis panel try to
+keep up with the current sequence selection to provide immediate
+feedback. The selection is used in some modules as only the portion
+being analyzed for other modules i.e. Digest is used to determine if
+enzymes cut in the in or outside of the selection.
+
+Most commonly available sequence formats have been reverse engineered.
+You can also access a sequences from the NCBI via its GID or UID. This
+currently cannot be done from behind a firewall.
+
+Most of the analyses are simple enough that they are obvious to use,
+Composition, pI. Others could stand some documenation i.e. Pairwise
+and Primer Design. The Publish tab uses a string to control the
+layout. Click on the Legend button for some help.
+
+NOTE:
+The 'source' is hosted at SourceForge by the SlackBuild maintainer.
diff --git a/academic/sequence-analysis/sequence-analysis.SlackBuild b/academic/sequence-analysis/sequence-analysis.SlackBuild
index f7419ac791..03a62d71d7 100644
--- a/academic/sequence-analysis/sequence-analysis.SlackBuild
+++ b/academic/sequence-analysis/sequence-analysis.SlackBuild
@@ -1,19 +1,34 @@
 #!/bin/sh
 
 # Slackware build script for sequence-analysis
-# Written by Petar Petrov, <ppetrov@paju.oulu.fi> and
-# hereby submitted to the public domain
 
-# THIS SLACKBUILD IS DISTRIBUTETD IN THE HOPE OF BEING
-# USEFUL BUT WITHOUT ANY WARRANTY. THE AUTHOR IS _NOT_
-# RESPONSIBLE FOR ANY DAMAGE OR DATA LOSS CAUSED BY IT.
+# Copyright 2011-2015 Petar Petrov, petar.petrov@student.oulu.fi
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sequence-analysis
-VERSION=${VERSION:-1.6.0}
-ARCH=noarch
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+ARCH=noarch
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
diff --git a/academic/sequence-analysis/sequence-analysis.info b/academic/sequence-analysis/sequence-analysis.info
index e7fa908cd3..fe94933976 100644
--- a/academic/sequence-analysis/sequence-analysis.info
+++ b/academic/sequence-analysis/sequence-analysis.info
@@ -1,10 +1,10 @@
 PRGNAM="sequence-analysis"
-VERSION="1.6.0"
+VERSION="1.7.2"
 HOMEPAGE="http://informagen.com/SA/"
-DOWNLOAD="http://informagen.com/SA/sa.jar"
-MD5SUM="48609bfdd0d689cc62467159a0308886"
+DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/sequence-analysis/1.7.2/sa.jar"
+MD5SUM="815c7e6a8717a9e2a7fedc9ed94fbd0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
 MAINTAINER="Petar Petrov"
-EMAIL="ppetrov@paju.oulu.fi"
+EMAIL="petar.petrov@student.oulu.fi"
diff --git a/academic/snpEff/slack-desc b/academic/snpEff/slack-desc
index 9235823e28..d7a52a2646 100644
--- a/academic/snpEff/slack-desc
+++ b/academic/snpEff/slack-desc
@@ -13,7 +13,7 @@ snpEff: annotates and predicts the effects of variants on genes (such
 snpEff: as amino acid changes).
 snpEff:
 snpEff: Home: http://snpeff.sourceforge.net/
-snpEff: References: /usr/doc/snpEff-4.1g/References
+snpEff: References: /usr/doc/snpEff-4.1l/References
 snpEff:
 snpEff:
 snpEff:
diff --git a/academic/snpEff/snpEff.SlackBuild b/academic/snpEff/snpEff.SlackBuild
index 7df14e0f81..f72bdb308d 100644
--- a/academic/snpEff/snpEff.SlackBuild
+++ b/academic/snpEff/snpEff.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=snpEff
-VERSION=${VERSION:-4.1g}
-SRCVER=${SRCVER:-v4_1g}
+VERSION=${VERSION:-4.1l}
+SRCVER=${SRCVER:-v4_1l}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/snpEff/snpEff.info b/academic/snpEff/snpEff.info
index 4c3c28335b..bc80b9cc38 100644
--- a/academic/snpEff/snpEff.info
+++ b/academic/snpEff/snpEff.info
@@ -1,8 +1,8 @@
 PRGNAM="snpEff"
-VERSION="4.1g"
+VERSION="4.1l"
 HOMEPAGE="http://snpeff.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/snpeff/files/snpEff_v4_1g_core.zip"
-MD5SUM="9226662c98e6479878e51522ba3ad3ed"
+DOWNLOAD="http://sourceforge.net/projects/snpeff/files/snpEff_v4_1l_core.zip"
+MD5SUM="43dd4b41f3223bbb4cc094ec5c5e2aac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/academic/spades/README b/academic/spades/README
index d28dbb956e..2ad3f0803b 100644
--- a/academic/spades/README
+++ b/academic/spades/README
@@ -12,5 +12,4 @@ Nurk S et al. Assembling Single-Cell Genomes and Mini-Metagenomes From
 Chimeric MDA Products. Journal of Computational Biology 20(10) (2013),
 714-737. doi:10.1089/cmb.2013.0084
 
-NOTE!
-This will not build on a 32bit system.
+NOTE: This will not build on a 32bit system.
diff --git a/academic/spades/spades.SlackBuild b/academic/spades/spades.SlackBuild
index 740b6a1e5f..dc8dc6bd13 100644
--- a/academic/spades/spades.SlackBuild
+++ b/academic/spades/spades.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=spades
 SRCNAM=SPAdes
-VERSION=${VERSION:-3.5.0}
+VERSION=${VERSION:-3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/spades/spades.info b/academic/spades/spades.info
index 2927f5e9ef..c43f1d6ae8 100644
--- a/academic/spades/spades.info
+++ b/academic/spades/spades.info
@@ -1,10 +1,10 @@
 PRGNAM="spades"
-VERSION="3.5.0"
+VERSION="3.6.1"
 HOMEPAGE="http://bioinf.spbau.ru/en/spades"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://spades.bioinf.spbau.ru/release3.5.0/SPAdes-3.5.0.tar.gz"
-MD5SUM_x86_64="58fbf728ec9945b9c36a26ff8c8f4cac"
+DOWNLOAD_x86_64="http://spades.bioinf.spbau.ru/release3.6.1/SPAdes-3.6.1.tar.gz"
+MD5SUM_x86_64="244bd18508bb06a4e433662f826c5a44"
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="petar.petrov@student.oulu.fi"
diff --git a/academic/spatialite-tools/spatialite-tools.info b/academic/spatialite-tools/spatialite-tools.info
index 2b8dd813f4..df2eceed66 100644
--- a/academic/spatialite-tools/spatialite-tools.info
+++ b/academic/spatialite-tools/spatialite-tools.info
@@ -1,7 +1,7 @@
 PRGNAM="spatialite-tools"
 VERSION="4.2.0"
 HOMEPAGE="https://www.gaia-gis.it/fossil/spatialite-tools/index"
-DOWNLOAD="http://www.gaia-gis.it/gaia-sins/spatialite-tools-4.2.0.tar.gz"
+DOWNLOAD="http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.2.0.tar.gz"
 MD5SUM="e00aeccec0cc8bf1e6fc725b1eabd2d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/speedcrunch/speedcrunch.info b/academic/speedcrunch/speedcrunch.info
index 59ca2bae8a..78d73e598d 100644
--- a/academic/speedcrunch/speedcrunch.info
+++ b/academic/speedcrunch/speedcrunch.info
@@ -1,7 +1,7 @@
 PRGNAM="speedcrunch"
 VERSION="0.11"
 HOMEPAGE="http://www.speedcrunch.org/en_US/index.html"
-DOWNLOAD="https://bitbucket.org/heldercorreia/speedcrunch/downloads/SpeedCrunch-0.11-src.zip"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/speedcrunch/SpeedCrunch-0.11-src.zip/38fa6f1de59e3a7c7e7bc6ad5174edda/SpeedCrunch-0.11-src.zip"
 MD5SUM="38fa6f1de59e3a7c7e7bc6ad5174edda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/spqr/autotoolize.diff b/academic/spqr/autotoolize.diff
index f11f72434a..10b8a2425c 100644
--- a/academic/spqr/autotoolize.diff
+++ b/academic/spqr/autotoolize.diff
@@ -655,7 +655,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([SPQR],[2.0.1],[DrTimothyAldenDavis@gmail.com],[spqr],[http://www.suitesparse.com/])
++AC_INIT([SPQR],[2.0.2],[DrTimothyAldenDavis@gmail.com],[spqr],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
 +AC_CONFIG_HEADERS([config.h])
 +AM_INIT_AUTOMAKE([foreign])
diff --git a/academic/spqr/spqr.SlackBuild b/academic/spqr/spqr.SlackBuild
index c58065e519..890cad7e91 100644
--- a/academic/spqr/spqr.SlackBuild
+++ b/academic/spqr/spqr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SPQR
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 PRGNAM=spqr
 SRCNAM=SuiteSparse
 SUBDIR=SPQR
-VERSION=${VERSION:-2.0.1}
-SRCVER=${SRCVER:-4.4.4}
+VERSION=${VERSION:-2.0.2}
+SRCVER=${SRCVER:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/spqr/spqr.info b/academic/spqr/spqr.info
index b0284ba57e..79c1861f7b 100644
--- a/academic/spqr/spqr.info
+++ b/academic/spqr/spqr.info
@@ -1,8 +1,8 @@
 PRGNAM="spqr"
-VERSION="2.0.1"
+VERSION="2.0.2"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack suitesparseconfig cholmod tbb"
diff --git a/academic/squizz/slack-desc b/academic/squizz/slack-desc
index b179c3078a..100bbafdd9 100644
--- a/academic/squizz/slack-desc
+++ b/academic/squizz/slack-desc
@@ -15,5 +15,5 @@ squizz: GENBANK, IG, NBRF, PIR (codata), RAW, SWISSPROT and CLUSTAL,
 squizz: FASTA, MEGA, MSF, NEXUS, PHYLIP (interleaved and sequential)
 squizz: and STOCKHOLM.
 squizz:
-squizz: Home: http://pbil.univ-lyon1.fr/pf_bioinfo/article313.html
+squizz: ftp://ftp.pasteur.fr/pub/gensoft/projects/squizz/
 squizz:
diff --git a/academic/squizz/squizz.SlackBuild b/academic/squizz/squizz.SlackBuild
index 8e0c669d17..8e7aa632ac 100644
--- a/academic/squizz/squizz.SlackBuild
+++ b/academic/squizz/squizz.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=squizz
-VERSION=${VERSION:-0.99b}
+VERSION=${VERSION:-0.99c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/squizz/squizz.info b/academic/squizz/squizz.info
index 76506f6b21..ceb11c761d 100644
--- a/academic/squizz/squizz.info
+++ b/academic/squizz/squizz.info
@@ -1,8 +1,8 @@
 PRGNAM="squizz"
-VERSION="0.99b"
-HOMEPAGE="http://pbil.univ-lyon1.fr/pf_bioinfo/article313.html"
-DOWNLOAD="ftp://ftp.pasteur.fr/pub/gensoft/projects/squizz/squizz-0.99b.tar.gz"
-MD5SUM="37b5fbfb3a78cd01f27a7a24df20838f"
+VERSION="0.99c"
+HOMEPAGE="ftp://ftp.pasteur.fr/pub/gensoft/projects/squizz/"
+DOWNLOAD="ftp://ftp.pasteur.fr/pub/gensoft/projects/squizz/squizz-0.99c.tar.gz"
+MD5SUM="880b326caf5d5d15689a393b5ecb83ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/stellarium/stellarium-0.13.3-qt55.patch b/academic/stellarium/stellarium-0.13.3-qt55.patch
new file mode 100644
index 0000000000..b4f7d5a444
--- /dev/null
+++ b/academic/stellarium/stellarium-0.13.3-qt55.patch
@@ -0,0 +1,23 @@
+diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/CLIProcessor.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/CLIProcessor.hpp
+--- src/CLIProcessor.hpp       2015-03-08 12:41:55.000000000 +0100
++++ src/CLIProcessor.hpp   2015-07-12 13:29:36.059179087 +0200
+@@ -21,6 +21,7 @@
+ #define CLIPROCESSOR_HPP
+ 
+ #include <QStringList>
++#include <QVariant>
+ 
+ class QSettings;
+ 
+diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp
+--- src/core/StelSkyCultureMgr.hpp     2015-03-08 12:41:55.000000000 +0100
++++ src/core/StelSkyCultureMgr.hpp 2015-07-12 13:28:32.589064791 +0200
+@@ -23,6 +23,7 @@
+ #include <QMap>
+ #include <QString>
+ #include <QStringList>
++#include <QObject>
+ 
+ //! @class StelSkyCulture
+ //! Store basic info about a sky culture for stellarium.
+
diff --git a/academic/stellarium/stellarium.SlackBuild b/academic/stellarium/stellarium.SlackBuild
index 831e6ed95f..9c7c9b976a 100644
--- a/academic/stellarium/stellarium.SlackBuild
+++ b/academic/stellarium/stellarium.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=stellarium
-VERSION=${VERSION:-0.13.2}
+VERSION=${VERSION:-0.13.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p0 < $CWD/stellarium-0.13.3-qt55.patch
+
 mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/academic/stellarium/stellarium.info b/academic/stellarium/stellarium.info
index 1605c87b7e..67bab6b6cf 100644
--- a/academic/stellarium/stellarium.info
+++ b/academic/stellarium/stellarium.info
@@ -1,8 +1,8 @@
 PRGNAM="stellarium"
-VERSION="0.13.2"
+VERSION="0.13.3"
 HOMEPAGE="http://www.stellarium.org"
-DOWNLOAD="http://downloads.sourceforge.net/stellarium/stellarium-0.13.2.tar.gz"
-MD5SUM="5839c51b75bdce2c307d7720e2c64d46"
+DOWNLOAD="http://downloads.sourceforge.net/stellarium/stellarium-0.13.3.tar.gz"
+MD5SUM="e967c48939a6606a5e5e017b3096fe90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/academic/suitesparse/suitesparse.info b/academic/suitesparse/suitesparse.info
index a3125411bc..853c1faa3b 100644
--- a/academic/suitesparse/suitesparse.info
+++ b/academic/suitesparse/suitesparse.info
@@ -1,7 +1,7 @@
 PRGNAM="suitesparse"
 VERSION="4.2.1"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-4.2.1.tar.gz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/suitesparse/SuiteSparse-4.2.1.tar.gz/4628df9eeae10ae5f0c486f1ac982fce/SuiteSparse-4.2.1.tar.gz"
 MD5SUM="4628df9eeae10ae5f0c486f1ac982fce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/suitesparseconfig/autotoolize.diff b/academic/suitesparseconfig/autotoolize.diff
index 2ac9afc27e..0dd3b85acb 100644
--- a/academic/suitesparseconfig/autotoolize.diff
+++ b/academic/suitesparseconfig/autotoolize.diff
@@ -28,7 +28,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([SuiteSparse_config],[4.4.4],[DrTimothyAldenDavis@gmail.com],[suitesparseconfig],[http://www.suitesparse.com/])
++AC_INIT([SuiteSparse_config],[4.4.6],[DrTimothyAldenDavis@gmail.com],[suitesparseconfig],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([SuiteSparse_config.c])
 +AC_CONFIG_HEADERS([config.h])
 +AM_INIT_AUTOMAKE([foreign])
diff --git a/academic/suitesparseconfig/suitesparseconfig.SlackBuild b/academic/suitesparseconfig/suitesparseconfig.SlackBuild
index 4ae80f990f..7f75381f96 100644
--- a/academic/suitesparseconfig/suitesparseconfig.SlackBuild
+++ b/academic/suitesparseconfig/suitesparseconfig.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SuiteSparse_config
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 PRGNAM=suitesparseconfig
 SRCNAM=SuiteSparse
 SUBDIR=SuiteSparse_config
-VERSION=${VERSION:-4.4.4}
-SRCVER=${SRCVER:-4.4.4}
+VERSION=${VERSION:-4.4.6}
+SRCVER=${SRCVER:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/suitesparseconfig/suitesparseconfig.info b/academic/suitesparseconfig/suitesparseconfig.info
index 8941609d14..25e6ffe027 100644
--- a/academic/suitesparseconfig/suitesparseconfig.info
+++ b/academic/suitesparseconfig/suitesparseconfig.info
@@ -1,8 +1,8 @@
 PRGNAM="suitesparseconfig"
-VERSION="4.4.4"
+VERSION="4.4.6"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/sundials/sundials.SlackBuild b/academic/sundials/sundials.SlackBuild
index 669d3917db..46375d2908 100644
--- a/academic/sundials/sundials.SlackBuild
+++ b/academic/sundials/sundials.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sundials
-VERSION=${VERSION:-2.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.6.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,39 +62,37 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-mkdir build
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cd build
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-../configure \
-  --prefix=$PKG/usr \
-  --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux \
-  F77=gfortran \
-  --disable-mpi \
-  --with-cflags=-fPIC \
-  --enable-shared \
-  --enable-static=no
-
-make
-make install
+sed -i \
+  -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' \
+  src/*/CMakeLists.txt \
+  src/*/*/CMakeLists.txt
 
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_SHARED_LIBS=BOOL:ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README INSTALL_NOTES LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README INSTALL_GUIDE.pdf LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/examples $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/academic/sundials/sundials.info b/academic/sundials/sundials.info
index 008d08f6d5..627f6d570b 100644
--- a/academic/sundials/sundials.info
+++ b/academic/sundials/sundials.info
@@ -1,8 +1,8 @@
 PRGNAM="sundials"
-VERSION="2.5.0"
+VERSION="2.6.2"
 HOMEPAGE="http://computation.llnl.gov/casc/sundials/main.html"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/sundials/sundials-2.5.0.tar.gz/aba8b56eec600de3109cfb967aa3ba0f/sundials-2.5.0.tar.gz"
-MD5SUM="aba8b56eec600de3109cfb967aa3ba0f"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/extras/sundials/sundials-2.6.2.tar.gz/3deeb0ede9f514184c6bd83ecab77d95/sundials-2.6.2.tar.gz"
+MD5SUM="3deeb0ede9f514184c6bd83ecab77d95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/sword-data-kjv/sword-data-kjv.SlackBuild b/academic/sword-data-kjv/sword-data-kjv.SlackBuild
index a990cca9ca..8ac1ed48b0 100644
--- a/academic/sword-data-kjv/sword-data-kjv.SlackBuild
+++ b/academic/sword-data-kjv/sword-data-kjv.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sword-data-kjv
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,6 +46,13 @@ rm -rf $PRGNAM-$VERSION
 DATADEST="/usr/shared/sword/"
 if [ -e /etc/sword.conf ]; then
   DATADEST=`cat /etc/sword.conf|grep DataPath|awk -F"=" '{print $2}'`
+  if [ "x$DATADEST" = "x" ]||[ "x$DATDEST" = "x/" ]; then
+    #this should not happen, give message and stop build
+    #it doesn't stop deliberately malicious configuration, but at least
+    #should catch a simple config file error.
+    echo "invalid data path in /etc/sword.conf" >/dev/stderr
+    exit 1
+  fi
 fi
 
 mkdir -p $PKG${DATADEST}
diff --git a/academic/sword-data-kjv/sword-data-kjv.info b/academic/sword-data-kjv/sword-data-kjv.info
index 16a0ac07f4..76a194bbd8 100644
--- a/academic/sword-data-kjv/sword-data-kjv.info
+++ b/academic/sword-data-kjv/sword-data-kjv.info
@@ -1,11 +1,11 @@
 PRGNAM="sword-data-kjv"
-VERSION="1.7"
+VERSION="1.7.4"
 HOMEPAGE="http://www.crosswire.org/sword/modules/"
 DOWNLOAD="http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip \
 	  http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsGreek.zip \
 	  http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsHebrew.zip"
-MD5SUM="455caa8e57e06e6b97856ed30150b36b \
- 	a99b80cf82aa4d2a33770967847919c5 \
+MD5SUM="285b6b8d430cbc9c69981c489a0523f8 \
+	2acde501e6a33e84feeeaa62f8e53d89 \
 	3cbbc69d7410efc9d1d7f6f6b30e3415"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/academic/tophat/slack-desc b/academic/tophat/slack-desc
index fda90eaaa3..68f24c83c6 100644
--- a/academic/tophat/slack-desc
+++ b/academic/tophat/slack-desc
@@ -14,6 +14,6 @@ tophat: high-throughput short read aligner Bowtie, and then analyzes the
 tophat: mapping results to identify splice junctions between exons.
 tophat:
 tophat: Home: http://tophat.cbcb.umd.edu/
-tophat: References: /usr/doc/tophat-2.0.14/References
+tophat: References: /usr/doc/tophat-2.1.0/References
 tophat:
 tophat:
diff --git a/academic/tophat/tophat.SlackBuild b/academic/tophat/tophat.SlackBuild
index d35360e663..88b0fda64e 100644
--- a/academic/tophat/tophat.SlackBuild
+++ b/academic/tophat/tophat.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tophat
-VERSION=${VERSION:-2.0.14}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -88,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL LICENSE NEWS README THANKS \
+  AUTHORS INSTALL LICENSE NEWS README THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/tophat/tophat.info b/academic/tophat/tophat.info
index 233ad2ac90..45e1fcb687 100644
--- a/academic/tophat/tophat.info
+++ b/academic/tophat/tophat.info
@@ -1,8 +1,8 @@
 PRGNAM="tophat"
-VERSION="2.0.14"
+VERSION="2.1.0"
 HOMEPAGE="http://ccb.jhu.edu/software/tophat/"
-DOWNLOAD="http://ccb.jhu.edu/software/tophat/downloads/tophat-2.0.14.tar.gz"
-MD5SUM="509f72082c98f116131e976681578a9f"
+DOWNLOAD="http://ccb.jhu.edu/software/tophat/downloads/tophat-2.1.0.tar.gz"
+MD5SUM="34afa379b030c6672a31bbe3689745bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/umfpack/umfpack.SlackBuild b/academic/umfpack/umfpack.SlackBuild
index df9a9e950a..e2047a9561 100644
--- a/academic/umfpack/umfpack.SlackBuild
+++ b/academic/umfpack/umfpack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for UMFPACK
 
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=umfpack
 SRCNAM=SuiteSparse
 SUBDIR=UMFPACK
 VERSION=${VERSION:-5.7.1}
-SRCVER=${SRCVER:-4.4.4}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-4.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
 cd $SRCNAM/$SUBDIR
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/umfpack/umfpack.info b/academic/umfpack/umfpack.info
index baea20329d..af4a1e1e18 100644
--- a/academic/umfpack/umfpack.info
+++ b/academic/umfpack/umfpack.info
@@ -1,8 +1,8 @@
 PRGNAM="umfpack"
 VERSION="5.7.1"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas suitesparseconfig amd cholmod"
diff --git a/academic/units/units.SlackBuild b/academic/units/units.SlackBuild
index 256c860762..1d42d18342 100644
--- a/academic/units/units.SlackBuild
+++ b/academic/units/units.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=units
-VERSION=${VERSION:-2.11}
+VERSION=${VERSION:-2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --datadir=/usr/share \
   --build=$ARCH-slackware-linux
 
-make -j1
+make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/academic/units/units.info b/academic/units/units.info
index d338a37408..82679387dc 100644
--- a/academic/units/units.info
+++ b/academic/units/units.info
@@ -1,8 +1,8 @@
 PRGNAM="units"
-VERSION="2.11"
+VERSION="2.12"
 HOMEPAGE="http://www.gnu.org/software/units/"
-DOWNLOAD="http://ftp.gnu.org/gnu/units/units-2.11.tar.gz"
-MD5SUM="1d83f4e68135495aa9267b848de78dc5"
+DOWNLOAD="http://ftp.gnu.org/gnu/units/units-2.12.tar.gz"
+MD5SUM="a9abd1f31a8dce22795372d5f87b9318"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/vcftools/slack-desc b/academic/vcftools/slack-desc
index 7cbadbcbbf..50dac51d10 100644
--- a/academic/vcftools/slack-desc
+++ b/academic/vcftools/slack-desc
@@ -15,5 +15,5 @@ vcftools: VCF files: validating, merging, comparing and calculate some
 vcftools: basic population genetic statistics.
 vcftools:
 vcftools: Home: http://vcftools.sourceforge.net/
-vcftools: References: /usr/doc/vcftools-0.1.12b/References
+vcftools: References: /usr/doc/vcftools-0.1.14_2_g78add55/References
 vcftools:
diff --git a/academic/vcftools/use-dpkg-buildflags.patch b/academic/vcftools/use-dpkg-buildflags.patch
deleted file mode 100644
index 3bd8521a3a..0000000000
--- a/academic/vcftools/use-dpkg-buildflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Andreas Tille <tille@debian.org>
-Date: Sat, 12 May 2012 09:31:58 +0200
-Description: Enable propagation of hardening flags
-
-Index: vcftools_0.1.11/cpp/Makefile
-===================================================================
---- vcftools_0.1.11.orig/cpp/Makefile	2013-06-13 16:40:54.000000000 +0200
-+++ vcftools_0.1.11/cpp/Makefile	2013-06-27 19:54:45.000000000 +0200
-@@ -12,9 +12,9 @@
- 	VCFTOOLS_PCA = 0
- endif
- # Compiler flags
--CFLAGS = -O2 -m64
-+CFLAGS += -O2
- #CFLAGS = -Wall -O2 -pg -m64
--CPPFLAGS = -O2 -D_FILE_OFFSET_BITS=64 
-+CPPFLAGS += -O2 -D_FILE_OFFSET_BITS=64
- #CPPFLAGS = -O2 -Wall -pg -D_FILE_OFFSET_BITS=64
- # Included libraries (zlib)
- LIB = -lz 
-@@ -38,7 +38,7 @@
- endif
- 
- vcftools: $(OBJS)
--	$(CPP) $(CPPFLAGS) $(OBJS) -o vcftools $(LIB)
-+	$(CPP) $(CPPFLAGS) $(OBJS) $(LDFLAGS) -o vcftools $(LIB)
- ifdef BINDIR
- 	cp $(CURDIR)/$@ $(BINDIR)/$@
- endif
-@@ -50,8 +50,8 @@
- -include $(OBJS:.o=.d)
- 
- %.o: %.cpp
--	$(CPP) -c $(CPPFLAGS) $*.cpp -o $*.o
--	$(CPP) -MM $(CPPFLAGS) $*.cpp > $*.d
-+	$(CPP) -c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $*.cpp -o $*.o
-+	$(CPP) -MM $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $*.cpp > $*.d
- 
- # remove compilation products
- clean:
diff --git a/academic/vcftools/vcftools.SlackBuild b/academic/vcftools/vcftools.SlackBuild
index 624601bdb3..7cfe136df6 100644
--- a/academic/vcftools/vcftools.SlackBuild
+++ b/academic/vcftools/vcftools.SlackBuild
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vcftools
-VERSION=${VERSION:-0.1.12b}
+VERSION=${VERSION:-0.1.14_2_g78add55}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=v0.1.14-2-g78add55
+GITVER=78add55
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -59,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
-cd ${PRGNAM}_${VERSION}
+rm -rf ${PRGNAM}-${PRGNAM}-${SRCVER}
+tar xvf $CWD/${PRGNAM}-${PRGNAM}-${SRCVER}.tar.gz
+cd ${PRGNAM}-${PRGNAM}-${GITVER}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,21 +72,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Thanks to Debian for the patch
-patch -p1 -i $CWD/use-dpkg-buildflags.patch
-
-# Set the proper, architecture-specific path
-sed -i "s:/lib/perl5/site_perl:/lib${LIBDIRSUFFIX}/perl5:g" Makefile
-
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
-PREFIX=$PKG/usr \
-make install
-
-# Remove this and copy the man page to its proper place
-rm -rf $PKG/usr/bin/man1
-mkdir -p $PKG//usr/man/man1
-cp cpp/vcftools.1 $PKG/usr/man/man1
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+make
+make DESTDIR=$PKG install
 
 # Copy examples
 mkdir -p $PKG/usr/share/$PRGNAM
@@ -96,7 +97,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt perl/ChangeLog website/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md src/perl/ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/References > $PKG/usr/doc/$PRGNAM-$VERSION/References
 
diff --git a/academic/vcftools/vcftools.info b/academic/vcftools/vcftools.info
index e30951603f..9e3ee465af 100644
--- a/academic/vcftools/vcftools.info
+++ b/academic/vcftools/vcftools.info
@@ -1,8 +1,8 @@
 PRGNAM="vcftools"
-VERSION="0.1.12b"
-HOMEPAGE="http://vcftools.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/vcftools/files/vcftools_0.1.12b.tar.gz"
-MD5SUM="662758d1139c138cf5a0239ed99f12c2"
+VERSION="0.1.14_2_g78add55"
+HOMEPAGE="https://vcftools.github.io/"
+DOWNLOAD="https://github.com/vcftools/vcftools/tarball/master/vcftools-vcftools-v0.1.14-2-g78add55.tar.gz"
+MD5SUM="e5fbb773ef13d567606067351501ac13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tabix"
diff --git a/academic/wmcalc/README b/academic/wmcalc/README
new file mode 100644
index 0000000000..99cffddb44
--- /dev/null
+++ b/academic/wmcalc/README
@@ -0,0 +1,9 @@
+wmcalc is a program designed to act as a simple four-function calculator.  It is different from other
+calculator programs, however in that it is designed to take up very little desktop space.  As such, it 
+can be left running on the desktop at all times.
+
+Note: The coding of this DockApp seems incredibly unorganized and there are several xpm's that are
+almost the same thing. It also seems that for whatever reason the author uses a xpm with the default
+WM backdrop, meaning it wont fit in with themed desktops. I may have a patch in the future that fixes 
+this and also make it use "wmcalc1.xpm". For now, enjoy it for what it is, a simple WindowMaker 
+calculator.
diff --git a/academic/wmcalc/slack-desc b/academic/wmcalc/slack-desc
new file mode 100644
index 0000000000..5c251ebe82
--- /dev/null
+++ b/academic/wmcalc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler--------------------------------------------------------|
+wmcalc: wmcalc (Calculator DockApp)
+wmcalc: 
+wmcalc: wmcalc is a program designed to act as a simple four-function
+wmcalc: calculator.  It is different from other calculator programs, however
+wmcalc: in that it is designed to take up very little desktop space.  As such,
+wmcalc: it can be left running on the desktop at all times.  
+wmcalc:
+wmcalc: Homepage: http://windowmaker.org/dockapps/?name=wmcalc
+wmcalc:
+wmcalc:
+wmcalc:
diff --git a/academic/wmcalc/wmcalc.SlackBuild b/academic/wmcalc/wmcalc.SlackBuild
new file mode 100644
index 0000000000..f8e9169fd6
--- /dev/null
+++ b/academic/wmcalc/wmcalc.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for wmcalc 
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmcalc
+VERSION=${VERSION:-0.5}
+ARCHIVEFIX=dockapps-c2f0ad2 # This is because the archive is named incorrectly.
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $ARCHIVEFIX
+tar xvf $CWD/$ARCHIVEFIX.tar.gz
+cd $ARCHIVEFIX
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+make
+make install DESTDIR=$PKG
+
+# Create bin directory and move executable there
+mkdir -p $PKG/usr/bin
+mv $PKG/usr/local/bin/wmcalc $PKG/usr/bin
+
+# Creates man page directory
+mkdir -p $PKG/usr/man/man1
+
+# Compresses man page and moves it into place
+gzip -9 $PKG/usr/local/share/man/man1/wmcalc.1
+mv $PKG/usr/local/share/man/man1/wmcalc.1.gz $PKG/usr/man/man1
+rm -rf $PKG/usr/local
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING wmcalc.conf README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/wmcalc/wmcalc.info b/academic/wmcalc/wmcalc.info
new file mode 100644
index 0000000000..ad8f27f566
--- /dev/null
+++ b/academic/wmcalc/wmcalc.info
@@ -0,0 +1,10 @@
+PRGNAM="wmcalc"
+VERSION="0.5"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmcalc"
+DOWNLOAD="http://repo.or.cz/w/dockapps.git/snapshot/c2f0ad2882b89c5c33dfb8331c1f05ca284e7c36.tar.gz"
+MD5SUM="ab62320662b38475a6882844266ad032"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/academic/wxMaxima/doinst.sh b/academic/wxMaxima/doinst.sh
index 3e5691a052..9a8ded3c60 100644
--- a/academic/wxMaxima/doinst.sh
+++ b/academic/wxMaxima/doinst.sh
@@ -2,8 +2,6 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
diff --git a/academic/wxMaxima/wxMaxima.SlackBuild b/academic/wxMaxima/wxMaxima.SlackBuild
index 63daef3bb1..74c823aaf3 100644
--- a/academic/wxMaxima/wxMaxima.SlackBuild
+++ b/academic/wxMaxima/wxMaxima.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wxMaxima
 
-# Copyright 2010-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wxMaxima
-VERSION=${VERSION:-13.04.2}
+SRCNAM=wxmaxima
+VERSION=${VERSION:-15.08.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,38 +60,48 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix man directory.
+sed -i '/^mandatadir/s|=.*|= \$(mandir)|' data/Makefile*
+#Fix end-of-line encoding.
+for i in art/*.txt; do
+  sed -e 's/\r//' $i > ${i}.new
+  touch -r $i ${i}.new
+  mv ${i}.new $i
+done
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
+  --disable-silent-rules \
   --enable-printing \
   --build=$ARCH-slackware-linux
 
 make
+make allmo
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Cleanup the desktop menu item.
-sed -i -e "/^Icon/s|=.*|=$PRGNAM|" wxmaxima.desktop
-install -D -m 0644 wxmaxima.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-for i in 16 32 48 64 96 128; do
-  convert data/wxmaxima.png -resize ${i}x${i}! $PRGNAM-$i.png
-  install -D -m 0644 $PRGNAM-$i.png \
-    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
-done
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README art/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/wxMaxima/wxMaxima.info b/academic/wxMaxima/wxMaxima.info
index 70eff42312..07bd4eb95d 100644
--- a/academic/wxMaxima/wxMaxima.info
+++ b/academic/wxMaxima/wxMaxima.info
@@ -1,10 +1,10 @@
 PRGNAM="wxMaxima"
-VERSION="13.04.2"
-HOMEPAGE="http://wxmaxima.sourceforge.net/wiki/index.php/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/wxmaxima/wxMaxima-13.04.2.tar.gz"
-MD5SUM="52458cb8798a75d099623ed4259f997d"
+VERSION="15.08.2"
+HOMEPAGE="http://andrejv.github.io/wxmaxima/"
+DOWNLOAD="http://downloads.sourceforge.net/wxmaxima/wxmaxima-15.08.2.tar.gz"
+MD5SUM="57f8ad6376bfc8ca92c69e613dcf0d99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="maxima wxPython"
+REQUIRES="maxima wxGTK3"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/academic/wxmacmolplt/wxmacmolplt.SlackBuild b/academic/wxmacmolplt/wxmacmolplt.SlackBuild
index f9404489c6..16fd4d9542 100644
--- a/academic/wxmacmolplt/wxmacmolplt.SlackBuild
+++ b/academic/wxmacmolplt/wxmacmolplt.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wxmacmolplt
-VERSION=${VERSION:-7.6}
+VERSION=${VERSION:-7.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/wxmacmolplt/wxmacmolplt.info b/academic/wxmacmolplt/wxmacmolplt.info
index 35434cba58..c2efda7926 100644
--- a/academic/wxmacmolplt/wxmacmolplt.info
+++ b/academic/wxmacmolplt/wxmacmolplt.info
@@ -1,8 +1,8 @@
 PRGNAM="wxmacmolplt"
-VERSION="7.6"
+VERSION="7.6.1"
 HOMEPAGE="http://brettbode.github.io/wxmacmolplt/"
-DOWNLOAD="https://bintray.com/artifact/download/brettbode/generic/wxmacmolplt-7.6.tar.gz"
-MD5SUM="4ca75436f966d893d7685d8d1365cbce"
+DOWNLOAD="http://downloads.sourceforge.net/slackbuildsdirectlinks/wxmacmolplt-7.6.1.tar.gz"
+MD5SUM="6980b3f3263526d1e91d32f80b52286a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ming wxPython"
diff --git a/academic/xiphos/xiphos.SlackBuild b/academic/xiphos/xiphos.SlackBuild
index 9f5640f30a..9087069730 100644
--- a/academic/xiphos/xiphos.SlackBuild
+++ b/academic/xiphos/xiphos.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xiphos
-VERSION=${VERSION:-4.0.2}
+VERSION=${VERSION:-4.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-20150415.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-20150830.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/academic/xiphos/xiphos.info b/academic/xiphos/xiphos.info
index 136638b88f..66a229d30b 100644
--- a/academic/xiphos/xiphos.info
+++ b/academic/xiphos/xiphos.info
@@ -1,8 +1,8 @@
 PRGNAM="xiphos"
-VERSION="4.0.2"
+VERSION="4.0.4"
 HOMEPAGE="http://xiphos.org"
-DOWNLOAD="http://heanet.dl.sourceforge.net/project/gnomesword/Xiphos/4.0.2/xiphos-4.0.2-20150415.tar.gz"
-MD5SUM="d5151d06bc701c82f9a1fa7f81214fe1"
+DOWNLOAD="http://heanet.dl.sourceforge.net/project/gnomesword/Xiphos/4.0.4/xiphos-4.0.4-20150830.tar.gz"
+MD5SUM="a1d88b7d6812fd261d71a229999c669d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="sword gtkhtml webkitgtk3 biblesync rarian"
diff --git a/academic/zotero/zotero.SlackBuild b/academic/zotero/zotero.SlackBuild
index 6e992e9de7..770b97944c 100644
--- a/academic/zotero/zotero.SlackBuild
+++ b/academic/zotero/zotero.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=zotero
 SRCNAM=Zotero
-VERSION=${VERSION:-4.0.26.3}
+VERSION=${VERSION:-4.0.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/zotero/zotero.info b/academic/zotero/zotero.info
index 50c2f51b45..a5ee7f0a76 100644
--- a/academic/zotero/zotero.info
+++ b/academic/zotero/zotero.info
@@ -1,10 +1,10 @@
 PRGNAM="zotero"
-VERSION="4.0.26.3"
+VERSION="4.0.28"
 HOMEPAGE="https://www.zotero.org/"
-DOWNLOAD="https://download.zotero.org/standalone/4.0.26.3/Zotero-4.0.26.3_linux-i686.tar.bz2"
-MD5SUM="ea0d2b7151e9b610651d3a8fe7c1f1bd"
-DOWNLOAD_x86_64="https://download.zotero.org/standalone/4.0.26.3/Zotero-4.0.26.3_linux-x86_64.tar.bz2"
-MD5SUM_x86_64="d46e52c7c4952aa97b2f27cebb462247"
+DOWNLOAD="https://download.zotero.org/standalone/4.0.28/Zotero-4.0.28_linux-i686.tar.bz2"
+MD5SUM="a5cb40b79b26dbe4fb29b8e9fdb61a9f"
+DOWNLOAD_x86_64="https://download.zotero.org/standalone/4.0.28/Zotero-4.0.28_linux-x86_64.tar.bz2"
+MD5SUM_x86_64="55f743aa7c08ca16d933e91faf43a2fc"
 REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="petar.petrov@student.oulu.fi"
diff --git a/accessibility/Synkron/README b/accessibility/Synkron/README
new file mode 100644
index 0000000000..4d72d53bf3
--- /dev/null
+++ b/accessibility/Synkron/README
@@ -0,0 +1,4 @@
+Synkron is an application that helps you keep your files and folders always updated. You can easily sync
+your documents, music, or pictures to have their latest versions everywhere.
+
+Synkron provides an easy-to-use interface and a lot of features. Moreover, it is free and cross-platform.
diff --git a/accessibility/Synkron/Synkron.SlackBuild b/accessibility/Synkron/Synkron.SlackBuild
new file mode 100644
index 0000000000..25bc655c4b
--- /dev/null
+++ b/accessibility/Synkron/Synkron.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for purple-facebook
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Synkron
+VERSION=${VERSION:-1.6.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+cd $PRGNAM-$VERSION-src
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Build release version
+lrelease Synkron.pro
+qmake -config release
+make
+
+# Have to manually do this sadly
+mkdir -p $PKG/usr/bin
+cp -a synkron $PKG/usr/bin
+
+# Makes desktop file related directories
+mkdir -p $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/pixmaps
+
+# Copies over desktop file and icon
+cp -a $CWD/synkron.desktop $PKG/usr/share/applications
+cp -a $CWD/synkron.png $PKG/usr/share/pixmaps
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a readme.txt gpl.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/accessibility/Synkron/Synkron.info b/accessibility/Synkron/Synkron.info
new file mode 100644
index 0000000000..709be7545b
--- /dev/null
+++ b/accessibility/Synkron/Synkron.info
@@ -0,0 +1,10 @@
+PRGNAM="Synkron"
+VERSION="1.6.2"
+HOMEPAGE="http://synkron.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/synkron/files/synkron/1.6.2/Synkron-1.6.2-src.tar.gz"
+MD5SUM="a54301030a0451401bb253f2d80ac61b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/accessibility/Synkron/slack-desc b/accessibility/Synkron/slack-desc
new file mode 100644
index 0000000000..1453397b50
--- /dev/null
+++ b/accessibility/Synkron/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler--------------------------------------------------------|
+Synkron: Synkron (Easy to use file/folder synchronization)
+Synkron: 
+Synkron: Synkron is an application that helps you keep your files and folders
+Synkron: always updated. You can easily sync your documents, music, or pictures
+Synkron: to have their latest versions everywhere.
+Synkron: 
+Synkron: Synkron provides an easy-to-use interface and a lot of features.
+Synkron: Moreover, it is free and cross-platform.
+Synkron: 
+Synkron: Homepage: http://synkron.sourceforge.net/
diff --git a/accessibility/Synkron/synkron.desktop b/accessibility/Synkron/synkron.desktop
new file mode 100644
index 0000000000..c643c54c73
--- /dev/null
+++ b/accessibility/Synkron/synkron.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Synkron
+GenericName=Easy to use file/folder synchronization
+Type=Application
+Comment=An easy-to-use gui for managing different version of files and folders.
+Exec=synkron
+Icon=synkron
+Terminal=false
+Categories=Utility
diff --git a/accessibility/Synkron/synkron.png b/accessibility/Synkron/synkron.png
new file mode 100644
index 0000000000..ab4d93d6f3
--- /dev/null
+++ b/accessibility/Synkron/synkron.png
diff --git a/accessibility/easystroke/easystroke.info b/accessibility/easystroke/easystroke.info
index 1d615d2dfd..e23730ec63 100644
--- a/accessibility/easystroke/easystroke.info
+++ b/accessibility/easystroke/easystroke.info
@@ -1,6 +1,6 @@
 PRGNAM="easystroke"
 VERSION="0.6.0"
-HOMEPAGE="http://easystroke.wiki.sourceforge.net/"
+HOMEPAGE="https://github.com/thjaeger/easystroke/wiki"
 DOWNLOAD="http://downloads.sourceforge.net/easystroke/easystroke-0.6.0.tar.gz"
 MD5SUM="3b4f25d02a6b5ac57a8b7a06545869db"
 DOWNLOAD_x86_64=""
diff --git a/accessibility/easystroke/slack-desc b/accessibility/easystroke/slack-desc
index 1613b39622..fb16fdb55c 100644
--- a/accessibility/easystroke/slack-desc
+++ b/accessibility/easystroke/slack-desc
@@ -12,7 +12,7 @@ easystroke: Easystroke is a gesture-recognition application for X11. Gestures or
 easystroke: strokes are movements that you make with you mouse (or your pen,
 easystroke: finger etc.) while holding down a specific mouse button.
 easystroke:
-easystroke: Homepage: http://easystroke.wiki.sourceforge.net/
+easystroke: Homepage: https://github.com/thjaeger/easystroke/wiki
 easystroke:
 easystroke:
 easystroke:
diff --git a/accessibility/svkbd/svkbd.info b/accessibility/svkbd/svkbd.info
index c88c5b7693..082432e5a6 100644
--- a/accessibility/svkbd/svkbd.info
+++ b/accessibility/svkbd/svkbd.info
@@ -1,7 +1,7 @@
 PRGNAM="svkbd"
 VERSION="20140130"
 HOMEPAGE="http://tools.suckless.org/svkbd"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/svkbd-20140130.tar.gz"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/accessibility/svkbd/svkbd-20140130.tar.gz"
 MD5SUM="d1279213dbdac77dbb7b386c138d6e61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/accessibility/xdotool/xdotool.SlackBuild b/accessibility/xdotool/xdotool.SlackBuild
index 3227f2a78b..df5ac9eb43 100644
--- a/accessibility/xdotool/xdotool.SlackBuild
+++ b/accessibility/xdotool/xdotool.SlackBuild
@@ -12,9 +12,15 @@
 # - make & install HTML doc instead of raw POD doc
 # - fix permissions in examples/
 
+# 20151028 bkw:
+# - updated for xdotool 3.20150503.1.
+
+# 20151126 bkw:
+# - fix xdo.h permissions
+
 PRGNAM=xdotool
-VERSION=${VERSION:-2.20110530.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.20150503.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -50,7 +56,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,6 +75,7 @@ strip --strip-unneeded $PKG/usr/bin/$PRGNAM
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 chmod 755 examples/*.sh
+chmod 644 /usr/include/*.h
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/accessibility/xdotool/xdotool.info b/accessibility/xdotool/xdotool.info
index f8dc47548d..407c4b424b 100644
--- a/accessibility/xdotool/xdotool.info
+++ b/accessibility/xdotool/xdotool.info
@@ -1,10 +1,10 @@
 PRGNAM="xdotool"
-VERSION="2.20110530.1"
+VERSION="3.20150503.1"
 HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
-DOWNLOAD="http://semicomplete.googlecode.com/files/xdotool-2.20110530.1.tar.gz"
-MD5SUM="62d0c2158bbaf882a1cf580421437b2f"
+DOWNLOAD="https://github.com/jordansissel/xdotool/archive/v3.20150503.1.tar.gz"
+MD5SUM="e4447c61034d1d2140db13fbf0daa060"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libxkbcommon"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild
index 6dafa3d0ad..26abf77a46 100644
--- a/audio/SuperCollider/SuperCollider.SlackBuild
+++ b/audio/SuperCollider/SuperCollider.SlackBuild
@@ -114,10 +114,10 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 if [ "${CAPS:-yes}" = "yes" ]; then
-  echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/sclang" >> $PKG/install/doinst.sh
-  echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/scsynth" >> $PKG/install/doinst.sh
-  echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/scvim" >> $PKG/install/doinst.sh
-  echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/scide" >> $PKG/install/doinst.sh
+  echo "setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/sclang" >> $PKG/install/doinst.sh
+  echo "setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/scsynth" >> $PKG/install/doinst.sh
+  echo "setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/scvim" >> $PKG/install/doinst.sh
+  echo "setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/scide" >> $PKG/install/doinst.sh
 fi
 
 cd $PKG
diff --git a/audio/abcde/Makefile.diff b/audio/abcde/Makefile.diff
deleted file mode 100644
index 922e3c3160..0000000000
--- a/audio/abcde/Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- abcde-2.6/Makefile	2014-10-26 13:41:35.000000000 -0400
-+++ abcde-2.6/Makefile.patched	2014-12-14 18:22:39.005098302 -0500
-@@ -3,7 +3,7 @@
- # Installation directories
- prefix = ${DESTDIR}/usr
- exec_prefix = ${prefix}
--mandir = ${prefix}/share/man/man1
-+mandir = ${prefix}/man/man1
- bindir = ${exec_prefix}/bin
- etcdir = ${DESTDIR}/etc
- 
diff --git a/audio/abcde/README b/audio/abcde/README
index 3b6c074d74..534e40d071 100644
--- a/audio/abcde/README
+++ b/audio/abcde/README
@@ -1,29 +1,46 @@
 abcde is a frontend command-line utility (actually, a shell script)
-that grabs tracks off a CD encodes them to Ogg/Vorbis, MP3, FLAC,
-OGG/Speex, MPP/MP+(Musepack) and/or M4A/AAC format, and tags them 
-all in one go.
-
-There are many optional features that abcde supports by building 
-with one or more of these optional dependencies:
-
-* faac       : for creating m4a/aac files
-* id3lib     : for manipulating ID3v1 and ID3v2 tags
-* id3v2      : for writing id3v2 tags
-* lame       : for creating mp3 files
-* mppenc     : for creating MPP/MP+(Musepack) files 
-* speex      : for creating Speex files
-* vorbisgain : for adjusting the volume of ogg vorbis files
-
-PLEASE NOTE: the included abcde-musicbrainz-tool script requires the
-following Perl modules (which are not available through SlackBuilds.org
-yet):
-
-MusicBrainz::DiscID
-WebService::MusicBrainz::Release
-WebService::MusicBrainz::Artist
-WebService::MusicBrainz::Response::Track
-WebService::MusicBrainz::Response::TrackList
-
-Try running abcde as root (sudo or whatever) if abcde/cd-discid thinks 
-your favorite audio cd is a data cd. Please note also that faac needs 
-to have mp4 support enabled to work correctly with abcde.
+that grabs tracks off an audio CD, encodes them to Ogg Vorbis, MP3,
+MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, M4A/AAC, Monkey’s
+Audio and/or True Audio formats, and tags them all in one go.
+
+On Slackware systems without third party packages Ogg Vorbis, FLAC
+and WavPack are supported. There are many additional features that
+abcde supports by installing one or more of these dependencies:
+
+* lame            for creating MP3 files
+* eyeD3           for tagging MP3 files (default)
+* id3v2           for tagging MP3 files (with ID3TAGV=id3v2.3)
+* id3             for tagging MP3 files (with ID3TAGV=id3v1)
+
+* twolame         for creating MP2 files
+* mutagen         for tagging MP2 and MP3 files (with ID3TAGV=id3v2.3
+                  and ID3V2=mid3v2)
+
+* opus-tools      for creating Opus files
+
+* speex           for creating Speex files
+
+* musepack-tools  for creating Musepack files
+
+* faac            for creating M4A/AAC files (default)
+* fdkaac          for creating M4A/AAC files
+* ffmpeg          for creating M4A/AAC, MP2 and WavPack files (if built
+                  with support for these formats)
+* wine            for running neroAacEnc, qaac and fhgaacenc
+
+* mac             for creating Monkey’s Audio files
+* apetag          for tagging Monkey’s Audio files
+
+* tta             for creating True Audio files (default)
+* ttaenc          for creating True Audio files
+
+* glyr            for downloading album art
+* mkcue           for generating cue sheets for one-album files
+* vorbisgain      for adjusting the volume of Ogg Vorbis files
+
+Install perl-MusicBrainz-DiscID and perl-WebService-MusicBrainz and set
+CDDBMETHOD to "musicbrainz" if you would like to retrieve music
+metadata and album art from MusicBrainz instead of freedb.
+
+Try running abcde as root (sudo or whatever) if abcde/cd-discid thinks
+your favorite audio cd is a data cd.
diff --git a/audio/abcde/abcde.SlackBuild b/audio/abcde/abcde.SlackBuild
index f232bfc94f..97addbabaa 100644
--- a/audio/abcde/abcde.SlackBuild
+++ b/audio/abcde/abcde.SlackBuild
@@ -25,9 +25,10 @@
 # Modified by the SlackBuilds.org project
 # Modified by Andrew Strong
 # Modified by Glenn Becker
+# Modified by Andreas Voegele
 
 PRGNAM=abcde
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,8 +49,8 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -57,39 +58,26 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix mandir and remove setting of ownership during install
-# The mandir can easily be changed by passing a 'mandir' variable to the
-# 'make install' process, but the setting of ownership isn't so easy to
-# work around without a patch.  This isn't an issue if the SlackBuild
-# script is run as root, but I'm guessing that I'm not the only person who
-# likes to test a script as normal user before running it as root, and the
-# ownership setting in the Makefile will break installs as a normal user.
-# --rworkman
-patch -p1 < $CWD/Makefile.diff
+patch -p1 < $CWD/id3-genre.diff
 
-# fix to mailx call: the command was using the -a option which, in Slackware's
-# mailx, means something different than what was intended here (intent here is
-# to set content type to UTF-8. In Slackware the -a is unnecessary. Thanks to
-# Andreas Vogele for this patch. --gbecker
-patch -p1 < $CWD/cddb-tool.diff
-
-# Removed aac/speex patch as this was fixed upstream - G Becker 10.7.12
-
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG \
+  prefix=/usr \
+  sysconfdir=/etc \
+  docdir=/usr/doc/$PRGNAM-$VERSION \
+  mandir=/usr/man
 
 # Let's not overwrite the config file if it already exists
 mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING FAQ README TODO changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING FAQ README changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/audio/abcde/abcde.info b/audio/abcde/abcde.info
index 76946e7dc1..13d1cd9557 100644
--- a/audio/abcde/abcde.info
+++ b/audio/abcde/abcde.info
@@ -1,10 +1,10 @@
 PRGNAM="abcde"
-VERSION="2.6"
+VERSION="2.7.1"
 HOMEPAGE="http://abcde.einval.com"
-DOWNLOAD="http://abcde.einval.com/download/abcde-2.6.tar.gz"
-MD5SUM="c8b91d5c53386cfc4345d9d49f67e1dd"
+DOWNLOAD="http://abcde.einval.com/download/abcde-2.7.1.tar.gz"
+MD5SUM="09d5c9dc6c0bf6dd4b3fb159e1433018"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cd-discid"
-MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/audio/abcde/id3-genre.diff b/audio/abcde/id3-genre.diff
new file mode 100644
index 0000000000..e3dd55d262
--- /dev/null
+++ b/audio/abcde/id3-genre.diff
@@ -0,0 +1,18 @@
+Pass the genre name instead of the identifier to the id3 command as the
+numbers are offset by one.
+
+--- abcde-2.7.1/abcde.orig	2015-10-04 11:30:28.000000000 +0200
++++ abcde-2.7.1/abcde	2016-01-09 15:49:12.249326957 +0100
+@@ -822,11 +822,11 @@
+ 			case "$ID3SYNTAX" in
+ 				id3)
+ 					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+ 						$TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+ 						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
+-						-y "$CDYEAR" -g "$GENREID" \
++						-y "$CDYEAR" -g "$CDGENRE" \
+ 						-T "${TRACKNUM:-$1}" \
+ 						"$ABCDETEMPDIR/track$1.$OUTPUT"
+ 					;;
+ 				id3v2)
+ 					# FIXME # track numbers in mp3 come with 1/10, so we cannot
diff --git a/audio/abcde/slack-desc b/audio/abcde/slack-desc
index b96cb9ab7c..49420743d9 100644
--- a/audio/abcde/slack-desc
+++ b/audio/abcde/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-abcde: abcde (shell script to encode CD's)
+abcde: abcde (shell script to encode audio CDs)
 abcde:
 abcde: abcde is a frontend command-line utility (actually, a shell script)
-abcde: that grabs tracks from a CD, encodes them to Ogg/Vorbis, MP3, FLAC,
-abcde: OGG/Speex, MPP/MP+(Musepack) and/or M4A/AAC format, and tags them,
-abcde: all in one go.
+abcde: that grabs tracks off an audio CD, encodes them to Ogg Vorbis, MP3,
+abcde: MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, M4A/AAC, Monkey’s
+abcde: Audio and/or True Audio formats and tags them all in one go.
 abcde:
-abcde: Homepage: http://freecode.com/projects/abcde
+abcde: Homepage: http://abcde.einval.com
 abcde:
 abcde:
 abcde:
diff --git a/audio/aj-snapshot/aj-snapshot.info b/audio/aj-snapshot/aj-snapshot.info
index e712a3970c..57e25db2c0 100644
--- a/audio/aj-snapshot/aj-snapshot.info
+++ b/audio/aj-snapshot/aj-snapshot.info
@@ -1,7 +1,7 @@
 PRGNAM="aj-snapshot"
 VERSION="0.9.6"
 HOMEPAGE="http://aj-snapshot.sourceforge.net/"
-DOWNLOAD="http://colocrossing.dl.sourceforge.net/project/aj-snapshot/aj-snapshot-0.9.6.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/project/aj-snapshot/aj-snapshot-0.9.6.tar.bz2"
 MD5SUM="fd755bbcade848001f16740462a08dff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/apulse/apulse.SlackBuild b/audio/apulse/apulse.SlackBuild
index 85096cc72c..6e75609e79 100644
--- a/audio/apulse/apulse.SlackBuild
+++ b/audio/apulse/apulse.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -20,11 +20,11 @@
 
 # You may have received a copy of the GNU General Public License along
 # with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 PRGNAM=apulse
-VERSION=${VERSION:-20150525}
-SRCVERSION=${SRCVERSION:-147c55c06a8ee78582767289552a0dfbe2e823f5}
+VERSION=${VERSION:-20151219}
+SRCVERSION=${SRCVERSION:-1a395013489c09fcd73d2f58994e8a53a1b903c2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/apulse/apulse.info b/audio/apulse/apulse.info
index 609ecb026b..9d97ab5bac 100644
--- a/audio/apulse/apulse.info
+++ b/audio/apulse/apulse.info
@@ -1,8 +1,8 @@
 PRGNAM="apulse"
-VERSION="20150525"
+VERSION="20151219"
 HOMEPAGE="https://github.com/i-rinat/apulse"
-DOWNLOAD="https://github.com/i-rinat/apulse/archive/147c55c06a8ee78582767289552a0dfbe2e823f5.tar.gz"
-MD5SUM="5cab20cce996705050a4a5c3725e97f8"
+DOWNLOAD="https://github.com/i-rinat/apulse/archive/1a395013489c09fcd73d2f58994e8a53a1b903c2.tar.gz"
+MD5SUM="e670e784166118ffd3e367bfc6a1217f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/calf-ladspa/README b/audio/calf-ladspa/README
new file mode 100644
index 0000000000..8ffe92ee3b
--- /dev/null
+++ b/audio/calf-ladspa/README
@@ -0,0 +1,17 @@
+Calf "legacy" audio plugin pack for LADSPA and JACK. Contains effects
+(flanger, reverb, tape-like delay, phaser, rotary speaker, multi-mode
+filter, multi-tap chorus and compressor) and instruments (organ simulator
+and a monophonic synthesizer). This is the last release of Calf that
+supports LADSPA.
+
+This build only contains LADSPA plugins. It can be installed on the same
+system as the main "calf" build without conflict. If you're looking for
+LV2 plugins and/or the standalone calfjackhost, see the main "calf" build.
+The main purpose for calf-ladspa is to allow old Ardour/etc sessions
+to keep working after upgrading calf to the new non-LADSPA version. New
+projects should use the LV2 plugins in the calf build, since that's what
+upstream supports.
+
+If you're looking for DSSI, please contact the script maintainer. Adding
+DSSI to this build is possible, but more work than I want to do unless
+someone actually *needs* it for opening old sessions.
diff --git a/audio/calf-ladspa/calf-ladspa.SlackBuild b/audio/calf-ladspa/calf-ladspa.SlackBuild
new file mode 100644
index 0000000000..bd3e0d7647
--- /dev/null
+++ b/audio/calf-ladspa/calf-ladspa.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+# Slackware build script for calf-ladspa
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# 20151105 bkw:
+# - Renamed to calf-ladspa. The main calf build is now for calf-0.0.60,
+#   which lacks LADSPA support. Removed LV2 and standalone support, use
+#   calf for that instead. Removed DSSI support, because I don't
+#   think anyone's using it, and because it's non-trivial to install
+#   the gui support files anywhere other than /usr/share/calf, which
+#   would step on the main calf package.
+
+# 20141030 bkw:
+# Finally getting around to submitting this, there have been no code
+# changes upstream since 20140308.
+
+# 20140308 bkw:
+# - Switched to falkTX's KXStudio fork of CALF. falkTX doesn't do release
+#   tarballs, so this is a git checkout from 20140308.
+# - Added capability stuff.
+
+PRGNAM=calf-ladspa
+VERSION=${VERSION:-0.0.19kx}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# 20151106 bkw: --enable-experimental only enables the fluidsynth
+# module, which doesn't work as LADSPA (needs to be DSSI or LV2), so
+# leave it disabled here.
+EXPOPT=disable
+
+# Unfortunately there's no way to disable building calfjackhost and
+# installing it and its support files. We'll disable what we can,
+# and go ahead & build calfjackhost and rm -rf it after install.
+LADSPA_OPT="--with-ladspa-dir=/usr/lib${LIBDIRSUFFIX}/ladspa"
+DSSI_OPT="--without-dssi"
+LV2_OPT="--without-lv2"
+
+set -e
+
+SRCNAM=calf
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+autoreconf -if
+
+# Note: The build ignores the provided -O2 in the flags (but the
+# -march/-mtune -fPIC stuff is used). If you really want to force
+# it to use -O2 (Slackware default), set FORCE_SLACK_CFLAGS=yes
+# in the environment.
+if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
+  sed -i -e 's/ -O3[^"]*//' configure
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --${EXPOPT}-experimental \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --htmldir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --disable-static \
+  $LADSPA_OPT \
+  $DSSI_OPT \
+  $LV2_OPT \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
+
+# install-strip is supported, but doesn't work:
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# This build is only for the ladspa plugins, so none of this
+# other stuff should be in the package:
+rm -rf $PKG/usr/share $PKG/usr/bin $PKG/usr/man $PKG/usr/lib64/calf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/calf-ladspa/calf-ladspa.info b/audio/calf-ladspa/calf-ladspa.info
new file mode 100644
index 0000000000..33bb8368d5
--- /dev/null
+++ b/audio/calf-ladspa/calf-ladspa.info
@@ -0,0 +1,10 @@
+PRGNAM="calf-ladspa"
+VERSION="0.0.19kx"
+HOMEPAGE="http://kxstudio.sourceforge.net/Plugins"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/calf-0.0.19kx.tar.gz"
+MD5SUM="ba2147ddc53022ddf1ffdf28c3340a57"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jack-audio-connection-kit ladspa_sdk fluidsynth"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/audio/calf-ladspa/calf.desktop b/audio/calf-ladspa/calf.desktop
new file mode 100644
index 0000000000..a5d65f428e
--- /dev/null
+++ b/audio/calf-ladspa/calf.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Calf Plugin Pack for JACK
+Name[pl]=Zestaw wtyczek Calf
+Name[ru]=�абор �ффектов и ин�трументов Calf дл� JACK
+Comment=Process and produce sounds using a set of plugins with JACK interface
+Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK
+Comment[ru]=Обработка и �оздание музыки при помощи �ффектов и ин�трументов через JACK
+Exec=calfjackhost
+Terminal=false
+Type=Application
+Categories=AudioVideo;Audio;
+Icon=calf
diff --git a/audio/calf-ladspa/slack-desc b/audio/calf-ladspa/slack-desc
new file mode 100644
index 0000000000..495567f433
--- /dev/null
+++ b/audio/calf-ladspa/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+calf-ladspa: calf-ladspa (legacy audio plugin pack for LADSPA, DSSI, and JACK)
+calf-ladspa:
+calf-ladspa: Calf audio plugin pack for LADSPA, DSSI, and JACK. Contains
+calf-ladspa: effects (flanger, reverb, tape-like delay, phaser, rotary speaker,
+calf-ladspa: multi-mode filter, multi-tap chorus and compressor) and instruments
+calf-ladspa: (organ simulator and a monophonic synthesizer).
+calf-ladspa:
+calf-ladspa:
+calf-ladspa:
+calf-ladspa:
+calf-ladspa:
diff --git a/audio/calf/README b/audio/calf/README
index 75707a3897..80ad9780bf 100644
--- a/audio/calf/README
+++ b/audio/calf/README
@@ -1,24 +1,13 @@
-Calf audio plugin pack for LADSPA, DSSI, LV2 and JACK. Contains effects
-(flanger, reverb, tape-like delay, phaser, rotary speaker, multi-mode
-filter, multi-tap chorus and compressor) and instruments (organ simulator
-and a monophonic synthesizer). This is falkTX's KXStudio fork of Calf,
-which re-adds LADSPA and DSSI support (which was removed from the
-original codebase).
+Calf Studio Gear is an audio plug-in pack for LV2 and JACK environments
+under Linux operating systems. The suite contains lots of effects (delay,
+modulation, signal processing, filters, equalizers, dynamics, distortion
+and mastering effects), instruments (SF2 player, organ simulator and
+a monophonic synthesizer) and tools (analyzer, mono/stereo tools,
+crossovers). Calf Studio Gear aims for a professional audience.
 
-Optional dependencies: By default, these are auto-detected at build time.
-Support for each dep will be built if found, unless disabled with an
-environment variable.
-
-ladspa_sdk: Disable with LADSPA=no (which will also disable DSSI).
-dssi: Disable with DSSI=no.
-lv2 and slv2: Disable with LV2=no.
-lash: cannot be disabled (will always be used if installed).
-
-Even with all the plugin formats disabled, calfjackhost will still
-be built.
-
-To enable some experimental LV2 plugins designed for use with modular
-hosts, set EXPERIMENTAL=yes in the environment (default is "no").
+By default, the package is built with SSE support if the host CPU supports
+SSE. If building for another host, you can set SSE=yes or SSE=no in the
+environment to override the autodetection.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/calf/calf.SlackBuild b/audio/calf/calf.SlackBuild
index f7b62727fa..fe8e9baa2e 100644
--- a/audio/calf/calf.SlackBuild
+++ b/audio/calf/calf.SlackBuild
@@ -4,6 +4,15 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# 20151106 bkw:
+# Switch to -master and upgrade to v0.0.60. No more LADSPA or DSSI
+# support (upstream dropped it). But if you need LADSPA, there's a
+# separate calf-ladspa build now. If there's a popular demand for
+# DSSI, I'll add it to calf-ladspa, not here.
+# fluidsynth is now required, because the build fails without it, even
+# though it's listed as experimental and there's a --disable-experimental
+# option. Since it's required anyway, might as well --enable-experimental.
+
 # 20141030 bkw:
 # Finally getting around to submitting this, there have been no code
 # changes upstream since 20140308.
@@ -14,8 +23,8 @@
 # - Added capability stuff.
 
 PRGNAM=calf
-VERSION=${VERSION:-0.0.19kx}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.0.60}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,39 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "${EXPERIMENTAL:-no}" = "yes" ]; then
-  EXPOPT=enable
-else
-  EXPOPT=disable
-fi
-
-if [ "${LADSPA:-yes}" = "no" ]; then
-  LADSPA_OPT="--without-ladspa"
-else
-  LADSPA_OPT="--with-ladspa-dir=/usr/lib${LIBDIRSUFFIX}/ladspa"
-fi
-
-if [ "${DSSI:-yes}" = "no" ]; then
-  DSSI_OPT="--without-dssi"
-else
-  DSSI_OPT="--with-dssi-dir=/usr/lib${LIBDIRSUFFIX}/dssi"
-fi
-
-if [ "${LV2:-yes}" = "no" ]; then
-  LV2_OPT="--without-lv2"
-else
-  LV2_OPT="--with-lv2-dir=/usr/lib${LIBDIRSUFFIX}/lv2"
-fi
-
-echo "LADSPA_OPT: $LADSPA_OPT, DSSI_OPT: $DSSI_OPT, LV2_OPT: $LV2_OPT"
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -94,12 +77,26 @@ autoreconf -if
 # in the environment.
 if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
   sed -i -e 's/ -O3[^"]*//' configure
+  SSE=no
 fi
 
+# Build with SSE support?
+case "${SSE:-auto}" in
+  "yes") SSEOPT="--enable-sse"  ;;
+  "no")  SSEOPT="--disable-sse" ;;
+  *)     grep sse /proc/cpuinfo >/dev/null \
+              && SSEOPT="--enable-sse" \
+              || SSEOPT="--disable-sse" ;;
+esac
+
+# For the slack-desc:
+WITHSSE="without"
+[ "$SSEOPT" = "--enable-sse" ] && WITHSSE="with"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --${EXPOPT}-experimental \
+  --enable-experimental \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -109,9 +106,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --htmldir=/usr/doc/$PRGNAM-$VERSION \
   --enable-shared \
   --disable-static \
-  $LADSPA_OPT \
-  $DSSI_OPT \
-  $LV2_OPT \
+  --with-lv2-dir=/usr/lib${LIBDIRSUFFIX}/lv2 \
   --build=$ARCH-slackware-linux
 
 make
@@ -134,7 +129,7 @@ rm -f $PKG/usr/share/icons/hicolor/icon-theme.cache
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITHSSE@,$WITHSSE," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Only add capability stuff if not disabled:
diff --git a/audio/calf/calf.info b/audio/calf/calf.info
index 2376eeb51a..c46bac6fc7 100644
--- a/audio/calf/calf.info
+++ b/audio/calf/calf.info
@@ -1,10 +1,10 @@
 PRGNAM="calf"
-VERSION="0.0.19kx"
+VERSION="0.0.60"
 HOMEPAGE="http://kxstudio.sourceforge.net/Plugins"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/calf-0.0.19kx.tar.gz"
-MD5SUM="ba2147ddc53022ddf1ffdf28c3340a57"
+DOWNLOAD="https://github.com/calf-studio-gear/calf/archive/0.0.60.tar.gz"
+MD5SUM="f54469f4bd3f194e7b979b15dfd3d048"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dssi jack-audio-connection-kit ladspa_sdk lash slv2"
+REQUIRES="jack-audio-connection-kit lash slv2 fluidsynth"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/calf/slack-desc b/audio/calf/slack-desc
index 0eefa70461..e5ca8673bb 100644
--- a/audio/calf/slack-desc
+++ b/audio/calf/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-calf: calf (audio plugin pack for LADSPA, DSSI, LV2 and JACK)
-calf:
-calf: Calf audio plugin pack for LADSPA, DSSI, LV2 and JACK. Contains
-calf: effects (flanger, reverb, tape-like delay, phaser, rotary speaker,
-calf: multi-mode filter, multi-tap chorus and compressor) and instruments
-calf: (organ simulator and a monophonic synthesizer).
-calf:
-calf:
+calf: Calf Studio Gear is an audio plug-in pack for LV2 and JACK
+calf: environments under Linux operating systems. The suite contains
+calf: lots of effects (delay, modulation, signal processing, filters,
+calf: equalizers, dynamics, distortion and mastering effects), instruments
+calf: (SF2 player, organ simulator and a monophonic synthesizer) and tools
+calf: (analyzer, mono/stereo tools, crossovers). Calf Studio Gear aims
+calf: for a professional audience.
 calf:
+calf: This package was built @WITHSSE@ SSE support.
 calf:
 calf:
diff --git a/audio/caps/caps.SlackBuild b/audio/caps/caps.SlackBuild
index 9bc82925ad..c0bae50ba3 100644
--- a/audio/caps/caps.SlackBuild
+++ b/audio/caps/caps.SlackBuild
@@ -76,8 +76,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # docs are in a separate tarball now, just a wget -r of upstream's site
 if [ "${DOCS:-yes}" = "yes" ]; then
   ( cd $PKG/usr/doc/$PRGNAM-$VERSION
-    tar xvf $CWD/$PRGNAM-doc-unofficial_$VERSION.tar.bz2
-	 mv $PRGNAM-doc-unofficial_$VERSION html
+    tar xvf $CWD/$PRGNAM-doc-unofficial_$VERSION.tar.bz2 --no-same-owner
+	mv $PRGNAM-doc-unofficial_$VERSION html
     chown root.root html/*
     chmod 644 html/*
   )
diff --git a/audio/chuck/chuck.SlackBuild b/audio/chuck/chuck.SlackBuild
index fb05b8d273..2263d8b327 100644
--- a/audio/chuck/chuck.SlackBuild
+++ b/audio/chuck/chuck.SlackBuild
@@ -44,7 +44,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION/src
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,6 +52,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+cd src
+
 # Set our CFLAGS
 sed -i "s|-O3|$SLKCFLAGS|" makefile*
 
diff --git a/audio/clam/clam.SlackBuild b/audio/clam/clam.SlackBuild
index 0211230929..6927378043 100644
--- a/audio/clam/clam.SlackBuild
+++ b/audio/clam/clam.SlackBuild
@@ -4,8 +4,10 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
 PRGNAM=clam
-VERSION=${VERSION:-r15441}
+VERSION=${VERSION:-r15456}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,6 +55,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# scons failing to link libvorbis/libogg test progs.
+patch -p1 < $CWD/scons_sucks.diff
+
 # An include is called incorrectly
 patch -p1 < $CWD/wrong_include.patch
 
@@ -69,7 +74,7 @@ CPPFLAGS="$SLKCFLAGS" \
 	prefix=/usr \
 	prefix_for_packaging=$PKG/usr
 
-scons
+scons $MAKEFLAGS
 scons install
 strip $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.*
 
diff --git a/audio/clam/clam.info b/audio/clam/clam.info
index 0b183c6fb9..ec362ba9a0 100644
--- a/audio/clam/clam.info
+++ b/audio/clam/clam.info
@@ -1,8 +1,8 @@
 PRGNAM="clam"
-VERSION="r15441"
+VERSION="r15456"
 HOMEPAGE="http://clam-project.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/CLAM-r15441.tar.xz"
-MD5SUM="5cbdefa901d467fd2d92c5e57d2a4372"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/CLAM-r15456.tar.xz"
+MD5SUM="c54caaa742960c015dc4783935ddc8d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="id3lib jack-audio-connection-kit ladspa_sdk lv2 portaudio scons xerces-c"
diff --git a/audio/clam/scons_sucks.diff b/audio/clam/scons_sucks.diff
new file mode 100644
index 0000000000..e4f42c1af6
--- /dev/null
+++ b/audio/clam/scons_sucks.diff
@@ -0,0 +1,19 @@
+diff -Naur CLAM-r15456.orig/scons/libs/clam_dependent_libs_checks.py CLAM-r15456/scons/libs/clam_dependent_libs_checks.py
+--- CLAM-r15456.orig/scons/libs/clam_dependent_libs_checks.py	2015-11-26 05:11:44.000000000 -0500
++++ CLAM-r15456/scons/libs/clam_dependent_libs_checks.py	2015-11-26 18:30:34.574999000 -0500
+@@ -91,10 +91,14 @@
+ 	return True
+ 
+ def test_oggvorbis( env, conf ) :
+-	if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc']) :
++	if not conf.CheckPkgConfigFile(['ogg']) :
+ 		return False
+ 	if not conf.CheckLibrarySample('libogg', 'c', None, libogg_test_code ) : return False
++	if not conf.CheckPkgConfigFile(['vorbis', 'vorbisenc']) :
++		return False
+ 	if not conf.CheckLibrarySample('libvorbis', 'c', None, libvorbis_test_code ) : return False
++	if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc']) :
++		return False
+ 	if not conf.CheckLibrarySample('libvorbisfile', 'c', None, libvorbisfile_test_code) : return False
+ 	return True
+ 
diff --git a/audio/clam_annotator/clam_annotator.SlackBuild b/audio/clam_annotator/clam_annotator.SlackBuild
index 7cca1324d0..de4a7106db 100644
--- a/audio/clam_annotator/clam_annotator.SlackBuild
+++ b/audio/clam_annotator/clam_annotator.SlackBuild
@@ -4,6 +4,8 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
 PRGNAM=clam_annotator
 VERSION=${VERSION:-0.5.0}
 BUILD=${BUILD:-2}
@@ -65,15 +67,15 @@ export QTDIR=$QT4DIR
 cd vmqt
 CCFLAGS="$SLKCFLAGS" \
 CPPLAGS="$SLKCFLAGS" \
-	scons clam_prefix=/usr prefix=/usr
+	scons $MAKEFLAGS clam_prefix=/usr prefix=/usr
 cd -
 
-# This is needed to fix underlinkg
+# This is needed to fix underlinking
 echo "env.Append(LINKFLAGS=['-lGL'])" >> SConstruct
 
 CCFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
-	scons \
+	scons $MAKEFLAGS \
 	prefix=/usr \
 	release=yes \
 	clam_prefix=/usr
diff --git a/audio/clam_voice2midi/clam_voice2midi.SlackBuild b/audio/clam_voice2midi/clam_voice2midi.SlackBuild
index 752826ae60..c4b91051be 100644
--- a/audio/clam_voice2midi/clam_voice2midi.SlackBuild
+++ b/audio/clam_voice2midi/clam_voice2midi.SlackBuild
@@ -4,6 +4,8 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
 PRGNAM=clam_voice2midi
 VERSION=${VERSION:-0.3.10}
 BUILD=${BUILD:-2}
@@ -67,7 +69,7 @@ patch -p1 < $CWD/fix_undelinking.patch
 
 CCFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
-	scons \
+	scons $MAKEFLAGS \
 	prefix=/usr \
 	release=yes \
 	clam_prefix=/usr
diff --git a/audio/clam_voice2midi/fix_undelinking.patch b/audio/clam_voice2midi/fix_undelinking.patch
index 3818e0074e..b84fb1e9d4 100644
--- a/audio/clam_voice2midi/fix_undelinking.patch
+++ b/audio/clam_voice2midi/fix_undelinking.patch
@@ -6,7 +6,7 @@ diff -Naur Voice2MIDI-0.3.10.orig/SConstruct Voice2MIDI-0.3.10/SConstruct
  if sys.platform == 'darwin' :
  	extralinkFlags=['-dynamic','-bind_at_load']
 +if sys.platform == 'linux2' :
-+	extralinkFlags=['-lGL']
++	extralinkFlags=['-lGL', '-lpthread']
  
  programs = []
  for main in mainSources.items() :
diff --git a/audio/cmt/cmt.info b/audio/cmt/cmt.info
index 68b7891478..730a004ea6 100644
--- a/audio/cmt/cmt.info
+++ b/audio/cmt/cmt.info
@@ -1,7 +1,7 @@
 PRGNAM="cmt"
 VERSION="1.16"
-HOMEPAGE="http://www.ladspa.org/cmt/"
-DOWNLOAD="http://www.ladspa.org/download/cmt_src_1.16.tgz"
+HOMEPAGE="https://web.archive.org/web/20131219003501/http://www.ladspa.org/cmt/"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cmt_src_1.16.tgz"
 MD5SUM="15a875e5aaf79c209c223babfb41cb1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/distrho-mini-series/distrho-mini-series.SlackBuild b/audio/distrho-mini-series/distrho-mini-series.SlackBuild
index 419aa75c90..c9423bda9f 100644
--- a/audio/distrho-mini-series/distrho-mini-series.SlackBuild
+++ b/audio/distrho-mini-series/distrho-mini-series.SlackBuild
@@ -26,7 +26,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i?86" ]; then
+if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
   LIBDIRMARK="32"
 elif [ "$ARCH" = "x86_64" ]; then
diff --git a/audio/distrho-ports/distrho-ports.SlackBuild b/audio/distrho-ports/distrho-ports.SlackBuild
index eda3cc034a..7605bd5bb5 100644
--- a/audio/distrho-ports/distrho-ports.SlackBuild
+++ b/audio/distrho-ports/distrho-ports.SlackBuild
@@ -26,7 +26,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i?86" ]; then
+if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
   LIBDIRMARK="32"
 elif [ "$ARCH" = "x86_64" ]; then
diff --git a/audio/fabla/fabla.SlackBuild b/audio/fabla/fabla.SlackBuild
index f898a5ed21..f06409701d 100644
--- a/audio/fabla/fabla.SlackBuild
+++ b/audio/fabla/fabla.SlackBuild
@@ -48,7 +48,8 @@ cd $TMP
 
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
-tar xvf $CWD/release-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1
+tar xvf $CWD/release-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1 \
+  || tar xvf $CWD/openAV-Fabla-release-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1
 
 cd $PRGNAM-$VERSION
 chown -R root:root .
diff --git a/audio/ff8dls/ff8dls.info b/audio/ff8dls/ff8dls.info
index 78bd2ae2e7..0a34e2e6c9 100644
--- a/audio/ff8dls/ff8dls.info
+++ b/audio/ff8dls/ff8dls.info
@@ -1,7 +1,7 @@
 PRGNAM="ff8dls"
 VERSION="1.39"
 HOMEPAGE="http://ffsf.aaron-kelley.net/download_8.html"
-DOWNLOAD="http://aladore3viii4.free.fr/files/FF8/ff8dls_v139.zip"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ff8dls_v139.zip"
 MD5SUM="85a9bffa1469b5c9ffde764858d21a30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/flacon/README b/audio/flacon/README
new file mode 100644
index 0000000000..607e3863ef
--- /dev/null
+++ b/audio/flacon/README
@@ -0,0 +1,21 @@
+flacon (Audio File Encoder)
+
+Flacon extracts individual tracks from one big audio file containing the entire album
+of music and saves them as separate audio files.
+
+To do this, it uses information from the appropriate CUE file.
+Besides, Flacon makes it possible to conveniently revise or specify tags both for all
+tracks at once or for each tag separately.
+
+Features:
+
+ * Supported input formats: WAV, FLAC, APE, WavPack, True Audio (TTA).
+ * Supported out formats: FLAC, WAV, WavPack, AAC, OGG or MP3.
+ * Replay Gain analysis (album-gain and track-gain modes).
+ * Multi-threaded conversion process.
+ * Automatic character set detection for CUE files.
+ * Generation of the pertrack CUE file in the output dir.
+
+Optional dependencie: qt5
+
+ * For build this package with Qt5, please add " -DUSE_QT5=Yes " on cmake options in SlackBuild file.
diff --git a/audio/flacon/doinst.sh b/audio/flacon/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/audio/flacon/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/audio/flacon/flacon.SlackBuild b/audio/flacon/flacon.SlackBuild
new file mode 100644
index 0000000000..ee581861af
--- /dev/null
+++ b/audio/flacon/flacon.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+# Slackware build script for flacon.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=flacon
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCVER="v1.2.0"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  .
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/flacon/flacon.info b/audio/flacon/flacon.info
new file mode 100644
index 0000000000..a4941d9fd5
--- /dev/null
+++ b/audio/flacon/flacon.info
@@ -0,0 +1,10 @@
+PRGNAM="flacon"
+VERSION="1.2.0"
+HOMEPAGE="https://flacon.github.io/"
+DOWNLOAD="https://github.com/flacon/flacon/archive/v1.2.0.tar.gz"
+MD5SUM="fc4219fdad2a714f72c6bccf71a5dc54"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libuchardet"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/audio/flacon/slack-desc b/audio/flacon/slack-desc
new file mode 100644
index 0000000000..c12f176dd7
--- /dev/null
+++ b/audio/flacon/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+flacon: flacon (Audio File Encoder)
+flacon:
+flacon: Flacon extracts individual tracks from one big audio file containing
+flacon: the entire album of music and saves them as separate audio files.
+flacon:
+flacon: Home page: https://flacon.github.io/
+flacon:
+flacon:
+flacon:
+flacon:
+flacon:
diff --git a/audio/flake/1001-buffer_overrun.patch b/audio/flake/1001-buffer_overrun.patch
new file mode 100644
index 0000000000..d26bee3196
--- /dev/null
+++ b/audio/flake/1001-buffer_overrun.patch
@@ -0,0 +1,18 @@
+Description: Pass max_order instead of max_order+1 to compute_lpc_coefs().
+ This avoids a buffer overrun in the autoc[] array.
+Origin: upstream, commit:263
+---
+ libflake/lpc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- flake.orig/libflake/lpc.c
++++ flake/libflake/lpc.c
+@@ -232,7 +232,7 @@ lpc_calc_coefs(const int32_t *samples, i
+     int i;
+     int opt_order;
+ 
+-    compute_autocorr(samples, blocksize, max_order+1, autoc);
++    compute_autocorr(samples, blocksize, max_order, autoc);
+ 
+     opt_order = max_order;
+     if(omethod == FLAKE_ORDER_METHOD_EST) {
diff --git a/audio/flake/README b/audio/flake/README
index 966df8d1d6..87562f5f6e 100644
--- a/audio/flake/README
+++ b/audio/flake/README
@@ -1,16 +1,21 @@
 flake (open-souce FLAC audio encoder)
 
-Flake is an open-souce FLAC audio encoder.
-It was developed as an independent implementation of the FLAC specification,
-and is meant to be an alternative to the FLAC reference encoder.
-While Flake does not yet have many of the advanced features of the reference encoder, it does have the benefit of faster encoding.
+Flake is an open-souce FLAC audio encoder. It was developed as an
+independent implementation of the FLAC specification, and is meant
+to be an alternative to the FLAC reference encoder.
+
+While Flake does not yet have many of the advanced features of the
+reference encoder, it does have the benefit of faster encoding.
 
 Features:
 
-* Commandline encoder frontend
-* libflake library which can be used by other programs
-* Fast encoding
-* Compression modes which closely mirror the reference encoder, plus additional modes for higher compression
-* A variety of LPC order search methods, each of which has its own speed vs. compression tradeoff
-* Variable block size encoding: an experimental feature which is allowed as part of the specification,
-  but is not currently implemented in the reference encoder.
+ * Commandline encoder frontend
+ * libflake library which can be used by other programs
+ * Fast encoding
+ * Compression modes which closely mirror the reference encoder,
+plus additional modes for higher compression
+ * A variety of LPC order search methods, each of which has its
+own speed vs. compression tradeoff
+ * Variable block size encoding: an experimental feature which
+is allowed as part of the specification, but is not currently
+implemented in the reference encoder.
diff --git a/audio/flake/flake.1 b/audio/flake/flake.1
new file mode 100644
index 0000000000..471f67ae9f
--- /dev/null
+++ b/audio/flake/flake.1
@@ -0,0 +1,39 @@
+.TH "FLAKE" "1" "2007-05-20" "Thomas Perl" ""
+.SH "NAME"
+flake \- Alternative Free Lossless Audio Codec encoder
+.SH "SYNOPSIS"
+.B flake
+.RI [options]
+[input.wav]
+[output.flac]
+.SH "DESCRIPTION"
+\fBflake\fP is an alternative encoder for the Free Lossless Audio Codec. Most tests turn out very similar or slightly better compression than the FLAC reference encoder, and it generally encodes significantly faster. Decoding times of the generated files are also close to those made by the reference encoder.
+.SH "OPTIONS"
+.TP 
+.B \-h
+Print out list of commandline options
+.TP 
+.B \-p #
+Padding bytes to put in header (default: 4096)
+.TP 
+.B \-0..\-12
+Compression level (default: 5)
+.TP 
+.B \-b #
+Block size [16 \- 65535] (default: 4608)
+.TP 
+.B \-l #
+Maximum prediction order [0 \- 32] (default: 8)
+.TP 
+.B \-o #
+Prediction order selection method (0 = maximum, 1 = estimate (default), 2 = 2\-level, 3 = 4\-level, 4 = 8\-level, 5 = full search)
+.TP 
+.B \-s #
+Stereo decorrelation method (0 = independent L+R channels, 1 = mid\-side (default))	
+.SH "SEE ALSO"
+.BR flac (1)
+.SH "AUTHOR"
+flake was written by Justin Ruggles <justin.ruggles@gmail.com>.
+.PP 
+This manual page was written by Thomas Perl <thp@perli.net>,
+for the Debian project (but may be used by others).
diff --git a/audio/flake/flake.SlackBuild b/audio/flake/flake.SlackBuild
index fcd7a257b2..b675b9f05a 100644
--- a/audio/flake/flake.SlackBuild
+++ b/audio/flake/flake.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=flake
 VERSION=${VERSION:-0.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/1001-buffer_overrun.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,7 +83,14 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/man/man1
+cp -a $CWD/flake.1 $PKG/usr/man/man1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 DOCS="Changelog COPYING README"
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
diff --git a/audio/flake/slack-desc b/audio/flake/slack-desc
index 295b4c00d8..fb29fd2467 100644
--- a/audio/flake/slack-desc
+++ b/audio/flake/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 flake: flake (open-souce FLAC audio encoder)
 flake:
-flake: Flake is an open-souce FLAC audio encoder.
-flake: It was developed as an independent
-flake: implementation of the FLAC specification, and is meant to be an
-flake: alternative to the FLAC reference encoder.
+flake: Flake is an open-souce FLAC audio encoder. It was developed as an
+flake: independent implementation of the FLAC specification, and is meant
+flake: to be an alternative to the FLAC reference encoder.
 flake:
 flake: Home Page: http://flake-enc.sourceforge.net/
 flake:
 flake:
 flake:
+flake:
diff --git a/audio/foo-yc20/foo-yc20.info b/audio/foo-yc20/foo-yc20.info
index b3f58a42c0..be9306b21d 100644
--- a/audio/foo-yc20/foo-yc20.info
+++ b/audio/foo-yc20/foo-yc20.info
@@ -1,7 +1,7 @@
 PRGNAM="foo-yc20"
 VERSION="1.3.0"
-HOMEPAGE="http://code.google.com/p/foo-yc20/"
-DOWNLOAD="http://foo-yc20.googlecode.com/files/foo-yc20-1.3.0.tar.bz2"
+HOMEPAGE="https://github.com/sampov2/foo-yc20"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/foo-yc20-1.3.0.tar.bz2"
 MD5SUM="3eddb658ddae87e3cf8e5ad7c4b6c8a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/gmusicbrowser/gmusicbrowser.SlackBuild b/audio/gmusicbrowser/gmusicbrowser.SlackBuild
index ebd0f58509..83d9b09f3e 100644
--- a/audio/gmusicbrowser/gmusicbrowser.SlackBuild
+++ b/audio/gmusicbrowser/gmusicbrowser.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for gmusicbrowser
 
 # (C) 2007 Michael Wagner <lapinours@web.de>
-# Copyright 2014 chinarulezzz
+# (C) 2014, 2015 chinarulezzz <s.alex08@mail.ru>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gmusicbrowser
-VERSION=${VERSION:-1.1.12}
+VERSION=${VERSION:-1.1.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,19 +55,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make
-make install DESTDIR=$PKG
+# We don't have MARKDOWN by default for mkd to html convertation
+sed -i -r 's/(DOCS=.*)(layout_doc).html/\1\2.mkd/' Makefile
+
+make DESTDIR=$PKG install
 
 mv $PKG/usr/share/man $PKG/usr && rm -rf $PKG/usr/share/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Not needed
-rm -rf $PKG/usr/lib
-
-# Let's not pollute /usr/share/icons
-mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
-
 mv $PKG/usr/share/doc $PKG/usr/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
diff --git a/audio/gmusicbrowser/gmusicbrowser.info b/audio/gmusicbrowser/gmusicbrowser.info
index 6629151649..f8313429c2 100644
--- a/audio/gmusicbrowser/gmusicbrowser.info
+++ b/audio/gmusicbrowser/gmusicbrowser.info
@@ -1,8 +1,8 @@
 PRGNAM="gmusicbrowser"
-VERSION="1.1.12"
+VERSION="1.1.14"
 HOMEPAGE="http://gmusicbrowser.org"
-DOWNLOAD="http://gmusicbrowser.org/download/gmusicbrowser-1.1.12.tar.gz"
-MD5SUM="348029d561be345540198cb415c6cd25"
+DOWNLOAD="http://gmusicbrowser.org/download/gmusicbrowser-1.1.14.tar.gz"
+MD5SUM="8eb2d3f22e0734a7f5efbf4f0b2bd71e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-gtk2"
diff --git a/audio/grip2/grip2.SlackBuild b/audio/grip2/grip2.SlackBuild
index aee00db42c..be3b9c8f90 100644
--- a/audio/grip2/grip2.SlackBuild
+++ b/audio/grip2/grip2.SlackBuild
@@ -48,6 +48,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+SLKCFLAGS="$SLKCFLAGS -std=gnu89"
+
 # Slack 12.2 and up keeps cdda headers in /usr/include/cdda, 12.1 has them
 # in /usr/include itself. Be adaptable.
 if [ -r /usr/include/cdda/cdda_interface.h ]; then
diff --git a/audio/guitarix/README b/audio/guitarix/README
index 569e7627a4..5dd02bf29d 100644
--- a/audio/guitarix/README
+++ b/audio/guitarix/README
@@ -1,13 +1,20 @@
 guitarix offers the range of sounds you would expect from a full-featured
-universal guitar-amp. You can get crisp clean-sounds, nice overdrive,
-fat distortion and a diversity of crazy sounds never heard before.
+universal guitar-amp. You can get crisp clean-sounds, nice overdrive, fat
+distortion and a diversity of crazy sounds never heard before. Guitarix
+can be used as a standalone application, as LADSPA plugins, or as LV2
+plugins.
 
 meterbridge is an optional runtime dependency.
 
-Guitarix can be used as a standalone application, as LADSPA plugins,
-or as LV2 plugins. By default, all three are built. To disable LV2, set
-LV2=no in the script's environment (you will still need lilv installed,
-however). The script author hasn't tested LV2 support.
+By default, the package is built with SSE support if the host CPU supports
+SSE. If building for another host, you can set SSE=no in the environment
+to build without it.
+
+Starting with version 0.34.0, guitarix can browse and download presets
+from the web, using the 'Online' button in the preset selector. To
+enable this feature, install webkitgtk before building guitarix. To
+disable this feature (even if webkitgtk is installed), set WEBKIT=no in
+the environment.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild
index 465fba0238..e3fa1af6a9 100644
--- a/audio/guitarix/guitarix.SlackBuild
+++ b/audio/guitarix/guitarix.SlackBuild
@@ -24,11 +24,24 @@
 #   installed to /usr/lib/ on 64-bit. Grr.
 # - Upstream wants avahi by default. For now, hardcoded --no-avahi.
 
+# 20151108 bkw:
+# - Updated for 0.34.0
+# - Added --disable-cxx11 to ./waf flags, as bluetooth.h uses the gcc
+#   typeof() extension. Not sure if newer versions of bluez would have
+#   this issue (but Slackware 14.1's bluez is pretty old by now).
+# - Added patch from upstream git to allow building without webkitgtk.
+#   The author added support for downloading presets, but didn't make
+#   it optional in 0.34.0. Also added a couple of bugfix patches.
+# - Support building 0.33.0 with VERSION=0.33.0 in the env.
+# - Add SSE=no option.
+# - Add WEBKIT=no option.
+# - Remove LV2=no option from README (but not from script).
+
 # Modified version released under the WTFPL, for details see
 # http://www.wtfpl.net/txt/copying/
 
 PRGNAM=guitarix
-VERSION=${VERSION:-0.32.3}
+VERSION=${VERSION:-0.34.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,10 +97,36 @@ find -L . \
 # be present among', implying we should only need Audio *or* AudioVideo.
 sed -i '/^Categories/s,$,Audio;,;' $PRGNAM.desktop.in
 
+# this is no longer documented in README, but still here for debugging.
 if [ "${LV2:-yes}" = "no" ]; then
   LV2OPT=--no-lv2
 fi
 
+# 20151109 bkw: in case anyone needs guitarix-0.33.0:
+# Starting with 0.34.0, the default is to pass -std=c++11 to gcc, which
+# causes Slack 14.1's old bluetooth.h to fail (it uses gcc extensions).
+# Before 0.34.0, this option's not needed... and will cause an error if
+# it's present. Also, our patches are for 0.34.0 and won't apply to
+# 0.33.0. So:
+if ./waf --help | grep -q -- --disable-cxx11; then
+  EXTRAOPT="--disable-cxx11"
+  PATCH=${PATCH:-yes}
+fi
+
+# patches are optional (undocumented in README, on purpose)
+if [ "${PATCH:-no}" = "yes" ]; then
+  for patch in $CWD/patches/*.patch; do
+    patch -p2 < "$patch"
+  done
+fi
+
+# allow building non-SSE package on SSE host
+[ "${SSE:-yes}" = "no" ] && EXTRAOPT="$EXTRAOPT --disable-sse"
+
+# allow disabling webkitgtk. A bit of a dirty hack.
+[ "${WEBKIT:-yes}" = "no" ] && \
+  sed -i 's,webkit-1.0,webkit-DISABLED,' wscript
+
 LIBDIR="/usr/lib${LIBDIRSUFFIX}"
 ./waf configure \
   --prefix=/usr \
@@ -96,8 +135,9 @@ LIBDIR="/usr/lib${LIBDIRSUFFIX}"
   --lv2dir="$LIBDIR/lv2/" \
   --libdir="$LIBDIR" \
   --no-avahi \
+  $EXTRAOPT \
   $LV2OPT
-./waf build
+./waf build # -v # verbose, shows actual commands
 ./waf install --destdir=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -106,7 +146,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # Shared libraries are supposed to be +x.
 chmod 755 $PKG/$LIBDIR/libgx*.so.?.?
 
-# Man page written for this SlackBuild
+# Man page written for this SlackBuild. It's for guitarix-0.32.3, but
+# the command line options haven't changed since then.
 mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info
index 3132c40be3..cc51ee0abb 100644
--- a/audio/guitarix/guitarix.info
+++ b/audio/guitarix/guitarix.info
@@ -1,8 +1,8 @@
 PRGNAM="guitarix"
-VERSION="0.32.3"
+VERSION="0.34.0"
 HOMEPAGE="http://guitarix.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.32.3.tar.bz2"
-MD5SUM="fb0a853acf40aa8a26f0abe5f224989a"
+DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.34.0.tar.bz2"
+MD5SUM="0ac5f18ee738d535b1551ea68ac2fce9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkmm jack-audio-connection-kit liblrdf eigen3 lilv"
diff --git a/audio/guitarix/patches/0001-fix-Issue-switching-presets-with-midi-messages-repor.patch b/audio/guitarix/patches/0001-fix-Issue-switching-presets-with-midi-messages-repor.patch
new file mode 100644
index 0000000000..7f7ad8fc3f
--- /dev/null
+++ b/audio/guitarix/patches/0001-fix-Issue-switching-presets-with-midi-messages-repor.patch
@@ -0,0 +1,35 @@
+From c929d5872b81214e7aef3fc82bc178b427dc30f8 Mon Sep 17 00:00:00 2001
+From: Hermann Meyer <brummer-@web.de>
+Date: Mon, 9 Nov 2015 06:57:27 +0100
+Subject: [PATCH 1/3]  * fix Issue switching presets with midi messages
+ reported by eduardomezencio
+
+---
+ trunk/src/gx_head/engine/gx_paramtable.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/trunk/src/gx_head/engine/gx_paramtable.cpp b/trunk/src/gx_head/engine/gx_paramtable.cpp
+index b82fe93..4ef2851 100644
+--- a/trunk/src/gx_head/engine/gx_paramtable.cpp
++++ b/trunk/src/gx_head/engine/gx_paramtable.cpp
+@@ -505,7 +505,7 @@ void MidiControllerList::on_pgm_chg() {
+     do {
+ 	pgm = gx_system::atomic_get(program_change);
+     } while (!gx_system::atomic_compare_and_exchange(&program_change, pgm, -1));
+-    new_program(pgm);
++    if (pgm>=0) new_program(pgm);
+ }
+ 
+ void MidiControllerList::on_mute_chg() {
+@@ -521,7 +521,7 @@ void MidiControllerList::on_bank_chg() {
+     do {
+ 	bk = gx_system::atomic_get(bank_change);
+     } while (!gx_system::atomic_compare_and_exchange(&bank_change, bk, -1));
+-    new_bank(bk);
++    if (bk>=0) new_bank(bk);
+ }
+ 
+ void MidiControllerList::set_config_mode(bool mode, int ctl) {
+-- 
+1.8.4
+
diff --git a/audio/guitarix/patches/0002-set-wscript-to-versio-0.34.0git.patch b/audio/guitarix/patches/0002-set-wscript-to-versio-0.34.0git.patch
new file mode 100644
index 0000000000..d3b560c3ff
--- /dev/null
+++ b/audio/guitarix/patches/0002-set-wscript-to-versio-0.34.0git.patch
@@ -0,0 +1,153 @@
+From 6b161fa314ee5948a7ebde5d4320d669041e831e Mon Sep 17 00:00:00 2001
+From: Hermann Meyer <brummer-@web.de>
+Date: Mon, 9 Nov 2015 09:46:54 +0100
+Subject: [PATCH 2/3]  * set wscript to versio 0.34.0git  * make webkit
+ optional  * add filebrowser for upload preset banks
+
+---
+ trunk/src/gx_head/gui/gx_preset_window.cpp | 34 +++++++++++++++++++++++++++++-
+ trunk/src/headers/gx_preset_window.h       |  8 ++++++-
+ trunk/wscript                              |  5 +++--
+ 3 files changed, 43 insertions(+), 4 deletions(-)
+
+diff --git a/trunk/src/gx_head/gui/gx_preset_window.cpp b/trunk/src/gx_head/gui/gx_preset_window.cpp
+index ead8c93..1050a9d 100644
+--- a/trunk/src/gx_head/gui/gx_preset_window.cpp
++++ b/trunk/src/gx_head/gui/gx_preset_window.cpp
+@@ -81,10 +81,13 @@ PresetWindow::PresetWindow(Glib::RefPtr<gx_gui::GxBuilder> bld, gx_engine::GxMac
+     //actiongroup->add(act, sigc::mem_fun(*this, &PresetWindow::on_presets_close));
+     //gtk_activatable_set_related_action(GTK_ACTIVATABLE(close_preset->gobj()), act->gobj());
+     close_preset->hide(); // disable (maybe remove later)
++#ifdef HAVE_WEBKIT
+     actions.online_preset_bank = Gtk::Action::create("OnlineBank");
+     actions.group->add(actions.online_preset_bank, sigc::mem_fun(*this, &PresetWindow::on_online_preset));
+     gtk_activatable_set_related_action(GTK_ACTIVATABLE(online_preset->gobj()), actions.online_preset_bank->gobj());
+-
++#else
++    online_preset->set_sensitive(false);
++#endif
+     bank_treeview->set_model(Gtk::ListStore::create(bank_col));
+     bank_treeview->set_name("PresetView");
+     bank_treeview->get_selection()->set_select_function(
+@@ -686,6 +689,7 @@ void PresetWindow::on_new_bank() {
+     start_edit(m->get_path(edit_iter), *bank_treeview->get_column(1), *bank_cellrenderer);
+ }
+ 
++#ifdef HAVE_WEBKIT
+ 
+ bool PresetWindow::insertRequested(const char *ur, gpointer data)
+ {
+@@ -748,6 +752,31 @@ bool PresetWindow::downloadRequested(WebKitWebView* webView, WebKitDownload *dow
+     return TRUE;
+ }
+ 
++bool PresetWindow::uploadRequested(WebKitWebView* webView, WebKitFileChooserRequest *request,gpointer data )
++{
++    Gtk::FileChooserDialog d( "Select upload file");
++    d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
++    d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
++    d.add_shortcut_folder(string(getenv("HOME")) + string("/.config/guitarix/bamks"));
++    Gtk::FileFilter banks;
++    banks.set_name("Bank Files");
++    banks.add_pattern("*.gx");
++    d.add_filter(banks);
++    Gtk::FileFilter all;
++    all.add_pattern("*");
++    all.set_name("All Files");
++    d.add_filter(all);
++    d.set_current_folder(string(getenv("HOME")) + string("/.config/guitarix/banks"));
++
++    if (d.run() != Gtk::RESPONSE_OK) {
++        return FALSE;
++    }
++    Glib::ustring  filename = d.get_filename();
++    const gchar*  f[2] = {filename.c_str(),0};
++    webkit_file_chooser_request_select_files (request, f);
++    return TRUE;
++}
++
+ void PresetWindow::show_online_preset() {
+ 
+   Gtk::Window *window = new Gtk::Window();
+@@ -760,6 +789,7 @@ void PresetWindow::show_online_preset() {
+   window->add(*Gtk::manage(scrollbox));
+   webkit_web_view_load_uri(web_view, "https://musical-artifacts.com/?apps=guitarix");
+   g_signal_connect(G_OBJECT (web_view), "download-requested", G_CALLBACK(downloadRequested), this);
++  g_signal_connect(G_OBJECT (web_view), "run-file-chooser", G_CALLBACK(uploadRequested), this);
+   window->show_all();
+ }
+ 
+@@ -767,6 +797,8 @@ void PresetWindow::on_online_preset() {
+     Glib::signal_idle().connect_once(sigc::mem_fun(*this, &PresetWindow::show_online_preset));
+ }
+ 
++#endif
++
+ bool PresetWindow::on_bank_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint timestamp) {
+     Gtk::Widget *source_widget = Gtk::Widget::drag_get_source_widget(context);
+     if (!source_widget) {
+diff --git a/trunk/src/headers/gx_preset_window.h b/trunk/src/headers/gx_preset_window.h
+index a009670..48a9801 100644
+--- a/trunk/src/headers/gx_preset_window.h
++++ b/trunk/src/headers/gx_preset_window.h
+@@ -24,7 +24,10 @@
+ /****************************************************************
+  ** class PresetWindow
+  */
++
++#ifdef HAVE_WEBKIT
+ #include <webkit/webkit.h>
++#endif
+ 
+ class PresetStore: public Gtk::ListStore {
+ public:
+@@ -141,12 +144,15 @@ private:
+     bool is_row_separator(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);
+     void on_new_bank();
+     void on_preset_save();
++    const std::string pdir() { return options.get_preset_dir();}
++#ifdef HAVE_WEBKIT
+     void on_online_preset();
+     void show_online_preset();
+-    const std::string pdir() { return options.get_preset_dir();}
+     static bool downloadRequested(WebKitWebView* webView, WebKitDownload *download,gpointer data );
++    static bool uploadRequested(WebKitWebView* webView, WebKitFileChooserRequest *request,gpointer data );
+     static bool insertRequested(const char* uri, gpointer data );
+     static void download_status(GObject* object, GParamSpec* pspec, gpointer data);
++#endif
+     bool on_bank_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint timestamp);
+     void on_bank_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint timestamp);
+     void on_bank_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, Gtk::SelectionData& selection, int info, int timestamp);
+diff --git a/trunk/wscript b/trunk/wscript
+index 9c0e41b..99cab29 100644
+--- a/trunk/wscript
++++ b/trunk/wscript
+@@ -24,7 +24,7 @@ blddir = 'build'
+ use_2to3 = True
+ 
+ # used by waf dist and waf build
+-VERSION='0.34.0'
++VERSION='0.34.0git'
+ APPNAME='guitarix'
+ 
+ good_faust_versions = ['0.9.58','0.9.65']
+@@ -649,7 +649,7 @@ def configure(conf):
+         conf.check_cfg(package='lrdf', args='--cflags --libs', uselib_store='LRDF', mandatory=1)
+         conf.check(header_name='ladspa.h', mandatory=1)
+         conf.check_cfg(package='lilv-0', args='--cflags --libs', uselib_store='LILV', mandatory=1)
+-        conf.check_cfg(package='webkit-1.0', args='--cflags --libs', uselib_store='WEBKIT', mandatory=1)
++        conf.check_cfg(package='webkit-1.0', args='--cflags --libs', uselib_store='WEBKIT', mandatory=0, define_name='HAVE_WEBKIT')
+         check_boost(conf)
+     conf.check_cfg(package='lv2', atleast_version='1.2.0',args='--cflags --libs', uselib_store='LV2CORE', mandatory=1)
+ 
+@@ -811,6 +811,7 @@ def configure(conf):
+     display_feature("Use prebuild gperf files", not conf.env["HAVE_GPERF"])
+     display_feature("Avahi service discovery", conf.env["HAVE_AVAHI"])
+     display_feature("Bluetooth rfcomm", conf.env["HAVE_BLUEZ"])
++    display_feature("Use Webkit", conf.env["HAVE_WEBKIT"])
+     display_feature("Use internal zita-resampler", not conf.env['ZITA_RESAMPLER'])
+     if conf.env['CONVOLVER_FFMPEG']:
+         display_feature("Use zita-convolver-ffmpeg", True)
+-- 
+1.8.4
+
diff --git a/audio/guitarix/patches/0003-fix-build-even-for-gcc4.8.patch b/audio/guitarix/patches/0003-fix-build-even-for-gcc4.8.patch
new file mode 100644
index 0000000000..50c64372ad
--- /dev/null
+++ b/audio/guitarix/patches/0003-fix-build-even-for-gcc4.8.patch
@@ -0,0 +1,65 @@
+From 995a692e807a5812a356d08d4d4adb1d72e67a7d Mon Sep 17 00:00:00 2001
+From: Hermann Meyer <brummer-@web.de>
+Date: Mon, 9 Nov 2015 13:06:45 +0100
+Subject: [PATCH 3/3]  * fix build even for gcc4.8
+
+---
+ trunk/src/LV2/DSP/gx_common.h | 4 ++--
+ trunk/src/headers/gx_system.h | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/trunk/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h
+index 0a3e44b..282c765 100644
+--- a/trunk/src/LV2/DSP/gx_common.h
++++ b/trunk/src/LV2/DSP/gx_common.h
+@@ -35,7 +35,7 @@
+ /* On Intel set FZ (Flush to Zero) and DAZ (Denormals Are Zero)
+    flags to avoid costly denormals */
+ #ifdef __SSE3__
+-#ifndef _X86INTRIN_H_INCLUDED
++#ifndef _PMMINTRIN_H_INCLUDED
+ #include <pmmintrin.h>
+ #endif //ndef
+ inline void AVOIDDENORMALS()
+@@ -44,7 +44,7 @@ inline void AVOIDDENORMALS()
+   _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
+ }
+ #else
+-#ifndef _X86INTRIN_H_INCLUDED
++#ifndef _XMMINTRIN_H_INCLUDED
+ #include <xmmintrin.h>
+ #endif //ndef
+ inline void AVOIDDENORMALS()
+diff --git a/trunk/src/headers/gx_system.h b/trunk/src/headers/gx_system.h
+index 7bf35f8..abf1e06 100644
+--- a/trunk/src/headers/gx_system.h
++++ b/trunk/src/headers/gx_system.h
+@@ -51,7 +51,7 @@ inline unsigned int get_fpu_status_bits() {
+ /* On Intel set FZ (Flush to Zero) and DAZ (Denormals Are Zero)
+    flags to avoid costly denormals */
+ #ifdef __SSE3__
+-#ifndef _X86INTRIN_H_INCLUDED
++#ifndef _PMMINTRIN_H_INCLUDED
+ #include <pmmintrin.h>
+ #endif //ndef
+ inline void AVOIDDENORMALS() {
+@@ -59,14 +59,14 @@ inline void AVOIDDENORMALS() {
+     _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
+ }
+ #else
+-#ifndef _X86INTRIN_H_INCLUDED
++#ifndef _XMMINTRIN_H_INCLUDED
+ #include <xmmintrin.h>
+ #endif //ndef
+ inline void AVOIDDENORMALS() { _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); }
+ #endif //__SSE3__
+ 
+ #else
+-#ifndef _X86INTRIN_H_INCLUDED
++#ifndef _XMMINTRIN_H_INCLUDED
+ inline void _MM_SET_EXCEPTION_STATE(unsigned int __mask) {}
+ inline unsigned int _MM_GET_EXCEPTION_STATE(void) { return 0; }
+ #endif //ndef
+-- 
+1.8.4
+
diff --git a/audio/horgand/horgand.SlackBuild b/audio/horgand/horgand.SlackBuild
index 4947f52dcf..ef09b5dd4b 100644
--- a/audio/horgand/horgand.SlackBuild
+++ b/audio/horgand/horgand.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151126 bkw:
+# - fix build on -current (preparing for 14.2)
+
 PRGNAM=horgand
 VERSION=${VERSION:-1.14}
 BUILD=${BUILD:-3}
@@ -53,6 +56,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Slackware's extra/fltk doesn't have /usr/include/Fl -> FL
+sed -i '/#include/s,Fl/,FL/,' src/*
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild
index 0c25981ebe..bea1a6de07 100644
--- a/audio/hydrogen/hydrogen.SlackBuild
+++ b/audio/hydrogen/hydrogen.SlackBuild
@@ -59,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/audio/jack-tools/README b/audio/jack-tools/README
index 66e8c26722..7d82241c8b 100644
--- a/audio/jack-tools/README
+++ b/audio/jack-tools/README
@@ -11,3 +11,9 @@ jack-record - JACK Capture Client
 jack-scope - JACK Oscilloscope
 jack-transport - Minimalist Jack Transport Interface
 jack-udp - JACK UDP Transport Client
+
+This package uses POSIX filesystem capabilities to execute with
+elevated privileges (required for realtime audio processing). This
+may be considered a security/stability risk. Please read
+http://www.slackbuilds.org/caps/ for more information. To disable
+capabilities, pass SETCAP=no to the script.
diff --git a/audio/jack-tools/jack-tools.SlackBuild b/audio/jack-tools/jack-tools.SlackBuild
index ade1c9e96e..918ddd2463 100644
--- a/audio/jack-tools/jack-tools.SlackBuild
+++ b/audio/jack-tools/jack-tools.SlackBuild
@@ -4,10 +4,18 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# 20151110 bkw:
+# - Updated for 20141211. This is the date of the latest darcs
+#   commit. Note that the c-common/ in the source tarball is the
+#   old one (from my jack-tools-20130616.tar.gz), since jack-tools
+#   won't compile against the latest c-common. Only jack-scope
+#   and jack-play have changed.
+# - Add capability stuff.
+
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=jack-tools
-VERSION=${VERSION:-20130616}
+VERSION=${VERSION:-20141211}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +63,7 @@ mkdir -p $PKG/usr/bin $PKG/usr/include
 make install prefix=$PKG/usr
 strip $PKG/usr/bin/*
 
-# man pages generated from *.text asciidoc files, then manually edited
+# man pages generated from *.ad asciidoc files, then manually edited
 # to clean up the formatting.
 mkdir -p $PKG/usr/man/man1
 for page in $CWD/man/*.1; do
@@ -69,5 +77,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  cat $CWD/setcap.sh >> $PKG/install/doinst.sh
+  chown root:audio $PKG/usr/bin/*
+  chmod 0750 $PKG/usr/bin/*
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/jack-tools/jack-tools.info b/audio/jack-tools/jack-tools.info
index 7b2c80f114..824e6662ed 100644
--- a/audio/jack-tools/jack-tools.info
+++ b/audio/jack-tools/jack-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="jack-tools"
-VERSION="20130616"
+VERSION="20141211"
 HOMEPAGE="http://rd.slavepianos.org/?t=rju"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/jack-tools-20130616.tar.gz"
-MD5SUM="69e5c61fa6ad1d01262ccacebb3f405f"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/jack-tools-20141211.tar.gz"
+MD5SUM="6ad8e71fcab77b79fa6dffb0533b3278"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblo"
diff --git a/audio/jack-tools/man/jack-play.1 b/audio/jack-tools/man/jack-play.1
index 1b7364e072..52d088b1c8 100644
--- a/audio/jack-tools/man/jack-play.1
+++ b/audio/jack-tools/man/jack-play.1
@@ -38,10 +38,14 @@ jack\-play [options] sound\-file\&...
 .sp
 \fB\-c\fR : Set the sample rate conversion algorithm (default=2)\&. Values are: SRC_SINC_BEST_QUALITY = 0, SRC_SINC_MEDIUM_QUALITY = 1, SRC_SINC_FASTEST = 2, SRC_ZERO_ORDER_HOLD = 3 and SRC_LINEAR = 4\&.
 .sp
+\fB\-d\fR : Set the destination port pattern, overrides environment variable\&.
+.sp
 \fB\-i\fR : Set the initial disk seek in frames (default=0)\&.
 .sp
 \fB\-m\fR : Set the minimal disk transfer size in frames (default=32)\&. This is an optimization switch\&.
 .sp
+\fB\-l\fR : Loop input file indefinitely\&.
+.sp
 \fB\-n\fR : Set the client name (default=jack\-play)\&.
 .sp
 \fB\-q\fR : Set the frame size to request data from the ringbuffer (default=64)\&. This is an optimization switch\&.
@@ -53,7 +57,7 @@ jack\-play [options] sound\-file\&...
 \fB\-u\fR : Do not make client name unique by appending process identifier\&.
 .SH "DESCRIPTION"
 .sp
-jack\-play is a light\-weight JACK sound file player\&. It creates as many output ports as there are channels in the input file\&. It will connect to ports mentioned in the environment variable JACK_PLAY_CONNECT_TO which must include a %d pattern to indicate port number, otherwise it implements no connection logic, use jack\-plumbing(1) instead\&.
+jack\-play is a light\-weight JACK sound file player\&. It creates as many output ports as there are channels in the input file\&. It will connect to ports mentioned at \fB\-p\fR or in the environment variable JACK_PLAY_CONNECT_TO which must include a %d pattern to indicate port number, otherwise it implements no connection logic, use jack\-plumbing(1) instead\&.
 .sp
 jack\-play will read files in any format supported by libsndfile, and will resample to match the server sample rate using libsamplerate\&.
 .SH "AUTHOR"
diff --git a/audio/jack-tools/man/jack-scope.1 b/audio/jack-tools/man/jack-scope.1
index b5d594f192..42ada4558d 100644
--- a/audio/jack-tools/man/jack-scope.1
+++ b/audio/jack-tools/man/jack-scope.1
@@ -46,6 +46,8 @@ jack\-scope [options]
 .sp
 \fB\-p\fR : A pattern describing the JACK ports to connect to, ie\&. SuperCollider:out_%d (default=nil)\&. If this is not set consults the environment variable JACK_SCOPE_CONNECT_TO\&.
 .sp
+\fB\-s\fR : Set the drawing style for signal mode (default=dot)\&.
+.sp
 \fB\-u\fR : Set the UDP port number to listen for OSC packets on (default=57140)\&.
 .sp
 \fB\-w\fR : Set the scope size in pixels (default=512)\&. The scope window is square\&.
diff --git a/audio/jack-tools/setcap.sh b/audio/jack-tools/setcap.sh
new file mode 100644
index 0000000000..93f5db1c7e
--- /dev/null
+++ b/audio/jack-tools/setcap.sh
@@ -0,0 +1,5 @@
+if [ -x /sbin/setcap ]; then
+  for i in jack-dl jack-osc jack-play jack-plumbing jack-record jack-scope jack-transport jack-udp; do
+    /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$i
+  done
+fi
diff --git a/audio/jost_bin/slack-desc b/audio/jost_bin/slack-desc
index e08abf8e20..b15a7ebe78 100644
--- a/audio/jost_bin/slack-desc
+++ b/audio/jost_bin/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-jost-bin: jost-bin (audio host plugin - binary repackaging)
-jost-bin:
-jost-bin: JOST is a audio host application for plugins that can be used as a
-jost-bin: plugin itself or be compiled as a cross bridge between multiple audio
-jost-bin: plugin technologies... It is the first open source multi-technology
-jost-bin: (internal, native vst, ladspa, dssi) host in linux.  It will mainly
-jost-bin: host a chain of plugins per instance, publishing jack, alsa, and
-jost-bin: alsa_seq ports in order to be connected in your main stream flow.
-jost-bin: It is actually under heavy development, but it still has some very
-jost-bin: good features that make it a first class host.
-jost-bin:
+jost_bin: jost_bin (audio host plugin - binary repackaging)
+jost_bin:
+jost_bin: JOST is a audio host application for plugins that can be used as a
+jost_bin: plugin itself or be compiled as a cross bridge between multiple audio
+jost_bin: plugin technologies... It is the first open source multi-technology
+jost_bin: (internal, native vst, ladspa, dssi) host in linux.  It will mainly
+jost_bin: host a chain of plugins per instance, publishing jack, alsa, and
+jost_bin: alsa_seq ports in order to be connected in your main stream flow.
+jost_bin: It is actually under heavy development, but it still has some very
+jost_bin: good features that make it a first class host.
+jost_bin:
diff --git a/audio/jvmetro/jvmetro.SlackBuild b/audio/jvmetro/jvmetro.SlackBuild
index ddfb361b09..42fcfd73e7 100644
--- a/audio/jvmetro/jvmetro.SlackBuild
+++ b/audio/jvmetro/jvmetro.SlackBuild
@@ -51,9 +51,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Correct Makefile to point in /usr/bin vs /usr/local/bin
-sed -i -e 's+/usr/local+/usr+' $TMP/$PRGNAM-$VERSION/Makefile
-cat $TMP/$PRGNAM-$VERSION/Makefile
+# Correct Makefile to point in /usr/bin vs /usr/local/bin and honour DESTDIR
+sed -i \
+  -e 's+/usr/local+/usr+' \
+  -e 's+install jvmetro /usr/bin+ginstall -D jvmetro $(DESTDIR)/usr/bin/jvmetro+' \
+  -e 's/-g3 //' \
+  Makefile
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/audio/kradio/README b/audio/kradio/README
index d73e647332..1d2fb5115b 100644
--- a/audio/kradio/README
+++ b/audio/kradio/README
@@ -2,4 +2,4 @@ KRadio is a comfortable KDE4/Linux internet and AM/FM radio application.
 
 You need to configure ALSA correctly for this to work.
 
-lame and lirc are optional dependencies.
+Optional dependencies: lame and lirc
diff --git a/audio/kradio/kradio.SlackBuild b/audio/kradio/kradio.SlackBuild
index 3ef216d010..50ed5f7e92 100644
--- a/audio/kradio/kradio.SlackBuild
+++ b/audio/kradio/kradio.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=kradio
 SRCNAM=kradio4
-VERSION=${VERSION:-4.0.7}
+VERSION=${VERSION:-4.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/kradio/kradio.info b/audio/kradio/kradio.info
index 257705a54e..b0228b91ae 100644
--- a/audio/kradio/kradio.info
+++ b/audio/kradio/kradio.info
@@ -1,8 +1,8 @@
 PRGNAM="kradio"
-VERSION="4.0.7"
+VERSION="4.0.8"
 HOMEPAGE="http://kradio.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/kradio/kradio4-4.0.7.tar.bz2"
-MD5SUM="75eb51fdd55f0557969febb2c1f82b1c"
+DOWNLOAD="http://downloads.sourceforge.net/kradio/kradio4-4.0.8.tar.bz2"
+MD5SUM="35915b48c15a11b7a5085cee66bcaedf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg libmms"
diff --git a/audio/ladspa_sdk/ladspa_sdk.info b/audio/ladspa_sdk/ladspa_sdk.info
index 9a61d4af46..f7ae322332 100644
--- a/audio/ladspa_sdk/ladspa_sdk.info
+++ b/audio/ladspa_sdk/ladspa_sdk.info
@@ -1,7 +1,7 @@
 PRGNAM="ladspa_sdk"
 VERSION="1.13"
 HOMEPAGE="http://www.ladspa.org/"
-DOWNLOAD="http://www.ladspa.org/download/ladspa_sdk_1.13.tgz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/ladspa/ladspa_sdk_1.13.tgz/671be3e1021d0722cadc7fb27054628e/ladspa_sdk_1.13.tgz"
 MD5SUM="671be3e1021d0722cadc7fb27054628e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/lmms/lmms.SlackBuild b/audio/lmms/lmms.SlackBuild
index 26d68486a2..0b2d7cf7bb 100644
--- a/audio/lmms/lmms.SlackBuild
+++ b/audio/lmms/lmms.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
 PRGNAM=lmms
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/lmms/lmms.info b/audio/lmms/lmms.info
index 16ad4f11e6..0cb3df36c4 100644
--- a/audio/lmms/lmms.info
+++ b/audio/lmms/lmms.info
@@ -1,8 +1,8 @@
 PRGNAM="lmms"
-VERSION="1.1.0"
+VERSION="1.1.3"
 HOMEPAGE="https://lmms.io/"
-DOWNLOAD="https://codeload.github.com/LMMS/lmms/tar.gz/v1.1.0"
-MD5SUM="170ce0615063e9a171f1980972cca262"
+DOWNLOAD="https://codeload.github.com/LMMS/lmms/tar.gz/v1.1.3"
+MD5SUM="88d9e66d240b711c37315e3c9da644a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/audio/luppp/luppp.SlackBuild b/audio/luppp/luppp.SlackBuild
index cab8dbf935..8f5f92e57c 100644
--- a/audio/luppp/luppp.SlackBuild
+++ b/audio/luppp/luppp.SlackBuild
@@ -48,7 +48,8 @@ cd $TMP
 
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
-tar xvf $CWD/release-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1
+tar xvf $CWD/release-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1 \
+  || tar xvf $CWD/openAV-Luppp-release-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components 1
 
 cd $PRGNAM-$VERSION
 chown -R root:root .
diff --git a/audio/lv2-mda-metapiano/lv2-mda-metapiano.SlackBuild b/audio/lv2-mda-metapiano/lv2-mda-metapiano.SlackBuild
index c191e1aea5..edc7770ec4 100644
--- a/audio/lv2-mda-metapiano/lv2-mda-metapiano.SlackBuild
+++ b/audio/lv2-mda-metapiano/lv2-mda-metapiano.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=lv2-mda-metapiano
-VERSION=${VERSION:-20140207}
+VERSION=${VERSION:-0.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,13 +54,11 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 INSTALL_DIR=$PKG/usr/lib$LIBDIRSUFFIX/lv2
-cd src
 make TYPE=mdaPiano
 make TYPE=mdaPiano install INSTALL_DIR=$INSTALL_DIR
 make clean
 make TYPE=mdaEPiano
 make TYPE=mdaEPiano install INSTALL_DIR=$INSTALL_DIR
-cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/audio/lv2-mda-metapiano/lv2-mda-metapiano.info b/audio/lv2-mda-metapiano/lv2-mda-metapiano.info
index ffab5d9275..cbfb3d68c2 100644
--- a/audio/lv2-mda-metapiano/lv2-mda-metapiano.info
+++ b/audio/lv2-mda-metapiano/lv2-mda-metapiano.info
@@ -1,8 +1,8 @@
 PRGNAM="lv2-mda-metapiano"
-VERSION="20140207"
-HOMEPAGE="https://github.com/rekado/lv2-mdaMetaPiano"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/lv2-mda-metapiano-20140207.tar.gz"
-MD5SUM="3d4f9adcb6079bc82484fa8153b3f437"
+VERSION="0.0.2"
+HOMEPAGE="http://git.elephly.net/software/lv2-mdametapiano.git"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/lv2-mda-metapiano-0.0.2.tar.gz"
+MD5SUM="2285d3bf306a9ca4a6a0effe1c687ce1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lvtk"
diff --git a/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild b/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild
index 3aa2ea8339..aa12e6c0f7 100644
--- a/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild
+++ b/audio/match-vamp-plugin/match-vamp-plugin.SlackBuild
@@ -8,7 +8,7 @@
 
 PRGNAM=match-vamp-plugin
 VERSION=${VERSION:-0.2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,6 +53,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# 20151122 bkw: Grr. How long has this been broken?
+sed -i 's/-Wl,-Bstatic//' Makefile
+
 # Just in case someone doesn't trust upstream's default CXXFLAGS:
 if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
   make CXXFLAGS="$SLKCFLAGS"
diff --git a/audio/miniAudicle/miniAudicle.SlackBuild b/audio/miniAudicle/miniAudicle.SlackBuild
index 29e3871f25..9ecdb75d00 100644
--- a/audio/miniAudicle/miniAudicle.SlackBuild
+++ b/audio/miniAudicle/miniAudicle.SlackBuild
@@ -44,7 +44,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION/src
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,6 +52,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+cd src
+
 # Set our CFLAGS
 sed -i "s|-O3|$SLKCFLAGS|" makefile* chuck/makefile*
 
diff --git a/audio/minimodem/minimodem.SlackBuild b/audio/minimodem/minimodem.SlackBuild
index 6ad7808307..e85d7c9a32 100644
--- a/audio/minimodem/minimodem.SlackBuild
+++ b/audio/minimodem/minimodem.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=minimodem
-VERSION=${VERSION:-0.20}
+VERSION=${VERSION:-0.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/minimodem/minimodem.info b/audio/minimodem/minimodem.info
index e06d3fc574..2d192c0439 100644
--- a/audio/minimodem/minimodem.info
+++ b/audio/minimodem/minimodem.info
@@ -1,8 +1,8 @@
 PRGNAM="minimodem"
-VERSION="0.20"
+VERSION="0.22"
 HOMEPAGE="http://www.whence.com/minimodem/"
-DOWNLOAD="http://www.whence.com/minimodem/minimodem-0.20.tar.gz"
-MD5SUM="cf8de4e6be2dc37ea29a82f1aba199fc"
+DOWNLOAD="http://www.whence.com/minimodem/minimodem-0.22.tar.gz"
+MD5SUM="6ce00a32699718b938263c07751f995a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/mkcue/README b/audio/mkcue/README
new file mode 100644
index 0000000000..5a3a118ccb
--- /dev/null
+++ b/audio/mkcue/README
@@ -0,0 +1,5 @@
+mkcue generates cue sheets from a CD TOC (Table Of Contents). Cue
+sheets describe how the tracks of a CD are laid out.
+
+abcde uses mkcue when ripping a multi-track audio CD to a single
+audio file and a cue sheet.
diff --git a/audio/mkcue/fix_msf_offset.diff b/audio/mkcue/fix_msf_offset.diff
new file mode 100644
index 0000000000..ccebb70b02
--- /dev/null
+++ b/audio/mkcue/fix_msf_offset.diff
@@ -0,0 +1,46 @@
+Description: Don't assume MSF offset is always 150 (#439790)
+Author: Martin Michlmayr <tbm@cyrius.com>
+Last-Update: 2007-10-21
+Index: mkcue-1/mkcue.cc
+===================================================================
+--- mkcue-1.orig/mkcue.cc	2004-10-27 07:20:30.000000000 +0100
++++ mkcue-1/mkcue.cc	2012-11-10 13:34:34.986131069 +0000
+@@ -12,6 +12,9 @@
+ 
+ #include "diskid.h"
+ 
++/* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439790 */
++#define MSF_OFFSET 150
++
+ void
+ DiskId::ReportError(char *err)
+ {
+@@ -54,16 +57,12 @@
+     }
+ 
+     puts("FILE \"dummy.wav\" WAVE");
+-    puts("  TRACK 01 AUDIO");
+-    puts("    INDEX 01 00:00:00");
+ 
+ #define min(x, y) ((x) < (y) ? (x) : (y))
+-    for (track = cdinfo.FirstTrack + 1;
++    for (track = cdinfo.FirstTrack;
+          track <= min(trackcount, cdinfo.LastTrack);
+          track++) {
+-        /* There is frequently (always?) an offset of 150 sectors, so
+-         * subtract the first track's offset. */
+-        cdinfo.FrameOffset[track] -= cdinfo.FrameOffset[1];
++        cdinfo.FrameOffset[track] -= MSF_OFFSET;
+ 
+         minutes = seconds = sectors = 0;
+         sectors = cdinfo.FrameOffset[track] % 75;
+@@ -76,6 +75,9 @@
+         }
+ 
+         printf("  TRACK %02d AUDIO\n", track);
++        if (track == 1 && cdinfo.FrameOffset[track] > 0) {
++            printf("    INDEX 00 00:00:00\n");
++        }
+         printf("    INDEX 01 %02d:%02d:%02d\n", minutes, seconds, sectors);
+     }
+ 
diff --git a/audio/mkcue/mkcue.SlackBuild b/audio/mkcue/mkcue.SlackBuild
new file mode 100644
index 0000000000..c8422c8756
--- /dev/null
+++ b/audio/mkcue/mkcue.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for mkcue
+
+# Copyright 2016 Andreas Voegele <andreas@andreasvoegele.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+PRGNAM=mkcue
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=$PRGNAM-1.orig
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM
+tar xvf $CWD/$( echo $SRCNAM | tr - _ ).tar.gz
+cd $SRCNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/fix_msf_offset.diff
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+mkdir -p $PKG/usr/bin
+install -m 755 mkcue $PKG/usr/bin/mkcue
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/mkcue/mkcue.info b/audio/mkcue/mkcue.info
new file mode 100644
index 0000000000..baeb1f5cda
--- /dev/null
+++ b/audio/mkcue/mkcue.info
@@ -0,0 +1,10 @@
+PRGNAM="mkcue"
+VERSION="1.4"
+HOMEPAGE="https://packages.debian.org/sid/mkcue"
+DOWNLOAD="http://httpredir.debian.org/debian/pool/main/m/mkcue/mkcue_1.orig.tar.gz"
+MD5SUM="de082e40baf042e23246d54d28cbcdcc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/audio/mkcue/slack-desc b/audio/mkcue/slack-desc
new file mode 100644
index 0000000000..171e4d520f
--- /dev/null
+++ b/audio/mkcue/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+mkcue: mkcue (generates cue sheets from a CD TOC)
+mkcue:
+mkcue: mkcue generates cue sheets from a CD TOC (Table Of Contents). Cue
+mkcue: sheets describe how the tracks of a CD are laid out.
+mkcue:
+mkcue: abcde uses mkcue when ripping a multi-track audio CD to a single
+mkcue: audio file and a cue sheet.
+mkcue:
+mkcue:
+mkcue:
+mkcue:
diff --git a/audio/morituri/README b/audio/morituri/README
index af0669756f..1df473eb0e 100644
--- a/audio/morituri/README
+++ b/audio/morituri/README
@@ -1,4 +1,4 @@
 morituri is a CD ripper aiming for accuracy over speed. Its features
 are to compare with Exact Audio Copy on Windows.
 
-pycdaudio is a an optional but recommended runtime dependency.
+pycdio is a an optional but recommended runtime dependency.
diff --git a/audio/morituri/morituri.SlackBuild b/audio/morituri/morituri.SlackBuild
index 5d5285017f..f52e198227 100644
--- a/audio/morituri/morituri.SlackBuild
+++ b/audio/morituri/morituri.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=morituri
 VERSION=${VERSION:-0.2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# https://github.com/thomasvs/morituri/issues/89
+patch -p1 --verbose < $CWD/rip_U.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/audio/morituri/morituri.info b/audio/morituri/morituri.info
index 3dcada182b..8a50188593 100644
--- a/audio/morituri/morituri.info
+++ b/audio/morituri/morituri.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://thomas.apestaart.org/download/morituri/morituri-0.2.3.tar.bz2"
 MD5SUM="9587255fc9b357942e700b9fda4c6ddf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gst-python"
+REQUIRES="cddb-py gst-python pysetuptools"
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/audio/morituri/rip_U.patch b/audio/morituri/rip_U.patch
new file mode 100644
index 0000000000..d1fcd8afe6
--- /dev/null
+++ b/audio/morituri/rip_U.patch
@@ -0,0 +1,23 @@
+From 01f07c5ad90563dc258eba4134a2544d192d0a49 Mon Sep 17 00:00:00 2001
+From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
+Date: Sun, 5 Oct 2014 16:40:59 -0400
+Subject: [PATCH] make sure rip cd rip -U works
+
+---
+ morituri/rip/cd.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
+index eaf5da4..c787d3f 100644
+--- a/morituri/rip/cd.py
++++ b/morituri/rip/cd.py
+@@ -123,7 +123,8 @@ def do(self, args):
+             "full table's AR URL %s differs from toc AR URL %s" % (
+             self.itable.getAccurateRipURL(), self.ittoc.getAccurateRipURL())
+ 
+-        self.program.metadata.discid = self.ittoc.getMusicBrainzDiscId()
++        if self.program.metadata:
++            self.program.metadata.discid = self.ittoc.getMusicBrainzDiscId()
+ 
+         # result
+ 
diff --git a/audio/musepack-tools/slack-desc b/audio/musepack-tools/slack-desc
index ade840e825..48238d8c57 100644
--- a/audio/musepack-tools/slack-desc
+++ b/audio/musepack-tools/slack-desc
@@ -11,7 +11,7 @@ musepack-tools:
 musepack-tools: This package contains the Musepack Stream Version 8 command line
 musepack-tools: tools for Linux. SV8 supercedes SV7 and is preferable for any task.
 musepack-tools:
-usepack-tools:
+musepack-tools:
 musepack-tools: Homepage: <http://www.musepack.net/>
 musepack-tools:
 musepack-tools:
diff --git a/audio/ncmpcpp/ncmpcpp.SlackBuild b/audio/ncmpcpp/ncmpcpp.SlackBuild
index c09a336038..a40991d89d 100644
--- a/audio/ncmpcpp/ncmpcpp.SlackBuild
+++ b/audio/ncmpcpp/ncmpcpp.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for ncmpcpp
 
 # Copyright 2006  Andrew Brouwers <abrouwers@gmail.com>
+# Copyright 2015  Jostein Berntsen <jbernts@broadpark.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=ncmpcpp
-VERSION=${VERSION:-0.5.10}
+VERSION=${VERSION:-0.6.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,16 +72,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -ie 's/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4))/g' src/tags.cpp
+
+export BOOST_LIB_SUFFIX=""
+./autogen.sh \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
+--prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --enable-unicode \
   --with-curl \
   --with-taglib \
-  --build=$ARCH-slackware-linux
+  --with-fftw \
+--enable-clock \
+--enable-visualizer \
+ --build=$ARCH-slackware-linux
 
 make docdir=/usr/doc/$PRGNAM-$VERSION
 make docdir=/usr/doc/$PRGNAM-$VERSION install-strip DESTDIR=$PKG
diff --git a/audio/ncmpcpp/ncmpcpp.info b/audio/ncmpcpp/ncmpcpp.info
index fdb8f4a319..ef617eb860 100644
--- a/audio/ncmpcpp/ncmpcpp.info
+++ b/audio/ncmpcpp/ncmpcpp.info
@@ -1,10 +1,10 @@
 PRGNAM="ncmpcpp"
-VERSION="0.5.10"
+VERSION="0.6.8"
 HOMEPAGE="http://ncmpcpp.rybczak.net"
-DOWNLOAD="http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.5.10.tar.bz2"
-MD5SUM="298ed66325bcfe358e37e186c7ea4861"
+DOWNLOAD="https://github.com/arybczak/ncmpcpp/archive/0.6.8.tar.gz"
+MD5SUM="350904a92d6b14ca6fcb31f3be04e5c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmpdclient"
-MAINTAINER="Juan Camilo Noreña"
-EMAIL="jcnb81@gmail.com"
+MAINTAINER="Jostein Berntsen"
+EMAIL="jbernts@broadpark.no"
diff --git a/audio/non/non.SlackBuild b/audio/non/non.SlackBuild
index da7ed3d997..b7043ea459 100644
--- a/audio/non/non.SlackBuild
+++ b/audio/non/non.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
     --localstatedir=/var \
     --mandir=/usr/man \
     --docdir=/usr/doc/$PRGNAM-$VERSION
-./waf
+./waf -j1
 ./waf install --destdir=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/audio/non/non.info b/audio/non/non.info
index 164807412e..e6142740e4 100644
--- a/audio/non/non.info
+++ b/audio/non/non.info
@@ -1,5 +1,5 @@
 PRGNAM="non"
-VERSION="git-23092014"
+VERSION="23092014"
 HOMEPAGE="http://non.tuxfamily.org"
 DOWNLOAD="http://slackermedia.info/slackbuilds/non/non-git-23092014.tar.bz2"
 MD5SUM="19716a610e8212ac70e570eede8277bc"
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblo libsigc++ liblrdf ntk"
 MAINTAINER="klaatu"
-EMAIL="klaatu@member.fsf.org"
\ No newline at end of file
+EMAIL="klaatu@member.fsf.org"
diff --git a/audio/non/slack-desc b/audio/non/slack-desc
index 6faeda848c..b1e50e21f6 100644
--- a/audio/non/slack-desc
+++ b/audio/non/slack-desc
@@ -16,4 +16,4 @@ non: Non was built entirely from scratch by one programmer, and it is
 non: intended as a lightweight, reliable, fast audio editing environment.
 non:
 non: http://non.tuxfamily.org
-non:
\ No newline at end of file
+non:
diff --git a/audio/opus/opus.SlackBuild b/audio/opus/opus.SlackBuild
index 147b12da7d..3648515e1d 100644
--- a/audio/opus/opus.SlackBuild
+++ b/audio/opus/opus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for opus
 
-# Copyright 2012-2013 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2012-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opus
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,6 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
+  --enable-intrinsics \
   --build=$ARCH-slackware-linux
 
 make
@@ -91,9 +92,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL README  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL README  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/opus/opus.info b/audio/opus/opus.info
index 85a2547c14..73251293b5 100644
--- a/audio/opus/opus.info
+++ b/audio/opus/opus.info
@@ -1,8 +1,8 @@
 PRGNAM="opus"
-VERSION="1.1"
+VERSION="1.1.1"
 HOMEPAGE="http://opus-codec.org/"
-DOWNLOAD="http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz"
-MD5SUM="c5a8cf7c0b066759542bc4ca46817ac6"
+DOWNLOAD="http://downloads.xiph.org/releases/opus/opus-1.1.1.tar.gz"
+MD5SUM="cfb354d4c65217ca32a762f8ab15f2ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/pasystray/pasystray.SlackBuild b/audio/pasystray/pasystray.SlackBuild
index a727392258..603c257386 100644
--- a/audio/pasystray/pasystray.SlackBuild
+++ b/audio/pasystray/pasystray.SlackBuild
@@ -83,12 +83,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --disable-static \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make clean
 make
 make install-strip DESTDIR=$PKG
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/audio/patchage/patchage.SlackBuild b/audio/patchage/patchage.SlackBuild
index 2714e6069c..ed3f75daf9 100644
--- a/audio/patchage/patchage.SlackBuild
+++ b/audio/patchage/patchage.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/audio/pd/pd.SlackBuild b/audio/pd/pd.SlackBuild
index 83d5e77671..12053c81c5 100644
--- a/audio/pd/pd.SlackBuild
+++ b/audio/pd/pd.SlackBuild
@@ -98,6 +98,8 @@ cp $TMP/${PRGNAM}_48-3.xpm $PKG/usr/share/$PRGNAM
 cp -p $TMP/$PRGNAM-$SRCVERSION/src/*.h $PKG/usr/include/
 
 mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL.txt README.txt LICENSE.txt src/CHANGELOG.txt \
diff --git a/audio/pogo/README b/audio/pogo/README
index 595f02d2ca..3e24cecc6d 100644
--- a/audio/pogo/README
+++ b/audio/pogo/README
@@ -1,4 +1,4 @@
-Probably the simplest and fastest audio player for Linux.
+pogo (A simple and fast audio player for Linux)
 
 Pogo plays your music. Nothing else. It is both fast and easy-to-use.
 The clear interface uses the screen real-estate very efficiently.
diff --git a/audio/pogo/pogo.SlackBuild b/audio/pogo/pogo.SlackBuild
index de19243b9c..6aa0bcbf08 100644
--- a/audio/pogo/pogo.SlackBuild
+++ b/audio/pogo/pogo.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pogo
-VERSION=${VERSION:-0.8.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,7 +69,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make install DESTDIR=$PKG MANDIR=$PKG/usr/man
+make install DESTDIR=$PKG MANDIR=$PKG/usr/man/man1
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -77,7 +77,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-DOCS="COPYING NEWS README"
+DOCS="LICENSE.txt NEWS.md README.md TODO.txt"
 
 find $PKG -name perllocal.pod \
   -o -name ".packlist" \
diff --git a/audio/pogo/pogo.info b/audio/pogo/pogo.info
index 792dec22f1..61ec46ff0e 100644
--- a/audio/pogo/pogo.info
+++ b/audio/pogo/pogo.info
@@ -1,8 +1,8 @@
 PRGNAM="pogo"
-VERSION="0.8.4"
-HOMEPAGE="https://launchpad.net/pogo"
-DOWNLOAD="https://launchpadlibrarian.net/206516837/pogo-0.8.4.tar.gz"
-MD5SUM="a86ed265f16f7793859d6d9b6fe09d58"
+VERSION="0.8.6"
+HOMEPAGE="https://github.com/jendrikseipp/pogo"
+DOWNLOAD="https://github.com/jendrikseipp/pogo/archive/v0.8.6.tar.gz"
+MD5SUM="92ab2db4acec1e68e1e72235f05cae50"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gst-plugins-ugly gst-python mutagen"
diff --git a/audio/pogo/slack-desc b/audio/pogo/slack-desc
index 3d36ebda92..edb29de54c 100644
--- a/audio/pogo/slack-desc
+++ b/audio/pogo/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-pogo: pogo (Probably the simplest and fastest audio player for Linux)
+pogo: pogo (A simple and fast audio player for Linux)
 pogo:
 pogo: Pogo plays your music. Nothing else. It is both fast and easy-to-use.
 pogo: The clear interface uses the screen real-estate very efficiently.
@@ -15,5 +15,5 @@ pogo: Other features include: Fast search on the harddrive and in the
 pogo: playlist, smart album grouping, cover display, desktop 
 pogo: notifications and no music library.
 pogo: 
-pogo: Homepage: https://launchpad.net/pogo
+pogo: Home page: https://github.com/jendrikseipp/pogo
 pogo:
diff --git a/audio/puddletag/puddletag.info b/audio/puddletag/puddletag.info
index 080fefddf8..6f47de3d29 100644
--- a/audio/puddletag/puddletag.info
+++ b/audio/puddletag/puddletag.info
@@ -1,7 +1,7 @@
 PRGNAM="puddletag"
 VERSION="1.0.5"
 HOMEPAGE="http://puddletag.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/puddletag/puddletag-1.0.5.tar.gz"
+DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/puddletag-1.0.5.tar.gz"
 MD5SUM="edd491e657415756c565fb92e0153c63"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/pulseaudio/030_posix-completion.diff b/audio/pulseaudio/030_posix-completion.diff
new file mode 100644
index 0000000000..de1ef055ef
--- /dev/null
+++ b/audio/pulseaudio/030_posix-completion.diff
@@ -0,0 +1,91 @@
+--- shell-completion/bash/pulseaudio.orig	2015-02-13 00:10:35.000000000 +1000
++++ shell-completion/bash/pulseaudio	2015-09-12 11:09:36.948222926 +1000
+@@ -1,39 +1,45 @@
+ #!/bin/bash
+ 
+ __cards () {
++    (pactl list cards short 2> /dev/null) |\
+     while IFS=$'\t' read idx name _; do
+         printf "%s %s\n" "$idx" "$name"
+-    done < <(pactl list cards short 2> /dev/null)
++    done
+ }
+ 
+ __sinks () {
++    (pactl list sinks short 2> /dev/null) |\
+     while IFS=$'\t' read _ name _ _ _; do
+         printf "%s\n" "$name"
+-    done < <(pactl list sinks short 2> /dev/null)
++    done
+ }
+ 
+ __sinks_idx () {
++    (pactl list sinks short 2> /dev/null) |\
+     while IFS=$'\t' read idx _ _ _ _; do
+         printf "%s\n" "$idx"
+-    done < <(pactl list sinks short 2> /dev/null)
++    done
+ }
+ 
+ __sources () {
++    (pactl list sources short 2> /dev/null) |\
+     while IFS=$'\t' read _ name _ _ _; do
+         printf "%s\n" "$name"
+-    done < <(pactl list sources short 2> /dev/null)
++    done
+ }
+ 
+ __sink_inputs () {
++    (pactl list sink-inputs short 2> /dev/null) |\
+     while IFS=$'\t' read idx _ _ _ _; do
+         printf "%s\n" "$idx"
+-    done < <(pactl list sink-inputs short 2> /dev/null)
++    done
+ }
+ 
+ __source_outputs () {
++    (pactl list source-outputs short 2> /dev/null) |\
+     while IFS=$'\t' read idx _ _ _ _; do
+         printf "%s\n" "$idx"
+-    done < <(pactl list source-outputs short 2> /dev/null)
++    done
+ }
+ 
+ __ports () {
+@@ -77,28 +83,32 @@
+ }
+ 
+ __all_modules () {
++    (pulseaudio --dump-modules 2> /dev/null) |\
+     while read name; do
+         name=${name%% *}
+         printf "%s\n" "$name"
+-    done < <(pulseaudio --dump-modules 2> /dev/null)
++    done
+ }
+ 
+ __loaded_modules () {
++    (pactl list modules short 2> /dev/null) |\
+     while IFS=$'\t' read idx name _; do
+         printf "%s %s\n" "$idx" "$name"
+-    done < <(pactl list modules short 2> /dev/null)
++    done
+ }
+ 
+ __resample_methods () {
++    (pulseaudio --dump-resample-methods 2> /dev/null) |\
+     while read name; do
+         printf "%s\n" "$name"
+-    done < <(pulseaudio --dump-resample-methods 2> /dev/null)
++    done
+ }
+ 
+ _pacat_file_formats () {
++    (pacat --list-file-formats 2> /dev/null) |\
+     while IFS=$'\t' read name _; do
+         printf "%s\n" "$name"
+-    done < <(pacat --list-file-formats 2> /dev/null)
++    done
+ }
+ 
+ in_array() {
diff --git a/audio/pulseaudio/README b/audio/pulseaudio/README
index b8d3234a3a..7e45020fa2 100644
--- a/audio/pulseaudio/README
+++ b/audio/pulseaudio/README
@@ -2,7 +2,10 @@ pulseaudio is a networked sound server for Unix-like operating systems
 and Microsoft Windows. It is intended to be an improved drop-in replacement 
 for the Enlightened Sound Daemon (ESOUND).
 
-Optional deps: jack-audio-connection-kit, avahi, lirc, libasyncns, orc
+Optional deps: sbc, jack-audio-connection-kit, avahi, lirc, libasyncns, orc
+
+Bluetooth support requires the optional sbc package (in addition to the
+standard bluez package).
 
 USAGE:
 In almost all cases, pulseaudio should be run as a normal user daemon
diff --git a/audio/pulseaudio/pulseaudio.SlackBuild b/audio/pulseaudio/pulseaudio.SlackBuild
index 231a2ad6f5..5d2fd83957 100644
--- a/audio/pulseaudio/pulseaudio.SlackBuild
+++ b/audio/pulseaudio/pulseaudio.SlackBuild
@@ -3,11 +3,11 @@
 # Slackware build script for pulseaudio
 
 # Written by crocket (crockabiscuit@gmail.com)
-# Maintained by Christoph Willing <chris.willing@iinet.net.au>
+# Maintained 2013-2015 by Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=pulseaudio
-VERSION=${VERSION:-6.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-7.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -46,6 +46,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 patch -p0 < $CWD/020_no-parallel-make.diff
+patch -p0 < $CWD/030_posix-completion.diff
 sed -i -e '/@PA_BINARY@/ imkdir -p \$HOME/.config/pulse' src/daemon/start-pulseaudio-x11.in
 echo "X-MATE-Autostart-Phase=Initialization" >>src/daemon/pulseaudio.desktop.in
 
@@ -62,6 +63,13 @@ else
   ORC=no
 fi
 
+if pkg-config --exists bash-completion ; then
+  BASHCOMPLETIONDIR=$(pkg-config --variable=completionsdir bash-completion)
+else
+  echo "Setting completions directory manually."
+  BASHCOMPLETIONDIR=/usr/share/bash-completion/completions
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./bootstrap.sh \
@@ -77,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-system-user=pulse \
   --with-system-group=pulse \
   --with-access-group=audio \
+  --with-bash-completion-dir=$BASHCOMPLETIONDIR \
   --build=$ARCH-slackware-linux
 
 make check
diff --git a/audio/pulseaudio/pulseaudio.info b/audio/pulseaudio/pulseaudio.info
index be2888b98b..5f0dbf7587 100644
--- a/audio/pulseaudio/pulseaudio.info
+++ b/audio/pulseaudio/pulseaudio.info
@@ -1,10 +1,10 @@
 PRGNAM="pulseaudio"
-VERSION="6.0"
+VERSION="7.0"
 HOMEPAGE="http://www.pulseaudio.org"
-DOWNLOAD="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-6.0.tar.xz"
-MD5SUM="b691e83b7434c678dffacfa3a027750e"
+DOWNLOAD="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-7.0.tar.xz"
+MD5SUM="09668b660ffb32f2639cfd6fdc9d3b37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-c speex"
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/audio/pyalsaaudio/pyalsaaudio.info b/audio/pyalsaaudio/pyalsaaudio.info
index ca88ce166b..4f3fdf75f1 100644
--- a/audio/pyalsaaudio/pyalsaaudio.info
+++ b/audio/pyalsaaudio/pyalsaaudio.info
@@ -1,7 +1,7 @@
 PRGNAM="pyalsaaudio"
 VERSION="0.6"
 HOMEPAGE="http://sourceforge.net/projects/pyalsaaudio/"
-DOWNLOAD="http://downloads.sourceforge.net/pyalsaaudio/pyalsaaudio-0.6.tar.gz"
+DOWNLOAD="https://pkgs.fedoraproject.org/repo/pkgs/python-alsaaudio/pyalsaaudio-0.6.tar.gz/94811fc4de883996eac4046d36fe2364/pyalsaaudio-0.6.tar.gz"
 MD5SUM="94811fc4de883996eac4046d36fe2364"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/qjackctl/qjackctl.SlackBuild b/audio/qjackctl/qjackctl.SlackBuild
index fd899de93b..2405de16b2 100644
--- a/audio/qjackctl/qjackctl.SlackBuild
+++ b/audio/qjackctl/qjackctl.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qjackctl
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-0.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qjackctl/qjackctl.info b/audio/qjackctl/qjackctl.info
index b633bfcd88..5b4ede3702 100644
--- a/audio/qjackctl/qjackctl.info
+++ b/audio/qjackctl/qjackctl.info
@@ -1,10 +1,10 @@
 PRGNAM="qjackctl"
-VERSION="0.4.0"
+VERSION="0.4.1"
 HOMEPAGE="http://qjackctl.sourceforge.net/"
-DOWNLOAD="https://s.mos6581.de/static/slackbuilds.org/sources/qjackctl-0.4.0.tar.gz"
-MD5SUM="2081b96e4facf3c2be641848b1c184fd"
+DOWNLOAD="http://downloads.sourceforge.net/project/qjackctl/qjackctl/0.4.1/qjackctl-0.4.1.tar.gz"
+MD5SUM="6a0a4245e2b9e470e04009e1d0f29f08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit"
+REQUIRES="qt5 jack-audio-connection-kit"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/audio/qmidinet/qmidinet.SlackBuild b/audio/qmidinet/qmidinet.SlackBuild
index 3028448b35..40a4904417 100644
--- a/audio/qmidinet/qmidinet.SlackBuild
+++ b/audio/qmidinet/qmidinet.SlackBuild
@@ -73,6 +73,7 @@ CXXFLAGS="$SLKCFLAGS"
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
diff --git a/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild b/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild
index 2c1c40bb27..c2a6f9bcec 100644
--- a/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild
+++ b/audio/qmmp-plugin-pack/qmmp-plugin-pack.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qmmp-plugin-pack
-VERSION=${VERSION:-0.8.4}
+VERSION=${VERSION:-0.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/audio/qmmp-plugin-pack/qmmp-plugin-pack.info b/audio/qmmp-plugin-pack/qmmp-plugin-pack.info
index de9c17c7a6..d913b25408 100644
--- a/audio/qmmp-plugin-pack/qmmp-plugin-pack.info
+++ b/audio/qmmp-plugin-pack/qmmp-plugin-pack.info
@@ -1,8 +1,8 @@
 PRGNAM="qmmp-plugin-pack"
-VERSION="0.8.4"
+VERSION="0.8.6"
 HOMEPAGE="http://qmmp.ylsoftware.com/plugins.php"
-DOWNLOAD="http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.8.4.tar.bz2"
-MD5SUM="b9cad0dda23649f5ee9ed60c5e946fed"
+DOWNLOAD="http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.8.6.tar.bz2"
+MD5SUM="a5d5b6d6660c2aad1ab9b4ebf579dc18"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qmmp"
diff --git a/audio/rakarrack/rakarrack.SlackBuild b/audio/rakarrack/rakarrack.SlackBuild
index 9268c8fff9..5a54585c3a 100644
--- a/audio/rakarrack/rakarrack.SlackBuild
+++ b/audio/rakarrack/rakarrack.SlackBuild
@@ -8,6 +8,8 @@
 
 # 20140114 bkw: add 64-bit distortion fix and setcap stuff.
 
+# 20151126 bkw: fix build on -current, preparing for 14.2.
+
 PRGNAM=rakarrack
 VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-2}
@@ -60,6 +62,9 @@ find -L . \
 # http://sourceforge.net/p/rakarrack/discussion/778862/thread/e9559a34/
 patch -p1 < $CWD/64bit_distortion.diff
 
+# Slackware's extra/fltk doesn't have /usr/include/Fl -> FL
+sed -i '/#include/s,Fl/,FL/,' src/*
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/audio/sbc/README b/audio/sbc/README
new file mode 100644
index 0000000000..b4acd561bc
--- /dev/null
+++ b/audio/sbc/README
@@ -0,0 +1,11 @@
+The Bluetooth low-complexity, subband codec (SBC) is described in the
+specification of the Advanced Audio Distribution Profile (A2DP) in
+appendix B (page 50). SBC is an audio coding system specially designed for
+Bluetooth audio and video applications to obtain high quality audio at medium
+bitrates, and having a low computational complexity. It uses 4 or 8 subbands,
+an adaptive bit allocation algorithm and simple adaptive block PCM quantizers.
+
+The SBC audio coding system is based on an earlier system:
+F. de Bont, M. Groenewegen and W. Oomen,
+"A High Quality Audio-Coding System at 128 kb/s",
+98th AES Convention, Febr. 25-28, 1995.
diff --git a/audio/sbc/sbc.SlackBuild b/audio/sbc/sbc.SlackBuild
new file mode 100644
index 0000000000..7d54796060
--- /dev/null
+++ b/audio/sbc/sbc.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for sbc
+
+# Copyright 2015 Christoph Willing  Brisbane, Australia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=sbc
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING COPYING.LIB ChangeLog INSTALL README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/sbc/sbc.info b/audio/sbc/sbc.info
new file mode 100644
index 0000000000..c4204a4eb6
--- /dev/null
+++ b/audio/sbc/sbc.info
@@ -0,0 +1,10 @@
+PRGNAM="sbc"
+VERSION="1.3"
+HOMEPAGE="http://www.bluez.org"
+DOWNLOAD="http://www.kernel.org/pub/linux/bluetooth/sbc-1.3.tar.gz"
+MD5SUM="338a86569d861856352ce196f679fdca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/audio/sbc/slack-desc b/audio/sbc/slack-desc
new file mode 100644
index 0000000000..288dafb81c
--- /dev/null
+++ b/audio/sbc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+sbc: sbc (Bluetooth low-complexity, subband codec)
+sbc:
+sbc: SBC is an audio coding system specially designed for Bluetooth audio
+sbc: and video applications to obtain high quality audio at medium
+sbc: bitrates, and having a low computational complexity.
+sbc:
+sbc:
+sbc:
+sbc:
+sbc:
+sbc:
diff --git a/audio/sfarkxtc/sfarkxtc.info b/audio/sfarkxtc/sfarkxtc.info
index f027952aac..ea0889ae4c 100644
--- a/audio/sfarkxtc/sfarkxtc.info
+++ b/audio/sfarkxtc/sfarkxtc.info
@@ -1,7 +1,7 @@
 PRGNAM="sfarkxtc"
 VERSION="20070326"
 HOMEPAGE="http://www.melodymachine.com/sfark.htm"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/sfarkxtc_lx86.tar.gz"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/audio/sfarkxtc/sfarkxtc_lx86.tar.gz"
 MD5SUM="3350e57ed3d09e9477d125dfc23e21f1"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
diff --git a/audio/soundkonverter/soundkonverter.SlackBuild b/audio/soundkonverter/soundkonverter.SlackBuild
index 0b5405dc74..3a029881c7 100644
--- a/audio/soundkonverter/soundkonverter.SlackBuild
+++ b/audio/soundkonverter/soundkonverter.SlackBuild
@@ -73,8 +73,8 @@ find -L . \
 
 # Move these files around in order for soundkonverter to find CMakeLists.txt and build
 # backends properly
-mv src/* /tmp/SBo/$PRGNAM-$VERSION
-mv tools/* /tmp/SBo/$PRGNAM-$VERSION
+mv src/* $TMP/$PRGNAM-$VERSION
+mv tools/* $TMP/$PRGNAM-$VERSION
 
 mkdir -p build
 cd build
diff --git a/audio/tagtool/tagtool.SlackBuild b/audio/tagtool/tagtool.SlackBuild
index 291106115d..6d7c2b366b 100644
--- a/audio/tagtool/tagtool.SlackBuild
+++ b/audio/tagtool/tagtool.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/audio/tap_plugins/README b/audio/tap_plugins/README
index bf30ff221f..8f7fb5c59b 100644
--- a/audio/tap_plugins/README
+++ b/audio/tap_plugins/README
@@ -7,3 +7,9 @@ echo, eq, limiter & more.
 
 This package includes the main tap-plugins distribution, plus the
 tap-plugins-doc and tap-reverbed (TAP Reverb Editor) distributions.
+
+This package uses POSIX filesystem capabilities to execute with
+elevated privileges (required for realtime audio processing). This
+may be considered a security/stability risk. Please read
+http://www.slackbuilds.org/caps/ for more information. To disable
+capabilities, pass SETCAP=no to the script.
diff --git a/audio/tap_plugins/doinst.sh b/audio/tap_plugins/doinst.sh
new file mode 100644
index 0000000000..696d35bad7
--- /dev/null
+++ b/audio/tap_plugins/doinst.sh
@@ -0,0 +1,4 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/audio/tap_plugins/reverbed-default-config.diff b/audio/tap_plugins/reverbed-default-config.diff
new file mode 100644
index 0000000000..e9df247d25
--- /dev/null
+++ b/audio/tap_plugins/reverbed-default-config.diff
@@ -0,0 +1,26 @@
+diff -Naur tap-reverbed-r0/src/file_io.c tap-reverbed-r0.patched/src/file_io.c
+--- tap-reverbed-r0/src/file_io.c	2004-06-18 07:19:01.000000000 -0400
++++ tap-reverbed-r0.patched/src/file_io.c	2015-11-04 16:11:02.000000000 -0500
+@@ -62,6 +62,8 @@
+ }
+ 
+ 
++/* default config, used as fallback if ~/.reverbed not found */
++#define SYS_REVERBED "/etc/reverbed/reverbed.conf"
+ 
+ REVTYPE *
+ parse_input_file(void) {
+@@ -85,8 +87,11 @@
+ 		home = ".";
+ 	sprintf(path, "%s/%s", home, NAME_REVERBED);
+ 	if ((infile = fopen(path,"rt")) == NULL) {
+-		fprintf(stderr, "Unable to open %s\n", path);
+-		return(NULL);
++		fprintf(stderr, "Unable to open %s, trying %s\n", path, SYS_REVERBED);
++		if ((infile = fopen(SYS_REVERBED ,"rt")) == NULL) {
++			fprintf(stderr, "Unable to open %s", SYS_REVERBED);
++			return(NULL);
++		}
+ 	}
+ 
+ 	if ((root = malloc(sizeof(REVTYPE))) == NULL) {
diff --git a/audio/tap_plugins/reverbed.desktop b/audio/tap_plugins/reverbed.desktop
new file mode 100644
index 0000000000..1bce528106
--- /dev/null
+++ b/audio/tap_plugins/reverbed.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=TAP Reverb Editor
+Exec=reverbed
+Terminal=false
+Type=Application
+Categories=AudioVideo;Audio;
+Icon=reverbed
diff --git a/audio/tap_plugins/reverbed.png b/audio/tap_plugins/reverbed.png
new file mode 100644
index 0000000000..ba3af7ecc5
--- /dev/null
+++ b/audio/tap_plugins/reverbed.png
diff --git a/audio/tap_plugins/reverbed.sh b/audio/tap_plugins/reverbed.sh
deleted file mode 100644
index b1cb7c2cfe..0000000000
--- a/audio/tap_plugins/reverbed.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Wrapper script for reverbed. When reverbed is run, it requires its
-# config file to already be present in the user's home directory. If not,
-# it'll exit, printing a message on the terminal... but if the user launched
-# it via an icon from a desktop environment, he won't see the error (it will
-# appear to silently fail to run). To avoid confusion, this script creates
-# the config file if & only if it doesn't already exist.
-
-if [ ! -e ~/.reverbed ]; then
-	cat /usr/doc/tap_plugins-@VERSION@/dot.reverbed.default > ~/.reverbed
-fi
-
-exec /usr/bin/reverbed.bin
diff --git a/audio/tap_plugins/setcap.sh b/audio/tap_plugins/setcap.sh
new file mode 100644
index 0000000000..2ae0f9bd07
--- /dev/null
+++ b/audio/tap_plugins/setcap.sh
@@ -0,0 +1 @@
+[ -x /sbin/setcap ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/reverbed
diff --git a/audio/tap_plugins/tap_plugins.SlackBuild b/audio/tap_plugins/tap_plugins.SlackBuild
index 2a23d2e3d1..1ead88e9fc 100644
--- a/audio/tap_plugins/tap_plugins.SlackBuild
+++ b/audio/tap_plugins/tap_plugins.SlackBuild
@@ -6,9 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151104 bkw:
+# update for v0.7.3, update docs to 20140526
+# get rid of reverbed.sh wrapper script (patch reverbed instead)
+# add capability stuff for reverbed
+# add .desktop, icon for reverbed
+
 PRGNAM=tap_plugins
-VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.7.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -45,7 +51,7 @@ FORCE_SYSTEM_LADSPA_H=${FORCE_SYSTEM_LADSPA_H:-no}
 
 PLUGINS_SRCNAM=tap-plugins
 DOCS_SRCNAM=tap-plugins-doc
-DOCS_VERSION=20040817
+DOCS_VERSION=20140526
 REVERBED_SRCNAM=tap-reverbed
 REVERBED_VERSION=r0
 
@@ -97,6 +103,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# patch by SlackBuild author, makes reverbed load its config from /etc
+# if no ~/.reverbed found (rather than aborting with an error message).
+patch -p1 < $CWD/reverbed-default-config.diff
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -113,14 +123,19 @@ fi
 make LIBS=-lm
 
 # more trouble than it's worth to get 'make install' to handle DESTDIR
-strip src/reverbed
-mkdir -p $PKG/usr/bin
-cp src/reverbed $PKG/usr/bin/reverbed.bin
-cat src/.reverbed > $PKG/usr/doc/$PRGNAM-$VERSION/dot.reverbed.default
+mkdir -p $PKG/usr/bin $PKG/etc/reverbed
+install -s -m0755 -oroot -groot src/reverbed $PKG/usr/bin/
+cat src/.reverbed > $PKG/etc/reverbed/reverbed.conf
 
-# Shell script wrapper
-sed 's/@VERSION@/'$VERSION'/g' < $CWD/reverbed.sh > $PKG/usr/bin/reverbed
-chmod 0755 $PKG/usr/bin/reverbed
+# icon came from:
+# https://www.hscripts.com/freeimages/icons/mechanical/spring-clipart.php
+# and turned into a PNG via ImageMagick's convert.
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/reverbed.png > $PKG/usr/share/pixmaps/reverbed.png
+
+# .desktop written by SlackBuild author
+mkdir -p $PKG/usr/share/applications
+cat $CWD/reverbed.desktop > $PKG/usr/share/applications/reverbed.desktop
 
 # ChangeLog and NEWS are 0-length placeholders
 for i in AUTHORS COPYING README; do
@@ -143,6 +158,15 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  cat $CWD/setcap.sh >> $PKG/install/doinst.sh
+  # Only allow execution by audio group
+  chown root:audio $PKG/usr/bin/reverbed
+  chmod 0750 $PKG/usr/bin/reverbed
+fi
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/tap_plugins/tap_plugins.info b/audio/tap_plugins/tap_plugins.info
index 6599b1b3a1..d6793981fc 100644
--- a/audio/tap_plugins/tap_plugins.info
+++ b/audio/tap_plugins/tap_plugins.info
@@ -1,12 +1,12 @@
 PRGNAM="tap_plugins"
-VERSION="0.7.2"
+VERSION="0.7.3"
 HOMEPAGE="http://tap-plugins.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/tap-plugins/tap-plugins/0.7.2/tap-plugins-0.7.2.tar.gz \
+DOWNLOAD="http://downloads.sourceforge.net/project/tap-plugins/tap-plugins/0.7.3/tap-plugins-0.7.3.tar.gz \
           http://downloads.sourceforge.net/project/tap-plugins/tap-reverbed/Release%200/tap-reverbed-r0.tar.gz \
-          http://downloads.sourceforge.net/project/tap-plugins/tap-plugins-doc/2004-08-17/tap-plugins-doc-20040817.tar.gz"
-MD5SUM="354b171e580cfad6bad87c26a79ef273 \
+          http://downloads.sourceforge.net/project/tap-plugins/tap-plugins-doc/2014-05-26/tap-plugins-doc-20140526.tar.gz"
+MD5SUM="113fa021b2a05e2fd3cf35f65e6ca137 \
         f8b15df131b45d2d5ef2e8d7c34e9a29 \
-        9a320210a7a9417487ceb31d6e5c21be"
+        8af9ad9be0aac9f577056311d7ebbd5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit ladspa_sdk"
diff --git a/audio/tta/README b/audio/tta/README
new file mode 100644
index 0000000000..cf29c9b902
--- /dev/null
+++ b/audio/tta/README
@@ -0,0 +1,21 @@
+tta (TTA lossless audio codec)
+
+TTA is a lossless compressor for multichannel 8,16 and 24 bits audio data
+with the ability of password data protection.
+Being 'lossless' means that no data/quality is lost in the compression.
+When when uncompressed, the data will be identical to the original.
+
+This package contains a full-futured codec library for realtime encoding
+and decoding of True Audio (TTA) files.
+
+Features:
+
+ * Down to 30-60% lossless audio data compression
+ * Fast decoding and encoding
+ * Password data protection
+ * Multiplatform
+ * Open source code and documentation
+ * Hardware support
+ * Real time data encryption
+
+This package can coexist with "ttaenc", also available in SlackBuilds.
diff --git a/audio/tta/slack-desc b/audio/tta/slack-desc
new file mode 100644
index 0000000000..ab9c19107f
--- /dev/null
+++ b/audio/tta/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+tta: tta (TTA lossless audio codec)
+tta:
+tta: TTA is a lossless compressor for multichannel 8,16 and 24 bits audio
+tta: data, with the ability of password data protection. Being 'lossless'
+tta: means that no data/quality is lost in the compression - when
+tta: uncompressed, the data will be identical to the original.
+tta:
+tta: Home Page: http://en.true-audio.com/
+tta:
+tta:
+tta:
diff --git a/audio/tta/tta.SlackBuild b/audio/tta/tta.SlackBuild
new file mode 100644
index 0000000000..52edb60b70
--- /dev/null
+++ b/audio/tta/tta.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+#
+# Slackware build script for tta.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tta
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="libtta-cpp"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+DOCS="COPYING README"
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/tta/tta.info b/audio/tta/tta.info
new file mode 100644
index 0000000000..b6f5e2d8d1
--- /dev/null
+++ b/audio/tta/tta.info
@@ -0,0 +1,10 @@
+PRGNAM="tta"
+VERSION="2.3"
+HOMEPAGE="http://en.true-audio.com/"
+DOWNLOAD="http://sourceforge.net/projects/tta/files/tta/libtta++/libtta-cpp-2.3.tar.gz"
+MD5SUM="c0b934e854fef32dc8578241e7b233b3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/audio/ttaenc/README b/audio/ttaenc/README
new file mode 100644
index 0000000000..d9b9d9bf0f
--- /dev/null
+++ b/audio/ttaenc/README
@@ -0,0 +1,9 @@
+ttaenc (TTA1 lossless audio encoder/decoder)
+
+TTA performs lossless compression on multichannel 8,16 and 24 bits data of the Wav audio files.
+Being "lossless" means that no data-quality is lost in the compression - when uncompressed,
+the data will be identical to the original. The compression ratios of TTA depend on the type of
+music file being compressed, but the compression size will generally range between 30% - 70% of
+the original. TTA format supports both of ID3v1/v2 and APEv2 tags.
+
+This package can coexist with "tta", also available in SlackBuilds.
diff --git a/audio/ttaenc/slack-desc b/audio/ttaenc/slack-desc
new file mode 100644
index 0000000000..10fd45479b
--- /dev/null
+++ b/audio/ttaenc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ttaenc: ttaenc (TTA Lossless Audio compressor)
+ttaenc:
+ttaenc: TTA performs lossless compression on multichannel 8,16 and 24 bits
+ttaenc: data of the Wav audio files.
+ttaenc:
+ttaenc: Home Page: http://en.true-audio.com/Free_Downloads/
+ttaenc:
+ttaenc:
+ttaenc:
+ttaenc:
+ttaenc:
diff --git a/audio/ttaenc/ttaenc.SlackBuild b/audio/ttaenc/ttaenc.SlackBuild
new file mode 100644
index 0000000000..cd7728c30c
--- /dev/null
+++ b/audio/ttaenc/ttaenc.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+#
+# Slackware build script for ttaenc.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ttaenc
+VERSION=${VERSION:-3.4.1}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+mv $PRGNAM-$VERSION-bin $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -d $PKG/usr/bin
+install -D -m755 ttaenc $PKG/usr/bin/ttaenc
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog-3.4.1 COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/ttaenc/ttaenc.info b/audio/ttaenc/ttaenc.info
new file mode 100644
index 0000000000..bb8cb6009d
--- /dev/null
+++ b/audio/ttaenc/ttaenc.info
@@ -0,0 +1,10 @@
+PRGNAM="ttaenc"
+VERSION="3.4.1"
+HOMEPAGE="http://en.true-audio.com/Free_Downloads/"
+DOWNLOAD="http://sourceforge.net/projects/tta/files/tta/ttaenc-linux/ttaenc-3.4.1.tgz"
+MD5SUM="0a493e4e4f7a7b83d59c83573f01f0b5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/audio/vocoder-ladspa/vocoder-ladspa.SlackBuild b/audio/vocoder-ladspa/vocoder-ladspa.SlackBuild
index c7519394e1..bba9b8b584 100644
--- a/audio/vocoder-ladspa/vocoder-ladspa.SlackBuild
+++ b/audio/vocoder-ladspa/vocoder-ladspa.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=vocoder-ladspa
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,10 +40,6 @@ fi
 
 SRCDIR=${PRGNAM%-*}
 
-# Leave this undocumented. Anyone who cares about it, should be
-# reading SlackBuilds rather than just running them.
-FORCE_SLACK_CFLAGS=${FORCE_SLACK_CFLAGS:-no}
-
 set -e
 
 rm -rf $PKG
@@ -60,7 +56,10 @@ find -L . \
  -exec chmod 644 {} \;
 
 sed -i "s/-Werror//" Makefile
-if [ "$FORCE_SLACK_CFLAGS" = "yes" ]; then
+
+# Leave this undocumented. Anyone who cares about it, should be
+# reading SlackBuilds rather than just running them.
+if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
   sed -i "s/-O3/$SLKCFLAGS/" Makefile
 fi
 
@@ -69,9 +68,7 @@ strip *.so
 make install INSTALL_PLUGINS_DIR=$PKG/usr/lib$LIBDIRSUFFIX/ladspa
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README COPYRIGHT \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYRIGHT $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/vocoder-ladspa/vocoder-ladspa.info b/audio/vocoder-ladspa/vocoder-ladspa.info
index 99f2d5b8c9..9c488d8234 100644
--- a/audio/vocoder-ladspa/vocoder-ladspa.info
+++ b/audio/vocoder-ladspa/vocoder-ladspa.info
@@ -1,8 +1,8 @@
 PRGNAM="vocoder-ladspa"
-VERSION="0.3"
+VERSION="0.4"
 HOMEPAGE="http://www.sirlab.de/linux/descr_vocoder.html"
-DOWNLOAD="http://www.sirlab.de/linux/download/vocoder-ladspa-0.3.tgz"
-MD5SUM="f802cc54b0e55b6764bf0a1f59820c40"
+DOWNLOAD="http://www.sirlab.de/linux/download/vocoder-ladspa-0.4.tgz"
+MD5SUM="c9a2a36666b8c22284ef1f5f1d24ced3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ladspa_sdk"
diff --git a/audio/wmusic/README b/audio/wmusic/README
new file mode 100644
index 0000000000..5036260978
--- /dev/null
+++ b/audio/wmusic/README
@@ -0,0 +1,6 @@
+wmusic is a dockapp that remote-controls xmms. Here is a list of the features:
+
+- VCR style controls including fast rewind and fast forward
+- Time and Playlist position display
+- Super stylee rotating arrow
+- Hiding of the xmms windows (on startup and through middle-click)
diff --git a/audio/wmusic/slack-desc b/audio/wmusic/slack-desc
new file mode 100644
index 0000000000..ec4aaf5737
--- /dev/null
+++ b/audio/wmusic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler--------------------------------------------------------|
+wmusic: wmusic (XMMS Remote Control DockApp)
+wmusic: 
+wmusic: wmusic is a dockapp that remote-controls xmms. Features VCR style fast
+wmusic: forward and rewind, time and playlist position display, hiding of XMMS
+wmusic: window and more.
+wmusic: 
+wmusic: Homepage: http://home.jtan.com/~john/wmusic/
+wmusic:
+wmusic:
+wmusic:
+wmusic:
diff --git a/audio/wmusic/wmusic.SlackBuild b/audio/wmusic/wmusic.SlackBuild
new file mode 100644
index 0000000000..2140c50d60
--- /dev/null
+++ b/audio/wmusic/wmusic.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for wmusic
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmusic
+VERSION=${VERSION:-1.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./configure
+make
+
+mkdir -p $PKG/usr/bin
+mv src/wmusic $PKG/usr/bin
+
+mkdir -p $PKG/usr/man/man1
+
+# Compresses man page and moves it into place
+gzip -9 debian/wmusic.1
+mv debian/wmusic.1.gz $PKG/usr/man/man1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/wmusic/wmusic.info b/audio/wmusic/wmusic.info
new file mode 100644
index 0000000000..08d2c1f4b5
--- /dev/null
+++ b/audio/wmusic/wmusic.info
@@ -0,0 +1,10 @@
+PRGNAM="wmusic"
+VERSION="1.5.0"
+HOMEPAGE="https://web.archive.org/web/20050405110012/http://home.jtan.com/~john/wmusic/"
+DOWNLOAD="https://web.archive.org/web/20070508045423/http://home.jtan.com/~john/wmusic/wmusic-1.5.0.tar.gz"
+MD5SUM="20b39e0528089161998e2b0c77b1e4ea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/audio/xmms-ctl/README b/audio/xmms-ctl/README
new file mode 100644
index 0000000000..61f97ccf4b
--- /dev/null
+++ b/audio/xmms-ctl/README
@@ -0,0 +1,2 @@
+A simple CLI program to control XMMS. Created for the Quake engine, NGUNIX, but can be used for any
+program or shell script really. 
diff --git a/audio/xmms-ctl/slack-desc b/audio/xmms-ctl/slack-desc
new file mode 100644
index 0000000000..ee66506dd3
--- /dev/null
+++ b/audio/xmms-ctl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+xmms-ctl: xmms-ctl (CLI Controller for XMMS)
+xmms-ctl:
+xmms-ctl: A simple CLI program to control XMMS. Created for the Quake engine,
+xmms-ctl: NGUNIX, but can be used for any program or shell script really.
+xmms-ctl:
+xmms-ctl: Homepage: https://github.com/eukos16/xmms-ctl
+xmms-ctl:
+xmms-ctl:
+xmms-ctl:
+xmms-ctl:
+xmms-ctl:
diff --git a/audio/xmms-ctl/xmms-ctl.SlackBuild b/audio/xmms-ctl/xmms-ctl.SlackBuild
new file mode 100644
index 0000000000..efd4cc75d3
--- /dev/null
+++ b/audio/xmms-ctl/xmms-ctl.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for xmms-ctl
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=xmms-ctl
+VERSION=${VERSION:-4158c718bf68cd8653a0aee93afe65202e483ef9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/$VERSION.zip
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+
+mkdir -p $PKG/usr/bin
+cp -a xmms-ctl $PKG/usr/bin
+
+mkdir -p $PKG/usr/man/man1
+mv xmms-ctl.man xmms-ctl.1
+gzip -9 xmms-ctl.1
+mv xmms-ctl.1.gz $PKG/usr/man/man1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/xmms-ctl/xmms-ctl.info b/audio/xmms-ctl/xmms-ctl.info
new file mode 100644
index 0000000000..e9d940df8b
--- /dev/null
+++ b/audio/xmms-ctl/xmms-ctl.info
@@ -0,0 +1,10 @@
+PRGNAM="xmms-ctl"
+VERSION="4158c718bf68cd8653a0aee93afe65202e483ef9"
+HOMEPAGE="https://github.com/eukos16/xmms-ctl"
+DOWNLOAD="https://github.com/eukos16/xmms-ctl/archive/4158c718bf68cd8653a0aee93afe65202e483ef9.zip"
+MD5SUM="c5913176230021c3608cbf69e025454e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/audio/xmms-mp4/xmms-mp4.SlackBuild b/audio/xmms-mp4/xmms-mp4.SlackBuild
index 8c6eca2831..80fbd548bc 100644
--- a/audio/xmms-mp4/xmms-mp4.SlackBuild
+++ b/audio/xmms-mp4/xmms-mp4.SlackBuild
@@ -60,6 +60,9 @@ patch -p1 < $CWD/compilefix.diff
 # Ancient configure script, generate a new one.
 autoreconf -fi
 
+# 20151119 bkw: -current needs this, and it does no harm on 14.1
+SLKCFLAGS="$SLKCFLAGS -std=gnu89"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/audio/xmms-scrobbler/xmms-scrobbler.info b/audio/xmms-scrobbler/xmms-scrobbler.info
index d8a37a393a..5642a960d0 100644
--- a/audio/xmms-scrobbler/xmms-scrobbler.info
+++ b/audio/xmms-scrobbler/xmms-scrobbler.info
@@ -1,7 +1,7 @@
 PRGNAM="xmms-scrobbler"
 VERSION="0.4.0"
 HOMEPAGE="http://xmms-scrobbler.sommitrealweird.co.uk"
-DOWNLOAD="http://xmms-scrobbler.sommitrealweird.co.uk/download/xmms-scrobbler-0.4.0.tar.gz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/xmms-scrobbler/xmms-scrobbler-0.4.0.tar.gz/a50de221dfb2cd87d803d22655df3dad/xmms-scrobbler-0.4.0.tar.gz"
 MD5SUM="a50de221dfb2cd87d803d22655df3dad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/zita-ajbridge/zita-ajbridge.1 b/audio/zita-ajbridge/zita-ajbridge.1
deleted file mode 100644
index cf8a3383e7..0000000000
--- a/audio/zita-ajbridge/zita-ajbridge.1
+++ /dev/null
@@ -1,198 +0,0 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-.    ds C`
-.    ds C'
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
-..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
-..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
-.\}
-.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZITA-AJBRIDGE 1"
-.TH ZITA-AJBRIDGE 1 "2014-01-14" "0.4.0" "SlackBuilds.org"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-zita\-a2j \- use ALSA capture device as a JACK client, with resampling
-.PP
-zita\-j2a \- use ALSA playback device as a JACK client, with resampling
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-zita\-a2j \fIoptions\fR
-.PP
-zita\-j2a \fIoptions\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-zita-ajbridge provides two applications, zita\-a2j and zita\-j2a.  They
-allow using an \s-1ALSA\s0 device as a Jack client, to provide additional
-capture (a2j) or playback (j2a) channels.  Functionally these are
-equivalent to the alsa_in and alsa_out clients that come with \s-1JACK,\s0
-but they provide much better audio quality. The resampling ratio will
-typically be stable within 1 \s-1PPM\s0 and change only very smoothly. Delay
-will be stable as well even under worst case conditions, e.g. the \s-1JACK\s0
-client running near the end of the cycle.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-Options for both executables are the same, except the default \s-1JACK\s0 client name.
-.IP "\-h" 4
-.IX Item "-h"
-Display this text
-.IP "\-j <jackname>" 4
-.IX Item "-j <jackname>"
-Name as Jack client [zita\-j2a or zita\-a2j]
-.IP "\-d <device>" 4
-.IX Item "-d <device>"
-\&\s-1ALSA\s0 playback device [none]
-.IP "\-r <rate>" 4
-.IX Item "-r <rate>"
-Sample rate [48000]
-.IP "\-p <period>" 4
-.IX Item "-p <period>"
-Period size [256]
-.IP "\-n <nfrags>" 4
-.IX Item "-n <nfrags>"
-Number of fragments [2]
-.IP "\-c <nchannels>" 4
-.IX Item "-c <nchannels>"
-Number of channels [2]
-.IP "\-Q <quality>" 4
-.IX Item "-Q <quality>"
-Resampling quality [48]
-.IP "\-O <latency>" 4
-.IX Item "-O <latency>"
-Latency adjustment[0]
-.IP "\-L" 4
-.IX Item "-L"
-Force 16\-bit and 2 channels [off]
-.IP "\-v" 4
-.IX Item "-v"
-Print tracing information [off]
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-\&\fBzita-ajbridge\fR is (C) 2006\-2011 Fons Adriaensen <fons@linuxaudio.org>
diff --git a/audio/zita-ajbridge/zita-ajbridge.SlackBuild b/audio/zita-ajbridge/zita-ajbridge.SlackBuild
index ae5c058b8f..e11398f6ed 100644
--- a/audio/zita-ajbridge/zita-ajbridge.SlackBuild
+++ b/audio/zita-ajbridge/zita-ajbridge.SlackBuild
@@ -6,8 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151105 bkw: updated for v0.6.0, which now has man pages, so
+# got rid of the ones I wrote.
+
 PRGNAM=zita-ajbridge
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,20 +56,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Makefile in 0.6.0 doesn't create these:
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+
 sed -i "s,-O2,$SLKCFLAGS," source/Makefile
-make -C source PREFIX=/usr DESTDIR=$PKG all install
+make -C source PREFIX=/usr MANDIR=/usr/man/man1 DESTDIR=$PKG all install
 strip $PKG/usr/bin/*
 
+# use symlinks instead of groff "so" mess
+for i in a2j j2a; do
+  rm -f $PKG/usr/man/man1/zita-$i.1.gz
+  ln -s $PRGNAM.1.gz $PKG/usr/man/man1/zita-$i.1.gz
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# man page written for this SlackBuild (from the -h text and README)
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-ln -s $PRGNAM.1.gz $PKG/usr/man/man1/zita-j2a.1.gz
-ln -s $PRGNAM.1.gz $PKG/usr/man/man1/zita-a2j.1.gz
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/audio/zita-ajbridge/zita-ajbridge.info b/audio/zita-ajbridge/zita-ajbridge.info
index a525a8a79b..667c79d91a 100644
--- a/audio/zita-ajbridge/zita-ajbridge.info
+++ b/audio/zita-ajbridge/zita-ajbridge.info
@@ -1,8 +1,8 @@
 PRGNAM="zita-ajbridge"
-VERSION="0.4.0"
+VERSION="0.6.0"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-0.4.0.tar.bz2"
-MD5SUM="9b834537b26063cc9ea6990cadeef62d"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-0.6.0.tar.bz2"
+MD5SUM="8fa90c91731c5b99f6a6eee95c8da38b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit zita-resampler zita-alsa-pcmi"
diff --git a/audio/zita-ajbridge/zita-ajbridge.pod b/audio/zita-ajbridge/zita-ajbridge.pod
deleted file mode 100644
index 08dc2b9c6d..0000000000
--- a/audio/zita-ajbridge/zita-ajbridge.pod
+++ /dev/null
@@ -1,83 +0,0 @@
-# pod source for zita-ajbridge man page
-# pod2man -s1 -r0.4.0 --stderr -nZITA-AJBRIDGE -cSlackBuilds.org < zita-ajbridge.pod > zita-ajbridge.1
-
-=pod
-
-=head1 NAME
-
-zita-a2j - use ALSA capture device as a JACK client, with resampling
-
-zita-j2a - use ALSA playback device as a JACK client, with resampling
-
-=head1 SYNOPSIS
-
-zita-a2j I<options>
-
-zita-j2a I<options>
-
-=head1 DESCRIPTION
-
-zita-ajbridge provides two applications, zita-a2j and zita-j2a.  They
-allow using an ALSA device as a Jack client, to provide additional
-capture (a2j) or playback (j2a) channels.  Functionally these are
-equivalent to the alsa_in and alsa_out clients that come with JACK,
-but they provide much better audio quality. The resampling ratio will
-typically be stable within 1 PPM and change only very smoothly. Delay
-will be stable as well even under worst case conditions, e.g. the JACK
-client running near the end of the cycle.
-
-=head1 OPTIONS
-
-Options for both executables are the same, except the default JACK client name.
-
-=over
-
-=item -h
-
-Display this text
-
-=item -j <jackname>
-
-Name as Jack client [zita-j2a or zita-a2j]
-
-=item -d <device>
-
-ALSA playback device [none]
-
-=item -r <rate>
-
-Sample rate [48000]
-
-=item -p <period>
-
-Period size [256]
-
-=item -n <nfrags>
-
-Number of fragments [2]
-
-=item -c <nchannels>
-
-Number of channels [2]
-
-=item -Q <quality>
-
-Resampling quality [48]
-
-=item -O <latency>
-
-Latency adjustment[0]
-
-=item -L
-
-Force 16-bit and 2 channels [off]
-
-=item -v
-
-Print tracing information [off]
-
-=back
-
-=head1 AUTHOR
-
-B<zita-ajbridge> is (C) 2006-2011 Fons Adriaensen <fons@linuxaudio.org>
diff --git a/business/openerp-client/openerp-client.info b/business/openerp-client/openerp-client.info
index 08f89b48ae..725d7e0e86 100644
--- a/business/openerp-client/openerp-client.info
+++ b/business/openerp-client/openerp-client.info
@@ -1,7 +1,7 @@
 PRGNAM="openerp-client"
 VERSION="5.0.4"
 HOMEPAGE="http://www.openerp.com"
-DOWNLOAD="http://nightly.openerp.com/old/openerp-5/openerp-client-5.0.4.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/openerp-client/openerp-client-5.0.4.tar.gz"
 MD5SUM="39657590a8d61f39cd8c55229e4643a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/business/openerp-server/openerp-server.info b/business/openerp-server/openerp-server.info
index b06478d6e8..50f2dc0dd9 100644
--- a/business/openerp-server/openerp-server.info
+++ b/business/openerp-server/openerp-server.info
@@ -1,7 +1,7 @@
 PRGNAM="openerp-server"
 VERSION="5.0.4"
 HOMEPAGE="http://www.openerp.com"
-DOWNLOAD="http://nightly.openerp.com/old/openerp-5/openerp-server-5.0.4.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/openerp-server/openerp-server-5.0.4.tar.gz"
 MD5SUM="043a19025943080207a9d6ca2e904d6f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/ComixCursors/ComixCursors.info b/desktop/ComixCursors/ComixCursors.info
index 396bd1dbe9..6bb30b213c 100644
--- a/desktop/ComixCursors/ComixCursors.info
+++ b/desktop/ComixCursors/ComixCursors.info
@@ -1,7 +1,7 @@
 PRGNAM="ComixCursors"
 VERSION="0.8.2"
-HOMEPAGE="http://gnome-look.org"
-DOWNLOAD="http://www.limitland.de/comixcursors/ComixCursors-0.8.2.tar.bz2"
+HOMEPAGE="http://www.limitland.de/comixcursors"
+DOWNLOAD="http://limitland.de/downloads/comixcursors/ComixCursors-0.8.2.tar.bz2"
 MD5SUM="e7ef34caa88918b1102551aaf34e45b6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/ComixCursors/slack-desc b/desktop/ComixCursors/slack-desc
index a59f5dcf9f..63e671c721 100644
--- a/desktop/ComixCursors/slack-desc
+++ b/desktop/ComixCursors/slack-desc
@@ -14,6 +14,6 @@ ComixCursors: The package comes with 12 different mouse themes for X11.
 ComixCursors: 6 colors (black, blue, green, orange, red and white)
 ComixCursors: 2 different weights (slim and normal)
 ComixCursors:
-ComixCursors: Homepage: http://gnome-look.org
+ComixCursors: Homepage: http://www.limitland.de/comixcursors
 ComixCursors:
 ComixCursors:
diff --git a/desktop/LX-Colors-themes/LX-Colors-themes.SlackBuild b/desktop/LX-Colors-themes/LX-Colors-themes.SlackBuild
new file mode 100644
index 0000000000..354817ecae
--- /dev/null
+++ b/desktop/LX-Colors-themes/LX-Colors-themes.SlackBuild
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Slackware build script for LX-Colors-themes.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=LX-Colors-themes
+VERSION=${VERSION:-20150908}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+THEME1="LX-Colors-by-color"
+THEME2="LX-Colors-by-style"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$THEME1.tar.bz2 -C $PRGNAM-$VERSION
+tar xvf $CWD/$THEME2.tar.bz2 -C $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+mkdir -p $PKG/usr/share/themes
+mv $THEME1/* $PKG/usr/share/themes
+mv $THEME2/* $PKG/usr/share/themes
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/LX-Colors-themes/LX-Colors-themes.info b/desktop/LX-Colors-themes/LX-Colors-themes.info
new file mode 100644
index 0000000000..d79ee56abb
--- /dev/null
+++ b/desktop/LX-Colors-themes/LX-Colors-themes.info
@@ -0,0 +1,12 @@
+PRGNAM="LX-Colors-themes"
+VERSION="20150908"
+HOMEPAGE="http://box-look.org/content/show.php/LX-Colors?content=171307"
+DOWNLOAD="https://copy.com/499YK3JYHbcxzNL3/LX-Colors-by-color.tar.bz2 \
+          https://copy.com/2I7HKHcfokaf0Rp8/LX-Colors-by-style.tar.bz2"
+MD5SUM="4f6f2f9124f7d346d5f9eab5727662c7 \
+        a750352fc79bc01bd3a2dc8ea8b58da9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/LX-Colors-themes/README b/desktop/LX-Colors-themes/README
new file mode 100644
index 0000000000..7bf4d095fb
--- /dev/null
+++ b/desktop/LX-Colors-themes/README
@@ -0,0 +1,32 @@
+LX-Colors-themes (GTK2/GTK3/Openbox themes)
+
+This is a series of GTK2/GTK3/Openbox themes not only in each of the 
+official seven Shiki-Colors color schemes, but there are also five 
+different styles available as well:
+
+ * Light: Kinda like Elementary (just use Elementary or something similar 
+as your Metacity/Unity/Cinnamon/etc. theme)
+
+ * Mixed: Like the light version, except with dark menus.
+
+ * NeoShiki: A GTK2/3 Shiki-Colors remake. For this style as well as the 
+two after it, I have also posted a link to the original Shiki-Colors 
+themes so that you can download the Metacity themes, which I have 
+designed these themes to seamlessly integrate with.
+
+ * Obsidian: Dark, but with a white base and black text for compatibility 
+with some websites, plus its also the basis for some of the other color 
+variations I have in mind that Ill be creating later.
+
+ * PitchDark: A true dark variation.
+
+In other words, there are 35 themes in all! Moreover, they are available 
+either sorted by color scheme or by style. The names will be reversed so 
+that they show up in order by your choice of color or style, but all the 
+contents are identical.
+
+As an added bonus, there are some other color variations I have in mind 
+with these themes, which will be periodically released on here, along 
+with matching GNOME-Colors-styled icon themes, so stay tuned!
+
+Optional dependencies: gtk-engines, murrine, gnome-colors.
diff --git a/desktop/LX-Colors-themes/doinst.sh b/desktop/LX-Colors-themes/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/desktop/LX-Colors-themes/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/LX-Colors-themes/slack-desc b/desktop/LX-Colors-themes/slack-desc
new file mode 100644
index 0000000000..dc5ed3ce51
--- /dev/null
+++ b/desktop/LX-Colors-themes/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+LX-Colors-themes: LX-Colors-themes (GTK2/GTK3/Openbox themes)
+LX-Colors-themes:
+LX-Colors-themes: This is a series of GTK2/GTK3/Openbox themes not only in each of the 
+LX-Colors-themes: official seven Shiki-Colors color schemes, but there are also five 
+LX-Colors-themes: different styles available as well.
+LX-Colors-themes:
+LX-Colors-themes: Home page: http://goo.gl/F2Y7jb
+LX-Colors-themes:
+LX-Colors-themes:
+LX-Colors-themes:
+LX-Colors-themes:
diff --git a/desktop/SDL2_ttf/SDL2_ttf.SlackBuild b/desktop/SDL2_ttf/SDL2_ttf.SlackBuild
deleted file mode 100644
index ff86901e39..0000000000
--- a/desktop/SDL2_ttf/SDL2_ttf.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_ttf
-
-# Copyright 2013 Dugan Chen Canada
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL2_ttf
-VERSION=${VERSION:-2.0.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a showfont.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/SDL2_ttf/SDL2_ttf.info b/desktop/SDL2_ttf/SDL2_ttf.info
deleted file mode 100644
index a284273da8..0000000000
--- a/desktop/SDL2_ttf/SDL2_ttf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_ttf"
-VERSION="2.0.12"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
-DOWNLOAD="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz"
-MD5SUM="79787216b56cb4707f39d538f2225e00"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/desktop/Window_Manager_Scripts/README b/desktop/Window_Manager_Scripts/README
new file mode 100644
index 0000000000..2e77170f0a
--- /dev/null
+++ b/desktop/Window_Manager_Scripts/README
@@ -0,0 +1,8 @@
+Window-Manager-Scripts is a series of window manager agnostic shell scripts. They're intended to be 
+lightweight, relying on few deps as possible and include a configuration file for easy customization.
+
+Optional requirements: cURL recompiled with OpenSSL support for SFTP image uploading, xclip to copy
+the uploaded image URL to clipboard, and xwinwrap if you want to use video backgrounds.
+
+Note: Copy the ".xyscripts" from the /usr/doc folder, place it in your home folder, and customize
+it your liking.
diff --git a/desktop/Window_Manager_Scripts/Window_Manager_Scripts.SlackBuild b/desktop/Window_Manager_Scripts/Window_Manager_Scripts.SlackBuild
new file mode 100644
index 0000000000..b60a7b46aa
--- /dev/null
+++ b/desktop/Window_Manager_Scripts/Window_Manager_Scripts.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for Window-Manager-Scripts
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Window_Manager_Scripts
+RPRGNAM=Window-Manager-Scripts # Real Program Name
+VERSION=${VERSION:-e8d3685da9e07a97823047a3c3685b298b968ec2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $RPRGNAM-$VERSION
+unzip $CWD/$RPRGNAM-$VERSION.zip || unzip $CWD/$VERSION.zip
+cd $RPRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Copy over shell scripts to bin
+mkdir -p $PKG/usr/bin
+cp -a batterylow importadvanced timer-xy videobackground $PKG/usr/bin/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.Credits README.md .xyscripts $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/Window_Manager_Scripts/Window_Manager_Scripts.info b/desktop/Window_Manager_Scripts/Window_Manager_Scripts.info
new file mode 100644
index 0000000000..0272529ea2
--- /dev/null
+++ b/desktop/Window_Manager_Scripts/Window_Manager_Scripts.info
@@ -0,0 +1,10 @@
+PRGNAM="Window_Manager_Scripts"
+VERSION="e8d3685da9e07a97823047a3c3685b298b968ec2"
+HOMEPAGE="https://github.com/Xylemon/Window-Manager-Scripts/"
+DOWNLOAD="https://github.com/Xylemon/Window-Manager-Scripts/archive/e8d3685da9e07a97823047a3c3685b298b968ec2.zip"
+MD5SUM="1ede760b516ad6d592fbe2d4c81dd483"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/Window_Manager_Scripts/slack-desc b/desktop/Window_Manager_Scripts/slack-desc
new file mode 100644
index 0000000000..0a09a2590f
--- /dev/null
+++ b/desktop/Window_Manager_Scripts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      		      |-----handy-ruler--------------------------------------------------------|
+Window_Manager_Scripts: Window_Manager_Scripts (WM Agnostic Shell Scripts)
+Window_Manager_Scripts:
+Window_Manager_Scripts: Window-Manager-Scripts is a series of window manager agnostic shell
+Window_Manager_Scripts: scripts. They're intended to be lightweight, relying on few deps as
+Window_Manager_Scripts: possible and include a configuration file for easy customization.
+Window_Manager_Scripts:
+Window_Manager_Scripts: Homepage: https://github.com/Xylemon/Window-Manager-Scripts/
+Window_Manager_Scripts:
+Window_Manager_Scripts:
+Window_Manager_Scripts:
+Window_Manager_Scripts:
diff --git a/desktop/anki/anki.SlackBuild b/desktop/anki/anki.SlackBuild
index 841c91521c..03792fcedf 100644
--- a/desktop/anki/anki.SlackBuild
+++ b/desktop/anki/anki.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Giuseppe Scalzi <giuseppe[at]osgate[dot]org>
 
 PRGNAM=anki
-VERSION=${VERSION:-2.0.32}
+VERSION=${VERSION:-2.0.33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH="noarch"
diff --git a/desktop/anki/anki.info b/desktop/anki/anki.info
index 90dca18fd0..174403bbe5 100644
--- a/desktop/anki/anki.info
+++ b/desktop/anki/anki.info
@@ -1,8 +1,8 @@
 PRGNAM="anki"
-VERSION="2.0.32"
+VERSION="2.0.33"
 HOMEPAGE="http://www.ankisrs.net/"
-DOWNLOAD="http://ankisrs.net/download/mirror/anki-2.0.32.tgz"
-MD5SUM="2186925ffa068017a30734e75b8a8ad7"
+DOWNLOAD="http://ankisrs.net/download/mirror/anki-2.0.33.tgz"
+MD5SUM="5df370dd19c71a76cdce448104824cf7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="BeautifulSoup SQLAlchemy matplotlib simplejson"
diff --git a/desktop/awemenugen/README b/desktop/awemenugen/README
new file mode 100644
index 0000000000..c312c94307
--- /dev/null
+++ b/desktop/awemenugen/README
@@ -0,0 +1,6 @@
+awemenugen (Awesome Menu Generator)
+
+This application generates a lua script containing a menu of all 
+applications installed on your system, thus manual adding of each 
+installed application in your rc.lua script is no longer required.
+Now, rc.lua simply includes a new generated script.
diff --git a/desktop/awemenugen/awemenugen.SlackBuild b/desktop/awemenugen/awemenugen.SlackBuild
new file mode 100644
index 0000000000..313547d358
--- /dev/null
+++ b/desktop/awemenugen/awemenugen.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# Slackware build script for awemenugen.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=awemenugen
+VERSION=${VERSION:-20120205}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mv $PRGNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/opt/awemenugen
+cp -a lib awemenugen.jar awemenugen.sh $PKG/opt/awemenugen
+chmod a+x $PKG/opt/awemenugen/awemenugen.sh
+
+mkdir -p $PKG/usr/bin
+
+(
+ln -s /opt/awemenugen/awemenugen.sh $PKG/usr/bin/awemenugen
+)
+
+# Remove SVN stuffs
+rm -rf $PKG/opt/awemenugen/lib/.svn/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/awemenugen/awemenugen.info b/desktop/awemenugen/awemenugen.info
new file mode 100644
index 0000000000..9b164c8d15
--- /dev/null
+++ b/desktop/awemenugen/awemenugen.info
@@ -0,0 +1,10 @@
+PRGNAM="awemenugen"
+VERSION="20120205"
+HOMEPAGE="http://sourceforge.net/projects/awemenugen/"
+DOWNLOAD="http://sourceforge.net/projects/awemenugen/files/awemenugen-20120205.tar.gz"
+MD5SUM="a07637224fb2da30575709b7b2c69d18"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jdk awesome"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/awemenugen/slack-desc b/desktop/awemenugen/slack-desc
new file mode 100644
index 0000000000..0305d4d842
--- /dev/null
+++ b/desktop/awemenugen/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+awemenugen: awemenugen (Awesome Menu Generator)
+awemenugen:
+awemenugen: This application generates a lua script containing a menu of all 
+awemenugen: applications installed on your system, thus manual adding of each 
+awemenugen: installed application in your rc.lua script is no longer required.
+awemenugen: Now, rc.lua simply includes a new generated script.
+awemenugen:
+awemenugen: Home page: http://sourceforge.net/projects/awemenugen/
+awemenugen:
+awemenugen:
+awemenugen:
diff --git a/desktop/awesome-extra/README b/desktop/awesome-extra/README
new file mode 100644
index 0000000000..9f889749ac
--- /dev/null
+++ b/desktop/awesome-extra/README
@@ -0,0 +1,16 @@
+awesome-extra (additional modules for the awesome window manager)
+
+awesome-extra is a additional modules for the awesome window manager.
+
+This package provide:
+
+ * wicked, a widget manager which can fill them with various system 
+   information (CPU or memory usage, network bandwidth, etc);
+ * shifty, an extension implementing dynamic tagging;
+ * obvious, a set of several widgets (WiFi link quality, battery 
+   usage, etc), superseding wicked;
+ * vicious, a widget manager;
+ * revelation, expose like functionality;
+ * bashets, use your shell scripts as content providers for widgets;
+ * flaw, object oriented library providing a thin abstraction layer
+   above awesome widgets.
diff --git a/desktop/awesome-extra/awesome-extra.SlackBuild b/desktop/awesome-extra/awesome-extra.SlackBuild
new file mode 100644
index 0000000000..d70ab9abb9
--- /dev/null
+++ b/desktop/awesome-extra/awesome-extra.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Slackware build script for awesome-extra.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=awesome-extra
+VERSION=${VERSION:-2012061101}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
+mv $PRGNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+EXTRAS="flaw obvious revelation shifty vicious bashets/bashets.lua wicked/wicked.lua"
+
+mkdir -p $PKG/usr/share/awesome/lib
+cp -a $EXTRAS $PKG/usr/share/awesome/lib/
+
+mkdir -p $PKG/usr/man/man7
+gzip -dc wicked/wicked.7.gz > $PKG/usr/man/man7/wicked.7
+cp -a flaw/flaw.7 $PKG/usr/man/man7/flaw.7
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCS="debian/awesome-extra.examples debian/changelog debian/copyright"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/awesome/lib/shifty/README.md $PKG/usr/doc/$PRGNAM-$VERSION/README-shifty
+mv $PKG/usr/share/awesome/lib/vicious/README $PKG/usr/doc/$PRGNAM-$VERSION/README-vicious
+mv $PKG/usr/share/awesome/lib/vicious/contrib/README $PKG/usr/doc/$PRGNAM-$VERSION/README-vicious-contrib
+mv $PKG/usr/share/awesome/lib/flaw/README $PKG/usr/doc/$PRGNAM-$VERSION/README-flaw
+mv $PKG/usr/share/awesome/lib/obvious/README $PKG/usr/doc/$PRGNAM-$VERSION/README-obvious
+mv $PKG/usr/share/awesome/lib/revelation/README.md $PKG/usr/doc/$PRGNAM-$VERSION/README-revelation
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/awesome-extra/awesome-extra.info b/desktop/awesome-extra/awesome-extra.info
new file mode 100644
index 0000000000..904d8b7f94
--- /dev/null
+++ b/desktop/awesome-extra/awesome-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="awesome-extra"
+VERSION="2012061101"
+HOMEPAGE="http://http.debian.net/debian/pool/main/a/awesome-extra/"
+DOWNLOAD="http://http.debian.net/debian/pool/main/a/awesome-extra/awesome-extra_2012061101.tar.gz"
+MD5SUM="2240cd03b5f04b8ae26b8cd445853ab9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="awesome"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/awesome-extra/slack-desc b/desktop/awesome-extra/slack-desc
new file mode 100644
index 0000000000..b69056508b
--- /dev/null
+++ b/desktop/awesome-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+awesome-extra: awesome-extra (additional modules for the awesome window manager)
+awesome-extra:
+awesome-extra: awesome-extra is a additional modules for the awesome window manager.
+awesome-extra:
+awesome-extra: awesome is a highly configurable, next generation framework window
+awesome-extra: manager for X. It is very fast, extensible and licensed under the
+awesome-extra: GNU GPLv2 license.
+awesome-extra:
+awesome-extra:
+awesome-extra:
+awesome-extra:
diff --git a/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild b/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild
index c87cc35402..87cd67f3c5 100644
--- a/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild
+++ b/desktop/awoken-icon-theme/awoken-icon-theme.SlackBuild
@@ -37,24 +37,24 @@ CWD=$(pwd)
 
 set -e
 
-rm -fr $TMP/$PRGNAM-$VERSION $PKG
-mkdir -p $TMP $PKG $OUTPUT $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
 unzip $CWD/$SRCNAM-$VERSION.zip
-chown -R root.root .
-find . -type f -exec chmod 644 {} \;
-find . -type d -exec chmod 755 {} \;
+cd $SRCNAM-$VERSION
 
 TARBALLS="AwOken AwOkenDark AwOkenWhite"
-ls
-ls
+
 for i in $TARBALLS; do
-  tar -xvf $SRCNAM-$VERSION/$i.tar.gz
+  tar -xvf $i.tar.gz
+  chown -R root.root $i
+  find $i -type f -exec chmod 644 {} \;
+  find $i -type d -exec chmod 755 {} \;
 done
 
 mkdir -p $PKG/usr/share/icons
-
-cp -a AwOken AwOkenDark AwOkenWhite $PKG/usr/share/icons
+cp -a $TARBALLS $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/icons/AwOken/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/catfish/catfish.SlackBuild b/desktop/catfish/catfish.SlackBuild
index 0365705239..7ba07e98a8 100644
--- a/desktop/catfish/catfish.SlackBuild
+++ b/desktop/catfish/catfish.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=catfish
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-0.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/catfish/catfish.info b/desktop/catfish/catfish.info
index 05cb6eb905..e130b6c03e 100644
--- a/desktop/catfish/catfish.info
+++ b/desktop/catfish/catfish.info
@@ -1,8 +1,8 @@
 PRGNAM="catfish"
-VERSION="1.2.2"
+VERSION="0.3.2"
 HOMEPAGE="http://www.twotoasts.de/index.php/catfish/"
-DOWNLOAD="https://launchpad.net/catfish-search/1.2/1.2.2/+download/catfish-1.2.2.tar.bz2"
-MD5SUM="df641d278151379f9224df4da69b45d9"
+DOWNLOAD="http://www.twotoasts.de/media/catfish/catfish-0.3.2.tar.gz"
+MD5SUM="b28db355094bfbe7de097678e91ce271"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyxdg pygobject3 pexpect"
diff --git a/desktop/cathexis-suite-themes/cathexis-suite-themes.SlackBuild b/desktop/cathexis-suite-themes/cathexis-suite-themes.SlackBuild
index 807aad35c0..aca9930d51 100644
--- a/desktop/cathexis-suite-themes/cathexis-suite-themes.SlackBuild
+++ b/desktop/cathexis-suite-themes/cathexis-suite-themes.SlackBuild
@@ -68,4 +68,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/cellwriter/cellwriter.SlackBuild b/desktop/cellwriter/cellwriter.SlackBuild
index 7eacb52cbd..2b15273010 100644
--- a/desktop/cellwriter/cellwriter.SlackBuild
+++ b/desktop/cellwriter/cellwriter.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/desktop/clearlooks-classic-themes/clearlooks-classic-themes.SlackBuild b/desktop/clearlooks-classic-themes/clearlooks-classic-themes.SlackBuild
index a4ad38f595..9a9a8b7edc 100644
--- a/desktop/clearlooks-classic-themes/clearlooks-classic-themes.SlackBuild
+++ b/desktop/clearlooks-classic-themes/clearlooks-classic-themes.SlackBuild
@@ -43,6 +43,7 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
+chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
diff --git a/desktop/clearlooks-phenix-theme/clearlooks-phenix-theme.SlackBuild b/desktop/clearlooks-phenix-theme/clearlooks-phenix-theme.SlackBuild
index ded44b776c..d03bacf49b 100644
--- a/desktop/clearlooks-phenix-theme/clearlooks-phenix-theme.SlackBuild
+++ b/desktop/clearlooks-phenix-theme/clearlooks-phenix-theme.SlackBuild
@@ -28,7 +28,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
-SRCNAM=clearlooks-phenix-$VERSION
+SRCNAM=clearlooks-phenix
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -40,9 +40,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/$VERSION.tar.gz
-cd $SRCNAM
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
diff --git a/desktop/compton-conf/README b/desktop/compton-conf/README
index b9713864c3..b7d211254d 100644
--- a/desktop/compton-conf/README
+++ b/desktop/compton-conf/README
@@ -1,3 +1,3 @@
-compton-conf (Qt configuration tool for X composite manager Compton.)
+compton-conf (Configuration Tool for Compton)
 
-compton-conf is a GUI configuration tool for compton X composite manager.
+Qt configuration tool for X composite manager Compton.
diff --git a/desktop/compton-conf/compton-conf.SlackBuild b/desktop/compton-conf/compton-conf.SlackBuild
index 683a1db309..fd8790938f 100644
--- a/desktop/compton-conf/compton-conf.SlackBuild
+++ b/desktop/compton-conf/compton-conf.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
-
+#
 # Slackware build script for compton-conf.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 
 PRGNAM="compton-conf"
 VERSION=${VERSION:-0.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-git-v${VERSION}-2013-10-21
-tar xvf $CWD/${VERSION}.tar.gz
-cd ${PRGNAM}-${VERSION}
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,7 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cmake -DCMAKE_INSTALL_PREFIX="/usr"
+cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
 make
 make install DESTDIR=$PKG
 
diff --git a/desktop/compton-conf/compton-conf.info b/desktop/compton-conf/compton-conf.info
index 8139349c50..5228661eee 100644
--- a/desktop/compton-conf/compton-conf.info
+++ b/desktop/compton-conf/compton-conf.info
@@ -1,6 +1,6 @@
 PRGNAM="compton-conf"
 VERSION="0.1.0"
-HOMEPAGE="https://github.com/chjj/compton"
+HOMEPAGE="https://github.com/lxde/compton-conf"
 DOWNLOAD="https://github.com/lxde/compton-conf/archive/0.1.0.tar.gz"
 MD5SUM="767ace41462d947f161d13edfee61f8b"
 DOWNLOAD_x86_64=""
diff --git a/desktop/compton-conf/slack-desc b/desktop/compton-conf/slack-desc
index 054f4b5781..5f8eea9370 100644
--- a/desktop/compton-conf/slack-desc
+++ b/desktop/compton-conf/slack-desc
@@ -8,8 +8,7 @@
             |-----handy-ruler------------------------------------------------------|
 compton-conf: compton-conf (Configuration Tool for Compton)
 compton-conf:
-compton-conf: compton-conf is a GUI configuration tool for compton X composite 
-compton-conf: manager.
+compton-conf: Qt configuration tool for X composite manager Compton.
 compton-conf:
 compton-conf: Home page: https://github.com/lxde/compton-conf
 compton-conf:
@@ -17,3 +16,4 @@ compton-conf:
 compton-conf:
 compton-conf:
 compton-conf:
+compton-conf:
diff --git a/desktop/conky-manager/conky-manager.info b/desktop/conky-manager/conky-manager.info
index f1a3d620c7..74fbb0c575 100644
--- a/desktop/conky-manager/conky-manager.info
+++ b/desktop/conky-manager/conky-manager.info
@@ -1,7 +1,7 @@
 PRGNAM="conky-manager"
 VERSION="2.3.3"
 HOMEPAGE="http://www.teejeetech.in/p/conky-manager.html"
-DOWNLOAD="https://launchpad.net/~teejee2008/+archive/ubuntu/ppa/+files/conky-manager_2.3.3~132~ubuntu15.04.1.tar.xz"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/conky-manager/conky-manager_2.3.3%7E132%7Eubuntu15.04.1.tar.xz"
 MD5SUM="967a5e8c5e2d7f872274d8b31a59c2f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/conky-manager/slack-desc b/desktop/conky-manager/slack-desc
index ef8df0ddf6..b8274ecee9 100644
--- a/desktop/conky-manager/slack-desc
+++ b/desktop/conky-manager/slack-desc
@@ -10,7 +10,7 @@ conky-manager: conky-manager (Conky front-end)
 conky-manager:
 conky-manager: Conky Manager is a graphical front-end for managing Conky config files
 conky-manager: It provides options to start/stop, browse and edit Conky themes
-conky-manaher: installed on the system. 
+conky-manager: installed on the system.
 conky-manager: Packages are currently available in Launchpad.
 conky-manager:
 conky-manager:
diff --git a/desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff
deleted file mode 100644
index b65edb6686..0000000000
--- a/desktop/dmenu/dmenu-4.5-libdir_cflags_fixups.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur dmenu-4.5-orig/config.mk dmenu-4.5/config.mk
---- dmenu-4.5-orig/config.mk	2012-01-08 07:18:43.000000000 -0500
-+++ dmenu-4.5/config.mk	2012-03-03 13:13:44.000000000 -0500
-@@ -4,6 +4,7 @@
- # paths
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
-+LIBDIR = /usr/local/lib
- 
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -14,12 +15,13 @@
- 
- # includes and libs
- INCS = -I${X11INC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
-+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS}
- 
- # flags
-+OPTS ?= -Os
- CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-+CFLAGS   = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
- LDFLAGS  = -s ${LIBS}
- 
- # compiler and linker
diff --git a/desktop/dmenu/dmenu-4.6-ReleaseNotes.txt b/desktop/dmenu/dmenu-4.6-ReleaseNotes.txt
new file mode 100644
index 0000000000..fb336373c8
--- /dev/null
+++ b/desktop/dmenu/dmenu-4.6-ReleaseNotes.txt
@@ -0,0 +1,71 @@
+From: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
+Date: Mon, 9 Nov 2015 00:50:44 +0100
+
+Hi suckless developers!,
+
+After a long time (dwm 4.5 was released on 2012-01-08) it is time for a new
+dmenu release. Thanks goes out to all the people involved at making the software
+better in various ways!
+
+Alot of things have changed, make sure to update your config.h and rebase the
+wiki patches you maintain on dmenu 4.6.
+
+The older wiki patches (specifically pre-4.5 and legacy) and
+functionality that was merged
+(xft) will be removed in a while (few weeks time).
+
+
+Download
+========
+
+dmenu-4.6: http://dl.suckless.org/tools/dmenu-4.6.tar.gz
+SHA1: 16297db470b370a16d532fba3cfd9743758ada80
+
+
+Release notes
+=============
+
+I tried to reconstruct the notes from the git log and give credit to
+the proper authors, there may be some mistakes.
+
+Features:
+  - Now uses Xft for font rendering by default with fallback-font
+support, this also allows anti-aliased fonts and such.
+    The font string matching will be different, check out
+http://www.freedesktop.org/software/fontconfig/fontconfig-user.html
+    for the font string syntax, huge thanks to Eric Pruitt and the
+other people who worked on the dmenu-xft patch (previously on the
+wiki).
+  - Uses a shared libdraw codebase (also used for dwm right now).
+  - Merged wiki patches:
+    - monarg: allow to specify monitor number to start on with -m (Martin Kühl).
+    - multisel: allow selecting multiple items (ctrl-enter) (Evan Gates).
+    - xft: see above.
+  - Accepted vi'is exit approach ^[ (Arkaduisz).
+  - Add ^G escape keybinding (Karl F).
+  - Separate config options to config.h (Alex Sedov).
+  - Support keybind C-S-[jm] (Connor Lane Smith).
+  - stest: get rid of getopt, use suckless arg.h (Hiltjo).
+  - stest: support inverse matching (flag -v) (Martin Kühl).
+
+Notable fixes:
+  - Buffer nul termination on tab (Alex Sedov's).
+  - Crash (pointer dereference) with ctrl-enter as input (Hiltjo).
+  - Ignore prompt if it is empty in addition to NULL (Moritz Wilhelmy).
+  - Incorrect ordering of match results (Davide Del Zompo).
+  - Input text matching (Quentin Rameau).
+  - Paste from clipboard (ctrl+shift+y) (Joshua Lloret).
+  - Replace deprecated usleep() with nanosleep() (Quentin Rameau).
+  - dmenu_run: Split cache logic to dmenu_path again (Quentin Glidic).
+  - multimon: always spawn client on first monitor if specified with
+-m 0 (Hiltjo).
+  - reset ControlMask for C-j and C-m (Hiltjo).
+
+Build improvements:
+  - config.mk: add $FREETYPELIBS and $FREETYPEINC, simpler to override
+(ports and *BSDs).
+  - config.mk: improve feature test check (k0ga, stateless).
+  - config.mk: use -std=c99 by default.
+
+Kind regards,
+Hiltjo Posthuma 
diff --git a/desktop/dmenu/dmenu-4.6-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.6-libdir_cflags_fixups.diff
new file mode 100644
index 0000000000..0690bee294
--- /dev/null
+++ b/desktop/dmenu/dmenu-4.6-libdir_cflags_fixups.diff
@@ -0,0 +1,26 @@
+diff -Naur dmenu-4.6-orig/config.mk dmenu-4.6/config.mk
+--- dmenu-4.6-orig/config.mk	2015-11-08 17:42:21.000000000 -0500
++++ dmenu-4.6/config.mk	2015-11-29 17:13:56.521190400 -0500
+@@ -4,6 +4,7 @@
+ # paths
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
++LIBDIR = /usr/local/lib
+ 
+ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+@@ -20,11 +21,12 @@
+ 
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+ 
+ # flags
++OPTS ?= -Os
+ CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
++CFLAGS   = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS}
+ LDFLAGS  = -s ${LIBS}
+ 
+ # compiler and linker
diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild
index 6817814c4e..ba19a0a2e8 100644
--- a/desktop/dmenu/dmenu.SlackBuild
+++ b/desktop/dmenu/dmenu.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by Phillip Warner for version >= 4.0
 
 PRGNAM=dmenu
-VERSION=4.5
+VERSION=${VERSION:-4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,13 +65,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fixup the CFLAGS and LIBDIR settings to prevent multilib conflicts
-patch -p1 < $CWD/dmenu-4.5-libdir_cflags_fixups.diff
+patch -p1 < $CWD/dmenu-4.6-libdir_cflags_fixups.diff
 
 make install \
   OPTS="$SLKCFLAGS" \
@@ -82,7 +82,7 @@ make install \
   X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \
   DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -91,6 +91,8 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Include important changes listed in the release notes in the mailing list group
+cat $CWD/${PRGNAM}-${VERSION}-ReleaseNotes.txt > $PKG/usr/doc/$PRGNAM-$VERSION/ReleaseNotes
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info
index 2102a9d543..48331ea081 100644
--- a/desktop/dmenu/dmenu.info
+++ b/desktop/dmenu/dmenu.info
@@ -1,8 +1,8 @@
 PRGNAM="dmenu"
-VERSION="4.5"
+VERSION="4.6"
 HOMEPAGE="http://tools.suckless.org/dmenu"
-DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.5.tar.gz"
-MD5SUM="9c46169ed703732ec52ed946c27d84b4"
+DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.6.tar.gz"
+MD5SUM="6fedf081133bc0725cb040b3b8ac3fac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/dwm/README b/desktop/dwm/README
index 2d265f98df..77a1a928c2 100644
--- a/desktop/dwm/README
+++ b/desktop/dwm/README
@@ -3,4 +3,9 @@ floating layouts. Either layout can be applied dynamically, optimizing
 the environment for the application in use and the task performed. It
 is the little brother of wmii.
 
+As of 6.1, `st` is the default terminal. This does not require
+installing `st`, only symlinking your favorite terminal to:
+
+  /usr/local/bin/st
+
 See README.CONFIG for more information.
diff --git a/desktop/dwm/README.CONFIG b/desktop/dwm/README.CONFIG
index bbd139540a..2114820081 100644
--- a/desktop/dwm/README.CONFIG
+++ b/desktop/dwm/README.CONFIG
@@ -49,20 +49,23 @@ tarball.
 
 Place any patches in the patches/ directory before starting the
 SlackBuild script. A sample patch is included that will change
-the default terminal from 'uxterm' to 'st'.
-This video shows how I created the patch:
+the default terminal from 'st' to 'uxterm'.
+This video shows one method of patch creation:
+
+https://asciinema.org/a/30752
+
+Here is an older video on patch creation:
 
 https://asciinema.org/a/7886
 
 Example:
 
-$ cd dwm-6.0
+$ cd dwm-6.1
 $ cp config.def.h config.h
 $ vi config.h
 [make customizations]
-$ diff -u config.h config.def.h >> ../patches/config.patch
+$ diff -u config.h config.def.h > ../patches/awesome_changes.patch
 $ cd ..
 $ sh dwm.SlackBuild
 
 
-
diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index ea2c5a2696..7173b901cf 100644
--- a/desktop/dwm/dwm.SlackBuild
+++ b/desktop/dwm/dwm.SlackBuild
@@ -1,8 +1,7 @@
 #!/bin/sh
-
 # Slackware build script for dwm
-
-# Copyright  2014 Ryan P.C. McQuen, WA, ryan.q@linux.com
+#
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 #
 # With permission of original maintainer Tom Canich.
 # All rights reserved.
@@ -34,8 +33,8 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dwm
-VERSION=${VERSION:-6.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -74,12 +73,18 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 mv config.def.h config.h
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 ### Per community request, this section has been restored
 ### for those that wish to include custom patches.
 ### A sample patch is included in the patches/ directory
-### that will change the default terminal from 'uxterm'
-### to 'st'. -Ryan
+### that will change the default terminal from 'st'
+### to 'uxterm'. -Ryan
 #
 #for i in $(ls $CWD/patches); do
 #  patch -p0 < $CWD/patches/$i
@@ -104,7 +109,7 @@ make install \
 mkdir -p $PKG/etc/X11/xinit
 install -m 0755 $CWD/xinitrc.dwm $PKG/etc/X11/xinit/xinitrc.dwm
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/desktop/dwm/dwm.info b/desktop/dwm/dwm.info
index f7160002b3..8967703ee7 100644
--- a/desktop/dwm/dwm.info
+++ b/desktop/dwm/dwm.info
@@ -1,8 +1,8 @@
 PRGNAM="dwm"
-VERSION="6.0"
+VERSION="6.1"
 HOMEPAGE="http://dwm.suckless.org"
-DOWNLOAD="http://dl.suckless.org/dwm/dwm-6.0.tar.gz"
-MD5SUM="8bb00d4142259beb11e13473b81c0857"
+DOWNLOAD="http://dl.suckless.org/dwm/dwm-6.1.tar.gz"
+MD5SUM="f0b6b1093b7207f89c2a90b848c008ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/dwm/patches/st.patch b/desktop/dwm/patches/st.patch
deleted file mode 100644
index c647a1009a..0000000000
--- a/desktop/dwm/patches/st.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h	2014-04-17 21:48:40.014970116 -0700
-+++ st.h	2014-04-17 21:48:55.490969058 -0700
-@@ -47,7 +47,7 @@
- 
- /* commands */
- static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
--static const char *termcmd[]  = { "uxterm", NULL };
-+static const char *termcmd[]  = { "st", NULL };
- 
- static Key keys[] = {
- 	/* modifier                     key        function        argument */
diff --git a/desktop/dwm/patches/use_uxterm_instead_of_st.patch b/desktop/dwm/patches/use_uxterm_instead_of_st.patch
new file mode 100644
index 0000000000..c45aa6b981
--- /dev/null
+++ b/desktop/dwm/patches/use_uxterm_instead_of_st.patch
@@ -0,0 +1,11 @@
+--- config.def.h	2015-11-08 14:39:37.000000000 -0800
++++ config.h	2015-11-27 09:35:45.456371304 -0800
+@@ -55,7 +55,7 @@
+ /* commands */
+ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+-static const char *termcmd[]  = { "st", NULL };
++static const char *termcmd[]  = { "uxterm", NULL };
+ 
+ static Key keys[] = {
+ 	/* modifier                     key        function        argument */
diff --git a/desktop/ede/ede.SlackBuild b/desktop/ede/ede.SlackBuild
index 3119fa2a51..8ea27d3c16 100644
--- a/desktop/ede/ede.SlackBuild
+++ b/desktop/ede/ede.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=ede
 VERSION=${VERSION:-2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -86,9 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-largefile=yes \
   --build=$ARCH-slackware-linux
 
-jam
+jam || true
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-jam -sDESTDIR=$PKG -sEDE_DOC_DIR=/usr/doc/${PRGNAM}-${VERSION} install
+jam -sDESTDIR=$PKG -sEDE_DOC_DIR=/usr/doc/${PRGNAM}-${VERSION} install || true
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/desktop/elementary-xfce/elementary-xfce.SlackBuild b/desktop/elementary-xfce/elementary-xfce.SlackBuild
index b6d7c9db30..0051e73a23 100644
--- a/desktop/elementary-xfce/elementary-xfce.SlackBuild
+++ b/desktop/elementary-xfce/elementary-xfce.SlackBuild
@@ -41,7 +41,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild
index bc3bf1f3ad..b58d2cf874 100644
--- a/desktop/enlightenment/enlightenment.SlackBuild
+++ b/desktop/enlightenment/enlightenment.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/desktop/faba-icon-theme/README b/desktop/faba-icon-theme/README
index 5cd2b4dca2..653477192f 100644
--- a/desktop/faba-icon-theme/README
+++ b/desktop/faba-icon-theme/README
@@ -1,5 +1,7 @@
-Faba icon theme for GNOME, XFCE and other DEs|WMs GTK+.
+faba-icon-theme (gnome icon theme)
 
-Faba is a Linux desktop icon theme. It has designed with simplicity and compliance to standards in mind.
+Faba is a sexy and modern icon theme with Tango influences.
+It has designed with simplicity and compliance to standards in mind.
 Faba's purpose is serve as a base icon theme to others (such as Moka Icon Theme).
+
 It comprises only of a system icons –folders, mimetypes, toolbar icons, etc.
diff --git a/desktop/faba-icon-theme/faba-icon-theme.SlackBuild b/desktop/faba-icon-theme/faba-icon-theme.SlackBuild
index 38a7a8e7bf..24a8438fb0 100644
--- a/desktop/faba-icon-theme/faba-icon-theme.SlackBuild
+++ b/desktop/faba-icon-theme/faba-icon-theme.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="faba-icon-theme"
-VERSION=${VERSION:-4.0}
+VERSION=${VERSION:-4.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,11 +36,13 @@ CWD=$(pwd)
 
 set -e
 
+SRCVER="v4.0.8"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
@@ -48,8 +50,7 @@ mkdir -p $PKG/usr/share/icons
 cp -a Faba $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING INSTALL LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-
+cp AUTHORS COPYING INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/faba-icon-theme/faba-icon-theme.info b/desktop/faba-icon-theme/faba-icon-theme.info
index 386f19cb95..3406f4da75 100644
--- a/desktop/faba-icon-theme/faba-icon-theme.info
+++ b/desktop/faba-icon-theme/faba-icon-theme.info
@@ -1,8 +1,8 @@
 PRGNAM="faba-icon-theme"
-VERSION="4.0"
-HOMEPAGE="http://snwh.org/moka/"
-DOWNLOAD="https://raw.githubusercontent.com/moka-project/faba-icon-theme/master/faba-icon-theme-4.0.tar.gz"
-MD5SUM="f80b2c355deecf5577576c768bb664ff"
+VERSION="4.0.8"
+HOMEPAGE="https://github.com/moka-project/faba-icon-theme/"
+DOWNLOAD="https://github.com/moka-project/faba-icon-theme/archive/v4.0.8.tar.gz"
+MD5SUM="0d585fc5001079e232a12c555bf57871"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/faba-icon-theme/slack-desc b/desktop/faba-icon-theme/slack-desc
index b2bd76c69c..d97b2f3ca8 100644
--- a/desktop/faba-icon-theme/slack-desc
+++ b/desktop/faba-icon-theme/slack-desc
@@ -8,12 +8,12 @@
                |-----handy-ruler------------------------------------------------------|
 faba-icon-theme: faba-icon-theme (gnome icon theme)
 faba-icon-theme:
-faba-icon-theme: Faba is a Linux desktop icon theme. It has designed with simplicity
-faba-icon-theme: and compliance to standards in mind. Faba's purpose is serve as a
-faba-icon-theme: base icon theme to others (such as Moka Icon Theme). It comprises
-faba-icon-theme: only of a system icons –folders, mimetypes, toolbar icons, etc.
-faba-icon-theme:
-faba-icon-theme: Home Page: http://snwh.org/moka/
+faba-icon-theme: Faba is a sexy and modern icon theme with Tango influences. It has
+faba-icon-theme: designed with simplicity and compliance to standards in mind. Faba's
+faba-icon-theme: purpose is serve as a base icon theme to others (such as Moka Icon
+faba-icon-theme: Theme). It comprises only of a system icons –folders, mimetypes,
+faba-icon-theme: toolbar icons, etc.
 faba-icon-theme:
+faba-icon-theme: Home Page: https://github.com/moka-project/faba-icon-theme/
 faba-icon-theme:
 faba-icon-theme:
diff --git a/desktop/faba-mono-icons/README b/desktop/faba-mono-icons/README
index 5e59a9b5e0..e7f4657b75 100644
--- a/desktop/faba-mono-icons/README
+++ b/desktop/faba-mono-icons/README
@@ -1,4 +1,8 @@
-Faba Mono Icons for GNOME, XFCE and other DEs|WMs GTK+.
+faba-mono-icons (gnome icon theme)
+
+Faba Mono Icons is a stylised tray icons for the Faba icon theme.
 
 Faba Mono Icons is a supplementary theme to Faba Icon Theme.
 It consists only of monochrome panel icons.
+
+Faba Mono Icons are distributed under the terms of the GNU GPL v.3
diff --git a/desktop/faba-mono-icons/faba-mono-icons.SlackBuild b/desktop/faba-mono-icons/faba-mono-icons.SlackBuild
index 44f0d75ffd..897c9ec200 100644
--- a/desktop/faba-mono-icons/faba-mono-icons.SlackBuild
+++ b/desktop/faba-mono-icons/faba-mono-icons.SlackBuild
@@ -49,7 +49,6 @@ cp -a Faba-Mono Faba-Mono-Dark $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp AUTHORS INSTALL LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/faba-mono-icons/faba-mono-icons.info b/desktop/faba-mono-icons/faba-mono-icons.info
index fb6b3f9bef..425693afc4 100644
--- a/desktop/faba-mono-icons/faba-mono-icons.info
+++ b/desktop/faba-mono-icons/faba-mono-icons.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://raw.githubusercontent.com/moka-project/faba-mono-icons/master/
 MD5SUM="f779b7ed8449afee7248b2e217538775"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="faba-icon-theme"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/faba-mono-icons/slack-desc b/desktop/faba-mono-icons/slack-desc
index 0d7371fc1f..0acae4ebbd 100644
--- a/desktop/faba-mono-icons/slack-desc
+++ b/desktop/faba-mono-icons/slack-desc
@@ -8,12 +8,12 @@
                |-----handy-ruler------------------------------------------------------|
 faba-mono-icons: faba-mono-icons (gnome icon theme)
 faba-mono-icons:
-faba-mono-icons: Faba mono icon theme for Slackware.
+faba-mono-icons: Faba Mono Icons is a stylised tray icons for the Faba icon theme.
 faba-mono-icons:
 faba-mono-icons: Faba Mono Icons is a supplementary theme to Faba Icon Theme.
 faba-mono-icons: It consists only of monochrome panel icons.
 faba-mono-icons:
-faba-mono-icons: Home Page: https://github.com/moka-project/faba-mono-icons
+faba-mono-icons: Home page: https://github.com/moka-project/faba-mono-icons
 faba-mono-icons:
 faba-mono-icons:
 faba-mono-icons:
diff --git a/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild b/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild
index 3a95c9dc98..114991a7f3 100644
--- a/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild
+++ b/desktop/faenza-icon-theme/faenza-icon-theme.SlackBuild
@@ -47,16 +47,16 @@ rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT $TMP/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION
 unzip $CWD/$PRGNAM\_$VERSION.zip
-chown -R root.root .
-find . -type f -exec chmod 644 {} \;
-find . -type d -exec chmod 755 {} \;
-
 TARBALLS="Faenza-Ambiance Faenza-Dark Faenza-Darker Faenza-Darkest Faenza-Radiance Faenza"
 
 for i in $TARBALLS; do
   tar -xvf $i.tar.gz
 done
 
+chown -R root:root .
+find . -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} \;
+
 mkdir -p $PKG/usr/share/icons
 
 cp -a Faenza \
diff --git a/desktop/faience-icon-theme/faience-icon-theme.SlackBuild b/desktop/faience-icon-theme/faience-icon-theme.SlackBuild
index 689a3a0f2d..c0b0ed2191 100644
--- a/desktop/faience-icon-theme/faience-icon-theme.SlackBuild
+++ b/desktop/faience-icon-theme/faience-icon-theme.SlackBuild
@@ -40,15 +40,15 @@ rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT $TMP/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION
 unzip $CWD/$PRGNAM\_$VERSION.zip
-chown -R root.root .
-find . -type f -exec chmod 644 {} \;
-find . -type d -exec chmod 755 {} \;
 
 TARBALLS="Faience Faience-Azur Faience-Ocre Faience-Claire"
-
 for i in $TARBALLS; do
   tar -xvf $i.tar.gz
 done
+chown -R root.root .
+find . -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} \;
+
 
 mkdir -p $PKG/usr/share/icons
 
diff --git a/desktop/fbmenugen/fbmenugen.SlackBuild b/desktop/fbmenugen/fbmenugen.SlackBuild
index ffdd3c653e..a8b9ffdd72 100644
--- a/desktop/fbmenugen/fbmenugen.SlackBuild
+++ b/desktop/fbmenugen/fbmenugen.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/fvwm-crystal/README b/desktop/fvwm-crystal/README
index 8a6dfc18c3..4966700be4 100644
--- a/desktop/fvwm-crystal/README
+++ b/desktop/fvwm-crystal/README
@@ -7,3 +7,5 @@ xterm, aterm, mrxvt or urxvt as terminal emulators, MPD, QuodLibet or XMMS as
 music players (there's built-in support for controlling these programs), and
 several other tools for different functions, like setting a wallpaper or making
 screenshots.
+
+Optional dependencies: rox-filer, feh, gdm, stalonetray
diff --git a/desktop/fvwm-crystal/fvwm-crystal.SlackBuild b/desktop/fvwm-crystal/fvwm-crystal.SlackBuild
index f1a2dd27cf..551d8790f7 100644
--- a/desktop/fvwm-crystal/fvwm-crystal.SlackBuild
+++ b/desktop/fvwm-crystal/fvwm-crystal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fvwm-crystal
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fvwm-crystal
-VERSION=${VERSION:-3.3.2}
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/fvwm-crystal/fvwm-crystal.info b/desktop/fvwm-crystal/fvwm-crystal.info
index 884ac1d54a..6a8fae6e5f 100644
--- a/desktop/fvwm-crystal/fvwm-crystal.info
+++ b/desktop/fvwm-crystal/fvwm-crystal.info
@@ -1,10 +1,10 @@
 PRGNAM="fvwm-crystal"
-VERSION="3.3.2"
+VERSION="3.4.1"
 HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/fvwm-crystal/files/3.3.2/fvwm-crystal-3.3.2.tar.gz"
-MD5SUM="2bc2f62d9f2f44736d02fef27449ddec"
+DOWNLOAD="http://sourceforge.net/projects/fvwm-crystal/files/3.4.1/fvwm-crystal-3.4.1.tar.gz"
+MD5SUM="a6a48ff102b3e5a6dfdd6e7a06aee56b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="rox-filer feh gdm stalonetray"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/desktop/gmusicbrowser-art/README b/desktop/gmusicbrowser-art/README
new file mode 100644
index 0000000000..c85fc40eb7
--- /dev/null
+++ b/desktop/gmusicbrowser-art/README
@@ -0,0 +1,3 @@
+gmusicbrowser-art (Additional layouts, icons, etc. for gmusicbrowser)
+
+Additional layouts, icons, etc. for gmusicbrowser.
diff --git a/desktop/gmusicbrowser-art/doinst.sh b/desktop/gmusicbrowser-art/doinst.sh
new file mode 100644
index 0000000000..ba65467f24
--- /dev/null
+++ b/desktop/gmusicbrowser-art/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/gmusicbrowser-art/gmusicbrowser-art.SlackBuild b/desktop/gmusicbrowser-art/gmusicbrowser-art.SlackBuild
new file mode 100644
index 0000000000..a363709689
--- /dev/null
+++ b/desktop/gmusicbrowser-art/gmusicbrowser-art.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Slackware build script for gmusicbrowser-art.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="gmusicbrowser-art"
+VERSION=${VERSION:-0.2.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCVER="0.2.2-0~191~ubuntu15.10.1"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$SRCVER.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+make install DESTDIR=$PKG
+
+DOCS="debian/changelog AUTHORS COPYING README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/gmusicbrowser-art/gmusicbrowser-art.info b/desktop/gmusicbrowser-art/gmusicbrowser-art.info
new file mode 100644
index 0000000000..a0568bce22
--- /dev/null
+++ b/desktop/gmusicbrowser-art/gmusicbrowser-art.info
@@ -0,0 +1,10 @@
+PRGNAM="gmusicbrowser-art"
+VERSION="0.2.2"
+HOMEPAGE="https://launchpad.net/~andreas-boettger/+archive/gmusicbrowser-art"
+DOWNLOAD="https://launchpad.net/~andreas-boettger/+archive/ubuntu/gmusicbrowser-art/+files/gmusicbrowser-art_0.2.2-0~191~ubuntu15.10.1.tar.gz"
+MD5SUM="9fcf6bf5c68f8f3f3d30d45600b3ae80"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gmusicbrowser"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/gmusicbrowser-art/slack-desc b/desktop/gmusicbrowser-art/slack-desc
new file mode 100644
index 0000000000..b7fda2a0aa
--- /dev/null
+++ b/desktop/gmusicbrowser-art/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+gmusicbrowser-art: gmusicbrowser-art (Additional layouts, icons, etc. for gmusicbrowser)
+gmusicbrowser-art:
+gmusicbrowser-art: Additional layouts, icons, etc. for gmusicbrowser.
+gmusicbrowser-art:
+gmusicbrowser-art:
+gmusicbrowser-art:
+gmusicbrowser-art:
+gmusicbrowser-art:
+gmusicbrowser-art:
+gmusicbrowser-art:
+gmusicbrowser-art:
diff --git a/desktop/gxkb/gxkb.SlackBuild b/desktop/gxkb/gxkb.SlackBuild
index 23b64c7306..4d51cd043e 100644
--- a/desktop/gxkb/gxkb.SlackBuild
+++ b/desktop/gxkb/gxkb.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gxkb
 
-# Copyright 2015 NK <nk-man@yandex.ru>
+# Copyright 2015 NK
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gxkb
-VERSION=${VERSION:-0.7.5}
+VERSION=${VERSION:-0.7.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,11 +90,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-install -Dm 644 ./debian/gxkb.desktop $PKG/usr/share/applications/gxkb.desktop
-install -Dm 644 ./debian/gxkb.xpm $PKG/usr/share/pixmaps/gxkb.xpm
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING CREDITS NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/AUTHORS doc/COPYING doc/CREDITS doc/NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/gxkb/gxkb.info b/desktop/gxkb/gxkb.info
index 22e693ad15..6aa4d57e3c 100644
--- a/desktop/gxkb/gxkb.info
+++ b/desktop/gxkb/gxkb.info
@@ -1,8 +1,8 @@
 PRGNAM="gxkb"
-VERSION="0.7.5"
+VERSION="0.7.6"
 HOMEPAGE="http://sourceforge.net/projects/gxkb/"
-DOWNLOAD="http://downloads.sourceforge.net/project/gxkb/gxkb-0.7.5.tar.gz"
-MD5SUM="d8b56e1b99411a89e42511498aeae226"
+DOWNLOAD="http://downloads.sourceforge.net/project/gxkb/gxkb-0.7.6.tar.gz"
+MD5SUM="abf89d159d2f4856e018c845fffef142"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/icewm/icewm-xdg-menu b/desktop/icewm/icewm-xdg-menu
deleted file mode 100644
index 529f9e2ab3..0000000000
--- a/desktop/icewm/icewm-xdg-menu
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/python2
-"""
-This script generates FreeDesktop application menu for IceWM window manager.
-
-Written by Konstantin Korikov <lostclus@ua.fm>, put in the public domain
-
-Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
-
-USAGE EXAMPLE
-
-Add to $HOME/.icewm/menu this line:
-
-	menuprog Applications - icewm-xdg-menu
-
-and restart IceWM.
-"""
-
-import sys
-import locale
-import getopt
-import re
-import xdg.Menu
-import xdg.DesktopEntry
-import xdg.IconTheme
-import xdg.Config
-
-version = "0.3"
-
-def print_usage(exit_code = 1):
-  print """Usage: %s [options]
-Options:
-  --locale=locale               set output languege and encoding
-  --root-folder folder          folder to generate (for example: /Games)
-  --terminal command            set terminal emulator command (default: xterm -e %%s)
-  --default-folder-icon icon    icon for folders that not provide Icon option
-  --default-entry-icon icon     icon for entries that not provide Icon option
-  --with-theme-paths            convert icon base names to icon absolute paths
-                                using icon theme
-  --entire-menu                 print entire menu
-  --icon-size                   set default icon size
-  --theme theme                 set icon theme
-  --help                        print this help and exit
-  --version                     print version and exit
-""" % sys.argv[0]
-  sys.exit(exit_code)
-  
-def print_version():
-  print "%s version %s" % (
-    os.path.basename(sys.argv[0]), version)
-  sys.exit(0)
-
-root_folder = ""
-terminal = "xterm -e %s"
-default_folder_icon = "folder"
-default_entry_icon = "-"
-entire_menu = False
-with_theme_paths = False
-icon_size = 16
-
-exec_clean1_re = re.compile(r'%[a-zA-Z]')
-exec_clean2_re = re.compile(r'%%')
-encoding = None
-locale_str = None
-
-def find_icon(entry):
-  icon = entry.getIcon()
-  if icon and with_theme_paths:
-    icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon
-  return icon
-
-def process_menu(menu):
-  for entry in menu.getEntries():
-    if isinstance(entry, xdg.Menu.Menu):
-      name = entry.getName() or entry.DesktopFileID
-      icon = find_icon(entry) or default_folder_icon
-
-      if entire_menu:
-        print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
-        process_menu(entry)
-        print "}".encode(encoding)
-      else:
-        print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) +
-            (" --root-folder \"%s\"" % entry.getPath(org=True)) +
-            (" --terminal \"%s\"" % terminal) +
-            (" --default-folder-icon \"%s\"" % default_folder_icon) +
-            (" --default-entry-icon \"%s\"" % default_entry_icon) +
-            (" --theme \"%s\"" % xdg.Config.icon_theme) +
-            (" --icon-size \"%d\"" % icon_size) +
-            (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
-        if locale_str:
-          print (" --locale \"%s\"" % locale_str).encode(encoding),
-        print
-    elif isinstance(entry, xdg.Menu.MenuEntry):
-      de = entry.DesktopEntry
-      name = de.getName() or entry.DesktopFileID
-      icon = find_icon(de) or default_entry_icon
-      execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
-      if de.getTerminal(): execute = terminal % execute      
-      print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
-
-try: opts, args = getopt.getopt(sys.argv[1:], "", 
-  ("help", "version", "locale=",
-   "root-folder=", "terminal=", "default-folder-icon=", 
-   "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths",
-   "icon-size="))
-except getopt.GetoptError: print_usage()
-
-locale.setlocale(locale.LC_ALL, "")
-
-for o, v in opts:
-  if o == "--locale":
-    locale_str = v
-    locale.setlocale(locale.LC_ALL, locale_str)
-  if o == "--root-folder": root_folder = v
-  elif o == "--terminal": terminal = v
-  elif o == "--default-folder-icon": default_folder_icon = v
-  elif o == "--default-entry-icon": default_entry_icon = v
-  elif o == "--entire-menu" : entire_menu = True
-  elif o == "--with-theme-paths" : with_theme_paths = True
-  elif o == "--icon-size": icon_size = int(v)
-  elif o == "--theme" : xdg.Config.setIconTheme(v)
-  elif o in ("-h", "-?", "--help"): print_usage(0)
-  elif o in ("-v", "--version"): print_version()
-
-encoding = locale.getlocale()[1] or 'UTF-8'
-menu = xdg.Menu.parse()
-if root_folder: menu = menu.getMenu(root_folder)
-process_menu(menu)
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index 63de462721..72b3d9a899 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icewm
 
-# Copyright 2006-2014  Robby Workman  Northport, Alabama, USA
+# Copyright 2006-2015  Robby Workman  Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icewm
-VERSION=${VERSION:-1.3.7}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.12}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,32 +69,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Explicitly link fontconfig
-patch -p1 < $CWD/patches/explicitly-link-fontconfig.diff
-
 # Since we put the html files in $docdir/html/, let's fix the integrated help:
-patch -p1 < $CWD/patches/icewm-1.3.x-fix_html_docdir.diff
-
-# Fix thermal information handling (Gentoo Bug #452730 by Dag Bakke)
-patch -p1 < $CWD/patches/icewm-1.3.7-thermal.patch
-
-# Fix icon size in menu (thanks to Fedora via Gentoo, iiuc)
-patch -p1 < $CWD/patches/icewm-1.3.7-menuiconsize.patch
+patch -p1 < $CWD/patches/icewm-1.3.x-fix_htmldir.diff
 
-# Set some sane keyboard shortcut defaults (thanks, Fedora)
+# Set some sane keyboard shortcut defaults
 patch -p1 < $CWD/patches/icewm-keys.patch
 
-# /proc/acpi is deprecated and may not be present
-patch -p1 < $CWD/patches/no_proc_acpi.patch
-
-# Allow use of deprecated functions without causing build failure
-patch -p1 < $CWD/patches/use_ICEWM_deprecated.patch
-
-# Unknown origin of these patches ; forwarded by a user
-patch -p0 < $CWD/patches/acpustatus_read_cpuinfo_cur_freq.patch
-patch -p1 < $CWD/patches/aapm_power.patch
-patch -p1 < $CWD/patches/wmclient.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -104,20 +84,19 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --with-cfgdir=/etc/$PRGNAM \
-  --docdir=/usr/doc \
-  --with-docdir=/usr/doc \
+  --with-libdir=/usr/share/$PRGNAM \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-corefonts \
+  --enable-guievents \
   --build=$ARCH-slackware-linux
 
-make VERBOSE=1
-make install DESTDIR=$PKG
+make htmldir=/usr/doc/$PRGNAM-$VERSION/html VERBOSE=1
+make install htmldir=/usr/doc/$PRGNAM-$VERSION/html DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Add man page
-mkdir -p $PKG/usr/man/man1
-gzip -9c doc/icewm.1.man > $PKG/usr/man/man1/icewm.1.gz
+gzip -9 $PKG/usr/man/man1/*.1
 
 # Add xinitrc for xwmconfig(1)
 mkdir -p $PKG/etc/X11/xinit
@@ -130,12 +109,10 @@ cat $CWD/icewm.desktop > $PKG/usr/share/xsessions/icewm.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a \
-  AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README* TODO VERSION \
+  AUTHORS COMPLIANCE COPYING ChangeLog INSTALL* NEWS README THANKS TODO VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
-# Add a menu generator for xdg menus to docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/contrib
-cat $CWD/icewm-xdg-menu > $PKG/usr/doc/$PRGNAM-$VERSION/contrib/icewm-xdg-menu
+mv $PKG/usr/doc/$PRGNAM-$VERSION/*.html $PKG/usr/doc/$PRGNAM-$VERSION/*.sgml \
+   $PKG/usr/doc/$PRGNAM-$VERSION/html/
 cat $CWD/icewm.SlackBuild > $PKG/usr/doc/icewm-$VERSION/icewm.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info
index 07975726a1..ac849519be 100644
--- a/desktop/icewm/icewm.info
+++ b/desktop/icewm/icewm.info
@@ -1,8 +1,8 @@
 PRGNAM="icewm"
-VERSION="1.3.7"
-HOMEPAGE="http://icewm.org"
-DOWNLOAD="http://downloads.sourceforge.net/icewm/icewm-1.3.7.tar.gz"
-MD5SUM="224695231aedb2b91db3254a13e1c8dd"
+VERSION="1.3.12"
+HOMEPAGE="https://github.com/bbidulock/icewm"
+DOWNLOAD="https://github.com/bbidulock/icewm/releases/download/1.3.12/icewm-1.3.12.tar.bz2"
+MD5SUM="3e3b8904d53998c0f46414722d86457c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/icewm/patches/aapm_power.patch b/desktop/icewm/patches/aapm_power.patch
deleted file mode 100644
index 292cdf4b8f..0000000000
--- a/desktop/icewm/patches/aapm_power.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- b/icewm-1.3.7/src/aapm.cc	2010-10-31 17:09:36.000000000 +0300
-+++ icewm-1.3.7/src/aapm.cc	2013-06-02 14:24:04.778299294 +0400
-@@ -614,6 +614,10 @@
-         }
-         strcat3(buf, "/sys/class/power_supply/", BATname, "/current_now", sizeof(buf));
-         fd = fopen(buf, "r");
-+        if (fd == NULL) {
-+            strcat3(buf, "/sys/class/power_supply/", BATname, "/power_now", sizeof(buf));
-+            fd = fopen(buf, "r");
-+	}
-         if (fd != NULL && fgets(buf, sizeof(buf), fd)) {
-                 //In case it contains non-numeric value
-                 if (sscanf(buf,"%d", &BATrate) <= 0) {
-@@ -706,7 +710,7 @@
-             //did we parse the needed values successfully?
-             BATcapacity_full >= 0 && BATcapacity_remain >= 0 && BATrate > 0) {
-             BATtime_remain = (int) (60 * (double)(BATcapacity_remain) / BATrate);
--            sprintf(bat_info, "%d:%02d", BATtime_remain / 60, BATtime_remain % 60);
-+            sprintf(bat_info, "%d:%02d %.1fW", BATtime_remain / 60, BATtime_remain % 60, (double) BATrate / 1000000);
-         }
-         else if (BATpresent == BAT_PRESENT &&
-                  //did we parse the needed values successfully?
-@@ -1075,7 +1079,7 @@
-         if ((mode == ACPI || mode == SYSFS) && acpiBatteries[i]->present == BAT_ABSENT)
-             continue;
-         if (taskBarShowApmTime)
--            strcat(buf, "0:00");
-+            strcat(buf, "0:00 0.0W");
-         else
-             strcat(buf, "100%");
-         strcat(buf, "C");
diff --git a/desktop/icewm/patches/acpustatus_read_cpuinfo_cur_freq.patch b/desktop/icewm/patches/acpustatus_read_cpuinfo_cur_freq.patch
deleted file mode 100644
index 580a64d58f..0000000000
--- a/desktop/icewm/patches/acpustatus_read_cpuinfo_cur_freq.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/acpustatus.cc.orig	2010-10-31 17:09:36.000000000 +0300
-+++ src/acpustatus.cc	2013-08-26 00:38:16.868170497 +0400
-@@ -323,7 +323,7 @@
-     int fd;
-     float cpufreq = 0;
- 
--    sprintf(namebuf, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", cpu);
-+    sprintf(namebuf, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", cpu);
-     fd = open(namebuf, O_RDONLY);
-     if (fd != -1) {
-         int len = read(fd, buf, sizeof(buf) - 1);
diff --git a/desktop/icewm/patches/explicitly-link-fontconfig.diff b/desktop/icewm/patches/explicitly-link-fontconfig.diff
deleted file mode 100644
index 36dab59d32..0000000000
--- a/desktop/icewm/patches/explicitly-link-fontconfig.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur icewm-1.3.7.orig/src/Makefile.in icewm-1.3.7/src/Makefile.in
---- icewm-1.3.7.orig/src/Makefile.in	2010-10-31 09:09:36.000000000 -0500
-+++ icewm-1.3.7/src/Makefile.in	2012-05-11 10:29:55.356344991 -0500
-@@ -37,7 +37,7 @@
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
- LFLAGS =	@LDFLAGS@ 
--LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
-+LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 fontconfig --libs` 
- 
- CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
- IMAGE_LIBS =    @IMAGE_LIBS@
diff --git a/desktop/icewm/patches/icewm-1.3.7-menuiconsize.patch b/desktop/icewm/patches/icewm-1.3.7-menuiconsize.patch
deleted file mode 100644
index d051d5bc5f..0000000000
--- a/desktop/icewm/patches/icewm-1.3.7-menuiconsize.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
---- icewm-1.3.7.bak/src/yicon.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yicon.cc	2011-11-07 19:41:52.841910531 +0100
-@@ -270,6 +270,10 @@
-         iconCache.getItem(0)->removeFromCache();
- }
- 
-+int YIcon::menuSize() {
-+    return menuIconSize;
-+}
-+
- int YIcon::smallSize() {
-     return smallIconSize;
- }
-diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
---- icewm-1.3.7.bak/src/yicon.h	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yicon.h	2011-11-07 19:41:28.555296033 +0100
-@@ -25,6 +25,7 @@
-     bool isCached() { return fCached; }
-     void setCached(bool cached) { fCached = cached; }
- 
-+    static int menuSize();
-     static int smallSize();
-     static int largeSize();
-     static int hugeSize();
-diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
---- icewm-1.3.7.bak/src/ymenu.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/ymenu.cc	2011-11-07 19:42:40.498474049 +0100
-@@ -153,8 +153,8 @@
- 
- #ifndef LITE
-         if (getItem(selItem)->getIcon() != null &&
--            YIcon::smallSize() > h)
--            h = YIcon::smallSize();
-+            YIcon::menuSize() > h)
-+            h = YIcon::menuSize();
- #endif
- 
-         if (x <= int(width() - h - 4))
-@@ -1023,8 +1023,8 @@
-                     mitem->getIcon()->draw(g,
-                                l + 1 + delta, t + delta + top + pad +
-                                (eh - top - pad * 2 - bottom -
--                                YIcon::smallSize()) / 2,
--                                YIcon::smallSize());
-+                                YIcon::menuSize()) / 2,
-+                                YIcon::menuSize());
- #endif
-                 }
- 
-diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
---- icewm-1.3.7.bak/src/ymenuitem.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/ymenuitem.cc	2011-11-07 19:50:04.458316916 +0100
-@@ -86,8 +86,8 @@
-         int ih = fontHeight;
- 
- #ifndef LITE
--        if (YIcon::smallSize() > ih)
--            ih = YIcon::smallSize();
-+        if (YIcon::menuSize() > ih)
-+            ih = YIcon::menuSize();
- #endif
- 
-         if (wmLook == lookWarp4 || wmLook == lookWin95) {
-@@ -123,7 +123,7 @@
-     return 0;
- #else
-     ref<YIcon> icon = getIcon();
--    return icon != null ? YIcon::smallSize(): 0;
-+    return icon != null ? YIcon::menuSize(): 0;
- #endif
- }
- 
diff --git a/desktop/icewm/patches/icewm-1.3.7-thermal.patch b/desktop/icewm/patches/icewm-1.3.7-thermal.patch
deleted file mode 100644
index f6b2cf71f0..0000000000
--- a/desktop/icewm/patches/icewm-1.3.7-thermal.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uprN a/src/acpustatus.cc b/src/acpustatus.cc
---- a/src/acpustatus.cc	2010-10-31 15:09:36.000000000 +0100
-+++ b/src/acpustatus.cc	2013-01-17 21:12:19.085715083 +0100
-@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf
-         }
-         closedir(dir);
-     } 
-+    else if ((dir = opendir("/sys/class/thermal")) != NULL) {
-+        struct dirent *de;
-+
-+        while ((de = readdir(dir)) != NULL) {
-+
-+            int fd, seglen;
-+
-+            if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
-+                continue;
-+
-+            sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
-+            fd = open(namebuf, O_RDONLY);
-+            if (fd != -1) {
-+                int len = read(fd, buf, sizeof(buf) - 1);
-+                buf[len - 4] = '\0';
-+                seglen = strlen(buf) + 4;
-+                if (retbuflen + seglen >= buflen) {
-+                    retbuflen = -retbuflen;
-+                    close(fd);
-+                    closedir(dir);
-+                    break;
-+                }
-+                retbuflen += seglen;
-+                strcat(tempbuf, "  ");
-+                strncat(tempbuf, buf, seglen);
-+                strcat(tempbuf, " C");
-+                close(fd);
-+            }
-+        }
-+        closedir(dir);
-+    }
-     return retbuflen;
- }
- 
diff --git a/desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff b/desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff
deleted file mode 100644
index b3818625fe..0000000000
--- a/desktop/icewm/patches/icewm-1.3.x-fix_html_docdir.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur icewm-1.3.7.orig/src/Makefile icewm-1.3.7/src/Makefile
---- icewm-1.3.7.orig/src/Makefile	2010-10-31 09:09:49.000000000 -0500
-+++ icewm-1.3.7/src/Makefile	2011-09-04 21:59:06.658236001 -0500
-@@ -32,7 +32,7 @@
-                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/html/icewm.html"'
- 
- CXXFLAGS =      -fpermissive -Wall -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
- 	         -I/usr/include/freetype2   -pthread -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include    # `fc-config --cflags`
-diff -Nur icewm-1.3.7.orig/src/Makefile.in icewm-1.3.7/src/Makefile.in
---- icewm-1.3.7.orig/src/Makefile.in	2010-10-31 09:09:36.000000000 -0500
-+++ icewm-1.3.7/src/Makefile.in	2011-09-04 21:59:06.659235991 -0500
-@@ -32,7 +32,7 @@
-                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/html/icewm.html"'
- 
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
diff --git a/desktop/icewm/patches/icewm-1.3.x-fix_htmldir.diff b/desktop/icewm/patches/icewm-1.3.x-fix_htmldir.diff
new file mode 100644
index 0000000000..ee0cb69be9
--- /dev/null
+++ b/desktop/icewm/patches/icewm-1.3.x-fix_htmldir.diff
@@ -0,0 +1,12 @@
+diff -Nur icewm-1.3.12.orig/configure icewm-1.3.12/configure
+--- icewm-1.3.12.orig/configure	2015-12-16 19:10:37.000000000 -0600
++++ icewm-1.3.12/configure	2016-01-03 16:51:39.034717138 -0600
+@@ -24013,7 +24013,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define ICEHELPIDX "${DOCDIR}/icewm.html"
++#define ICEHELPIDX "${DOCDIR}/html/icewm.html"
+ _ACEOF
+ 
+ 
diff --git a/desktop/icewm/patches/icewm-keys.patch b/desktop/icewm/patches/icewm-keys.patch
index 7e136bb932..c9ad1584f7 100644
--- a/desktop/icewm/patches/icewm-keys.patch
+++ b/desktop/icewm/patches/icewm-keys.patch
@@ -1,43 +1,14 @@
---- icewm-1.2.30/lib/keys.in.old	2007-01-18 13:55:20.000000000 +0200
-+++ icewm-1.2.30/lib/keys.in	2007-01-18 16:07:07.000000000 +0200
-@@ -9,28 +9,21 @@
- # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
- # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
- #
--key "Alt+Ctrl+t"		xterm
--key "Alt+Ctrl+f"		fte
--key "Alt+Ctrl+e"		nedit
--key "Alt+Ctrl+g"		gimp
--key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
--key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
--key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
-+key "Alt+Ctrl+t"			xterm
-+key "Alt+Ctrl+b"			xdg-open about:blank
-+key "Alt+Ctrl+s"			xdg-open http://www.google.com
- 
--key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
--key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
-+key "Super+KP_Subtract"		amixer sset PCM 5%-
-+key "Super+KP_Add"			amixer sset PCM 5%+
- 
- # "Multimedia key" bindings for XFree86. Gather the keycodes of your
+diff -Nur icewm-1.3.12.orig/lib/keys.in icewm-1.3.12/lib/keys.in
+--- icewm-1.3.12.orig/lib/keys.in	2015-09-13 16:29:28.000000000 -0500
++++ icewm-1.3.12/lib/keys.in	2016-01-03 16:28:55.332001195 -0600
+@@ -20,8 +20,8 @@
  # advanced function keys by watching the output of the xev command whilest
  # pressing those keys and map those symbols by using xmodmap.
  
--key "XF86Standby"		killall -QUIT icewm
--key "XF86AudioLowerVolume"	aumix -v -5
--key "XF86AudioRaiseVolume"	aumix -v +5
--key "XF86AudioMute"		aumix -v 0
--key "XF86AudioPlay"		cdplay play 1
--key "XF86AudioStop"		cdplay stop
--key "XF86HomePage"		netscape -noraise -remote openHomepage
--key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
--key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
--key "XF86Eject"			eject
-+key "XF86Standby"			killall -QUIT icewm
-+key "XF86AudioLowerVolume"	amixer sset PCM 5%-
-+key "XF86AudioRaiseVolume"	amixer sset PCM 5%+
-+key "XF86AudioMute"			amixer sset PCM 0%
-+key "XF86HomePage"			xdg-open about:blank
-+key "XF86Search"			xdg-open http://www.google.com
-+key "XF86Eject"				eject
+-key "XF86Standby"			/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
+-key "XF86Sleep"				/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
++key "XF86Standby"			/bin/sh -c "{ pm-suspend; } ||:"
++key "XF86Sleep"				/bin/sh -c "{ pm-suspend; } ||:"
+ key "XF86AudioLowerVolume"		amixer sset PCM 5%-
+ key "XF86AudioRaiseVolume"		amixer sset PCM 5%+
+ key "XF86AudioMute"			amixer sset PCM 0%
diff --git a/desktop/icewm/patches/no_proc_acpi.patch b/desktop/icewm/patches/no_proc_acpi.patch
deleted file mode 100644
index 4cd92360ca..0000000000
--- a/desktop/icewm/patches/no_proc_acpi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
-Author: Andrey Danin <danindrey@mail.ru>, Eduard Bloch <blade@debian.org>
-Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel
-Forwarded: Yes
-
-Index: icewm-1.3.7/src/wmtaskbar.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmtaskbar.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmtaskbar.cc	2012-04-11 23:22:23.466564372 +0200
-@@ -467,6 +467,7 @@
- #endif
- #ifdef CONFIG_APPLET_APM
-     if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
-+                           access("/sys/class/power_supply", 0) == 0 ||
-                            access("/proc/acpi", 0) == 0 ||
-                            access("/dev/acpi", 0) == 0 ||
- 	                   access("/proc/pmu", R_OK|X_OK) == 0))
diff --git a/desktop/icewm/patches/use_ICEWM_deprecated.patch b/desktop/icewm/patches/use_ICEWM_deprecated.patch
deleted file mode 100644
index 3533d31e34..0000000000
--- a/desktop/icewm/patches/use_ICEWM_deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
-Forwarded: Yes
-
---- icewm-1.3.7.orig/src/base.h
-+++ icewm-1.3.7/src/base.h
-@@ -2,9 +2,9 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
--#define deprecated __attribute__((deprecated))
-+#define ICEWM_deprecated __attribute__((deprecated))
- #else
--#define deprecated
-+#define ICEWM_deprecated
- #endif
- 
- /*** Atomar Data Types ********************************************************/
diff --git a/desktop/icewm/patches/wmclient.patch b/desktop/icewm/patches/wmclient.patch
deleted file mode 100644
index 95f00614de..0000000000
--- a/desktop/icewm/patches/wmclient.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc
---- icewm-1.3.7.orig/src/wmclient.cc	2012-05-27 11:54:25.663101746 +0200
-+++ icewm-1.3.7/src/wmclient.cc	2012-05-27 12:17:40.236339580 +0200
-@@ -1044,20 +1044,11 @@
-         while (XGetWindowProperty(display, handle,
-                                propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
-                                &r_type, &r_format, &nitems, &bytes_remain,
--                               &prop) == Success && prop && bytes_remain == 0)
-+                               &prop) == Success && prop)
-         {
-             if (r_format == itemSize1 && nitems > 0) {
-                 data = realloc(data, (itemCount + nitems) * itemSize / 8);
- 
--                // access to memory beyound 256MiB causes crashes! But anyhow, size
--                // >>2MiB looks suspicious. Detect this case ASAP. However, if
--                // the usable icon is somewhere in the beginning, it's okay to
--                // return truncated data.
--                if (itemCount * itemSize / 8 >= 2097152) {
--                     XFree(prop);
--                     break;
--                }
--
-                 memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
-                 itemCount += nitems;
-                 XFree(prop);
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm
index 7bf9154446..18d62cfa72 100644
--- a/desktop/icewm/xinitrc.icewm
+++ b/desktop/icewm/xinitrc.icewm
@@ -23,7 +23,7 @@ fi
 icewmbg &
 icewmtray &
 
-if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+if [ -z "$XDG_SESSION_COOKIE" -a -x /usr/bin/ck-launch-session ]; then
   ck-launch-session dbus-launch --exit-with-session icewm-session
 else
   exec icewm-session
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index 59c3c05242..4c175d7d45 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20150914 bkw:
+# - Update for 2.13 release.
+
 # 20150512 bkw:
 # - Update for 2.12 release.
 # - Replace my man page with upstream's (from git).
@@ -24,7 +27,7 @@
 # - Added default terminal selection
 
 PRGNAM=j4-dmenu-desktop
-VERSION=${VERSION:-2.12}
+VERSION=${VERSION:-2.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
index acdf2dd48c..575cfeec74 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
@@ -1,8 +1,8 @@
 PRGNAM="j4-dmenu-desktop"
-VERSION="2.12"
+VERSION="2.13"
 HOMEPAGE="http://www.j4tools.org/"
-DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.12.tar.gz"
-MD5SUM="89dca54ed781ca7d928bcfe37143c451"
+DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.13.tar.gz"
+MD5SUM="ef76857665d5b8bdf9dc7d97ef9b81c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu"
diff --git a/desktop/jwm/jwm.SlackBuild b/desktop/jwm/jwm.SlackBuild
index c3d6a007b7..9bbd213d07 100644
--- a/desktop/jwm/jwm.SlackBuild
+++ b/desktop/jwm/jwm.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=jwm
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/jwm/jwm.info b/desktop/jwm/jwm.info
index f22cf9fc3c..35a5f6562e 100644
--- a/desktop/jwm/jwm.info
+++ b/desktop/jwm/jwm.info
@@ -1,8 +1,8 @@
 PRGNAM="jwm"
-VERSION="2.3.1"
+VERSION="2.3.4"
 HOMEPAGE="http://www.joewing.net/programs/jwm/"
-DOWNLOAD="http://www.joewing.net/projects/jwm/releases/jwm-2.3.1.tar.xz"
-MD5SUM="172aef20a5c0396c168d891e86d3e379"
+DOWNLOAD="http://www.joewing.net/projects/jwm/releases/jwm-2.3.4.tar.xz"
+MD5SUM="64660b8b9dbd842d02662e4de95789c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/kde-gtk-config/kde-gtk-config.SlackBuild b/desktop/kde-gtk-config/kde-gtk-config.SlackBuild
index 0cff963287..a1a5432ee7 100644
--- a/desktop/kde-gtk-config/kde-gtk-config.SlackBuild
+++ b/desktop/kde-gtk-config/kde-gtk-config.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild
index d869010bf8..b5ae965885 100644
--- a/desktop/lumina/lumina.SlackBuild
+++ b/desktop/lumina/lumina.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -25,8 +25,8 @@
 # not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=lumina
-VERSION=${VERSION:-0.8.4}
-SRCVERSION=${SRCVERSION:-P1}
+VERSION=${VERSION:-0.8.6}
+SRCVERSION=${SRCVERSION:-}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,13 +62,13 @@ set -eu
 rm -rf $PKG
 mkdir -pv $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-Release-$SRCVERSION
-if [ -e $CWD/v$VERSION-Release-$SRCVERSION.tar.gz ]; then
-  tar xvf $CWD/v$VERSION-Release-$SRCVERSION.tar.gz
+rm -rf $PRGNAM-$VERSION-Release$SRCVERSION
+if [ -e $CWD/v$VERSION-Release$SRCVERSION.tar.gz ]; then
+  tar xvf $CWD/v$VERSION-Release$SRCVERSION.tar.gz
 else
-  tar xvf $CWD/$PRGNAM-$VERSION-Release-$SRCVERSION.tar.gz
+  tar xvf $CWD/$PRGNAM-$VERSION-Release$SRCVERSION.tar.gz
 fi
-cd $PRGNAM-$VERSION-Release-$SRCVERSION
+cd $PRGNAM-$VERSION-Release$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -83,7 +83,7 @@ qmake-qt5 \
   QMAKE_CXXFLAGS="$SLKCFLAGS" \
   QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5
 
-make
+make -j1
 make install \
   INSTALL_ROOT=$PKG \
   DESTDIR=$PKG
diff --git a/desktop/lumina/lumina.info b/desktop/lumina/lumina.info
index a9c04eba6e..69b7611b2c 100644
--- a/desktop/lumina/lumina.info
+++ b/desktop/lumina/lumina.info
@@ -1,8 +1,8 @@
 PRGNAM="lumina"
-VERSION="0.8.4-P1"
-HOMEPAGE="http://wiki.pcbsd.org/index.php/Lumina/10.1"
-DOWNLOAD="https://github.com/pcbsd/lumina/archive/v0.8.4-Release-P1.tar.gz"
-MD5SUM="7f6fe869e99ee0816bcea12c0da92acd"
+VERSION="0.8.6"
+HOMEPAGE="http://lumina-desktop.org/"
+DOWNLOAD="https://github.com/pcbsd/lumina/archive/v0.8.6-Release.tar.gz"
+MD5SUM="8768c4f9d6b7f80ba7bac1488273d6e8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/desktop/lumina/slack-desc b/desktop/lumina/slack-desc
index 2db352e933..0894687606 100644
--- a/desktop/lumina/slack-desc
+++ b/desktop/lumina/slack-desc
@@ -15,5 +15,5 @@ lumina: specifically on streamlining the ability to get work done while
 lumina: minimizing system overhead.
 lumina:
 lumina:
-lumina: http://wiki.pcbsd.org/index.php/Lumina/10.1
+lumina: http://lumina-desktop.org/
 lumina:
diff --git a/desktop/luna-wallpapers/luna-wallpapers.SlackBuild b/desktop/luna-wallpapers/luna-wallpapers.SlackBuild
index 54e0caa66a..4f03ea4f2f 100644
--- a/desktop/luna-wallpapers/luna-wallpapers.SlackBuild
+++ b/desktop/luna-wallpapers/luna-wallpapers.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=luna-wallpapers
 VERSION=${VERSION:-0.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -54,6 +54,11 @@ mkdir -p $PKG/usr/share/wallpapers
 
 # Xfce default
 ( cd $PKG/usr/share/xfce4/backdrops/
+  tar xvf $CWD/elementary-wallpapers*ubuntu*.tar.gz
+  cp -f elementary-wallpapers*/*.jpg elementary-wallpapers*/extra/*.jpg .
+  rm -rf elementary-wallpapers*/
+)
+( cd $PKG/usr/share/xfce4/backdrops/
   tar xvf $CWD/$PRGNAM.tar.gz
   ls -1 *.* | while read file; do
     newfile=$(echo $file | tr ' ' '_')
diff --git a/desktop/luna-wallpapers/luna-wallpapers.info b/desktop/luna-wallpapers/luna-wallpapers.info
index e70aa7b5f1..7812fbf14c 100644
--- a/desktop/luna-wallpapers/luna-wallpapers.info
+++ b/desktop/luna-wallpapers/luna-wallpapers.info
@@ -1,8 +1,10 @@
 PRGNAM="luna-wallpapers"
 VERSION="0.2"
 HOMEPAGE="http://elementaryos.org/journal/luna-wallpapers-officially-revealed"
-DOWNLOAD="https://launchpad.net/elementaryos/0.2-luna/luna-wallpapers/+download/luna-wallpapers.tar.gz"
-MD5SUM="153357336d6c727669127c27d64cf5a1"
+DOWNLOAD="https://launchpad.net/elementaryos/0.2-luna/luna-wallpapers/+download/luna-wallpapers.tar.gz \
+          http://slackware.org.uk/microlinux/desktop-14.1-source/luna-wallpapers/elementary-wallpapers_0.1.4-0~42~ubuntu0.3.1.tar.gz"
+MD5SUM="153357336d6c727669127c27d64cf5a1 \
+        55279169f4f1bf82098b2ed033021c77"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/menumaker/menumaker.SlackBuild b/desktop/menumaker/menumaker.SlackBuild
index 5b1888288a..9080137bc3 100644
--- a/desktop/menumaker/menumaker.SlackBuild
+++ b/desktop/menumaker/menumaker.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for menumaker
 
-# Copyright 2010, 2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011, 2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=menumaker
-VERSION=${VERSION:-0.99.7}
+VERSION=${VERSION:-0.99.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,7 +78,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --with-python \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/desktop/menumaker/menumaker.info b/desktop/menumaker/menumaker.info
index 5579a63f14..62e31cfa77 100644
--- a/desktop/menumaker/menumaker.info
+++ b/desktop/menumaker/menumaker.info
@@ -1,8 +1,8 @@
 PRGNAM="menumaker"
-VERSION="0.99.7"
+VERSION="0.99.9"
 HOMEPAGE="http://menumaker.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/menumaker/menumaker-0.99.7.tar.gz"
-MD5SUM="a54cb7ec32db1bc8e04218e0be727b1e"
+DOWNLOAD="http://downloads.sourceforge.net/menumaker/menumaker-0.99.9.tar.gz"
+MD5SUM="0b199079905955eab2325dddb83e6da0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/menutray/menutray.SlackBuild b/desktop/menutray/menutray.SlackBuild
index a348e243b6..4a6de1300e 100644
--- a/desktop/menutray/menutray.SlackBuild
+++ b/desktop/menutray/menutray.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
+#
 # Slackware build script for menutray.
-# Home page: https://github.com/trizen/menutray.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=menutray
-VERSION=${VERSION:-0.43}
+VERSION=${VERSION:-0.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,8 +54,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="INSTALL.md LICENSE README.md"
-
 set -e
 
 rm -rf $PKG
@@ -75,11 +73,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/bin
-cp menutray $PKG/usr/bin
+cp -a menutray $PKG/usr/bin
 mkdir -p $PKG/etc/xdg/$PRGNAM
-cp schema.pl $PKG/etc/xdg/$PRGNAM
+cp -a schema.pl $PKG/etc/xdg/$PRGNAM
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/menutray/menutray.info b/desktop/menutray/menutray.info
index 1c96440be0..bd1b0255e7 100644
--- a/desktop/menutray/menutray.info
+++ b/desktop/menutray/menutray.info
@@ -1,8 +1,8 @@
 PRGNAM="menutray"
-VERSION="0.43"
+VERSION="0.44"
 HOMEPAGE="https://github.com/trizen/menutray/"
-DOWNLOAD="https://github.com/trizen/menutray/archive/0.43.tar.gz"
-MD5SUM="8340d8b85c4e991372a890e6ed31f1b3"
+DOWNLOAD="https://github.com/trizen/menutray/archive/0.44.tar.gz"
+MD5SUM="eb0a6f41279984a2dcdc793abb6680c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-linux-desktop-files"
diff --git a/desktop/menutray/slack-desc b/desktop/menutray/slack-desc
index ac54597692..639022e306 100644
--- a/desktop/menutray/slack-desc
+++ b/desktop/menutray/slack-desc
@@ -17,4 +17,3 @@ menutray:
 menutray:
 menutray:
 menutray:
-menutray:
diff --git a/desktop/mimi/README b/desktop/mimi/README
new file mode 100644
index 0000000000..18281ef75d
--- /dev/null
+++ b/desktop/mimi/README
@@ -0,0 +1,12 @@
+mimi is an improved verision of xdg-open. The original xdg-open works horribly
+without DE environment.
+
+Note:
+
+This WILL overwrite xdg-open. If you desire to go back to the original
+xdg-open script, be sure to reinstall xdg-utils from Slackware's repo.
+
+You specifically define what applications should be opened by which mime type.
+Simply make a text file at "~/.config/mimi/mime.conf" and edit it to your
+liking. If you don't feel like doing this, mimi will automatically find the
+best suited desktop file for the file. More info on the Github page.
diff --git a/desktop/mimi/mimi.SlackBuild b/desktop/mimi/mimi.SlackBuild
new file mode 100644
index 0000000000..3cf5765e61
--- /dev/null
+++ b/desktop/mimi/mimi.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for mimi
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mimi
+VERSION=${VERSION:-d85ea825}
+SRCVER=d85ea8256ed627e93b387cd42e4ab39bfab9504c
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+unzip $CWD/$PRGNAM-$SRCVER.zip || unzip $CWD/$SRCVER.zip
+cd $PRGNAM-$SRCVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Copy over shell scripts to bin
+install -D -m 0755 xdg-open $PKG/usr/bin/xdg-open
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a  README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/mimi/mimi.info b/desktop/mimi/mimi.info
new file mode 100644
index 0000000000..24d9732888
--- /dev/null
+++ b/desktop/mimi/mimi.info
@@ -0,0 +1,10 @@
+PRGNAM="mimi"
+VERSION="d85ea825"
+HOMEPAGE="https://github.com/march-linux/mimi/"
+DOWNLOAD="https://github.com/march-linux/mimi/archive/d85ea8256ed627e93b387cd42e4ab39bfab9504c.zip"
+MD5SUM="e3b70b4473fb1a319c36688cea356efc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/mimi/slack-desc b/desktop/mimi/slack-desc
new file mode 100644
index 0000000000..28316fc3e4
--- /dev/null
+++ b/desktop/mimi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler--------------------------------------------------------|
+mimi: mimi (xdg-open alternative)
+mimi:
+mimi: mimi is an improved verision of xdg-open. The original xdg-open works
+mimi: horribly without DE environment.
+mimi:
+mimi: Homepage: https://github.com/march-linux/mimi/
+mimi:
+mimi:
+mimi:
+mimi:
+mimi:
diff --git a/desktop/moka-icon-theme/README b/desktop/moka-icon-theme/README
index 5197015cc3..fa9a016f9e 100644
--- a/desktop/moka-icon-theme/README
+++ b/desktop/moka-icon-theme/README
@@ -1,13 +1,17 @@
-Moka icon theme for GNOME, XFCE and other DEs|WMs GTK+.
+moka-icon-theme (gnome icon theme)
+
+Moka is a stylized Linux desktop icon set, and the titular icon theme of the Moka Project.
+They are designed to be clear, simple and consistent.
 
 Moka was created with minimal, flat style, using simple geometry & colours.
 Each icon has been pixel-perfectly-designed and for the best experience throughout your desktop.
 
-As one of the most comprehensive icon sets available for the Linux desktop,
-Moka provides thousands of icons for many applications.
+As one of the most comprehensive icon sets available for the Linux desktop, Moka provides thousands of icons for many applications.
 
 No matter which desktop you are using, Moka has you covered; it's for all of the popular Linux desktop environments.
 
-Moka is only a set of application icons, it relies on its companion icon set "Faba".
+Moka is only a set of application icons, it relies on its companion icon set "Faba Icon Theme".
+
+From Faba Icon Theme, Moka inherits all the system icons, folders, panel icons, etc. to make a complete experience.
 
-From Faba, Moka inherits all the system icons, folders, panel icons, etc. to make a complete experience.
+Moka Icon Theme (the icon assets and sources) are licensed under a Creative Commons Attribution-ShareAlike 4.0 license.
diff --git a/desktop/moka-icon-theme/moka-icon-theme.SlackBuild b/desktop/moka-icon-theme/moka-icon-theme.SlackBuild
index a1a2fff21c..cc0b687607 100644
--- a/desktop/moka-icon-theme/moka-icon-theme.SlackBuild
+++ b/desktop/moka-icon-theme/moka-icon-theme.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="moka-icon-theme"
-VERSION=${VERSION:-5.0}
+VERSION=${VERSION:-5.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,11 +36,13 @@ CWD=$(pwd)
 
 set -e
 
+SRCVER="v5.0.11"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
@@ -48,8 +50,7 @@ mkdir -p $PKG/usr/share/icons
 cp -a Moka $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING INSTALL LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-
+cp -a AUTHORS COPYING INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/moka-icon-theme/moka-icon-theme.info b/desktop/moka-icon-theme/moka-icon-theme.info
index 2d9d66766e..58738eef3b 100644
--- a/desktop/moka-icon-theme/moka-icon-theme.info
+++ b/desktop/moka-icon-theme/moka-icon-theme.info
@@ -1,10 +1,10 @@
 PRGNAM="moka-icon-theme"
-VERSION="5.0"
-HOMEPAGE="http://snwh.org/moka/"
-DOWNLOAD="https://raw.githubusercontent.com/moka-project/moka-icon-theme/master/moka-icon-theme-5.0.tar.gz"
-MD5SUM="4dd25186e7b6a4f6ca8d296c75ff5093"
+VERSION="5.0.11"
+HOMEPAGE="https://github.com/moka-project/moka-icon-theme/"
+DOWNLOAD="https://github.com/moka-project/moka-icon-theme/archive/v5.0.11.tar.gz"
+MD5SUM="24fb03e4c907e4728cc3edce779abf5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="faba-icon-theme"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/moka-icon-theme/slack-desc b/desktop/moka-icon-theme/slack-desc
index 09c2f69b9d..84ccc79af9 100644
--- a/desktop/moka-icon-theme/slack-desc
+++ b/desktop/moka-icon-theme/slack-desc
@@ -8,11 +8,11 @@
                |-----handy-ruler------------------------------------------------------|
 moka-icon-theme: moka-icon-theme (gnome icon theme)
 moka-icon-theme:
-moka-icon-theme: Moka was created with minimal, flat style, using simple geometry &
-moka-icon-theme: colours. Each icon has been pixel-perfectly-designed and for the best
-moka-icon-theme: experience throughout your desktop.
+moka-icon-theme: Moka is a stylized Linux desktop icon set, and the titular icon theme
+moka-icon-theme: of the Moka Project. They are designed to be clear, simple and
+moka-icon-theme: consistent.
 moka-icon-theme:
-moka-icon-theme: Home Page: http://snwh.org/moka/
+moka-icon-theme: Home Page: https://github.com/moka-project/moka-icon-theme/
 moka-icon-theme:
 moka-icon-theme:
 moka-icon-theme:
diff --git a/desktop/moka-minimal/README b/desktop/moka-minimal/README
index 9efe4095ea..70b7ddd2d8 100644
--- a/desktop/moka-minimal/README
+++ b/desktop/moka-minimal/README
@@ -2,6 +2,8 @@ moka-minimal (gnome icon theme).
 
 Grayscale versions of Moka & Faba icons (already in SlackBuilds).
 
+Moka inherits Faba, so index.theme modified to inherit Faba-Minimal, which inherits gnome, in that order.
+
 This is not dependent of packages 'faba-icon-theme' or 'moka-icon-theme'.
 
 NOTE: p7zip is used only to extract the source.
diff --git a/desktop/moka-minimal/moka-minimal.SlackBuild b/desktop/moka-minimal/moka-minimal.SlackBuild
index a3774c4308..eb0dc9a485 100644
--- a/desktop/moka-minimal/moka-minimal.SlackBuild
+++ b/desktop/moka-minimal/moka-minimal.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM="moka-minimal"
 VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -49,7 +49,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 
 mkdir -p $PKG/usr/share/icons
-cp -a * $PKG/usr/share/icons
+cp -a Faba-Minimal Moka-Minimal $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/moka-themes/README b/desktop/moka-themes/README
index 99f2e950fb..9d275f5add 100644
--- a/desktop/moka-themes/README
+++ b/desktop/moka-themes/README
@@ -1,5 +1,7 @@
-moka-themes (GTK themes).
+moka-themes (GTK themes)
 
-GTK-2.0 Themes for Openbox, XFCE and Emerald.
+Moka is an elegant and minimalistic theme suite for your GNU/Linux desktop.
+
+The archive contains a GTK, an Emerald and an Openbox theme.
 
 * Extras for Conky and Tint2 found at /etc/xdg.
diff --git a/desktop/moka-themes/moka-themes.SlackBuild b/desktop/moka-themes/moka-themes.SlackBuild
index b8bf52939e..14b348adfd 100644
--- a/desktop/moka-themes/moka-themes.SlackBuild
+++ b/desktop/moka-themes/moka-themes.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
+#
 # Slackware build script for moka-themes.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -22,9 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="moka-themes"
-SRCNAM="Moka_by_rent0n86"
 VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -36,6 +36,8 @@ CWD=$(pwd)
 
 set -e
 
+SRCNAM="Moka_by_rent0n86"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -47,9 +49,9 @@ chown -R root:root .
 
 mkdir -p $PKG/usr/share/themes/$PRGNAM
 mkdir -p $PKG/etc/xdg/{conky,tint2}
-cp .conkyrc $PKG/etc/xdg/conky
+cp .conkyrc $PKG/etc/xdg/conky/conkyrc
 cp tint2rc $PKG/etc/xdg/tint2
-rm *.jpg
+rm Screenshot.jpg
 cp -a gtk-2.0 openbox-3 xfce-notify-4.0 Moka.emerald $PKG/usr/share/themes/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/moka-themes/slack-desc b/desktop/moka-themes/slack-desc
index 689f9a3916..bc485d4a0f 100644
--- a/desktop/moka-themes/slack-desc
+++ b/desktop/moka-themes/slack-desc
@@ -8,7 +8,8 @@
            |-----handy-ruler------------------------------------------------------|
 moka-themes: moka-themes (GTK themes)
 moka-themes:
-moka-themes: GTK-2.0 Themes for Openbox, XFCE and Emerald.
+moka-themes: Moka is an elegant and minimalistic theme suite for your GNU/Linux
+moka-themes: desktop.
 moka-themes:
 moka-themes: Home page: http://rent0n86.deviantart.com/art/Moka-136909912/
 moka-themes:
@@ -16,4 +17,3 @@ moka-themes:
 moka-themes:
 moka-themes:
 moka-themes:
-moka-themes:
diff --git a/desktop/mousepad/slack-desc b/desktop/mousepad/slack-desc
index 9d12884353..f54e6d83ab 100644
--- a/desktop/mousepad/slack-desc
+++ b/desktop/mousepad/slack-desc
@@ -15,5 +15,5 @@ mousepad: Mousepad includes complete support for UTF-8 text,
 mousepad: the usual cut/copy/paste functionality, font selection support, etc.
 mousepad:
 mousepad: Archive: http://archive.xfce.org/src/apps/mousepad/
-mosuepad:
+mousepad:
 mousepad:
diff --git a/desktop/musca/musca.info b/desktop/musca/musca.info
index 0a6cf7cc02..5ff67f79ef 100644
--- a/desktop/musca/musca.info
+++ b/desktop/musca/musca.info
@@ -1,7 +1,7 @@
 PRGNAM="musca"
 VERSION="0.9.24"
 HOMEPAGE="http://aerosuidae.net/musca/Musca_Window_Manager"
-DOWNLOAD="http://aerosuidae.net/musca-0.9.24.tgz"
+DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/musca-0.9.24.tgz"
 MD5SUM="e067a8e39b1a97d62fc8e43800edee70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/desktop/neutral/neutral.SlackBuild b/desktop/neutral/neutral.SlackBuild
index 248840ba40..159f4f29a1 100644
--- a/desktop/neutral/neutral.SlackBuild
+++ b/desktop/neutral/neutral.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/desktop/notion/notion.SlackBuild b/desktop/notion/notion.SlackBuild
index eac27eca4c..a632f938b4 100644
--- a/desktop/notion/notion.SlackBuild
+++ b/desktop/notion/notion.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for notion
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=notion
-VERSION=${VERSION:-3_2014052800}
-SRCVER=$(echo $VERSION | tr _ - )
+SRCVER=${SRCVER:-3-2015061300}
+VERSION=$(echo $SRCVER | tr - _)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,10 +60,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCVER-src.tar.gz
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz || tar xvf $CWD/$SRCVER.tar.gz
 cd $PRGNAM-$SRCVER
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,17 +69,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make \
-  OPTS="$SLKCFLAGS" \
-  PREFIX=/usr \
-  ETCDIR=/etc/$PRGNAM \
-  LIBDIR=/usr/lib$LIBDIRSUFFIX \
-  MANDIR=/usr/man \
-  DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-  X11INC=/usr/include \
-  X11LIB=/usr/lib${LIBDIRSUFFIX}/X11
-
-
+make
 make install \
   OPTS="$SLKCFLAGS" \
   PREFIX=/usr \
diff --git a/desktop/notion/notion.info b/desktop/notion/notion.info
index 4bb9c565c6..986910a469 100644
--- a/desktop/notion/notion.info
+++ b/desktop/notion/notion.info
@@ -1,8 +1,8 @@
 PRGNAM="notion"
-VERSION="3_2014052800"
+VERSION="3_2015061300"
 HOMEPAGE="http://notion.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/notion/notion-3-2014052800-src.tar.gz"
-MD5SUM="f6256fe12a3d321dbb7f7d2ecfcdcbeb"
+DOWNLOAD="https://github.com/raboof/notion/archive/3-2015061300.tar.gz"
+MD5SUM="6dea9fdc4654aa8dbb294ad86feb9ce1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/desktop/numix-gtk-theme/README b/desktop/numix-gtk-theme/README
new file mode 100644
index 0000000000..91b0f74bb3
--- /dev/null
+++ b/desktop/numix-gtk-theme/README
@@ -0,0 +1,7 @@
+numix-gtk-theme (modern flat theme)
+
+Numix is a modern flat theme with a combination of light and dark
+elements. It supports Gnome, Unity, XFCE and Openbox. Numix is a part
+of the Numix Project.
+
+Optional dependencies: gtk-engines, gtk-engines-unico, murrine.
diff --git a/desktop/numix-gtk-theme/doinst.sh b/desktop/numix-gtk-theme/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/numix-gtk-theme/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/numix-gtk-theme/fix_overlay_scrollbar.patch b/desktop/numix-gtk-theme/fix_overlay_scrollbar.patch
new file mode 100644
index 0000000000..d2df5d45a4
--- /dev/null
+++ b/desktop/numix-gtk-theme/fix_overlay_scrollbar.patch
@@ -0,0 +1,16 @@
+diff -Nru Numix.orig/gtk-3.0/gtk-widgets.css Numix/gtk-3.0/gtk-widgets.css
+--- Numix.orig/gtk-3.0/gtk-widgets.css	2013-07-01 15:27:19.000000000 +0530
++++ Numix/gtk-3.0/gtk-widgets.css	2013-07-01 19:59:56.017479426 +0530
+@@ -58,6 +58,12 @@
+     background-color: @theme_bg_color;
+     color: @theme_fg_color;
+ }
++ 
++* {
++    /* inherit colors from parent */
++    color: inherit;
++    background-color: inherit;
++}
+ 
+ *:selected,
+ *:selected:focus {
diff --git a/desktop/numix-gtk-theme/numix-gtk-theme.SlackBuild b/desktop/numix-gtk-theme/numix-gtk-theme.SlackBuild
new file mode 100644
index 0000000000..ef942ee695
--- /dev/null
+++ b/desktop/numix-gtk-theme/numix-gtk-theme.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Slackware build script for numix-gtk-theme.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="numix-gtk-theme"
+VERSION=${VERSION:-2.4.20141208}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCVER="2.4"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.gz
+mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+patch -p0 gtk-3.0/gtk-widgets.css < $CWD/fix_overlay_scrollbar.patch
+
+mkdir -p $PKG/usr/share/themes/Numix
+
+THEMES="gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfce-notify-4.0 xfwm4"
+cp -a $THEMES $PKG/usr/share/themes/Numix
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CREDITS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-gtk-theme/numix-gtk-theme.info b/desktop/numix-gtk-theme/numix-gtk-theme.info
new file mode 100644
index 0000000000..14e7efbaa6
--- /dev/null
+++ b/desktop/numix-gtk-theme/numix-gtk-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="numix-gtk-theme"
+VERSION="2.4.20141208"
+HOMEPAGE="https://github.com/shimmerproject/Numix/"
+DOWNLOAD="https://launchpad.net/~numix/+archive/ubuntu/ppa/+files/numix-gtk-theme_2.4.orig.tar.gz"
+MD5SUM="c491ba484f332e11c22e5b18bd06505f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/numix-gtk-theme/slack-desc b/desktop/numix-gtk-theme/slack-desc
new file mode 100644
index 0000000000..c3e905be96
--- /dev/null
+++ b/desktop/numix-gtk-theme/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+numix-gtk-theme: numix-gtk-theme (modern flat theme)
+numix-gtk-theme:
+numix-gtk-theme: Numix is a modern flat theme with a combination of light and dark
+numix-gtk-theme: elements. It supports Gnome, Unity, XFCE and Openbox. Numix is a part
+numix-gtk-theme: of the Numix Project.
+numix-gtk-theme:
+numix-gtk-theme: Home page: https://github.com/shimmerproject/Numix
+numix-gtk-theme:
+numix-gtk-theme:
+numix-gtk-theme:
+numix-gtk-theme:
diff --git a/desktop/numix-icon-theme-bevel/README b/desktop/numix-icon-theme-bevel/README
new file mode 100644
index 0000000000..e0bb435b84
--- /dev/null
+++ b/desktop/numix-icon-theme-bevel/README
@@ -0,0 +1,4 @@
+numix-icon-theme-bevel (Numix Bevel icon theme)
+
+Numix Bevel is a original set of current Numix Circle an icon theme
+for Linux from the Numix project.
diff --git a/desktop/numix-icon-theme-bevel/doinst.sh b/desktop/numix-icon-theme-bevel/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/numix-icon-theme-bevel/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/numix-icon-theme-bevel/numix-icon-theme-bevel.SlackBuild b/desktop/numix-icon-theme-bevel/numix-icon-theme-bevel.SlackBuild
new file mode 100644
index 0000000000..3b4ccb8583
--- /dev/null
+++ b/desktop/numix-icon-theme-bevel/numix-icon-theme-bevel.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Slackware build script for numix-icon-theme-bevel.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="numix-icon-theme-bevel"
+VERSION=${VERSION:-1.0.20141021}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCVER="1.0+201410212340~8~ubuntu14.10.1"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${SRCVER}.tar.xz
+mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+mkdir -p $PKG/usr/share/icons
+cp -a Numix-Bevel $PKG/usr/share/icons
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-icon-theme-bevel/numix-icon-theme-bevel.info b/desktop/numix-icon-theme-bevel/numix-icon-theme-bevel.info
new file mode 100644
index 0000000000..b83d77e4c7
--- /dev/null
+++ b/desktop/numix-icon-theme-bevel/numix-icon-theme-bevel.info
@@ -0,0 +1,10 @@
+PRGNAM="numix-icon-theme-bevel"
+VERSION="1.0.20141021"
+HOMEPAGE="https://github.com/numixproject/numix-icon-theme-circle/releases/"
+DOWNLOAD="https://launchpad.net/~numix/+archive/ubuntu/ppa/+files/numix-icon-theme-bevel_1.0%2B201410212340%7E8%7Eubuntu14.10.1.tar.xz"
+MD5SUM="9d2554321cb70405cdb84616a256056b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/numix-icon-theme-bevel/slack-desc b/desktop/numix-icon-theme-bevel/slack-desc
new file mode 100644
index 0000000000..31e0abad5d
--- /dev/null
+++ b/desktop/numix-icon-theme-bevel/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+numix-icon-theme-bevel: numix-icon-theme-bevel (Numix Bevel icon theme)
+numix-icon-theme-bevel:
+numix-icon-theme-bevel: Numix Bevel is a original set of current Numix Circle an icon theme
+numix-icon-theme-bevel: for Linux from the Numix project.
+numix-icon-theme-bevel:
+numix-icon-theme-bevel: Home Page: https://github.com/numixproject/numix-icon-theme-circle/
+numix-icon-theme-bevel:
+numix-icon-theme-bevel:
+numix-icon-theme-bevel:
+numix-icon-theme-bevel:
+numix-icon-theme-bevel:
diff --git a/desktop/numix-icon-theme-circle/README b/desktop/numix-icon-theme-circle/README
new file mode 100644
index 0000000000..a5adce4e4a
--- /dev/null
+++ b/desktop/numix-icon-theme-circle/README
@@ -0,0 +1,3 @@
+numix-icon-theme-circle (Numix Circle icon theme)
+
+Numix Circle is an icon theme for Linux from the Numix project.
diff --git a/desktop/numix-icon-theme-circle/doinst.sh b/desktop/numix-icon-theme-circle/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/numix-icon-theme-circle/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
new file mode 100644
index 0000000000..fb2a40d077
--- /dev/null
+++ b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Slackware build script for numix-icon-theme-circle.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="numix-icon-theme-circle"
+VERSION=${VERSION:-1.0.20151016}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCVER="1.0.2+5~201510162111~ubuntu15.10.1"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${SRCVER}.tar.xz
+mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+mkdir -p $PKG/usr/share/icons
+cp -a Numix-Circle Numix-Circle-Light $PKG/usr/share/icons
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/changelog license readme.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info
new file mode 100644
index 0000000000..d11e547edf
--- /dev/null
+++ b/desktop/numix-icon-theme-circle/numix-icon-theme-circle.info
@@ -0,0 +1,10 @@
+PRGNAM="numix-icon-theme-circle"
+VERSION="1.0.20151016"
+HOMEPAGE="https://github.com/numixproject/numix-icon-theme-circle"
+DOWNLOAD="https://launchpadlibrarian.net/221494686/numix-icon-theme-circle_1.0.2%2B5%7E201510162111%7Eubuntu15.10.1.tar.xz"
+MD5SUM="02d67a41adb9d12860ed87016c060117"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64="numix-icon-theme"
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/numix-icon-theme-circle/slack-desc b/desktop/numix-icon-theme-circle/slack-desc
new file mode 100644
index 0000000000..99e48ae9dd
--- /dev/null
+++ b/desktop/numix-icon-theme-circle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                       |-----handy-ruler------------------------------------------------------|
+numix-icon-theme-circle: numix-icon-theme-circle (Numix Circle icon theme)
+numix-icon-theme-circle:
+numix-icon-theme-circle: Numix Circle is an icon theme for Linux from the Numix project.  
+numix-icon-theme-circle:
+numix-icon-theme-circle: Home Page: https://github.com/numixproject/numix-icon-theme-circle/
+numix-icon-theme-circle:
+numix-icon-theme-circle:
+numix-icon-theme-circle:
+numix-icon-theme-circle:
+numix-icon-theme-circle:
+numix-icon-theme-circle:
diff --git a/desktop/numix-icon-theme/README b/desktop/numix-icon-theme/README
new file mode 100644
index 0000000000..05c8582a38
--- /dev/null
+++ b/desktop/numix-icon-theme/README
@@ -0,0 +1,10 @@
+numix-icon-theme (official icon theme from the Numix project)
+
+Numix is the official icon theme from the Numix project. It is 
+heavily inspired by, and based upon parts of the Elementary, 
+Humanity and Gnome icon themes. Designed to be used along side the 
+application icon theme Numix Circle.
+
+Numix is designed to look fresh, swishy and modern using white 
+symbols on vividly coloured background for applications and 
+simplistic devices, toolbars and status icons.
diff --git a/desktop/numix-icon-theme/doinst.sh b/desktop/numix-icon-theme/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/numix-icon-theme/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/numix-icon-theme/numix-icon-theme.SlackBuild b/desktop/numix-icon-theme/numix-icon-theme.SlackBuild
new file mode 100644
index 0000000000..dfa628b056
--- /dev/null
+++ b/desktop/numix-icon-theme/numix-icon-theme.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Slackware build script for numix-icon-theme.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="numix-icon-theme"
+VERSION=${VERSION:-0.3.20151121}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCVER="0.3+683~201511210216~ubuntu15.10.1"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${SRCVER}.tar.xz
+mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+mkdir -p $PKG/usr/share/icons
+cp -a Numix Numix-Light $PKG/usr/share/icons
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/changelog license readme.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/numix-icon-theme/numix-icon-theme.info b/desktop/numix-icon-theme/numix-icon-theme.info
new file mode 100644
index 0000000000..98cffa1ac3
--- /dev/null
+++ b/desktop/numix-icon-theme/numix-icon-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="numix-icon-theme"
+VERSION="0.3.20151121"
+HOMEPAGE="https://github.com/numixproject/numix-icon-theme/"
+DOWNLOAD="https://launchpad.net/~numix/+archive/ubuntu/ppa/+files/numix-icon-theme_0.3%2B683~201511210216~ubuntu15.10.1.tar.xz"
+MD5SUM="4713e92b1a7bba50456a47876e628003"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/numix-icon-theme/slack-desc b/desktop/numix-icon-theme/slack-desc
new file mode 100644
index 0000000000..d3e8fcf1b3
--- /dev/null
+++ b/desktop/numix-icon-theme/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+numix-icon-theme: numix-icon-theme (official icon theme from the Numix project)
+numix-icon-theme:
+numix-icon-theme: Numix is the official icon theme from the Numix project. It is 
+numix-icon-theme: heavily inspired by, and based upon parts of the Elementary, 
+numix-icon-theme: Humanity and Gnome icon themes. Designed to be used along side the 
+numix-icon-theme: application icon theme Numix Circle.
+numix-icon-theme:
+numix-icon-theme: Home Page: https://github.com/numixproject/numix-icon-theme/
+numix-icon-theme:
+numix-icon-theme:
+numix-icon-theme:
diff --git a/desktop/obbrowser/obbrowser.SlackBuild b/desktop/obbrowser/obbrowser.SlackBuild
index 9ae745c281..64a7fa0610 100644
--- a/desktop/obbrowser/obbrowser.SlackBuild
+++ b/desktop/obbrowser/obbrowser.SlackBuild
@@ -62,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/obkey/obkey.SlackBuild b/desktop/obkey/obkey.SlackBuild
index 004220c8d7..06945aa127 100644
--- a/desktop/obkey/obkey.SlackBuild
+++ b/desktop/obkey/obkey.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
+#
 # Slackware build script for obkey.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -23,7 +24,7 @@
 
 PRGNAM=obkey
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -55,11 +56,13 @@ fi
 
 set -e
 
+SRCVER="v1.0"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -73,10 +76,8 @@ python setup.py install --root=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-DOCS="COPYING NEWS"
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/obkey/obkey.info b/desktop/obkey/obkey.info
index 773e70f427..43e7aed778 100644
--- a/desktop/obkey/obkey.info
+++ b/desktop/obkey/obkey.info
@@ -1,8 +1,8 @@
 PRGNAM="obkey"
 VERSION="1.0"
-HOMEPAGE="http://code.google.com/p/obkey/"
-DOWNLOAD="http://obkey.googlecode.com/files/obkey-1.0.tar.gz"
-MD5SUM="fd11d473d79055af1e68f40c354d233b"
+HOMEPAGE="https://github.com/nsf/obkey/"
+DOWNLOAD="https://github.com/nsf/obkey/archive/v1.0.tar.gz"
+MD5SUM="41686cfe4708fe304a16163496fa05d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/obkey/slack-desc b/desktop/obkey/slack-desc
index fba16495fe..e2165eec35 100644
--- a/desktop/obkey/slack-desc
+++ b/desktop/obkey/slack-desc
@@ -10,7 +10,7 @@ obkey: obkey (Openbox key editor)
 obkey:
 obkey: ObKey is the Openbox Key Editor, written in Python + PyGTK.
 obkey:
-obkey: Home page: http://code.google.com/p/obkey/
+obkey: Home page: https://github.com/nsf/obkey/
 obkey:
 obkey:
 obkey:
diff --git a/desktop/obmenu-generator/obmenu-generator.SlackBuild b/desktop/obmenu-generator/obmenu-generator.SlackBuild
index f463520e4d..ca8992de1b 100644
--- a/desktop/obmenu-generator/obmenu-generator.SlackBuild
+++ b/desktop/obmenu-generator/obmenu-generator.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=obmenu-generator
-VERSION=${VERSION:-0.65}
+VERSION=${VERSION:-0.66}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/obmenu-generator/obmenu-generator.info b/desktop/obmenu-generator/obmenu-generator.info
index 8e33d90334..fbc9ea5458 100644
--- a/desktop/obmenu-generator/obmenu-generator.info
+++ b/desktop/obmenu-generator/obmenu-generator.info
@@ -1,8 +1,8 @@
 PRGNAM="obmenu-generator"
-VERSION="0.65"
+VERSION="0.66"
 HOMEPAGE="https://github.com/trizen/obmenu-generator/"
-DOWNLOAD="https://github.com/trizen/obmenu-generator/archive/0.65.tar.gz"
-MD5SUM="7c2e4a1fe27c1cf86ec26ae90ea25ad4"
+DOWNLOAD="https://github.com/trizen/obmenu-generator/archive/0.66.tar.gz"
+MD5SUM="92e61faeb819f06d337959aabb835e9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-data-dump perl-linux-desktop-files"
diff --git a/desktop/obsession/0001-make-clean-now-revert-to-pre-configure-state.patch b/desktop/obsession/0001-make-clean-now-revert-to-pre-configure-state.patch
new file mode 100644
index 0000000000..21918c8bb0
--- /dev/null
+++ b/desktop/obsession/0001-make-clean-now-revert-to-pre-configure-state.patch
@@ -0,0 +1,29 @@
+From: Fabien Givors <f+debian@chezlefab.net>
+Date: Mon, 13 Oct 2014 19:26:11 +0200
+Subject: make clean now revert to pre-configure state
+-
+Author: Fabien Givors <f+debian@chezlefab.net>
+Forwarded: yes
+Last-Update: 2014-10-13
+
+
+  * make clean remove makefile.mk file
+  * make clean restore default PREFIX in config.h
+---
+ Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index a241804..e8924fd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,6 +48,9 @@ mrproper: clean
+ 
+ clean:
+ 	rm -f obsession-exit obsession-logout xdg-autostart *.o $(I18N_MO)
++	sed -i 's#define PREFIX.*#define PREFIX              "/usr/local"#' config.h
++
++	rm -f makefile.mk
+ 
+ configure:
+ 	sed -i 's#define PREFIX.*#define PREFIX "$(PREFIX)"#' config.h
diff --git a/desktop/obsession/README b/desktop/obsession/README
index 3bb7fd8636..2de2a5be94 100644
--- a/desktop/obsession/README
+++ b/desktop/obsession/README
@@ -2,3 +2,13 @@ obsession (Openbox session tools)
 
 Obsession displays dialog where you can choose if you
 want to quit, power off, suspend or hibernate the computer.
+
+And provides:
+
+ * obsession-logout displays a dialog where you can choose
+if you want to quit the session, power off, suspend or
+hibernate the computer.
+ * obsession-exit: this is the command line version of
+obsession-logout.
+ * xdg-autostart start automatically programs defined in
+/etc/xdg/autostart and ~/.config/autostart.
diff --git a/desktop/obsession/obsession.SlackBuild b/desktop/obsession/obsession.SlackBuild
index 0b8fc54d3b..2a34c6a885 100644
--- a/desktop/obsession/obsession.SlackBuild
+++ b/desktop/obsession/obsession.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
+#
 # Slackware build script for obsession.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -23,7 +24,7 @@
 
 PRGNAM=obsession
 VERSION=${VERSION:-20140608}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,9 +69,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+rm -rf {archlinux,.hg*}
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 
+patch -p1 < $CWD/0001-make-clean-now-revert-to-pre-configure-state.patch
+
 make configure PREFIX=/usr
 make
 make install DESTDIR=$PKG
@@ -78,6 +83,12 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/man/man1
+install -D -m644 {obsession-exit.1,obsession-logout.1,xdg-autostart.1} $PKG/usr/man/man1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 DOCS="AUTHORS COPYING INSTALL README.md TODO"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/openbox-menu/README b/desktop/openbox-menu/README
index 39f000ecd4..fe7c13b617 100644
--- a/desktop/openbox-menu/README
+++ b/desktop/openbox-menu/README
@@ -1,7 +1,16 @@
 openbox-menu (pipemenu for Openbox window manager)
 
-Openbox-menu is a pipemenu for Openbox window manager.
-It provides a dynamic menu listing installed applications.
-Most of the work is done by the LXDE library menu-cache.
+Openbox-menu is a pipemenu for Openbox window manager. It provides a
+dynamic menu listing installed applications. Most of the work is done
+by the LXDE library menu-cache.
 
-Optional dependencies: gnome-menus, lxmenu-data.
+Optional dependencie: gnome-menus.
+
+To use, get a copy of menu.xml located in /usr/doc/openbox-menu-0.7.0
+and put into ~/.config/openbox, after run:
+
+$ openbox --reconfigure
+
+In menu.xml these programs are included (thunar, leafpad, sakura, opera,
+obmenu, obconf, lxappearance, obsession, nitrogen, gmrun), all available
+on SlackBuilds, change if needed.
diff --git a/desktop/openbox-menu/debian_build.patch b/desktop/openbox-menu/debian_build.patch
new file mode 100644
index 0000000000..553825e20d
--- /dev/null
+++ b/desktop/openbox-menu/debian_build.patch
@@ -0,0 +1,15 @@
+Description: Make makefile compatible with Debian's standards.
+Author: Mateusz �ukasik <mati75@linuxmint.pl>
+Last-Update: 2013-11-30
+
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@ CC=gcc
+ CFLAGS+=-DWITH_ICONS
+ # Uncomment this line if Openbox can display SVG icons 
+ # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
+-# CFLAGS+=-DWITH_SVG
++CFLAGS+=-DWITH_SVG
+ 
+ prefix= /usr/local
+ DESTDIR ?= $(prefix)
diff --git a/desktop/openbox-menu/menu.xml-sample b/desktop/openbox-menu/menu.xml-sample
new file mode 100644
index 0000000000..1e7ed3ae55
--- /dev/null
+++ b/desktop/openbox-menu/menu.xml-sample
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <openbox_menu xmlns="http://openbox.org/3.5/menu">
+     <menu execute="/usr/bin/openbox-menu lxde-applications.menu" id="desktop-app-menu" label="Applications"/>
+     <menu id="root-menu" label="Openbox 3">
+         <separator label="OpenBox Menu"/>
+         <menu id="desktop-app-menu"/>
+		<separator/>
+		<item label="File Manager">
+			<action name="Execute">
+				<execute>thunar</execute>
+			</action>
+		</item>
+		<item label="Terminal Emulator">
+			<action name="Execute">
+				<execute>sakura</execute>
+			</action>
+		</item>
+		<item label="Text Editor">
+			<action name="Execute">
+				<execute>leafpad</execute>
+			</action>
+		</item>
+		<item label="Web Browser">
+			<action name="Execute">
+				<execute>opera</execute>
+			</action>
+		</item>
+		<separator/>
+		<menu id="settings" label="Settings">
+			<item label="Change Wallpaper">
+				<action name="Execute">
+					<execute>nitrogen --sort=alpha ~/Images/</execute>
+				</action>
+			</item>
+			<item label="Customize Appearance">
+				<action name="Execute">
+					<execute>lxappearance</execute>
+				</action>
+			</item>
+			<item label="Edit autostart">
+				<action name="Execute">
+					<execute>leafpad ~/.config/openbox/autostart</execute>
+				</action>
+			</item>
+			<item label="Edit menu.xml">
+				<action name="Execute">
+					<execute>leafpad ~/.config/openbox/menu.xml</execute>
+				</action>
+			</item>
+			<item label="Edit rc.xml">
+				<action name="Execute">
+					<execute>leafpad ~/.config/openbox/rc.xml</execute>
+				</action>
+			</item>
+			<item label="Edit xinitrc">
+				<action name="Execute">
+					<execute>leafpad ~/.xinitrc</execute>
+				</action>
+			</item>
+			<item label="Edit OpenBox Menu">
+				<action name="Execute">
+					<execute>obmenu</execute>
+				</action>
+			</item>
+			<item label="OpenBox Config Tool">
+				<action name="Execute">
+					<execute>obconf</execute>
+				</action>
+			</item>
+			<item label="Reconfigure OpenBox">
+				<action name="Reconfigure"/>
+			</item>
+			<item label="Restart OpenBox">
+				<action name="Restart"/>
+			</item>
+		</menu>
+		<separator/>
+		<item label="Execute">
+			<action name="Execute">
+				<execute>gmrun</execute>
+			</action>
+		</item>
+		<separator/>
+		<item label="Exit">
+			<action name="Execute">
+				<execute>obsession-logout</execute>
+			</action>
+		</item>
+	</menu>
+</openbox_menu>
diff --git a/desktop/openbox-menu/openbox-menu.1 b/desktop/openbox-menu/openbox-menu.1
new file mode 100644
index 0000000000..a496936d53
--- /dev/null
+++ b/desktop/openbox-menu/openbox-menu.1
@@ -0,0 +1,45 @@
+.TH OPENBOX-MENU "1" "November 2013"
+.SH NAME
+openbox-menu \- Openbox pipe-menu to display entries in *.desktop files
+.SH DESCRIPTION
+.SS "Usage:"
+.TP
+openbox\-menu [OPTION...] [file.menu]
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+.SS "Application Options:"
+.TP
+\fB\-c\fR, \fB\-\-comment\fR
+Show generic name instead of application name
+.TP
+\fB\-t\fR, \fB\-\-terminal\fR=\fIcmd\fR
+Terminal command (default xterm \fB\-e\fR)
+.TP
+\fB\-g\fR, \fB\-\-gnome\fR
+Show GNOME entries
+.TP
+\fB\-k\fR, \fB\-\-kde\fR
+Show KDE entries
+.TP
+\fB\-x\fR, \fB\-\-xfce\fR
+Show XFCE entries
+.TP
+\fB\-r\fR, \fB\-\-rox\fR
+Show ROX entries
+.TP
+\fB\-p\fR, \fB\-\-persistent\fR
+stay active
+.TP
+\fB\-s\fR, \fB\-\-sn\fR
+Enable startup notification
+.TP
+\fB\-o\fR, \fB\-\-output\fR
+file to write data to
+.TP
+\fB\-i\fR, \fB\-\-noicons\fR
+Don't display icons in menu
+.PP
+This manual page was written by Mateusz �ukasik <mati75@linuxmint.pl>,
+for the Debian project (and may be used by others).
diff --git a/desktop/openbox-menu/openbox-menu.SlackBuild b/desktop/openbox-menu/openbox-menu.SlackBuild
index 2882509fbd..768ae01d09 100644
--- a/desktop/openbox-menu/openbox-menu.SlackBuild
+++ b/desktop/openbox-menu/openbox-menu.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
+#
 # Slackware build script for openbox-menu.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -22,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openbox-menu
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,25 +69,36 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+rm -rf {archlinux,.hg*}
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 
+patch -p1 < $CWD/debian_build.patch
+
 make PREFIX=/usr
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+rm -rf $PKG/bin
+install -d $PKG/usr/bin
+install -D -m755 openbox-menu $PKG/usr/bin/openbox-menu
+
+install -d $PKG/usr/man/man1
+install -D -m644 $CWD/openbox-menu.1 $PKG/usr/man/man1/openbox-menu.1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 DOCS="AUTHORS ChangeLog COPYING README.md THANKS TODO"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $CWD/menu.xml-sample $PKG/usr/doc/$PRGNAM-$VERSION/menu.xml-sample
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-rm -rf $PKG/bin
-mkdir -p $PKG/usr/bin
-cp openbox-menu $PKG/usr/bin
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/desktop/openbox-menu/openbox-menu.info b/desktop/openbox-menu/openbox-menu.info
index 85a04b9a40..5d31bb601d 100644
--- a/desktop/openbox-menu/openbox-menu.info
+++ b/desktop/openbox-menu/openbox-menu.info
@@ -1,10 +1,10 @@
 PRGNAM="openbox-menu"
-VERSION="0.7.0"
+VERSION="0.8.0"
 HOMEPAGE="https://bitbucket.org/fabriceT/openbox-menu/"
-DOWNLOAD="https://bitbucket.org/fabriceT/openbox-menu/downloads/openbox-menu-0.7.0.tar.bz2"
-MD5SUM="bd7e746452931e48340788c9e8ececa4"
+DOWNLOAD="https://bitbucket.org/fabriceT/openbox-menu/downloads/openbox-menu-0.8.0.tar.bz2"
+MD5SUM="0d6f907adf2d47dd4d4198c0ff14721d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="menu-cache"
+REQUIRES="menu-cache lxmenu-data"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/openbox-simple-theme/README b/desktop/openbox-simple-theme/README
new file mode 100644
index 0000000000..d15545acd7
--- /dev/null
+++ b/desktop/openbox-simple-theme/README
@@ -0,0 +1,5 @@
+openbox-simple-theme (A Simple Grey Openbox Theme)
+
+OpenBox Simple is a simple theme for GTK2|GTK3, XFCE and OpenBox.
+
+Optional dependencies: gtk-engines, gtk-engines-unico, murrine.
diff --git a/desktop/openbox-simple-theme/doinst.sh b/desktop/openbox-simple-theme/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/openbox-simple-theme/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/openbox-simple-theme/openbox-simple-theme.SlackBuild b/desktop/openbox-simple-theme/openbox-simple-theme.SlackBuild
new file mode 100644
index 0000000000..6b9d491f3f
--- /dev/null
+++ b/desktop/openbox-simple-theme/openbox-simple-theme.SlackBuild
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Slackware build script for openbox-simple-theme.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="openbox-simple-theme"
+VERSION=${VERSION:-20160104}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCNAM="171403-openbox-simple"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM.tar.gz
+mv simple\ openbox\ theme $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+mkdir -p $PKG/usr/share/themes
+cp -a Simple $PKG/usr/share/themes/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/openbox-simple-theme/openbox-simple-theme.info b/desktop/openbox-simple-theme/openbox-simple-theme.info
new file mode 100644
index 0000000000..e54e237563
--- /dev/null
+++ b/desktop/openbox-simple-theme/openbox-simple-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="openbox-simple-theme"
+VERSION="20160104"
+HOMEPAGE="http://box-look.org/content/show.php/Openbox-Simple?content=171403"
+DOWNLOAD="https://www.dropbox.com/s/ymnqdyi6koeynog/171403-openbox-simple.tar.gz"
+MD5SUM="610533acef59f70cd584dacb28560490"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/openbox-simple-theme/slack-desc b/desktop/openbox-simple-theme/slack-desc
new file mode 100644
index 0000000000..6c3f0a4ecb
--- /dev/null
+++ b/desktop/openbox-simple-theme/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+openbox-simple-theme: openbox-simple-theme (A Simple Grey Openbox Theme)
+openbox-simple-theme:
+openbox-simple-theme: OpenBox Simple is a simple theme for GTK2|GTK3, XFCE and OpenBox.
+openbox-simple-theme:
+openbox-simple-theme: Home page: http://goo.gl/I0jk9A
+openbox-simple-theme:
+openbox-simple-theme:
+openbox-simple-theme:
+openbox-simple-theme:
+openbox-simple-theme:
+openbox-simple-theme:
diff --git a/desktop/orchis-gtk-theme/README b/desktop/orchis-gtk-theme/README
new file mode 100644
index 0000000000..7b6d4e8df0
--- /dev/null
+++ b/desktop/orchis-gtk-theme/README
@@ -0,0 +1,5 @@
+orchis-gtk-theme (Orchis is a modern GTK3 theme for Linux)
+
+Orchis is an GTK3 theme belonging to the Moka Project.
+
+Orchis GTK Theme is distributed under the terms the GNU GPL v.3
diff --git a/desktop/orchis-gtk-theme/doinst.sh b/desktop/orchis-gtk-theme/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/orchis-gtk-theme/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/orchis-gtk-theme/orchis-gtk-theme.SlackBuild b/desktop/orchis-gtk-theme/orchis-gtk-theme.SlackBuild
new file mode 100644
index 0000000000..02f311b473
--- /dev/null
+++ b/desktop/orchis-gtk-theme/orchis-gtk-theme.SlackBuild
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Slackware build script for orchis-gtk-theme.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="orchis-gtk-theme"
+VERSION=${VERSION:-3.0.22}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+CWD=$(pwd)
+
+set -e
+
+SRCVER="v3.0.22"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+# remove unity files.
+rm -rf Orchis/unity Orchis-Dark/unity
+
+mkdir -p $PKG/usr/share/themes
+cp -a Orchis Orchis-Dark $PKG/usr/share/themes
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/orchis-gtk-theme/orchis-gtk-theme.info b/desktop/orchis-gtk-theme/orchis-gtk-theme.info
new file mode 100644
index 0000000000..384d195a91
--- /dev/null
+++ b/desktop/orchis-gtk-theme/orchis-gtk-theme.info
@@ -0,0 +1,10 @@
+PRGNAM="orchis-gtk-theme"
+VERSION="3.0.22"
+HOMEPAGE="https://github.com/moka-project/orchis-gtk-theme"
+DOWNLOAD="https://github.com/moka-project/orchis-gtk-theme/archive/v3.0.22.tar.gz"
+MD5SUM="767b436b5e36b47914ed88bbc3fbb91b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/orchis-gtk-theme/slack-desc b/desktop/orchis-gtk-theme/slack-desc
new file mode 100644
index 0000000000..7e5537c4b1
--- /dev/null
+++ b/desktop/orchis-gtk-theme/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+orchis-gtk-theme: orchis-gtk-theme (modern GTK3 theme for Linux)
+orchis-gtk-theme:
+orchis-gtk-theme: Orchis is an GTK3 theme belonging to the Moka Project.
+orchis-gtk-theme:
+orchis-gtk-theme: Home page: https://github.com/moka-project/orchis-gtk-theme/
+orchis-gtk-theme:
+orchis-gtk-theme:
+orchis-gtk-theme:
+orchis-gtk-theme:
+orchis-gtk-theme:
+orchis-gtk-theme:
diff --git a/desktop/perwindowlayoutd/README b/desktop/perwindowlayoutd/README
new file mode 100644
index 0000000000..e7a04b696d
--- /dev/null
+++ b/desktop/perwindowlayoutd/README
@@ -0,0 +1,5 @@
+Sometimes you want to setup switching keyboard layouts using X server - because
+there is no DE plugin, or it's broken, or lacks needed functionality.  You can
+easily configure X server to switch keyboard layouts, but I could not find way
+of keeping layout for each window separately using only X server.  Hence this
+package.
diff --git a/desktop/perwindowlayoutd/perwindowlayoutd.SlackBuild b/desktop/perwindowlayoutd/perwindowlayoutd.SlackBuild
new file mode 100644
index 0000000000..2242fe96f5
--- /dev/null
+++ b/desktop/perwindowlayoutd/perwindowlayoutd.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for perwindowlayoutd
+
+# Copyright 2015, Alexander Verbovetsky, Moscow, Russia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perwindowlayoutd
+VERSION=${VERSION:-0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --build=$ARCH-slackware-linux
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/perwindowlayoutd/perwindowlayoutd.info b/desktop/perwindowlayoutd/perwindowlayoutd.info
new file mode 100644
index 0000000000..ca2831f2bb
--- /dev/null
+++ b/desktop/perwindowlayoutd/perwindowlayoutd.info
@@ -0,0 +1,10 @@
+PRGNAM="perwindowlayoutd"
+VERSION="0.6"
+HOMEPAGE="http://sourceforge.net/projects/perwindowlayout/"
+DOWNLOAD="http://downloads.sourceforge.net/project/perwindowlayout/perwindowlayoutd-0.6.tar.gz"
+MD5SUM="5a0172bf1351e1de2dc3c29363859550"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/desktop/perwindowlayoutd/slack-desc b/desktop/perwindowlayoutd/slack-desc
new file mode 100644
index 0000000000..6fe46ce72f
--- /dev/null
+++ b/desktop/perwindowlayoutd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+perwindowlayoutd: perwindowlayoutd (Keeps per window keyboard layout under X11)
+perwindowlayoutd:
+perwindowlayoutd: Sometimes you want to setup switching keyboard layouts using
+perwindowlayoutd: X server - because there is no DE plugin, or it's broken, or
+perwindowlayoutd: lacks needed functionality.  You can easily configure X
+perwindowlayoutd: server to switch keyboard layouts, but I could not find way
+perwindowlayoutd: of keeping layout for each window separately using only X
+perwindowlayoutd: server.  Hence this package.
+perwindowlayoutd:
+perwindowlayoutd: Homepage: http://sourceforge.net/projects/perwindowlayout/
+perwindowlayoutd:
diff --git a/desktop/plank/README b/desktop/plank/README
new file mode 100644
index 0000000000..f5d4ce91a0
--- /dev/null
+++ b/desktop/plank/README
@@ -0,0 +1,12 @@
+plank (Elegant, simple, clean dock)
+
+Plank is meant to be the simplest dock on the planet.
+
+The goal is to provide just what a dock needs and absolutely nothing 
+more. It is, however, a library which can be extended to create other
+dock programs with more advanced features.
+
+Thus, Plank is the underlying technology for Docky (starting in 
+version 3.0.0) and aims to provide all the core features while Docky 
+extends it to add fancier things like Docklets, painters, settings 
+dialogs, etc.
diff --git a/desktop/plank/doinst.sh b/desktop/plank/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/plank/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/plank/plank.SlackBuild b/desktop/plank/plank.SlackBuild
new file mode 100644
index 0000000000..bb176920cb
--- /dev/null
+++ b/desktop/plank/plank.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+#
+# Slackware build script for plank.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=plank
+VERSION=${VERSION:-0.10.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-silent-rules \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCS="AUTHORS ChangeLog COPYING COPYING.LGPL2.1 COPYRIGHT HACKING INSTALL NEWS README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/plank/plank.info b/desktop/plank/plank.info
new file mode 100644
index 0000000000..2f4efc5e19
--- /dev/null
+++ b/desktop/plank/plank.info
@@ -0,0 +1,10 @@
+PRGNAM="plank"
+VERSION="0.10.1"
+HOMEPAGE="https://launchpad.net/plank"
+DOWNLOAD="https://launchpad.net/plank/1.0/0.10.1/+download/plank-0.10.1.tar.xz"
+MD5SUM="fa3f74d20394429c3e4ac4fe8105a998"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="bamf libgee libdbusmenu gnome-common"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/plank/slack-desc b/desktop/plank/slack-desc
new file mode 100644
index 0000000000..ce56768c1f
--- /dev/null
+++ b/desktop/plank/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+plank: plank (Elegant, simple, clean dock)
+plank:
+plank: Plank is meant to be the simplest dock on the planet.
+plank:
+plank: The goal is to provide just what a dock needs and absolutely nothing 
+plank: more. It is, however, a library which can be extended to create other
+plank: dock programs with more advanced features.
+plank:
+plank: Home page: https://launchpad.net/plank
+plank:
+plank:
diff --git a/desktop/pspshrink/README b/desktop/pspshrink/README
new file mode 100644
index 0000000000..66387debea
--- /dev/null
+++ b/desktop/pspshrink/README
@@ -0,0 +1,6 @@
+pspshrink (ISO compressor for PSP games).
+
+pspshrink it's a GUI for convert PSP game images into a .cso format, it allows you 
+to shrink your isos to the cso format which is compatible with Devhook.
+
+An alternative to pspshrink is "ciso", a command-line tool also available on SlackBuilds.
diff --git a/desktop/pspshrink/doinst.sh b/desktop/pspshrink/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/desktop/pspshrink/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/pspshrink/pspshrink.SlackBuild b/desktop/pspshrink/pspshrink.SlackBuild
new file mode 100644
index 0000000000..3b1f84b9e1
--- /dev/null
+++ b/desktop/pspshrink/pspshrink.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# Slackware build script for pspshrink.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pspshrink
+VERSION=${VERSION:-1.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+DOCS="AUTHORS ChangeLog COPYING INSTALL README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/pspshrink/pspshrink.info b/desktop/pspshrink/pspshrink.info
new file mode 100644
index 0000000000..7902abed05
--- /dev/null
+++ b/desktop/pspshrink/pspshrink.info
@@ -0,0 +1,10 @@
+PRGNAM="pspshrink"
+VERSION="1.1.2"
+HOMEPAGE="https://code.google.com/p/pspshrink/"
+DOWNLOAD="https://pspshrink.googlecode.com/files/pspshrink-1.1.2.tar.gz"
+MD5SUM="c9f7dc58c983016047ceebbacb9856e9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gtkmm"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/pspshrink/slack-desc b/desktop/pspshrink/slack-desc
new file mode 100644
index 0000000000..e3eaf405ea
--- /dev/null
+++ b/desktop/pspshrink/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pspshrink: pspshrink (ISO compressor for PSP games)
+pspshrink:
+pspshrink: pspshrink is a GUI for convert PSP game images into a .cso format.
+pspshrink:
+pspshrink: Home page: https://code.google.com/p/pspshrink/
+pspshrink:
+pspshrink:
+pspshrink:
+pspshrink:
+pspshrink:
+pspshrink:
diff --git a/desktop/py3status/py3status.SlackBuild b/desktop/py3status/py3status.SlackBuild
index 9b648ad5f3..0d41a01f20 100644
--- a/desktop/py3status/py3status.SlackBuild
+++ b/desktop/py3status/py3status.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for py3status
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=py3status
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/py3status/py3status.info b/desktop/py3status/py3status.info
index 575721553c..d950457722 100644
--- a/desktop/py3status/py3status.info
+++ b/desktop/py3status/py3status.info
@@ -1,8 +1,8 @@
 PRGNAM="py3status"
-VERSION="2.4"
+VERSION="2.8"
 HOMEPAGE="https://github.com/ultrabug/py3status"
-DOWNLOAD="https://pypi.python.org/packages/source/p/py3status/py3status-2.4.tar.gz"
-MD5SUM="dde68ddbe9bb7d8d049555dd69249fd3"
+DOWNLOAD="https://pypi.python.org/packages/source/p/py3status/py3status-2.8.tar.gz"
+MD5SUM="d844202b6518bece40a4ce44c5c08f42"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/desktop/recoll/recoll.SlackBuild b/desktop/recoll/recoll.SlackBuild
index 6a6ce3d31e..28781cdd7c 100644
--- a/desktop/recoll/recoll.SlackBuild
+++ b/desktop/recoll/recoll.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by the SlackBuilds.org Project
 
 PRGNAM=recoll
-VERSION=${VERSION:-1.19.14p2}
+VERSION=${VERSION:-1.21.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/recoll/recoll.info b/desktop/recoll/recoll.info
index 670f0e8267..c06428e5a7 100644
--- a/desktop/recoll/recoll.info
+++ b/desktop/recoll/recoll.info
@@ -1,8 +1,8 @@
 PRGNAM="recoll"
-VERSION="1.19.14p2"
+VERSION="1.21.2"
 HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-DOWNLOAD="http://www.lesbonscomptes.com/recoll/recoll-1.19.14p2.tar.gz"
-MD5SUM="438c38c12c0b6eadc96465e08b08d0d2"
+DOWNLOAD="http://www.lesbonscomptes.com/recoll/recoll-1.21.2.tar.gz"
+MD5SUM="4e3e6d381ccc341c872f7d0fc64523d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xapian-core"
diff --git a/desktop/seafile-gui/seafile-gui.SlackBuild b/desktop/seafile-gui/seafile-gui.SlackBuild
index 546b5ff62f..9b7e62a867 100644
--- a/desktop/seafile-gui/seafile-gui.SlackBuild
+++ b/desktop/seafile-gui/seafile-gui.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=seafile-gui
 SRCNAM=seafile-client
-VERSION=${VERSION:-4.2.3}
+VERSION=${VERSION:-4.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/seafile-gui/seafile-gui.info b/desktop/seafile-gui/seafile-gui.info
index 47dba4cdff..a878209924 100644
--- a/desktop/seafile-gui/seafile-gui.info
+++ b/desktop/seafile-gui/seafile-gui.info
@@ -1,8 +1,8 @@
 PRGNAM="seafile-gui"
-VERSION="4.2.3"
+VERSION="4.4.2"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v4.2.3.tar.gz"
-MD5SUM="7ce06797baf7282cb607429758e7fa92"
+DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v4.4.2.tar.gz"
+MD5SUM="8749f059e9209df31e662c9325c735e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="seafile-client"
diff --git a/desktop/slock/patches/0001-applied-Dimitris-style-patch-from-Dec-14-with-some-m.patch b/desktop/slock/patches/0001-applied-Dimitris-style-patch-from-Dec-14-with-some-m.patch
new file mode 100644
index 0000000000..d92e14925b
--- /dev/null
+++ b/desktop/slock/patches/0001-applied-Dimitris-style-patch-from-Dec-14-with-some-m.patch
@@ -0,0 +1,316 @@
+From a31b9191111572dafaa8366415b89a4472aa4626 Mon Sep 17 00:00:00 2001
+From: Anselm R Garbe <garbeam@gmail.com>
+Date: Tue, 27 Jan 2015 22:16:52 +0100
+Subject: [PATCH 1/9] applied Dimitris' style patch from Dec'14, with some
+ minor modifications
+
+---
+ slock.c | 112 ++++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 60 insertions(+), 52 deletions(-)
+
+diff --git a/slock.c b/slock.c
+index face75e..407a540 100644
+--- a/slock.c
++++ b/slock.c
+@@ -1,4 +1,3 @@
+-
+ /* See LICENSE file for license details. */
+ #define _XOPEN_SOURCE 500
+ #if HAVE_SHADOW_H
+@@ -37,20 +36,22 @@ static int nscreens;
+ static Bool running = True;
+ 
+ static void
+-die(const char *errstr, ...) {
++die(const char *errstr, ...)
++{
+ 	va_list ap;
+ 
+ 	va_start(ap, errstr);
+ 	vfprintf(stderr, errstr, ap);
+ 	va_end(ap);
+-	exit(EXIT_FAILURE);
++	exit(1);
+ }
+ 
+ #ifdef __linux__
+ #include <fcntl.h>
+ 
+ static void
+-dontkillme(void) {
++dontkillme(void)
++{
+ 	int fd;
+ 
+ 	fd = open("/proc/self/oom_score_adj", O_WRONLY);
+@@ -62,8 +63,10 @@ dontkillme(void) {
+ #endif
+ 
+ #ifndef HAVE_BSD_AUTH
++/* only run as root */
+ static const char *
+-getpw(void) { /* only run as root */
++getpw(void)
++{
+ 	const char *rval;
+ 	struct passwd *pw;
+ 
+@@ -73,7 +76,7 @@ getpw(void) { /* only run as root */
+ 		if (errno)
+ 			die("slock: getpwuid: %s\n", strerror(errno));
+ 		else
+-			die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n");
++			die("slock: cannot retrieve password entry\n");
+ 	}
+ 	rval =  pw->pw_passwd;
+ 
+@@ -81,15 +84,15 @@ getpw(void) { /* only run as root */
+ 	if (rval[0] == 'x' && rval[1] == '\0') {
+ 		struct spwd *sp;
+ 		sp = getspnam(getenv("USER"));
+-		if(!sp)
++		if (!sp)
+ 			die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
+ 		rval = sp->sp_pwdp;
+ 	}
+ #endif
+ 
+ 	/* drop privileges */
+-	if (geteuid() == 0
+-	   && ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
++	if (geteuid() == 0 &&
++	    ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
+ 		die("slock: cannot drop privileges\n");
+ 	return rval;
+ }
+@@ -115,21 +118,23 @@ readpw(Display *dpy, const char *pws)
+ 	 * had been removed and you can set it with "xset" or some other
+ 	 * utility. This way the user can easily set a customized DPMS
+ 	 * timeout. */
+-	while(running && !XNextEvent(dpy, &ev)) {
+-		if(ev.type == KeyPress) {
++	while (running && !XNextEvent(dpy, &ev)) {
++		if (ev.type == KeyPress) {
+ 			buf[0] = 0;
+ 			num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
+-			if(IsKeypadKey(ksym)) {
+-				if(ksym == XK_KP_Enter)
++			if (IsKeypadKey(ksym)) {
++				if (ksym == XK_KP_Enter)
+ 					ksym = XK_Return;
+-				else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
++				else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
+ 					ksym = (ksym - XK_KP_0) + XK_0;
+ 			}
+-			if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
+-					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
+-					|| IsPrivateKeypadKey(ksym))
++			if (IsFunctionKey(ksym) ||
++			    IsKeypadKey(ksym) ||
++			    IsMiscFunctionKey(ksym) ||
++			    IsPFKey(ksym) ||
++			    IsPrivateKeypadKey(ksym))
+ 				continue;
+-			switch(ksym) {
++			switch (ksym) {
+ 			case XK_Return:
+ 				passwd[len] = 0;
+ #ifdef HAVE_BSD_AUTH
+@@ -137,7 +142,7 @@ readpw(Display *dpy, const char *pws)
+ #else
+ 				running = !!strcmp(crypt(passwd, pws), pws);
+ #endif
+-				if(running)
++				if (running)
+ 					XBell(dpy, 100);
+ 				len = 0;
+ 				break;
+@@ -145,36 +150,37 @@ readpw(Display *dpy, const char *pws)
+ 				len = 0;
+ 				break;
+ 			case XK_BackSpace:
+-				if(len)
++				if (len)
+ 					--len;
+ 				break;
+ 			default:
+-				if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
++				if (num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
+ 					memcpy(passwd + len, buf, num);
+ 					len += num;
+ 				}
+ 				break;
+ 			}
+-			if(llen == 0 && len != 0) {
+-				for(screen = 0; screen < nscreens; screen++) {
++			if (llen == 0 && len != 0) {
++				for (screen = 0; screen < nscreens; screen++) {
+ 					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]);
+ 					XClearWindow(dpy, locks[screen]->win);
+ 				}
+-			} else if(llen != 0 && len == 0) {
+-				for(screen = 0; screen < nscreens; screen++) {
++			} else if (llen != 0 && len == 0) {
++				for (screen = 0; screen < nscreens; screen++) {
+ 					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
+ 					XClearWindow(dpy, locks[screen]->win);
+ 				}
+ 			}
+ 			llen = len;
+ 		}
+-		else for(screen = 0; screen < nscreens; screen++)
++		else for (screen = 0; screen < nscreens; screen++)
+ 			XRaiseWindow(dpy, locks[screen]->win);
+ 	}
+ }
+ 
+ static void
+-unlockscreen(Display *dpy, Lock *lock) {
++unlockscreen(Display *dpy, Lock *lock)
++{
+ 	if(dpy == NULL || lock == NULL)
+ 		return;
+ 
+@@ -187,7 +193,8 @@ unlockscreen(Display *dpy, Lock *lock) {
+ }
+ 
+ static Lock *
+-lockscreen(Display *dpy, int screen) {
++lockscreen(Display *dpy, int screen)
++{
+ 	char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+ 	unsigned int len;
+ 	Lock *lock;
+@@ -195,11 +202,11 @@ lockscreen(Display *dpy, int screen) {
+ 	XSetWindowAttributes wa;
+ 	Cursor invisible;
+ 
+-	if(dpy == NULL || screen < 0)
++	if (dpy == NULL || screen < 0)
+ 		return NULL;
+ 
+ 	lock = malloc(sizeof(Lock));
+-	if(lock == NULL)
++	if (lock == NULL)
+ 		return NULL;
+ 
+ 	lock->screen = screen;
+@@ -210,8 +217,8 @@ lockscreen(Display *dpy, int screen) {
+ 	wa.override_redirect = 1;
+ 	wa.background_pixel = BlackPixel(dpy, lock->screen);
+ 	lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
+-			0, DefaultDepth(dpy, lock->screen), CopyFromParent,
+-			DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
++	                          0, DefaultDepth(dpy, lock->screen), CopyFromParent,
++	                          DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
+ 	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
+ 	lock->colors[1] = color.pixel;
+ 	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
+@@ -220,36 +227,37 @@ lockscreen(Display *dpy, int screen) {
+ 	invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
+ 	XDefineCursor(dpy, lock->win, invisible);
+ 	XMapRaised(dpy, lock->win);
+-	for(len = 1000; len; len--) {
+-		if(XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+-			GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
++	for (len = 1000; len; len--) {
++		if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
++		    GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+ 			break;
+ 		usleep(1000);
+ 	}
+-	if(running && (len > 0)) {
+-		for(len = 1000; len; len--) {
+-			if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+-				== GrabSuccess)
++	if (running && (len > 0)) {
++		for (len = 1000; len; len--) {
++			if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
+ 				break;
+ 			usleep(1000);
+ 		}
+ 	}
+ 
+ 	running &= (len > 0);
+-	if(!running) {
++	if (!running) {
+ 		unlockscreen(dpy, lock);
+ 		lock = NULL;
+ 	}
+-	else 
++	else {
+ 		XSelectInput(dpy, lock->root, SubstructureNotifyMask);
++	}
+ 
+ 	return lock;
+ }
+ 
+ static void
+-usage(void) {
++usage(void)
++{
+ 	fprintf(stderr, "usage: slock [-v]\n");
+-	exit(EXIT_FAILURE);
++	exit(1);
+ }
+ 
+ int
+@@ -260,38 +268,38 @@ main(int argc, char **argv) {
+ 	Display *dpy;
+ 	int screen;
+ 
+-	if((argc == 2) && !strcmp("-v", argv[1]))
+-		die("slock-%s, © 2006-2014 slock engineers\n", VERSION);
+-	else if(argc != 1)
++	if ((argc == 2) && !strcmp("-v", argv[1]))
++		die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
++	else if (argc != 1)
+ 		usage();
+ 
+ #ifdef __linux__
+ 	dontkillme();
+ #endif
+ 
+-	if(!getpwuid(getuid()))
++	if (!getpwuid(getuid()))
+ 		die("slock: no passwd entry for you\n");
+ 
+ #ifndef HAVE_BSD_AUTH
+ 	pws = getpw();
+ #endif
+ 
+-	if(!(dpy = XOpenDisplay(0)))
++	if (!(dpy = XOpenDisplay(0)))
+ 		die("slock: cannot open display\n");
+ 	/* Get the number of screens in display "dpy" and blank them all. */
+ 	nscreens = ScreenCount(dpy);
+ 	locks = malloc(sizeof(Lock *) * nscreens);
+-	if(locks == NULL)
++	if (locks == NULL)
+ 		die("slock: malloc: %s\n", strerror(errno));
+ 	int nlocks = 0;
+-	for(screen = 0; screen < nscreens; screen++) {
++	for (screen = 0; screen < nscreens; screen++) {
+ 		if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)
+ 			nlocks++;
+ 	}
+ 	XSync(dpy, False);
+ 
+ 	/* Did we actually manage to lock something? */
+-	if (nlocks == 0) { // nothing to protect
++	if (nlocks == 0) { /* nothing to protect */
+ 		free(locks);
+ 		XCloseDisplay(dpy);
+ 		return 1;
+@@ -305,7 +313,7 @@ main(int argc, char **argv) {
+ #endif
+ 
+ 	/* Password ok, unlock everything and quit. */
+-	for(screen = 0; screen < nscreens; screen++)
++	for (screen = 0; screen < nscreens; screen++)
+ 		unlockscreen(dpy, locks[screen]);
+ 
+ 	free(locks);
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0002-Blank-the-screen-with-color-0-add-third-color-for-fa.patch b/desktop/slock/patches/0002-Blank-the-screen-with-color-0-add-third-color-for-fa.patch
new file mode 100644
index 0000000000..14d649f942
--- /dev/null
+++ b/desktop/slock/patches/0002-Blank-the-screen-with-color-0-add-third-color-for-fa.patch
@@ -0,0 +1,119 @@
+From f2ea92c3ddf1d9476ef61f85ec3aa26818d094a1 Mon Sep 17 00:00:00 2001
+From: David Phillips <dbphillipsnz@gmail.com>
+Date: Thu, 12 Feb 2015 11:56:35 +1300
+Subject: [PATCH 2/9] Blank the screen with color 0, add third color for failed
+ logins
+
+- Adds another color in config.def.h, COLOR_INIT
+- Renames the colours from numerical ones to ones with meaningful names;
+  COLOR_INPUT for when there is content in the input buffer and COLOR_EMPTY
+  for when the input buffer has been cleared (backspaced or a failed attempt).
+- Ensures XFreeColors frees the right number of colours. This is now derived
+  from the size of `Lock->colors` rather than being an integer literal.
+- Makes slock exhibit the behaviour described by Markus
+
+The default colours are the same as the ones slock currently uses, with the
+exception of the new color, which I have set to red, as it indicates someone
+has either failed an attempt to unlock, or that they have entered input and
+erased it all.
+---
+ config.def.h |  7 +++++--
+ slock.c      | 27 ++++++++++++++++++---------
+ 2 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 89e5977..4bccb5d 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -1,2 +1,5 @@
+-#define COLOR1 "black"
+-#define COLOR2 "#005577"
++static const char *colorname[NUMCOLS] = {
++	"black",     /* after initialization */
++	"#005577",   /* during input */
++	"#CC3333",   /* failed/cleared the input */
++};
+diff --git a/slock.c b/slock.c
+index 407a540..df5c3fe 100644
+--- a/slock.c
++++ b/slock.c
+@@ -22,13 +22,20 @@
+ #include <bsd_auth.h>
+ #endif
+ 
++enum {
++	INIT,
++	INPUT,
++	EMPTY,
++	NUMCOLS
++};
++
+ #include "config.h"
+ 
+ typedef struct {
+ 	int screen;
+ 	Window root, win;
+ 	Pixmap pmap;
+-	unsigned long colors[2];
++	unsigned long colors[NUMCOLS];
+ } Lock;
+ 
+ static Lock **locks;
+@@ -162,12 +169,12 @@ readpw(Display *dpy, const char *pws)
+ 			}
+ 			if (llen == 0 && len != 0) {
+ 				for (screen = 0; screen < nscreens; screen++) {
+-					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]);
++					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[INPUT]);
+ 					XClearWindow(dpy, locks[screen]->win);
+ 				}
+ 			} else if (llen != 0 && len == 0) {
+ 				for (screen = 0; screen < nscreens; screen++) {
+-					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
++					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[EMPTY]);
+ 					XClearWindow(dpy, locks[screen]->win);
+ 				}
+ 			}
+@@ -185,7 +192,7 @@ unlockscreen(Display *dpy, Lock *lock)
+ 		return;
+ 
+ 	XUngrabPointer(dpy, CurrentTime);
+-	XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
++	XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, NUMCOLS, 0);
+ 	XFreePixmap(dpy, lock->pmap);
+ 	XDestroyWindow(dpy, lock->win);
+ 
+@@ -197,6 +204,7 @@ lockscreen(Display *dpy, int screen)
+ {
+ 	char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+ 	unsigned int len;
++	int i;
+ 	Lock *lock;
+ 	XColor color, dummy;
+ 	XSetWindowAttributes wa;
+@@ -213,16 +221,17 @@ lockscreen(Display *dpy, int screen)
+ 
+ 	lock->root = RootWindow(dpy, lock->screen);
+ 
++	for (i = 0; i < NUMCOLS; i++) {
++		XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i], &color, &dummy);
++		lock->colors[i] = color.pixel;
++	}
++
+ 	/* init */
+ 	wa.override_redirect = 1;
+-	wa.background_pixel = BlackPixel(dpy, lock->screen);
++	wa.background_pixel = lock->colors[INIT];
+ 	lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
+ 	                          0, DefaultDepth(dpy, lock->screen), CopyFromParent,
+ 	                          DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
+-	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
+-	lock->colors[1] = color.pixel;
+-	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
+-	lock->colors[0] = color.pixel;
+ 	lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
+ 	invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
+ 	XDefineCursor(dpy, lock->win, invisible);
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0003-resize-lockscreen-window-after-Xrandr-resize.patch b/desktop/slock/patches/0003-resize-lockscreen-window-after-Xrandr-resize.patch
new file mode 100644
index 0000000000..4b74350fca
--- /dev/null
+++ b/desktop/slock/patches/0003-resize-lockscreen-window-after-Xrandr-resize.patch
@@ -0,0 +1,83 @@
+From f5ef1b8eb5555da11e81d92d8d05acd4aba1ef40 Mon Sep 17 00:00:00 2001
+From: Markus Teich <markus.teich@stusta.mhn.de>
+Date: Wed, 25 Feb 2015 23:06:45 +0100
+Subject: [PATCH 3/9] resize lockscreen window after Xrandr resize
+
+---
+ config.mk |  2 +-
+ slock.c   | 18 ++++++++++++++++--
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index 067cfc7..44e41c6 100644
+--- a/config.mk
++++ b/config.mk
+@@ -11,7 +11,7 @@ X11LIB = /usr/X11R6/lib
+ 
+ # includes and libs
+ INCS = -I. -I/usr/include -I${X11INC}
+-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
++LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
+diff --git a/slock.c b/slock.c
+index df5c3fe..6502c86 100644
+--- a/slock.c
++++ b/slock.c
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <X11/extensions/Xrandr.h>
+ #include <X11/keysym.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -41,6 +42,9 @@ typedef struct {
+ static Lock **locks;
+ static int nscreens;
+ static Bool running = True;
++static Bool rr;
++static int rrevbase;
++static int rrerrbase;
+ 
+ static void
+ die(const char *errstr, ...)
+@@ -179,8 +183,15 @@ readpw(Display *dpy, const char *pws)
+ 				}
+ 			}
+ 			llen = len;
+-		}
+-		else for (screen = 0; screen < nscreens; screen++)
++		} else if (rr && ev.type == rrevbase + RRScreenChangeNotify) {
++			XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev;
++			for (screen = 0; screen < nscreens; screen++) {
++				if (locks[screen]->win == rre->window) {
++					XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height);
++					XClearWindow(dpy, locks[screen]->win);
++				}
++			}
++		} else for (screen = 0; screen < nscreens; screen++)
+ 			XRaiseWindow(dpy, locks[screen]->win);
+ 	}
+ }
+@@ -236,6 +247,8 @@ lockscreen(Display *dpy, int screen)
+ 	invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
+ 	XDefineCursor(dpy, lock->win, invisible);
+ 	XMapRaised(dpy, lock->win);
++	if (rr)
++		XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
+ 	for (len = 1000; len; len--) {
+ 		if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+ 		    GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+@@ -295,6 +308,7 @@ main(int argc, char **argv) {
+ 
+ 	if (!(dpy = XOpenDisplay(0)))
+ 		die("slock: cannot open display\n");
++	rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase);
+ 	/* Get the number of screens in display "dpy" and blank them all. */
+ 	nscreens = ScreenCount(dpy);
+ 	locks = malloc(sizeof(Lock *) * nscreens);
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch b/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch
new file mode 100644
index 0000000000..07866a66c6
--- /dev/null
+++ b/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch
@@ -0,0 +1,64 @@
+From b1289f30b79c9c5ea43a9e9c624406d7d0661692 Mon Sep 17 00:00:00 2001
+From: Nick Currier <nick.currier@gmail.com>
+Date: Wed, 6 May 2015 10:18:50 -0600
+Subject: [PATCH 4/9] Option to not show failure color on clear
+
+---
+ config.def.h | 1 +
+ slock.c      | 9 ++++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 4bccb5d..fca0ae0 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -3,3 +3,4 @@ static const char *colorname[NUMCOLS] = {
+ 	"#005577",   /* during input */
+ 	"#CC3333",   /* failed/cleared the input */
+ };
++static const Bool failonclear = True;
+diff --git a/slock.c b/slock.c
+index 6502c86..1551a9e 100644
+--- a/slock.c
++++ b/slock.c
+@@ -26,7 +26,7 @@
+ enum {
+ 	INIT,
+ 	INPUT,
+-	EMPTY,
++	FAILED,
+ 	NUMCOLS
+ };
+ 
+@@ -42,6 +42,7 @@ typedef struct {
+ static Lock **locks;
+ static int nscreens;
+ static Bool running = True;
++static Bool failure = False;
+ static Bool rr;
+ static int rrevbase;
+ static int rrerrbase;
+@@ -153,8 +154,10 @@ readpw(Display *dpy, const char *pws)
+ #else
+ 				running = !!strcmp(crypt(passwd, pws), pws);
+ #endif
+-				if (running)
++				if (running) {
+ 					XBell(dpy, 100);
++					failure = True;
++				}
+ 				len = 0;
+ 				break;
+ 			case XK_Escape:
+@@ -178,7 +181,7 @@ readpw(Display *dpy, const char *pws)
+ 				}
+ 			} else if (llen != 0 && len == 0) {
+ 				for (screen = 0; screen < nscreens; screen++) {
+-					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[EMPTY]);
++					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[failure || failonclear ? FAILED : INIT]);
+ 					XClearWindow(dpy, locks[screen]->win);
+ 				}
+ 			}
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0005-consistently-use-with-sizeof.patch b/desktop/slock/patches/0005-consistently-use-with-sizeof.patch
new file mode 100644
index 0000000000..8db4960d68
--- /dev/null
+++ b/desktop/slock/patches/0005-consistently-use-with-sizeof.patch
@@ -0,0 +1,34 @@
+From 10d4e479c5f6d91bf86e15be3a12c6b09c9808be Mon Sep 17 00:00:00 2001
+From: Markus Teich <markus.teich@stusta.mhn.de>
+Date: Fri, 8 May 2015 16:43:13 +0200
+Subject: [PATCH 5/9] consistently use () with sizeof
+
+---
+ slock.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/slock.c b/slock.c
+index 1551a9e..68e813f 100644
+--- a/slock.c
++++ b/slock.c
+@@ -133,7 +133,7 @@ readpw(Display *dpy, const char *pws)
+ 	while (running && !XNextEvent(dpy, &ev)) {
+ 		if (ev.type == KeyPress) {
+ 			buf[0] = 0;
+-			num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
++			num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
+ 			if (IsKeypadKey(ksym)) {
+ 				if (ksym == XK_KP_Enter)
+ 					ksym = XK_Return;
+@@ -168,7 +168,7 @@ readpw(Display *dpy, const char *pws)
+ 					--len;
+ 				break;
+ 			default:
+-				if (num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
++				if (num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))) {
+ 					memcpy(passwd + len, buf, num);
+ 					len += num;
+ 				}
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0006-rework-setting-window-color.patch b/desktop/slock/patches/0006-rework-setting-window-color.patch
new file mode 100644
index 0000000000..f1c0903f8c
--- /dev/null
+++ b/desktop/slock/patches/0006-rework-setting-window-color.patch
@@ -0,0 +1,54 @@
+From 754195f8d75586e23d1cc69cad00710802e0cb5d Mon Sep 17 00:00:00 2001
+From: Markus Teich <markus.teich@stusta.mhn.de>
+Date: Fri, 8 May 2015 17:10:15 +0200
+Subject: [PATCH 6/9] rework setting window color
+
+---
+ slock.c | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/slock.c b/slock.c
+index 68e813f..d6053af 100644
+--- a/slock.c
++++ b/slock.c
+@@ -119,11 +119,12 @@ readpw(Display *dpy, const char *pws)
+ {
+ 	char buf[32], passwd[256];
+ 	int num, screen;
+-	unsigned int len, llen;
++	unsigned int len, color;
+ 	KeySym ksym;
+ 	XEvent ev;
++	static int oldc = INIT;
+ 
+-	len = llen = 0;
++	len = 0;
+ 	running = True;
+ 
+ 	/* As "slock" stands for "Simple X display locker", the DPMS settings
+@@ -174,18 +175,14 @@ readpw(Display *dpy, const char *pws)
+ 				}
+ 				break;
+ 			}
+-			if (llen == 0 && len != 0) {
++			color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
++			if (oldc != color) {
+ 				for (screen = 0; screen < nscreens; screen++) {
+-					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[INPUT]);
+-					XClearWindow(dpy, locks[screen]->win);
+-				}
+-			} else if (llen != 0 && len == 0) {
+-				for (screen = 0; screen < nscreens; screen++) {
+-					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[failure || failonclear ? FAILED : INIT]);
++					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
+ 					XClearWindow(dpy, locks[screen]->win);
+ 				}
++				oldc = color;
+ 			}
+-			llen = len;
+ 		} else if (rr && ev.type == rrevbase + RRScreenChangeNotify) {
+ 			XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev;
+ 			for (screen = 0; screen < nscreens; screen++) {
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0007-Slightly-safer-OOM-killer-disablement-in-linux.patch b/desktop/slock/patches/0007-Slightly-safer-OOM-killer-disablement-in-linux.patch
new file mode 100644
index 0000000000..8fbde2c31d
--- /dev/null
+++ b/desktop/slock/patches/0007-Slightly-safer-OOM-killer-disablement-in-linux.patch
@@ -0,0 +1,45 @@
+From 0edbd2e0164a8c6cbad415e38083469041f29996 Mon Sep 17 00:00:00 2001
+From: David Phillips <dbphillipsnz@gmail.com>
+Date: Fri, 19 Jun 2015 23:42:15 +1200
+Subject: [PATCH 7/9] Slightly safer OOM killer disablement in linux
+
+---
+ slock.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/slock.c b/slock.c
+index d6053af..b3bee92 100644
+--- a/slock.c
++++ b/slock.c
+@@ -60,16 +60,27 @@ die(const char *errstr, ...)
+ 
+ #ifdef __linux__
+ #include <fcntl.h>
++#include <linux/oom.h>
+ 
+ static void
+ dontkillme(void)
+ {
+ 	int fd;
++	int length;
++	char value[64];
+ 
+ 	fd = open("/proc/self/oom_score_adj", O_WRONLY);
+ 	if (fd < 0 && errno == ENOENT)
+ 		return;
+-	if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
++
++	/* convert OOM_SCORE_ADJ_MIN to string for writing */
++	length = snprintf(value, sizeof(value), "%d\n", OOM_SCORE_ADJ_MIN);
++
++	/* bail on truncation */
++	if (length >= sizeof(value))
++		die("buffer too small\n");
++
++	if (fd < 0 || write(fd, value, length) != length || close(fd) != 0)
+ 		die("cannot disable the out-of-memory killer for this process\n");
+ }
+ #endif
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0008-Don-t-change-to-failure-colour-on-success.patch b/desktop/slock/patches/0008-Don-t-change-to-failure-colour-on-success.patch
new file mode 100644
index 0000000000..39c70926b7
--- /dev/null
+++ b/desktop/slock/patches/0008-Don-t-change-to-failure-colour-on-success.patch
@@ -0,0 +1,25 @@
+From b95ee111c7625375716e848ec81af2f57ca35b02 Mon Sep 17 00:00:00 2001
+From: David Phillips <dbphillipsnz@gmail.com>
+Date: Thu, 27 Aug 2015 06:16:25 +0200
+Subject: [PATCH 8/9] Don't change to failure colour on success
+
+---
+ slock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/slock.c b/slock.c
+index b3bee92..6be8f22 100644
+--- a/slock.c
++++ b/slock.c
+@@ -187,7 +187,7 @@ readpw(Display *dpy, const char *pws)
+ 				break;
+ 			}
+ 			color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
+-			if (oldc != color) {
++			if (running && oldc != color) {
+ 				for (screen = 0; screen < nscreens; screen++) {
+ 					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
+ 					XClearWindow(dpy, locks[screen]->win);
+-- 
+2.6.4
+
diff --git a/desktop/slock/patches/0009-add-option-to-run-command-after-screen-is-locked.patch b/desktop/slock/patches/0009-add-option-to-run-command-after-screen-is-locked.patch
new file mode 100644
index 0000000000..574396a1de
--- /dev/null
+++ b/desktop/slock/patches/0009-add-option-to-run-command-after-screen-is-locked.patch
@@ -0,0 +1,49 @@
+From e867c38123175d6f050e051ee6b00f4737a9712a Mon Sep 17 00:00:00 2001
+From: Markus Teich <markus.teich@stusta.mhn.de>
+Date: Sat, 26 Dec 2015 13:13:25 +0100
+Subject: [PATCH 9/9] add option to run command after screen is locked
+
+---
+ slock.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/slock.c b/slock.c
+index 6be8f22..ddf1074 100644
+--- a/slock.c
++++ b/slock.c
+@@ -289,7 +289,7 @@ lockscreen(Display *dpy, int screen)
+ static void
+ usage(void)
+ {
+-	fprintf(stderr, "usage: slock [-v]\n");
++	fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");
+ 	exit(1);
+ }
+ 
+@@ -303,7 +303,8 @@ main(int argc, char **argv) {
+ 
+ 	if ((argc == 2) && !strcmp("-v", argv[1]))
+ 		die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
+-	else if (argc != 1)
++
++	if ((argc == 2) && !strcmp("-h", argv[1]))
+ 		usage();
+ 
+ #ifdef __linux__
+@@ -339,6 +340,13 @@ main(int argc, char **argv) {
+ 		return 1;
+ 	}
+ 
++	if (argc >= 2 && fork() == 0) {
++		if (dpy)
++			close(ConnectionNumber(dpy));
++		execvp(argv[1], argv+1);
++		die("slock: execvp %s failed: %s\n", argv[1], strerror(errno));
++	}
++
+ 	/* Everything is now blank. Now wait for the correct password. */
+ #ifdef HAVE_BSD_AUTH
+ 	readpw(dpy);
+-- 
+2.6.4
+
diff --git a/desktop/slock/config.mk.patch b/desktop/slock/patches/config.mk.patch
index b1c5821101..b1c5821101 100644
--- a/desktop/slock/config.mk.patch
+++ b/desktop/slock/patches/config.mk.patch
diff --git a/desktop/slock/slock-1.2-failcolor.diff b/desktop/slock/slock-1.2-failcolor.diff
deleted file mode 100644
index 3b2a03193f..0000000000
--- a/desktop/slock/slock-1.2-failcolor.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 89e5977..7f55466 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -1,2 +1,3 @@
- #define COLOR1 "black"
- #define COLOR2 "#005577"
-+#define COLOR3 "#550000"
-diff --git a/slock.c b/slock.c
-index face75e..8519ce2 100644
---- a/slock.c
-+++ b/slock.c
-@@ -29,12 +29,13 @@ typedef struct {
- 	int screen;
- 	Window root, win;
- 	Pixmap pmap;
--	unsigned long colors[2];
-+	unsigned long colors[3];
- } Lock;
- 
- static Lock **locks;
- static int nscreens;
- static Bool running = True;
-+static Bool tried = False;
- 
- static void
- die(const char *errstr, ...) {
-@@ -135,6 +136,7 @@ readpw(Display *dpy, const char *pws)
- #ifdef HAVE_BSD_AUTH
- 				running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
- #else
-+				tried=True;
- 				running = !!strcmp(crypt(passwd, pws), pws);
- #endif
- 				if(running)
-@@ -162,7 +164,7 @@ readpw(Display *dpy, const char *pws)
- 				}
- 			} else if(llen != 0 && len == 0) {
- 				for(screen = 0; screen < nscreens; screen++) {
--					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
-+					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[tried ? 2 : 0]);
- 					XClearWindow(dpy, locks[screen]->win);
- 				}
- 			}
-@@ -179,7 +181,7 @@ unlockscreen(Display *dpy, Lock *lock) {
- 		return;
- 
- 	XUngrabPointer(dpy, CurrentTime);
--	XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
-+	XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 3, 0);
- 	XFreePixmap(dpy, lock->pmap);
- 	XDestroyWindow(dpy, lock->win);
- 
-@@ -212,6 +214,8 @@ lockscreen(Display *dpy, int screen) {
- 	lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
- 			0, DefaultDepth(dpy, lock->screen), CopyFromParent,
- 			DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
-+	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR3, &color, &dummy);
-+	lock->colors[2] = color.pixel;
- 	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
- 	lock->colors[1] = color.pixel;
- 	XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
diff --git a/desktop/slock/slock.SlackBuild b/desktop/slock/slock.SlackBuild
index 0b51ea5f65..e40ee6aefb 100644
--- a/desktop/slock/slock.SlackBuild
+++ b/desktop/slock/slock.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=slock
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,14 +71,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Support upstream failcolor patch
-# http://tools.suckless.org/slock/patches/failcolor
-if [ "${FAILCOLOR:-no}" != "no" ]; then
-  patch -p1 <$CWD/slock-1.2-failcolor.diff
-fi
-
 # This uses our CFLAGS defined above
-sed "s/@SLACKCFLAGS@/$SLKCFLAGS/" $CWD/config.mk.patch | patch -p1
+sed "s,@SLACKCFLAGS@,$SLKCFLAGS," $CWD/patches/config.mk.patch | patch -p1
+
+# Upstream patches in git
+patch -p1 < $CWD/patches/0001-applied-Dimitris-style-patch-from-Dec-14-with-some-m.patch
+patch -p1 < $CWD/patches/0002-Blank-the-screen-with-color-0-add-third-color-for-fa.patch
+patch -p1 < $CWD/patches/0003-resize-lockscreen-window-after-Xrandr-resize.patch
+patch -p1 < $CWD/patches/0004-Option-to-not-show-failure-color-on-clear.patch
+patch -p1 < $CWD/patches/0005-consistently-use-with-sizeof.patch
+patch -p1 < $CWD/patches/0006-rework-setting-window-color.patch
+patch -p1 < $CWD/patches/0007-Slightly-safer-OOM-killer-disablement-in-linux.patch
+patch -p1 < $CWD/patches/0008-Don-t-change-to-failure-colour-on-success.patch
+patch -p1 < $CWD/patches/0009-add-option-to-run-command-after-screen-is-locked.patch
 
 make PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib${LIBDIRSUFFIX}/X11
 make install PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 DESTDIR=$PKG
diff --git a/desktop/ssr/ssr.SlackBuild b/desktop/ssr/ssr.SlackBuild
index fd366e82c6..a520625160 100644
--- a/desktop/ssr/ssr.SlackBuild
+++ b/desktop/ssr/ssr.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ssr
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
   --disable-assert \
   $jack \
   $pulseaudio \
@@ -96,6 +97,9 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG.md COPYING notes.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/ssr/ssr.info b/desktop/ssr/ssr.info
index dd61fec120..8dd914274b 100644
--- a/desktop/ssr/ssr.info
+++ b/desktop/ssr/ssr.info
@@ -1,8 +1,8 @@
 PRGNAM="ssr"
-VERSION="0.3.3"
+VERSION="0.3.6"
 HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder/"
-DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.3.3.tar.gz"
-MD5SUM="c3f7c3c6e0f5c2458487bc0b90bdf6d1"
+DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.3.6.tar.gz"
+MD5SUM="3c0dcf288c0cc1b21f4cd2010c73d5ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/desktop/sun/README b/desktop/sun/README
index 069c1f7a94..2ed799ba23 100644
--- a/desktop/sun/README
+++ b/desktop/sun/README
@@ -1,6 +1,6 @@
 SUN (Slackware Update Notifier) is a tray notification applet for informing 
 about package updates in Slackware and CLI tool for monitoring upgraded 
 packages.
-NOTE: To start the daemon executable permission required, 
-      after installation run as root:
+
+NOTE: To start the daemon executable permission required:
       # chmod +x /etc/rc.d/rc.sun
diff --git a/desktop/sun/sun.SlackBuild b/desktop/sun/sun.SlackBuild
index a6cf5ecd60..d145342ddc 100644
--- a/desktop/sun/sun.SlackBuild
+++ b/desktop/sun/sun.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sun
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sun
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.1.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,7 +80,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # install configurations files
 mkdir -p $PKG/etc/$PRGNAM $PKG/etc/rc.d/
 install -D -m0644 conf/${PRGNAM}.conf $PKG/etc/$PRGNAM/${PRGNAM}.conf.new
-install -D -m0644 conf/mirrors $PKG/etc/$PRGNAM/mirrors
+
 # install rc file
 install -D -m0644 conf/rc.${PRGNAM} $PKG/etc/rc.d/rc.${PRGNAM}.new
 
diff --git a/desktop/sun/sun.info b/desktop/sun/sun.info
index 33b6f7d8f3..50d7522478 100644
--- a/desktop/sun/sun.info
+++ b/desktop/sun/sun.info
@@ -1,8 +1,8 @@
 PRGNAM="sun"
-VERSION="1.1.0"
+VERSION="1.1.4"
 HOMEPAGE="https://github.com/dslackw/sun"
-DOWNLOAD="http://sourceforge.net/projects/slackwareupdatenotifier/files/sun-1.1.0/sun-1.1.0.tar.gz"
-MD5SUM="d6fb95502a4e9fbe7fc43b3f74ed656c"
+DOWNLOAD="https://github.com/dslackw/sun/archive/v1.1.4.tar.gz"
+MD5SUM="92a4b04a33f8af8c94202bae8801d605"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/superkey-launch/superkey-launch.SlackBuild b/desktop/superkey-launch/superkey-launch.SlackBuild
index fc573932d4..3c08c8ea10 100644
--- a/desktop/superkey-launch/superkey-launch.SlackBuild
+++ b/desktop/superkey-launch/superkey-launch.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -23,7 +23,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=superkey-launch
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,11 @@ mkdir -p $TMP $PKG $OUTPUT
 mkdir -p $PKG/etc/xdg/autostart/
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+if [ -e $CWD/$PRGNAM-$VERSION.tar.gz ]; then
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+else
+  tar xvf $CWD/$VERSION.tar.gz
+fi
 cd $PRGNAM-$VERSION
 
 sed -i "s|MANDIR?=/local/man/man1|MANDIR?=/man/man1|" Makefile
diff --git a/desktop/superkey-launch/superkey-launch.info b/desktop/superkey-launch/superkey-launch.info
index d4442c8a48..7a8f407d58 100644
--- a/desktop/superkey-launch/superkey-launch.info
+++ b/desktop/superkey-launch/superkey-launch.info
@@ -1,8 +1,8 @@
 PRGNAM="superkey-launch"
-VERSION="1.6.0"
+VERSION="1.6.3"
 HOMEPAGE="https://github.com/ryanpcmcquen/superkey-launch"
-DOWNLOAD="https://github.com/ryanpcmcquen/superkey-launch/archive/1.6.0.tar.gz"
-MD5SUM="3b8d0f04055f90de03db77feca19e86e"
+DOWNLOAD="https://github.com/ryanpcmcquen/superkey-launch/archive/1.6.3.tar.gz"
+MD5SUM="31b7ee3ed8a515a08621fd0b17f5e3a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/tint2/tint2.SlackBuild b/desktop/tint2/tint2.SlackBuild
index b01c0f58bd..6230509c00 100644
--- a/desktop/tint2/tint2.SlackBuild
+++ b/desktop/tint2/tint2.SlackBuild
@@ -2,12 +2,12 @@
 
 # Slackware build script for tint2
 
-# Written by Eugene Wissner <eugen@flevum.de>
+# Written by Eugene Wissner <belka@caraus.de>
 # You are free to modify or redistribute this in any way you wish.
 
 PRGNAM=tint2
-VERSION=${VERSION:-0.11}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.12.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -46,7 +46,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/tint2/tint2.info b/desktop/tint2/tint2.info
index 99271d5a16..beb95575e6 100644
--- a/desktop/tint2/tint2.info
+++ b/desktop/tint2/tint2.info
@@ -1,10 +1,10 @@
 PRGNAM="tint2"
-VERSION="0.11"
-HOMEPAGE="http://code.google.com/p/tint2/"
-DOWNLOAD="http://tint2.googlecode.com/files/tint2-0.11.tar.bz2"
-MD5SUM="6fc5731e7425125fa84a2add5cef4bff"
+VERSION="0.12.3"
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+DOWNLOAD="http://download.dlackware.com/hosted-sources/tint2/tint2-0.12.3.tar.xz"
+MD5SUM="618e50e39b9682fd7a68205c3dba2666"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
 MAINTAINER="Eugene Wissner"
-EMAIL="eugen@flevum.de"
+EMAIL="belka@caraus.de"
diff --git a/desktop/trayer-srg/trayer-srg.SlackBuild b/desktop/trayer-srg/trayer-srg.SlackBuild
index 5d53be4acc..b72c770d11 100644
--- a/desktop/trayer-srg/trayer-srg.SlackBuild
+++ b/desktop/trayer-srg/trayer-srg.SlackBuild
@@ -52,7 +52,7 @@ if [ "$ARCH" = "i486" ];then
 	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 	LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ];then
-	SLKCFLAGS="-02 -march=i686 -mtune=i686"
+	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 	LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
 	SLKCFLAGS="-O2 -fPIC"
diff --git a/desktop/velox/README b/desktop/velox/README
new file mode 100644
index 0000000000..6c99fda177
--- /dev/null
+++ b/desktop/velox/README
@@ -0,0 +1,16 @@
+velox (velox is a simple window manager based on swc)
+
+velox is a simple window manager based on swc. It is inspired by dwm   
+and xmonad.
+
+velox uses tag-based window management similar to dwm. This allows you
+to construct your workspace by selecting a set of tags to work with.
+However, in contrast with dwm, windows do not have any screen 
+associated with them; they are shown on whichever screen has their tag
+selected, allowing you to easily move windows between screens by 
+selecting their tag on a different screen. This is similar to the 
+multi-monitor workspace switching in xmonad.
+
+Copy /usr/doc/velox-0.0.3/velox.conf.sample to your $HOME/.velox.conf.
+
+Optional dependencie: dmenu.
diff --git a/desktop/velox/build-fixes.patch b/desktop/velox/build-fixes.patch
new file mode 100644
index 0000000000..730080f434
--- /dev/null
+++ b/desktop/velox/build-fixes.patch
@@ -0,0 +1,74 @@
+diff -up src/velox-0.0.3/modules/alsa.c.orig src/velox-0.0.3/modules/alsa.c
+--- src/velox-0.0.3/modules/alsa.c.orig	2014-03-27 03:59:31.000000000 -0600
++++ src/velox-0.0.3/modules/alsa.c	2014-03-27 04:00:01.000000000 -0600
+@@ -20,8 +20,8 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <yaml.h>
+-#include <asoundlib.h>
+-#include <mixer.h>
++#include <alsa/asoundlib.h>
++#include <alsa/mixer.h>
+ 
+ #include <velox/velox.h>
+ #include <velox/module.h>
+diff -up src/velox-0.0.3/velox/event.c.orig src/velox-0.0.3/velox/event.c
+--- src/velox-0.0.3/velox/event.c.orig	2014-03-27 03:57:53.000000000 -0600
++++ src/velox-0.0.3/velox/event.c	2014-03-27 03:58:00.000000000 -0600
+@@ -272,7 +272,7 @@ static void unmap_notify(xcb_unmap_notif
+ 
+         xcb_grab_server(c);
+ 
+-        property_values[0] = XCB_WM_STATE_WITHDRAWN;
++        property_values[0] = XCB_ICCCM_WM_STATE_WITHDRAWN;
+         property_values[1] = 0;
+         xcb_change_property(c, XCB_PROP_MODE_REPLACE, window->window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+diff -up src/velox-0.0.3/velox/velox.c.orig src/velox-0.0.3/velox/velox.c
+--- src/velox-0.0.3/velox/velox.c.orig	2014-03-27 03:56:23.000000000 -0600
++++ src/velox-0.0.3/velox/velox.c	2014-03-27 03:57:38.000000000 -0600
+@@ -314,7 +314,7 @@ void show_window(xcb_window_t window_id)
+ 
+     DEBUG_ENTER
+ 
+-    property_values[0] = XCB_WM_STATE_NORMAL;
++    property_values[0] = XCB_ICCCM_WM_STATE_NORMAL;
+     property_values[1] = 0;
+     xcb_change_property(c, XCB_PROP_MODE_REPLACE, window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+@@ -327,7 +327,7 @@ void hide_window(xcb_window_t window_id)
+ 
+     DEBUG_ENTER
+ 
+-    property_values[0] = XCB_WM_STATE_WITHDRAWN; // FIXME: Maybe this should be iconic?
++    property_values[0] = XCB_ICCCM_WM_STATE_WITHDRAWN; // FIXME: Maybe this should be iconic?
+     property_values[1] = 0;
+     xcb_change_property(c, XCB_PROP_MODE_REPLACE, window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+@@ -766,7 +766,7 @@ void manage(xcb_window_t window_id)
+ 
+         xcb_map_window(c, window->window_id);
+ 
+-        property_values[0] = XCB_WM_STATE_NORMAL;
++        property_values[0] = XCB_ICCCM_WM_STATE_NORMAL;
+         property_values[1] = 0;
+         xcb_change_property(c, XCB_PROP_MODE_REPLACE, window->window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+@@ -885,7 +885,7 @@ void manage_existing_windows()
+             continue;
+         }
+ 
+-        if (window_attributes_replies[child]->map_state == XCB_MAP_STATE_VIEWABLE || ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_WM_STATE_ICONIC)
++        if (window_attributes_replies[child]->map_state == XCB_MAP_STATE_VIEWABLE || ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_ICCCM_WM_STATE_ICONIC)
+         {
+             manage(children[child]);
+         }
+@@ -894,7 +894,7 @@ void manage_existing_windows()
+     {
+         if (*((xcb_window_t *) xcb_get_property_value(property_replies[child])) &&
+             (window_attributes_replies[child]->map_state == XCB_MAP_STATE_VIEWABLE ||
+-            ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_WM_STATE_ICONIC))
++            ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_ICCCM_WM_STATE_ICONIC))
+         {
+             manage(children[child]);
+         }
diff --git a/games/supertux2/doinst.sh b/desktop/velox/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/games/supertux2/doinst.sh
+++ b/desktop/velox/doinst.sh
diff --git a/desktop/velox/slack-desc b/desktop/velox/slack-desc
new file mode 100644
index 0000000000..368dcb3cf5
--- /dev/null
+++ b/desktop/velox/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+velox: velox (simple window manager)
+velox:
+velox: velox is a simple window manager based on swc. It is inspired by dwm   
+velox: and xmonad. 
+velox:
+velox: Home page: https://www.openhub.net/p/velox-wm
+velox:
+velox:
+velox:
+velox:
+velox:
diff --git a/desktop/velox/velox.SlackBuild b/desktop/velox/velox.SlackBuild
new file mode 100644
index 0000000000..1aa9988cac
--- /dev/null
+++ b/desktop/velox/velox.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# Slackware build script for velox.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="velox"
+VERSION=${VERSION:-0.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -Np2 < $CWD/xcb-atom.patch
+patch -Np2 < $CWD/xcb-aux.patch
+patch -Np2 < $CWD/build-fixes.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+DOCS="$CWD/velox.conf.sample AUTHORS.mkd COPYING NEWS.mkd README.mkd"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/velox/velox.conf.sample b/desktop/velox/velox.conf.sample
new file mode 100644
index 0000000000..675c4baac3
--- /dev/null
+++ b/desktop/velox/velox.conf.sample
@@ -0,0 +1,76 @@
+# velox.conf
+
+#   property                        value
+set mod                             logo
+set window.border_color_active      0xff338833
+set window.border_color_inactive    0xff888888
+set window.border_width             2
+
+set tag.1.name                      1
+set tag.2.name                      2
+set tag.3.name                      3
+set tag.4.name                      4
+set tag.5.name                      5
+set tag.6.name                      6
+set tag.7.name                      7
+set tag.8.name                      8
+set tag.9.name                      9
+
+#      name             type    arguments
+action spawn_terminal   spawn   st-wl
+action spawn_run        spawn   dmenu_run-wl -b -fn Terminus:pixelsize=14 -nb "#1a1a1a" -nf "#999999" -sb "#338833" -sf "#ffffff"
+
+#   key         modifiers           action
+key j           mod                 focus_next
+key k           mod                 focus_prev
+key Return      mod                 zoom
+key space       mod                 layout_next
+key Tab         mod                 previous_tags
+key q           mod,shift           quit
+
+key g           mod                 window.switch_layer
+key c           mod,shift           window.close
+
+key h           mod                 tall.decrease_master_size
+key l           mod                 tall.increase_master_size
+key h           mod,shift           tall.increase_num_masters
+key l           mod,shift           tall.decrease_num_masters
+key h           mod,ctrl            tall.increase_num_columns
+key l           mod,ctrl            tall.decrease_num_columns
+
+key Return      mod,shift           spawn_terminal
+key r           mod                 spawn_run
+
+key 1           mod                 tag.1.activate
+key 2           mod                 tag.2.activate
+key 3           mod                 tag.3.activate
+key 4           mod                 tag.4.activate
+key 5           mod                 tag.5.activate
+key 6           mod                 tag.6.activate
+key 7           mod                 tag.7.activate
+key 8           mod                 tag.8.activate
+key 9           mod                 tag.9.activate
+
+key 1           mod,ctrl            tag.1.toggle
+key 2           mod,ctrl            tag.2.toggle
+key 3           mod,ctrl            tag.3.toggle
+key 4           mod,ctrl            tag.4.toggle
+key 5           mod,ctrl            tag.5.toggle
+key 6           mod,ctrl            tag.6.toggle
+key 7           mod,ctrl            tag.7.toggle
+key 8           mod,ctrl            tag.8.toggle
+key 9           mod,ctrl            tag.9.toggle
+
+key 1           mod,shift           tag.1.apply
+key 2           mod,shift           tag.2.apply
+key 3           mod,shift           tag.3.apply
+key 4           mod,shift           tag.4.apply
+key 5           mod,shift           tag.5.apply
+key 6           mod,shift           tag.6.apply
+key 7           mod,shift           tag.7.apply
+key 8           mod,shift           tag.8.apply
+key 9           mod,shift           tag.9.apply
+
+button  left    mod                 window.begin_move:window.end_move
+button  left    mod,shift           window.begin_resize:window.end_resize
+
diff --git a/desktop/velox/velox.info b/desktop/velox/velox.info
new file mode 100644
index 0000000000..4a8d7628f9
--- /dev/null
+++ b/desktop/velox/velox.info
@@ -0,0 +1,10 @@
+PRGNAM="velox"
+VERSION="0.0.3"
+HOMEPAGE="https://www.openhub.net/p/velox-wm"
+DOWNLOAD="https://github.com/downloads/michaelforney/velox/velox-0.0.3.tar.bz2"
+MD5SUM="0eda26856cdc9fbc68593b6b360970db"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libmpdclient"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/desktop/velox/xcb-atom.patch b/desktop/velox/xcb-atom.patch
new file mode 100644
index 0000000000..08cc926634
--- /dev/null
+++ b/desktop/velox/xcb-atom.patch
@@ -0,0 +1,12 @@
+diff -up src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake.orig src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake
+--- src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake.orig	2014-03-27 03:48:31.000000000 -0600
++++ src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake	2014-03-27 03:48:42.000000000 -0600
+@@ -16,7 +16,7 @@ find_path(XCB-Atom_INCLUDE_DIR
+ )
+ 
+ find_library(XCB-Atom_LIBRARY
+-    NAMES xcb-atom
++    NAMES xcb-util
+     PATHS ${XCB-Atom_PKGCONF_LIBRARY_DIRS}
+ )
+ 
diff --git a/desktop/velox/xcb-aux.patch b/desktop/velox/xcb-aux.patch
new file mode 100644
index 0000000000..5c8ea80c7f
--- /dev/null
+++ b/desktop/velox/xcb-aux.patch
@@ -0,0 +1,12 @@
+diff -up src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake.orig src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake
+--- src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake.orig	2014-03-27 03:51:44.000000000 -0600
++++ src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake	2014-03-27 03:52:11.000000000 -0600
+@@ -16,7 +16,7 @@ find_path(XCB-Aux_INCLUDE_DIR
+ )
+ 
+ find_library(XCB-Aux_LIBRARY
+-    NAMES xcb-aux
++    NAMES xcb-util
+     PATHS ${XCB-Aux_PKGCONF_LIBRARY_DIRS}
+ )
+ 
diff --git a/desktop/wmblob/README b/desktop/wmblob/README
new file mode 100644
index 0000000000..36951a0b15
--- /dev/null
+++ b/desktop/wmblob/README
@@ -0,0 +1,4 @@
+I'll be honest with you. The truth is: wmblob is a totally useless program. But unlike other
+totally useless programs, it looks good and shows funny moving `blobs'. I'm sure you'll like it.
+It's a nice dockapp for WindowMaker, but it's probably going to run just as well with any other
+ window manager.
diff --git a/desktop/wmblob/slack-desc b/desktop/wmblob/slack-desc
new file mode 100644
index 0000000000..21ae9027be
--- /dev/null
+++ b/desktop/wmblob/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler--------------------------------------------------------|
+wmblob: wmblob (Fancy Moving Blobs DockApp)
+wmblob: 
+wmblob: I'll be honest with you. The truth is: wmblob is a totally useless
+wmblob: program. But unlike other totally useless programs, it looks good and
+wmblob: shows funny moving `blobs'. I'm sure you'll like it. It's a nice
+wmblob: dockapp for WindowMaker, but it's probably going to run just as well
+wmblob: with any other window manager.
+wmblob:
+wmblob: Homepage: https://github.com/bbidulock/wmblob
+wmblob:
+wmblob:
diff --git a/desktop/wmblob/wmblob.SlackBuild b/desktop/wmblob/wmblob.SlackBuild
new file mode 100644
index 0000000000..98092fe6bc
--- /dev/null
+++ b/desktop/wmblob/wmblob.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for wmblob 
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmblob
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+./configure \
+--prefix=/usr \
+--libdir=/usr/lib${LIBDIRSUFFIX} \
+--x-includes=/usr/include/X11 \
+--x-libraries=/usr/lib/X11 \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--mandir=/usr/man \
+--docdir=/usr/doc/$PRGNAM-$VERSION \
+--build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Compresses man page
+gzip -9 $PKG/usr/man/man1/wmblob.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL doc/how_it_works NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmblob/wmblob.info b/desktop/wmblob/wmblob.info
new file mode 100644
index 0000000000..60d92079dd
--- /dev/null
+++ b/desktop/wmblob/wmblob.info
@@ -0,0 +1,10 @@
+PRGNAM="wmblob"
+VERSION="1.0.4"
+HOMEPAGE="https://github.com/bbidulock/wmblob/"
+DOWNLOAD="https://github.com/bbidulock/wmblob/releases/download/1.0.4/wmblob-1.0.4.tar.bz2"
+MD5SUM="0b4f9ac8cefd943e2db6882e877a971d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/wmclock/README b/desktop/wmclock/README
index fc33f80b8e..8fe9495c50 100644
--- a/desktop/wmclock/README
+++ b/desktop/wmclock/README
@@ -8,9 +8,9 @@ can run a user-specified program on a mouse click.
 wmclock can display the month and weekday abbreviations in any of these
 languages:
 
-breton czech danish dutch english french french2 german hungarian indonesian 
-italian norwegian portuguese russian slovene spanish swedish ukrainian
-polish croatian
+breton croatian czech danish dutch english french french2 german
+hungarian indonesian italian norwegian polish portuguese russian
+slovene spanish swedish ukrainian
 
 To set the default language, set LANGUAGE to one of the above in the
 environment before running wmclock.SlackBuild, e.g.
diff --git a/desktop/wmclock/slack-desc b/desktop/wmclock/slack-desc
index 16537799e2..fbe9048e55 100644
--- a/desktop/wmclock/slack-desc
+++ b/desktop/wmclock/slack-desc
@@ -12,8 +12,8 @@ wmclock: wmclock is an applet which displays the date and time in a dockable
 wmclock: tile in the same style as the clock from the NEXTSTEP(tm) operating
 wmclock: system. wmclock is specially designed for the Window Maker window
 wmclock: manager, by Alfredo Kojima, and features multiple language support,
-wmclock: twenty-four-hour and twelve-hour (am/pm) time display, and, optionally,
+wmclock: twenty-four-hour and twelve-hour (am/pm) time display, and optionally
 wmclock: can run a user-specified program on a mouse click.
 wmclock:
-wmclock:
+wmclock: This package's default language is: @LANGUAGE@
 wmclock:
diff --git a/desktop/wmclock/wmclock.SlackBuild b/desktop/wmclock/wmclock.SlackBuild
index 95a8274d51..bbfa620218 100644
--- a/desktop/wmclock/wmclock.SlackBuild
+++ b/desktop/wmclock/wmclock.SlackBuild
@@ -6,8 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151110 bkw:
+# - finally got around to upgrading to 1.0.14.
+# - added default language in slack-desc.
+
 PRGNAM=wmclock
-VERSION=${VERSION:-1.0.13}
+VERSION=${VERSION:-1.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,18 +61,13 @@ find -L . \
 # Default is english. It's still possible to display in other
 # languages using the -monthxpm and -weekdayxpm options.
 
-# Language choices:
-# breton czech danish dutch english french french2 german hungarian indonesian
-# italian norwegian portuguese russian slovene spanish swedish ukrainian
-
 LANGUAGE=${LANGUAGE:-english}
 ./configure --lang $LANGUAGE
 
-make CDEBUGFLAGS="$SLKCFLAGS"
+make CDEBUGFLAGS="$SLKCFLAGS" PREFIX=/usr
 mkdir -p $PKG/usr/bin
-strip --strip-unneeded $PRGNAM
-install -m0755 -o root -g root $PRGNAM $PKG/usr/bin
-make install.share DESTDIR=$PKG
+install -s -m0755 -o root -g root $PRGNAM $PKG/usr/bin
+make install.share DESTDIR=$PKG PREFIX=/usr
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
@@ -78,7 +77,7 @@ cp README COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@LANGUAGE@,$LANGUAGE," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmclock/wmclock.info b/desktop/wmclock/wmclock.info
index 5ae0584212..fad3ff31d4 100644
--- a/desktop/wmclock/wmclock.info
+++ b/desktop/wmclock/wmclock.info
@@ -1,8 +1,8 @@
 PRGNAM="wmclock"
-VERSION="1.0.13"
+VERSION="1.0.14"
 HOMEPAGE="http://www.bluestop.org/wmclock/"
-DOWNLOAD="http://www.bluestop.org/wmclock/wmclock-1.0.13.tar.gz"
-MD5SUM="e0ce24c2fe700351b1e917dd63dff7f0"
+DOWNLOAD="http://www.bluestop.org/wmclock/wmclock-1.0.14.tar.gz"
+MD5SUM="15a83f45e2baabec26b22a2153aa2417"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/wmctrl/patch-64bit.diff b/desktop/wmctrl/patch-64bit.diff
new file mode 100644
index 0000000000..4af039d3cd
--- /dev/null
+++ b/desktop/wmctrl/patch-64bit.diff
@@ -0,0 +1,12 @@
+--- main.c.orig	2005-01-29 03:31:33.000000000 +0000
++++ main.c	2010-12-20 11:09:11.000000000 +0000
+@@ -1441,6 +1441,9 @@
+ 
+     /* null terminate the result to make string handling easier */
+     tmp_size = (ret_format / 8) * ret_nitems;
++    /* Correct 64 Architecture implementation of 32 bit data */
++    if (ret_format == 32)
++        tmp_size *= sizeof(long)/4;
+     ret = g_malloc(tmp_size + 1);
+     memcpy(ret, ret_prop, tmp_size);
+     ret[tmp_size] = '\0';
diff --git a/desktop/wmctrl/wmctrl.SlackBuild b/desktop/wmctrl/wmctrl.SlackBuild
index 3e628d93cb..0b88252f8c 100644
--- a/desktop/wmctrl/wmctrl.SlackBuild
+++ b/desktop/wmctrl/wmctrl.SlackBuild
@@ -3,11 +3,12 @@
 # Slackware build script for wmctrl
 # Written by Vasilis Papavasileiou <el03020 at mail dot ntua dot gr>
 # Modified by the SlackBuilds.org project
+# Modified by Mason Loring Bliss.
 # (assumed to be public domain per our submission policy)
 
 PRGNAM=wmctrl
 VERSION=1.07
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,6 +63,8 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
+patch -p0 < $CWD/patch-64bit.diff
+
 make
 make install DESTDIR=$PKG
 
diff --git a/desktop/wmctrl/wmctrl.info b/desktop/wmctrl/wmctrl.info
index ed0858cf3c..facf6772c1 100644
--- a/desktop/wmctrl/wmctrl.info
+++ b/desktop/wmctrl/wmctrl.info
@@ -6,5 +6,5 @@ MD5SUM="1fe3c7a2caa6071e071ba34f587e1555"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Vasilis Papavasileiou"
-EMAIL="el03020@mail.ntua.gr"
+MAINTAINER="Mason Loring Bliss"
+EMAIL="mason@blisses.org"
diff --git a/desktop/wmmon/README b/desktop/wmmon/README
index 0da8e71022..ef5a14b94d 100644
--- a/desktop/wmmon/README
+++ b/desktop/wmmon/README
@@ -1,6 +1,3 @@
 WMMon monitors the your CPU, Disk I/O, Memory and Swap usage, and shows
 an average load for CPU and Disk I/O. It also displays your uptime. You
 just click on it to toggle the display.
-
-This build includes security fixes and 2.6 kernel support added by Simon
-Law (maintainer of the wmmon Debian package).
diff --git a/desktop/wmmon/patches/gcc5.diff b/desktop/wmmon/patches/gcc5.diff
new file mode 100644
index 0000000000..1d02bddb48
--- /dev/null
+++ b/desktop/wmmon/patches/gcc5.diff
@@ -0,0 +1,18 @@
+Description: fix build failure with gcc5:
+ build with "-std=gnu89"
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/778171
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2015-07-19
+
+--- a/wmmon/Makefile
++++ b/wmmon/Makefile
+@@ -5,7 +5,7 @@
+ 		../wmgeneral/misc.o \
+ 		../wmgeneral/list.o
+ 
+-CFLAGS = -O2
++CFLAGS = -O2 -std=gnu89
+ CC = cc
+ 
+ 
diff --git a/desktop/wmmon/patches/wmmon_1_0b2-p14.diff b/desktop/wmmon/patches/wmmon_1_0b2-p14.diff
deleted file mode 100644
index acb1979f5a..0000000000
--- a/desktop/wmmon/patches/wmmon_1_0b2-p14.diff
+++ /dev/null
@@ -1,996 +0,0 @@
---- wmmon-1.0b2.orig/wmgeneral/wmgeneral.c
-+++ wmmon-1.0b2/wmgeneral/wmgeneral.c
-@@ -12,6 +12,8 @@
- 	---
- 	CHANGES:
- 	---
-+	10/10/2003 (Simon Law, sfllaw@debian.org)
-+		* changed the parse_rcfile function to use getline instead of fgets.
- 	02/05/1998 (Martijn Pieterse, pieterse@xs4all.nl)
- 		* changed the read_rc_file to parse_rcfile, as suggester by Marcelo E. Magallon
- 		* debugged the parse_rc file.
-@@ -21,6 +23,7 @@
- 
- */
- 
-+#define _GNU_SOURCE
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -83,17 +86,18 @@
- void parse_rcfile(const char *filename, rckeys *keys) {
- 
- 	char	*p;
--	char	temp[128];
-+	char	*line = NULL;
-+	size_t  line_size = 0;
- 	char	*tokens = " :\t\n";
- 	FILE	*fp;
- 	int		i,key;
- 
- 	fp = fopen(filename, "r");
- 	if (fp) {
--		while (fgets(temp, 128, fp)) {
-+		while (getline(&line, &line_size, fp) >= 0) {
- 			key = 0;
- 			while (key >= 0 && keys[key].label) {
--				if ((p = strstr(temp, keys[key].label))) {
-+				if ((p = strstr(line, keys[key].label))) {
- 					p += strlen(keys[key].label);
- 					p += strspn(p, tokens);
- 					if ((i = strcspn(p, "#\n"))) p[i] = 0;
-@@ -270,6 +274,7 @@
- 	unsigned int	borderwidth = 1;
- 	XClassHint		classHint;
- 	char			*display_name = NULL;
-+	char			*geometry = NULL;
- 	char			*wname = argv[0];
- 	XTextProperty	name;
- 
-@@ -282,7 +287,9 @@
- 
- 	for (i=1; argv[i]; i++) {
- 		if (!strcmp(argv[i], "-display")) 
--			display_name = argv[i+1];
-+			display_name = argv[++i];
-+		else if (!strcmp(argv[i], "-geometry"))
-+			geometry = argv[++i];
- 	}
- 
- 	if (!(display = XOpenDisplay(display_name))) {
-@@ -307,7 +314,11 @@
- 	fore_pix = GetColor("black");
- 
- 	XWMGeometry(display, screen, Geometry, NULL, borderwidth, &mysizehints,
--				&mysizehints.x, &mysizehints.y,&mysizehints.width,&mysizehints.height, &dummy);
-+	            &mysizehints.x, &mysizehints.y,
-+	            &mysizehints.width, &mysizehints.height, &dummy);
-+	if (geometry)
-+		XParseGeometry(geometry, &mysizehints.x, &mysizehints.y,
-+		               &mysizehints.width, &mysizehints.height);
- 
- 	mysizehints.width = 64;
- 	mysizehints.height = 64;
-@@ -364,3 +375,6 @@
- 	XMapWindow(display, win);
- 
- }
-+
-+/* vim: sw=4 ts=4 columns=82
-+ */
---- wmmon-1.0b2.orig/wmmon/wmmon.c
-+++ wmmon-1.0b2/wmmon/wmmon.c
-@@ -28,6 +28,12 @@
- 	Changes:
- 	----
- 
-+	15/05/2004 (Simon Law, sfllaw@debian.org)
-+		* Support disabling of mode-cycling
-+	23/10/2003 (Simon Law, sfllaw@debian.org)
-+		* Eliminated exploitable static buffers
-+		* Added -geometry support.
-+		* /proc/meminfo support for Linux 2.6
- 	18/05/1998 (Antoine Nulle, warp@xs4all.nl)
- 		* MEM/SWAP/UPTIME only updated when visible
- 		* Using global file descriptors to reduce file
-@@ -65,6 +71,7 @@
- 		* First Working Version
- */
- 
-+#define _GNU_SOURCE
- #include <stdlib.h>
- #include <stdio.h>
- #include <time.h>
-@@ -100,31 +107,28 @@
-  /* Global Variables */
- /********************/
- 
--char	*ProgName;
- int	stat_current = 0; /* now global */
-+int mode_cycling = 1; /* Allow mode-cycling */
- FILE	*fp_meminfo;
- FILE	*fp_stat;
- FILE	*fp_loadavg;
- 
- /* functions */
--void usage(void);
-+void usage(char*);
- void printversion(void);
- void DrawStats(int *, int, int, int, int);
- void DrawStats_io(int *, int, int, int, int);
- 
- void wmmon_routine(int, char **);
- 
--void main(int argc, char *argv[]) {
-+int main(int argc, char *argv[]) {
- 
- 	int		i;
-+	char	*name = argv[0];
- 	
- 
- 	/* Parse Command Line */
- 
--	ProgName = argv[0];
--	if (strlen(ProgName) >= 5)
--		ProgName += (strlen(ProgName) - 5);
--	
- 	for (i=1; i<argc; i++) {
- 		char *arg = argv[i];
- 
-@@ -132,13 +136,17 @@
- 			switch (arg[1]) {
- 			case 'd' :
- 				if (strcmp(arg+1, "display")) {
--					usage();
--					exit(1);
-+					usage(name);
-+					return 1;
- 				}
- 				break;
--			case 'v' :
--				printversion();
--				exit(0);
-+			case 'g' :
-+				if (strcmp(arg+1, "geometry")) {
-+					usage(name);
-+					return 1;
-+				}
-+			case 'l' :
-+				mode_cycling = 0;
- 				break;
- 			case 'i' :
- 				stat_current = 1;
-@@ -146,15 +154,20 @@
- 			case 's' :
- 				stat_current = 2;
- 				break;
-+			case 'v' :
-+				printversion();
-+				return 0;
- 			default:
--				usage();
--				exit(0);
--				break;
-+				usage(name);
-+				return 1;
- 			}
- 		}
- 	}
- 
- 	wmmon_routine(argc, argv);
-+  
-+      exit (0);
-+   
- }
- 
- /*******************************************************************************\
-@@ -214,8 +227,7 @@
- 	long		idle;
- 
- 	FILE		*fp;
--	char		temp[128];
--	char		*p;
-+	char		*conffile = NULL;
- 
- 	int			xpm_X = 0, xpm_Y = 0;
- 
-@@ -246,16 +258,21 @@
- 	if (RIGHT_ACTION) right_action = strdup(RIGHT_ACTION);
- 	if (MIDDLE_ACTION) middle_action = strdup(MIDDLE_ACTION);
- 
--	strcpy(temp, "/etc/wmmonrc");
--	parse_rcfile(temp, wmmon_keys);
-+	/* Scan through the .rc files */
-+	if (asprintf(&conffile, "/etc/wmmonrc") >= 0) {
-+		parse_rcfile(conffile, wmmon_keys);
-+		free(conffile);
-+	}
- 
--	p = getenv("HOME");
--	strcpy(temp, p);
--	strcat(temp, "/.wmmonrc");
--	parse_rcfile(temp, wmmon_keys);
--	
--	strcpy(temp, "/etc/wmmonrc.fixed");
--	parse_rcfile(temp, wmmon_keys);
-+	if (asprintf(&conffile, "%s/.wmmonrc", getenv("HOME")) >= 0) {
-+		parse_rcfile(conffile, wmmon_keys);
-+		free(conffile);
-+	}
-+
-+	if (asprintf(&conffile, "/etc/wmmonrc.fixed") >= 0) {
-+		parse_rcfile(conffile, wmmon_keys);
-+		free(conffile);
-+	}
- 
- 	stat_online = checksysdevs();
- 
-@@ -269,26 +286,36 @@
- 	starttime = time(0);
- 	nexttime = starttime + 10;
- 
-+	/* Collect information on each panel */
- 	for (i=0; i<stat_online; i++) {
- 		get_statistics(stat_device[i].name, &k, &istat, &idle);
- 		stat_device[i].statlast = istat;
- 		stat_device[i].idlelast = idle;
- 	}
--	if (stat_current == 0) DrawStats(stat_device[stat_current].his, 54, 40, 5, 58);
--	if (stat_current == 1) {
--		DrawStats_io(stat_device[stat_current].his, 54, 40, 5, 58);
--	}
--	if (stat_current == 2) {
--		xpm_X = 64;
--		setMaskXY(-64, 0);
--	} else {
--		xpm_X = 0;
--		setMaskXY(0, 0);
-+
-+	/* Set the mask for the current window */
-+	switch (stat_current) {
-+		case 0:
-+		case 1:
-+			xpm_X = 0;
-+			setMaskXY(0, 0);
-+			break;
-+		case 2:
-+			xpm_X = 64;
-+			setMaskXY(-64, 0);
-+		default:
-+			break;
- 	}
-+
-+	/* Draw statistics */
-+	if (stat_current == 0)
-+		DrawStats(stat_device[stat_current].his, 54, 40, 5, 58);
-+	if (stat_current == 1)
-+		DrawStats_io(stat_device[stat_current].his, 54, 40, 5, 58);
- 	DrawActive(stat_device[stat_current].name);
- 
- 	while (1) {
--		curtime = time(0);
-+		curtime = time(NULL);
- 
- 		waitpid(0, NULL, WNOHANG);
- 
-@@ -377,6 +404,9 @@
- 		if (curtime >= nexttime) {
- 			nexttime+=10;
- 
-+			if (curtime > nexttime) /* dont let APM suspends make this crazy */
-+			  nexttime = curtime;
-+
- 			for (i=0; i<stat_online; i++) {
- 				if (stat_device[i].his[54])
- 					stat_device[i].his[54] /= stat_device[i].hisaddcnt;
-@@ -411,7 +441,7 @@
- 				break;
- 			case ButtonRelease:
- 				i = CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
--				if (but_stat == i && but_stat >= 0) {
-+				if (but_stat == i && but_stat >= 0 && mode_cycling) {
- 					switch (but_stat) {
- 					case 0:
- 						switch (Event.xbutton.button) {
-@@ -430,7 +460,6 @@
- 						}
- 					case 1:
- 						stat_current++;
--						printf("current stat is :%d\n", stat_current);
- 						if (stat_current == stat_online)
- 							stat_current = 0;
- 
-@@ -499,43 +528,80 @@
- 
- void update_stat_mem(stat_dev *st, stat_dev *st2) {
- 
--	char	temp[128];
-+	static char *line = NULL;
-+	static size_t line_size = 0;
-+
-+	unsigned long swapfree;
- 	unsigned long free, shared, buffers, cached;
- 
- 	freopen("/proc/meminfo", "r", fp_meminfo);
--	while (fgets(temp, 128, fp_meminfo)) {
--		if (strstr(temp, "Mem:")) {
--			sscanf(temp, "Mem: %ld %ld %ld %ld %ld %ld",
--			       &st->rt_idle, &st->rt_stat,
--			       &free, &shared, &buffers, &cached);
--			st->rt_idle >>= 10;
--			st->rt_stat -= buffers+cached;
--			st->rt_stat >>= 10;
--//			break;
--		}
--		if (strstr(temp, "Swap:")) {
--			sscanf(temp, "Swap: %ld %ld", &st2->rt_idle, &st2->rt_stat);
--			st2->rt_idle >>= 10;
--			st2->rt_stat >>= 10;
--			break;
-+	while ((getline(&line, &line_size, fp_meminfo)) > 0) {
-+		/* The original format for the first two lines of /proc/meminfo was
-+		 * Mem: total used free shared buffers cached
-+		 * Swap: total used free
-+		 *
-+		 * As of at least 2.5.47 these two lines were removed, so that the
-+		 * required information has to come from the rest of the lines.
-+		 * On top of that, used is no longer recorded - you have to work
-+		 * this out yourself, from total - free.
-+		 *
-+		 * So, these changes below should work. They should also work with
-+		 * older kernels, too, since the new format has been available for
-+		 * ages.
-+		 */
-+		if (strstr(line, "MemTotal:")) {
-+			sscanf(line, "MemTotal: %ld", &st->rt_idle);
-+		}
-+		else if (strstr(line, "MemFree:")) {
-+			sscanf(line, "MemFree: %ld", &free);
-+		}
-+		else if (strstr(line, "MemShared:")) {
-+			sscanf(line, "MemShared: %ld", &shared);
-+		}
-+		else if (strstr(line, "Buffers:")) {
-+			sscanf(line, "Buffers: %ld", &buffers);
-+		}
-+		else if (strstr(line, "Cached:")) {
-+			sscanf(line, "Cached: %ld", &cached);
-+		}
-+		else if (strstr(line, "SwapTotal:")) {
-+			sscanf(line, "SwapTotal: %ld", &st2->rt_idle);
-+		}
-+		else if (strstr(line, "SwapFree:")) {
-+			sscanf(line, "SwapFree: %ld", &swapfree);
- 		}
- 	}
-+
-+	/* memory use - rt_stat is the amount used, it seems, and this isn't
-+	 * recorded in current version of /proc/meminfo (as of 2.5.47), so we
-+	 * calculate it from MemTotal - MemFree
-+	 */
-+	st->rt_stat = st->rt_idle - free;
-+	st->rt_stat -= buffers+cached;
-+	/* As with the amount of memory used, it's not recorded any more, so
-+	 * we have to calculate it ourselves.
-+	 */
-+	st2->rt_stat = st2->rt_idle - swapfree;
- }
- 
- void update_stat_swp(stat_dev *st) {
- 
--	char	temp[128];
-+	static char *line = NULL;
-+	static size_t line_size = 0;
-+	unsigned long swapfree;
- 
- 	fseek(fp_meminfo, 0, SEEK_SET);
--	while (fgets(temp, 128, fp_meminfo)) {
--		if (strstr(temp, "Swap:")) {
--			sscanf(temp, "Swap: %ld %ld", &st->rt_idle, &st->rt_stat);
--			st->rt_idle >>= 10;
--			st->rt_stat >>= 10;
--			break;
-+	while ((getline(&line, &line_size, fp_meminfo)) > 0) {
-+		/* As with update_stat_mem(), the format change to /proc/meminfo has
-+		 * forced some changes here. */
-+		if (strstr(line, "SwapTotal:")) {
-+			sscanf(line, "SwapTotal: %ld", &st->rt_idle);
-+		}
-+		else if (strstr(line, "SwapFree:")) {
-+			sscanf(line, "SwapFree: %ld", &swapfree);
- 		}
- 	}
--
-+	st->rt_stat = st->rt_idle - swapfree;
- }
- 
- /*******************************************************************************\
-@@ -545,11 +611,11 @@
- void get_statistics(char *devname, long *is, long *ds, long *idle) {
- 
- 	int	i;
--	char	temp[128];
-+	static char *line = NULL;
-+	static size_t line_size = 0;
- 	char	*p;
- 	char	*tokens = " \t\n";
- 	float	f;
--	long	maxdiskio=0;
- 
- 	*is = 0;
- 	*ds = 0;
-@@ -557,9 +623,9 @@
- 
- 	if (!strncmp(devname, "cpu", 3)) {
- 		fseek(fp_stat, 0, SEEK_SET);
--		while (fgets(temp, 128, fp_stat)) {
--			if (strstr(temp, "cpu")) {
--				p = strtok(temp, tokens);
-+		while ((getline(&line, &line_size, fp_stat)) > 0) {
-+			if (strstr(line, "cpu ")) {
-+				p = strtok(line, tokens);
- 				/* 1..3, 4 == idle, we don't want idle! */
- 				for (i=0; i<3; i++) {
- 					p = strtok(NULL, tokens);
-@@ -577,17 +643,35 @@
- 	if (!strncmp(devname, "i/o", 3)) {
- 
- 		fseek(fp_stat, 0, SEEK_SET);
--		while (fgets(temp, 128, fp_stat)) {
--			if (strstr(temp, "disk_rio") || strstr(temp, "disk_wio")) {
--				p = strtok(temp, tokens);
-+		while ((getline(&line, &line_size, fp_stat)) > 0) {
-+			if (strstr(line, "disk_rio") || strstr(line, "disk_wio")) {
-+				p = strtok(line, tokens);
- 				/* 1..4 */
- 				for (i=0; i<4; i++) {
- 					p = strtok(NULL, tokens);
- 					*ds += atol(p);
- 				}
- 			}
-+			else if (strstr(line, "disk_io")) {
-+				int val;
-+				unsigned int a, b, c, d, e, h, g;
-+   
-+				p = strtok(line, tokens);
-+   
-+				while ((p = strtok(NULL, tokens))) {
-+					val = sscanf (p,
-+						      "(%d,%d):(%d,%d,%d,%d,%d)",
-+						      &a, &b, &c, &d, &e, &h,
-+						      &g);
-+   
-+					if (val != 7)
-+						continue;
-+   
-+					*ds += d;
-+					*ds += h;
-+				}
-+			}
- 		}
--		if (*ds > maxdiskio) maxdiskio = *ds;
- 	}
- }
- 
-@@ -715,16 +799,17 @@
- |* usage																	   *|
- \*******************************************************************************/
- 
--void usage(void) {
--
--	fprintf(stderr, "\nwmmon - programming: tijno, (de)bugging & design warp, webhosting: bobby\n\n");
--	fprintf(stderr, "usage:\n");
--	fprintf(stderr, "\t-display <display name>\n");
--	fprintf(stderr, "\t-h\tthis screen\n");
--	fprintf(stderr, "\t-v\tprint the version number\n");
--	fprintf(stderr, "\t-i\tstartup in DiskIO mode\n");
--	fprintf(stderr, "\t-s\tstartup in SysInfo mode\n");
--	fprintf(stderr, "\n");
-+void usage(char *name) {
-+	printf("Usage: %s [OPTION]...\n", name);
-+	printf("WindowMaker dockapp that displays system information.\n");
-+	printf("\n");
-+	printf("  -display DISPLAY     contact the DISPLAY X server\n");
-+	printf("  -geometry GEOMETRY   position the clock at GEOMETRY\n");
-+	printf("  -l                   locked view - cannot cycle modes\n");
-+	printf("  -i                   start in Disk I/O mode\n");
-+	printf("  -s                   start in System Info mode\n");
-+	printf("  -h                   display this help and exit\n");
-+	printf("  -v                   output version information and exit\n");
- }
- 
- /*******************************************************************************\
-@@ -733,7 +818,7 @@
- 
- void printversion(void) {
- 
--	if (!strcmp(ProgName, "wmmon")) {
--		fprintf(stderr, "%s\n", WMMON_VERSION);
--	}
-+	printf("WMMon version %s\n", WMMON_VERSION);
- }
-+/* vim: sw=4 ts=4 columns=82
-+ */
---- wmmon-1.0b2.orig/wmmon/wmmon.1
-+++ wmmon-1.0b2/wmmon/wmmon.1
-@@ -0,0 +1,192 @@
-+'\" t
-+.\" Man page for wmmon
-+.\" Copyright (c) 2003  Software in the Public Interest, Inc.
-+.\"
-+.\" This program is free software; you can redistribute it and/or modify
-+.\" it under the terms of the GNU General Public License as published by
-+.\" the Free Software Foundation; either version 2 of the License, or (at
-+.\" your option) any later version.
-+.\"
-+.\" This program is distributed in the hope that it will be useful, but
-+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+.\" General Public License for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this program; if not, write to the Free Software
-+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-+.\"
-+.TH wmmon 1 "May 1998" "WMMON 1.0b2"
-+
-+.SH NAME
-+wmmon \- Window Maker dockapp for monitoring system information
-+
-+.SH SYNOPSIS
-+
-+.B wmmon
-+[
-+.I OPTION
-+]
-+
-+.SH DESCRIPTION
-+
-+.B WMMon
-+monitors the realtime CPU load as well as the average system load,
-+and gives you some nice additional features too. It is intended for
-+docking in Window Maker.
-+
-+It currently provides:
-+
-+.IP \(bu 4
-+a realtime CPU stress meter;
-+.IP \(bu
-+an auto-scaled average system load meter, like
-+.B xload
-+and
-+.BR wmavgload ;
-+.IP \(bu
-+a realtime disk I/O stress meter;
-+.IP \(bu
-+auto-scaled disk I/O load meter;
-+.IP \(bu
-+realtime memory and swap usage meters;
-+.IP \(bu
-+a display for system uptime;
-+.IP \(bu
-+three user-defined commands to launch.
-+
-+.SH OPTIONS
-+
-+.TP
-+.BI \-display \ display
-+This option specifies the X server to contact; see
-+.IR X(7x) .
-+
-+.TP
-+.BI \-geometry \ geometry
-+This option specifies the preferred position of clock; see
-+.IR X(7x) .
-+
-+.TP
-+.BR \-l
-+Lock the mode, so that it cannot be cycled by clicking on the upper-left
-+widget.  You can use this to open multiple copies of
-+.BR WMMon ,
-+each set to a different mode.
-+
-+.TP
-+.BR \-i
-+Start in disk I/O mode, which displays instantaneous disk usage and
-+average disk load.
-+
-+.TP
-+.BR \-s
-+Start in system information mode, which displays memory usage, swap usage,
-+and uptime.
-+
-+.TP
-+.B \-h
-+Show help information.
-+
-+.TP
-+.B \-v
-+Print the version number.
-+
-+.SH USAGE
-+The
-+.B WMMon
-+display can be cycled between CPU, disk I/O, and system
-+information displays by clicking on the upper-left widget.  This
-+displays CPU information by default.
-+
-+WMMon can also be used to launch programs.  You may click either left,
-+middle, or right mouse buttons in the average-load section of the
-+window.  The pre-configured program will be launched according to the
-+mouse button clicked.  (see
-+.B CONFIGURATION FILE
-+below.)
-+
-+In order to move
-+.BR WMMon ,
-+drag on the outer edges.  These are not sensitive to mouse clicks.
-+
-+.SH "DOCKING IN WINDOW MANAGERS"
-+
-+.TP
-+Window Maker
-+
-+Window Maker users should drag and drop the
-+.B WMMon
-+window on the Dock.  Then, right-click on the border of the window and
-+select \*(lqSettings...\*(rq.  Check \*(lqStart when Window Maker
-+is started\*(rq.
-+
-+.TP
-+AfterStep
-+
-+AfterStep users should put the following in their
-+.I $HOME/.steprc
-+
-+.RS 16
-+Wharf wmmon \- MaxSwallow "wmmon" wmmon &
-+.RE
-+
-+.TP
-+Other window managers
-+
-+.B WMMon
-+runs nicely as a 64x64 shaped icon on your desktop.
-+
-+.SH "CONFIGURATION FILE"
-+
-+.B WMMon
-+can launch three user-defined commands, triggered by left, middle and
-+right mouse button clicks.  You can define the commands to launch in
-+.I $HOME/.wmmonrc
-+
-+.RS
-+.PD 0
-+left: xterm
-+.PP
-+middle: xload
-+.PP
-+right: xcalc
-+.PP
-+.PD 
-+.RE
-+
-+If
-+.B WMMon
-+detects a
-+.I $HOME/.wmmonrc
-+file, it will launch the appropriate command when you click on the clock.
-+
-+The system administrator can define default commands in
-+.IR /etc/wmmonrc .
-+The administrator may also choose to \*(lqfix\*(rq particular commands,
-+making it impossible for users to change.  These commands can be defined in
-+.IR /etc/wmmonrc.fixed ,
-+although this isn't a nice thing to do.
-+
-+.SH FILES
-+
-+.I /etc/wmmonrc
-+.br
-+.I $HOME/.wmmonrc
-+.br
-+.I /etc/wmmonrc.fixed
-+
-+.SH AUTHORS
-+
-+.B WMMon
-+was written by Martijn Pieterse and Antoine Nulle.
-+
-+This manual page was written by Simon Law <sfllaw@debian.org> for the
-+.B Debian
-+system (but may be used by others). It is based on the documentation provided
-+by the original program.
-+
-+This manual is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or (at
-+your option) any later version.
---- wmmon-1.0b2.orig/debian/examples
-+++ wmmon-1.0b2/debian/examples
-@@ -0,0 +1 @@
-+debian/wmmonrc
---- wmmon-1.0b2.orig/debian/dirs
-+++ wmmon-1.0b2/debian/dirs
-@@ -0,0 +1 @@
-+usr/bin
---- wmmon-1.0b2.orig/debian/rules
-+++ wmmon-1.0b2/debian/rules
-@@ -0,0 +1,96 @@
-+#!/usr/bin/make -f
-+#
-+# debian/rules file for wmmon.
-+# Copyright (C) 2003  Software in the Public Interest.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or (at
-+# your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+# 
-+# Based on the sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -g
-+endif
-+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-+	INSTALL_PROGRAM += -s
-+endif
-+
-+build: build-stamp
-+
-+build-stamp:
-+	dh_testdir
-+
-+	# Add here commands to compile the package.
-+	cd wmmon; $(MAKE)
-+
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp 
-+
-+	# Add here commands to clean up after the build process.
-+	-cd wmmon; $(MAKE) clean
-+
-+	dh_clean
-+
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	# Add here commands to install the package into debian/wmmon.
-+	install -m 755 wmmon/wmmon $(CURDIR)/debian/wmmon/usr/bin
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installdebconf
-+	dh_installdocs
-+	dh_installexamples
-+	dh_installmenu
-+#	dh_installlogrotate
-+#	dh_installemacsen
-+#	dh_installpam
-+#	dh_installmime
-+#	dh_installinit
-+#	dh_installcron
-+	dh_installman
-+#	dh_installinfo
-+	dh_installchangelogs CHANGES
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+#	dh_makeshlibs
-+	dh_installdeb
-+#	dh_perl
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install 
---- wmmon-1.0b2.orig/debian/menu
-+++ wmmon-1.0b2/debian/menu
-@@ -0,0 +1,6 @@
-+?package(wmmon):\
-+	needs="X11"\
-+	section="Apps/System"\
-+	title="WMmon"\
-+	command="/usr/bin/wmmon"\
-+	hints="Monitoring,Dockapp"
---- wmmon-1.0b2.orig/debian/changelog
-+++ wmmon-1.0b2/debian/changelog
-@@ -0,0 +1,100 @@
-+wmmon (1.0b2-14) unstable; urgency=medium
-+
-+  * Fixed build dependencies so we no longer depend on libxpm4-dev.
-+  * Quoted all strings in /usr/lib/menu/wmtime.
-+  * Add the ability to lock the mode, preventing cycling.  Thanks go to
-+    Chris Bechberger <bechberger@yahoo.com>.
-+
-+ -- Simon Law <sfllaw@debian.org>  Tue, 10 Aug 2004 21:22:17 -0400
-+
-+wmmon (1.0b2-13) unstable; urgency=low
-+
-+  * Removed a memory leak that I introduced.  (Closes: Bug#223338)
-+
-+ -- Simon Law <sfllaw@debian.org>  Tue, 09 Dec 2003 12:42:41 -0500
-+
-+wmmon (1.0b2-12) unstable; urgency=low
-+
-+  * Changed section to x11.
-+
-+ -- Simon Law <sfllaw@debian.org>  Fri, 05 Dec 2003 11:17:21 -0500
-+
-+wmmon (1.0b2-11) unstable; urgency=low
-+
-+  * New maintainer.
-+  * Added a manual page.
-+  * Added the -geometry option.
-+  * Ensure that I/O mode works the same no matter how it is started.
-+    (Closes: Bug#94277)
-+  * Support new /proc/meminfo format in 2.6 kernels. (Closes: Bug#169160)
-+  * Fixed some buffer overflow problems.  (Closes: Bug#174949)
-+
-+ -- Simon Law <sfllaw@debian.org>  Wed, 26 Nov 2003 23:47:47 -0500
-+
-+wmmon (1.0b2-10) unstable; urgency=low
-+
-+  * Fixed build depends (closes: #170133)
-+  * Applied patch from Simon Fowler <simon@himi.org> to fix /proc/meminfo
-+    parsing for linux 2.5.
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Fri, 22 Nov 2002 14:17:26 +0100
-+
-+wmmon (1.0b2-9) unstable; urgency=low
-+
-+  * Remove debug message (closes: #139408)
-+  * Applied patch from Frederik Schueler <fs@lowpingbastards.de>
-+    to fix /proc/stat parsing on linux 2.4 (closes: #144122)
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Tue, 23 Apr 2002 21:39:09 +0200
-+
-+wmmon (1.0b2-8) unstable; urgency=low
-+
-+  * Fixed menu path (closes: #129353)
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Thu, 17 Jan 2002 21:35:03 +0100
-+
-+wmmon (1.0b2-7) unstable; urgency=low
-+
-+  * Updated description (closes: #125496)
-+  * Don't install INSTALL (closes: #116940)
-+  * Changed section to utils
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Wed,  2 Jan 2002 23:19:06 +0100
-+
-+wmmon (1.0b2-6) unstable; urgency=low
-+
-+  * Updated menu with patch from Arthur Korn <arthur@korn.ch>
-+    (closes: #82315)
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Mon, 15 Jan 2001 07:56:10 +0100
-+
-+wmmon (1.0b2-5) unstable; urgency=low
-+
-+  * Build without xpm4.7 (closes: #77466)
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Sun, 19 Nov 2000 22:17:03 +0100
-+
-+wmmon (1.0b2-4) unstable; urgency=low
-+
-+  * Added menu entry (closes: #76969)
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Sat, 18 Nov 2000 21:14:56 +0100
-+
-+wmmon (1.0b2-3) unstable; urgency=low
-+
-+  * Rebuild to update libxmp dependency. (closes: #67990)
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Mon, 31 Jul 2000 07:25:09 +0200
-+
-+wmmon (1.0b2-2) unstable; urgency=low
-+
-+  * Patch from Salvador Pinto Abreu <spa@sc.uevora.pt>:
-+    Fixed behavior when APM causes the system to sleep/suspend.
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Sat, 17 Oct 1998 13:35:55 +0200
-+
-+wmmon (1.0b2-1) unstable; urgency=low
-+
-+  * Initial Release.
-+
-+ -- Fredrik Hallenberg <hallon@debian.org>  Wed, 15 Jul 1998 18:18:37 +0200
---- wmmon-1.0b2.orig/debian/control
-+++ wmmon-1.0b2/debian/control
-@@ -0,0 +1,24 @@
-+Source: wmmon
-+Section: x11
-+Priority: optional
-+Maintainer: Simon Law <sfllaw@debian.org>
-+Standards-Version: 3.6.1
-+Build-Depends: debhelper (>> 4.0.0), libx11-dev, libxpm-dev, libxext-dev
-+
-+Package: wmmon
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Description: Window Maker dockapp for monitoring system information
-+ WMMon monitors the realtime CPU load as well as the average system load,
-+ and gives you some nice additional features too. It is intended for
-+ docking in Window Maker.
-+ .
-+ It currently provides:
-+ .
-+   * a realtime CPU stress meter;
-+   * an auto-scaled average system load meter, like xload and wmavgload;
-+   * a realtime disk I/O stress meter;
-+   * auto-scaled disk I/O load meter;
-+   * realtime memory and swap usage meters;
-+   * a display for system uptime;
-+   * three user-defined commands to launch.
---- wmmon-1.0b2.orig/debian/copyright
-+++ wmmon-1.0b2/debian/copyright
-@@ -0,0 +1,25 @@
-+This package was debianized by Fredrik Hallenberg hallon@debian.org on
-+Wed, 15 Jul 1998 18:18:37 +0200.
-+
-+It was downloaded from http://www.xs4all.nl/~warp/files/wmmon-1.0b2.tar.gz
-+
-+Upstream Copyright:
-+
-+    Copyright (c) 1997, 1998 by Martijn Pieterse and Antoine Nulle
-+
-+    This program is free software; you can redistribute it and/or modify it
-+    under the terms of the GNU General Public License as published by the
-+    Free Software Foundation; either version 2, or (at your option) any
-+    later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+On Debian GNU/Linux systems, the complete text of the GNU General
-+Public License can be found in `/usr/share/common-licenses/GPL'.
---- wmmon-1.0b2.orig/debian/manpages
-+++ wmmon-1.0b2/debian/manpages
-@@ -0,0 +1 @@
-+wmmon/wmmon.1
---- wmmon-1.0b2.orig/debian/compat
-+++ wmmon-1.0b2/debian/compat
-@@ -0,0 +1 @@
-+4
---- wmmon-1.0b2.orig/debian/wmmonrc
-+++ wmmon-1.0b2/debian/wmmonrc
-@@ -0,0 +1,3 @@
-+left: xterm
-+middle: xload
-+right: xcalc
diff --git a/desktop/wmmon/wmmon.SlackBuild b/desktop/wmmon/wmmon.SlackBuild
index 170840d264..84601f77db 100644
--- a/desktop/wmmon/wmmon.SlackBuild
+++ b/desktop/wmmon/wmmon.SlackBuild
@@ -7,13 +7,10 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=wmmon
-VERSION=${VERSION:-1.0b2_p14}
+VERSION=${VERSION:-1.1+20131205}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVER=$(echo $VERSION | cut -d_ -f1 | sed 's,\.,_,' )
-PATCHVER=$(echo $VERSION | cut -d_ -f2)
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -44,8 +41,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM.app
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM.app
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -53,11 +50,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# wmmon was pretty much abandoned by the original developer 10+ years ago.
-# The Debian maintainer has added some security-related fixes, a man page,
-# better support for 2.6 kernels, and some extra features. Most people
-# would prefer to run the patched version...
-patch -p1 < $CWD/patches/${PRGNAM}_$SRCVER-$PATCHVER.diff
+# need this for -current, it doesn't hurt anything on 14.1.
+# patch snarfed from Debian:
+patch -p1 < $CWD/patches/gcc5.diff
 
 # This patch is necessary because the $#!%^#$^ wmmonrc file parser doesn't
 # fully support comments: they are allowed, but a commented-out (but
@@ -85,8 +80,7 @@ cat $CWD/wmmonrc > $PKG/etc/wmmonrc.sample
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   BUGS CHANGES COPYING HINTS INSTALL README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION/changelog.debian
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/wmmon/wmmon.info b/desktop/wmmon/wmmon.info
index 911ad868b9..09646450fa 100644
--- a/desktop/wmmon/wmmon.info
+++ b/desktop/wmmon/wmmon.info
@@ -1,8 +1,8 @@
 PRGNAM="wmmon"
-VERSION="1.0b2_p14"
-HOMEPAGE="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/sys.html#wmmon"
-DOWNLOAD="http://distfiles.gentoo.org/distfiles/wmmon-1_0b2.tar.gz"
-MD5SUM="1b8c780b8c24a6958c69330fef4171df"
+VERSION="1.1+20131205"
+HOMEPAGE="http://repo.or.cz/w/dockapps.git"
+DOWNLOAD="http://http.debian.net/debian/pool/main/w/wmmon/wmmon_1.1+20131205.orig.tar.gz"
+MD5SUM="c2faf71b0d2bf92d65d308eee321104f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/wmtimer/README b/desktop/wmtimer/README
new file mode 100644
index 0000000000..58861c0d0a
--- /dev/null
+++ b/desktop/wmtimer/README
@@ -0,0 +1,3 @@
+WMTimer is a dockable alarm clock for WindowMaker which can be run in alarm, countdown timer, or
+chronograph mode. In alarm or timer mode, you can either execute a command or sound the system bell
+when the time is reached. Wmtimer is configurable through the command line or the GTK GUI.
diff --git a/desktop/wmtimer/slack-desc b/desktop/wmtimer/slack-desc
new file mode 100644
index 0000000000..440abd1a7f
--- /dev/null
+++ b/desktop/wmtimer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler--------------------------------------------------------|
+wmtimer: wmtimer (Timer DockApp)
+wmtimer: 
+wmtimer: WMTimer is a dockable alarm clock for WindowMaker which can be run in  
+wmtimer: alarm, countdown timer, or chronograph mode. In alarm or timer mode,
+wmtimer: you can either execute a command or sound the system bell when the time
+wmtimer: is reached. Wmtimer is configurable through the command line or the 
+wmtimer: GTK GUI.
+wmtimer: 
+wmtimer: Homepage: http://www.darkops.net/wmtimer/
+wmtimer:
+wmtimer:
diff --git a/desktop/wmtimer/wmtimer.SlackBuild b/desktop/wmtimer/wmtimer.SlackBuild
new file mode 100644
index 0000000000..6d70142469
--- /dev/null
+++ b/desktop/wmtimer/wmtimer.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for WMTimer
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmtimer
+VERSION=${VERSION:-2.92}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+cd wmtimer
+make
+
+# Create bin directory and move executable there
+mkdir -p $PKG/usr/bin
+mv wmtimer $PKG/usr/bin
+
+# Leave build directory
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog COPYING CREDITS INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmtimer/wmtimer.info b/desktop/wmtimer/wmtimer.info
new file mode 100644
index 0000000000..dd76c64390
--- /dev/null
+++ b/desktop/wmtimer/wmtimer.info
@@ -0,0 +1,10 @@
+PRGNAM="wmtimer"
+VERSION="2.92"
+HOMEPAGE="https://web.archive.org/web/20101217102400/http://www.darkops.net/wmtimer/"
+DOWNLOAD="https://web.archive.org/web/20101217102400/http://www.darkops.net/wmtimer/wmtimer-2.92.tar.gz"
+MD5SUM="425bbb4b0cc852f858da025538d7c900"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/wmudmount/README b/desktop/wmudmount/README
index bd0e92d087..e5f518ffc3 100644
--- a/desktop/wmudmount/README
+++ b/desktop/wmudmount/README
@@ -1,4 +1,10 @@
-wmudmount is a (dockapp) filesystem mounter that uses udisks to handle
-notification of new filesystems as a non-root user. It also includes
-a mode to display the mounted filesystems with the least free space
-percentage (similar to wmfsm).
+A filesystem mounter that uses udisks to handle notification of new filesystems and mounting
+of the filesystems as a non-root user. It also includes a mode to display the mounted
+filesystems with the least free space percentage (similar to wmfsm).
+
+Note: This SlackBuild uses the last version to support GTK2 and UDisks1. The latest versions
+are GTK3 and UDisks2 only. I may update this in the future with an optional patch for those
+who use GTK2. If you desire the latest version, visit the link to the home page below. The
+SlackBuild contains comments on what to change if you want to build version 2.2
+
+I would also accept a patch from anyone who backports the latest version to GTK2.
diff --git a/desktop/wmudmount/slack-desc b/desktop/wmudmount/slack-desc
index 12420af4d9..3fff7fa4fe 100644
--- a/desktop/wmudmount/slack-desc
+++ b/desktop/wmudmount/slack-desc
@@ -5,15 +5,15 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-         |-----handy-ruler------------------------------------------------------|
-wmudmount: wmudmount (Filesystem mounter)
+         |-----handy-ruler--------------------------------------------------------|
+wmudmount: wmudmount (Filesystem Mounter and Manager DockApp)
 wmudmount:
-wmudmount: wmudmount is a (dockapp) filesystem mounter that uses udisks to handle
-wmudmount: notification of new filesystems as a non-root user. It also includes
-wmudmount: a mode to display the mounted filesystems with the least free space
-wmudmount: percentage (similar to wmfsm).
+wmudmount: A filesystem mounter that uses udisks to handle notification of new
+wmudmount: filesystems and mounting of the filesystems as a non-root user. It also
+wmudmount: includes a mode to display the mounted filesystems with the least free
+wmudmount: space percentage (similar to wmfsm).
+wmudmount:
+wmudmount: Homepage: http://sourceforge.net/projects/wmudmount/
 wmudmount:
 wmudmount:
-wmudmount: Home page:          http://sourceforge.net/projects/wmudmount/
-wmudmount: dockapps.org entry: http://www.dockapps.org/file.php/id/357
 wmudmount:
diff --git a/desktop/wmudmount/wmudmount.SlackBuild b/desktop/wmudmount/wmudmount.SlackBuild
index f823258307..1e5739ea8e 100644
--- a/desktop/wmudmount/wmudmount.SlackBuild
+++ b/desktop/wmudmount/wmudmount.SlackBuild
@@ -1,29 +1,33 @@
 #!/bin/sh
-#
+
 # Slackware build script for wmudmount
 #
-# Written by Rex Hauser <thundermachinegun[AT]gmail.com>
+# Originally written by Rex Hauser <thundermachinegun[AT]gmail.com>
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
 #
-#   Redistribution and use of this script, with or without modification, is
-#   permitted provided that the following conditions are met:
+# Based on:
+# SBo's cmake-template
 #
-#   1. Redistributions of this script must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-#   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-#   EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wmudmount
-VERSION=${VERSION:-1.13}
+VERSION=${VERSION:-1.13} #If you want to use the newest version, read the comments below
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,16 +64,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+# Let's compile!
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -77,21 +81,18 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make DESTDIR=$PKG install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Compresses man page. For 2.2 users, remove the x in wmudmount.1x
+gzip -9 $PKG/usr/man/man1/wmudmount.1x
 
+# For 2.2 users, change line 95 to: ChangeLog COPYING \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmudmount/wmudmount.info b/desktop/wmudmount/wmudmount.info
index ca80221781..679a95a9a9 100644
--- a/desktop/wmudmount/wmudmount.info
+++ b/desktop/wmudmount/wmudmount.info
@@ -1,10 +1,10 @@
 PRGNAM="wmudmount"
 VERSION="1.13"
 HOMEPAGE="http://sourceforge.net/projects/wmudmount/"
-DOWNLOAD="http://downloads.sourceforge.net/project/wmudmount/wmudmount/wmudmount-1.13.tar.gz"
+DOWNLOAD="http://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-1.13.tar.gz"
 MD5SUM="988955faca6db4f9c4d26f8b79a38744"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Rex Hauser"
-EMAIL="thundermachinegun@gmail.com"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/wmweather+/README b/desktop/wmweather+/README
new file mode 100644
index 0000000000..9c5efe085c
--- /dev/null
+++ b/desktop/wmweather+/README
@@ -0,0 +1,6 @@
+wmweather+ will download the National Weather Serivce METAR bulletins;  AVN, ETA, and MRF forecasts;
+and any weather map for display in a WindowMaker dockapp. Think wmweather with a smaller font,
+forecasts, a weather map, and a sky condition display.
+
+Note: This requires a configuration setup in a home folder called ".wmweather+". See "example.conf"
+under /usr/doc and read the manpage on how to set it up.
diff --git a/desktop/wmweather+/slack-desc b/desktop/wmweather+/slack-desc
new file mode 100644
index 0000000000..f313d8ea2a
--- /dev/null
+++ b/desktop/wmweather+/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler--------------------------------------------------------|
+wmweather+: wmweather+ (Weather Monitor DockApp)
+wmweather+:
+wmweather+: wmweather+ will download the National Weather Serivce METAR bulletins;
+wmweather+: AVN, ETA, and MRF forecasts; and any weather map for display in a
+wmweather+: WindowMaker dockapp. Think wmweather with a smaller font, forecasts,
+wmweather+: a weather map, and a sky condition display.
+wmweather+:
+wmweather+: Homepage: http://sourceforge.net/projects/wmweatherplus/
+wmweather+:
+wmweather+:
+wmweather+:
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild
new file mode 100644
index 0000000000..7cb7452522
--- /dev/null
+++ b/desktop/wmweather+/wmweather+.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for wmweather+
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmweather+
+VERSION=${VERSION:-2.15}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+make
+make install DESTDIR=$PKG
+
+# Compresses man page
+gzip -9 $PKG/usr/man/man1/wmweather+.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING example.conf HINTS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmweather+/wmweather+.info b/desktop/wmweather+/wmweather+.info
new file mode 100644
index 0000000000..cb46edd8d3
--- /dev/null
+++ b/desktop/wmweather+/wmweather+.info
@@ -0,0 +1,10 @@
+PRGNAM="wmweather+"
+VERSION="2.15"
+HOMEPAGE="http://sourceforge.net/projects/wmweatherplus/"
+DOWNLOAD="http://sourceforge.net/projects/wmweatherplus/files/wmweather%2B/wmweather%2B-2.15.tar.gz"
+MD5SUM="5eea25d708abe1da3549672b898bd0d4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/wmwebcam/README b/desktop/wmwebcam/README
new file mode 100644
index 0000000000..0ba4ec57db
--- /dev/null
+++ b/desktop/wmwebcam/README
@@ -0,0 +1,10 @@
+wmwebcam is a dockapp that grabs an image from your webcam every second and displays the captured
+image. Original written years ago, it was updated by eukara to work with the newer V4L2. Credits go to
+him for the fix.
+
+You can customize the device location, webcam delay, and size. However, this must be done in the source
+before compile. To make this easier a patch is included, just open it in your favorite editor, read the
+comments, and edit the variables to your liking (make sure it's the lines with the "+" in front).
+
+There is also a default perl script that can upload the captured images to a FTP, this is also
+configurable in the patch.
diff --git a/desktop/wmwebcam/customize.patch b/desktop/wmwebcam/customize.patch
new file mode 100644
index 0000000000..fb9d7d5f18
--- /dev/null
+++ b/desktop/wmwebcam/customize.patch
@@ -0,0 +1,63 @@
+diff -Naur wmwebcam-0.3.5-fixed/Makefile wmwebcam-0.3.5-customize/Makefile
+--- wmwebcam-0.3.5-fixed/Makefile	2015-06-01 11:40:40.000000000 -0700
++++ wmwebcam-0.3.5-customize/Makefile	2015-11-24 02:23:25.695647261 -0700
+@@ -1,5 +1,5 @@
+ CC	= gcc
+-CFLAGS  = -O2 -Wall -I/usr/X11R6/include -DVIDEO_DEV=\"/dev/video0\"
++CFLAGS  = -O2 -Wall -I/usr/X11R6/include -DVIDEO_DEV=\"/dev/video0\"
+ LDFLAGS = 
+ LIBS	= -L/usr/X11R6/lib -lX11 -lXext -lm -ljpeg -lv4l1
+ 
+diff -Naur wmwebcam-0.3.5-fixed/wmwebcam.c wmwebcam-0.3.5-customize/wmwebcam.c
+--- wmwebcam-0.3.5-fixed/wmwebcam.c	2015-06-01 11:37:49.000000000 -0700
++++ wmwebcam-0.3.5-customize/wmwebcam.c	2015-11-24 02:22:29.172647747 -0700
+@@ -46,15 +46,15 @@
+ 
+ //////////////////////// CHANGE THESE IF NECESSARY ///////////////////////////
+ 
+-#define DEF_WIDTH	352         // changing these requires adjustements
+-#define DEF_HEIGHT	288         // to the source, use default if possible
++#define DEF_WIDTH	352         // changing these requires adjustements
++#define DEF_HEIGHT	288         // to the source, use default if possible
+ 
+-#define SENDINGDELAY	60          // default delay between saving jpeg
++#define SENDINGDELAY	60          // default delay between saving jpeg
+                                     // images and scriptrunning (in seconds)
+ 
+-#define OUTPUTFILE	"/tmp/wmwebcam.jpg"     // default output file
+-#define CUSTOMSCRIPT    "wmwebcam.pl"           // default custom script
+-#define QUAL_DEFAULT	100                     // default jpeg outputquality
++#define OUTPUTFILE	"/tmp/wmwebcam.jpg"     // default output file
++#define CUSTOMSCRIPT    "wmwebcam.pl"           // default custom script
++#define QUAL_DEFAULT	100                     // default jpeg outputquality
+ 
+ //////////////////////////////////////////////////////////////////////////////
+ 
+diff -Naur wmwebcam-0.3.5-fixed/wmwebcam.pl wmwebcam-0.3.5-customize/wmwebcam.pl
+--- wmwebcam-0.3.5-fixed/wmwebcam.pl	2001-01-27 09:24:16.000000000 -0700
++++ wmwebcam-0.3.5-customize/wmwebcam.pl	2015-11-24 02:23:01.323647470 -0700
+@@ -5,12 +5,12 @@
+ 
+ # check if the ppp is on before stamping&sending, otherwise don't do
+ # anything
+-$areweonline = `grep "ppp" /proc/net/route`;
++$areweonline = `grep "ppp" /proc/net/route`;
+ 
+-if (length $areweonline != 0) { # THIS IS JUST MY CONFIGURATION,
++if (length $areweonline != 0) { # THIS IS JUST MY CONFIGURATION,
+                                 # CHANGE TO YOUR OWN
+ 
+-system "stamp";    # stamp reads /tmp/wmwebcam.jpg and outputs
++system "stamp";    # stamp reads /tmp/wmwebcam.jpg and outputs
+                    # /tmp/webcam.jpg with some info (has to be
+                    # configured to do so)
+ # get stamp from:
+@@ -19,7 +19,7 @@
+ # NOTE: stamp has the ability to send the image to server via ftp, but I
+ # prefer using scp.
+ 
+-system "scp -q /tmp/webcam.jpg SOME_HOST:public_html/webcam.jpg";
++system "scp -q /tmp/webcam.jpg SOME_HOST:public_html/webcam.jpg";
+                    # replace the previous line to suit your needs
+                    # or disable if you use stamp's own ftpsend
+ } else {
diff --git a/desktop/wmwebcam/slack-desc b/desktop/wmwebcam/slack-desc
new file mode 100644
index 0000000000..67d56a30dd
--- /dev/null
+++ b/desktop/wmwebcam/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler--------------------------------------------------------|
+wmwebcam: wmwebcam (Webcam DockApp)
+wmwebcam: 
+wmwebcam: wmwebcam is a dockapp that grabs an image from your webcam every 
+wmwebcam: second and displays the captured image. Original written years ago, it
+wmwebcam: was updated by eukara to work with the newer V4L2.
+wmwebcam: 
+wmwebcam: Homepage: http://bloodbathsoftworks.com/eukara/
+wmwebcam:
+wmwebcam:
+wmwebcam:
+wmwebcam:
diff --git a/desktop/wmwebcam/wmwebcam.SlackBuild b/desktop/wmwebcam/wmwebcam.SlackBuild
new file mode 100644
index 0000000000..914b84e870
--- /dev/null
+++ b/desktop/wmwebcam/wmwebcam.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for wmwebcam-fixed
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmwebcam
+VERSION=${VERSION:-0.3.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION-fixed
+tar xvf $CWD/$PRGNAM-$VERSION-fixed.tar.gz
+cd $PRGNAM-$VERSION-fixed
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Customization patch
+patch -p1 < $CWD/customize.patch
+
+make
+
+mkdir -p $PKG/usr/bin
+mv wmwebcam $PKG/usr/bin
+mv wmwebcam.pl $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING Changelog $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmwebcam/wmwebcam.info b/desktop/wmwebcam/wmwebcam.info
new file mode 100644
index 0000000000..f0bea6ab87
--- /dev/null
+++ b/desktop/wmwebcam/wmwebcam.info
@@ -0,0 +1,10 @@
+PRGNAM="wmwebcam"
+VERSION="0.3.5"
+HOMEPAGE="http://bloodbathsoftworks.com/eukara/files/index.php?dir=UNIX%2Fapplications%2F"
+DOWNLOAD="http://bloodbathsoftworks.com/eukara/files/UNIX/applications/wmwebcam-0.3.5-fixed.tar.gz"
+MD5SUM="e0a65c02d9743f38c8639d8035bb13b0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/wmxss/README b/desktop/wmxss/README
new file mode 100644
index 0000000000..dbf1945163
--- /dev/null
+++ b/desktop/wmxss/README
@@ -0,0 +1,3 @@
+A simple dockapp frontend for XScreenSaver that can also display XSS screensavers. Execute like so,
+
+wmxss -e /usr/libexec/xscreensaver/<screensaverhere>
diff --git a/desktop/wmxss/slack-desc b/desktop/wmxss/slack-desc
new file mode 100644
index 0000000000..918a1c4be8
--- /dev/null
+++ b/desktop/wmxss/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler--------------------------------------------------------|
+wmxss: wmxss (XScreenSaver DockApp)
+wmxss:
+wmxss: A simple frontend for XScreenSaver that can also display XSS
+wmxss: screensavers.
+wmxss:
+wmxss: Homepage: http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html
+wmxss:
+wmxss:
+wmxss:
+wmxss:
+wmxss:
diff --git a/desktop/wmxss/wmxss.SlackBuild b/desktop/wmxss/wmxss.SlackBuild
new file mode 100644
index 0000000000..34032420ee
--- /dev/null
+++ b/desktop/wmxss/wmxss.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for wmxss
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmxss
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cd Src
+
+# This archive is very dirty!
+make clean
+
+# Let's compile!
+make
+
+# Copies over compiled binary
+install -D -m 0755 wmxss $PKG/usr/bin/wmxss
+
+# Need to do this for the license file
+cd ../
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmxss/wmxss.info b/desktop/wmxss/wmxss.info
new file mode 100644
index 0000000000..a907f1aeff
--- /dev/null
+++ b/desktop/wmxss/wmxss.info
@@ -0,0 +1,10 @@
+PRGNAM="wmxss"
+VERSION="0.1"
+HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html"
+DOWNLOAD="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmxss-0.1.tar.gz"
+MD5SUM="26d4f00c3a3d1b2306ba4924a9fbb0fa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
index 24765e4ad4..87c86df9a5 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
+++ b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
@@ -1,14 +1,17 @@
 #!/bin/sh
 
 # Slackware build script for xdgmenumaker
-# Copyright 2013, Andrew Tkalia, Ukraine, Kyiv
-# Written by B. Watson (yalhcru@gmail.com)
+# Originally written by Andrew Tkalia
+# Modified by B. Watson (yalhcru@gmail.com)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
 # for details.
 
+# 20150914 bkw: updated 0.5 => 0.8. upstream now uses a Makefile
+# instead of install.sh so this script can't build the old version.
+
 PRGNAM=xdgmenumaker
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,18 +39,18 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # install man pages where Slackware wants them:
-sed -i 's,share/man,man,' install.sh
+sed -i 's,share/man,man,' Makefile
 
 # I had to use the full path to xdgmenumaker to get a windowmaker
 # dynamic menu to work, the man page should reflect this:
 sed -i '/``xdgmenumaker -f windowmaker``/s,``,``/usr/bin/,' man/$PRGNAM.t2t
 
-DESTDIR=$PKG ./install.sh
+make -j1 man install DESTDIR=$PKG PREFIX=/usr
 
 gzip $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/xdgmenumaker/xdgmenumaker.info b/desktop/xdgmenumaker/xdgmenumaker.info
index 7114efac73..929d036772 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.info
+++ b/desktop/xdgmenumaker/xdgmenumaker.info
@@ -1,8 +1,8 @@
 PRGNAM="xdgmenumaker"
-VERSION="0.5"
+VERSION="0.8"
 HOMEPAGE="https://github.com/gapan/xdgmenumaker"
-DOWNLOAD="https://github.com/gapan/xdgmenumaker/archive/0.5.tar.gz"
-MD5SUM="d4fad8709022ec9b3c0034871cdea962"
+DOWNLOAD="https://github.com/gapan/xdgmenumaker/archive/0.8.tar.gz"
+MD5SUM="bff56a2be42f47d6bddbd5f63991b2f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyxdg txt2tags"
diff --git a/desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch b/desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch
new file mode 100644
index 0000000000..a94d9ea706
--- /dev/null
+++ b/desktop/xfce4-places-plugin/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch
@@ -0,0 +1,69 @@
+From 94d583d0ba257cdc96cde5794ebb7d38001ae3a5 Mon Sep 17 00:00:00 2001
+From: Andrzej <ndrwrdck@gmail.com>
+Date: Tue, 7 Jul 2015 22:26:51 +0100
+Subject: [PATCH] Bug 11939:  xfce4-places-plugin 1.7.0 crashes with undefined
+ symbol
+
+Patch from Fedora. Submitted by Kevin Fenzi.
+---
+ panel-plugin/model.h | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/panel-plugin/model.h b/panel-plugin/model.h
+index 06d9d6f..043e391 100644
+--- a/panel-plugin/model.h
++++ b/panel-plugin/model.h
+@@ -36,13 +36,13 @@ struct _PlacesBookmarkAction
+     void        (*finalize) (PlacesBookmarkAction *self);
+ };
+ 
+-inline PlacesBookmarkAction*
++extern inline PlacesBookmarkAction*
+ places_bookmark_action_create(gchar *label);
+ 
+-inline void
++extern inline void
+ places_bookmark_action_destroy(PlacesBookmarkAction*);
+ 
+-inline void
++extern inline void
+ places_bookmark_action_call(PlacesBookmarkAction*);
+ 
+ /* Places Bookmark */
+@@ -70,10 +70,10 @@ struct _PlacesBookmark
+     void                 (*finalize) (PlacesBookmark *self);
+ };
+ 
+-inline PlacesBookmark*
++extern inline PlacesBookmark*
+ places_bookmark_create(gchar *label);
+ 
+-inline void
++extern inline void
+ places_bookmark_destroy(PlacesBookmark *bookmark);
+ 
+ /* Places Bookmark Group */
+@@ -86,16 +86,16 @@ struct _PlacesBookmarkGroup
+     gpointer    priv;
+ };
+ 
+-inline GList*
++extern inline GList*
+ places_bookmark_group_get_bookmarks(PlacesBookmarkGroup*);
+ 
+-inline gboolean
++extern inline gboolean
+ places_bookmark_group_changed(PlacesBookmarkGroup*);
+ 
+-inline PlacesBookmarkGroup*
++extern inline PlacesBookmarkGroup*
+ places_bookmark_group_create();
+ 
+-inline void
++extern inline void
+ places_bookmark_group_destroy(PlacesBookmarkGroup*);
+ 
+ #endif
+-- 
+2.6.4
+
diff --git a/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild b/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild
index bec8dc21d4..288a615200 100644
--- a/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild
+++ b/desktop/xfce4-places-plugin/xfce4-places-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-places-plugin
 
-# Copyright 2006-2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xfce4-places-plugin
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/0001-Bug-11939-xfce4-places-plugin-1.7.0-crashes-with-und.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/desktop/xfce4-places-plugin/xfce4-places-plugin.info b/desktop/xfce4-places-plugin/xfce4-places-plugin.info
index 8d1f7fb4a4..96960adf69 100644
--- a/desktop/xfce4-places-plugin/xfce4-places-plugin.info
+++ b/desktop/xfce4-places-plugin/xfce4-places-plugin.info
@@ -1,8 +1,8 @@
 PRGNAM="xfce4-places-plugin"
-VERSION="1.6.0"
+VERSION="1.7.0"
 HOMEPAGE="http://goodies.xfce.org"
-DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.6/xfce4-places-plugin-1.6.0.tar.bz2"
-MD5SUM="8f3ec883efb0775052eeea816bbd8a23"
+DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.tar.bz2"
+MD5SUM="fcae9b38a8affcd82699a94991bba29b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild
index 31f6b4d697..4f18f9e307 100644
--- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild
+++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-sensors-plugin
 
-# Copyright 2006-2012  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xfce4-sensors-plugin
-VERSION=${VERSION:-1.2.5}
+VERSION=${VERSION:-1.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info
index ab0c9f0c9e..74f9928f4d 100644
--- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info
+++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info
@@ -1,8 +1,8 @@
 PRGNAM="xfce4-sensors-plugin"
-VERSION="1.2.5"
+VERSION="1.2.6"
 HOMEPAGE="http://goodies.xfce.org/"
-DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.5.tar.bz2"
-MD5SUM="33a8203f88c207e7e40ffaacae5d2404"
+DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.6.tar.bz2"
+MD5SUM="33c2e343c1224d9c4ae757a70cbe08eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/xfce4-timer-plugin/README b/desktop/xfce4-timer-plugin/README
new file mode 100644
index 0000000000..3f90c1f34f
--- /dev/null
+++ b/desktop/xfce4-timer-plugin/README
@@ -0,0 +1,2 @@
+xfce4-timer-plugin is a simple plugin that lets the user run an alarm
+at a specified time or at the end of a specified countdown period.
diff --git a/desktop/xfce4-timer-plugin/doinst.sh b/desktop/xfce4-timer-plugin/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/desktop/xfce4-timer-plugin/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/desktop/xfce4-timer-plugin/slack-desc b/desktop/xfce4-timer-plugin/slack-desc
new file mode 100644
index 0000000000..f70204e4c7
--- /dev/null
+++ b/desktop/xfce4-timer-plugin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+xfce4-timer-plugin: xfce4-timer-plugin (timer plugin for the Xfce panel)
+xfce4-timer-plugin:
+xfce4-timer-plugin: xfce4-timer-plugin is a simple plugin that lets the user run an alarm
+xfce4-timer-plugin: at a specified time or at the end of a specified countdown period.
+xfce4-timer-plugin:
+xfce4-timer-plugin:
+xfce4-timer-plugin:
+xfce4-timer-plugin:
+xfce4-timer-plugin:
+xfce4-timer-plugin:
+xfce4-timer-plugin:
diff --git a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild
new file mode 100644
index 0000000000..71b9a21c99
--- /dev/null
+++ b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-timer-plugin
+
+# Copyright 2015 Thibaut Notteboom, Paris, FRANCE
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=xfce4-timer-plugin
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info
new file mode 100644
index 0000000000..53b2e8f562
--- /dev/null
+++ b/desktop/xfce4-timer-plugin/xfce4-timer-plugin.info
@@ -0,0 +1,10 @@
+PRGNAM="xfce4-timer-plugin"
+VERSION="1.0.0"
+HOMEPAGE="http://goodies.xfce.org/"
+DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.0/xfce4-timer-plugin-1.0.0.tar.bz2"
+MD5SUM="bb10a5c0c4025161e647ef80454058ef"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/desktop/xonclock/xonclock.SlackBuild b/desktop/xonclock/xonclock.SlackBuild
index eb499dd84e..0493f4f972 100644
--- a/desktop/xonclock/xonclock.SlackBuild
+++ b/desktop/xonclock/xonclock.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xonclock
-VERSION=${VERSION:-0.0.9.3}
+VERSION=${VERSION:-0.0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -I/usr/include/freetype2" \
+CXXFLAGS="$SLKCFLAGS -I/usr/include/freetype2" \
 LDFLAGS="-lm -lXrender" \
 ./configure \
   --prefix=/usr \
diff --git a/desktop/xonclock/xonclock.info b/desktop/xonclock/xonclock.info
index e928619312..40e8b384a5 100644
--- a/desktop/xonclock/xonclock.info
+++ b/desktop/xonclock/xonclock.info
@@ -1,8 +1,8 @@
 PRGNAM="xonclock"
-VERSION="0.0.9.3"
+VERSION="0.0.9.4"
 HOMEPAGE="http://xonclock.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/xonclock/xonclock/xonclock-0.0.9.3/xonclock-0.0.9.3.tar.gz"
-MD5SUM="3505b6ab52244bd9399936a3a1ed6351"
+DOWNLOAD="http://downloads.sourceforge.net/project/xonclock/xonclock/xonclock-0.0.9.4/xonclock-0.0.9.4.tar.gz"
+MD5SUM="173f67305114d3eca10e9a7969b6c939"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/xxkb/.notes b/desktop/xxkb/.notes
deleted file mode 100644
index 9c77dea205..0000000000
--- a/desktop/xxkb/.notes
+++ /dev/null
@@ -1,2 +0,0 @@
-the manpage isn't being compressed
-see what to do about the /tmp/SBo/xxkb directory not being cleaned up - the 2nd time I run the slackbuild, the makefile has nothing to do!
diff --git a/desktop/yad/README b/desktop/yad/README
index a7e2d49301..a1462a66b5 100644
--- a/desktop/yad/README
+++ b/desktop/yad/README
@@ -3,3 +3,5 @@ yad displays graphical dialogs from shell scripts or command line.
 Yad is a fork of Zenity with many improvements, including custom
 buttons, additional dialogs and a pop-up menu in the notification
 area.
+
+the optional dependency webkitgtk enables the html widget.
diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild
index 38c4e440e6..0295c660be 100644
--- a/desktop/yad/yad.SlackBuild
+++ b/desktop/yad/yad.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yad
-VERSION=${VERSION:-0.28.1}
+VERSION=${VERSION:-0.31.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,6 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+if pkg-config --exists webkit-1.0 ; then HTML="--enable-html" ; else HTML="" ; fi
+
 set -e
 
 rm -rf $PKG
@@ -70,6 +72,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix location of rgb.txt
+sed -i "s|/etc/X11/rgb\.txt|/usr/share/X11/rgb.txt|" configure.ac
+autoreconf -fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,6 +85,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-rgb=/usr/share/X11/rgb.txt \
+  --enable-icon-browser \
+  $HTML \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/desktop/yad/yad.info b/desktop/yad/yad.info
index cea3425a59..02d5a30962 100644
--- a/desktop/yad/yad.info
+++ b/desktop/yad/yad.info
@@ -1,8 +1,8 @@
 PRGNAM="yad"
-VERSION="0.28.1"
-HOMEPAGE="http://code.google.com/p/yad/"
-DOWNLOAD="http://downloads.sf.net/yad-dialog/yad-0.28.1.tar.xz"
-MD5SUM="79798cbd7d209c2d290b6f794ed66ba4"
+VERSION="0.31.2"
+HOMEPAGE="http://sourceforge.net/projects/yad-dialog/"
+DOWNLOAD="http://downloads.sf.net/yad-dialog/yad-0.31.2.tar.xz"
+MD5SUM="d3b98ea9a1fa5fb6b17542eaf1dc626f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/Arduino/Arduino.SlackBuild b/development/Arduino/Arduino.SlackBuild
index 5cded705b1..c7d5cb3765 100644
--- a/development/Arduino/Arduino.SlackBuild
+++ b/development/Arduino/Arduino.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Arduino
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,26 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Arduino
-VERSION=${VERSION:-1.6.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.6.9}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-REFERENCE=${REFERENCE:-1.6.0}
+REFERENCE=${REFERENCE:-1.6.6-3}
 GALILEO=${GALILEO:-1.6.2}
 EDISON=${EDISON:-1.6.2}
-FIRMATA=${FIRMATA:-2.4.3}
-TEMBOO=${TEMBOO:-1.1.2}
-LIBASTYLEJ=${LIBASTYLEJ:-2.05}
+FIRMATA=${FIRMATA:-2.5.2}
+BRIDGE=${BRIDGE:-1.6.2}
+ROBOT_CONTROL=${ROBOT_CONTROL:-1.0.2}
+ROBOT_MOTOR=${ROBOT_MOTOR:-1.0.2}
+ROBOTIRREMOTE=${ROBOTIRREMOTE:-1.0.2}
+SPACEBREWYUN=${SPACEBREWYUN:-1.0.0}
+TEMBOO=${TEMBOO:-1.1.5}
+ESPLORA=${ESPLORA:-1.0.4}
+MOUSE=${MOUSE:-1.0.1}
+KEYBOARD=${KEYBOARD:-1.0.1}
+LIBASTYLEJ=${LIBASTYLEJ:-2.05.1-3}
+LIBLISTSERIALS=${LIBLISTSERIALS:-1.1.0}
+ARDUINOBUILDER=${ARDUINOBUILDER:-1.3.18}
 
 AVRLIBC=${AVRLIBC:-1.8.0}
 AVRHEADERS=${AVRHEADERS:-6.2.0.469}
@@ -61,13 +71,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  LIB="32"
+elif [ "$ARCH" = "x86_64" ]; then
+  LIB="64"
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -108,25 +127,33 @@ echo -e "arduino.avrdude=$AVRDUDE-arduino5\narduino.avr-gcc=$GCC-arduino5" \
 
 # Use already present toolchain and library bundles
 sed -e '/<antcall target="avr-toolchain-bundle">/,/<\/antcall>/d' \
-    -e '/<antcall target="package-library-index-json-bundle"\/>/d' \
+    -e '/<delete file=".*_index.json.gz"\/>/d' \
+    -e 's/skipexisting="false"/skipexisting="true"/' \
     -i build/build.xml
 
-# Copy documentation, help and libraries
+# Copy documentation and help
 cp $CWD/reference-$REFERENCE.zip \
    $CWD/Galileo_help_files-$GALILEO.zip \
-   $CWD/Edison_help_files-$EDISON.zip \
-   build/shared/
-cp $CWD/v$FIRMATA.zip build/Firmata-$FIRMATA.zip \
-|| cp $CWD/Firmata-$FIRMATA.zip build/
-cp $CWD/$TEMBOO.zip build/Temboo-$TEMBOO.zip \
-|| cp $CWD/Temboo-$TEMBOO.zip build/
-cp $CWD/libastylej-$LIBASTYLEJ.zip build/
-
-# Unpack library bundles
+   $CWD/Edison_help_files-$EDISON.zip build/shared/
+
+# Copy libraries
+cp $CWD/Firmata-$FIRMATA.zip \
+   $CWD/Bridge-$BRIDGE.zip \
+   $CWD/Robot_Control-$ROBOT_CONTROL.zip \
+   $CWD/Robot_Motor-$ROBOT_MOTOR.zip \
+   $CWD/RobotIRremote-$ROBOTIRREMOTE.zip \
+   $CWD/SpacebrewYun-$SPACEBREWYUN.zip \
+   $CWD/Temboo-$TEMBOO.zip \
+   $CWD/Esplora-$ESPLORA.zip \
+   $CWD/Mouse-$MOUSE.zip \
+   $CWD/Keyboard-$KEYBOARD.zip \
+   $CWD/libastylej-$LIBASTYLEJ.zip \
+   $CWD/liblistSerials-$LIBLISTSERIALS.zip \
+   $CWD/arduino-builder-linux$LIB-$ARDUINOBUILDER.tar.bz2 build/
+
+# Copy library bundles
 mkdir -p build/linux/work/dist/
-cp $CWD/package_index.json.sig build/linux/work/dist/
-gunzip -c $CWD/package_index.json.gz > build/linux/work/dist/package_index.json
-gunzip -c $CWD/library_index.json.gz > build/linux/work/dist/library_index.json
+cp $CWD/{library,package}_index.json.* build/linux/work/dist/
 
 # Finally, build Arduino
 ( cd build ; ant )
@@ -135,18 +162,25 @@ gunzip -c $CWD/library_index.json.gz > build/linux/work/dist/library_index.json
 cd build/linux/work/
 
 # Clean up
-rm -rf hardware/tmp/
+rm dist/{library,package}_index.json.gz
 
 # Manual install ensues
 mkdir -p $PKG/opt/$PRGNAM
-mv arduino dist examples hardware lib libraries reference tools $PKG/opt/$PRGNAM
+mv arduino{,-builder} dist examples hardware lib libraries reference \
+  tools{,-builder} $PKG/opt/$PRGNAM
+
+# Ownership fixup
+chown -R root:root $PKG/opt/Arduino/tools-builder
 
 # Make it a bit more user friendly
 mkdir -p $PKG/usr/{bin,share/applications}
-sed "s/FULL_PATH/\/opt\/$PRGNAM/" arduino.desktop \
+sed "s/FULL_PATH/\/opt\/$PRGNAM/" $CWD/arduino.desktop \
   > $PKG/usr/share/applications/$PRGNAM.desktop
 ln -s /opt/$PRGNAM/arduino $PKG/usr/bin/$PRGNAM
 
+# Fix perms
+chmod 755 $PKG/opt/$PRGNAM/reference/*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a revisions.txt $TMP/$PRGNAM-$VERSION/{README.md,license.txt} \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/Arduino/Arduino.info b/development/Arduino/Arduino.info
index b859f8cd1f..51770327c1 100644
--- a/development/Arduino/Arduino.info
+++ b/development/Arduino/Arduino.info
@@ -1,18 +1,28 @@
 PRGNAM="Arduino"
-VERSION="1.6.5"
+VERSION="1.6.9"
 HOMEPAGE="http://www.arduino.cc/"
-DOWNLOAD="https://github.com/arduino/Arduino/archive/1.6.5.tar.gz \
-          http://downloads.arduino.cc/reference-1.6.0.zip \
+DOWNLOAD="https://github.com/arduino/Arduino/archive/1.6.9/Arduino-1.6.9.tar.gz \
+          http://downloads.arduino.cc/reference-1.6.6-3.zip \
           http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip \
           http://downloads.arduino.cc/Edison_help_files-1.6.2.zip \
-          https://github.com/arduino-libraries/Firmata/archive/v2.4.3.zip \
-          https://github.com/temboo/Temboo/archive/1.1.2.zip \
-          http://downloads.arduino.cc/libastylej-2.05.zip \
-          http://downloads.arduino.cc/packages/package_index.json.gz \
-          http://downloads.arduino.cc/packages/package_index.json.sig \
-          http://downloads.arduino.cc/libraries/library_index.json.gz \
+          https://github.com/arduino-libraries/Firmata/archive/2.5.2/Firmata-2.5.2.zip \
+          https://github.com/arduino-libraries/Bridge/archive/1.6.2/Bridge-1.6.2.zip \
+          https://github.com/arduino-libraries/Robot_Control/archive/1.0.2/Robot_Control-1.0.2.zip \
+          https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2/Robot_Motor-1.0.2.zip \
+          https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2/RobotIRremote-1.0.2.zip \
+          https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0/SpacebrewYun-1.0.0.zip \
+          https://github.com/arduino-libraries/Temboo/archive/1.1.5/Temboo-1.1.5.zip \
+          https://github.com/arduino-libraries/Esplora/archive/1.0.4/Esplora-1.0.4.zip \
+          https://github.com/arduino-libraries/Mouse/archive/1.0.1/Mouse-1.0.1.zip \
+          https://github.com/arduino-libraries/Keyboard/archive/1.0.1/Keyboard-1.0.1.zip \
+          http://downloads.arduino.cc/libastylej-2.05.1-3.zip \
+          http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip \
+          http://mirror.slackware.hr/sources/Arduino/package_index.json.gz \
+          http://mirror.slackware.hr/sources/Arduino/package_index.json.sig \
+          http://mirror.slackware.hr/sources/Arduino/library_index.json.gz \
+          http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.18.tar.bz2 \
           https://github.com/arduino/toolchain-avr/archive/avr-gcc-4.8.1-avrdude-6.0.1-arduino5.tar.gz \
-          http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.8.0.tar.bz2 \
+          http://download.savannah.gnu.org/releases/avr-libc/old-releases/avr-libc-1.8.0.tar.bz2 \
           http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/3.4.5/avr8-headers-6.2.0.469.zip \
           http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.gz \
           http://mirror.switch.ch/ftp/mirror/gnu/binutils/binutils-2.24.tar.bz2 \
@@ -25,16 +35,26 @@ DOWNLOAD="https://github.com/arduino/Arduino/archive/1.6.5.tar.gz \
           http://download.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-0.1.5/libusb-compat-0.1.5.tar.bz2 \
           http://mirror.switch.ch/ftp/mirror/gnu/autoconf/autoconf-2.64.tar.bz2 \
           http://mirror.switch.ch/ftp/mirror/gnu/automake/automake-1.11.1.tar.bz2"
-MD5SUM="b340a595fb024da1636eb396342b011d \
-        e95c906955bbdefcf31751633b289d48 \
+MD5SUM="b1f205208db0065286013e544ecbf48f \
+        f04dadd797e5e57149bce626defc7be4 \
         dfa93daedbe9188f20f00308f64f4908 \
         c97d466ee23021ffb0d57c222d93e96f \
-        edbdc40caceef0841843df661c2e7483 \
-        96797ddb8f7b252fedc029e22f76bb8d \
-        22787c4d0910a628b0ed71cdd40d8c13 \
-        c6af2f221f2830a50c2a17817500733a \
-        fe1dd73e5baaef2432a29feb5c5455b2 \
-        8feb8fcf526a4ed25e25d150b002b0ad \
+        194079377a3c310a7de8e1099a763fdf \
+        c9460b9fa60d6e338ad537debfa9bf2a \
+        4ed4c60f01e02eb5b28da260ad0e75ae \
+        f5b648b60c76a3f2ead085b613279d11 \
+        47ff47fab7b44e482dff47b11148d67f \
+        9bdcbdfa1669fada84e4b5d29cecd092 \
+        e771ef7cb110ef6d1a24a227b5c154d4 \
+        b066c4b117cd035b4e941016e04617af \
+        39018b239c31f89e97cab344c0d42fca \
+        d07885c5f18c6ead722c5e28e60bebde \
+        3f6fd60bfe51ce7a7543671cb638ffbb \
+        01ad823406ab79d33aefe5b02add96c2 \
+        1fcd648258ad7edb3103c9ea80939df6 \
+        4c99664d041242971f3268475ccb7e69 \
+        5e71ce1fd82c17953019a31de41d2350 \
+        86ec280cd3e764641ea696ce5f6a2165 \
         573b7840861c311e8eafbf07e37c0786 \
         54c71798f24c96bab206be098062344f \
         3719aca9af4d0d3a0855a8d43c92a4ae \
@@ -49,8 +69,74 @@ MD5SUM="b340a595fb024da1636eb396342b011d \
         2780b6a758a1e2c2943bdbf7faf740e4 \
         ef400d672005e0be21e0d20648169074 \
         c2972c4d9b3e29c03d5f2af86249876f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD_x86_64="https://github.com/arduino/Arduino/archive/1.6.9/Arduino-1.6.9.tar.gz \
+                 http://downloads.arduino.cc/reference-1.6.6-3.zip \
+                 http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip \
+                 http://downloads.arduino.cc/Edison_help_files-1.6.2.zip \
+                 https://github.com/arduino-libraries/Firmata/archive/2.5.2/Firmata-2.5.2.zip \
+                 https://github.com/arduino-libraries/Bridge/archive/1.6.2/Bridge-1.6.2.zip \
+                 https://github.com/arduino-libraries/Robot_Control/archive/1.0.2/Robot_Control-1.0.2.zip \
+                 https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2/Robot_Motor-1.0.2.zip \
+                 https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2/RobotIRremote-1.0.2.zip \
+                 https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0/SpacebrewYun-1.0.0.zip \
+                 https://github.com/arduino-libraries/Temboo/archive/1.1.5/Temboo-1.1.5.zip \
+                 https://github.com/arduino-libraries/Esplora/archive/1.0.4/Esplora-1.0.4.zip \
+                 https://github.com/arduino-libraries/Mouse/archive/1.0.1/Mouse-1.0.1.zip \
+                 https://github.com/arduino-libraries/Keyboard/archive/1.0.1/Keyboard-1.0.1.zip \
+                 http://downloads.arduino.cc/libastylej-2.05.1-3.zip \
+                 http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip \
+                 http://mirror.slackware.hr/sources/Arduino/package_index.json.gz \
+                 http://mirror.slackware.hr/sources/Arduino/package_index.json.sig \
+                 http://mirror.slackware.hr/sources/Arduino/library_index.json.gz \
+                 http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.18.tar.bz2 \
+                 https://github.com/arduino/toolchain-avr/archive/avr-gcc-4.8.1-avrdude-6.0.1-arduino5.tar.gz \
+                 http://download.savannah.gnu.org/releases/avr-libc/old-releases/avr-libc-1.8.0.tar.bz2 \
+                 http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/3.4.5/avr8-headers-6.2.0.469.zip \
+                 http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.gz \
+                 http://mirror.switch.ch/ftp/mirror/gnu/binutils/binutils-2.24.tar.bz2 \
+                 http://mirror.switch.ch/ftp/mirror/gnu/gmp/gmp-5.0.2.tar.bz2 \
+                 http://mirror.switch.ch/ftp/mirror/gnu/mpfr/mpfr-3.0.0.tar.bz2 \
+                 http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz \
+                 http://mirror.switch.ch/ftp/mirror/gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2 \
+                 http://mirror.switch.ch/ftp/mirror/gnu/gdb/gdb-7.8.tar.xz \
+                 http://download.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.18/libusb-1.0.18.tar.bz2 \
+                 http://download.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-0.1.5/libusb-compat-0.1.5.tar.bz2 \
+                 http://mirror.switch.ch/ftp/mirror/gnu/autoconf/autoconf-2.64.tar.bz2 \
+                 http://mirror.switch.ch/ftp/mirror/gnu/automake/automake-1.11.1.tar.bz2"
+MD5SUM_x86_64="b1f205208db0065286013e544ecbf48f \
+               f04dadd797e5e57149bce626defc7be4 \
+               dfa93daedbe9188f20f00308f64f4908 \
+               c97d466ee23021ffb0d57c222d93e96f \
+               194079377a3c310a7de8e1099a763fdf \
+               c9460b9fa60d6e338ad537debfa9bf2a \
+               4ed4c60f01e02eb5b28da260ad0e75ae \
+               f5b648b60c76a3f2ead085b613279d11 \
+               47ff47fab7b44e482dff47b11148d67f \
+               9bdcbdfa1669fada84e4b5d29cecd092 \
+               e771ef7cb110ef6d1a24a227b5c154d4 \
+               b066c4b117cd035b4e941016e04617af \
+               39018b239c31f89e97cab344c0d42fca \
+               d07885c5f18c6ead722c5e28e60bebde \
+               3f6fd60bfe51ce7a7543671cb638ffbb \
+               01ad823406ab79d33aefe5b02add96c2 \
+               1fcd648258ad7edb3103c9ea80939df6 \
+               4c99664d041242971f3268475ccb7e69 \
+               5e71ce1fd82c17953019a31de41d2350 \
+               ad303f624e06b4793c75fb8a82ccc214 \
+               573b7840861c311e8eafbf07e37c0786 \
+               54c71798f24c96bab206be098062344f \
+               3719aca9af4d0d3a0855a8d43c92a4ae \
+               346ec2e46393a54ac152b95abf1d9850 \
+               e0f71a7b2ddab0f8612336ac81d9636b \
+               0bbaedc82fb30315b06b1588b9077cd3 \
+               f45bac3584922c8004a10060ab1a8f9f \
+               0d6acab8d214bd7d1fbbc593e83dd00d \
+               3b2386c114cd74185aa3754b58a79304 \
+               bd958fe9019d7c7896f29f6724a764ed \
+               4a6d049923efc6496f1d383054dac1a6 \
+               2780b6a758a1e2c2943bdbf7faf740e4 \
+               ef400d672005e0be21e0d20648169074 \
+               c2972c4d9b3e29c03d5f2af86249876f"
 REQUIRES="apache-ant"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/development/Arduino/README b/development/Arduino/README
index 581ee5734d..8127f6239d 100644
--- a/development/Arduino/README
+++ b/development/Arduino/README
@@ -3,5 +3,5 @@ it to the board. It runs on Windows, Mac OS X, and Linux. The environment
 is written in Java and based on Processing and other open-source software.
 This software can be used with any Arduino board.
 
-NOTE: This script compiles everything from the source. Compared to the binary
+NOTE: This script compiles everything from source. Compared to the binary
 version, it will take longer and require almost 1GB of free space.
diff --git a/development/Arduino/arduino.desktop b/development/Arduino/arduino.desktop
new file mode 100644
index 0000000000..8b271e4939
--- /dev/null
+++ b/development/Arduino/arduino.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Arduino IDE
+GenericName=Integrated Development Environment
+Comment=An IDE for Arduino-compatible electronics prototyping platforms
+Exec=FULL_PATH/arduino
+Icon=FULL_PATH/lib/arduino.png
+Terminal=false
+Categories=Development;IDE;Electronics;
+MimeType=text/x-arduino
+Keywords=embedded electronics;electronics;avr;microcontroller;
diff --git a/development/Cython-Kivy/Cython-Kivy.SlackBuild b/development/Cython-Kivy/Cython-Kivy.SlackBuild
new file mode 100644
index 0000000000..792058a694
--- /dev/null
+++ b/development/Cython-Kivy/Cython-Kivy.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for Cython-Kivy
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="Cython-Kivy"
+SRCNAM=$(echo $PRGNAM | cut -c1-6)
+VERSION=${VERSION:-0.21.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+python setup.py install --root=$PKG --prefix=/usr
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt Doc $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Fix a broken link in one of the html files
+sed -i 's|~greg/python/Cython|greg.ewing/python/Pyrex|' \
+  $PKG/usr/doc/$PRGNAM-$VERSION/Doc/index.html
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/Cython-Kivy/Cython-Kivy.info b/development/Cython-Kivy/Cython-Kivy.info
new file mode 100644
index 0000000000..03e5c653f6
--- /dev/null
+++ b/development/Cython-Kivy/Cython-Kivy.info
@@ -0,0 +1,10 @@
+PRGNAM="Cython-Kivy"
+VERSION="0.21.2"
+HOMEPAGE="http://www.cython.org/"
+DOWNLOAD="http://www.cython.org/release/Cython-0.21.2.tar.gz"
+MD5SUM="d21adb870c75680dc857cd05d41046a4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/development/Cython-Kivy/README b/development/Cython-Kivy/README
new file mode 100644
index 0000000000..196ad6261d
--- /dev/null
+++ b/development/Cython-Kivy/README
@@ -0,0 +1,8 @@
+Cython is a language that makes writing C extensions for
+the Python language as easy as Python itself. Cython is
+based on the well-known Pyrex, but supports more cutting
+edge functionality and optimizations.
+
+Cython version to support package Kivy.
+
+NOTE: This package conflict with Cython. Do not install both.
diff --git a/development/Cython-Kivy/slack-desc b/development/Cython-Kivy/slack-desc
new file mode 100644
index 0000000000..7a679f3909
--- /dev/null
+++ b/development/Cython-Kivy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+Cython-Kivy: Cython-Kivy (C bindings for Python)
+Cython-Kivy:
+Cython-Kivy: Cython is a language that makes writing C extensions for the Python
+Cython-Kivy: language as easy as Python itself. Cython is based on the well-known
+Cython-Kivy: Pyrex, but supports more cutting edge functionality and
+Cython-Kivy: optimizations.
+Cython-Kivy:
+Cython-Kivy: Homepage: http://www.cython.org/
+Cython-Kivy:
+Cython-Kivy:
+Cython-Kivy:
diff --git a/development/Cython/Cython.SlackBuild b/development/Cython/Cython.SlackBuild
index 8bee37c3ed..c5ec877719 100644
--- a/development/Cython/Cython.SlackBuild
+++ b/development/Cython/Cython.SlackBuild
@@ -6,7 +6,7 @@
 # New Maintainer - Nishant Limbachia <nishant _AT_ mnspace _DOT_ net> - 11/04/2011
 
 PRGNAM="Cython"
-VERSION=${VERSION:-0.22}
+VERSION=${VERSION:-0.23.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/Cython/Cython.info b/development/Cython/Cython.info
index 894371545f..22fffb7ec5 100644
--- a/development/Cython/Cython.info
+++ b/development/Cython/Cython.info
@@ -1,8 +1,8 @@
 PRGNAM="Cython"
-VERSION="0.22"
+VERSION="0.23.4"
 HOMEPAGE="http://www.cython.org/"
-DOWNLOAD="http://www.cython.org/release/Cython-0.22.tar.gz"
-MD5SUM="1ae25add4ef7b63ee9b4af697300d6b6"
+DOWNLOAD="http://cython.org/release/Cython-0.23.4.tar.gz"
+MD5SUM="157df1f69bcec6b56fd97e0f2e057f6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/FreeBASIC/FreeBASIC.SlackBuild b/development/FreeBASIC/FreeBASIC.SlackBuild
index ae60c1e700..03bfd240ee 100644
--- a/development/FreeBASIC/FreeBASIC.SlackBuild
+++ b/development/FreeBASIC/FreeBASIC.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=FreeBASIC
-VERSION=${VERSION:-1.03.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.04.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -75,14 +75,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/bin $PKG/usr/include/${PRGNAM,,} $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM,,} \
-         $PKG/usr/man/man1
+mkdir -p $PKG/usr/bin $PKG/usr/include/${PRGNAM,,} $PKG/usr/lib/${PRGNAM,,} \
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM,,} $PKG/usr/man/man1
 
 install -D -m0755 bin/fbc $PKG/usr/bin/fbc
 cp -rf include/${PRGNAM,,}/* $PKG/usr/include/${PRGNAM,,}
 cp -rf lib/${PRGNAM,,}/* $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM,,}
 
-gzip -c doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz
+# fix linking library for x86_64 arch
+if [ "$ARCH" = "x86_64" ]; then
+    (
+      cd /usr/lib${LIBDIRSUFFIX}
+      ln -s /usr/lib${LIBDIRSUFFIX}/${PRGNAM,,}/linux-x86_64 $PKG/usr/lib/${PRGNAM,,}
+    )
+fi
 
 # fix linking with libtinfo over libncurses
 if [[ -L "/usr/lib${LIBDIRSUFFIX}/libtinfo.so.5" && -f "/usr/lib${LIBDIRSUFFIX}/libtinfo.so.5" ]]; then
@@ -94,6 +100,9 @@ else
     )
 fi
 
+# gzip man page
+gzip -c doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/FreeBASIC/FreeBASIC.info b/development/FreeBASIC/FreeBASIC.info
index ae6acba515..b8fc428490 100644
--- a/development/FreeBASIC/FreeBASIC.info
+++ b/development/FreeBASIC/FreeBASIC.info
@@ -1,10 +1,10 @@
 PRGNAM="FreeBASIC"
-VERSION="1.03.0"
+VERSION="1.04.0"
 HOMEPAGE="http://www.freebasic.net"
-DOWNLOAD="http://downloads.sourceforge.net/fbc/FreeBASIC-1.03.0-linux-x86.tar.gz"
-MD5SUM="91583ae0773bbb14c8a69b33bf7c835c"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/fbc/FreeBASIC-1.03.0-linux-x86_64.tar.gz"
-MD5SUM_x86_64="26b401e84c349a5509aa5b4107a5adca"
+DOWNLOAD="http://downloads.sourceforge.net/fbc/FreeBASIC-1.04.0-linux-x86.tar.gz"
+MD5SUM="20f9f53917f1120440548695dd1bb60f"
+DOWNLOAD_x86_64="http://downloads.sourceforge.net/fbc/FreeBASIC-1.04.0-linux-x86_64.tar.gz"
+MD5SUM_x86_64="c5ec3cb0a33e07b27391716f7b3bb73c"
 REQUIRES="jdk"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/development/J-Link/J-Link.SlackBuild b/development/J-Link/J-Link.SlackBuild
new file mode 100644
index 0000000000..5cadb2eff2
--- /dev/null
+++ b/development/J-Link/J-Link.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Slackware build script for SEGGER J-Link
+
+# Copyright 2015 Andrzej Telszewski, Sabadell
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=J-Link
+VERSION=${VERSION:-5.02}
+SRCNAM="JLink_Linux_V"$(echo $VERSION | tr -d .)"_"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+if [ "$ARCH" != "i486" ] && [ "$ARCH" != "x86_64" ]; then
+  echo -ne "\n\nError: \"${ARCH}\" architecture is not supported.\n\n"
+  exit 1
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SRCNAM="${SRCNAM}i386"
+else
+  SRCNAM="${SRCNAM}$ARCH"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM.tgz
+mv $SRCNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+TREE_MD5=80fa37c7583e6eb366e15c1fc84e630f
+UDEV_MD5=4918ffb129c5691e8f9a01313f975fea
+TREE_MD5_NEW=( $(find . ! -name "libjlinkarm.so.*" ! -name "libedit.so.*" | sort | md5sum) )
+UDEV_MD5_NEW=( $(md5sum 99-jlink.rules) )
+
+if [ $TREE_MD5 != $TREE_MD5_NEW ] || [ $UDEV_MD5 != $UDEV_MD5_NEW ]; then
+  if [ $TREE_MD5 != $TREE_MD5_NEW ]; then
+    printf "\n\tThe directory structure for which this script has been written is different\n"
+    printf "\tfrom the provided one. Although most probably nothing wrong will happen,\n"
+    printf "\tit's possible there will be a missing file or a build failure.\n"
+  fi
+
+  if [ $UDEV_MD5 != $UDEV_MD5_NEW ]; then
+    printf "\n\tThe udev rules found in the provided source are different from the one\n"
+    printf "\tfor which this script has been written. Although most probably nothing\n"
+    printf "\twrong will happen, you might run into some device permissions problems.\n"
+  fi
+
+  sleep 5
+fi
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/etc/udev/rules.d
+fromdos < 99-jlink.rules > $PKG/etc/udev/rules.d/99-jlink.rules
+sed -i 's/BUS!="usb", ACTION!="add", SUBSYSTEM!=="usb_device", GOTO="jlink_rules_end"/ACTION!="add", SUBSYSTEM!="usb", GOTO="jlink_rules_end"/' \
+  $PKG/etc/udev/rules.d/99-jlink.rules
+sed -i 's/MODE="666"/MODE="664", GROUP="plugdev"/' $PKG/etc/udev/rules.d/99-jlink.rules
+
+mkdir -p $PKG/usr/bin
+cp -a JFlashSPI_CL JLink{Exe,GDBServer,RemoteServer,RTTClient,STM32,SWOViewer} $PKG/usr/bin
+
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
+cp -a libjlinkarm.so.* $PKG/usr/lib$LIBDIRSUFFIX
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Doc/{License.txt,UM08001_JLink.pdf,ReleaseNotes/ReleaseJLink.html} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/samples
+cp -a Samples/JLink/* $PKG/usr/doc/$PRGNAM-$VERSION/samples
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/J-Link/J-Link.info b/development/J-Link/J-Link.info
new file mode 100644
index 0000000000..59ab609a0d
--- /dev/null
+++ b/development/J-Link/J-Link.info
@@ -0,0 +1,10 @@
+PRGNAM="J-Link"
+VERSION="5.02"
+HOMEPAGE="https://www.segger.com/"
+DOWNLOAD="https://www.segger.com/jlink-software.html?step=1&file=JLinkLinuxTGZ32_502"
+MD5SUM="0f7d058711d62a2837a13f01d41caf8a"
+DOWNLOAD_x86_64="https://www.segger.com/jlink-software.html?step=1&file=JLinkLinuxTGZ64_502"
+MD5SUM_x86_64="1129746191f45657a6e24aa0e3c85b37"
+REQUIRES="libedit"
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/development/J-Link/README b/development/J-Link/README
new file mode 100644
index 0000000000..7cd3be26cd
--- /dev/null
+++ b/development/J-Link/README
@@ -0,0 +1,16 @@
+The J-Link software gives you the USB drivers needed for your system, a number
+of utilities as well as a dynamically linkable library used by most of the IDEs
+and debuggers using J-Link. Also included are a number of sample setup scripts
+for devices needing one as well as documentation.
+
+NOTE:
+1. This SlackBuild is not sbopkg compatible because source download requires
+   licence acceptance (the link provided in .info points to download site)
+   and the source tarball name is different from the resulting package name.
+2. This SlackBuild repackages the official J-Link binary package.
+3. The official binary package bundles libedit, which is also available from
+   slackbuilds.org so I decided to go with the one from slackbuilds.org and
+   not with the bundled one. BTW, ldd shows that libedit is not used at all.
+4. The original udev rules change the device permissions to 0666.
+   This SlackBuild modifies the rules, so that the permissions are 0664 and
+   the group is plugdev. Make sure to make yourself a member of this group.
diff --git a/development/J-Link/slack-desc b/development/J-Link/slack-desc
new file mode 100644
index 0000000000..e659599c66
--- /dev/null
+++ b/development/J-Link/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+J-Link: J-Link (software and documentation for J-Link)
+J-Link:
+J-Link: The J-Link software gives you the USB drivers needed for your system,
+J-Link: a number of utilities as well as a dynamically linkable library used
+J-Link: by most of the IDEs and debuggers using J-Link. Also included are a
+J-Link: number of sample setup scripts for devices needing one as well as
+J-Link: documentation.
+J-Link:
+J-Link:
+J-Link: Homepage: https://www.segger.com/
+J-Link:
diff --git a/development/LLgen/LLgen.info b/development/LLgen/LLgen.info
index c7886b3595..30a312662b 100644
--- a/development/LLgen/LLgen.info
+++ b/development/LLgen/LLgen.info
@@ -1,7 +1,7 @@
 PRGNAM="LLgen"
 VERSION="1.4"
 HOMEPAGE="http://www.cs.vu.nl/~ceriel/LLgen.html"
-DOWNLOAD="ftp://ftp.cs.vu.nl/pub/ceriel/LLgen.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/LLgen/LLgen.tar.gz"
 MD5SUM="b8408e4a56378085cd721f3f6778e27c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/ParadisEO/ParadisEO.info b/development/ParadisEO/ParadisEO.info
index 77e0c3aad9..44415b247b 100644
--- a/development/ParadisEO/ParadisEO.info
+++ b/development/ParadisEO/ParadisEO.info
@@ -1,5 +1,5 @@
 PRGNAM="ParadisEO"
-VERSION="1.3.1"
+VERSION="2.0.1"
 HOMEPAGE="http://paradiseo.gforge.inria.fr/"
 DOWNLOAD="https://gforge.inria.fr/frs/download.php/31732/ParadisEO-2.0.1.tar.gz"
 MD5SUM="89f875b3f92abdb64b26c6c207fef346"
diff --git a/development/SDL2/SDL2.SlackBuild b/development/SDL2/SDL2.SlackBuild
deleted file mode 100644
index 19f87d68e6..0000000000
--- a/development/SDL2/SDL2.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2
-
-# Copyright 2013 Dugan Chen Canada
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL2
-VERSION=${VERSION:-2.0.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/SDL2/SDL2.info b/development/SDL2/SDL2.info
deleted file mode 100644
index 7a314ecdd8..0000000000
--- a/development/SDL2/SDL2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2"
-VERSION="2.0.3"
-HOMEPAGE="http://libsdl.org"
-DOWNLOAD="http://www.libsdl.org/release/SDL2-2.0.3.tar.gz"
-MD5SUM="fe6c61d2e9df9ef570e7e80c6e822537"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2_image/SDL2_image.SlackBuild b/development/SDL2_image/SDL2_image.SlackBuild
deleted file mode 100644
index 49e211e65d..0000000000
--- a/development/SDL2_image/SDL2_image.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_image
-
-# Copyright 2013 Dugan Chen Canada
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL2_image
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# To allow for compiling with png support.
-patch -p1 --verbose < $CWD/pngfix.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/SDL2_image/SDL2_image.info b/development/SDL2_image/SDL2_image.info
deleted file mode 100644
index ff373fb90b..0000000000
--- a/development/SDL2_image/SDL2_image.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_image"
-VERSION="2.0.0"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-DOWNLOAD="http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz"
-MD5SUM="fb399c8386fb3248f1b33cfe81bdf92b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2_image/pngfix.patch b/development/SDL2_image/pngfix.patch
deleted file mode 100644
index c93abc6514..0000000000
--- a/development/SDL2_image/pngfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN SDL2_image-2.0.0.orig/IMG_png.c SDL2_image-2.0.0/IMG_png.c
---- SDL2_image-2.0.0.orig/IMG_png.c	2013-08-10 10:38:36.000000000 -0700
-+++ SDL2_image-2.0.0/IMG_png.c	2014-01-13 09:33:32.569432897 -0800
-@@ -68,8 +68,8 @@
- #include <png.h>
- 
- /* Check for the older version of libpng */
--#if (PNG_LIBPNG_VER_MAJOR == 1) 
--#if (PNG_LIBPNG_VER_MINOR < 4)
-+#if (PNG_LIBPNG_VER_MAJOR == 1)
-+#if (PNG_LIBPNG_VER_MINOR < 5)
- #define LIBPNG_VERSION_12
- typedef png_bytep png_const_bytep;
- #endif
diff --git a/development/SDL2_mixer/SDL2_mixer.SlackBuild b/development/SDL2_mixer/SDL2_mixer.SlackBuild
deleted file mode 100644
index c45ab43543..0000000000
--- a/development/SDL2_mixer/SDL2_mixer.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_mixer
-
-# Copyright 2013-2015 Dugan Chen Canada
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL2_mixer
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-music-mod-modplug=no \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a playmus.c playwave.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/SDL2_mixer/SDL2_mixer.info b/development/SDL2_mixer/SDL2_mixer.info
deleted file mode 100644
index 7930b742ae..0000000000
--- a/development/SDL2_mixer/SDL2_mixer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_mixer"
-VERSION="2.0.0"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-DOWNLOAD="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz"
-MD5SUM="65f6d80df073a1fb3bb537fbda031b50"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2_net/SDL2_net.SlackBuild b/development/SDL2_net/SDL2_net.SlackBuild
deleted file mode 100644
index 7021e98bd6..0000000000
--- a/development/SDL2_net/SDL2_net.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for SDL2_net
-
-# Copyright 2013 Dugan Chen Canada
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=SDL2_net
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --disable-gui
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/demo
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a chat.cpp chat.h chatd.c $PKG/usr/doc/$PRGNAM-$VERSION/demo
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/SDL2_net/SDL2_net.info b/development/SDL2_net/SDL2_net.info
deleted file mode 100644
index e7350167f1..0000000000
--- a/development/SDL2_net/SDL2_net.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="SDL2_net"
-VERSION="2.0.0"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_net/"
-DOWNLOAD="http://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.0.tar.gz"
-MD5SUM="83bcd0e67796b81b35b08a014c677200"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SQLAlchemy/SQLAlchemy.SlackBuild b/development/SQLAlchemy/SQLAlchemy.SlackBuild
index c60d254a9d..e65e316480 100644
--- a/development/SQLAlchemy/SQLAlchemy.SlackBuild
+++ b/development/SQLAlchemy/SQLAlchemy.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SQLAlchemy
-VERSION=${VERSION:-1.0.8}
+VERSION=${VERSION:-1.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/SQLAlchemy/SQLAlchemy.info b/development/SQLAlchemy/SQLAlchemy.info
index f78abfc7cd..0aaa2656bb 100644
--- a/development/SQLAlchemy/SQLAlchemy.info
+++ b/development/SQLAlchemy/SQLAlchemy.info
@@ -1,8 +1,8 @@
 PRGNAM="SQLAlchemy"
-VERSION="1.0.8"
+VERSION="1.0.11"
 HOMEPAGE="http://www.sqlalchemy.org"
-DOWNLOAD="https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.0.8.tar.gz"
-MD5SUM="7cfd005be63945c96a78c67764ac3a85"
+DOWNLOAD="https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.0.11.tar.gz"
+MD5SUM="0bff4f96f0a25f44415a6bab7a741148"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/WebStorm/README b/development/WebStorm/README
new file mode 100644
index 0000000000..b1049bfad6
--- /dev/null
+++ b/development/WebStorm/README
@@ -0,0 +1,2 @@
+WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex
+client-side development and server-side development with Node.js.
diff --git a/development/WebStorm/WebStorm.SlackBuild b/development/WebStorm/WebStorm.SlackBuild
new file mode 100644
index 0000000000..d602f10856
--- /dev/null
+++ b/development/WebStorm/WebStorm.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for pycharm
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=WebStorm
+VERSION=${VERSION:-10.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+CARPETA=WebStorm-141.1550
+ICONO=webide
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $CARPETA
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Install data
+mkdir -p $PKG/opt/$PRGNAM
+cp -rf * $PKG/opt/$PRGNAM
+
+# Remove unused
+rm -rf $PKG/opt/$PRGNAM/lib/libpty/win $PKG/opt/$PRGNAM/lib/libpty/macosx
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Create soft link for launcher
+mkdir -p $PKG/usr/bin
+(
+ cd $PKG/usr/bin
+ ln -sf /opt/$PRGNAM/bin/$PRGNAM.sh $PRGNAM
+)
+
+# Install .desktop file
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+# Install .desktop icon
+mkdir -p $PKG/usr/share/pixmaps
+install -D -m0644 bin/$ICONO.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/WebStorm/WebStorm.desktop b/development/WebStorm/WebStorm.desktop
new file mode 100644
index 0000000000..69b0051c6c
--- /dev/null
+++ b/development/WebStorm/WebStorm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=WebStorm
+GenericName=Text Editor
+Comment=Powerful Html+JavaScript IDE
+Exec=webstorm
+Icon=webstorm
+Type=Application
+Terminal=false
+Categories=Development;TextEditor;
diff --git a/development/WebStorm/WebStorm.info b/development/WebStorm/WebStorm.info
new file mode 100644
index 0000000000..3fad89515f
--- /dev/null
+++ b/development/WebStorm/WebStorm.info
@@ -0,0 +1,10 @@
+PRGNAM="WebStorm"
+VERSION="10.0.4"
+HOMEPAGE="https://www.jetbrains.com/webstorm/"
+DOWNLOAD="http://download-cf.jetbrains.com/webstorm/WebStorm-10.0.4.tar.gz"
+MD5SUM="672f62a6334383636c01b59c4ead43f1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jdk"
+MAINTAINER="Maximiliano Sorribas"
+EMAIL="mjsorribas@gmail.com"
diff --git a/development/WebStorm/doinst.sh b/development/WebStorm/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/development/WebStorm/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/development/WebStorm/slack-desc b/development/WebStorm/slack-desc
new file mode 100644
index 0000000000..6929045844
--- /dev/null
+++ b/development/WebStorm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+WebStorm: WebStorm (HTML5 + JavaScript IDE)
+WebStorm:
+WebStorm: WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex
+WebStorm: client-side development and server-side development with Node.js.
+WebStorm:
+WebStorm:
+WebStorm:
+WebStorm:
+WebStorm:
+WebStorm:
+WebStorm:
diff --git a/development/android-studio/android-studio.SlackBuild b/development/android-studio/android-studio.SlackBuild
index 2ed33854e0..9fd6601346 100644
--- a/development/android-studio/android-studio.SlackBuild
+++ b/development/android-studio/android-studio.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Android Studio
 
-# Copyright 2009-2014  Roberto Metere, Cagliari (CA), Italy <roberto@metere.it>
+# Copyright 2009-2015  Roberto Metere, Cagliari (CA), Italy <roberto@metere.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=android-studio
-VERSION=${VERSION:-1.1.0_135_1740770}
-SRCVER=${SRCVER:-135.1740770}
+VERSION=${VERSION:-1.5.1_141_2456560}
+SRCVER=${SRCVER:-141.2456560}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,6 +46,7 @@ mkdir -p $TMP $PKG $OUTPUT
 mkdir -p $PKG/usr/share
 cd $PKG/usr/share/
 unzip $CWD/$PRGNAM-ide-${SRCVER}-linux.zip
+
 #
 # Make and install launchers
 #
@@ -62,6 +63,7 @@ ln -s /usr/share/$PRGNAM/bin/inspect.sh ../bin/$PRGNAM-inspect
 # Adjust ownerships and permissions
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
+
 cd
 
 mkdir -p $PKG/usr/doc/$PRGNAM-${VERSION}
diff --git a/development/android-studio/android-studio.desktop b/development/android-studio/android-studio.desktop
index e207924352..79f20d98e8 100644
--- a/development/android-studio/android-studio.desktop
+++ b/development/android-studio/android-studio.desktop
@@ -3,7 +3,7 @@ Name=Android Studio
 GenericName=Android IDE
 Comment=Android development environment based on IntelliJ IDEA
 Exec=/usr/share/android-studio/bin/studio.sh
-Icon=/usr/share/android-studio/bin/androidstudio.ico
+Icon=/usr/share/android-studio/bin/studio.ico
 Path=/usr/share/android-studio/bin/
 Type=Application
 Categories=Development;Android
diff --git a/development/android-studio/android-studio.info b/development/android-studio/android-studio.info
index f022b26890..27e7ceda59 100644
--- a/development/android-studio/android-studio.info
+++ b/development/android-studio/android-studio.info
@@ -1,8 +1,8 @@
 PRGNAM="android-studio"
-VERSION="1.1.0_135_1740770"
-HOMEPAGE="https://developer.android.com/sdk/installing/studio.html"
-DOWNLOAD="https://dl.google.com/dl/android/studio/ide-zips/1.1.0/android-studio-ide-135.1740770-linux.zip"
-MD5SUM="602a69fb027c6b5f8b768b726a445cf0"
+VERSION="1.5.1_141_2456560"
+HOMEPAGE="http://developer.android.com/tools/studio/index.html"
+DOWNLOAD="https://dl.google.com/dl/android/studio/ide-zips/1.5.1.0/android-studio-ide-141.2456560-linux.zip"
+MD5SUM="4ff66e127c2f45cf8120cdae8c3a01c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/apache-jmeter/apache-jmeter.SlackBuild b/development/apache-jmeter/apache-jmeter.SlackBuild
index 5d5ea7bc2a..15f61f7c80 100644
--- a/development/apache-jmeter/apache-jmeter.SlackBuild
+++ b/development/apache-jmeter/apache-jmeter.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=apache-jmeter
-VERSION=${VERSION:-2.11}
+VERSION=${VERSION:-2.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/apache-jmeter/apache-jmeter.info b/development/apache-jmeter/apache-jmeter.info
index 1fb1c5cff2..a804baa21b 100644
--- a/development/apache-jmeter/apache-jmeter.info
+++ b/development/apache-jmeter/apache-jmeter.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-jmeter"
-VERSION="2.11"
+VERSION="2.13"
 HOMEPAGE="http://jmeter.apache.org/"
-DOWNLOAD="https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-2.11.tgz"
-MD5SUM="f3f853c8f79734580a199efd7a2f0a11"
+DOWNLOAD="https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-2.13.tgz"
+MD5SUM="53dc44a6379b7b4a57976936f3a65e03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/apitrace/README b/development/apitrace/README
new file mode 100644
index 0000000000..afa1ac47a7
--- /dev/null
+++ b/development/apitrace/README
@@ -0,0 +1,11 @@
+apitrace consists of a set of tools to:
+
+    trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs calls to a file;
+
+    replay OpenGL and OpenGL ES calls from a file;
+
+    inspect OpenGL state at any call while retracing;
+
+    visualize and edit trace files.
+
+qt5 is an optional dependency to build the gui.
diff --git a/development/apitrace/apitrace.SlackBuild b/development/apitrace/apitrace.SlackBuild
new file mode 100644
index 0000000000..f9f52e386f
--- /dev/null
+++ b/development/apitrace/apitrace.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for apitrace
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=apitrace
+VERSION=${VERSION:-7.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/apitrace/apitrace.info b/development/apitrace/apitrace.info
new file mode 100644
index 0000000000..c07f9baff6
--- /dev/null
+++ b/development/apitrace/apitrace.info
@@ -0,0 +1,10 @@
+PRGNAM="apitrace"
+VERSION="7.1"
+HOMEPAGE="https://apitrace.github.io/"
+DOWNLOAD="https://github.com/apitrace/apitrace/archive/7.1.tar.gz"
+MD5SUM="c5d44dece1e1ca7c63f8b8efbd06ac5a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/development/apitrace/slack-desc b/development/apitrace/slack-desc
new file mode 100644
index 0000000000..a8ef336f1b
--- /dev/null
+++ b/development/apitrace/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+apitrace: apitracee (Tools for tracing OpenGL and other graphics APIs)
+apitrace:
+apitrace: apitrace consists of a set of tools to:
+apitrace:
+apitrace: trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs calls to a
+apitrace: file; replay OpenGL and OpenGL ES calls from a file; inspect OpenGL
+apitrace: state at any call while retracing; visualize and edit trace files.
+apitrace:
+apitrace: Homepage: https://apitrace.github.io/
+apitrace:
+apitrace:
diff --git a/development/arduino/arduino.SlackBuild b/development/arduino/arduino.SlackBuild
index 3161ebf26f..648a2a29b3 100644
--- a/development/arduino/arduino.SlackBuild
+++ b/development/arduino/arduino.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for arduino
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=arduino
-VERSION=${VERSION:-1.6.5}
+VERSION=${VERSION:-1.6.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,11 +71,12 @@ find -L . \
 
 # Manual install ensues
 mkdir -p $PKG/opt/$PRGNAM
-mv arduino dist examples hardware lib libraries reference tools $PKG/opt/$PRGNAM
+mv arduino{,-builder} dist examples hardware lib libraries reference \
+  tools{,-builder} $PKG/opt/$PRGNAM
 
 # Make it a bit more user friendly
 mkdir -p $PKG/usr/{bin,share/applications}
-sed "s/FULL_PATH/\/opt\/$PRGNAM/" arduino.desktop \
+sed "s/FULL_PATH/\/opt\/$PRGNAM/" $CWD/arduino.desktop \
   > $PKG/usr/share/applications/$PRGNAM.desktop
 ln -s /opt/$PRGNAM/arduino $PKG/usr/bin/$PRGNAM
 
@@ -83,6 +84,9 @@ ln -s /opt/$PRGNAM/arduino $PKG/usr/bin/$PRGNAM
 ln -s /lib$LIBDIRSUFFIX/libncurses.so.5 \
   $PKG/opt/$PRGNAM/hardware/tools/avr/lib/libtinfo.so.5
 
+# Fix perms
+chmod 755 $PKG/opt/$PRGNAM/reference/*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a revisions.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/arduino/arduino.desktop b/development/arduino/arduino.desktop
new file mode 100644
index 0000000000..8b271e4939
--- /dev/null
+++ b/development/arduino/arduino.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Arduino IDE
+GenericName=Integrated Development Environment
+Comment=An IDE for Arduino-compatible electronics prototyping platforms
+Exec=FULL_PATH/arduino
+Icon=FULL_PATH/lib/arduino.png
+Terminal=false
+Categories=Development;IDE;Electronics;
+MimeType=text/x-arduino
+Keywords=embedded electronics;electronics;avr;microcontroller;
diff --git a/development/arduino/arduino.info b/development/arduino/arduino.info
index 3d20a37e4d..60ace26f09 100644
--- a/development/arduino/arduino.info
+++ b/development/arduino/arduino.info
@@ -1,10 +1,10 @@
 PRGNAM="arduino"
-VERSION="1.6.5"
+VERSION="1.6.9"
 HOMEPAGE="http://www.arduino.cc/"
-DOWNLOAD="http://mirror.slackware.hr/sources/arduino/arduino-1.6.5-linux32.tar.xz"
-MD5SUM="44c48ba7775d6e4f3b9b9513312319b9"
-DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/arduino/arduino-1.6.5-linux64.tar.xz"
-MD5SUM_x86_64="9bf83a56b31b66c20918c20f5d60f508"
+DOWNLOAD="http://mirror.slackware.hr/sources/arduino/arduino-1.6.9-linux32.tar.xz"
+MD5SUM="afd97cbf3c076f3dfab3aabe5f143378"
+DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/arduino/arduino-1.6.9-linux64.tar.xz"
+MD5SUM_x86_64="cf31421f10e2726afc2d2b320c2b5127"
 REQUIRES="jdk"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/development/asl/asl.SlackBuild b/development/asl/asl.SlackBuild
index 41a5f8a126..0724e96455 100644
--- a/development/asl/asl.SlackBuild
+++ b/development/asl/asl.SlackBuild
@@ -4,7 +4,9 @@
 # Written by Oleg O. Chukaev <oleg.chukaev@mail.ru>
 
 PRGNAM=asl
-VERSION=${VERSION:-current_20090810}
+SRCNAM=asl-current
+VERSION=${VERSION:-142_bld98}
+SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,18 +42,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.?z*
+cd $SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fixup the manpage installation
-patch -p1 < $CWD/fixup_manpage_install.diff
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mv Makefile.def.tmpl Makefile.def
 
diff --git a/development/asl/asl.info b/development/asl/asl.info
index a8b2c43139..eca6062570 100644
--- a/development/asl/asl.info
+++ b/development/asl/asl.info
@@ -1,8 +1,8 @@
 PRGNAM="asl"
-VERSION="current_20090810"
+VERSION="142_bld98"
 HOMEPAGE="http://john.ccac.rwth-aachen.de:8000/as/"
-DOWNLOAD="http://slackbuilds.org/sources/13.0/asl-current_20090810.tar.xz"
-MD5SUM="3123dbf298c96c4a5bbdce9843348402"
+DOWNLOAD="http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld98.tar.bz2"
+MD5SUM="dae1e1b994e31b3c611d2504b26cb754"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/asm6809/README b/development/asm6809/README
new file mode 100644
index 0000000000..e9bc7a9810
--- /dev/null
+++ b/development/asm6809/README
@@ -0,0 +1,6 @@
+asm6809 is a portable cross assembler targeting the Motorola 6809 and
+Hitachi 6309.
+
+Features arbitrarily complex expressions (with most C-style operators available),
+forward references, macro expansion and conditional assembly.
+Output formats are: Raw binary, DragonDOS binary, CoCo RS-DOS (or "DECB") binary, Motorola SREC, Intel HEX.
diff --git a/development/asm6809/asm6809.SlackBuild b/development/asm6809/asm6809.SlackBuild
new file mode 100644
index 0000000000..4b3dfe3b53
--- /dev/null
+++ b/development/asm6809/asm6809.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for asm6809
+
+# Copyright 2015  David Golus <bassplayer69@gmail.com>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Heavily based on original slackbuild by AlienBOB.
+# Modified by David Golus <bassplayer69@gmail.com>
+
+PRGNAM=asm6809
+VERSION=${VERSION:-2.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  SLKLDFLAGS="-L/usr/lib64"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+LDFLAGS="-lm" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --sysconfdir=/etc \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING.GPL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/asm6809/asm6809.info b/development/asm6809/asm6809.info
new file mode 100644
index 0000000000..6453264a0d
--- /dev/null
+++ b/development/asm6809/asm6809.info
@@ -0,0 +1,10 @@
+PRGNAM="asm6809"
+VERSION="2.5"
+HOMEPAGE="http://www.6809.org.uk/asm6809/"
+DOWNLOAD="http://www.6809.org.uk/asm6809/dl/asm6809-2.5.tar.gz"
+MD5SUM="0258826e5f9e0bdf9de5c5d8b554eaaf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="David Golus"
+EMAIL="bassplayer69@gmail.com"
diff --git a/development/asm6809/slack-desc b/development/asm6809/slack-desc
new file mode 100644
index 0000000000..53c83569d9
--- /dev/null
+++ b/development/asm6809/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+asm6809: asm6809 - (6809/6309 cross assmbler)
+asm6809:
+asm6809: asm6809 is a portable cross assembler targetting the Motorola 6809
+asm6809: and Hitachi 6309 microprocessors.
+asm6809: 
+asm6809: Features arbitrarily complex expressions (with most C-style
+asm6809: operators available, forward references, macro expansion and
+asm6809: conditional assembly.  Output formats are: Raw binary, DragonDOS
+asm6809: binary, CoCo RS-DOS (or "DECB") binary, Motorola SREC, Intel HEX.
+asm6809:
+asm6809: http://www.6809.org.uk/asm6809
+asm6809:
diff --git a/development/astyle/astyle.SlackBuild b/development/astyle/astyle.SlackBuild
index 8db5ad81a6..59388dc601 100644
--- a/development/astyle/astyle.SlackBuild
+++ b/development/astyle/astyle.SlackBuild
@@ -14,7 +14,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -100,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/atom/README b/development/atom/README
index e031f1d978..b65b016b6b 100644
--- a/development/atom/README
+++ b/development/atom/README
@@ -1,4 +1,4 @@
-Atom is a Chorme-based text editor, hackable and full-featured.
+Atom is a Chrome-based text editor, hackable and full-featured.
 
 Atom comes loaded with the features you've come to expect from
 a modern text editor, like a file system browser, fuzzy finder for
@@ -12,9 +12,6 @@ To build Atom is necessary to download about 500MB of data,
 which are temporarily stored in ~/.atom, which can be
 deleted after building.
 
-If you are upgrading from 0.138.0 version, you need replace node
-package with iojs.
-
 Optional building features:
 * Disable compiling metrics module for Google Analytics
   for poeple who love your privacy
diff --git a/development/atom/atom.SlackBuild b/development/atom/atom.SlackBuild
index c358f6bf65..a0290770a7 100644
--- a/development/atom/atom.SlackBuild
+++ b/development/atom/atom.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=atom
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$DISABLE_METRICS" == "yes" ]; then
+if [ "$DISABLE_METRICS" = "yes" ]; then
     sed -i '/"metrics":/d' package.json
 fi
 
@@ -97,25 +97,26 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # move apm symlink to atom-apm for prevent conflicts with apmd package.
 mv $PKG/usr/bin/apm $PKG/usr/bin/atom-apm
 
-# move and configure icon and .desktop file
-mkdir -p $PKG/usr/share/pixmaps
-cp -a resources/atom.png \
-    $PKG/usr/share/pixmaps
+# move and configure icons and .desktop file
+(
+  cd resources/app-icons/stable/png
+  for IMG in *.png
+  do
+    DIR_NAME=${IMG%.*}x${IMG%.*}
+    install -D $IMG $PKG/usr/share/icons/hicolor/$DIR_NAME/apps/$PRGNAM.png
+  done
+)
 mkdir -p $PKG/usr/share/applications
-sed -e "s#<%= description %>#Hackable text editor#" \
-    -e "s#<%= executable %>#/usr/bin/atom#" \
-    -e "s#<%= iconName %>#atom#" \
-    resources/linux/atom.desktop.in > \
-    $PKG/usr/share/applications/atom.desktop
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 
-if [ "$DELETE_CACHE" == "yes" ]; then
+if [ "$DELETE_CACHE" = "yes" ]; then
     # delete temporal data
     rm -rf ~/.atom/
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar LICENSE.md README.md CONTRIBUTING.md docs \
+cp -ar LICENSE.md README.md CONTRIBUTING.md CHANGELOG.md docs \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > \
     $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/atom/atom.desktop b/development/atom/atom.desktop
new file mode 100644
index 0000000000..54e54d2d5e
--- /dev/null
+++ b/development/atom/atom.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Atom
+Comment=A jackable text editor
+GenericName=Text Editor
+GenericName[es]=Editor de texto
+GenericName[it]=Editor di testo
+GenericName[pt]=Editor de texto
+Exec=/usr/bin/atom %U
+Icon=atom
+Type=Application
+StartupNotify=true
+Terminal=false
+Categories=GNOME;GTK;Utility;TextEditor;Development;
+MimeType=text/plain;
diff --git a/development/atom/atom.info b/development/atom/atom.info
index 768dc584e1..f06574d1e9 100644
--- a/development/atom/atom.info
+++ b/development/atom/atom.info
@@ -1,10 +1,10 @@
 PRGNAM="atom"
-VERSION="1.0.0"
+VERSION="1.3.0"
 HOMEPAGE="https://atom.io/"
-DOWNLOAD="https://codeload.github.com/atom/atom/tar.gz/v1.0.0"
-MD5SUM="0018e6fcc17cf15a0203b230f22b329a"
+DOWNLOAD="https://codeload.github.com/atom/atom/tar.gz/v1.3.0"
+MD5SUM="a2006d60bcb1b4628c9bb097365c47f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iojs"
+REQUIRES="nodejs"
 MAINTAINER="DhabyX"
 EMAIL="slack.dhabyx@gmail.com"
diff --git a/development/atom/slack-desc b/development/atom/slack-desc
index e01b1bb143..4f6dd464bf 100644
--- a/development/atom/slack-desc
+++ b/development/atom/slack-desc
@@ -8,7 +8,7 @@
     |-----handy-ruler------------------------------------------------------|
 atom: Atom (Chrome-based and Hackable text editor)
 atom:
-atom: A chorome-based text editor, with full-featured, right out of the 
+atom: A chrome-based text editor, with full-featured, right out of the 
 atom: box: file system browser, multiple panes, snippets, and more.
 atom: 
 atom:
diff --git a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
index b0864d8497..d18d0f566e 100644
--- a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
+++ b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
@@ -48,10 +48,10 @@ mv $(echo $SRCNAM | tr '_' '-' ) $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/share/{avr8-burn-o-mat,applications,pixmaps}
@@ -67,10 +67,7 @@ cp -a icon/AVR8_Burn-O-Mat_Icon_48.png $PKG/usr/share/pixmaps/avr8-burn-o-mat.pn
 cp -a "Installer Debian/avr8-burn-o-mat.desktop" $PKG/usr/share/applications
 sed -i 's/'REPLACE_PROG_VERSION'/'$VERSION'/g' $PKG/usr/share/applications/avr8-burn-o-mat.desktop
 
-cp -a \
-  TODO.txt \
-  license_gpl-3.0.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a license_gpl-3.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/avr8-burn-o-mat/avr8-burn-o-mat.info b/development/avr8-burn-o-mat/avr8-burn-o-mat.info
index a34fa58634..726f54445c 100644
--- a/development/avr8-burn-o-mat/avr8-burn-o-mat.info
+++ b/development/avr8-burn-o-mat/avr8-burn-o-mat.info
@@ -2,7 +2,7 @@ PRGNAM="avr8-burn-o-mat"
 VERSION="2.1.2"
 HOMEPAGE="http://avr8-burn-o-mat.aaabbb.de/"
 DOWNLOAD="http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2_src.tar.bz2"
-MD5SUM="2ad3b6a8d3d233579dc03308cab69b92"
+MD5SUM="3ce2f3205840b855e4c2494335b0540e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk avrdude"
diff --git a/development/bas55/bas55.SlackBuild b/development/bas55/bas55.SlackBuild
index 2b8d133d3e..162e9c51bf 100644
--- a/development/bas55/bas55.SlackBuild
+++ b/development/bas55/bas55.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bas55
-VERSION=${VERSION:-1.02}
+VERSION=${VERSION:-1.08}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/bas55/bas55.info b/development/bas55/bas55.info
index 5629a59895..bed4bb1ba4 100644
--- a/development/bas55/bas55.info
+++ b/development/bas55/bas55.info
@@ -1,8 +1,8 @@
 PRGNAM="bas55"
-VERSION="1.02"
+VERSION="1.08"
 HOMEPAGE="http://jorgicor.sdfeu.org/bas55"
-DOWNLOAD="http://jorgicor.sdfeu.org/bas55/bas55-1.02.tar.gz"
-MD5SUM="aae59291e2183889e8110368a6767fbb"
+DOWNLOAD="http://jorgicor.sdfeu.org/bas55/bas55-1.08.tar.gz"
+MD5SUM="d8ca3e3f67e8fe95ac4dacd9dd097526"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/bfg/bfg.SlackBuild b/development/bfg/bfg.SlackBuild
index 4e5e839807..a7861afefa 100644
--- a/development/bfg/bfg.SlackBuild
+++ b/development/bfg/bfg.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/bigloo/bigloo.SlackBuild b/development/bigloo/bigloo.SlackBuild
index 6fe536aa9d..bed44f683e 100644
--- a/development/bigloo/bigloo.SlackBuild
+++ b/development/bigloo/bigloo.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/development/bmake/bmake.SlackBuild b/development/bmake/bmake.SlackBuild
index dadaa22dfb..60e4109811 100644
--- a/development/bmake/bmake.SlackBuild
+++ b/development/bmake/bmake.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bmake
-VERSION=${VERSION:-20150606}
+VERSION=${VERSION:-20151020}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/bmake/bmake.info b/development/bmake/bmake.info
index 1793126d73..1aefbd6779 100644
--- a/development/bmake/bmake.info
+++ b/development/bmake/bmake.info
@@ -1,8 +1,8 @@
 PRGNAM="bmake"
-VERSION="20150606"
+VERSION="20151020"
 HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
-DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20150606.tar.gz"
-MD5SUM="0f61b2181452bd6e68d63abe0d62aabf"
+DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20151020.tar.gz"
+MD5SUM="f6df5751c8144b0b1d81e140540c0526"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/brackets/brackets.SlackBuild b/development/brackets/brackets.SlackBuild
index de01ccc5ae..30f7f7df37 100644
--- a/development/brackets/brackets.SlackBuild
+++ b/development/brackets/brackets.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -25,7 +25,7 @@
 PRGNAM=brackets
 SRCNAM=Brackets
 RELEASE=Extract
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/brackets/brackets.info b/development/brackets/brackets.info
index ee2f860631..36b680b306 100644
--- a/development/brackets/brackets.info
+++ b/development/brackets/brackets.info
@@ -1,10 +1,10 @@
 PRGNAM="brackets"
-VERSION="1.3"
+VERSION="1.5"
 HOMEPAGE="http://brackets.io"
-DOWNLOAD="https://github.com/adobe/brackets/releases/download/release-1.3%2Beb4/Brackets.1.3.Extract.32-bit.deb"
-MD5SUM="9527e43da0e0077155c981f1120b3823"
-DOWNLOAD_x86_64="https://github.com/adobe/brackets/releases/download/release-1.3%2Beb4/Brackets.1.3.Extract.64-bit.deb"
-MD5SUM_x86_64="d4ccf9edd3304b73ffdea128335ae4b5"
+DOWNLOAD="https://github.com/adobe/brackets/releases/download/release-1.5%2Beb4/Brackets.1.5.Extract.32-bit.deb"
+MD5SUM="edcdedf56bba77e66f8c035c8b5f070b"
+DOWNLOAD_x86_64="https://github.com/adobe/brackets/releases/download/release-1.5%2Beb4/Brackets.1.5.Extract.64-bit.deb"
+MD5SUM_x86_64="2f8a1e1c8844f28a72c4692f97d45ac2"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/development/byacc/byacc.SlackBuild b/development/byacc/byacc.SlackBuild
index e5ef6495cf..7264b1bce2 100644
--- a/development/byacc/byacc.SlackBuild
+++ b/development/byacc/byacc.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=byacc
-VERSION=${VERSION:-20141128}
+VERSION=${VERSION:-20150711}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/byacc/byacc.info b/development/byacc/byacc.info
index 63b6e5ef08..9e348d9ea5 100644
--- a/development/byacc/byacc.info
+++ b/development/byacc/byacc.info
@@ -1,8 +1,8 @@
 PRGNAM="byacc"
-VERSION="20141128"
+VERSION="20150711"
 HOMEPAGE="http://invisible-island.net/byacc/"
 DOWNLOAD="http://invisible-island.net/datafiles/release/byacc.tar.gz"
-MD5SUM="acb0ff0fb6cc414a6b50c799794b2425"
+MD5SUM="2700401030583c4e9169ac7ea7d08de8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/cgit/cgit.info b/development/cgit/cgit.info
index 526afa33f9..d5242307aa 100644
--- a/development/cgit/cgit.info
+++ b/development/cgit/cgit.info
@@ -1,7 +1,7 @@
 PRGNAM="cgit"
 VERSION="0.11.2"
 HOMEPAGE="http://git.zx2c4.com/cgit/about/"
-DOWNLOAD="https://github.com/zx2c4/cgit/archive/v0.11.2.tar.gz \
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cgit-0.11.2.tar.gz \
           https://www.kernel.org/pub/software/scm/git/git-2.3.2.tar.xz"
 MD5SUM="13488a915a8a6827693f223d5b9c8f4b \
         56701b3b1815c8bbfd7b43b4773adad7"
diff --git a/development/checkbashisms/checkbashisms.SlackBuild b/development/checkbashisms/checkbashisms.SlackBuild
index 0850d29cfa..70911367fd 100644
--- a/development/checkbashisms/checkbashisms.SlackBuild
+++ b/development/checkbashisms/checkbashisms.SlackBuild
@@ -41,9 +41,13 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 
 mkdir -p $PKG/usr/bin
-install -m 0755 "$CWD/$PRGNAM.pl?id=$REV" $PKG/usr/bin/$PRGNAM
+install -m 0755 "$CWD/$PRGNAM.pl?id=$REV" $PKG/usr/bin/$PRGNAM || \
+  install -m 0755 "$CWD/$PRGNAM.pl" $PKG/usr/bin/$PRGNAM
+
 mkdir -p $PKG/usr/man/man1
-cat "$CWD/$PRGNAM.1?id=$REV" | gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+cat "$CWD/$PRGNAM.1?id=$REV" > $PKG/usr/man/man1/$PRGNAM.1 || \
+  cat "$CWD/$PRGNAM.1" > $PKG/usr/man/man1/$PRGNAM.1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/chicken/chicken.SlackBuild b/development/chicken/chicken.SlackBuild
index f87653340e..4ecda6761c 100644
--- a/development/chicken/chicken.SlackBuild
+++ b/development/chicken/chicken.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=chicken
-VERSION=${VERSION:-4.9.0.1}
+VERSION=${VERSION:-4.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,7 @@ make \
   PLATFORM=linux \
   PREFIX=/usr \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  TOPMANDIR=/usr/man \
+  MANDIR=/usr/man \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION
 
 make install \
@@ -88,7 +88,7 @@ make install \
   PLATFORM=linux \
   PREFIX=/usr \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  TOPMANDIR=/usr/man \
+  MANDIR=/usr/man \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION \
   DESTDIR=$PKG
 
diff --git a/development/chicken/chicken.info b/development/chicken/chicken.info
index 2c5bda1e20..b3ea3264c7 100644
--- a/development/chicken/chicken.info
+++ b/development/chicken/chicken.info
@@ -1,8 +1,8 @@
 PRGNAM="chicken"
-VERSION="4.9.0.1"
-HOMEPAGE="http://wiki.call-cc.org"
-DOWNLOAD="http://code.call-cc.org/releases/4.9.0/chicken-4.9.0.1.tar.gz"
-MD5SUM="f45e282c64714127309ae45119b4d306"
+VERSION="4.10.0"
+HOMEPAGE="http://call-cc.org"
+DOWNLOAD="http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz"
+MD5SUM="5585edb369eb2a49f1f92775419852e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/codelite/README b/development/codelite/README
index 48d1c8dc95..bc8c2196c7 100644
--- a/development/codelite/README
+++ b/development/codelite/README
@@ -8,4 +8,4 @@ Subversion integration, cscope integration, UnitTest++ integration,
 an interactive debugger built over GDB/LLDB and a source code editor
 (based on Scintilla).
 
-Optional: Valgrind
+Optional: valgrind
diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild
index a1efc6f7d4..9e3cfcfa2c 100644
--- a/development/codelite/codelite.SlackBuild
+++ b/development/codelite/codelite.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
 PRGNAM=codelite
-VERSION=${VERSION:-8.0}
+VERSION=${VERSION:-8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-${VERSION}-1
-tar xvf $CWD/$PRGNAM-${VERSION}-1.tar.gz || tar xvf $CWD/${VERSION}-1.tar.gz
-cd $PRGNAM-${VERSION}-1
+rm -rf $PRGNAM-${VERSION}
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz || tar xvf $CWD/${VERSION}.tar.gz
+cd $PRGNAM-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info
index 18e859a4fe..b47f1af497 100644
--- a/development/codelite/codelite.info
+++ b/development/codelite/codelite.info
@@ -1,8 +1,8 @@
 PRGNAM="codelite"
-VERSION="8.0"
+VERSION="8.1"
 HOMEPAGE="http://www.codelite.org/"
-DOWNLOAD="https://github.com/eranif/codelite/archive/8.0-1.tar.gz"
-MD5SUM="1be80bf75f45243eebfd5d5c11f2d192"
+DOWNLOAD="https://github.com/eranif/codelite/archive/8.1.tar.gz"
+MD5SUM="363ac51e6cf81f77ed9905483d7ecd45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3"
diff --git a/development/colordiff/colordiff.SlackBuild b/development/colordiff/colordiff.SlackBuild
index 98f369068a..566ce746e3 100644
--- a/development/colordiff/colordiff.SlackBuild
+++ b/development/colordiff/colordiff.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/development/colordiff/colordiff.info b/development/colordiff/colordiff.info
index 0065c60e9b..05464a6644 100644
--- a/development/colordiff/colordiff.info
+++ b/development/colordiff/colordiff.info
@@ -1,7 +1,7 @@
 PRGNAM="colordiff"
 VERSION="1.0.15"
 HOMEPAGE="http://www.colordiff.org/"
-DOWNLOAD="http://www.colordiff.org/colordiff-1.0.15.tar.gz"
+DOWNLOAD="http://www.colordiff.org/archive/colordiff-1.0.15.tar.gz"
 MD5SUM="b934ee76daaa47737ee46ddee534e42c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/composer/README b/development/composer/README
new file mode 100644
index 0000000000..9818a02db2
--- /dev/null
+++ b/development/composer/README
@@ -0,0 +1,6 @@
+Composer is a tool for dependency management in PHP. It allows you to
+declare the libraries your project depends on and it will manage
+(install/update) them for you.
+
+This package ships a shortcut (/usr/bin/composer) that uses hhvm
+instead of php if installed.
diff --git a/development/composer/composer b/development/composer/composer
new file mode 100644
index 0000000000..1823271500
--- /dev/null
+++ b/development/composer/composer
@@ -0,0 +1,8 @@
+#/bin/sh
+
+if [ -x /usr/bin/hhvm ]
+then
+	/usr/bin/hhvm /usr/bin/composer.phar "$@"
+else
+	/usr/bin/php /usr/bin/composer.phar "$@"
+fi
diff --git a/development/composer/composer.SlackBuild b/development/composer/composer.SlackBuild
new file mode 100644
index 0000000000..73adce87c5
--- /dev/null
+++ b/development/composer/composer.SlackBuild
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Slackware build script for "composer".
+
+# Copyright 2015 Eugene Wissner <belka@caraus.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=composer
+VERSION=${VERSION:-1.0.0_alpha11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $PKG/usr/bin $OUTPUT
+install -m 0755 $CWD/composer.phar $PKG/usr/bin
+chown -R root:root $PKG
+
+install -m 0755 $CWD/composer $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/composer/composer.info b/development/composer/composer.info
new file mode 100644
index 0000000000..9604b5b482
--- /dev/null
+++ b/development/composer/composer.info
@@ -0,0 +1,10 @@
+PRGNAM="composer"
+VERSION="1.0.0_alpha11"
+HOMEPAGE="https://getcomposer.org/"
+DOWNLOAD="https://getcomposer.org/download/1.0.0-alpha11/composer.phar"
+MD5SUM="488ca7972e447e0e1b2988f66d8e01e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/composer/slack-desc b/development/composer/slack-desc
new file mode 100644
index 0000000000..2a1a561c67
--- /dev/null
+++ b/development/composer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+composer: Composer (tool for dependency management in PHP)
+composer:
+composer: Composer is a tool for dependency management in PHP. It allows you to
+composer: declare the libraries your project depends on and it will manage
+composer: (install/update) them for you.
+composer:
+composer: Homepage: https://getcomposer.org/
+composer:
+composer:
+composer:
+composer:
diff --git a/development/cppcms/cppcms.info b/development/cppcms/cppcms.info
index 96430204b4..0860022409 100644
--- a/development/cppcms/cppcms.info
+++ b/development/cppcms/cppcms.info
@@ -1,7 +1,7 @@
 PRGNAM="cppcms"
 VERSION="1.0.4"
 HOMEPAGE="http://cppcms.com"
-DOWNLOAD="http://garr.dl.sourceforge.net/project/cppcms/cppcms/1.0.4/cppcms-1.0.4.tar.bz2"
+DOWNLOAD="http://sourceforge.net/projects/cppcms/files/cppcms/1.0.4/cppcms-1.0.4.tar.bz2"
 MD5SUM="e5e081d57f93461c5fb4c36c5f26cad3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/cppdb/cppdb.info b/development/cppdb/cppdb.info
index 3200a4f5e8..0ad85e16df 100644
--- a/development/cppdb/cppdb.info
+++ b/development/cppdb/cppdb.info
@@ -1,7 +1,7 @@
 PRGNAM="cppdb"
 VERSION="0.3.1"
 HOMEPAGE="http://cppcms.com"
-DOWNLOAD="http://garr.dl.sourceforge.net/project/cppcms/cppdb/0.3.1/cppdb-0.3.1.tar.bz2"
+DOWNLOAD="http://sourceforge.net/projects/cppcms/files/cppdb/0.3.1/cppdb-0.3.1.tar.bz2/download"
 MD5SUM="129f1d75f46114b79160b93807d5223f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/dfu-programmer/dfu-programmer.info b/development/dfu-programmer/dfu-programmer.info
index f3ba9254c3..a7b308729a 100644
--- a/development/dfu-programmer/dfu-programmer.info
+++ b/development/dfu-programmer/dfu-programmer.info
@@ -1,7 +1,7 @@
 PRGNAM="dfu-programmer"
 VERSION="0.5.4"
 HOMEPAGE="http://dfu-programmer.sourceforge.net/"
-DOWNLOAD="http://dfn.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.5.4/dfu-programmer-0.5.4.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.5.4/dfu-programmer-0.5.4.tar.gz"
 DOWNLOAD_x86_64=""
 MD5SUM="707dcd0f957a74e92456ea6919faa772"
 MD5SUM_x86_64=""
diff --git a/development/docutils/docutils.SlackBuild b/development/docutils/docutils.SlackBuild
index 3493ce102e..e35b1b3ed5 100644
--- a/development/docutils/docutils.SlackBuild
+++ b/development/docutils/docutils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for docutils
 
-# Copyright 2006-2013  Robby Workman  Northport, AL, USA
+# Copyright 2006-2016  Robby Workman  Tuscaloosa, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=docutils
-VERSION=${VERSION:-0.11}
+VERSION=${VERSION:-0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/docutils/docutils.info b/development/docutils/docutils.info
index d2fea342ae..1e7e2af22e 100644
--- a/development/docutils/docutils.info
+++ b/development/docutils/docutils.info
@@ -1,8 +1,8 @@
 PRGNAM="docutils"
-VERSION="0.11"
+VERSION="0.12"
 HOMEPAGE="http://docutils.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-0.11.tar.gz"
-MD5SUM="20ac380a18b369824276864d98ec0ad6"
+DOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-0.12.tar.gz"
+MD5SUM="4622263b62c5c771c03502afa3157768"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/dwarf/README b/development/dwarf/README
new file mode 100644
index 0000000000..c1e28e78bc
--- /dev/null
+++ b/development/dwarf/README
@@ -0,0 +1,10 @@
+The DWARF Debugging Information Format is of interest to programmers working on
+compilers and debuggers (and anyone interested in reading or writing DWARF
+information). It was developed by a committee (known as the PLSIG at the time)
+starting around 1991. Starting around 1991 SGI got involved with the committee
+and then developed the libdwarf and dwarfdump tools for SGI-internal use and as
+part of SGI IRIX developer tools. From around 1993 dwarfdump and libdwarf were
+shipped (as an executable and archive respectively, not source) with every
+release of the SGI MIPS/IRIX C compiler. In 1994 (I think the correct year) SGI
+agreed (at my request) to open-source libdwarf (and in 1999 to open-source
+dwarfdump) so anyone could use them. 
diff --git a/development/dwarf/dwarf.SlackBuild b/development/dwarf/dwarf.SlackBuild
new file mode 100644
index 0000000000..a0ea396edd
--- /dev/null
+++ b/development/dwarf/dwarf.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for dwarf
+
+# Copyright 2015 Eugene Wissner Germany
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=dwarf
+VERSION=${VERSION:-20150915}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/libdwarf-$VERSION.tar.gz
+cd $PRGNAM-$VERSION/libdwarf
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="-I/usr/include/libelf $SLKCFLAGS" \
+./configure \
+  --enable-shared \
+  --build=$ARCH-slackware-linux
+
+make
+
+# There is no make install
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} $PKG/usr/include $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a libdwarf.so $PKG/usr/lib${LIBDIRSUFFIX}
+cp -a dwarf.h libdwarf.h $PKG/usr/include
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+cp -a README NEWS COPYING CODINGSTYLE CHANGES  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/dwarf/dwarf.info b/development/dwarf/dwarf.info
new file mode 100644
index 0000000000..543dd18b98
--- /dev/null
+++ b/development/dwarf/dwarf.info
@@ -0,0 +1,10 @@
+PRGNAM="dwarf"
+VERSION="20150915"
+HOMEPAGE="http://www.prevanders.net/dwarf.html"
+DOWNLOAD="http://www.prevanders.net/libdwarf-20150915.tar.gz"
+MD5SUM="08d243ea44e39ceb15f72c1066857cc1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/dwarf/slack-desc b/development/dwarf/slack-desc
new file mode 100644
index 0000000000..5a22cf812c
--- /dev/null
+++ b/development/dwarf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+dwarf: dwarf (library to consume and produce DWARF debug information)
+dwarf:
+dwarf: The DWARF Debugging Information Format is of interest to programmers
+dwarf: working on compilers and debuggers (and anyone interested in reading
+dwarf: or writing DWARF information). It was developed by a committee (known
+dwarf: as the PLSIG at the time) starting around 1991.
+dwarf:
+dwarf:
+dwarf:
+dwarf:
+dwarf:
diff --git a/development/eagle/README b/development/eagle/README
index c093a1c7d1..21a490f7b4 100644
--- a/development/eagle/README
+++ b/development/eagle/README
@@ -18,6 +18,6 @@ This script installs the English documentation. With version 5.10.0
 German and (some) Chinese documentation is included as well. To select
 them, run this script as:
 
-  # LANG=<xx> ./eagle.SlackBuild
+  # DOC_LANG=<xx> ./eagle.SlackBuild
 
-where <xx> = "de" for German and "zh" for Chinese.
+where <xx> = "de" for German, "zh" for Chinese, or "all".
diff --git a/development/eagle/eagle.SlackBuild b/development/eagle/eagle.SlackBuild
index 74ae617eee..6180e65c41 100644
--- a/development/eagle/eagle.SlackBuild
+++ b/development/eagle/eagle.SlackBuild
@@ -24,33 +24,35 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=eagle
-VERSION=${VERSION:-7.2.0}
+VERSION=${VERSION:-7.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCH=i486
+
+ARCH=${ARCH:-$(uname -m)}
+case $ARCH in
+  i?86)   PLATFORM=lin32; ARCH=i686 ;;
+  x86_64) PLATFORM=lin64 ;;
+  *)      echo "$ARCH is unsupported."; exit 1 ;;
+esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Documentation is distributed for English, German and Chinese.  Due to the size
-# of the documentation, only include one language.
-LANG=${LANG:-"en"}
-if [ "$LANG" = "de" ]; then
-  DOCS="README_de UPDATE_de library_de.txt license_de.txt manual_de.pdf tutorial_de.pdf eagle.dtd connect-device-split-symbol-de.pdf generate-3d-idf-data_de.pdf make-symbol-device-package-bsdl-2011-de.pdf elektro-tutorial.pdf"
-elif [ "$LANG" = "zh" ]; then
-  DOCS="README_en UPDATE_en library_en.txt license_en.txt manual_zh.pdf tutorial_zh.pdf eagle.dtd"
-else
-  DOCS="README_en UPDATE_en library_en.txt license_en.txt manual_en.pdf tutorial_en.pdf eagle.dtd connect-device-split-symbol-en.pdf generate-3d-idf-data_en.pdf make-symbol-device-package-bsdl-2011-en.pdf EagleIDFExporterInstructions.pdf layer-setup_designrules.pdf"
-fi
+# Documentation is distributed for English, German and Chinese.
+# Due to the size of the documentation, only include one language.
+DOC_LANG=${DOC_LANG:-en}  # one of "all", "de", "en", or "zh"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-sh $CWD/$PRGNAM-lin-$VERSION.run $PKG/opt
+sh $CWD/$PRGNAM-$PLATFORM-$VERSION.run $PKG/opt
 chown -R root:root $PKG
+chmod -R u+w,go-w,a+rX-st $PKG
+find $PKG/opt/$PRGNAM-$VERSION/lbr/seeed -type f -exec chmod -x {} +
+find $PKG/opt/$PRGNAM-$VERSION/projects/examples/seeed -type f -exec chmod -x {} +
 
 # Create the license key file.  EAGLE will write to this the first time it is
 # run.  After that, you can change the permissions to 0644 if you wish.
@@ -73,14 +75,38 @@ mkdir -p $PKG/usr/man/man1
 mv $PKG/opt/$PRGNAM-$VERSION/doc/*.1 $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} +
 
+if [ ${DOC_LANG} != "all" ]; then
+  # Move each language-specific file to its own subdir.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc
+  for lang in de en zh; do mkdir -p ${lang}/ulp; done
+  for lang in de en;    do mv README_${lang} ${lang}/README; done
+  for lang in de en;    do mv UPDATE_${lang} ${lang}/UPDATE; done
+  for lang in de en;    do mv library_${lang}.txt ${lang}/library.txt; done
+  for lang in de en;    do mv license_${lang}.txt ${lang}/license.txt; done
+  for lang in de en zh; do mv manual_${lang}.pdf ${lang}/manual.pdf; done
+  for lang in de en zh; do mv tutorial_${lang}.pdf ${lang}/tutorial.pdf; done
+  for lang in de en;    do mv ulp/connect-device-split-symbol-${lang}.pdf ${lang}/ulp/connect-device-split-symbol.pdf; done
+  for lang in de en;    do mv ulp/generate-3d-idf-data_${lang}.pdf ${lang}/ulp/generate-3d-idf-data.pdf; done
+  for lang in de en;    do mv ulp/make-symbol-device-package-bsdl-2011-${lang}.pdf ${lang}/ulp/make-symbol-device-package-bsdl-2011.pdf; done
+
+  # Prefer the English docs as a base set.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc/en
+  find . -type f -exec mv {} ../{} \;
+
+  # Replace the base set with other languages.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc/${DOC_LANG}
+  find . -type f -exec mv {} ../{} \;
+
+  # Delete all alternate language files.
+  cd $PKG/opt/$PRGNAM-$VERSION/doc
+  for lang in de en zh; do rm -rf ${lang}; done
+fi
+
 # Move the documentation to the proper location
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc
+mv $PKG/opt/$PRGNAM-$VERSION/doc $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s /usr/doc/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cd $PKG/opt/$PRGNAM-$VERSION
-for d in $DOCS; do mv doc/$d $PKG/usr/doc/$PRGNAM-$VERSION/; done
-  rm -rf doc
-  ln -s /usr/doc/$PRGNAM-$VERSION doc
-cd -
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/eagle/eagle.info b/development/eagle/eagle.info
index 10bd04ad62..92daf77fca 100644
--- a/development/eagle/eagle.info
+++ b/development/eagle/eagle.info
@@ -1,10 +1,10 @@
 PRGNAM="eagle"
-VERSION="7.2.0"
+VERSION="7.5.0"
 HOMEPAGE="http://www.cadsoft.de/"
-DOWNLOAD="http://web.cadsoft.de/ftp/eagle/program/7.2/eagle-lin-7.2.0.run"
-MD5SUM="31abdc995fe39946cb4624716966f1c7"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64="UNSUPPORTED"
+DOWNLOAD="http://web.cadsoft.de/ftp/eagle/program/7.5/eagle-lin32-7.5.0.run"
+MD5SUM="8daa005e2f35ccffbda75cf9c8a777e0"
+DOWNLOAD_x86_64="http://web.cadsoft.de/ftp/eagle/program/7.5/eagle-lin64-7.5.0.run"
+MD5SUM_x86_64="19674814e6da7b94c7ba3d545798bf4a"
 REQUIRES=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
diff --git a/development/ebe/ebe.SlackBuild b/development/ebe/ebe.SlackBuild
index 488bd6331f..f177cccff0 100644
--- a/development/ebe/ebe.SlackBuild
+++ b/development/ebe/ebe.SlackBuild
@@ -28,7 +28,7 @@
 
 
 PRGNAM=ebe
-VERSION=${VERSION:-2.7.10}
+VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/ebe/ebe.info b/development/ebe/ebe.info
index 59c68ba842..5acb4a2943 100644
--- a/development/ebe/ebe.info
+++ b/development/ebe/ebe.info
@@ -1,8 +1,8 @@
 PRGNAM="ebe"
-VERSION="2.7.10"
+VERSION="3.0.3"
 HOMEPAGE="http://www.rayseyfarth.com/ebe/"
-DOWNLOAD="http://sourceforge.net/projects/qtebe/files/src/ebe_src_2.7.10.tgz"
-MD5SUM="7b255efef95836a7df83dfbce5b40c8f"
+DOWNLOAD="http://sourceforge.net/projects/qtebe/files/src/ebe_src_3.0.3.tgz"
+MD5SUM="3d8c5e92ce667d2f45eedaa60a5b9c13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="astyle"
diff --git a/development/eclipse-cpp/eclipse-cpp.SlackBuild b/development/eclipse-cpp/eclipse-cpp.SlackBuild
index 28b9426eaa..2f5ba6b6e7 100644
--- a/development/eclipse-cpp/eclipse-cpp.SlackBuild
+++ b/development/eclipse-cpp/eclipse-cpp.SlackBuild
@@ -26,8 +26,8 @@
 # This script is just a binary repackaging.
 
 PRGNAM=eclipse-cpp
-VERSION=${VERSION:-4.5}
-SRCVERSION=mars-R
+VERSION=${VERSION:-4.5.1}
+SRCVERSION="mars-1"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,7 @@ chmod 0755 $PKG/usr/bin/$PRGNAM
 
 # Add eclipse to KDE/GNOME/XFCE menu and install an icon for them
 install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.cdt.debug.application_1.1.0.201506070905/icons/cc48.png" \
+install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.cdt.debug.application_1.1.0.201509131935/icons/cc48.png" \
 	$PKG/usr/share/pixmaps/$PRGNAM.png
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/eclipse-cpp/eclipse-cpp.info b/development/eclipse-cpp/eclipse-cpp.info
index 7a40c556e1..6850c87d5a 100644
--- a/development/eclipse-cpp/eclipse-cpp.info
+++ b/development/eclipse-cpp/eclipse-cpp.info
@@ -1,10 +1,10 @@
 PRGNAM="eclipse-cpp"
-VERSION="4.5"
+VERSION="4.5.1"
 HOMEPAGE="http://www.eclipse.org"
-DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk.tar.gz"
-MD5SUM="42e12ade62f188259d81320fee68e81c"
-DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="dc8a40fa49392b3de3fa94470e61afdb"
+DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk.tar.gz"
+MD5SUM="378a1487d46413966ed3882aae6081fc"
+DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="5f0bf4989075058af670866e952be044"
 REQUIRES="jdk"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/development/eclipse-java/eclipse-java.SlackBuild b/development/eclipse-java/eclipse-java.SlackBuild
index b35639e459..105fd8a855 100644
--- a/development/eclipse-java/eclipse-java.SlackBuild
+++ b/development/eclipse-java/eclipse-java.SlackBuild
@@ -26,8 +26,8 @@
 # This script is just a binary repackaging.
 
 PRGNAM=eclipse-java
-VERSION=${VERSION:-4.5}
-SRCVERSION=mars-R
+VERSION=${VERSION:-4.5.1}
+SRCVERSION="mars-1"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,7 @@ chmod 0755 $PKG/usr/bin/$PRGNAM
 
 # Add eclipse to KDE/GNOME/XFCE menu and install an icon for them
 install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.platform_4.5.0.v20150603-2000/eclipse48.png" \
+install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.platform_4.5.1.v20150904-0015/eclipse48.png" \
 	$PKG/usr/share/pixmaps/$PRGNAM.png
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/eclipse-java/eclipse-java.info b/development/eclipse-java/eclipse-java.info
index e575b23371..8c4272a23c 100644
--- a/development/eclipse-java/eclipse-java.info
+++ b/development/eclipse-java/eclipse-java.info
@@ -1,10 +1,10 @@
 PRGNAM="eclipse-java"
-VERSION="4.5"
+VERSION="4.5.1"
 HOMEPAGE="http://www.eclipse.org"
-DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/mars/R/eclipse-java-mars-R-linux-gtk.tar.gz"
-MD5SUM="71b6ca28189d062c3dc5bede5395a7a1"
-DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/mars/R/eclipse-java-mars-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="1984d8cfdd7ed30ff82f5931f5593b13"
+DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/mars/1/eclipse-java-mars-1-linux-gtk.tar.gz"
+MD5SUM="95357aec20d57c4d2c59dc9e85d05652"
+DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/mars/1/eclipse-java-mars-1-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="4256d9dc2629f81423846e5a63ba9cec"
 REQUIRES="jdk webkitgtk"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/development/eclipse-jee/eclipse-jee.SlackBuild b/development/eclipse-jee/eclipse-jee.SlackBuild
index e23232938a..0d8e034a91 100644
--- a/development/eclipse-jee/eclipse-jee.SlackBuild
+++ b/development/eclipse-jee/eclipse-jee.SlackBuild
@@ -26,8 +26,8 @@
 # This script is just a binary repackaging.
 
 PRGNAM=eclipse-jee
-VERSION=${VERSION:-4.5}
-SRCVERSION=mars-R
+VERSION=${VERSION:-4.5.1}
+SRCVERSION="mars-1"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,7 @@ chmod 0755 $PKG/usr/bin/$PRGNAM
 
 # Add eclipse to KDE/GNOME/XFCE menu and install an icon for them
 install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.epp.package.jee_4.5.0.20150621-1200/javaee-ide_x48.png"\
+install -D -m 0644 "$PKG/opt/$PRGNAM/plugins/org.eclipse.epp.package.jee_4.5.1.20150917-1200/javaee-ide_x48.png" \
 	$PKG/usr/share/pixmaps/$PRGNAM.png
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/eclipse-jee/eclipse-jee.info b/development/eclipse-jee/eclipse-jee.info
index c82f111788..5fc2b34a15 100644
--- a/development/eclipse-jee/eclipse-jee.info
+++ b/development/eclipse-jee/eclipse-jee.info
@@ -1,10 +1,10 @@
 PRGNAM="eclipse-jee"
-VERSION="4.5"
+VERSION="4.5.1"
 HOMEPAGE="http://www.eclipse.org"
-DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-linux-gtk.tar.gz"
-MD5SUM="379a7bbaef29d003bb8d85421e8a6d0c"
-DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="30e2e666064f2ed32979e874a8c9cd81"
+DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/mars/1/eclipse-jee-mars-1-linux-gtk.tar.gz"
+MD5SUM="dce33eba239a4f1e745976e7cb576569"
+DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/mars/1/eclipse-jee-mars-1-linux-gtk-x86_64.tar.gz"
+MD5SUM_x86_64="72a722a59a43e8ed6c47ae279fb3d355"
 REQUIRES="jdk webkitgtk"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/development/enki/enki.SlackBuild b/development/enki/enki.SlackBuild
index 07b352d5c0..5c3ff15ab6 100644
--- a/development/enki/enki.SlackBuild
+++ b/development/enki/enki.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/eric/eric.info b/development/eric/eric.info
index 37b2b3f5e0..dee7e267f5 100644
--- a/development/eric/eric.info
+++ b/development/eric/eric.info
@@ -1,8 +1,8 @@
 PRGNAM="eric"
 VERSION="4.5.25"
 HOMEPAGE="http://eric-ide.python-projects.org/"
-DOWNLOAD="http://downloads.sourceforge.net/eric-ide/eric4-4.5.25.tar.gz \
-          http://downloads.sourceforge.net/eric-ide/eric4-i18n-en-4.5.25.tar.gz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/eric/eric4-4.5.25.tar.gz/f68cdadacfa10298c89300e0c4036324/eric4-4.5.25.tar.gz \
+          https://pkgs.fedoraproject.org/repo/pkgs/eric/eric4-i18n-en-4.5.25.tar.gz/be31efb97dc597cc58ba86461f972874/eric4-i18n-en-4.5.25.tar.gz"
 MD5SUM="f68cdadacfa10298c89300e0c4036324 \
         be31efb97dc597cc58ba86461f972874"
 DOWNLOAD_x86_64=""
diff --git a/development/flow/README b/development/flow/README
new file mode 100644
index 0000000000..a38b4d172a
--- /dev/null
+++ b/development/flow/README
@@ -0,0 +1,11 @@
+The goal of Flow is to find errors in JavaScript code with little programmer effort.
+Flow relies heavily on type inference to find type errors even when the program has not been annotated
+It precisely tracks the types of variables as they flow through the program.
+
+At the same time, Flow is a gradual type system.
+Any parts of your program that are dynamic in nature can easily bypass the type checker
+so you can mix statically typed code with dynamic code.
+
+Flow also supports a highly expressive type language.
+Flow types can express much more fine-grained distinctions than traditional type systems.
+For example, Flow helps you catch errors involving null, unlike most type systems.
diff --git a/development/flow/flow.SlackBuild b/development/flow/flow.SlackBuild
new file mode 100644
index 0000000000..b837b36f9a
--- /dev/null
+++ b/development/flow/flow.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for flow
+
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License along
+# with this program (most likely, a file named COPYING).  If not, see
+# <https://www.gnu.org/licenses/>.
+
+PRGNAM=flow
+VERSION=${VERSION:-0.20.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -e $CWD/v$VERSION.tar.gz ]; then
+  tar xvf $CWD/v$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Need to remove this for Slackware 14.2
+sed -i "s|EXTRA_INCLUDE_PATHS=|EXTRA_INCLUDE_PATHS=/usr/include/libelf|" Makefile
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+  make
+
+mkdir -p $PKG/opt/$PRGNAM/ $PKG/usr/bin/
+mv bin/ $PKG/opt/$PRGNAM/
+(
+  cd $PKG/usr/bin
+  ln -sf /opt/$PRGNAM/bin/$PRGNAM $PRGNAM
+)
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog.md CONTRIBUTING.md LICENSE PATENTS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/flow/flow.info b/development/flow/flow.info
new file mode 100644
index 0000000000..6fdf162919
--- /dev/null
+++ b/development/flow/flow.info
@@ -0,0 +1,10 @@
+PRGNAM="flow"
+VERSION="0.20.1"
+HOMEPAGE="http://flowtype.org/"
+DOWNLOAD="https://github.com/facebook/flow/archive/v0.20.1.tar.gz"
+MD5SUM="3a5c5752a0e402c23aaa9730ea70b7be"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ocaml"
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
diff --git a/development/flow/slack-desc b/development/flow/slack-desc
new file mode 100644
index 0000000000..d3202dc0a9
--- /dev/null
+++ b/development/flow/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+flow: flow (A static type checker for JavaScript)
+flow:
+flow: Adds static typing to JavaScript to improve developer productivity
+flow: and code quality.
+flow:
+flow:
+flow:
+flow:
+flow:
+flow: http://flowtype.org/
+flow:
diff --git a/development/fossil/fossil.SlackBuild b/development/fossil/fossil.SlackBuild
index cf10205e5d..55aa338628 100644
--- a/development/fossil/fossil.SlackBuild
+++ b/development/fossil/fossil.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fossil
 
-# Copyright 2015 Andy Goth <andrew.m.goth@gmail.com>
+# Copyright 2016 Andy Goth <andrew.m.goth@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fossil
-VERSION=${VERSION:-1.33}
+VERSION=${VERSION:-1.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/fossil/fossil.info b/development/fossil/fossil.info
index 79c482a3bc..51e2fd1796 100644
--- a/development/fossil/fossil.info
+++ b/development/fossil/fossil.info
@@ -1,8 +1,8 @@
 PRGNAM="fossil"
-VERSION="1.33"
+VERSION="1.34"
 HOMEPAGE="https://www.fossil-scm.org/"
-DOWNLOAD="https://www.fossil-scm.org/download/fossil-src-1.33.tar.gz"
-MD5SUM="53f8145084a2065d6cb734980c172c7e"
+DOWNLOAD="https://www.fossil-scm.org/download/fossil-src-1.34.tar.gz"
+MD5SUM="3d5a7da5c506a47784942236a788b29b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/fsharp/fsharp.SlackBuild b/development/fsharp/fsharp.SlackBuild
index 89399e3b87..cfdd208604 100644
--- a/development/fsharp/fsharp.SlackBuild
+++ b/development/fsharp/fsharp.SlackBuild
@@ -4,9 +4,10 @@
 # Written by Steven Vch. <unstatik@staremax.com>
 
 PRGNAM=fsharp
-VERSION=${VERSION:-3.1.1.32}
+VERSION=${VERSION:-4.0.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+MONO_BIN=/usr/bin/mono
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvfz $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -50,6 +51,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+mozroots --import --machine --sync
+$MONO_BIN ./.nuget/NuGet.exe install FsCheck
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./autogen.sh \
@@ -68,7 +72,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.txt LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG-* LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/fsharp/fsharp.info b/development/fsharp/fsharp.info
index 9b84a73ff8..aa0931133d 100644
--- a/development/fsharp/fsharp.info
+++ b/development/fsharp/fsharp.info
@@ -1,8 +1,8 @@
 PRGNAM="fsharp"
-VERSION="3.1.1.32"
+VERSION="4.0.1.1"
 HOMEPAGE="https://github.com/fsharp/fsharp"
-DOWNLOAD="https://github.com/fsharp/fsharp/archive/3.1.1.32.tar.gz"
-MD5SUM="6fa9a52ffe8b6d0a26330a8d6ac8f17e"
+DOWNLOAD="https://github.com/fsharp/fsharp/archive/4.0.1.1.tar.gz"
+MD5SUM="2dd3cc2cf130615bc79ceb1b93141e2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mono"
diff --git a/development/fuel/fuel.SlackBuild b/development/fuel/fuel.SlackBuild
index 1faac25123..ca4799a844 100644
--- a/development/fuel/fuel.SlackBuild
+++ b/development/fuel/fuel.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Slackware build script for fuel.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fuel
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,7 +82,7 @@ install -D -m644 rsrc/icons/fuel.png $PKG/usr/share/icons/hicolor/256x256/apps/f
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-DOCS="doc/Changes.txt doc/License.txt"
+DOCS="doc/Building.md doc/Changes.md doc/License.txt"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
diff --git a/development/fuel/fuel.info b/development/fuel/fuel.info
index ef9020898c..347ea5aa08 100644
--- a/development/fuel/fuel.info
+++ b/development/fuel/fuel.info
@@ -1,8 +1,8 @@
 PRGNAM="fuel"
-VERSION="1.0.0"
+VERSION="1.0.1"
 HOMEPAGE="https://fuel-scm.org/fossil/home"
-DOWNLOAD="https://fuel-scm.org/files/releases/fuel-1.0.0.tar.gz"
-MD5SUM="586e998fb3eb6096dbfbbf79cf2b3125"
+DOWNLOAD="https://fuel-scm.org/files/releases/fuel-1.0.1.tar.gz"
+MD5SUM="2dc6067711d7aff02bbe1b1585e55108"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 fossil"
diff --git a/development/gauche/gauche.SlackBuild b/development/gauche/gauche.SlackBuild
index 8c790167ab..7ee41b6d9d 100644
--- a/development/gauche/gauche.SlackBuild
+++ b/development/gauche/gauche.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/development/geany-plugins/geany-plugins.SlackBuild b/development/geany-plugins/geany-plugins.SlackBuild
index 3438962e25..f985500b44 100644
--- a/development/geany-plugins/geany-plugins.SlackBuild
+++ b/development/geany-plugins/geany-plugins.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geany-plugins
-VERSION=${VERSION:-1.24}
+VERSION=${VERSION:-1.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/geany-plugins/geany-plugins.info b/development/geany-plugins/geany-plugins.info
index 3066bafbc6..d154843554 100644
--- a/development/geany-plugins/geany-plugins.info
+++ b/development/geany-plugins/geany-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="geany-plugins"
-VERSION="1.24"
+VERSION="1.25"
 HOMEPAGE="http://plugins.geany.org/"
-DOWNLOAD="http://plugins.geany.org/geany-plugins/geany-plugins-1.24.tar.bz2"
-MD5SUM="5ac59e2693bf61d4df94892aeddbd13e"
+DOWNLOAD="http://plugins.geany.org/geany-plugins/geany-plugins-1.25.tar.bz2"
+MD5SUM="91f32224ab7a1eb8d05bf6cde5743427"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geany"
diff --git a/development/geany/geany.SlackBuild b/development/geany/geany.SlackBuild
index 1fd49940d2..1c30cf6815 100644
--- a/development/geany/geany.SlackBuild
+++ b/development/geany/geany.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=geany
-VERSION=${VERSION:-1.24.1}
+VERSION=${VERSION:-1.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/geany/geany.info b/development/geany/geany.info
index c3dba3b212..0521992520 100644
--- a/development/geany/geany.info
+++ b/development/geany/geany.info
@@ -1,8 +1,8 @@
 PRGNAM="geany"
-VERSION="1.24.1"
+VERSION="1.25"
 HOMEPAGE="http://www.geany.org/"
-DOWNLOAD="http://download.geany.org/geany-1.24.1.tar.bz2"
-MD5SUM="d225104cef3973164d70116d46239606"
+DOWNLOAD="http://download.geany.org/geany-1.25.tar.bz2"
+MD5SUM="888bd82d62759ac47a4a398fb27c8471"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/gisto/gisto.SlackBuild b/development/gisto/gisto.SlackBuild
index 5eb2a1b6fd..9985f4c97e 100644
--- a/development/gisto/gisto.SlackBuild
+++ b/development/gisto/gisto.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/git-lfs/README b/development/git-lfs/README
new file mode 100644
index 0000000000..f3d756e0fc
--- /dev/null
+++ b/development/git-lfs/README
@@ -0,0 +1,3 @@
+Git LFS is a command line extension and specification for managing
+large files with Git. The client is written in Go, with pre-compiled
+binaries available for Mac, Windows, Linux, and FreeBSD.
diff --git a/development/git-lfs/git-lfs.SlackBuild b/development/git-lfs/git-lfs.SlackBuild
new file mode 100644
index 0000000000..8ee72e3884
--- /dev/null
+++ b/development/git-lfs/git-lfs.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for git-lfs
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=git-lfs
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  SRCARCH=386
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  SRCARCH=386
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  SRCARCH=amd64
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  SRCARCH=386
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-linux-$SRCARCH-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+mkdir -p $PKG/usr/bin
+install -m0755 $PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/git-lfs/git-lfs.info b/development/git-lfs/git-lfs.info
new file mode 100644
index 0000000000..40cdfba727
--- /dev/null
+++ b/development/git-lfs/git-lfs.info
@@ -0,0 +1,10 @@
+PRGNAM="git-lfs"
+VERSION="1.1.0"
+HOMEPAGE="https://git-lfs.github.com/"
+DOWNLOAD="https://github.com/github/git-lfs/releases/download/v1.1.0/git-lfs-linux-386-1.1.0.tar.gz"
+MD5SUM="29a6ec6f368e8219f59e13749eaeb9f8"
+DOWNLOAD_x86_64="https://github.com/github/git-lfs/releases/download/v1.1.0/git-lfs-linux-amd64-1.1.0.tar.gz"
+MD5SUM_x86_64="1c97830d2903522de414509c9f090400"
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/development/git-lfs/slack-desc b/development/git-lfs/slack-desc
new file mode 100644
index 0000000000..0cc77ac484
--- /dev/null
+++ b/development/git-lfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+git-lfs: git-lfs (Git extension)
+git-lfs:
+git-lfs: Git LFS is a command line extension and specification for managing
+git-lfs: large files with Git. The client is written in Go, with pre-compiled
+git-lfs: binaries available for Mac, Windows, Linux, and FreeBSD.
+git-lfs:
+git-lfs:
+git-lfs: Project URL: https://git-lfs.github.com/
+git-lfs:
+git-lfs:
+git-lfs:
diff --git a/development/gitstats/README b/development/gitstats/README
new file mode 100644
index 0000000000..e184d728be
--- /dev/null
+++ b/development/gitstats/README
@@ -0,0 +1,13 @@
+GitStats is a statistics generator for git (a distributed revision
+control system) repositories. It examines the repository and produces
+some interesting statistics from the history of it.
+
+Usage:
+gitstats <git repository path> <output path>
+
+Example:
+gitstats ~/slackbuilds ~/public_html/sbo
+
+NOTE:
+gitstats will read all history from the beginning.
+It will take some time for big projects with long commits history.
diff --git a/development/gitstats/gitstats.SlackBuild b/development/gitstats/gitstats.SlackBuild
new file mode 100644
index 0000000000..3330d020ce
--- /dev/null
+++ b/development/gitstats/gitstats.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for gitstats
+
+# Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gitstats
+VERSION=${VERSION:-20160102}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/{bin,share/gitstats}
+install -m 755 $PRGNAM $PKG/usr/bin
+install -m 644 gitstats.css sortable.js *.gif $PKG/usr/share/gitstats
+
+sed -i "s|VERSION = 0|VERSION = $VERSION|" $PKG/usr/bin/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/gitstats/gitstats.info b/development/gitstats/gitstats.info
new file mode 100644
index 0000000000..3dbfabff29
--- /dev/null
+++ b/development/gitstats/gitstats.info
@@ -0,0 +1,10 @@
+PRGNAM="gitstats"
+VERSION="20160102"
+HOMEPAGE="http://gitstats.sourceforge.net/"
+DOWNLOAD="http://kent.dl.sourceforge.net/project/slackbuildsdirectlinks/gitstats/gitstats-20160102.tar.gz"
+MD5SUM="782831f55fa2647b409ac3b4ee555ab7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/development/gitstats/slack-desc b/development/gitstats/slack-desc
new file mode 100644
index 0000000000..a4c98e5d5e
--- /dev/null
+++ b/development/gitstats/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+gitstats: gitstats (git history statistics generator)
+gitstats:
+gitstats: GitStats is a statistics generator for git (a distributed revision
+gitstats: control system) repositories. It examines the repository and produces
+gitstats: some interesting statistics from the history of it.
+gitstats:
+gitstats:
+gitstats: Project URL: http://gitstats.sourceforge.net/
+gitstats:
+gitstats:
+gitstats:
diff --git a/development/global/global.SlackBuild b/development/global/global.SlackBuild
index fa45f58175..a3ca767a77 100644
--- a/development/global/global.SlackBuild
+++ b/development/global/global.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=global
-VERSION=${VERSION:-6.2.5}
+VERSION=${VERSION:-6.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/global/global.info b/development/global/global.info
index 9caf3d9e4b..015c54599c 100644
--- a/development/global/global.info
+++ b/development/global/global.info
@@ -1,10 +1,10 @@
 PRGNAM="global"
-VERSION="6.2.5"
+VERSION="6.5.2"
 HOMEPAGE="http://www.gnu.org/software/global/"
-DOWNLOAD="http://tamacom.com/global/global-6.2.5.tar.gz"
-MD5SUM="38728f942e048a1ba22043d482caf2f2"
+DOWNLOAD="http://tamacom.com/global/global-6.5.2.tar.gz"
+MD5SUM="c154bc9ba77e7630068e2916cb9531c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
+MAINTAINER="Arkadiusz Drabczyk"
+EMAIL="arkadiusz@drabczyk.org"
diff --git a/development/gnats/README b/development/gnats/README
new file mode 100644
index 0000000000..f6e166e168
--- /dev/null
+++ b/development/gnats/README
@@ -0,0 +1,5 @@
+GNU GNATS is a set of tools for tracking bugs reported by users to a central
+site. It allows problem report management and communication with users via
+various means. GNATS stores all the information about problem reports in its
+databases and provides tools for querying, editing, and maintenance of the
+databases.
diff --git a/development/gnats/doinst.sh b/development/gnats/doinst.sh
new file mode 100644
index 0000000000..d7e52e513b
--- /dev/null
+++ b/development/gnats/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/gnats/databases.new
diff --git a/development/gnats/gnats.SlackBuild b/development/gnats/gnats.SlackBuild
new file mode 100644
index 0000000000..bd2d9b5390
--- /dev/null
+++ b/development/gnats/gnats.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for gnats
+
+# Copyright 2012, 2015  Ebben Aries, Denver, CO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gnats
+VERSION=${VERSION:-4.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/info $PKG/usr/info
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO UPGRADING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/gnats/gnats.info b/development/gnats/gnats.info
new file mode 100644
index 0000000000..8451acc1df
--- /dev/null
+++ b/development/gnats/gnats.info
@@ -0,0 +1,10 @@
+PRGNAM="gnats"
+VERSION="4.2.0"
+HOMEPAGE="https://www.gnu.org/software/gnats/"
+DOWNLOAD="http://ftp.gnu.org/pub/gnu/gnats/gnats-4.2.0.tar.gz"
+MD5SUM="b2fb3bbaea6688b8341769569f4a6e70"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="e@dscp.org"
diff --git a/development/gnats/slack-desc b/development/gnats/slack-desc
new file mode 100644
index 0000000000..a27dec9050
--- /dev/null
+++ b/development/gnats/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+gnats: gnats (set of tools for tracking bugs)
+gnats:
+gnats: GNU GNATS is a set of tools for tracking bugs reported by users to a
+gnats: central site. It allows problem report management and communication
+gnats: with users via various means. GNATS stores all the information about
+gnats: problem reports in its databases and provides tools for querying,
+gnats: editing, and maintenance of the databases.
+gnats: 
+gnats: Homepage: https://www.gnu.org/software/gnats/
+gnats:
diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild
index 6dc7aafd45..5558e4e45d 100644
--- a/development/gnuradio/gnuradio.SlackBuild
+++ b/development/gnuradio/gnuradio.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnuradio
-VERSION=${VERSION:-3.7.5.1}
+VERSION=${VERSION:-3.7.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -92,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README README.hacking $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/gnuradio/gnuradio.info b/development/gnuradio/gnuradio.info
index 8b04f2d7ec..3b44ff53dc 100644
--- a/development/gnuradio/gnuradio.info
+++ b/development/gnuradio/gnuradio.info
@@ -1,8 +1,8 @@
 PRGNAM="gnuradio"
-VERSION="3.7.5.1"
+VERSION="3.7.8.1"
 HOMEPAGE="http://gnuradio.org"
-DOWNLOAD="http://gnuradio.org/releases/gnuradio/gnuradio-3.7.5.1.tar.gz"
-MD5SUM="bfd2116b344a949aacc3d7e2eff07642"
+DOWNLOAD="http://gnuradio.org/releases/gnuradio/gnuradio-3.7.8.1.tar.gz"
+MD5SUM="961d5ba5089f409f0c9e5e5b7f6ee0f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-cheetah"
diff --git a/development/gnustep-startup/gnustep-startup.SlackBuild b/development/gnustep-startup/gnustep-startup.SlackBuild
index 3002b640fe..e8911ed42e 100644
--- a/development/gnustep-startup/gnustep-startup.SlackBuild
+++ b/development/gnustep-startup/gnustep-startup.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/google-appengine-gosdk/google-appengine-gosdk.SlackBuild b/development/google-appengine-gosdk/google-appengine-gosdk.SlackBuild
index 2474a81aa7..13f131483b 100644
--- a/development/google-appengine-gosdk/google-appengine-gosdk.SlackBuild
+++ b/development/google-appengine-gosdk/google-appengine-gosdk.SlackBuild
@@ -25,7 +25,7 @@
 # Written by Eric Schultz eric at schultzter dot ca
 
 PRGNAM=google-appengine-gosdk
-VERSION=${VERSION:-1.9.20}
+VERSION=${VERSION:-1.9.27}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/google-appengine-gosdk/google-appengine-gosdk.info b/development/google-appengine-gosdk/google-appengine-gosdk.info
index 9de3fb1df7..582fbe5204 100644
--- a/development/google-appengine-gosdk/google-appengine-gosdk.info
+++ b/development/google-appengine-gosdk/google-appengine-gosdk.info
@@ -1,10 +1,10 @@
 PRGNAM="google-appengine-gosdk"
-VERSION="1.9.20"
+VERSION="1.9.27"
 HOMEPAGE="https://cloud.google.com/appengine/docs"
-DOWNLOAD="https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_386-1.9.20.zip"
-MD5SUM="9c095248dc209efd28a363645272b2d3"
-DOWNLOAD_x86_64="https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-1.9.20.zip"
-MD5SUM_x86_64="7dd6bdf2a6a0e72f41c2ac5058a41c83"
+DOWNLOAD="https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_386-1.9.27.zip"
+MD5SUM="3b99f5e77f037702a6f84b7499b40500"
+DOWNLOAD_x86_64="https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-1.9.27.zip"
+MD5SUM_x86_64="302c712f403f2e00b7d6ff2d6ed6b2cf"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/development/google-appengine-pysdk/google-appengine-pysdk.SlackBuild b/development/google-appengine-pysdk/google-appengine-pysdk.SlackBuild
index 3961f9a56d..117469dbc1 100644
--- a/development/google-appengine-pysdk/google-appengine-pysdk.SlackBuild
+++ b/development/google-appengine-pysdk/google-appengine-pysdk.SlackBuild
@@ -25,7 +25,7 @@
 # Written by Eric Schultz eric at schultzter dot ca
 
 PRGNAM=google-appengine-pysdk
-VERSION=${VERSION:-1.9.20}
+VERSION=${VERSION:-1.9.27}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/google-appengine-pysdk/google-appengine-pysdk.info b/development/google-appengine-pysdk/google-appengine-pysdk.info
index 8262d284eb..1275036927 100644
--- a/development/google-appengine-pysdk/google-appengine-pysdk.info
+++ b/development/google-appengine-pysdk/google-appengine-pysdk.info
@@ -1,8 +1,8 @@
 PRGNAM="google-appengine-pysdk"
-VERSION="1.9.20"
+VERSION="1.9.27"
 HOMEPAGE="https://cloud.google.com/appengine/"
-DOWNLOAD="https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.20.zip"
-MD5SUM="73330eb2cfe720a15c9005df74e75686"
+DOWNLOAD="https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.27.zip"
+MD5SUM="9f32e5485d5254d5dc36c0f3bf16bd95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/google-go-lang/README b/development/google-go-lang/README
index ecb6d7aa20..2675ac5166 100644
--- a/development/google-go-lang/README
+++ b/development/google-go-lang/README
@@ -46,6 +46,5 @@ As of go1.2, the 'go doc ...' command has been relocated to the go.tools
 library (golang-googlecode-gotools), which provide `godoc`.
 
 
-Testing is a default part of the standard build. If you elect to not run the
-test during the build of this package, provide the environment variable
-RUN_TEST=false at build time.
+To elect to run the buildtime tests of this package, provide the environment
+variable RUN_TEST=true at build time.
diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild
index 82457ae89d..1694323508 100644
--- a/development/google-go-lang/google-go-lang.SlackBuild
+++ b/development/google-go-lang/google-go-lang.SlackBuild
@@ -27,13 +27,13 @@
 # SOFTWARE.
 
 PRGNAM=google-go-lang
-VERSION=${VERSION:-1.4.2}
+VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 RELEASE=${RELEASE:-linux}
 
-RUN_TEST=${RUN_TEST:-true}
+RUN_TEST=${RUN_TEST:-false}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info
index 10f51b8163..33c77472af 100644
--- a/development/google-go-lang/google-go-lang.info
+++ b/development/google-go-lang/google-go-lang.info
@@ -1,8 +1,8 @@
 PRGNAM="google-go-lang"
-VERSION="1.4.2"
+VERSION="1.4.3"
 HOMEPAGE="http://golang.org"
-DOWNLOAD="https://storage.googleapis.com/golang/go1.4.2.src.tar.gz"
-MD5SUM="907f85c8fa765d31f7f955836fec4049"
+DOWNLOAD="https://storage.googleapis.com/golang/go1.4.3.src.tar.gz"
+MD5SUM="dfb604511115dd402a77a553a5923a04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/google-webdesigner/google-webdesigner.SlackBuild b/development/google-webdesigner/google-webdesigner.SlackBuild
index 5c7f7040c1..2259201c60 100644
--- a/development/google-webdesigner/google-webdesigner.SlackBuild
+++ b/development/google-webdesigner/google-webdesigner.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for google-webdesigner
 
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=google-webdesigner
-VERSION=${VERSION:-1.1.3.1119}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.1.7.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,7 @@ rm -rf $PKG/usr/share/doc
 rm -rf $PKG/etc
 
 chmod 644 $PKG/usr/share/applications/$PRGNAM.desktop
+chmod 4755 $PKG/opt/google/webdesigner/chrome-sandbox
 
 mkdir -p $PKG/usr/share/pixmaps
 cp $PKG/opt/google/webdesigner/resources/product_logo_128.png $PKG/usr/share/pixmaps/$PRGNAM.png
diff --git a/development/google-webdesigner/google-webdesigner.info b/development/google-webdesigner/google-webdesigner.info
index a7428b48d2..590776a60d 100644
--- a/development/google-webdesigner/google-webdesigner.info
+++ b/development/google-webdesigner/google-webdesigner.info
@@ -1,10 +1,10 @@
 PRGNAM="google-webdesigner"
-VERSION="1.1.3.1119"
+VERSION="1.1.7.0"
 HOMEPAGE="https://www.google.com/webdesigner/"
 DOWNLOAD="https://dl.google.com/linux/direct/google-webdesigner_current_i386.deb"
-MD5SUM="a13898e5285d663db8d334590d5c7e87"
+MD5SUM="3fcfe673c41c07c0826596369b5daf89"
 DOWNLOAD_x86_64="https://dl.google.com/linux/direct/google-webdesigner_current_amd64.deb"
-MD5SUM_x86_64="345a52e808e8df2cc4bf3b6759051637"
+MD5SUM_x86_64="cc439889f3cc0cf47a85faf2e523832e"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/development/gpsim/gpsim.info b/development/gpsim/gpsim.info
index 81a6566f31..f6d3515e6a 100644
--- a/development/gpsim/gpsim.info
+++ b/development/gpsim/gpsim.info
@@ -1,10 +1,10 @@
 PRGNAM="gpsim"
-VERSION="0.27"
+VERSION="0.27.0"
 HOMEPAGE="http://gpsim.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/project/gpsim/gpsim/0.27.0/gpsim-0.27.0.tar.gz \
 	  http://gpsim.sourceforge.net/gpsim.pdf"
 MD5SUM="b3ded17f1c8c6134f2381d6e6925b231 \
-	f228aee3a7aeba7d7f07f07a6d166110"
+	26b315bb99bb8989c4d77f7121aaea69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkextra gputils"
diff --git a/development/groovy/groovy.SlackBuild b/development/groovy/groovy.SlackBuild
index 10c9126b0c..57169a4874 100644
--- a/development/groovy/groovy.SlackBuild
+++ b/development/groovy/groovy.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/guile-json/README b/development/guile-json/README
new file mode 100644
index 0000000000..a0d2a77bbf
--- /dev/null
+++ b/development/guile-json/README
@@ -0,0 +1,11 @@
+Guile-json is a JSON module for Guile. It supports parsing and
+building JSON documents according to the http://json.org
+specification. These are the main features:
+
+- Strictly complies to http://json.org specification.
+
+- Build JSON documents programmatically via macros.
+
+- Basic unicode support for strings.
+
+- Allows JSON pretty printing.
diff --git a/development/guile-json/guile-json.SlackBuild b/development/guile-json/guile-json.SlackBuild
new file mode 100644
index 0000000000..d5f39b2040
--- /dev/null
+++ b/development/guile-json/guile-json.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for guile-json
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guile-json
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/guile-json/guile-json.info b/development/guile-json/guile-json.info
new file mode 100644
index 0000000000..5b47f0b168
--- /dev/null
+++ b/development/guile-json/guile-json.info
@@ -0,0 +1,10 @@
+PRGNAM="guile-json"
+VERSION="0.4.0"
+HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
+DOWNLOAD="http://download.savannah.gnu.org/releases-redirect/guile-json/guile-json-0.4.0.tar.gz"
+MD5SUM="57eeb7901354fbab9795671fdace1618"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/development/guile-json/slack-desc b/development/guile-json/slack-desc
new file mode 100644
index 0000000000..55977ab100
--- /dev/null
+++ b/development/guile-json/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+guile-json: guile-json (JSON module for Guile)
+guile-json:
+guile-json: Guile-json is a JSON module for Guile. It supports parsing and
+guile-json: building JSON documents according to the http://json.org
+guile-json: specification.
+guile-json:
+guile-json: Homepage: https://savannah.nongnu.org/projects/guile-json/
+guile-json:
+guile-json:
+guile-json:
+guile-json:
diff --git a/development/hexedit/hexedit.SlackBuild b/development/hexedit/hexedit.SlackBuild
index 3dafe23de8..1f62358c25 100644
--- a/development/hexedit/hexedit.SlackBuild
+++ b/development/hexedit/hexedit.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/hhvm-pgsql/README b/development/hhvm-pgsql/README
new file mode 100644
index 0000000000..54ceea89b1
--- /dev/null
+++ b/development/hhvm-pgsql/README
@@ -0,0 +1,8 @@
+This is an implementation of the pgsql and pdo_pgsql PHP extensions for HHVM.
+
+Once you've installed hhvm-pgsql, create the following lines in
+/etc/hhvm/php.ini (create one if it doesn't exist):
+	extension_dir = /usr/lib64/hhvm/extensions
+	hhvm.extensions[pgsql] = pgsql.so
+
+Restart the HipHop virtual machine.
diff --git a/development/hhvm-pgsql/hhvm-pgsql.SlackBuild b/development/hhvm-pgsql/hhvm-pgsql.SlackBuild
new file mode 100644
index 0000000000..b414012515
--- /dev/null
+++ b/development/hhvm-pgsql/hhvm-pgsql.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for hhvm-pgsql
+
+# Copyright 2015 Eugene Wissner, Dachau, Germany
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hhvm-pgsql
+VERSION=${VERSION:-3.11.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+    echo "$ARCH is not supported."
+    exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -e $CWD/$VERSION.tar.gz ]; then
+  tar xvf $CWD/$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
+
+hphpize
+cmake .
+make
+
+strip --strip-unneeded pgsql.so
+
+mkdir -p $PKG/usr/lib64/hhvm/extensions
+install -m 755 -o root -g root pgsql.so $PKG/usr/lib64/hhvm/extensions
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.PHP README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/hhvm-pgsql/hhvm-pgsql.info b/development/hhvm-pgsql/hhvm-pgsql.info
new file mode 100644
index 0000000000..59a60735dd
--- /dev/null
+++ b/development/hhvm-pgsql/hhvm-pgsql.info
@@ -0,0 +1,10 @@
+PRGNAM="hhvm-pgsql"
+VERSION="3.11.0"
+HOMEPAGE="https://github.com/PocketRent/hhvm-pgsql"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/PocketRent/hhvm-pgsql/archive/3.11.0.tar.gz"
+MD5SUM_x86_64="5bc0b3f9ca4a471996b31b0299226957"
+REQUIRES="hhvm postgresql"
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/hhvm-pgsql/slack-desc b/development/hhvm-pgsql/slack-desc
new file mode 100644
index 0000000000..975f6e64b3
--- /dev/null
+++ b/development/hhvm-pgsql/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+hhvm-pgsql: hhvm-pgsql (Postgres Extension for HipHop)
+hhvm-pgsql:
+hhvm-pgsql: HHVM uses a just-in-time (JIT) compilation approach to achieve
+hhvm-pgsql: superior performance while maintaining the development flexibility
+hhvm-pgsql: that PHP provides.
+hhvm-pgsql:
+hhvm-pgsql: This is an implementation of the pgsql and pdo_pgsql PHP extensions
+hhvm-pgsql: for HHVM.
+hhvm-pgsql:
+hhvm-pgsql: Homepage: https://github.com/PocketRent/hhvm-pgsql
+hhvm-pgsql:
diff --git a/development/hhvm/README b/development/hhvm/README
new file mode 100644
index 0000000000..4d72d13f81
--- /dev/null
+++ b/development/hhvm/README
@@ -0,0 +1,48 @@
+HHVM is an open-source virtual machine designed for executing
+programs written in Hack and PHP. HHVM uses a just-in-time (JIT)
+compilation approach to achieve superior performance while maintaining
+the development flexibility that PHP provides.
+
+Hack is a programming language for HHVM. Hack reconciles the fast
+development cycle of a dynamically typed language with the discipline
+provided by static typing, while adding many features commonly found
+in other modern programming languages.
+
+Please note that HHVM is unsupported on 32-bit OSes and there are no
+current plans to ever add support.
+
+In order to start HHVM at boot and stop it properly at shutdown, 
+make sure rc.hhvm is executable and add the following lines to 
+the following files:
+
+	/etc/rc.d/rc.local
+	==================
+	# Startup HHVM
+	if [ -x /etc/rc.d/rc.hhvm ]; then
+		/etc/rc.d/rc.hhvm start
+	fi
+
+	/etc/rc.d/rc.local_shutdown
+	===========================
+	# Stop HHVM
+	if [ -x /etc/rc.d/rc.hhvm ]; then
+		/etc/rc.d/rc.hhvm stop
+	fi
+
+Default HHVM configuration uses Unix sockets. If you don't use Apache make sure that your
+web server has write access to the socket file. You can create a new group and add
+your web server user to this group or just use the main group of your web server and
+start HHVM as following:
+	hhvm_GROUP=apache /etc/rc.d/rc.hhvm start
+
+FastCGI must be configured to communicate with HHVM.
+A good start point is: https://github.com/facebook/hhvm/wiki/FastCGI
+
+To start a project you have to configure the type checker as well.
+See the official documentation: http://docs.hhvm.com/manual/en/install.hack.bootstrapping.php
+Basically you create an empty .hhconfig file in the root directory of your project:
+	touch .hhconfig
+and run:
+	hh_client
+
+Happy Hacking!
diff --git a/development/hhvm/doinst.sh b/development/hhvm/doinst.sh
new file mode 100644
index 0000000000..6979f0cdcf
--- /dev/null
+++ b/development/hhvm/doinst.sh
@@ -0,0 +1,20 @@
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+# Keep same perms on rc.hhvm.new:
+if [ -e etc/rc.d/rc.hhvm ]; then
+  cp -a etc/rc.d/rc.hhvm etc/rc.d/rc.hhvm.new.incoming
+  cat etc/rc.d/rc.hhvm.new > etc/rc.d/rc.hhvm.new.incoming
+  mv etc/rc.d/rc.hhvm.new.incoming etc/rc.d/rc.hhvm.new
+fi
+config etc/rc.d/rc.hhvm.new
+config etc/hhvm/server.ini.new
+config etc/hhvm/php.ini.new
diff --git a/development/hhvm/etc/php.ini b/development/hhvm/etc/php.ini
new file mode 100644
index 0000000000..5004b9fb11
--- /dev/null
+++ b/development/hhvm/etc/php.ini
@@ -0,0 +1 @@
+extension_dir = /usr/lib64/hhvm/extensions
diff --git a/development/hhvm/etc/rc.hhvm b/development/hhvm/etc/rc.hhvm
new file mode 100644
index 0000000000..1e184ae39c
--- /dev/null
+++ b/development/hhvm/etc/rc.hhvm
@@ -0,0 +1,160 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          hhvm
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       Starts The HHVM FastCGI Daemon
+### END INIT INFO
+
+DAEMON=/usr/bin/hhvm
+PIDFILE=/var/run/hhvm/pid
+hhvm_SOCKET=/var/run/hhvm/sock
+hhvm_GROUP=${hhvm_GROUP:-apache}
+CONFIG_FILE="/etc/hhvm/server.ini"
+SYSTEM_CONFIG_FILE="/etc/hhvm/php.ini"
+
+DAEMON_ARGS="--config ${SYSTEM_CONFIG_FILE} \
+	--config ${CONFIG_FILE} \
+	-vPidFile=${PIDFILE}"
+
+do_stop () {
+	try=0
+
+	if [ ! -r $2 ]; then
+		echo "warning, no pid file found - HHVM is not running?"
+		exit 1
+	fi
+
+	PID=`cat $2`
+	kill $1 $PID
+
+	# Waiting for HHVM to shutdown
+	while test $try -lt 35
+	do
+		if ps -p $PID | grep -q $PID
+		then
+			echo -n .
+			try=`expr $try + 1`
+			sleep 1
+		else
+			try=''
+			break
+		fi
+	done
+
+	if [ -n "$try" ]
+	then
+		echo " failed. Use force-quit"
+		exit 1
+	else
+		rm -f $2
+		echo " done"
+	fi
+}
+
+wait_for_pid () {
+	try=0
+
+	while test $try -lt 35
+	do
+		if [ -f "$1" ] ; then
+			try=''
+			break
+		fi
+
+		echo -n .
+		try=`expr $try + 1`
+		sleep 1
+	done
+
+}
+
+case "$1" in
+	start)
+		echo -n "Starting HHVM "
+
+		if [ -r $PIDFILE ]; then
+			echo "warning, pid file found - HHVM is already running?"
+			exit 1
+		fi
+
+		echo
+		$DAEMON --mode daemon $DAEMON_ARGS
+		if [ "$?" != 0 ]
+		then
+			echo "Failed"
+			exit 1
+		fi
+
+		wait_for_pid $PIDFILE
+
+		if [ -n "$try" ] ; then
+			echo " failed"
+			exit 1
+		fi
+
+		# Set the socket permissions if HHVM uses UDS
+		if [ -S "$hhvm_SOCKET" ]
+		then
+			chgrp $hhvm_GROUP $hhvm_SOCKET
+		fi
+
+		echo " done"
+	;;
+
+	stop)
+		echo -n "Stopping HHVM "
+
+		do_stop -QUIT $PIDFILE
+	;;
+
+	force-quit)
+		echo -n "Terminating HHVM "
+
+		do_stop -TERM $PIDFILE
+	;;
+
+	status)
+		if [ ! -r $PIDFILE ]
+		then
+			echo "HHVM is stopped"
+			exit 0
+		fi
+
+		PID=`cat $PIDFILE`
+		if ps -p $PID | grep -q $PID
+		then
+			echo "HHVM (pid $PID) is running..."
+		else
+			echo "HHVM dead but pid file exists"
+		fi
+	;;
+
+	restart)
+		sh $0 stop
+		sh $0 start
+	;;
+
+	reload)
+		echo -n "Reload service HHVM "
+
+		if [ ! -r $PIDFILE ]
+		then
+			echo "warning, no pid file found - HHVM is not running?"
+			exit 1
+		fi
+
+		kill -USR2 `cat $PIDFILE`
+
+		echo " done"
+	;;
+
+	*)
+        echo "Usage: $0 {start|stop|status|restart|reload|force-quit}" >&2
+        exit 1
+	;;
+
+esac
diff --git a/development/hhvm/etc/server.ini b/development/hhvm/etc/server.ini
new file mode 100644
index 0000000000..18f4643f3a
--- /dev/null
+++ b/development/hhvm/etc/server.ini
@@ -0,0 +1,9 @@
+pid = /var/run/hhvm/pid
+
+hhvm.server.file_socket = /var/run/hhvm/sock
+;hhvm.server.port = 9000
+hhvm.server.type = fastcgi
+hhvm.server.default_document = index.hh
+hhvm.log.use_log_file = true
+hhvm.log.file = /var/log/hhvm/error.log
+hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
diff --git a/development/hhvm/hhvm.SlackBuild b/development/hhvm/hhvm.SlackBuild
new file mode 100644
index 0000000000..62b11c7671
--- /dev/null
+++ b/development/hhvm/hhvm.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for HHVM
+
+# Copyright 2015 Eugene Wissner, Dachau, Germany
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hhvm
+VERSION=${VERSION:-3.11.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+CMAKE3=cmake-3.2.3-Linux-x86_64
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar Jxvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+tar zxvf $CWD/$CMAKE3.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+#export CMAKE_PREFIX_PATH=`pwd`/..
+./$CMAKE3/bin/cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lreadline -lncurses" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -I/usr/kerberos/include" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+    -DENABLE_MCROUTER=true \
+    -DCMAKE_BUILD_TYPE=Release .
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress man pages
+mkdir -p $PKG/usr/man
+mv hphp/doc/man $PKG/usr/man/man1
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+mkdir -p $PKG/etc/{rc.d,hhvm} $PKG/usr/lib64/hhvm/extensions
+install -m 644 $CWD/etc/rc.hhvm $PKG/etc/rc.d/rc.hhvm.new
+install -m 644 $CWD/etc/server.ini $PKG/etc/hhvm/server.ini.new
+install -m 644 $CWD/etc/php.ini $PKG/etc/hhvm/php.ini.new
+
+# PID
+mkdir -p $PKG/var/run/hhvm
+
+# Copy program documentation into the package
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a hphp/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/hhvm/hhvm.info b/development/hhvm/hhvm.info
new file mode 100644
index 0000000000..d18c405fef
--- /dev/null
+++ b/development/hhvm/hhvm.info
@@ -0,0 +1,12 @@
+PRGNAM="hhvm"
+VERSION="3.11.0"
+HOMEPAGE="http://hhvm.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://download.dlackware.com/hosted-sources/hhvm/hhvm-3.11.0.tar.xz \
+                https://cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz"
+MD5SUM_x86_64="2649df637c21684778c409ec04b06750 \
+              82eb3cbcf74ffc5f68e8bb6f1e20271e"
+REQUIRES="tbb glog ocaml dwarf oniguruma libmemcached jemalloc krb5"
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/hhvm/slack-desc b/development/hhvm/slack-desc
new file mode 100644
index 0000000000..d6b0c7100c
--- /dev/null
+++ b/development/hhvm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+hhvm: hhvm (a virtual machine designed for executing Hack and PHP)
+hhvm:
+hhvm: HHVM uses a just-in-time (JIT) compilation approach to achieve
+hhvm: superior performance while maintaining the development flexibility
+hhvm: that PHP provides.
+hhvm:
+hhvm: Hack is a programming language for HHVM.
+hhvm:
+hhvm:
+hhvm: Homepage: http://hhvm.com/
+hhvm:
diff --git a/development/hub/hub.SlackBuild b/development/hub/hub.SlackBuild
index f6f130783c..ef5f35346a 100644
--- a/development/hub/hub.SlackBuild
+++ b/development/hub/hub.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hub
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/hub/hub.info b/development/hub/hub.info
index 3eff293bc4..e9dddf8875 100644
--- a/development/hub/hub.info
+++ b/development/hub/hub.info
@@ -1,8 +1,8 @@
 PRGNAM="hub"
-VERSION="2.2.1"
+VERSION="2.2.2"
 HOMEPAGE="https://github.com/github/hub"
-DOWNLOAD="https://github.com/github/hub/archive/v2.2.1.tar.gz"
-MD5SUM="889a31ee9d10ae9cb333480d8dbe881f"
+DOWNLOAD="https://github.com/github/hub/archive/v2.2.2.tar.gz"
+MD5SUM="7edc8f5b5d3c7c392ee191dd999596fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/development/idea/idea.info b/development/idea/idea.info
index d4071b925c..ac64418e04 100644
--- a/development/idea/idea.info
+++ b/development/idea/idea.info
@@ -1,7 +1,7 @@
 PRGNAM="idea"
 VERSION="13.1.3"
 HOMEPAGE="http://www.jetbrains.com/idea/"
-DOWNLOAD="http://download.jetbrains.com/idea/ideaIC-13.1.3.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/slackbuildsdirectlinks/idea/ideaIC-13.1.3.tar.gz"
 MD5SUM="f71c624bf4e98269d883e8ea8dd48145"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/ign-math2/README b/development/ign-math2/README
new file mode 100644
index 0000000000..8027c54c83
--- /dev/null
+++ b/development/ign-math2/README
@@ -0,0 +1,5 @@
+ign-math (A small, fast, and high performance math library)
+
+A small, fast, and high performance math library.
+This library is a self-contained set of classes and functions suitable
+for robot applications.
diff --git a/development/ign-math2/ign-math2.SlackBuild b/development/ign-math2/ign-math2.SlackBuild
new file mode 100644
index 0000000000..5dd0e25e8d
--- /dev/null
+++ b/development/ign-math2/ign-math2.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for ign-math2
+
+# Copyright 2015 Jean-Yves Didier Evry, France
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PRGNAM=ign-math2
+VERSION=${VERSION:-2.2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP/
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM.tar.bz2 --strip 1
+#cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING LICENSE NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/development/ign-math2/ign-math2.info b/development/ign-math2/ign-math2.info
new file mode 100644
index 0000000000..14d055a841
--- /dev/null
+++ b/development/ign-math2/ign-math2.info
@@ -0,0 +1,10 @@
+PRGNAM="ign-math2"
+VERSION="2.2.3"
+HOMEPAGE="http://ignitionrobotics.org/libraries/math"
+DOWNLOAD="https://bitbucket.org/ignitionrobotics/ign-math/get/ign-math2.tar.bz2"
+MD5SUM="b792edf4a05d61cc80c0bae7a26f129f"
+DOWNLOAD_x86_64="UNTESTED"
+MD5SUM_x86_64="UNTESTED"
+REQUIRES=""
+MAINTAINER="Jean-Yves Didier"
+EMAIL="jydidier@free.fr"
diff --git a/development/ign-math2/slack-desc b/development/ign-math2/slack-desc
new file mode 100644
index 0000000000..efa0d01fca
--- /dev/null
+++ b/development/ign-math2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+ign-math2: ign-math2 (A small, fast, and high performance math library)
+ign-math2:
+ign-math2: A small, fast, and high performance math library.
+ign-math2: This library is a self-contained set of classes and functions suitable
+ign-math2: for robot applications.
+ign-math2:
+ign-math2:
+ign-math2:
+ign-math2:
+ign-math2:
+ign-math2:
diff --git a/development/ignition-math/README b/development/ignition-math/README
new file mode 100644
index 0000000000..8027c54c83
--- /dev/null
+++ b/development/ignition-math/README
@@ -0,0 +1,5 @@
+ign-math (A small, fast, and high performance math library)
+
+A small, fast, and high performance math library.
+This library is a self-contained set of classes and functions suitable
+for robot applications.
diff --git a/development/ignition-math/ignition-math.SlackBuild b/development/ignition-math/ignition-math.SlackBuild
new file mode 100644
index 0000000000..c21f3b0e41
--- /dev/null
+++ b/development/ignition-math/ignition-math.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for ignition-math
+
+# Copyright 2015 Jean-Yves Didier Evry, France
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ignition-math
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING LICENSE NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/development/ignition-math/ignition-math.info b/development/ignition-math/ignition-math.info
new file mode 100644
index 0000000000..23a9a85d08
--- /dev/null
+++ b/development/ignition-math/ignition-math.info
@@ -0,0 +1,10 @@
+PRGNAM="ignition-math"
+VERSION="1.0.0"
+HOMEPAGE="http://ignitionrobotics.org/libraries/math"
+DOWNLOAD="http://gazebosim.org/distributions/ign-math/releases/ignition-math-1.0.0.tar.bz2"
+MD5SUM="82c5da4beb724ebb2a6553eb3a8c7bcb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jean-Yves Didier"
+EMAIL="jydidier@free.fr"
diff --git a/development/ignition-math/slack-desc b/development/ignition-math/slack-desc
new file mode 100644
index 0000000000..3720135f67
--- /dev/null
+++ b/development/ignition-math/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+ignition-math: ignition-math (small, fast, and high performance math library)
+ignition-math:
+ignition-math: A small, fast, and high performance math library.
+ignition-math: This library is a self-contained set of classes and functions suitable
+ignition-math: for robot applications.
+ignition-math:
+ignition-math:
+ignition-math:
+ignition-math:
+ignition-math:
+ignition-math:
diff --git a/libraries/ioncube-loader/README b/development/ioncube-loader/README
index 2f45a0f764..2f45a0f764 100644
--- a/libraries/ioncube-loader/README
+++ b/development/ioncube-loader/README
diff --git a/libraries/ioncube-loader/doinst.sh b/development/ioncube-loader/doinst.sh
index 7dd6884f39..7dd6884f39 100644
--- a/libraries/ioncube-loader/doinst.sh
+++ b/development/ioncube-loader/doinst.sh
diff --git a/development/ioncube-loader/ioncube-loader.SlackBuild b/development/ioncube-loader/ioncube-loader.SlackBuild
new file mode 100644
index 0000000000..8ee5230a95
--- /dev/null
+++ b/development/ioncube-loader/ioncube-loader.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for "ioncube-loader".
+
+# Copyright 2015 Eugene Wissner <belka.ew@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ioncube-loader
+SRCNAM=ioncube
+VERSION=${VERSION:-5.0.18}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  TARGET="x86"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  TARGET="x86"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  TARGET="x86-64"
+  LIBDIRSUFFIX="64"
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$SRCNAM
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/ioncube_loaders_lin_$TARGET.tar.bz2
+cd $SRCNAM
+chown -R root:root .
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions
+install -m 0755 ioncube_loader_lin_5.4_ts.so $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions
+mkdir -p $PKG/etc/php
+cat $CWD/ioncube${LIBDIRSUFFIX}.ini > $PKG/etc/php/20ioncube.ini.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.txt USER-GUIDE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/ioncube-loader/ioncube-loader.info b/development/ioncube-loader/ioncube-loader.info
new file mode 100644
index 0000000000..4f03f8a0eb
--- /dev/null
+++ b/development/ioncube-loader/ioncube-loader.info
@@ -0,0 +1,10 @@
+PRGNAM="ioncube-loader"
+VERSION="5.0.18"
+HOMEPAGE="https://www.ioncube.com"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/d/6/d6c19034730b5f4eb35b4f94e01cb93f/ioncube_loaders_lin_x86.tar.bz2"
+MD5SUM="d6c19034730b5f4eb35b4f94e01cb93f"
+DOWNLOAD_x86_64="http://attic-distfiles.pld-linux.org/distfiles/by-md5/2/0/20329d3b324039892215e84c2ea6b0bc/ioncube_loaders_lin_x86-64.tar.bz2"
+MD5SUM_x86_64="20329d3b324039892215e84c2ea6b0bc"
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka.ew@gmail.com"
diff --git a/libraries/ioncube-loader/ioncube.ini b/development/ioncube-loader/ioncube.ini
index 01e6f7a5bb..01e6f7a5bb 100644
--- a/libraries/ioncube-loader/ioncube.ini
+++ b/development/ioncube-loader/ioncube.ini
diff --git a/libraries/ioncube-loader/ioncube64.ini b/development/ioncube-loader/ioncube64.ini
index 17df3dd767..17df3dd767 100644
--- a/libraries/ioncube-loader/ioncube64.ini
+++ b/development/ioncube-loader/ioncube64.ini
diff --git a/libraries/ioncube-loader/slack-desc b/development/ioncube-loader/slack-desc
index 60a98f9f1f..60a98f9f1f 100644
--- a/libraries/ioncube-loader/slack-desc
+++ b/development/ioncube-loader/slack-desc
diff --git a/development/jam/jam.info b/development/jam/jam.info
index 223a38625f..1abbbd1f25 100644
--- a/development/jam/jam.info
+++ b/development/jam/jam.info
@@ -1,7 +1,7 @@
 PRGNAM="jam"
 VERSION="2.5"
 HOMEPAGE="http://public.perforce.com/public/jam/index.html"
-DOWNLOAD="ftp://ftp.perforce.com/jam/jam-2.5.zip"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/jam/jam-2.5.zip/f92caadb62fe4cb0b152eff508c9d450/jam-2.5.zip"
 MD5SUM="f92caadb62fe4cb0b152eff508c9d450"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/development/jdk/jdk.SlackBuild b/development/jdk/jdk.SlackBuild
index 10f937dfc2..0c9968204f 100644
--- a/development/jdk/jdk.SlackBuild
+++ b/development/jdk/jdk.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jdk
-VERSION=${VERSION:-8u51}
+VERSION=${VERSION:-8u66}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/jdk/jdk.info b/development/jdk/jdk.info
index a5e793238c..f6fb424da4 100644
--- a/development/jdk/jdk.info
+++ b/development/jdk/jdk.info
@@ -1,10 +1,10 @@
 PRGNAM="jdk"
-VERSION="8u51"
+VERSION="8u66"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
-DOWNLOAD="https://download.oracle.com/otn-pub/java/jdk/8u51-b16/jdk-8u51-linux-i586.tar.gz"
-MD5SUM="742b9151d9190a9ae7d8ed05c7d39850"
-DOWNLOAD_x86_64="https://download.oracle.com/otn-pub/java/jdk/8u51-b16/jdk-8u51-linux-x64.tar.gz"
-MD5SUM_x86_64="b34ff02c5d98b6f372288c17e96c51cf"
+DOWNLOAD="https://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-i586.tar.gz"
+MD5SUM="8a1f36b29152856a5dd2c3953a4c24a1"
+DOWNLOAD_x86_64="https://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz"
+MD5SUM_x86_64="88f31f3d642c3287134297b8c10e61bf"
 REQUIRES=""
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
diff --git a/development/jeex/jeex.SlackBuild b/development/jeex/jeex.SlackBuild
index 26b3fd9d08..7e236a8ce1 100644
--- a/development/jeex/jeex.SlackBuild
+++ b/development/jeex/jeex.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/jsmin/README b/development/jsmin/README
new file mode 100644
index 0000000000..0fb3858bb2
--- /dev/null
+++ b/development/jsmin/README
@@ -0,0 +1,6 @@
+JSMin, The JavaScript Minifier
+
+JSMin is a filter that removes comments and unnecessary whitespace from
+JavaScript files. It typically reduces filesize by half, resulting in faster
+downloads. It also encourages a more expressive programming style because it
+eliminates the download cost of clean, literate self-documentation.
diff --git a/development/jsmin/jsmin.SlackBuild b/development/jsmin/jsmin.SlackBuild
new file mode 100644
index 0000000000..3f4fcef980
--- /dev/null
+++ b/development/jsmin/jsmin.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Slackware build script for jsmin
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License along
+# with this program (most likely, a file named COPYING).  If not, see
+# <https://www.gnu.org/licenses/>.
+
+PRGNAM=jsmin
+SRCNAM=JSMin
+VERSION=${VERSION:-20130329}
+SRCVERSION=${SRCVERSION:-1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$SRCVERSION
+tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz || tar xvf $CWD/$SRCVERSION.tar.gz
+cd $SRCNAM-$SRCVERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin/
+gcc $PRGNAM.c -o $PKG/usr/bin/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/jsmin/jsmin.info b/development/jsmin/jsmin.info
new file mode 100644
index 0000000000..0061ca1bfb
--- /dev/null
+++ b/development/jsmin/jsmin.info
@@ -0,0 +1,10 @@
+PRGNAM="jsmin"
+VERSION="20130329"
+HOMEPAGE="http://www.crockford.com/javascript/jsmin.html"
+DOWNLOAD="https://github.com/douglascrockford/JSMin/archive/1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b.tar.gz"
+MD5SUM="b7036954ad6fc5662052fd77eebcb323"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
diff --git a/development/jsmin/slack-desc b/development/jsmin/slack-desc
new file mode 100644
index 0000000000..5b3234497b
--- /dev/null
+++ b/development/jsmin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+jsmin: jsmin (The JavaScript Minifier)
+jsmin:
+jsmin: JSMin is a filter which removes comments and unnecessary whitespace
+jsmin: from JavaScript files. It typically reduces filesize by half,
+jsmin: resulting in faster downloads. It also encourages a more expressive
+jsmin: programming style because it eliminates the download cost of clean,
+jsmin: literate self-documentation.
+jsmin:
+jsmin:
+jsmin: http://www.crockford.com/javascript/jsmin.html
+jsmin:
diff --git a/development/kaaedit/kaaedit.SlackBuild b/development/kaaedit/kaaedit.SlackBuild
index 8ca2a835bb..dd183677f0 100644
--- a/development/kaaedit/kaaedit.SlackBuild
+++ b/development/kaaedit/kaaedit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kaaedit
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kaaedit
-VERSION=${VERSION:-0.43.0}
+VERSION=${VERSION:-0.48.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/kaaedit/kaaedit.info b/development/kaaedit/kaaedit.info
index df627d6f6e..718f478cb1 100644
--- a/development/kaaedit/kaaedit.info
+++ b/development/kaaedit/kaaedit.info
@@ -1,8 +1,8 @@
 PRGNAM="kaaedit"
-VERSION="0.43.0"
+VERSION="0.48.0"
 HOMEPAGE="https://github.com/kaaedit/kaa"
-DOWNLOAD="https://pypi.python.org/packages/source/k/kaaedit/kaaedit-0.43.0.tar.gz"
-MD5SUM="f41532251342fdc854c27253b972114e"
+DOWNLOAD="https://pypi.python.org/packages/source/k/kaaedit/kaaedit-0.48.0.tar.gz"
+MD5SUM="d4e28f77137714821c32717c77a1a96f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 curses_ex pyjf3 setproctitle kaadbg"
diff --git a/development/kconfig-frontends/README b/development/kconfig-frontends/README
new file mode 100644
index 0000000000..68d2e2bcca
--- /dev/null
+++ b/development/kconfig-frontends/README
@@ -0,0 +1,12 @@
+kconfig-frontends project aims at centralising the effort of keeping an
+up-to-date, out of the Linux source tree, packaging of the kconfig
+infrastructure, ready for use by third party projects.
+
+The configuration language used by the Linux kernel, known as kconfig,
+has gained some traction in the community, due to its advantages:
+ * simple syntax and grammar
+ * limited, yet adequate, option types: boolean and tristates, integers and
+   strings
+ * simple, yet efficient, organisation of options: indentation, sub-menus,
+   radio-like choices
+ * direct and reverse dependencies
diff --git a/development/kconfig-frontends/kconfig-frontends.SlackBuild b/development/kconfig-frontends/kconfig-frontends.SlackBuild
new file mode 100644
index 0000000000..5cc8edfbab
--- /dev/null
+++ b/development/kconfig-frontends/kconfig-frontends.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for kconfig-frontends
+
+# Copyright 2015 Andrzej Telszewski, Sabadell
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=kconfig-frontends
+VERSION=${VERSION:-3.12.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/kconfig-frontends/kconfig-frontends.info b/development/kconfig-frontends/kconfig-frontends.info
new file mode 100644
index 0000000000..23efc52168
--- /dev/null
+++ b/development/kconfig-frontends/kconfig-frontends.info
@@ -0,0 +1,10 @@
+PRGNAM="kconfig-frontends"
+VERSION="3.12.0.0"
+HOMEPAGE="http://ymorin.is-a-geek.org/projects/kconfig-frontends"
+DOWNLOAD="http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-3.12.0.0.tar.xz"
+MD5SUM="b939280dcc83f8feabd87a1d5f9b00c2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/development/kconfig-frontends/slack-desc b/development/kconfig-frontends/slack-desc
new file mode 100644
index 0000000000..9f9f985b47
--- /dev/null
+++ b/development/kconfig-frontends/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+kconfig-frontends: kconfig-frontends (kconfig language frontends)
+kconfig-frontends:
+kconfig-frontends: kconfig-frontends project aims at centralising the effort of keeping
+kconfig-frontends: an up-to-date, out of the Linux source tree, packaging of the kconfig
+kconfig-frontends: infrastructure, ready for use by third party projects.
+kconfig-frontends:
+kconfig-frontends:
+kconfig-frontends:
+kconfig-frontends:
+kconfig-frontends: Homepage: http://ymorin.is-a-geek.org/projects/kconfig-frontends
+kconfig-frontends:
diff --git a/development/kicad/help_path.patch b/development/kicad/help_path.patch
deleted file mode 100644
index 9c61f86d53..0000000000
--- a/development/kicad/help_path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kicad-bzr_20101223/common/edaappl.cpp	2010-12-31 17:48:16.000000000 -0200
-+++ kicad-bzr_20101223_patched/common/edaappl.cpp	2010-12-31 17:49:46.000000000 -0200
-@@ -927,7 +927,6 @@
-     // from a distribution files are in /usr/share/doc/kicad/help and binaries
-     // in /usr/bin or /usr/local/bin
-     subdirs.Add( wxT( "share" ) );
--    subdirs.Add( _T( "doc" ) );
-     subdirs.Add( wxT( "kicad" ) );
-     subdirs.Add( _T( "help" ) );
- 
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 50728ba17e..014613e462 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -26,7 +26,7 @@
 # Revision date: 2013/03/29
 
 PRGNAM=kicad
-VERSION=${VERSION:-bzr_20130325}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,41 +63,37 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Patch to solve path to help-files from kicad-doc package
-#  This is not the cleanest solution, but it works, and the source code itself
-#  admits being "hacky"...
-patch -p1 < $CWD/help_path.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
   cmake \
+    -DKICAD_REPO_NAME=stable \
+    -DKICAD_BUILD_VERSION=4.0.0 \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DKICAD_DOCS=/usr/doc/$PRGNAM-$VERSION \
     -DKICAD_PLUGINS=/usr/lib${LIBDIRSUFFIX}/$PRGNAM/plugins \
     -DKICAD_STABLE_VERSION=ON \
+    -DKICAD_SKIP_BOOST=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS.txt CHANGELOG.txt COPYRIGHT.txt INSTALL.txt README.txt TODO.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info
index b83c5b1b7c..337d906e19 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,10 +1,10 @@
 PRGNAM="kicad"
-VERSION="bzr_20130325"
-HOMEPAGE="http://kicad.sourceforge.net/wiki"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20130325.tar.bz2"
-MD5SUM="d4828b22bc530ac63a112c060264b77c"
+VERSION="4.0.0"
+HOMEPAGE="http://kicad-pcb.org"
+DOWNLOAD="https://launchpad.net/kicad/4.0/4.0.0/+download/kicad-4.0.0.tar.xz"
+MD5SUM="f4f7ea77ee854ca12e1fd4463f681657"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnomeprintui wxPython"
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+REQUIRES="libgnomeprintui wxGTK3"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/development/kompozer/slack-desc b/development/kompozer/slack-desc
index 5c344519ec..7ec95e1606 100644
--- a/development/kompozer/slack-desc
+++ b/development/kompozer/slack-desc
@@ -4,16 +4,16 @@
 # the '|' on the right side marks the last column you can put a character in.
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
-

-        |-----handy-ruler------------------------------------------------------|

-kompozer: KompoZer (Easy Web Authoring)

-kompozer:

-kompozer: KompoZer is a complete web authoring system that combines web file

-kompozer: management and easy-to-use WYSIWYG web page editing.

-kompozer: KompoZer is designed to be extremely easy to use, making it ideal

-kompozer: for non-technical computer users who want to create an attractive

-kompozer: professional-looking web site without needing to know HTML or web

-kompozer: coding.

-kompozer:

-kompozer: Home Page: http://www.kompozer.net/

-kompozer:

+
+        |-----handy-ruler------------------------------------------------------|
+kompozer: KompoZer (Easy Web Authoring)
+kompozer:
+kompozer: KompoZer is a complete web authoring system that combines web file
+kompozer: management and easy-to-use WYSIWYG web page editing.
+kompozer: KompoZer is designed to be extremely easy to use, making it ideal
+kompozer: for non-technical computer users who want to create an attractive
+kompozer: professional-looking web site without needing to know HTML or web
+kompozer: coding.
+kompozer:
+kompozer: Home Page: http://www.kompozer.net/
+kompozer:
diff --git a/development/lazarus/lazarus.SlackBuild b/development/lazarus/lazarus.SlackBuild
index 756ffd11a4..a2e6280660 100644
--- a/development/lazarus/lazarus.SlackBuild
+++ b/development/lazarus/lazarus.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lazarus
-VERSION=${VERSION:-1.4.2}
+VERSION=${VERSION:-1.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$LCL" = "qt" ]; then
-  OPT="-dUSE_QT_45"
-fi
+sed -i -e 's:share/man:man:' install/man/Makefile
 
 # Compilation doesn't need ./configure
 make clean
diff --git a/development/lazarus/lazarus.info b/development/lazarus/lazarus.info
index ff2246eb72..52fab2189a 100644
--- a/development/lazarus/lazarus.info
+++ b/development/lazarus/lazarus.info
@@ -1,8 +1,8 @@
 PRGNAM="lazarus"
-VERSION="1.4.2"
+VERSION="1.4.4"
 HOMEPAGE="http://www.lazarus.freepascal.org/"
-DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-1.4.2-0.tar.gz"
-MD5SUM="f9f56d5d9eb6de5c6b939f033fbbefb7"
+DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-1.4.4-0.tar.gz"
+MD5SUM="fdc2ec9dd4438f5e188227ec542bb86c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fpc fpc-source"
diff --git a/development/lcov/README b/development/lcov/README
index b7dc99d4b1..6c01ad2a10 100644
--- a/development/lcov/README
+++ b/development/lcov/README
@@ -2,4 +2,4 @@ LCOV is a graphical front-end for GCC's coverage testing tool gcov.  It
 collects gcov data for multiple source files and creates HTML pages containing
 the source code annotated with coverage information.  It also adds overview
 pages for easy navigation within the file structure.  LCOV supports statement,
-function and branch coverage meaurement.
+function and branch coverage measurement.
diff --git a/development/lcov/slack-desc b/development/lcov/slack-desc
index 8f7bd66e43..350c265772 100644
--- a/development/lcov/slack-desc
+++ b/development/lcov/slack-desc
@@ -13,7 +13,7 @@ lcov: It collects gcov data for multiple source files and creates HTML pages
 lcov: containing the source code annotated with coverage information.  It
 lcov: also adds overview pages for easy navigation within the file
 lcov: structure.  LCOV supports statement, function and branch coverage
-lcov: meaurement.
+lcov: measurement.
 lcov:
 lcov: Homepage: http://ltp.sourceforge.net/coverage/lcov.php
 lcov:
diff --git a/development/leiningen/README b/development/leiningen/README
index 207b5ac06c..93976c53a9 100644
--- a/development/leiningen/README
+++ b/development/leiningen/README
@@ -1,11 +1,3 @@
-Leiningen is for automating Clojure projects without setting your hair on
-fire. Working on Clojure projects with tools designed for Java can be an
-exercise in frustration. With Leiningen, you just write Clojure.
-
-Leiningen bootstraps itself using the 'lein' shell script; there is no
-separate 'install script'. It installs its dependencies upon the first run on
-unix, so the first run will take longer.
-
-Hence, this build script just installs the 'lein' shell script into /usr/bin/,
-then you need to manually invoke 'lein self-install' as normal user, which
-won't touch system directories but install some stuff into ~/.lein/.
+Leiningen is the easiest way to use Clojure. With a
+focus on project automation and declarative configuration,
+it gets out of your way and lets you focus on your code.
diff --git a/development/leiningen/leiningen.SlackBuild b/development/leiningen/leiningen.SlackBuild
index f8f2d68065..941abc204d 100644
--- a/development/leiningen/leiningen.SlackBuild
+++ b/development/leiningen/leiningen.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Slackware build script for leiningen
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=leiningen
-VERSION=${VERSION:-2.5.1}
+VERSION=${VERSION:-2.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/leiningen/leiningen.info b/development/leiningen/leiningen.info
index 4d8b0c47c8..2eb21e3c57 100644
--- a/development/leiningen/leiningen.info
+++ b/development/leiningen/leiningen.info
@@ -1,10 +1,10 @@
 PRGNAM="leiningen"
-VERSION="2.5.1"
+VERSION="2.5.3"
 HOMEPAGE="https://github.com/technomancy/leiningen/"
-DOWNLOAD="https://raw.githubusercontent.com/technomancy/leiningen/2.5.1/bin/lein"
-MD5SUM="c365f062444cb888ee21edbbe26afd75"
+DOWNLOAD="https://raw.githubusercontent.com/technomancy/leiningen/2.5.3/bin/lein"
+MD5SUM="b298776cef52f59516881888e6240fcc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="jdk"
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/development/leo/leo.info b/development/leo/leo.info
index 353084e90c..559141d6fb 100644
--- a/development/leo/leo.info
+++ b/development/leo/leo.info
@@ -1,5 +1,5 @@
 PRGNAM="leo"
-VERSION="4.11"
+VERSION="4.11.final"
 HOMEPAGE="http://leoeditor.com"
 DOWNLOAD="http://sourceforge.net/projects/leo/files/Leo/4.11-final/Leo-4.11-final.zip"
 MD5SUM="2e68122eb0ecb8d9efe3fba7f3b0360b"
diff --git a/development/lighttable/lighttable.SlackBuild b/development/lighttable/lighttable.SlackBuild
index 1756f59b73..37f190a470 100644
--- a/development/lighttable/lighttable.SlackBuild
+++ b/development/lighttable/lighttable.SlackBuild
@@ -1,12 +1,11 @@
 #!/bin/sh
-
 # Slackware build script for Light Table
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -20,12 +19,12 @@
 
 # You may have received a copy of the GNU General Public License along
 # with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 
 PRGNAM=lighttable
 SRCNAM=LightTable
-VERSION=${VERSION:-0.7.2}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,27 +41,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-TARBALL_x86=$SRCNAM"Linux.tar.gz"
-TARBALL_x86_64=$SRCNAM"Linux64.tar.gz"
-TARBALL_ROOT=$SRCNAM
-
-# Set LIBDIRSUFFIX and TARBALL.
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-  TARBALL="$TARBALL_x86_64"
-else
-  LIBDIRSUFFIX=""
-  TARBALL="$TARBALL_x86"
-fi
-
-set -eu
+set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -pv $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf "$TARBALL_ROOT"
-tar -xvf "$CWD/$TARBALL"
-cd "$TARBALL_ROOT"
+rm -rf ${SRCNAM}-${VERSION}
+tar xvf $CWD/${VERSION}.tar.gz || tar xvf $CWD/${SRCNAM}-${VERSION}.tar.gz
+cd ${SRCNAM}-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,17 +56,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/opt/$SRCNAM
-cp -a * $PKG/opt/$SRCNAM
+## as aburd as this is, we have to run the build script twice,
+## because it always fails the first time,
+## also LEIN_ROOT is important to set, or the script just
+## hangs forever
+LEIN_ROOT=true \
+  script/build.sh --release \
+  || LEIN_ROOT=true \
+  script/build.sh --release
+
+mkdir -pv $PKG/opt/${PRGNAM}-${VERSION}-linux/
+mv builds/${PRGNAM}-${VERSION}-linux/ $PKG/opt/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/bin
-ln -sf /opt/$SRCNAM/$SRCNAM $PKG/usr/bin
-
-mkdir -p $PKG/usr/share/pixmaps
-ln -sf /opt/$SRCNAM/core/img/lticon.png $PKG/usr/share/pixmaps/LightTable.png
+ln -sfv /opt/${PRGNAM}-${VERSION}-linux/$SRCNAM $PKG/usr/bin
+
+## icon files
+(
+  cd deploy/core/img/
+  for IMG in *.png
+  do
+    DIR_NAME=${IMG%.*}x${IMG%.*}
+    install -D $IMG $PKG/usr/share/icons/hicolor/$DIR_NAME/apps/$PRGNAM.png
+  done
+)
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/development/lighttable/lighttable.info b/development/lighttable/lighttable.info
index 5b8635a5b4..cdd05f8e35 100644
--- a/development/lighttable/lighttable.info
+++ b/development/lighttable/lighttable.info
@@ -1,10 +1,10 @@
 PRGNAM="lighttable"
-VERSION="0.7.2"
+VERSION="0.8.0"
 HOMEPAGE="http://www.lighttable.com"
-DOWNLOAD="https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.7.2/LightTableLinux.tar.gz"
-MD5SUM="999ca3e734ea1cf7b5f3dc190e914ad9"
-DOWNLOAD_x86_64="https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.7.2/LightTableLinux64.tar.gz"
-MD5SUM_x86_64="e49c9c57d1dec787a58094cc7e6d3f63"
-REQUIRES=""
+DOWNLOAD="https://github.com/LightTable/LightTable/archive/0.8.0.tar.gz"
+MD5SUM="ca6a12d91ea6d8dee26a123e7fe7b566"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="leiningen nodejs"
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/development/ltrace/ltrace.SlackBuild b/development/ltrace/ltrace.SlackBuild
index 5210240181..f1f07992b4 100644
--- a/development/ltrace/ltrace.SlackBuild
+++ b/development/ltrace/ltrace.SlackBuild
@@ -76,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-werror \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/development/luajit/luajit.SlackBuild b/development/luajit/luajit.SlackBuild
index c5c57c9749..ad683d6d1a 100644
--- a/development/luajit/luajit.SlackBuild
+++ b/development/luajit/luajit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for luajit
 
-# Copyright 2013-2014, Andrew Tkalia <anddt@yandex.ua>, Ukraine, Kyiv
+# Copyright 2013-2015, Andrew Tkalia <anddt@ukr.net>, Ukraine, Kyiv
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luajit
-VERSION=${VERSION:-2.0.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.0.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -78,6 +78,7 @@ make \
 make install \
   DESTDIR=$PKG \
   PREFIX=/usr \
+  MULTILIB=lib${LIBDIRSUFFIX} \
   INSTALL_LIB=$PKG/usr/lib${LIBDIRSUFFIX} \
   INSTALL_MAN=$PKG/usr/man/man1
 
diff --git a/development/luajit/luajit.info b/development/luajit/luajit.info
index 04d81cde01..c26e30487a 100644
--- a/development/luajit/luajit.info
+++ b/development/luajit/luajit.info
@@ -1,10 +1,10 @@
 PRGNAM="luajit"
-VERSION="2.0.3"
+VERSION="2.0.4"
 HOMEPAGE="http://luajit.org/"
-DOWNLOAD="http://luajit.org/download/LuaJIT-2.0.3.tar.gz"
-MD5SUM="f14e9104be513913810cd59c8c658dc0"
+DOWNLOAD="http://luajit.org/download/LuaJIT-2.0.4.tar.gz"
+MD5SUM="dd9c38307f2223a504cbfb96e477eca0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
 MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ua"
+EMAIL="anddt@ukr.net"
diff --git a/development/lwtools/README b/development/lwtools/README
new file mode 100644
index 0000000000..7edda0e737
--- /dev/null
+++ b/development/lwtools/README
@@ -0,0 +1,4 @@
+LWTOOLS is a set of cross-development tools for the Motorola 6809 and Hitachi
+6309 microprocessors.  It supports assembling to raw binaries, CoCo LOADM
+binaries, and a proprietary object file format for later linking.  It also
+supports macros and file inclusion among other things.
diff --git a/development/lwtools/lwtools.SlackBuild b/development/lwtools/lwtools.SlackBuild
new file mode 100644
index 0000000000..b0b735b1ba
--- /dev/null
+++ b/development/lwtools/lwtools.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for lwtools
+
+# Copyright 2015  David Golus <bassplayer69@gmail.com>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Heavily based on original slackbuild by AlienBOB.
+# Modified by David Golus <bassplayer69@gmail.com>
+
+PRGNAM=lwtools
+VERSION=${VERSION:-4.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  SLKLDFLAGS="-L/usr/lib64"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+LDFLAGS="-lm" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a 00README.txt COPYING GPL3 $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/lwtools/lwtools.info b/development/lwtools/lwtools.info
new file mode 100644
index 0000000000..6673c447b3
--- /dev/null
+++ b/development/lwtools/lwtools.info
@@ -0,0 +1,10 @@
+PRGNAM="lwtools"
+VERSION="4.12"
+HOMEPAGE="http://lwtools.projects.l-w.ca"
+DOWNLOAD="http://lwtools.projects.l-w.ca/releases/lwtools/lwtools-4.12.tar.gz"
+MD5SUM="0261d02a84cc4e0e3f69e124cddb05c4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="David Golus"
+EMAIL="bassplayer69@gmail.com"
diff --git a/development/lwtools/slack-desc b/development/lwtools/slack-desc
new file mode 100644
index 0000000000..52ebc786cd
--- /dev/null
+++ b/development/lwtools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+lwtools: lwtools (6809/6309 cross-development tools)
+lwtools:
+lwtools: LWTOOLS is a set of cross-development tools for the Motorola 6809
+lwtools: and Hitachi 6309 microprocessors.  It supports assembling to raw
+lwtools: binaries, CoCo LOADM binaries, and a proprietary object file format
+lwtools: for later linking.  It also supports macros and file inclusion among
+lwtools: other things.
+lwtools: 
+lwtools: http://lwtools.projects.l-w.ca
+lwtools:
+lwtools:
diff --git a/development/makedepf90/01-adds-B-PATH-option.patch b/development/makedepf90/01-adds-B-PATH-option.patch
new file mode 100644
index 0000000000..f1c217ea0f
--- /dev/null
+++ b/development/makedepf90/01-adds-B-PATH-option.patch
@@ -0,0 +1,243 @@
+From 76a2fc5c3fa8edb17a6e9e15d5ef519768f9ccff Mon Sep 17 00:00:00 2001
+From: Jason Graham <jason.graham@jhuapl.edu>
+Date: Wed, 18 Nov 2015 01:37:05 -0500
+Subject: [PATCH] makedepf90: Adds the '-B PATH' option to mirror src directory
+ structure in object PATH.
+
+When working on one of my projects, I wanted to preserve the directory
+structure used in the source tree within the objects PATH. The main
+issue was naming collisions with the '-b' option, since I have
+sub-directories within the source tree and some of the files have the
+same name resulting in the same objects within PATH. So '-B' behaves
+similarly to '-b', but places resulting objects within PATH using the
+same directory structure as the source files. The motivation for this
+addition is to be able to have equivalent source file names contained
+within different directories and still use the same top level objects
+PATH.
+---
+ global.h     |  3 +++
+ main.c       | 31 ++++++++++++++++++++++++-------
+ makedepf90.1 | 11 +++++++++--
+ utils.c      | 14 ++++++++++----
+ utils.h      |  3 ++-
+ 5 files changed, 48 insertions(+), 14 deletions(-)
+
+diff --git a/global.h b/global.h
+index 1704f82..64a627e 100644
+--- a/global.h
++++ b/global.h
+@@ -1,5 +1,6 @@
+ /* 
+  * Copyright (C) 2000-2005 Erik Edelmann <Erik.Edelmann@iki.fi>
++ * Copyright (C) 2015 Jason Graham <jason.graham@jhuapl.edu>
+  *
+  *     This program is free software;  you  can  redistribute  it
+  *     and/or modify it under the terms of the GNU General Public
+@@ -68,6 +69,8 @@ typedef struct {
+     char *link_rule;    
+     bool coco;          /* Look for coco set-files */
+     bool obj_dir_set;  /* Option -b obj_dir was used */
++    bool obj_dir_mirror;  /* Option -B obj_dir was used; turns on
++			     mirroring of src directory structure */
+     char *obj_dir;      /* Directory set by option -b */
+     bool src_dep;       /* List the source file in the dependencys */
+     bool src_path_set;  /* option -I was used */
+diff --git a/main.c b/main.c
+index e73bdef..d78f355 100644
+--- a/main.c
++++ b/main.c
+@@ -1,5 +1,6 @@
+ /* 
+  * Copyright (C) 2000-2006 Erik Edelmann <Erik.Edelmann@iki.fi>
++ * Copyright (C) 2015 Jason Graham <jason.graham@jhuapl.edu>
+  *
+  *     This program is free software;  you  can  redistribute  it
+  *     and/or modify it under the terms of the GNU General Public
+@@ -86,6 +87,8 @@ static const char helpstring[] =
+     "\n-coco\tLook for coco set-files.  Implies '-free'.\n"
+     "\n-D NAME\tDefine pre-processor symbol 'NAME'\n"
+     "\n-b PATH\tAssume object files are placed in PATH.\n"
++    "\n-B PATH\tAssume object files are placed in PATH using the same\n"
++	"\tdirectory structure as the source files.\n"
+     "\n-nosrc\tRemove the explicit dependency on the source file\n"
+     "\n-I PATH1:PATH2:...\n\tSearch path(s) for source files\n"
+     "\n\nReport bugs to erik.edelmann@iki.fi\n";
+@@ -143,6 +146,7 @@ int main (int argc, char **argv)
+     options.link_rule = (char *)LINK_RULE_DEFAULT;
+     options.coco = false;
+     options.obj_dir_set = false;
++    options.obj_dir_mirror = false;
+     options.obj_dir = "";
+     options.src_dep = true;
+     options.ignore_mods = NULL;
+@@ -276,9 +280,18 @@ int main (int argc, char **argv)
+             if (!list_find(macrolist, mac, &macrocmp))
+                 macrolist = list_prepend(macrolist, mac);
+ 
+-        } else if (strncmp(argv[i], "-b", 2) == 0) {
++        } else if (strncmp(argv[i], "-b", 2) == 0 ||
++		   strncmp(argv[i], "-B", 2) == 0 ) {
++	
++            /* Construct custom error message */
++            char err_msg[32];
++	    char _argv[3];
++	    
++	    strncpy(_argv,argv[i],2); _argv[2]='\0';
++	    snprintf(err_msg,sizeof(err_msg),"Option '%s' needs argument",_argv);
++
+             if (strlen(argv[i]) == 2) {
+-                if (i == argc - 1) fatal_error("Option '-b' needs argument");
++                if (i == argc - 1) fatal_error(err_msg);
+                 options.obj_dir = xstrdup(argv[++i]);
+             } else
+                 if (argv[i][2] == '=') {
+@@ -292,7 +305,11 @@ int main (int argc, char **argv)
+                 strcat(options.obj_dir, "/");
+             }
+ 
+-            options.obj_dir_set = true;
++	    options.obj_dir_set = true;
++	    /* Have to compare with '_argv' since 'i' may be modified above */
++	    if(strncmp(_argv, "-B", 2) == 0) {
++		    options.obj_dir_mirror = true;
++	    }
+ 
+         } else if (strncmp(argv[i], "-I", 2) == 0) {
+             int jp;
+@@ -383,7 +400,7 @@ int main (int argc, char **argv)
+         printf("FOBJ=");
+         for (h1 = obj; h1; h1 = h1->next)
+             if (options.obj_dir_set)
+-                printf("%s ", set_path(h1->data, options.obj_dir));
++	        printf("%s ", set_path(h1->data, options.obj_dir, options.obj_dir_mirror));
+             else
+                 printf("%s ", (char *)h1->data);
+         printf("\n\n%s: $(FOBJ)\n\t%s\n\n", options.exe_name,options.link_rule);
+@@ -402,8 +419,8 @@ int main (int argc, char **argv)
+         /* Targets */
+         for (h2 = dep->targets; h2; h2 = h2->next)  
+             if (options.obj_dir_set)
+-                printf("%s ", set_path(h2->data, options.obj_dir));
+-            else
++	        printf("%s ", set_path(h2->data, options.obj_dir, options.obj_dir_mirror));
++	    else
+                 printf("%s ", (char *)h2->data);
+ 
+         printf(": ");;
+@@ -430,7 +447,7 @@ int main (int argc, char **argv)
+                 } else {
+                     if (options.obj_dir_set)
+                         printf("%s ", 
+-                               set_path(mod->modfile_name, options.obj_dir));
++                            set_path(mod->modfile_name, options.obj_dir, options.obj_dir_mirror));
+                     else
+                         printf("%s ", mod->modfile_name);
+                 }
+diff --git a/makedepf90.1 b/makedepf90.1
+index 49bcfb7..738ce66 100644
+--- a/makedepf90.1
++++ b/makedepf90.1
+@@ -1,5 +1,6 @@
+ .\"
+ .\"    Copyright (C) 2000--2003 Erik Edelmann <eedelman@acclab.helsinki.fi>
++.\"    Copyright (C) 2015 Jason Graham <jason.graham@jhuapl.edu>
+ .\"
+ .\"    This program is free software;  you  can  redistribute  it
+ .\"    and/or modify it under the terms of the GNU General Public
+@@ -18,7 +19,7 @@
+ .\"    Boston, MA  02111-1307  USA
+ .\"
+ .\" $Format: ".TH makedepf90 1 \"$Date$\""$
+-.TH makedepf90 1 "Thu, 06 Dec 2001 23:28:54 +0200"
++.TH makedepf90 1 "Tue, 17 Nov 2015 23:21:02 -0500"
+ 
+ .SH NAME
+ makedepf90 \- creates Makefile dependency list for Fortran source files.
+@@ -45,7 +46,7 @@ makedepf90 \- creates Makefile dependency list for Fortran source files.
+ .RB [ \-coco ]
+ .RB [ \-D
+ .IR NAME ]
+-.RB [ \-b
++.RB [ \-b | \-B
+ .IR "path" ]
+ .RB [ \-I
+ .IR "PATH1:PATH2:..." ]
+@@ -211,6 +212,12 @@ Dependency tree and link rule will assume objects are placed in \fIpath\fP.
+ This is useful if the build places object files in a different directory than
+ the source files.
+ .TP
++.BI \-B " path"
++Dependency tree and link rule will assume objects are placed in \fIpath\fP using
++the same directory structure as the source files. This is useful if the build
++places object files in a different directory than the source files and the
++source directory structure is needed to avoid object name collisions.
++.TP
+ .BI \-I " list-of-paths"
+ Look for source/include files in the \fIlist-of-paths\fP, if not found in
+ current working directory.  Here, \fIlist-of-paths\fP is a colon separated
+diff --git a/utils.c b/utils.c
+index 08f6905..e5d3aff 100644
+--- a/utils.c
++++ b/utils.c
+@@ -1,5 +1,6 @@
+ /* 
+  * Copyright (C) 2000-2005 Erik Edelmann <Erik.Edelmann@iki.fi>
++ * Copyright (C) 2015 Jason Graham <jason.graham@jhuapl.edu>
+  *
+  *     This program is free software;  you  can  redistribute  it
+  *     and/or modify it under the terms of the GNU General Public
+@@ -70,22 +71,27 @@ char *replace_suffix(const char *filename, const char *new_suffix)
+ 
+ 
+ /* If filename has no path, append 'path' to the beginning of the filename,
+- * else replace the existing path (everything before the first '/') with 'path'.
++ * else replace the existing path if 'mirror=false' (everything before the first '/') with 'path' or
++ * prepend 'path' in the case that 'mirror=true'
+  */
+ 
+-char *set_path(const char *filename, const char *path)
++char *set_path(const char *filename, const char *path, const bool mirror)
+ {
+     char *rs;
+     int fl, n, pl, nl;
+ 
+     pl = strlen(path);
+ 
++
+     fl = n = strlen(filename);
+-    while (filename[n] != '/' && n >= 0)  n--;
++    if( !mirror )
++        while (filename[n] != '/' && n >= 0)  n--;
++    else
++        n=-1;
+     nl = fl - n - 1;
+ 
+     if (n == -1) {
+-        /* if there was no '/' */
++        /* if there was no '/' or 'mirror=true' */
+         rs = (char *)xmalloc((fl+pl+2)*sizeof(char));
+         strcpy(rs, path);
+         strcat(rs, filename);
+diff --git a/utils.h b/utils.h
+index 643d276..ca932ef 100644
+--- a/utils.h
++++ b/utils.h
+@@ -1,5 +1,6 @@
+ /* 
+  * Copyright (C) 2000-2005 Erik Edelmann <Erik.Edelmann@iki.fi>
++ * Copyright (C) 2015 Jason Graham <jason.graham@jhuapl.edu>
+  *
+  *     This program is free software;  you  can  redistribute  it
+  *     and/or modify it under the terms of the GNU General Public
+@@ -21,7 +22,7 @@
+ #define UTILS_H_
+ 
+ char *replace_suffix (const char *filename, const char *new_suffix);
+-char *set_path (const char *filename, const char *path);
++char *set_path (const char *filename, const char *path, const bool mirror);
+ char *remove_citation (const char *s);
+ char *expand_rule(const char *rule, const char *srcfile);
+ FILE *open_src_file (const char *fname, const List *path);
+-- 
+1.8.4
+
diff --git a/development/makedepf90/README b/development/makedepf90/README
new file mode 100644
index 0000000000..fc68a5eb03
--- /dev/null
+++ b/development/makedepf90/README
@@ -0,0 +1,12 @@
+Makedepf90 is a program for automatic creation of Makefile-style dependency
+lists for Fortran source code. Makedepf90 supports MODULE:s, INCLUDE:s, cpp
+#include:s, f90ppr $include:s and coco ??include:s and set-files.
+
+Also included is a patch which adds the '-B PATH' option to mirror the source
+directory structure in PATH. This patch has been submitted to the current
+makedepf90 maintainer Alastair McKinstry <mckinstry@debian.org> for inclusion in
+future upstream releases.
+
+To build the patched version, do this:
+
+  "PATCH=yes ./makedepf90.SlackBuild"
diff --git a/development/makedepf90/makedepf90.SlackBuild b/development/makedepf90/makedepf90.SlackBuild
new file mode 100644
index 0000000000..ee31fdfbcd
--- /dev/null
+++ b/development/makedepf90/makedepf90.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Slackware build script for makedepf90
+
+# Copyright 2015 Jason Graham <jason.graham@jhuapl.edu>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=makedepf90
+VERSION=${VERSION:-2.8.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# PATCH lets the user apply the "-B PATH" option patch
+PATCH=${PATCH:-no}
+
+# Apply patches
+if [ "$PATCH" = "yes" ]; then
+  for _p in $(ls $CWD/*.patch); do
+      patch -p1 -i $_p
+  done
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+ginstall -d $PKG/usr/bin
+ginstall $PRGNAM $PKG/usr/bin
+ginstall -d $PKG/usr/man/man1
+ginstall $PRGNAM.1 $PKG/usr/man/man1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/makedepf90/makedepf90.info b/development/makedepf90/makedepf90.info
new file mode 100644
index 0000000000..24560b1dd4
--- /dev/null
+++ b/development/makedepf90/makedepf90.info
@@ -0,0 +1,10 @@
+PRGNAM="makedepf90"
+VERSION="2.8.8"
+HOMEPAGE="http://personal.inet.fi/private/erikedelmann/makedepf90/"
+DOWNLOAD="http://personal.inet.fi/private/erikedelmann/makedepf90/makedepf90-2.8.8.tar.gz"
+MD5SUM="514a32147e956264ac5e60cc12fd5f5d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jason Graham"
+EMAIL="jason.graham@jhuapl.edu"
diff --git a/development/makedepf90/slack-desc b/development/makedepf90/slack-desc
new file mode 100644
index 0000000000..9677b6a2bd
--- /dev/null
+++ b/development/makedepf90/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+makedepf90: makedepf90 (Makefile-style dependency generator for Fortran)
+makedepf90:
+makedepf90: Makedepf90 is a program for automatic creation of Makefile-style 
+makedepf90: dependency lists for Fortran source code. Makedepf90 supports 
+makedepf90: MODULE:s, INCLUDE:s, cpp #include:s, f90ppr $include:s and coco 
+makedepf90: ??include:s and set-files.
+makedepf90:
+makedepf90: Homepage: http://personal.inet.fi/private/erikedelmann/makedepf90
+makedepf90:
+makedepf90:
+makedepf90:
diff --git a/development/mcrl2/mcrl2.SlackBuild b/development/mcrl2/mcrl2.SlackBuild
index ceef96581b..23e159e20d 100644
--- a/development/mcrl2/mcrl2.SlackBuild
+++ b/development/mcrl2/mcrl2.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild
index 937d12c8d2..92483dc41e 100644
--- a/development/meld3/meld3.SlackBuild
+++ b/development/meld3/meld3.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=meld3
 SRCNAM=meld
-VERSION=${VERSION:-3.14.0}
+VERSION=${VERSION:-3.12.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/meld3/meld3.info b/development/meld3/meld3.info
index 0b46d61afb..437dc1b604 100644
--- a/development/meld3/meld3.info
+++ b/development/meld3/meld3.info
@@ -1,8 +1,8 @@
 PRGNAM="meld3"
-VERSION="3.14.0"
+VERSION="3.12.3"
 HOMEPAGE="http://meldmerge.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/meld/3.14/meld-3.14.0.tar.xz"
-MD5SUM="7d09e818726ee09e84d305feef79695c"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/meld/3.12/meld-3.12.3.tar.xz"
+MD5SUM="4cb8cf5d1f07b4350d253f325b9c9c20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygobject3 gtksourceview3"
diff --git a/development/menhir/menhir.SlackBuild b/development/menhir/menhir.SlackBuild
index 3bfa610842..d3e4251ab5 100644
--- a/development/menhir/menhir.SlackBuild
+++ b/development/menhir/menhir.SlackBuild
@@ -79,9 +79,13 @@ sed -i -e 's/share\/doc/doc\//' -e 's/share\/man/man\//' Makefile
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make PREFIX=$PKG/usr all
+make -j1 PREFIX=$PKG/usr all
 make install PREFIX=$PKG/usr
 
+# "Installing MenhirLib via ocamlfind" ignores PREFIX= :-(
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ocaml/site-lib
+mv /usr/lib${LIBDIRSUFFIX}/ocaml/site-lib/menhirLib $PKG/usr/lib${LIBDIRSUFFIX}/ocaml/site-lib/
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/development/mit-scheme/mit-scheme.SlackBuild b/development/mit-scheme/mit-scheme.SlackBuild
index 1ef558569f..44e1068877 100644
--- a/development/mit-scheme/mit-scheme.SlackBuild
+++ b/development/mit-scheme/mit-scheme.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -96,6 +96,12 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 # take prebuilt info doc rather than build them by ourselves
 mkdir -p $PKG/usr/info
 tar xvf $CWD/$PRGNAM-$VERSION-doc-info.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 cp -a $PRGNAM-$VERSION/doc/*.info $PKG/usr/info
 find $PKG/usr/info -type f -exec gzip -9 {} \;
 rm -rf $PRGNAM-$VERSION
@@ -103,12 +109,24 @@ rm -rf $PRGNAM-$VERSION
 # ditto for html ones
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 tar xvf $CWD/$PRGNAM-$VERSION-doc-html.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 cp -a $PRGNAM-$VERSION/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/html
 rm -rf $PRGNAM-$VERSION
 
 # ditto for pdf ones
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pdf
 tar xvf $CWD/$PRGNAM-$VERSION-doc-pdf.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 cp -a $PRGNAM-$VERSION/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/pdf
 rm -rf $PRGNAM-$VERSION
 
diff --git a/development/mlton/mlton.SlackBuild b/development/mlton/mlton.SlackBuild
index 0621e040fd..00fb63805e 100644
--- a/development/mlton/mlton.SlackBuild
+++ b/development/mlton/mlton.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/development/mono-addins/mono-addins.SlackBuild b/development/mono-addins/mono-addins.SlackBuild
index 75ad2d2a91..3d759a117c 100644
--- a/development/mono-addins/mono-addins.SlackBuild
+++ b/development/mono-addins/mono-addins.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=mono-addins
 VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -66,10 +66,11 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+MCS=/usr/bin/mcs \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib \
@@ -88,16 +89,14 @@ if [ "$ARCH" = "x86_64" ]; then
 	mv $PKG/usr/lib/pkgconfig $PKG/usr/lib64/pkgconfig
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS  COPYING  NEWS  README ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS  COPYING  NEWS  README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/mono/README b/development/mono/README
index 8d4ff275e3..b7527e3835 100644
--- a/development/mono/README
+++ b/development/mono/README
@@ -4,3 +4,12 @@ Microsoft's .Net Framework based on the ECMA standards for C# and the Common
 Language Runtime.  We feel that by embracing a successful, standardized 
 software platform, we can lower the barriers to producing great applications 
 for Linux.
+
+
+Notes from https://github.com/mono/mono:
+ - Mono build relies on a working Mono C# compiler to compile itself
+   (also known as bootstrapping).
+
+ - If you don't have a working Mono installation, the build process uses
+   the 'monolite' distribution, which contains just enough to run the 'mcs'
+   compiler. This is considered a "slightly more risky approach" to build Mono.
diff --git a/development/mono/doinst.sh b/development/mono/doinst.sh
index 47554f5fd9..20f7c6c342 100644
--- a/development/mono/doinst.sh
+++ b/development/mono/doinst.sh
@@ -11,19 +11,21 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/mono/browscap.ini.new
 config etc/mono/config.new
+config etc/mono/browscap.ini.new
 config etc/mono/mconfig/config.xml.new
-config etc/mono/2.0/Browsers/Compat.browser.new
 config etc/mono/2.0/DefaultWsdlHelpGenerator.aspx.new
 config etc/mono/2.0/machine.config.new
 config etc/mono/2.0/settings.map.new
 config etc/mono/2.0/web.config.new
+config etc/mono/2.0/Browsers/Compat.browser.new
 config etc/mono/4.0/DefaultWsdlHelpGenerator.aspx.new
 config etc/mono/4.0/machine.config.new
 config etc/mono/4.0/settings.map.new
 config etc/mono/4.0/web.config.new
+config etc/mono/4.0/Browsers/Compat.browser.new
 config etc/mono/4.5/DefaultWsdlHelpGenerator.aspx.new
 config etc/mono/4.5/machine.config.new
 config etc/mono/4.5/settings.map.new
 config etc/mono/4.5/web.config.new
+config etc/mono/4.5/Browsers/Compat.browser.new
diff --git a/development/mono/mono.SlackBuild b/development/mono/mono.SlackBuild
index 288a7ccfaa..f1373abe67 100644
--- a/development/mono/mono.SlackBuild
+++ b/development/mono/mono.SlackBuild
@@ -2,9 +2,11 @@
 
 # Slackware build script for mono
 # Written by Sebastián Salazar Molina <ssalazar@orangepeople.cl>
+# Updated by Andre Barboza <bmg.andre@gmail.com>
 
 PRGNAM=mono
-VERSION=${VERSION:-3.10.0}
+VERSION=${VERSION:-4.2.2.10}
+MAJORVERSION=${MAJORVERSION:-4.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +44,8 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$MAJORVERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -50,7 +53,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix libgdiplus library path
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -74,21 +76,23 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
   mv browscap.ini browscap.ini.new
   mv mconfig/config.xml mconfig/config.xml.new
 
-  mv 2.0/settings.map 2.0/settings.map.new
+  mv 2.0/DefaultWsdlHelpGenerator.aspx 2.0/DefaultWsdlHelpGenerator.aspx.new
   mv 2.0/machine.config 2.0/machine.config.new
+  mv 2.0/settings.map 2.0/settings.map.new
   mv 2.0/web.config 2.0/web.config.new
   mv 2.0/Browsers/Compat.browser 2.0/Browsers/Compat.browser.new
-  mv 2.0/DefaultWsdlHelpGenerator.aspx 2.0/DefaultWsdlHelpGenerator.aspx.new
 
   mv 4.0/DefaultWsdlHelpGenerator.aspx 4.0/DefaultWsdlHelpGenerator.aspx.new
   mv 4.0/machine.config 4.0/machine.config.new
   mv 4.0/settings.map 4.0/settings.map.new
   mv 4.0/web.config 4.0/web.config.new
+  mv 4.0/Browsers/Compat.browser 4.0/Browsers/Compat.browser.new
 
   mv 4.5/DefaultWsdlHelpGenerator.aspx 4.5/DefaultWsdlHelpGenerator.aspx.new
   mv 4.5/machine.config 4.5/machine.config.new
   mv 4.5/settings.map 4.5/settings.map.new
   mv 4.5/web.config 4.5/web.config.new
+  mv 4.5/Browsers/Compat.browser 4.5/Browsers/Compat.browser.new
 )
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/mono/mono.info b/development/mono/mono.info
index 01480ec4f2..320b950fd5 100644
--- a/development/mono/mono.info
+++ b/development/mono/mono.info
@@ -1,10 +1,10 @@
 PRGNAM="mono"
-VERSION="3.10.0"
+VERSION="4.2.2.10"
 HOMEPAGE="http://www.mono-project.com/"
-DOWNLOAD="http://download.mono-project.com/sources/mono/mono-3.10.0.tar.bz2"
-MD5SUM="8c79f38bcab3ad0cf65728ca4c76b3c6"
+DOWNLOAD="http://download.mono-project.com/sources/mono/mono-4.2.2.10.tar.bz2"
+MD5SUM="16644eab7d890e568d34a18e93e7a878"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Sebastián Salazar Molina"
-EMAIL="sebastian@sebastian.cl"
+REQUIRES="libgdiplus"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
diff --git a/development/mono2/mono2.SlackBuild b/development/mono2/mono2.SlackBuild
index 2d586f266c..a12f17a139 100644
--- a/development/mono2/mono2.SlackBuild
+++ b/development/mono2/mono2.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/monodevelop-database/monodevelop-database-5.10.1.1.patch b/development/monodevelop-database/monodevelop-database-5.10.1.1.patch
new file mode 100644
index 0000000000..611041878f
--- /dev/null
+++ b/development/monodevelop-database/monodevelop-database-5.10.1.1.patch
@@ -0,0 +1,383 @@
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml	2015-11-05 20:56:51.021960146 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database CodeGenerator Module"
+ 	category	= "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
+@@ -15,11 +15,11 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Query" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Query" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Ide/Commands">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml	2015-11-05 20:56:51.015960146 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Components Module"
+ 	category	= "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Components.dll"/>
+@@ -15,10 +15,10 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="SourceEditor2" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="SourceEditor2" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml	2015-11-05 20:56:51.037960147 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database ConnectionManager Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
+@@ -15,12 +15,12 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Query" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Query" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Ide/Pads">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml	2015-11-05 20:56:51.082960150 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Designer Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Designer.dll"/>
+@@ -15,9 +15,9 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ </Addin>
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml	2015-11-05 20:56:51.027960147 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Query Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Query.dll"/>
+@@ -15,10 +15,10 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<ExtensionPoint path = "/MonoDevelop/Database/ToolBar/SqlQueryView">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml	2015-11-05 20:56:50.991960145 -0200
+@@ -6,14 +6,14 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category	= "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.dll"/>
+ 	</Runtime>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
+ 	</Dependencies>
+ 
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml	2015-11-05 20:56:51.078960149 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/>
+@@ -15,7 +15,7 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="MonoDevelop.Database.Sql" version="4.2.3"/>
++		<Addin id="MonoDevelop.Database.Sql" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/Mono/Data/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml	2015-11-05 20:56:51.009960146 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.MySql.dll"/>
+@@ -15,12 +15,12 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
+-		<Addin id="SourceEditor2" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
++		<Addin id="SourceEditor2" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Database/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml	2015-11-05 20:56:51.062960149 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/>
+@@ -15,12 +15,12 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
+-		<Addin id="SourceEditor2" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
++		<Addin id="SourceEditor2" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Database/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml	2015-11-05 20:56:51.053960148 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/>
+@@ -15,11 +15,11 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Database/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml	2015-11-05 20:56:51.030960147 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/>
+@@ -15,11 +15,11 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Database/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml	2015-11-05 20:56:51.074960149 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/>
+@@ -15,12 +15,12 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
+-		<Addin id="SourceEditor2" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
++		<Addin id="SourceEditor2" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Database/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml	2015-11-05 20:56:51.070960149 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/>
+@@ -15,12 +15,12 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="Core" version="4.2.3"/>
+-		<Addin id="Ide" version="4.2.3"/>
+-		<Addin id="Database.Sql" version="4.2.3"/>
+-		<Addin id="Database.Components" version="4.2.3"/>
+-		<Addin id="Database.Designer" version="4.2.3"/>
+-		<Addin id="SourceEditor2" version="4.2.3"/>
++		<Addin id="Core" version="5.10.1"/>
++		<Addin id="Ide" version="5.10.1"/>
++		<Addin id="Database.Sql" version="5.10.1"/>
++		<Addin id="Database.Components" version="5.10.1"/>
++		<Addin id="Database.Designer" version="5.10.1"/>
++		<Addin id="SourceEditor2" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/MonoDevelop/Database/Sql">
+diff -ur monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
+--- monodevelop-5.10.1.1.old/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml	2015-10-20 23:14:58.000000000 -0200
++++ monodevelop-5.10.1.1.new/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml	2015-11-05 20:56:51.043960148 -0200
+@@ -6,7 +6,7 @@
+ 	url		= "http://www.monodevelop.com"
+ 	description	= "Database Module"
+ 	category    = "Database"
+-	version		= "4.2.3">
++	version		= "5.10.1">
+     
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/>
+@@ -15,7 +15,7 @@
+   	<Localizer type="Gettext" catalog="monodevelop-database"/>
+ 
+ 	<Dependencies>
+-		<Addin id="MonoDevelop.Database.Sql" version="4.2.3"/>
++		<Addin id="MonoDevelop.Database.Sql" version="5.10.1"/>
+ 	</Dependencies>
+ 
+ 	<Extension path = "/Mono/Data/Sql">
diff --git a/development/monodevelop-database/monodevelop-database.SlackBuild b/development/monodevelop-database/monodevelop-database.SlackBuild
index c71b3ad7b9..c2d19578d1 100644
--- a/development/monodevelop-database/monodevelop-database.SlackBuild
+++ b/development/monodevelop-database/monodevelop-database.SlackBuild
@@ -22,7 +22,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monodevelop-database
-VERSION=${VERSION:-5.0.1}
+SRCNAM=monodevelop
+VERSION=${VERSION:-5.10.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +59,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-0.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+mkdir -p $SRCNAM-$VERSION
+tar -xvf $CWD/${SRCNAM}-${VERSION}.tar.bz2 --strip-components 1 -C ${SRCNAM}-${VERSION}
+cd $SRCNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,6 +71,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch --strip=1 < ${CWD}/${PRGNAM}-${VERSION}.patch
+
+pushd extras/MonoDevelop.Database
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/development/monodevelop-database/monodevelop-database.info b/development/monodevelop-database/monodevelop-database.info
index e6a34af9ba..41bb8495a9 100644
--- a/development/monodevelop-database/monodevelop-database.info
+++ b/development/monodevelop-database/monodevelop-database.info
@@ -1,8 +1,8 @@
 PRGNAM="monodevelop-database"
-VERSION="5.0.1"
+VERSION="5.10.1.1"
 HOMEPAGE="http://monodevelop.com/"
-DOWNLOAD="http://download.mono-project.com/sources/monodevelop-database/monodevelop-database-5.0.1-0.tar.bz2"
-MD5SUM="1c893258e61cbdb983bbfeaba419eb56"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/monodevelop/monodevelop-5.10.1.1.tar.bz2"
+MD5SUM="569b1a644744ecf35356f8b1a21979d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="monodevelop"
diff --git a/development/monodevelop-debugger-gdb/README b/development/monodevelop-debugger-gdb/README
deleted file mode 100644
index 2b4fcd1ee3..0000000000
--- a/development/monodevelop-debugger-gdb/README
+++ /dev/null
@@ -1,10 +0,0 @@
-GDB Debugger support for MonoDevelop
-
-Mono comes with two Mono-specific debuggers: a hard debugger and a soft
-debugger, additionally, you can use the Unix GDB debugger with Mono to
-debug low level problems.
-
-Until the Mono Debugger is ready for production, GDB can be used to
-obtain some information about your application and debug some problems.
-For more information:
-http://www.mono-project.com/Debugging#Debugging_with_GDB
diff --git a/development/monodevelop-debugger-gdb/monodevelop-debugger-gdb.SlackBuild b/development/monodevelop-debugger-gdb/monodevelop-debugger-gdb.SlackBuild
deleted file mode 100644
index 159692052e..0000000000
--- a/development/monodevelop-debugger-gdb/monodevelop-debugger-gdb.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for MonoDevelop GDB Debugger Support
-
-# Written by Andre Barboza <bmg.andre@gmail.com>
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=monodevelop-debugger-gdb
-VERSION=${VERSION:-5.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-0.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-
-make -j1
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/monodevelop-debugger-gdb/monodevelop-debugger-gdb.info b/development/monodevelop-debugger-gdb/monodevelop-debugger-gdb.info
deleted file mode 100644
index 3af97955f3..0000000000
--- a/development/monodevelop-debugger-gdb/monodevelop-debugger-gdb.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="monodevelop-debugger-gdb"
-VERSION="5.0.1"
-HOMEPAGE="http://monodevelop.com/"
-DOWNLOAD="http://download.mono-project.com/sources/monodevelop-debugger-gdb/monodevelop-debugger-gdb-5.0.1-0.tar.bz2"
-MD5SUM="4292cb70a2a4cab1181d8fba922b8c77"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="monodevelop"
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
diff --git a/development/monodevelop-debugger-gdb/slack-desc b/development/monodevelop-debugger-gdb/slack-desc
deleted file mode 100644
index 52085c7f7e..0000000000
--- a/development/monodevelop-debugger-gdb/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                        |-----handy-ruler------------------------------------------------------|
-monodevelop-debugger-gdb: monodevelop-debugger-gdb (GDB Debugger support for MonoDevelop)
-monodevelop-debugger-gdb:
-monodevelop-debugger-gdb: Additionally to the Mono-specific debuggers, you can use the Unix
-monodevelop-debugger-gdb: GDB debugger with Mono and MonoDevelop to debug low level problems.
-monodevelop-debugger-gdb:
-monodevelop-debugger-gdb:
-monodevelop-debugger-gdb:
-monodevelop-debugger-gdb:
-monodevelop-debugger-gdb:
-monodevelop-debugger-gdb: Homepage: http://monodevelop.com/
-monodevelop-debugger-gdb:
diff --git a/development/monodevelop/monodevelop.SlackBuild b/development/monodevelop/monodevelop.SlackBuild
index 7defeb97e6..265d9a673f 100644
--- a/development/monodevelop/monodevelop.SlackBuild
+++ b/development/monodevelop/monodevelop.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monodevelop
-VERSION=${VERSION:-5.0.1}
+VERSION=${VERSION:-5.10.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,8 +59,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-0.tar.bz2
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 --strip-components 1 -C $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,6 +70,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+pushd main
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/development/monodevelop/monodevelop.info b/development/monodevelop/monodevelop.info
index 7473062615..13335c5b9b 100644
--- a/development/monodevelop/monodevelop.info
+++ b/development/monodevelop/monodevelop.info
@@ -1,10 +1,10 @@
 PRGNAM="monodevelop"
-VERSION="5.0.1"
+VERSION="5.10.1.1"
 HOMEPAGE="http://monodevelop.com/"
-DOWNLOAD="http://download.mono-project.com/sources/monodevelop/monodevelop-5.0.1-0.tar.bz2"
-MD5SUM="5f68aa384c7aa473fdd36da2f70117b4"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/monodevelop/monodevelop-5.10.1.1.tar.bz2"
+MD5SUM="569b1a644744ecf35356f8b1a21979d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk mono-addins gnome-sharp"
+REQUIRES="jdk mono-addins gnome-sharp nuget libssh2"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/development/monotone/monotone.SlackBuild b/development/monotone/monotone.SlackBuild
index 29c2bf2430..2216aa283a 100644
--- a/development/monotone/monotone.SlackBuild
+++ b/development/monotone/monotone.SlackBuild
@@ -93,6 +93,9 @@ make install htmldir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild
index 84c8019cce..a994e06840 100644
--- a/development/neovim/neovim.SlackBuild
+++ b/development/neovim/neovim.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=neovim
-VERSION=${VERSION:-20150721}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info
index 1df50687f0..5b546ee129 100644
--- a/development/neovim/neovim.info
+++ b/development/neovim/neovim.info
@@ -1,8 +1,8 @@
 PRGNAM="neovim"
-VERSION="20150721"
+VERSION="0.1.1"
 HOMEPAGE="http://neovim.org/"
-DOWNLOAD="http://jaxartes.net/files/neovim-20150721.tar.bz2"
-MD5SUM="739617730a90559819003f2d50557533"
+DOWNLOAD="https://github.com/neovim/neovim/archive/v0.1.1.tar.gz"
+MD5SUM="75f69a0547405f62f19248f2c8fa4ed8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libuv msgpack-c luajit lua-lpeg lua-MessagePack libtermkey libvterm"
diff --git a/development/newtonsoft-json/newtonsoft-json.SlackBuild b/development/newtonsoft-json/newtonsoft-json.SlackBuild
index 4545fed4d9..6d38568adc 100644
--- a/development/newtonsoft-json/newtonsoft-json.SlackBuild
+++ b/development/newtonsoft-json/newtonsoft-json.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=newtonsoft-json
-VERSION=${VERSION:-6.0.4}
+VERSION=${VERSION:-8.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$VERSION.tar.gz
+# Make sure sbokpg can extract the source
+tar xvf $CWD/Newtonsoft.Json-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd Newtonsoft.Json-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/development/newtonsoft-json/newtonsoft-json.info b/development/newtonsoft-json/newtonsoft-json.info
index f4d6ce353c..fd2a38c774 100644
--- a/development/newtonsoft-json/newtonsoft-json.info
+++ b/development/newtonsoft-json/newtonsoft-json.info
@@ -1,8 +1,8 @@
 PRGNAM="newtonsoft-json"
-VERSION="6.0.4"
+VERSION="8.0.2"
 HOMEPAGE="http://james.newtonking.com/json"
-DOWNLOAD="https://github.com/JamesNK/Newtonsoft.Json/archive/6.0.4.tar.gz"
-MD5SUM="7d0c0985f3930e57d802023f5958ed3a"
+DOWNLOAD="https://github.com/JamesNK/Newtonsoft.Json/archive/8.0.2.tar.gz"
+MD5SUM="f2af1f6fc56109e45f4562c7139d9997"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mono"
diff --git a/development/ninja-ide/ninja-ide.SlackBuild b/development/ninja-ide/ninja-ide.SlackBuild
index 829d370563..863e9f4eb5 100644
--- a/development/ninja-ide/ninja-ide.SlackBuild
+++ b/development/ninja-ide/ninja-ide.SlackBuild
@@ -46,8 +46,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/v$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/development/ninja/README b/development/ninja/README
new file mode 100644
index 0000000000..4881393f6e
--- /dev/null
+++ b/development/ninja/README
@@ -0,0 +1,4 @@
+Ninja is a small build system with a focus on speed.  It differs from other
+build systems in two major respects: it is designed to have its input files
+generated by a higher-level build system, and it is designed to run builds as
+fast as possible.
diff --git a/development/ninja/ninja.SlackBuild b/development/ninja/ninja.SlackBuild
new file mode 100644
index 0000000000..f9391e2d63
--- /dev/null
+++ b/development/ninja/ninja.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for ninja
+
+# Copyright 2015 Markus Rinne Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ninja
+VERSION=${VERSION:-1.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -e $CWD/v$VERSION.tar.gz ]; then
+  tar xvf $CWD/v$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./configure.py --bootstrap
+
+mkdir -p $PKG/usr/bin
+cp ninja $PKG/usr/bin
+
+mkdir -p $PKG/usr/share/bash-completion/completions
+cp misc/bash-completion $PKG/usr/share/bash-completion/completions/ninja
+
+mkdir -p $PKG/usr/share/zsh/site-functions
+cp misc/zsh-completion $PKG/usr/share/zsh/site-functions/_ninja
+
+mkdir -p $PKG/usr/share/emacs/site-lisp
+cp misc/ninja-mode.el $PKG/usr/share/emacs/site-lisp
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING doc/manual.asciidoc $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/ninja/ninja.info b/development/ninja/ninja.info
new file mode 100644
index 0000000000..8d778e291d
--- /dev/null
+++ b/development/ninja/ninja.info
@@ -0,0 +1,10 @@
+PRGNAM="ninja"
+VERSION="1.6.0"
+HOMEPAGE="https://martine.github.io/ninja/"
+DOWNLOAD="https://github.com/martine/ninja/archive/v1.6.0.tar.gz"
+MD5SUM="254133059f2da79d8727f654d7198f43"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Markus Rinne"
+EMAIL="markus.ka.rinne@gmail.com"
diff --git a/development/ninja/slack-desc b/development/ninja/slack-desc
new file mode 100644
index 0000000000..a04b84adce
--- /dev/null
+++ b/development/ninja/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ninja: ninja (small build system with a focus on speed)
+ninja:
+ninja: Ninja is a small build system with a focus on speed.  It differs from
+ninja: other build systems in two major respects: it is designed to have its
+ninja: input files generated by a higher-level build system, and it is
+ninja: designed to run builds as fast as possible.
+ninja:
+ninja:
+ninja:
+ninja:
+ninja:
diff --git a/development/nodejs/README b/development/nodejs/README
new file mode 100644
index 0000000000..d9118318ef
--- /dev/null
+++ b/development/nodejs/README
@@ -0,0 +1,9 @@
+Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine.
+
+Node.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient. Node.js' package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
+
+WARNING: nodejs will conflict with node.
+
+Either install the node package, or nodejs (recommended) from SBo, but not both. Both packages include npm.
+
+nodejs is based off of iojs, you should test your project with nodejs before switching from the node package. Due to significant breaking changes, you may need to update your project to be compatible.
diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild
new file mode 100644
index 0000000000..55d2dc40c9
--- /dev/null
+++ b/development/nodejs/nodejs.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# Slackware build script for nodejs
+# Thanks to Audrius Kažukauskas
+
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License
+# along with this program (most likely, a file named COPYING). If
+# not, see <https://www.gnu.org/licenses/>.
+
+PRGNAM=nodejs
+SRCNAM=node
+VERSION=${VERSION:-4.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+DOCS="AUTHORS CHANGELOG.md COLLABORATOR_GUIDE.md CONTRIBUTING.md GOVERNANCE.md LICENSE README.md ROADMAP.md WORKING_GROUPS.md"
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+SHAREDOPENSSL=""
+## use system openssl if the version number is high enough
+if [ "`openssl version | grep '1.0.2'`" ]; then
+  SHAREDOPENSSL="--shared-openssl"
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+## Fix man page path.
+sed -i 's|share/||' tools/install.py
+sed -i '/var manRoot/ s/"share",//' deps/npm/lib/{,un}build.js
+
+## Fix libdir for 64-bit.
+sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py
+sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js
+sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js
+
+./configure \
+  --prefix=/usr \
+  --shared-zlib \
+  ${SHAREDOPENSSL}
+
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+## Add bash completion file for npm.
+install -D -m 644 $CWD/npm.sh $PKG/usr/share/bash-completion/completions/npm
+
+## Remove unneeded files.
+find $PKG/usr \( -name '.git*' \) -exec rm -f {} \;
+
+## Set NODE_PATH to look for globally installed modules.
+mkdir -p $PKG/etc/profile.d
+cat > $PKG/etc/profile.d/${SRCNAM}.csh << EOF
+#!/bin/csh
+setenv NODE_PATH /usr/lib${LIBDIRSUFFIX}/node_modules
+EOF
+cat > $PKG/etc/profile.d/${SRCNAM}.sh << EOF
+#!/bin/sh
+export NODE_PATH=/usr/lib${LIBDIRSUFFIX}/node_modules
+EOF
+chmod 0755 $PKG/etc/profile.d/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info
new file mode 100644
index 0000000000..ecdd089246
--- /dev/null
+++ b/development/nodejs/nodejs.info
@@ -0,0 +1,10 @@
+PRGNAM="nodejs"
+VERSION="4.2.4"
+HOMEPAGE="https://nodejs.org/"
+DOWNLOAD="https://github.com/nodejs/node/archive/v4.2.4.tar.gz"
+MD5SUM="f1f8b6d523dcf678a8e457e338dab8ff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
diff --git a/development/nodejs/npm.sh b/development/nodejs/npm.sh
new file mode 100644
index 0000000000..25bef2c17b
--- /dev/null
+++ b/development/nodejs/npm.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+###-begin-npm-completion-###
+#
+# npm command completion script
+#
+# Installation: npm completion >> ~/.bashrc  (or ~/.zshrc)
+# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm
+#
+
+if type complete &>/dev/null; then
+  _npm_completion () {
+    local words cword
+    if type _get_comp_words_by_ref &>/dev/null; then
+      _get_comp_words_by_ref -n = -n @ -w words -i cword
+    else
+      cword="$COMP_CWORD"
+      words=("${COMP_WORDS[@]}")
+    fi
+
+    local si="$IFS"
+    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$cword" \
+                           COMP_LINE="$COMP_LINE" \
+                           COMP_POINT="$COMP_POINT" \
+                           npm completion -- "${words[@]}" \
+                           2>/dev/null)) || return $?
+    IFS="$si"
+  }
+  complete -o default -F _npm_completion npm
+elif type compdef &>/dev/null; then
+  _npm_completion() {
+    local si=$IFS
+    compadd -- $(COMP_CWORD=$((CURRENT-1)) \
+                 COMP_LINE=$BUFFER \
+                 COMP_POINT=0 \
+                 npm completion -- "${words[@]}" \
+                 2>/dev/null)
+    IFS=$si
+  }
+  compdef _npm_completion npm
+elif type compctl &>/dev/null; then
+  _npm_completion () {
+    local cword line point words si
+    read -Ac words
+    read -cn cword
+    let cword-=1
+    read -l line
+    read -ln point
+    si="$IFS"
+    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
+                       COMP_LINE="$line" \
+                       COMP_POINT="$point" \
+                       npm completion -- "${words[@]}" \
+                       2>/dev/null)) || return $?
+    IFS="$si"
+  }
+  compctl -K _npm_completion npm
+fi
+###-end-npm-completion-###
diff --git a/development/nodejs/slack-desc b/development/nodejs/slack-desc
new file mode 100644
index 0000000000..0634c606ef
--- /dev/null
+++ b/development/nodejs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+nodejs: nodejs (JavaScript runtime)
+nodejs:
+nodejs: Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript
+nodejs: engine.
+nodejs:
+nodejs:
+nodejs:
+nodejs: https://nodejs.org/
+nodejs:
+nodejs:
+nodejs:
diff --git a/development/npm2tgz/npm2tgz.SlackBuild b/development/npm2tgz/npm2tgz.SlackBuild
index e970392274..3ceb1be8f3 100644
--- a/development/npm2tgz/npm2tgz.SlackBuild
+++ b/development/npm2tgz/npm2tgz.SlackBuild
@@ -5,14 +5,12 @@
 # Written by Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
 
 PRGNAM=npm2tgz
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
 
-SRCNAM="$VERSION.tar.gz"
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -20,10 +18,11 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-rm -rf $TMP/$PRGNAM-$VERSION $PKG
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$SRCNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
diff --git a/development/npm2tgz/npm2tgz.info b/development/npm2tgz/npm2tgz.info
index ac9aca736b..adc6797279 100644
--- a/development/npm2tgz/npm2tgz.info
+++ b/development/npm2tgz/npm2tgz.info
@@ -1,8 +1,8 @@
 PRGNAM="npm2tgz"
-VERSION="1.3.1"
+VERSION="1.3.2.1"
 HOMEPAGE="http://github.com/cycojesus/npm2tgz"
-DOWNLOAD="http://github.com/cycojesus/npm2tgz/archive/1.3.1.tar.gz"
-MD5SUM="727da6783b9aba45d90cfdefc9f153c0"
+DOWNLOAD="http://github.com/cycojesus/npm2tgz/archive/1.3.2.1.tar.gz"
+MD5SUM="f78af79ab304eb1face69dc543510098"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="node"
diff --git a/development/nuget/README b/development/nuget/README
new file mode 100644
index 0000000000..d8f446acdf
--- /dev/null
+++ b/development/nuget/README
@@ -0,0 +1,3 @@
+NuGet is the package manager for the Microsoft development 
+platform including .NET. The NuGet client tools provide 
+the ability to produce and consume packages. 
diff --git a/development/nuget/nuget.SlackBuild b/development/nuget/nuget.SlackBuild
new file mode 100644
index 0000000000..f1d90c817b
--- /dev/null
+++ b/development/nuget/nuget.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Slackware build script for NuGet Package Management
+
+# Copyright 2015, Andre Barboza, Belo Horizonte
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=nuget
+VERSION=${VERSION:-2.8.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+ARCH=noarch
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+
+mkdir -p ${PKG}/usr/share/NuGet.PackageManagement/
+install -m 0644 ${CWD}/nuget.exe ${PKG}/usr/share/NuGet.PackageManagement/
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p ${PKG}/usr/bin
+cat <<EOF > ${PKG}/usr/bin/nuget
+#!/bin/bash
+mono /usr/share/NuGet.PackageManagement/nuget.exe \$*
+EOF
+chmod 755 ${PKG}/usr/bin/nuget
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/development/nuget/nuget.info b/development/nuget/nuget.info
new file mode 100644
index 0000000000..d305156965
--- /dev/null
+++ b/development/nuget/nuget.info
@@ -0,0 +1,11 @@
+PRGNAM="nuget"
+VERSION="2.8.6"
+HOMEPAGE="https://www.nuget.org/"
+DOWNLOAD="https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe"
+MD5SUM="ef16c016d7eb396c8f65888a53b69d78"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="mono"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
+
diff --git a/development/nuget/slack-desc b/development/nuget/slack-desc
new file mode 100644
index 0000000000..e92fc636d3
--- /dev/null
+++ b/development/nuget/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+nuget: nuget (Package manager for the Microsoft development)
+nuget:
+nuget: NuGet is the package manager for the Microsoft development platform 
+nuget: including .NET. The NuGet client tools provide the ability to 
+nuget: produce and consume packages. 
+nuget: 
+nuget: 
+nuget:
+nuget: 
+nuget: https://www.nuget.org/ 
+nuget:
diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild
index ebd06af5d7..17322ee8ac 100644
--- a/development/ocaml/ocaml.SlackBuild
+++ b/development/ocaml/ocaml.SlackBuild
@@ -90,7 +90,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changes INSTALL LICENSE README VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
-tar -xvf $CWD/ocaml-4.01-refman-html.tar.gz -C $PKG/usr/doc/$PRGNAM-$VERSION/
+tar -xvf $CWD/ocaml-4.01-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/ola/ola.SlackBuild b/development/ola/ola.SlackBuild
index 251cf664a0..6535cd777d 100644
--- a/development/ola/ola.SlackBuild
+++ b/development/ola/ola.SlackBuild
@@ -78,6 +78,9 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   README INSTALL COPYING AUTHORS ChangeLog \
diff --git a/development/oniguruma/README b/development/oniguruma/README
new file mode 100644
index 0000000000..8eb7bf9091
--- /dev/null
+++ b/development/oniguruma/README
@@ -0,0 +1,3 @@
+Oniguruma is a regular expressions library. The characteristics of
+this library is that different character encoding for every regular
+expression object can be specified.
diff --git a/development/oniguruma/oniguruma.SlackBuild b/development/oniguruma/oniguruma.SlackBuild
new file mode 100644
index 0000000000..fedd78646e
--- /dev/null
+++ b/development/oniguruma/oniguruma.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for oniguruma
+
+# Copyright 2015 Eugene Wissner, Dachau, Germany
+# Copyright 2008, 2009, 2010, 2011 Phantom X, Goiania, Brazil.
+# Copyright 2006 Martijn Dekker, Groningen, Netherlands.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=oniguruma
+VERSION=${VERSION:-5.9.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/libonig_$VERSION.orig.tar.gz
+cd onig-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --with-rubydir=/usr/bin \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=${PKG}
+
+find ${PKG} \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HISTORY README* index*.html doc/{API,FAQ,RE}* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/oniguruma/oniguruma.info b/development/oniguruma/oniguruma.info
new file mode 100644
index 0000000000..c251a069be
--- /dev/null
+++ b/development/oniguruma/oniguruma.info
@@ -0,0 +1,10 @@
+PRGNAM="oniguruma"
+VERSION="5.9.5"
+HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma/"
+DOWNLOAD="http://http.debian.net/debian/pool/main/libo/libonig/libonig_5.9.5.orig.tar.gz"
+MD5SUM="970f98a4cd10021b545d84e34c34aae4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/oniguruma/slack-desc b/development/oniguruma/slack-desc
new file mode 100644
index 0000000000..6016842233
--- /dev/null
+++ b/development/oniguruma/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+oniguruma: oniguruma (Regular expressions library)
+oniguruma:
+oniguruma: Oniguruma is a regular expressions library. The characteristics of
+oniguruma: this library is that different character encoding for every regular
+oniguruma: expression object can be specified.
+oniguruma:
+oniguruma: http://www.geocities.jp/kosako3/oniguruma/
+oniguruma:
+oniguruma:
+oniguruma:
+oniguruma:
diff --git a/development/openjdk/README b/development/openjdk/README
index de4628333f..8204b9d061 100644
--- a/development/openjdk/README
+++ b/development/openjdk/README
@@ -1,8 +1,7 @@
-OpenJDK is an open source implementation of the Java(TM) 2 Platform
-Standard Edition Development Kit. This package is built with the
-IcedTea build and integration project and is thus free software.
-It includes tools for developing, testing, and running programs
-written in the Java programming language.
+OpenJDK is an open source implementation of the Java(TM) 2 Platform Standard
+Edition Development Kit. This package is built with the IcedTea build
+project and includes tools for developing, testing, and running
+programs written in Java.
 
 apache-ant is a required dependency and you have to install it before
 you build openjdk. However, you do not need to install Oracle's jdk,
@@ -25,6 +24,13 @@ as it will add new files to the /etc/profile.d folder.
 
 This script may take a couple of hours to finish and will require
 about 11 GB of disk space for its temporary directory. It defaults to
-"/tmp/SBo" and you may redefine it by invoking the script like this:
+"/tmp/SBo" and you may redefine it like this:
 
 TMP=/your/temporary/dir ./openjdk.SlackBuild
+
+If you get an error like
+
+Internal compiler error: java.lang.NullPointerException at org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
+
+simply run the build again. This happens early so it shouldn't be that of a
+problem.  At least 1 out of 5 runs so far have always succeded.
diff --git a/development/openjdk/openjdk.SlackBuild b/development/openjdk/openjdk.SlackBuild
index e1bcf65265..1e38ffeb0d 100644
--- a/development/openjdk/openjdk.SlackBuild
+++ b/development/openjdk/openjdk.SlackBuild
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjdk
-VERSION=${VERSION:-7u79b14}
+VERSION=${VERSION:-7u91b1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.5.5
+ICEDTEA=icedtea-2.6.2
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -72,6 +72,8 @@ JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
   --without-rhino \
   --disable-system-kerberos \
   --disable-downloading \
+  --disable-system-pcsc \
+  --disable-system-sctp \
   --with-openjdk-src-zip="$CWD/openjdk.tar.bz2" \
   --with-corba-src-zip="$CWD/corba.tar.bz2" \
   --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
@@ -120,9 +122,5 @@ cp -a $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/{THIRD_PARTY_README,LICENSE,ASSEMBLY_E
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mv $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/man/ $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/openjdk/openjdk.info b/development/openjdk/openjdk.info
index 515b77462b..ff2b8f7225 100644
--- a/development/openjdk/openjdk.info
+++ b/development/openjdk/openjdk.info
@@ -1,22 +1,22 @@
 PRGNAM="openjdk"
-VERSION="7u79b14"
+VERSION="7u91b1"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.5.5.tar.xz \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/openjdk.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/corba.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jaxp.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jaxws.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jdk.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/langtools.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/hotspot.tar.bz2"
-MD5SUM="362ab805f8da0f85fa826e76a11e1727 \
-  6edc6aa04cb261ebc382d53e7072d946 \
-  999fa486ab1eaddaba220c19d24d1b33 \
-  139a569cf9d78ae7354fd407750a6fe2 \
-  7bc5e8735d9db574caf1c658d248f69a \
-  81ee4210f1c4315af9069f8153a8e7a1 \
-  117ae9e846a00e287060035b930c299d \
-  51b6547c4a27c4cf6a134dca0f59e3ae"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.2.tar.xz \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/openjdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/corba.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jaxp.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jaxws.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/langtools.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/hotspot.tar.bz2"
+MD5SUM="3932be2adca6ea40abf2cc0ea8a59094 \
+  d63c5b401aaa9ef76d1dbd87943aa387 \
+  500547dc50acde20fad18d0645be89c4 \
+  793fb78b5f51323e31785bb89292182f \
+  131e2f619455e37cea74ca710e6ada6d \
+  6e8061b2b7c22163ab149fb66553eda8 \
+  1cebffc6b56e9efdbe08eff018801cb1 \
+  5ffb731931226fbff870b80a377f6258"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"
diff --git a/development/openjdk/slack-desc b/development/openjdk/slack-desc
index 4d5263d8f2..17649944a0 100644
--- a/development/openjdk/slack-desc
+++ b/development/openjdk/slack-desc
@@ -10,9 +10,9 @@ openjdk: openjdk (Open Implementation of JDK)
 openjdk:
 openjdk: OpenJDK is an open source implementation of the Java(TM) 2 Platform 
 openjdk: Standard Edition Development Kit. This package is built using the 
-openjdk: IcedTea build and integration project and is thus free software. It 
-openjdk: includes tools for developing, testing, and running programs 
-openjdk: written in the Java programming language.
+openjdk: IcedTea build and integration project and includes tools for
+openjdk: developing, testing, and running programs written in the Java
+openjdk: programming language.
 openjdk:
 openjdk:
 openjdk:
diff --git a/development/p4/p4.SlackBuild b/development/p4/p4.SlackBuild
index 260edd9815..da84b92b12 100644
--- a/development/p4/p4.SlackBuild
+++ b/development/p4/p4.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Andy Bailey <GooseYArd@gmail.com>
 
 PRGNAM=p4
-VERSION=${VERSION:-2014.1.821990}
+VERSION=${VERSION:-2015.2.1319959}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/p4/p4.info b/development/p4/p4.info
index 7634d87b33..fbebfa32da 100644
--- a/development/p4/p4.info
+++ b/development/p4/p4.info
@@ -1,10 +1,10 @@
 PRGNAM="p4"
-VERSION="2014.1.821990"
+VERSION="2015.2.1319959"
 HOMEPAGE="http://www.perforce.com/"
-DOWNLOAD="http://www.perforce.com/downloads/perforce/r14.1/bin.linux26x86/p4"
-MD5SUM="2af07cb74ebc5a6a87d7f10dc9f0740a"
-DOWNLOAD_x86_64="http://www.perforce.com/downloads/perforce/r14.1/bin.linux26x86_64/p4"
-MD5SUM_x86_64="ee4ba028921a9c687bea70959c201fb2"
+DOWNLOAD="http://www.perforce.com/downloads/perforce/r15.2/bin.linux26x86/p4"
+MD5SUM="59a3f047cffaebf270f5efce3f5c1e15"
+DOWNLOAD_x86_64="http://www.perforce.com/downloads/perforce/r15.2/bin.linux26x86_64/p4"
+MD5SUM_x86_64="ca5059570edf9021871855dfaaf4c2a2"
 REQUIRES=""
 MAINTAINER="David Sullins"
 EMAIL="david.sullins@gmail.com"
diff --git a/development/p4v/p4v.info b/development/p4v/p4v.info
index ff64e3c512..e0dedc4c98 100644
--- a/development/p4v/p4v.info
+++ b/development/p4v/p4v.info
@@ -1,10 +1,10 @@
 PRGNAM="p4v"
-VERSION="2014.1.978848"
+VERSION="2014.1.1206753"
 HOMEPAGE="http://www.perforce.com/"
 DOWNLOAD="http://www.perforce.com/downloads/perforce/r14.1/bin.linux26x86/p4v.tgz"
-MD5SUM="3ffcae9547bf335191b709e170003e6d"
+MD5SUM="96c6e88ea1a4fe283331cea6e8c6734c"
 DOWNLOAD_x86_64="http://www.perforce.com/downloads/perforce/r14.1/bin.linux26x86_64/p4v.tgz"
-MD5SUM_x86_64="f801f36570ff30e8c4d7dcc34bfebf54"
+MD5SUM_x86_64="8adb5e7f3400472bb05f1518dbd68efd"
 REQUIRES=""
 MAINTAINER="David Sullins"
 EMAIL="david.sullins@gmail.com"
diff --git a/development/pandas/pandas.SlackBuild b/development/pandas/pandas.SlackBuild
index e2c2d16c3f..2d1cd22cfa 100644
--- a/development/pandas/pandas.SlackBuild
+++ b/development/pandas/pandas.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pandas
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pandas
-VERSION=${VERSION:-0.16.2}
+VERSION=${VERSION:-0.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/pandas/pandas.info b/development/pandas/pandas.info
index 826cba19b1..3f4866222a 100644
--- a/development/pandas/pandas.info
+++ b/development/pandas/pandas.info
@@ -1,8 +1,8 @@
 PRGNAM="pandas"
-VERSION="0.16.2"
+VERSION="0.17.1"
 HOMEPAGE="http://pandas.pydata.org"
-DOWNLOAD="https://github.com/pydata/pandas/archive/v0.16.2.tar.gz"
-MD5SUM="3b05778198f39dbad9ffe1b6edd810dd"
+DOWNLOAD="https://github.com/pydata/pandas/archive/v0.17.1.tar.gz"
+MD5SUM="ef1c09e1d66c54a2b227fead292b0359"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Cython numpy python-dateutil pytz"
diff --git a/development/patchutils/patchutils.SlackBuild b/development/patchutils/patchutils.SlackBuild
index f9c1e1d372..1d5dd5c9aa 100644
--- a/development/patchutils/patchutils.SlackBuild
+++ b/development/patchutils/patchutils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for patchutils
 
-# Copyright 2008-2012  Robby Workman, Northport, Alabama, USA
+# Copyright 2008-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Updated by Donald Cooley <dfc@warpmail.net>
 
 PRGNAM=patchutils
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/patchutils/patchutils.info b/development/patchutils/patchutils.info
index 441cb88b61..261811c68a 100644
--- a/development/patchutils/patchutils.info
+++ b/development/patchutils/patchutils.info
@@ -1,8 +1,8 @@
 PRGNAM="patchutils"
-VERSION="0.3.3"
+VERSION="0.3.4"
 HOMEPAGE="http://cyberelk.net/tim/software/patchutils/"
-DOWNLOAD="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz"
-MD5SUM="b640b6b8af6183f83eacf7bd6d2460cb"
+DOWNLOAD="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.4.tar.xz"
+MD5SUM="ee95b5993d07ccdf27ca9f2cc4e6ffee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/php-apcu/README b/development/php-apcu/README
new file mode 100644
index 0000000000..88a373e284
--- /dev/null
+++ b/development/php-apcu/README
@@ -0,0 +1,10 @@
+APCu is userland caching: APC stripped of opcode caching in
+preparation for the deployment of Zend Optimizer+ as the
+primary solution to opcode caching in future versions of PHP.
+
+APCu only supports userland caching (and dumping) of variables,
+providing an upgrade path for the future. When O+ takes over,
+many will be tempted to use 3rd party solutions to userland
+caching, possibly even distributed solutions; this would be a
+grave error. The tried and tested APC codebase provides far
+superior support for local storage of PHP variables.
diff --git a/development/php-apcu/apc.ini b/development/php-apcu/apc.ini
new file mode 100644
index 0000000000..b76e42ac6f
--- /dev/null
+++ b/development/php-apcu/apc.ini
@@ -0,0 +1,5 @@
+extension=apcu.so
+apc.enabled=1
+apc.shm_size=32M
+apc.ttl=7200
+apc.enable_cli=1
diff --git a/development/php-apcu/php-apcu.SlackBuild b/development/php-apcu/php-apcu.SlackBuild
new file mode 100644
index 0000000000..918cfe3780
--- /dev/null
+++ b/development/php-apcu/php-apcu.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for "php-apcu".
+
+# Copyright 2015 Eugene Wissner <belka@caraus.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=php-apcu
+SRCNAM=apcu
+VERSION=${VERSION:-4.0.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$SRCNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+phpize
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --with-php-config=/usr/bin/php-config \
+  --build=$ARCH-slackware-linux
+
+make
+make INSTALL_ROOT=$PKG install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Copy default php configuration
+mkdir -p $PKG/etc/php
+cp -a $CWD/apc.ini $PKG/etc/php
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md NOTICE TECHNOTES.txt TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/php-apcu/php-apcu.info b/development/php-apcu/php-apcu.info
new file mode 100644
index 0000000000..e496d024de
--- /dev/null
+++ b/development/php-apcu/php-apcu.info
@@ -0,0 +1,10 @@
+PRGNAM="php-apcu"
+VERSION="4.0.7"
+HOMEPAGE="http://pecl.php.net/package/APCu/"
+DOWNLOAD="https://pecl.php.net/get/apcu-4.0.7.tgz"
+MD5SUM="9feb03d3e5217242a39244964f098b52"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/php-apcu/slack-desc b/development/php-apcu/slack-desc
new file mode 100644
index 0000000000..75ef89a7a9
--- /dev/null
+++ b/development/php-apcu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+php-apcu: php-apcu (APCu is userland caching)
+php-apcu:
+php-apcu: APC stripped of opcode caching in preparation for the deployment of
+php-apcu: Zend Optimizer+ as the primary solution to opcode caching in future
+php-apcu: versions of PHP.
+php-apcu:
+php-apcu: Homepage: http://pecl.php.net/package/APCu/
+php-apcu:
+php-apcu:
+php-apcu:
+php-apcu:
diff --git a/development/poedit/poedit.SlackBuild b/development/poedit/poedit.SlackBuild
index b1f4d904d1..3cdf1040ca 100644
--- a/development/poedit/poedit.SlackBuild
+++ b/development/poedit/poedit.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=poedit
-VERSION=${VERSION:-1.8.3}
+VERSION=${VERSION:-1.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/poedit/poedit.info b/development/poedit/poedit.info
index f10c0572bd..9c0c49a09c 100644
--- a/development/poedit/poedit.info
+++ b/development/poedit/poedit.info
@@ -1,8 +1,8 @@
 PRGNAM="poedit"
-VERSION="1.8.3"
+VERSION="1.8.6"
 HOMEPAGE="http://www.poedit.net"
-DOWNLOAD="https://github.com/vslavik/poedit/releases/download/v1.8.3-oss/poedit-1.8.3.tar.gz"
-MD5SUM="64de6bda79c0b8554da39e973f7d0ee6"
+DOWNLOAD="https://github.com/vslavik/poedit/releases/download/v1.8.6-oss/poedit-1.8.6.tar.gz"
+MD5SUM="c493b759b5201b2679a42e25dac90287"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3 LucenePlusPlus gtkspell3"
diff --git a/development/portaudio/README b/development/portaudio/README
index 7c5c15c44f..ccd250fc15 100644
--- a/development/portaudio/README
+++ b/development/portaudio/README
@@ -1,2 +1,7 @@
-PortAudio is a portable API for audio I/O. It allows people writing audio
-programs to easily access the audio devices.
+PortAudio provides a very simple API for recording and/or playing
+sound using a simple callback function or a blocking read/write
+interface. Example programs are included that play sine waves,
+process audio input (guitar fuzz), record and playback audio, list
+available audio devices, etc.
+
+Optional dependencies: jack-audio-connection-kit
diff --git a/development/portaudio/portaudio.SlackBuild b/development/portaudio/portaudio.SlackBuild
index 8624f6a782..b6091dcb64 100644
--- a/development/portaudio/portaudio.SlackBuild
+++ b/development/portaudio/portaudio.SlackBuild
@@ -1,36 +1,36 @@
 #!/bin/sh
 
-# Slackware build script for PortAudio.
+# Slackware build script for "PortAudio".
 #
-# Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
+# Copyright 2009-2015 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Marco Bonetti <marc@mos6581.de>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=portaudio
-VERSION=${VERSION:-V19}
-BUILD=${BUILD:-2}
+SRCNAM=pa
+VERSION=${VERSION:-v19_20140130}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# eek!
-SRCNAME="pa_stable_v19_20111121.tgz"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -44,8 +44,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE.txt README.txt"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -66,14 +64,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$SRCNAME
+tar xvf $CWD/${SRCNAM}_stable_${VERSION}.tgz
 cd $PRGNAM
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -88,11 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.configure.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/portaudio/portaudio.info b/development/portaudio/portaudio.info
index d788a1a853..d23c31ceb3 100644
--- a/development/portaudio/portaudio.info
+++ b/development/portaudio/portaudio.info
@@ -1,10 +1,10 @@
 PRGNAM="portaudio"
-VERSION="V19"
+VERSION="v19_20140130"
 HOMEPAGE="http://www.portaudio.com/"
-DOWNLOAD="http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz"
-MD5SUM="25c85c1cc5e9e657486cbc299c6c035a"
+DOWNLOAD="http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz"
+MD5SUM="7f220406902af9dca009668e198cbd23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/development/portaudio/slack-desc b/development/portaudio/slack-desc
index e588d42ffe..a09f85685e 100644
--- a/development/portaudio/slack-desc
+++ b/development/portaudio/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-portaudio: PortAudio (portable cross-platform audio API)
-portaudio:
-portaudio: PortAudio is a portable API for audio I/O. It allows people writing
-portaudio: audio programs to easily access the audio devices.
-portaudio:
-portaudio:
+portaudio: PortAudio (cross-platform audio I/O library)
 portaudio:
+portaudio: PortAudio provides a very simple API for recording and/or playing
+portaudio: sound using a simple callback function or a blocking read/write
+portaudio: interface. Example programs are included that play sine waves,
+portaudio: process audio input (guitar fuzz), record and playback audio, list
+portaudio: available audio devices, etc.
 portaudio:
 portaudio:
 portaudio:
diff --git a/development/pycharm/pycharm.SlackBuild b/development/pycharm/pycharm.SlackBuild
index b95f4e2740..8155601978 100644
--- a/development/pycharm/pycharm.SlackBuild
+++ b/development/pycharm/pycharm.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=pycharm
 EDITION=community
-VERSION=${VERSION:-4.5.3}
+VERSION=${VERSION:-5.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/pycharm/pycharm.info b/development/pycharm/pycharm.info
index 42c7d4238f..5be3365378 100644
--- a/development/pycharm/pycharm.info
+++ b/development/pycharm/pycharm.info
@@ -1,8 +1,8 @@
 PRGNAM="pycharm"
-VERSION="4.5.3"
+VERSION="5.0.3"
 HOMEPAGE="https://www.jetbrains.com/pycharm/"
-DOWNLOAD="http://download.jetbrains.com/python/pycharm-community-4.5.3.tar.gz"
-MD5SUM="a2770ba40056a57842c7384a887320d6"
+DOWNLOAD="http://download.jetbrains.com/python/pycharm-community-5.0.3.tar.gz"
+MD5SUM="9a62285ee71fdc00a928e131e4d55839"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/pyclewn/doinst.sh b/development/pyclewn/doinst.sh
index 2c7ff8c9e9..d4eda6ef79 100644
--- a/development/pyclewn/doinst.sh
+++ b/development/pyclewn/doinst.sh
@@ -1 +1 @@
-/usr/bin/vim -c "helptags /usr/share/vim/vimfiles/doc|q"
+/usr/bin/vim -c "helptags usr/share/vim/vimfiles/doc|q"
diff --git a/development/pylint/pylint.SlackBuild b/development/pylint/pylint.SlackBuild
index e6de592f1d..59b1473c27 100644
--- a/development/pylint/pylint.SlackBuild
+++ b/development/pylint/pylint.SlackBuild
@@ -3,10 +3,10 @@
 # Slackware build script for pylint
 
 # Written by Grissiom chaos.proton@gmail.com
-# Updated up to v. 1.3.1 by Serban Udrea (S.Udrea@gsi.de)
+# Updated up to v. 1.5.2 by Serban Udrea (S.Udrea@gsi.de)
 
 PRGNAM=pylint
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -29,7 +29,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -44,7 +44,7 @@ mkdir -p ${PKG}/usr/doc/$PRGNAM-$VERSION
 rm -rf ${PKG}/usr/share
 
 cp -a \
-  PKG-INFO README README.Python3 ChangeLog COPYING DEPENDS \
+  PKG-INFO README.rst ChangeLog COPYING DEPENDS \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/pylint/pylint.info b/development/pylint/pylint.info
index 2aa2dff7f7..3027ea8d20 100644
--- a/development/pylint/pylint.info
+++ b/development/pylint/pylint.info
@@ -1,8 +1,8 @@
 PRGNAM="pylint"
-VERSION="1.3.1"
+VERSION="1.5.2"
 HOMEPAGE="http://www.pylint.org"
-DOWNLOAD="http://pypi.python.org/packages/source/p/pylint/pylint-1.3.1.zip"
-MD5SUM="3fd88d02423e167cf130e9882075b2ac"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pylint/pylint-1.5.2.tar.gz"
+MD5SUM="a82352dee7cbdcc902a849b9b7e57e6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="astroid"
diff --git a/development/pyside-tools/pyside-tools.SlackBuild b/development/pyside-tools/pyside-tools.SlackBuild
index 64cc95816b..dfe5bd58fa 100644
--- a/development/pyside-tools/pyside-tools.SlackBuild
+++ b/development/pyside-tools/pyside-tools.SlackBuild
@@ -44,7 +44,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xzvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/development/pyvim/pyvim.SlackBuild b/development/pyvim/pyvim.SlackBuild
index 8004bb23dd..f25892a783 100644
--- a/development/pyvim/pyvim.SlackBuild
+++ b/development/pyvim/pyvim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyvim
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyvim
-VERSION=${VERSION:-0.0.5}
+VERSION=${VERSION:-0.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/pyvim/pyvim.info b/development/pyvim/pyvim.info
index 5c3c789dab..ce018c926a 100644
--- a/development/pyvim/pyvim.info
+++ b/development/pyvim/pyvim.info
@@ -1,8 +1,8 @@
 PRGNAM="pyvim"
-VERSION="0.0.5"
+VERSION="0.0.13"
 HOMEPAGE="https://github.com/jonathanslenders/pyvim"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyvim/pyvim-0.0.5.tar.gz"
-MD5SUM="25bb86dd20c72f4341b6cea908f4ad05"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyvim/pyvim-0.0.13.tar.gz"
+MD5SUM="65472c93b0da5b74d3f3a0ccaefcb39f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ptpython pyflakes"
diff --git a/development/qt-creator3/README b/development/qt-creator3/README
index 462426421b..5813cacf85 100644
--- a/development/qt-creator3/README
+++ b/development/qt-creator3/README
@@ -26,5 +26,5 @@ NOTES:
     follow:
     EXAMPLES=yes DOCS=yes ./qt5.SlackBuild
 
-    Upgrading from Qt5 5.4.0 to Qt5 5.4.1 can lead to errors
+    Upgrading from Qt5 5.4.* to Qt5 5.5 can lead to errors
     when building the Qt5 docs. So, remove Qt5 before upgrading.
diff --git a/development/qt-creator3/qt-creator3.SlackBuild b/development/qt-creator3/qt-creator3.SlackBuild
index 29097ea04f..789e0e726a 100644
--- a/development/qt-creator3/qt-creator3.SlackBuild
+++ b/development/qt-creator3/qt-creator3.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=qt-creator3
 SRCNAM=qt-creator
-VERSION=${VERSION:-3.4.2}
+VERSION=${VERSION:-3.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/qt-creator3/qt-creator3.info b/development/qt-creator3/qt-creator3.info
index 770b9f4163..9f383ea23d 100644
--- a/development/qt-creator3/qt-creator3.info
+++ b/development/qt-creator3/qt-creator3.info
@@ -1,8 +1,8 @@
 PRGNAM="qt-creator3"
-VERSION="3.4.2"
+VERSION="3.5.1"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt.io/official_releases/qtcreator/3.4/3.4.2/qt-creator-opensource-src-3.4.2.tar.gz"
-MD5SUM="4a72e361a07576c140d1d67a54b16226"
+DOWNLOAD="http://download.qt.io/official_releases/qtcreator/3.5/3.5.1/qt-creator-opensource-src-3.5.1.tar.gz"
+MD5SUM="77aef7df837eba07c7ce6037ee504c05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/development/racket/racket.SlackBuild b/development/racket/racket.SlackBuild
index 881a252ce9..41ab1ef8c4 100644
--- a/development/racket/racket.SlackBuild
+++ b/development/racket/racket.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=racket
-VERSION=${VERSION:-6.2}
+VERSION=${VERSION:-6.3}
 SUFFIX=src    # suffix of the UNIX sourcepackage
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/development/racket/racket.info b/development/racket/racket.info
index f91d424509..e24b395630 100644
--- a/development/racket/racket.info
+++ b/development/racket/racket.info
@@ -1,8 +1,8 @@
 PRGNAM="racket"
-VERSION="6.2"
+VERSION="6.3"
 HOMEPAGE="http://racket-lang.org/"
-DOWNLOAD="http://mirror.racket-lang.org/installers/6.2/racket-6.2-src.tgz"
-MD5SUM="4ef7892c546355a2afa851f06177e6bc"
+DOWNLOAD="http://mirror.informatik.uni-tuebingen.de/mirror/racket/6.3/racket-6.3-src.tgz"
+MD5SUM="006e110f0fafdd52ceeb461c5c89aed9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/re2c/re2c.SlackBuild b/development/re2c/re2c.SlackBuild
index 4619078752..a4954c9dbf 100644
--- a/development/re2c/re2c.SlackBuild
+++ b/development/re2c/re2c.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for re2c
 
-# Copyright 2008-2014  LukenShiro, Italy
+# Copyright 2008-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=re2c
-VERSION=${VERSION:-0.13.7.4}
+VERSION=${VERSION:-0.14.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/re2c/re2c.info b/development/re2c/re2c.info
index 5f82749d77..c24edabd18 100644
--- a/development/re2c/re2c.info
+++ b/development/re2c/re2c.info
@@ -1,8 +1,8 @@
 PRGNAM="re2c"
-VERSION="0.13.7.4"
+VERSION="0.14.3"
 HOMEPAGE="http://re2c.org/"
-DOWNLOAD="http://downloads.sourceforge.net/re2c/re2c-0.13.7.4.tar.gz"
-MD5SUM="9e356e2e63b90e9b4d1e048795d46928"
+DOWNLOAD="http://downloads.sourceforge.net/re2c/re2c-0.14.3.tar.gz"
+MD5SUM="9d6914369494ea924a1dd7d96715cdc0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/robomongo/robomongo.SlackBuild b/development/robomongo/robomongo.SlackBuild
index 9d881112e6..2091165fd4 100644
--- a/development/robomongo/robomongo.SlackBuild
+++ b/development/robomongo/robomongo.SlackBuild
@@ -5,12 +5,11 @@
 
 PRGNAM="robomongo"
 VERSION=${VERSION:-0.8.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    x86_64)
+case "$( uname -m )" in
+   x86_64)
 		ANAME=x86_64
 		ARCH=$( uname -m )
 		LIB=lib64
@@ -22,8 +21,7 @@ if [ -z "$ARCH" ]; then
 		;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
-  esac
-fi
+esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index cada371768..ce3e441e6f 100644
--- a/development/rust/rust.SlackBuild
+++ b/development/rust/rust.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=rust
 PRGNAM2=cargo
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/rust/rust.info b/development/rust/rust.info
index c9dc4c367b..ccb58f3254 100644
--- a/development/rust/rust.info
+++ b/development/rust/rust.info
@@ -1,10 +1,10 @@
 PRGNAM="rust"
-VERSION="1.1.0"
+VERSION="1.5.0"
 HOMEPAGE="http://www.rust-lang.org"
-DOWNLOAD="https://static.rust-lang.org/dist/rust-1.1.0-i686-unknown-linux-gnu.tar.gz"
-MD5SUM="b533eb1e22ce177a1d535e2f70c332ea"
-DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-unknown-linux-gnu.tar.gz"
-MD5SUM_x86_64="0faa60bcb3c11324609f7f0bf42ffbd7"
+DOWNLOAD="https://static.rust-lang.org/dist/rust-1.5.0-i686-unknown-linux-gnu.tar.gz"
+MD5SUM="9f02673a3b0897ea81196fd30e685eea"
+DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rust-1.5.0-x86_64-unknown-linux-gnu.tar.gz"
+MD5SUM_x86_64="689c69a7194e9fb2f96671e555bd2f7f"
 REQUIRES=""
 MAINTAINER="Dmitrii Sosedov"
 EMAIL="dmitrii@sosedov.org"
diff --git a/development/rust/slack-desc b/development/rust/slack-desc
index bdad3f0ccd..c5b9708d16 100644
--- a/development/rust/slack-desc
+++ b/development/rust/slack-desc
@@ -15,5 +15,5 @@ rust: operational - that preserve large-system integrity, availability and
 rust: concurrency.
 rust:
 rust: Homepage: http://rust-lang.org
-rust: Release date: Jun 25, 2015
+rust: Release date: Dec 10, 2015
 rust:
diff --git a/development/sbcl/README b/development/sbcl/README
index 364732890f..92b8b51afb 100644
--- a/development/sbcl/README
+++ b/development/sbcl/README
@@ -1,6 +1,6 @@
-Steel Bank Common Lisp (SBCL) is an open source (free software)
-compiler and runtime system for ANSI Common Lisp. It provides an
-interactive environment including an integrated native compiler,
-a debugger, and many extensions.
-
-This is from the pre-compiled linux binary supplied by SBCL.
+Steel Bank Common Lisp (SBCL) is a high performance Common Lisp
+compiler. It is open source / free software, with a permissive
+license. In addition to the compiler and runtime system for ANSI
+Common Lisp, it provides an interactive environment including a
+debugger, a statistical profiler, a code coverage tool, and many
+other extensions.
diff --git a/development/sbcl/sbcl.SlackBuild b/development/sbcl/sbcl.SlackBuild
index 8cc73eee69..d63cabc6a5 100644
--- a/development/sbcl/sbcl.SlackBuild
+++ b/development/sbcl/sbcl.SlackBuild
@@ -1,21 +1,40 @@
 #!/bin/sh
 
-### sbcl.SlackBuild ###
-
-# Slackware build script for sbcl (Steel Bank Common Lisp)
-# written by paul wisehart paul@oldcode.org
+# Slackware build script for sbcl
+
+# Copyright 2006 - 2015 Paul Wisehart, <paul at oldcode dot org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Eugene M., <damagedone at gmx dot com>
 
 PRGNAM=sbcl
-VERSION=${VERSION:-1.0.50}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-#ARCH should
 if [ -z "$ARCH" ]; then
-    case "$( uname -m )" in
-        i?86) ARCH=i486 ;;
-        *) ARCH=$( uname -m ) ;;
-    esac
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
 fi
 
 CWD=$(pwd)
@@ -24,14 +43,17 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-    LIBDIRSUFFIX=""
-    FNAM=$PRGNAM-$VERSION-x86-linux-binary
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-    LIBDIRSUFFIX="64"
-    FNAM=$PRGNAM-$VERSION-x86-64-linux-binary
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
-    echo "Architecture [$ARCH] not supported."
-    exit 1
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -39,51 +61,56 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
-rm -rf $(basename $FNAM "-binary") #the resulting directory doesnt have the "-binary"
-tar xvf $CWD/$FNAM.tar.bz2
-cd $(basename $FNAM "-binary")
-
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir ${PKG}/usr
-INSTALL_ROOT=${PKG}/usr sh install.sh
+sh make.sh clisp --prefix=/usr --fancy
 
-#fixup /usr/lib -> /usr/lib64 if on x86_64:
-if [ "$ARCH" = "x86_64" ]; then
-  cd $PKG/usr
-    mv lib lib${LIBDIRSUFFIX}
-  cd -
-fi
+make -C doc/manual info pdf
 
-cd $PKG/usr/share
-  mv man ..
-  mv doc ..
-cd -
+SBCL_HOME="" \
+INSTALL_ROOT=$PKG/usr \
+MAN_DIR=$PKG/usr/man \
+INFO_DIR=$PKG/usr/info \
+DOC_DIR=$PKG/usr/doc/$PRGNAM-$VERSION \
+sh install.sh
 
-cd $PKG/usr/doc
-  mv $PRGNAM $PRGNAM-$VERSION
-  rm -rf  $PKG/usr/share
-cd -
+# Fixup /usr/lib -> /usr/lib64 if on x86_64:
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+fi
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-#get rid of unneeded zero-length files.
-cd $PKG
-    find . -name "test-passed" -type f -exec rm -f {} \;
-cd -
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
 
-# scripts in profile.d that set SBCL_HOME
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a HACKING INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Set SBCL_HOME path
 mkdir -p $PKG/etc/profile.d
-cp $CWD/sbcl.csh $CWD/sbcl.sh $PKG/etc/profile.d
+cat > $PKG/etc/profile.d/sbcl.csh << EOF
+#!/bin/csh
+setenv SBCL_HOME /usr/lib${LIBDIRSUFFIX}/sbcl
+EOF
+cat > $PKG/etc/profile.d/sbcl.sh << EOF
+#!/bin/sh
+export SBCL_HOME=/usr/lib${LIBDIRSUFFIX}/sbcl
+EOF
 chmod 0755 $PKG/etc/profile.d/*
 
 mkdir -p $PKG/install
diff --git a/development/sbcl/sbcl.csh b/development/sbcl/sbcl.csh
deleted file mode 100644
index 11dd1604ce..0000000000
--- a/development/sbcl/sbcl.csh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/csh
-
-if (`uname -m` == "x86_64") then
-    set LIBDIRSUFFIX="64"
-else
-    set LIBDIRSUFFIX=""
-endif
-
-setenv SBCL_HOME /usr/lib${LIBDIRSUFFIX}/sbcl
-
diff --git a/development/sbcl/sbcl.info b/development/sbcl/sbcl.info
index 2864e707d2..0da1c80288 100644
--- a/development/sbcl/sbcl.info
+++ b/development/sbcl/sbcl.info
@@ -1,10 +1,10 @@
 PRGNAM="sbcl"
-VERSION="1.0.50"
+VERSION="1.3.1"
 HOMEPAGE="http://www.sbcl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-x86-linux-binary.tar.bz2"
-MD5SUM="f97585bbe221e4a1441e9bcfa5ba8edc"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-x86-64-linux-binary.tar.bz2"
-MD5SUM_x86_64="5dceb09a03ce515e12bfe51607d0de21"
+DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-1.3.1-source.tar.bz2"
+MD5SUM="ea47f40d22e074c2e022ae7c2a8df7c1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Paul Wisehart"
-EMAIL="paul@oldcode.org"
+MAINTAINER="Eugene M."
+EMAIL="damagedone@gmx.com"
diff --git a/development/sbcl/sbcl.sh b/development/sbcl/sbcl.sh
deleted file mode 100644
index 5eec0d3de8..0000000000
--- a/development/sbcl/sbcl.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ $(uname -m) = "x86_64" ]; then
-    LIBDIRSUFFIX="64"
-else
-    LIBDIRSUFFIX=""
-fi
-
-export SBCL_HOME=/usr/lib${LIBDIRSUFFIX}/sbcl
-
diff --git a/development/sbcl/slack-desc b/development/sbcl/slack-desc
index 832b0df43d..68f9c7622e 100644
--- a/development/sbcl/slack-desc
+++ b/development/sbcl/slack-desc
@@ -14,6 +14,6 @@ sbcl: interactive environment including an integrated native compiler,
 sbcl: a debugger, and many extensions.
 sbcl:
 sbcl:
-sbcl:
+sbcl: Homepage: http://www.sbcl.org/
 sbcl:
 sbcl:
diff --git a/development/scala/profile.d/scala.csh b/development/scala/profile.d/scala.csh
index ac90ddc545..c7258711dd 100644
--- a/development/scala/profile.d/scala.csh
+++ b/development/scala/profile.d/scala.csh
@@ -1,4 +1,2 @@
 #!/bin/csh
 setenv SCALA_HOME @LIBDIR@/scala
-setenv MANPATH ${MANPATH}:${SCALA_HOME}/man
-setenv PATH ${PATH}:${SCALA_HOME}/bin
diff --git a/development/scala/profile.d/scala.sh b/development/scala/profile.d/scala.sh
index a53787d419..bb58bb3824 100644
--- a/development/scala/profile.d/scala.sh
+++ b/development/scala/profile.d/scala.sh
@@ -1,4 +1,2 @@
 #!/bin/sh
 export SCALA_HOME=@LIBDIR@/scala
-export MANPATH="${MANPATH}:${SCALA_HOME}/man"
-export PATH="${PATH}:${SCALA_HOME}/bin"
diff --git a/development/scala/scala.SlackBuild b/development/scala/scala.SlackBuild
index d530573f2b..b88f620786 100644
--- a/development/scala/scala.SlackBuild
+++ b/development/scala/scala.SlackBuild
@@ -4,9 +4,10 @@
 
 # Written by Matthias Diehn Ingesman (matthias@pf-c.dk)
 # Public domain.
+# Updated by Andre Barboza <bmg.andre@gmail.com>
 
 PRGNAM=scala
-VERSION=${VERSION:-2.7.7.final}
+VERSION=${VERSION:-2.11.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -23,11 +24,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Binary repackaging, so no compile-flags needed
 if [ "$ARCH" = "x86_64" ]; then
-  LIBDIR="/usr/lib64"
+  LIBDIRSUFFIX="64"
 else
-  LIBDIR="/usr/lib"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -40,28 +40,36 @@ tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/$LIBDIR/$PRGNAM
-mv $TMP/$PRGNAM-$VERSION/{bin,lib,man,meta,misc,src} $PKG/$LIBDIR/$PRGNAM
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM $PKG/usr/{bin,man,doc}
+mv $TMP/$PRGNAM-$VERSION/{bin,lib} $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+(
+  cd $PKG/usr/bin
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/fsc
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scala
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scalac
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scalap
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scaladoc
+)
+rm $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin/*.bat
+mv $TMP/$PRGNAM-$VERSION/man $PKG/usr/
 
 # No need to install these with a .new extension
 mkdir -p $PKG/etc/profile.d
-sed "s%@LIBDIR@%$LIBDIR%" $CWD/profile.d/scala.sh > \
+sed "s%@LIBDIR@%/usr/lib$LIBDIRSUFFIX%" $CWD/profile.d/scala.sh > \
     $PKG/etc/profile.d/scala.sh
-sed "s%@LIBDIR@%$LIBDIR%" $CWD/profile.d/scala.csh > \
+sed "s%@LIBDIR@%/usr/lib$LIBDIRSUFFIX%" $CWD/profile.d/scala.csh > \
     $PKG/etc/profile.d/scala.csh
 chmod 0755 $PKG/etc/profile.d/*
 
-( cd $PKG/$LIBDIR/$PRGNAM/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $TMP/$PRGNAM-$VERSION/doc/ $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/scala/scala.info b/development/scala/scala.info
index c94040434b..10f6f683af 100644
--- a/development/scala/scala.info
+++ b/development/scala/scala.info
@@ -1,10 +1,10 @@
 PRGNAM="scala"
-VERSION="2.7.7.final"
+VERSION="2.11.7"
 HOMEPAGE="http://www.scala-lang.org/"
-DOWNLOAD="http://www.scala-lang.org/files/archive/scala-2.7.7.final.tgz"
-MD5SUM="5d2294d5aab72fec869c0ba666d28b7e"
+DOWNLOAD="http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz"
+MD5SUM="ad81770762ec65099daf77493a591d7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Matthias Diehn Ingesman"
-EMAIL="matthias@pf-c.dk"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
diff --git a/development/scons/scons.SlackBuild b/development/scons/scons.SlackBuild
index e7929b8cb7..559c5c625c 100644
--- a/development/scons/scons.SlackBuild
+++ b/development/scons/scons.SlackBuild
@@ -9,7 +9,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -23,10 +23,10 @@
 
 # You may have received a copy of the GNU General Public License along
 # with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 PRGNAM=scons
-VERSION=${VERSION:-2.3.4}
+VERSION=${VERSION:-2.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/scons/scons.info b/development/scons/scons.info
index b75ad78515..13ac8383c6 100644
--- a/development/scons/scons.info
+++ b/development/scons/scons.info
@@ -1,8 +1,8 @@
 PRGNAM="scons"
-VERSION="2.3.4"
+VERSION="2.4.1"
 HOMEPAGE="http://www.scons.org/"
-DOWNLOAD="http://downloads.sourceforge.net/scons/scons-2.3.4.tar.gz"
-MD5SUM="91fbbb67c2c65b03c746601baac4a6a5"
+DOWNLOAD="http://downloads.sourceforge.net/scons/scons-2.4.1.tar.gz"
+MD5SUM="9a0ddf33d9839f04380e0fae87cc4b40"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/simulavr/README b/development/simulavr/README
new file mode 100644
index 0000000000..df4ace7230
--- /dev/null
+++ b/development/simulavr/README
@@ -0,0 +1,14 @@
+The SimulAVR program is a simulator for the Atmel AVR family of
+microcontrollers (ATtiny and ATmega). SimulAVR can be used either
+standalone or as a remote target for avr-gdb. There is a python
+and TCL interface. When used in gdbserver mode, the simulator is used
+as a back-end so that avr-gdb can be used as a source level debugger
+for AVR programs.
+
+SimulAVR started out as a C based project written by Theodore Roth
+in 2001. Klaus Rudolph started then in 2004 to rewrite the hardware
+simulation part in C++. Only the instruction decoder and the avr-gdb
+interface are mostly copied from the original simulavr sources.
+This C++ based version was known as simulavrxx until it became
+feature compatibile with the old simulavr code, then it
+was renamed back to simulavr.
diff --git a/development/simulavr/doinst.sh b/development/simulavr/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/development/simulavr/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/development/simulavr/simulavr.SlackBuild b/development/simulavr/simulavr.SlackBuild
new file mode 100644
index 0000000000..79ff684358
--- /dev/null
+++ b/development/simulavr/simulavr.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for SimulAVR
+
+# Copyright 2014 R. S. Ananda Murthy, Mysore, India
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=simulavr
+VERSION=${VERSION:-git20151002}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./bootstrap
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --with-tclconfig=/usr/lib${LIBDIRSUFFIX} \
+  --enable-verilog \
+  --enable-tcl
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress info pages and remove the package's dir file
+# If no info pages are installed by the software, don't leave this in the script
+mv $PKG/usr/share/info $PKG/usr
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README.* INSTALL doc/simulavr.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/simulavr/simulavr.info b/development/simulavr/simulavr.info
new file mode 100644
index 0000000000..72edaee57c
--- /dev/null
+++ b/development/simulavr/simulavr.info
@@ -0,0 +1,10 @@
+PRGNAM="simulavr"
+VERSION="git20151002"
+HOMEPAGE="http://www.nongnu.org/simulavr/"
+DOWNLOAD="https://www.dropbox.com/s/r7ybvxhibhq86ki/simulavr-git20151002.tar.gz"
+MD5SUM="3b9f1fd532fb9287738b47e90f91f56e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="avr-gcc avr-libc"
+MAINTAINER="R. S. Ananda Murthy"
+EMAIL="rsamurti@gmail.com"
diff --git a/development/simulavr/slack-desc b/development/simulavr/slack-desc
new file mode 100644
index 0000000000..96a912d7be
--- /dev/null
+++ b/development/simulavr/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+simulavr: simulavr (A Simulator for Atmel AVR Family of Microcontrollers)
+simulavr:
+simulavr: SimulAVR can be used either standalone or as a remote target
+simulavr: for avr-gdb. There is a Python and TCL interface. When used in
+simulavr: gdbserver mode, the simulator is used as a back-end so that
+simulavr: avr-gdb can be used as a source level debugger for AVR programs.
+simulavr:
+simulavr:
+simulavr:
+simulavr:
+simulavr:
diff --git a/development/smalltalk/smalltalk.SlackBuild b/development/smalltalk/smalltalk.SlackBuild
index b7c4596d98..25e0e8e964 100644
--- a/development/smalltalk/smalltalk.SlackBuild
+++ b/development/smalltalk/smalltalk.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/development/smartgit/smartgit.SlackBuild b/development/smartgit/smartgit.SlackBuild
index 397603713a..c621bcb07a 100644
--- a/development/smartgit/smartgit.SlackBuild
+++ b/development/smartgit/smartgit.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="smartgit"
-VERSION=${VERSION:-6.5.8}
+VERSION=${VERSION:-7.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
diff --git a/development/smartgit/smartgit.info b/development/smartgit/smartgit.info
index a3445401d9..400a9d4056 100644
--- a/development/smartgit/smartgit.info
+++ b/development/smartgit/smartgit.info
@@ -1,8 +1,8 @@
 PRGNAM="smartgit"
-VERSION="6.5.8"
+VERSION="7.0.3"
 HOMEPAGE="http://www.syntevo.com/smartgit/"
-DOWNLOAD="http://www.syntevo.com/downloads/smartgit/smartgit-generic-6_5_8.tar.gz"
-MD5SUM="84ebfa3fbd5e039b740971c511f705ce"
+DOWNLOAD="http://www.syntevo.com/downloads/smartgit/smartgit-generic-7_0_3.tar.gz"
+MD5SUM="a33819ab59229049d5b847d78b72c0c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/development/spin/spin.SlackBuild b/development/spin/spin.SlackBuild
index 2ee42e5226..11150e292c 100644
--- a/development/spin/spin.SlackBuild
+++ b/development/spin/spin.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/spyder/spyder.SlackBuild b/development/spyder/spyder.SlackBuild
index 99f5cf5b69..bef00bb9f2 100644
--- a/development/spyder/spyder.SlackBuild
+++ b/development/spyder/spyder.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for spyder
 
-# Copyright 2010-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spyder
-VERSION=${VERSION:-2.3.5.2}
+VERSION=${VERSION:-2.3.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,9 @@ find -L . \
 # change doc/conf.py to Unix format.  Simple hack! :/
 for FILE in $(find . -type f \( ! -iname "*\.*o" ! -iname "*\.png" \) \
   | xargs grep -Pl '\r$'); do
-  sed -i 's/\r//g' $FILE
+  sed -e 's/\r//g' $FILE > ${FILE}.new
+  touch -r $FILE ${FILE}.new
+  mv ${FILE}.new $FILE
 done
 
 python setup.py install --root=$PKG
diff --git a/development/spyder/spyder.info b/development/spyder/spyder.info
index d7c52bb8a1..fc5edd75a2 100644
--- a/development/spyder/spyder.info
+++ b/development/spyder/spyder.info
@@ -1,8 +1,8 @@
 PRGNAM="spyder"
-VERSION="2.3.5.2"
+VERSION="2.3.8"
 HOMEPAGE="https://github.com/spyder-ide/spyder"
-DOWNLOAD="https://bitbucket.org/spyder-ide/spyderlib/downloads/spyder-2.3.5.2.zip"
-MD5SUM="debf130130a7bef188b3bdfedb7b3c70"
+DOWNLOAD="https://bitbucket.org/spyder-ide/spyderlib/downloads/spyder-2.3.8.zip"
+MD5SUM="fb890dc956f606c43d560558159f3491"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/src-vcs/src-vcs.SlackBuild b/development/src-vcs/src-vcs.SlackBuild
index 2c556639b3..066c9c0434 100644
--- a/development/src-vcs/src-vcs.SlackBuild
+++ b/development/src-vcs/src-vcs.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/textadept/textadept.SlackBuild b/development/textadept/textadept.SlackBuild
index 8e84db487d..34d652b5f8 100644
--- a/development/textadept/textadept.SlackBuild
+++ b/development/textadept/textadept.SlackBuild
@@ -1,10 +1,11 @@
 #!/bin/sh
+
 # Slackware build script for textadept
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -18,10 +19,10 @@
 
 # You may have received a copy of the GNU General Public License
 # along with this program (most likely, a file named COPYING). If
-# not, see <http://www.gnu.org/licenses/>.
+# not, see <https://www.gnu.org/licenses/>.
 
 PRGNAM=textadept
-VERSION=${VERSION:-8.1}
+VERSION=${VERSION:-8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/textadept/textadept.info b/development/textadept/textadept.info
index 85019a2661..e0b8da7085 100644
--- a/development/textadept/textadept.info
+++ b/development/textadept/textadept.info
@@ -1,10 +1,10 @@
 PRGNAM="textadept"
-VERSION="8.1"
+VERSION="8.5"
 HOMEPAGE="http://foicica.com/textadept/"
-DOWNLOAD="http://foicica.com/textadept/download/textadept_8.1.i386.tgz"
-MD5SUM="70ca191278b4a6b9592c3893aad83bc2"
-DOWNLOAD_x86_64="http://foicica.com/textadept/download/textadept_8.1.x86_64.tgz"
-MD5SUM_x86_64="2c5b23dd1d74fa34baf47f5d69a347f7"
+DOWNLOAD="http://foicica.com/textadept/download/textadept_8.5.i386.tgz"
+MD5SUM="81464f47fabc7e4283c65438a0fbf903"
+DOWNLOAD_x86_64="http://foicica.com/textadept/download/textadept_8.5.x86_64.tgz"
+MD5SUM_x86_64="ebabdad211f81e2d81cfbcb1c10d1cec"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/development/thunderpad/thunderpad.SlackBuild b/development/thunderpad/thunderpad.SlackBuild
index 38c8e8bf7d..c46507493c 100644
--- a/development/thunderpad/thunderpad.SlackBuild
+++ b/development/thunderpad/thunderpad.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/development/tiled-qt/tiled-qt.info b/development/tiled-qt/tiled-qt.info
index 53086d49a0..0a2121aa06 100644
--- a/development/tiled-qt/tiled-qt.info
+++ b/development/tiled-qt/tiled-qt.info
@@ -2,7 +2,7 @@ PRGNAM="tiled-qt"
 VERSION="0.12.3"
 HOMEPAGE="http://www.mapeditor.org"
 DOWNLOAD="https://github.com/bjorn/tiled/archive/v0.12.3/tiled-0.12.3.tar.gz"
-MD5SUM="8461fe02ebe7d64f963cab6cda4607cd"
+MD5SUM="b3afda73d80b70b96351ea2de8e0959c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/tyrutils-ericw/README b/development/tyrutils-ericw/README
new file mode 100644
index 0000000000..8b0d380166
--- /dev/null
+++ b/development/tyrutils-ericw/README
@@ -0,0 +1,19 @@
+tyrutils-ericw is a branch of Tyrann's quake 1 tools, focused on adding lighting features, mostly
+borrowed from q3map2. There are a few bugfixes for qbsp as well. Original readme follows:
+
+A collection of command line utilities for building Quake levels and working with various Quake file
+formats. I need to work on the documentation a bit more, but below are some brief descriptions of the
+tools.
+
+Included utilities:
+
+  qbsp    - Used for turning a .map file into a playable .bsp file.
+
+  light   - Used for lighting a level after the bsp stage.
+            This util was previously known as TyrLite
+
+  vis     - Creates the potentially visible set (PVS) for a bsp.
+
+  bspinfo - Print stats about the data contained in a bsp file.
+
+  bsputil - Simple tool for manipulation of bsp file data.
diff --git a/development/tyrutils-ericw/slack-desc b/development/tyrutils-ericw/slack-desc
new file mode 100644
index 0000000000..e66788e240
--- /dev/null
+++ b/development/tyrutils-ericw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+	      |-----handy-ruler------------------------------------------------------|
+tyrutils-ericw: tyrutils-ericw (Quake/Hexen 2 Map Compiling Tools)
+tyrutils-ericw:      
+tyrutils-ericw: tyrutils-ericw is a branch of Tyrann's quake 1 tools, focused on
+tyrutils-ericw: adding lighting features, mostly borrowed from q3map2. There are a 
+tyrutils-ericw: few bugfixes for qbsp as well. 
+tyrutils-ericw: 
+tyrutils-ericw: Homepage: https://github.com/ericwa/tyrutils-ericw
+tyrutils-ericw:
+tyrutils-ericw:
+tyrutils-ericw:
+tyrutils-ericw:
diff --git a/development/tyrutils-ericw/tyrutils-ericw.SlackBuild b/development/tyrutils-ericw/tyrutils-ericw.SlackBuild
new file mode 100644
index 0000000000..d1eb613c04
--- /dev/null
+++ b/development/tyrutils-ericw/tyrutils-ericw.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for tyrutils-ericw
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tyrutils-ericw
+VERSION=${VERSION:-0.15.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-ericw-v$VERSION.tar.gz || tar xvf $CWD/ericw-v$VERSION.tar.gz
+cd $PRGNAM-ericw-v$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+make
+
+# Copies over compiled binaries
+install -D -m 0755 bin/bspinfo $PKG/usr/bin/bspinfo
+install -D -m 0755 bin/bsputil $PKG/usr/bin/bsputil
+install -D -m 0755 bin/light   $PKG/usr/bin/light
+install -D -m 0755 bin/qbsp    $PKG/usr/bin/qbsp
+install -D -m 0755 bin/vis     $PKG/usr/bin/vis
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt COPYING changelog.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/tyrutils-ericw/tyrutils-ericw.info b/development/tyrutils-ericw/tyrutils-ericw.info
new file mode 100644
index 0000000000..2587b560ed
--- /dev/null
+++ b/development/tyrutils-ericw/tyrutils-ericw.info
@@ -0,0 +1,10 @@
+PRGNAM="tyrutils-ericw"
+VERSION="0.15.4"
+HOMEPAGE="https://github.com/ericwa/tyrutils-ericw"
+DOWNLOAD="https://github.com/ericwa/tyrutils-ericw/archive/ericw-v0.15.4.tar.gz"
+MD5SUM="5c1ac216de0f2e657cf0d0bc7b302ce1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/development/ucpp/README b/development/ucpp/README
new file mode 100644
index 0000000000..d50af6cc71
--- /dev/null
+++ b/development/ucpp/README
@@ -0,0 +1,16 @@
+A C preprocessor is a part of a C compiler responsible for macro
+replacement, conditional compilation and inclusion of header files.
+It is often found as a stand-alone program on Unix systems.
+
+ucpp is such a preprocessor; it is designed to be quick and light,
+but anyway fully compliant to the ISO standard 9899:1999, also known
+as C99. ucpp can be compiled as a stand-alone program, or linked to
+some other code; in the latter case, ucpp will output tokens, one
+at a time, on demand, as an integrated lexer.
+
+ucpp operates in two modes:
+-- lexer mode: ucpp is linked to some other code and outputs a stream of
+tokens (each call to the lex() function will yield one token)
+-- non-lexer mode: ucpp preprocesses text and outputs the resulting text
+to a file descriptor; if linked to some other code, the cpp() function
+must be called repeatedly, otherwise ucpp is a stand-alone binary.
diff --git a/development/ucpp/slack-desc b/development/ucpp/slack-desc
new file mode 100644
index 0000000000..c0dabb4a06
--- /dev/null
+++ b/development/ucpp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+ucpp: ucpp (C preprocessor compliant to ISO-C99)
+ucpp:
+ucpp: A C preprocessor designed to be embeddable, quick, light and fully
+ucpp: compliant to ISO Standard 9899:1999, aka ISO C99, or simply, C99.
+ucpp:
+ucpp: Homepage: https://github.com/scarabeusiv/ucpp
+ucpp:
+ucpp:
+ucpp:
+ucpp:
+ucpp:
diff --git a/development/ucpp/ucpp.SlackBuild b/development/ucpp/ucpp.SlackBuild
new file mode 100644
index 0000000000..1592202c7b
--- /dev/null
+++ b/development/ucpp/ucpp.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for ucpp
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ucpp
+VERSION=${VERSION:-1.3.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sh autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog.old READM* TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/ucpp/ucpp.info b/development/ucpp/ucpp.info
new file mode 100644
index 0000000000..322e147d86
--- /dev/null
+++ b/development/ucpp/ucpp.info
@@ -0,0 +1,10 @@
+PRGNAM="ucpp"
+VERSION="1.3.4"
+HOMEPAGE="https://github.com/scarabeusiv/ucpp"
+DOWNLOAD="https://github.com/scarabeusiv/ucpp/archive/1.3.4.tar.gz"
+MD5SUM="7d169055b45f0f4fb4b91a92a1ef5d5a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/development/universal-ctags/README b/development/universal-ctags/README
new file mode 100644
index 0000000000..ec179dbaab
--- /dev/null
+++ b/development/universal-ctags/README
@@ -0,0 +1,14 @@
+universal-ctags has the objective of continuing the development from
+what existed in the Sourceforge area. Github exuberant-ctags
+repository was started by Reza Jelveh and was later moved to the
+universal-ctags organization.
+
+The goal of the project is preparing and maintaining common/unified working
+space where people interested in making ctags better can work
+together.
+
+Note that the resulting package will overwrite Exuberant Ctags included in
+Slackware's vim package:
+/usr/bin/ctags
+/usr/man/man1/ctags.1.gz
+In case you remove this package, you'll need to reinstall vim.
diff --git a/development/universal-ctags/slack-desc b/development/universal-ctags/slack-desc
new file mode 100644
index 0000000000..4635b7342e
--- /dev/null
+++ b/development/universal-ctags/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+universal-ctags: universal-ctags (generate tag files for source code)
+universal-ctags:
+universal-ctags: universal-ctags has the objective of continuing the development from
+universal-ctags: what existed in the Sourceforge area. Github exuberant-ctags
+universal-ctags: repository was started by Reza Jelveh and was later moved to the
+universal-ctags: universal-ctags organization.
+universal-ctags:
+universal-ctags: The goal of the project is preparing and maintaining common/unified
+universal-ctags: working space where people interested in making ctags better can work
+universal-ctags: together.
+universal-ctags:
diff --git a/development/universal-ctags/universal-ctags.SlackBuild b/development/universal-ctags/universal-ctags.SlackBuild
new file mode 100644
index 0000000000..48d740a357
--- /dev/null
+++ b/development/universal-ctags/universal-ctags.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for universal-ctags
+
+# Copyright 2015 Eugene Wissner Dachau
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=universal-ctags
+VERSION=${VERSION:-8efa556}
+GITVERSION=${GITVERSION:-8efa5561fb3cf1b0402679c0d2c5514690bdc5a8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+SRCNAM=ctags
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$GITVERSION
+unzip $CWD/$SRCNAM-$GITVERSION.zip || unzip $CWD/$GITVERSION.zip
+cd $SRCNAM-$GITVERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+autoreconf -vfi
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING docs/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/universal-ctags/universal-ctags.info b/development/universal-ctags/universal-ctags.info
new file mode 100644
index 0000000000..c026ba2533
--- /dev/null
+++ b/development/universal-ctags/universal-ctags.info
@@ -0,0 +1,10 @@
+PRGNAM="universal-ctags"
+VERSION="8efa556"
+HOMEPAGE="https://ctags.io/"
+DOWNLOAD="https://github.com/universal-ctags/ctags/archive/8efa5561fb3cf1b0402679c0d2c5514690bdc5a8.zip"
+MD5SUM="50b28787b42f6716d361436e3356ea30"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/development/vala/vala.SlackBuild b/development/vala/vala.SlackBuild
index b0f321dc66..7010391848 100644
--- a/development/vala/vala.SlackBuild
+++ b/development/vala/vala.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vala
-VERSION=${VERSION:-0.28.0}
+VERSION=${VERSION:-0.26.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/vala/vala.info b/development/vala/vala.info
index b88de55f03..029e62ce53 100644
--- a/development/vala/vala.info
+++ b/development/vala/vala.info
@@ -1,8 +1,8 @@
 PRGNAM="vala"
-VERSION="0.28.0"
+VERSION="0.26.2"
 HOMEPAGE="http://live.gnome.org/Vala"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vala/0.28/vala-0.28.0.tar.xz"
-MD5SUM="8d4ceac3451a0d5497e7be38e5e4c2ad"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vala/0.26/vala-0.26.2.tar.xz"
+MD5SUM="cb712cc5785e2133d58af9e54b2c79db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/valgrind/configure.patch b/development/valgrind/configure.patch
new file mode 100644
index 0000000000..0890cabed9
--- /dev/null
+++ b/development/valgrind/configure.patch
@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index 78ddf3e..a730c3d 100755
+--- a/configure
++++ b/configure
+@@ -5553,7 +5553,7 @@ $as_echo_n "checking for the kernel version... " >&6; }
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*|3.*)
++             2.6.*|3.*|4.*)
+         	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
+ $as_echo "2.6.x/3.x family (${kernel})" >&6; }
+ 
+@@ -6832,7 +6832,7 @@ $as_echo "#define GLIBC_2_19 1" >>confdefs.h
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
+-     2.20)
++     2.2?)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5
+ $as_echo "2.20 family" >&6; }
+ 
diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild
index 511aef611d..069252eeb1 100644
--- a/development/valgrind/valgrind.SlackBuild
+++ b/development/valgrind/valgrind.SlackBuild
@@ -6,7 +6,7 @@
 # Updated by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 
 PRGNAM=valgrind
-VERSION=${VERSION:-3.10.0}
+VERSION=${VERSION:-3.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,6 +52,9 @@ find -L . \
 \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
 -exec chmod 644 {} \;
 
+# For compatibility with -current; thanks to Gethyn ThomasQuail for the report.
+patch -p1 < $CWD/configure.patch || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info
index 8e555c1944..43122fff16 100644
--- a/development/valgrind/valgrind.info
+++ b/development/valgrind/valgrind.info
@@ -1,8 +1,8 @@
 PRGNAM="valgrind"
-VERSION="3.10.0"
+VERSION="3.10.1"
 HOMEPAGE="http://www.valgrind.org/"
-DOWNLOAD="http://www.valgrind.org/downloads/valgrind-3.10.0.tar.bz2"
-MD5SUM="7c311a72a20388aceced1aa5573ce970"
+DOWNLOAD="http://www.valgrind.org/downloads/valgrind-3.10.1.tar.bz2"
+MD5SUM="60ddae962bc79e7c95cfc4667245707f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/vispatch/README b/development/vispatch/README
new file mode 100644
index 0000000000..55a654349b
--- /dev/null
+++ b/development/vispatch/README
@@ -0,0 +1,12 @@
+VisPatch is a tool for patching quake maps for transparent water in glquake. Original quake didn't have
+their maps water-vis'ed, so people did that by themselves and prepared patch data files. This tool is
+used for preparing and applying those patch files.
+
+At the time this tool was written, re-vis'ing maps took a lot of time, but applying a vispatch took
+less than minutes, so this was a necessity. Even today, if people don't want going into a 'complex'
+job of vising, this tool comes as a great convenience because there are a lot of vispatch data files
+around.
+
+This is a revised version of Andy Bay's 1.2a source code for unix (linux, freebsd, ...), as well as
+windows. It fixes a number of compilation issues, crashes and some other bugs, and resolves endianness
+issues. The source code is licensed under GPLv2, and is maintained here with portability in mind.
diff --git a/development/vispatch/slack-desc b/development/vispatch/slack-desc
new file mode 100644
index 0000000000..f6f963b39f
--- /dev/null
+++ b/development/vispatch/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+    	|-----handy-ruler------------------------------------------------------|
+vispatch: vispatch (VIS Patching for Quake BSPs)
+vispatch:      
+vispatch: VisPatch is a tool for patching quake maps for transparent water in
+vispatch: glquake. Original quake didn't have their maps water-vised, so 
+vispatch: people did that by themselves and prepared patch data files. This
+vispatch: tool is used for preparing and applying those patch files.
+vispatch: 
+vispatch: Homepage: http://vispatch.sourceforge.net/
+vispatch:
+vispatch:
+vispatch:
diff --git a/development/vispatch/vispatch.SlackBuild b/development/vispatch/vispatch.SlackBuild
new file mode 100644
index 0000000000..a4b851f075
--- /dev/null
+++ b/development/vispatch/vispatch.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for vispatch
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=vispatch
+VERSION=${VERSION:-1.4.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz || tar xvf $CWD/$VERSION.tgz
+cd $PRGNAM-$VERSION/source
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+make
+
+# Copies over compiled binary
+install -D -m 0755 vispatch $PKG/usr/bin/vispatch
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a vispatch.txt COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/vispatch/vispatch.info b/development/vispatch/vispatch.info
new file mode 100644
index 0000000000..64b0e07586
--- /dev/null
+++ b/development/vispatch/vispatch.info
@@ -0,0 +1,10 @@
+PRGNAM="vispatch"
+VERSION="1.4.6"
+HOMEPAGE="http://vispatch.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/project/vispatch/vispatch/1.4.6/vispatch-1.4.6.tgz"
+MD5SUM="b9717f834b4e8c15e5992f838c2958e1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/development/visual-studio-code/README b/development/visual-studio-code/README
new file mode 100644
index 0000000000..cd0ce6f56d
--- /dev/null
+++ b/development/visual-studio-code/README
@@ -0,0 +1,7 @@
+Visual Studio Code.
+
+Build and debug modern web and cloud applications.
+
+Code combines the streamlined UI of a modern editor with 
+rich code assistance and navigation, and an integrated 
+debugging experience - without the need for a full IDE.
diff --git a/development/visual-studio-code/doinst.sh b/development/visual-studio-code/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/development/visual-studio-code/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/development/visual-studio-code/slack-desc b/development/visual-studio-code/slack-desc
new file mode 100644
index 0000000000..f30aa65920
--- /dev/null
+++ b/development/visual-studio-code/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+visual-studio-code: visual-studio-code (Build and debug modern web and cloud applications)
+visual-studio-code:
+visual-studio-code: Editor for building and debugging modern web and cloud applications. 
+visual-studio-code: 
+visual-studio-code: 
+visual-studio-code: 
+visual-studio-code: 
+visual-studio-code:
+visual-studio-code: 
+visual-studio-code: https://code.visualstudio.com/
+visual-studio-code:
diff --git a/development/visual-studio-code/visual-studio-code.SlackBuild b/development/visual-studio-code/visual-studio-code.SlackBuild
new file mode 100644
index 0000000000..939165b2f1
--- /dev/null
+++ b/development/visual-studio-code/visual-studio-code.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for <appname>
+
+# Copyright 2015 Andre Barboza, Belo Horizonte
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=visual-studio-code
+VERSION=${VERSION:-0.9.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}	# For consistency's sake, use this
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
+
+if [ "$ARCH" = "x86_64" ]; then
+  PKGSUFFIX=64
+else
+  PKGSUFFIX=32
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf VSCode-linux-x${PKGSUFFIX}
+unzip $CWD/VSCode-linux$PKGSUFFIX.zip
+cd VSCode-linux-x${PKGSUFFIX}
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Copy binary files
+mkdir -p "${PKG}/opt/${PRGNAM}-${VERSION}"
+cp -rvf * "${PKG}/opt/${PRGNAM}-${VERSION}" -R
+
+# Link executable to usr/bin
+mkdir -p "${PKG}/usr/bin"
+ln -s "/opt/${PRGNAM}-${VERSION}/Code" "${PKG}"/usr/bin/visual-studio-code
+
+# copy desktop shortcut
+mkdir -p "${PKG}/usr/share/applications"
+install -m644 "${CWD}/${PRGNAM}.desktop" "${PKG}/usr/share/applications/${PRGNAM}.desktop"
+
+# copy vscode icon
+mkdir -p "${PKG}/usr/share/icons" 
+install -m644 "${PKG}/opt/${PRGNAM}-${VERSION}/resources/app/vso.png" \
+	"${PKG}/usr/share/icons/${PRGNAM}.png"
+
+# copy license and slackbuild
+mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
+install -m644 "${PKG}/opt/${PRGNAM}-${VERSION}/resources/app/license.txt" \
+	"$PKG/usr/doc/$PRGNAM-$VERSION"
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/development/visual-studio-code/visual-studio-code.desktop b/development/visual-studio-code/visual-studio-code.desktop
new file mode 100644
index 0000000000..8acb6b5eb8
--- /dev/null
+++ b/development/visual-studio-code/visual-studio-code.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Categories=Development;
+Exec=/usr/bin/visual-studio-code
+Icon=visual-studio-code
+Terminal=false
+Type=Application
+Name=Visual Studio Code
+Comment=Editor for building and debugging modern web and cloud applications
diff --git a/development/visual-studio-code/visual-studio-code.info b/development/visual-studio-code/visual-studio-code.info
new file mode 100644
index 0000000000..7845a78603
--- /dev/null
+++ b/development/visual-studio-code/visual-studio-code.info
@@ -0,0 +1,11 @@
+PRGNAM="visual-studio-code"
+VERSION="0.9.2"
+HOMEPAGE="https://code.visualstudio.com/"
+DOWNLOAD="https://az764295.vo.msecnd.net/public/0.9.2/VSCode-linux32.zip"
+MD5SUM="f9d9a05ea84f61988a9f11305457a19c"
+DOWNLOAD_x86_64="https://az764295.vo.msecnd.net/public/0.9.2/VSCode-linux64.zip"
+MD5SUM_x86_64="a4e7c3925929bc7cfb84d14fa655b427"
+REQUIRES=""
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
+
diff --git a/development/vstudio/vstudio.SlackBuild b/development/vstudio/vstudio.SlackBuild
index 37bfe3f1fe..4ef8ec3270 100644
--- a/development/vstudio/vstudio.SlackBuild
+++ b/development/vstudio/vstudio.SlackBuild
@@ -23,17 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vstudio
-VERSION=${VERSION:-5.8.6}
+VERSION=${VERSION:-6.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ; BASENAME=${BASENAME:-vstudio_5_lin} ;;
-    x86_64) ARCH=x86_64 ; BASENAME=${BASENAME:-vstudio_x64_5_lin} ;;
-    *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
-  esac
-fi
+case "$( uname -m )" in
+  i?86) ARCH=i486 ; BASENAME=${BASENAME:-vstudio_6_lin} ;;
+  x86_64) ARCH=x86_64 ; BASENAME=${BASENAME:-vstudio_x64_6_lin} ;;
+  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
+esac
 
 set -e
 CWD=$(pwd)
@@ -44,7 +42,7 @@ OUTPUT=${OUTPUT:-/tmp}
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/$BASENAME.deb data.tar.bz2 | bunzip2 -d | tar xv
+ar p $CWD/$BASENAME.deb data.tar.xz | tar xvJ
 
 chown -R root:root .
 find -L . \
diff --git a/development/vstudio/vstudio.info b/development/vstudio/vstudio.info
index 65729391e8..b9f1a8aba3 100644
--- a/development/vstudio/vstudio.info
+++ b/development/vstudio/vstudio.info
@@ -1,10 +1,10 @@
 PRGNAM="vstudio"
-VERSION="5.8.6"
+VERSION="6.0.13"
 HOMEPAGE="http://www.valentina-db.com/"
-DOWNLOAD="http://www.valentina-db.com/download/prev_releases/5.8.6/lin_32/vstudio_5_lin.deb"
-MD5SUM="91689f3f50dede842c6d48c57b7f460e"
-DOWNLOAD_x86_64="http://www.valentina-db.com/download/prev_releases/5.8.6/lin_64/vstudio_x64_5_lin.deb"
-MD5SUM_x86_64="3f2177f8da2a23c115724820420767b8"
+DOWNLOAD="http://www.valentina-db.com/download/prev_releases/6.0.13/lin_32/vstudio_6_lin.deb"
+MD5SUM="897ff412126acdd0c7edf04e2dbc3ab9"
+DOWNLOAD_x86_64="http://www.valentina-db.com/download/prev_releases/6.0.13/lin_64/vstudio_x64_6_lin.deb"
+MD5SUM_x86_64="be8ab7809f19dbe241122d298d535d2b"
 REQUIRES=""
 MAINTAINER="Antonio Leal"
 EMAIL="antonioleal@yahoo.com"
diff --git a/development/watchman/README b/development/watchman/README
new file mode 100644
index 0000000000..da78460701
--- /dev/null
+++ b/development/watchman/README
@@ -0,0 +1,9 @@
+Watchman exists to watch files and record when they change. It can also trigger actions (such as rebuilding assets) when matching files change.
+
+Concepts
+- Watchman can recursively watch one or more directory trees (we call them roots).
+- Watchman does not follow symlinks. It knows they exist, but they show up the same as any other file in its reporting.
+- Watchman waits for a root to settle down before it will start to trigger notifications or command execution.
+- Watchman is conservative, preferring to err on the side of caution; it considers files to be freshly changed when you start to watch them or when it is unsure.
+- You can query a root for file changes since you last checked, or the current state of the tree
+- You can subscribe to file changes that occur in a root
diff --git a/development/watchman/slack-desc b/development/watchman/slack-desc
new file mode 100644
index 0000000000..ded546d12c
--- /dev/null
+++ b/development/watchman/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+watchman: watchman (A file watching service)
+watchman:
+watchman: Watchman exists to watch files and record when they change.
+watchman: It can also trigger actions (such as rebuilding assets) when
+watchman: matching files change.
+watchman:
+watchman:
+watchman:
+watchman:
+watchman: https://facebook.github.io/watchman/
+watchman:
diff --git a/development/watchman/watchman.SlackBuild b/development/watchman/watchman.SlackBuild
new file mode 100644
index 0000000000..16e8a4aec7
--- /dev/null
+++ b/development/watchman/watchman.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for watchman
+
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License along
+# with this program (most likely, a file named COPYING).  If not, see
+# <https://www.gnu.org/licenses/>.
+
+PRGNAM=watchman
+VERSION=${VERSION:-4.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -e $CWD/v$VERSION.tar.gz ]; then
+  tar xvf $CWD/v$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/watchman/watchman.info b/development/watchman/watchman.info
new file mode 100644
index 0000000000..4e3b49ffe1
--- /dev/null
+++ b/development/watchman/watchman.info
@@ -0,0 +1,10 @@
+PRGNAM="watchman"
+VERSION="4.3.0"
+HOMEPAGE="https://facebook.github.io/watchman/"
+DOWNLOAD="https://github.com/facebook/watchman/archive/v4.3.0.tar.gz"
+MD5SUM="eb8421c637f43b6c71bef054711c7fc5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
diff --git a/development/wheel/README b/development/wheel/README
index afc6d2862f..4063e3f1e7 100644
--- a/development/wheel/README
+++ b/development/wheel/README
@@ -2,3 +2,5 @@ A wheel is a ZIP-format archive with a specially formatted
 filename and the .whl extension. It is designed to contain
 all the files for a PEP 376 compatible install in a way
 that is very close to the on-disk format. 
+
+Optional dependencies: python-keyring
diff --git a/development/wheel/wheel.SlackBuild b/development/wheel/wheel.SlackBuild
index f3bc985acc..436cd1225b 100644
--- a/development/wheel/wheel.SlackBuild
+++ b/development/wheel/wheel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wheel
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wheel
-VERSION=${VERSION:-0.24.0}
+VERSION=${VERSION:-0.26.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.txt  README.txt LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/wheel/wheel.info b/development/wheel/wheel.info
index ed86235b09..a314c00425 100644
--- a/development/wheel/wheel.info
+++ b/development/wheel/wheel.info
@@ -1,8 +1,8 @@
 PRGNAM="wheel"
-VERSION="0.24.0"
+VERSION="0.26.0"
 HOMEPAGE="http://bitbucket.org/pypa/wheel/"
-DOWNLOAD="https://pypi.python.org/packages/source/w/wheel/wheel-0.24.0.tar.gz"
-MD5SUM="3b0d66f0d127ea8befaa5d11453107fd"
+DOWNLOAD="https://pypi.python.org/packages/source/w/wheel/wheel-0.26.0.tar.gz"
+MD5SUM="4cfc6e7e3dc7377d0164914623922a10"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/development/xmlcopyeditor/xmlcopyeditor.SlackBuild b/development/xmlcopyeditor/xmlcopyeditor.SlackBuild
index 84eba01038..975bc168ee 100644
--- a/development/xmlcopyeditor/xmlcopyeditor.SlackBuild
+++ b/development/xmlcopyeditor/xmlcopyeditor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xmlcopyeditor
 
-# Copyright 2009-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmlcopyeditor
-VERSION=${VERSION:-1.2.1.2}
+VERSION=${VERSION:-1.2.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,6 +78,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
   --build=$ARCH-slackware-linux
@@ -88,6 +89,8 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog gpl-2.0.txt INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/xmlcopyeditor/xmlcopyeditor.info b/development/xmlcopyeditor/xmlcopyeditor.info
index 5a5986ed7a..3c09e59469 100644
--- a/development/xmlcopyeditor/xmlcopyeditor.info
+++ b/development/xmlcopyeditor/xmlcopyeditor.info
@@ -1,8 +1,8 @@
 PRGNAM="xmlcopyeditor"
-VERSION="1.2.1.2"
+VERSION="1.2.1.3"
 HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/xml-copy-editor/xmlcopyeditor-1.2.1.2.tar.gz"
-MD5SUM="fddbd314037dd50ff1cb8346000ff84d"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/xml-copy-editor/xmlcopyeditor-1.2.1.3.tar.gz"
+MD5SUM="b8ec66bbf41d6dd10ffe704e5b5f4b5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython xerces-c"
diff --git a/development/xtruss/xtruss.SlackBuild b/development/xtruss/xtruss.SlackBuild
index 79baf9d810..c9ca046284 100644
--- a/development/xtruss/xtruss.SlackBuild
+++ b/development/xtruss/xtruss.SlackBuild
@@ -6,7 +6,7 @@
 # Modified by B. Watson
 
 PRGNAM=xtruss
-VERSION=${VERSION:-20150103.8828e85}
+VERSION=${VERSION:-20150926.f43ba98}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/xtruss/xtruss.info b/development/xtruss/xtruss.info
index 007fd81474..54fefe402e 100644
--- a/development/xtruss/xtruss.info
+++ b/development/xtruss/xtruss.info
@@ -1,8 +1,8 @@
 PRGNAM="xtruss"
-VERSION="20150103.8828e85"
+VERSION="20150926.f43ba98"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/xtruss/"
-DOWNLOAD="http://www.chiark.greenend.org.uk/~sgtatham/xtruss/xtruss-20150103.8828e85.tar.gz"
-MD5SUM="e5a08d7d7f5cb8221dc36eb41e3c8dba"
+DOWNLOAD="http://www.chiark.greenend.org.uk/~sgtatham/xtruss/xtruss-20150926.f43ba98.tar.gz"
+MD5SUM="2beb74c0de3c274df1641ad8bb5b3ad7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/zeal/README b/development/zeal/README
new file mode 100644
index 0000000000..e6ff8184bc
--- /dev/null
+++ b/development/zeal/README
@@ -0,0 +1,15 @@
+Zeal (a simple offline documentation browser inspired by Dash)
+
+Offline documentation browser inspired by Dash (http://kapeli.com/dash/),
+available for Linux and Windows.
+
+- Quickly search documentation using Alt+Space (or customised) hotkey
+  to display Zeal from any place in your workspace
+- Search in multiple sets of documentation at once
+- Do not depend on your Internet connection
+- Integrate Zeal with IDEA, Sublime Text, or your favourite IDE with
+  a variety of plugins (http://zealdocs.org/usage.html#plugins)
+
+After installing Zeal go to File -> Options -> Docsets to browse and download docsets.
+
+All documentation available for Dash is also available for Zeal.
diff --git a/development/zeal/doinst.sh b/development/zeal/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/development/zeal/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/development/zeal/qt5.patch b/development/zeal/qt5.patch
new file mode 100644
index 0000000000..6873332505
--- /dev/null
+++ b/development/zeal/qt5.patch
@@ -0,0 +1,14 @@
+https://github.com/zealdocs/zeal/issues/376
+https://github.com/zealdocs/zeal/issues/380
+
+--- a/src/main.cpp	2015-04-19 23:08:52.000000000 +0000
++++ b/src/main.cpp	2015-08-18 22:36:56.408596690 +0000
+@@ -3,6 +3,7 @@
+ 
+ #include <QApplication>
+ #include <QCommandLineParser>
++#include <QDataStream>
+ #include <QDir>
+ #include <QLocalSocket>
+ #include <QStandardPaths>
+
diff --git a/development/zeal/slack-desc b/development/zeal/slack-desc
new file mode 100644
index 0000000000..0359855c76
--- /dev/null
+++ b/development/zeal/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+zeal: zeal (offline documentation browser)
+zeal:
+zeal: Zeal is an offline documentation browser inspired by Dash
+zeal: (http://kapeli.com/dash/), available for Linux and Windows.
+zeal:
+zeal: Homepage: http://zealdocs.org/
+zeal:
+zeal:
+zeal:
+zeal:
+zeal:
diff --git a/development/zeal/zeal.SlackBuild b/development/zeal/zeal.SlackBuild
new file mode 100644
index 0000000000..a6139e5760
--- /dev/null
+++ b/development/zeal/zeal.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for zeal
+
+# Copyright 2015 Ricardo J. Barberis (ricardo.barberis@gmail.com)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=zeal
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-3}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/qt5.patch
+export ZEAL_VERSION=${VERSION}
+mkdir -p build
+cd build
+  qmake-qt5 ..
+  make
+  make INSTALL_ROOT=$PKG install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/zeal/zeal.info b/development/zeal/zeal.info
new file mode 100644
index 0000000000..974cfebe2a
--- /dev/null
+++ b/development/zeal/zeal.info
@@ -0,0 +1,10 @@
+PRGNAM="zeal"
+VERSION="0.1.1"
+HOMEPAGE="http://zealdocs.org/"
+DOWNLOAD="https://github.com/zealdocs/zeal/archive/v0.1.1.tar.gz"
+MD5SUM="b2ccf1bc420c1d8f3f57092a7ca8873f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"
diff --git a/development/zed/README b/development/zed/README
new file mode 100644
index 0000000000..5ef2a735d8
--- /dev/null
+++ b/development/zed/README
@@ -0,0 +1,16 @@
+Zed is a fully offline-capable, open source, keyboard-focused, text and code editor for power users.
+You can use Zed to edit local files as well as remote files on any server.
+
+Zed has all features you'd expect from a capable code editor:
+- Syntax highlighting for many programming languages (e.g. C, Clojure, CoffeeScript, C#, CSS, Dart,
+  Erlang, Go, Haml, Haskell, HTML, ini files, Java, JavaScript, JSON, LogiQL, Lua, Markdown, Nix,
+  PHP, Plist, Protobufs, Python, Ruby, Shell, XML)
+- Code completion: symbols, snippets and property/method completion.
+- Built-in linting for some languages with inline markers (JavaScript, CoffeeScript, JSON, Lua, CSS)
+- Multiple cursors
+- Split-view editing
+- Themes: light and dark themes out of the box and you can easily develop your own using CSS.
+
+To learn more about Zed's remote editing, look here:
+
+http://zedapp.org/features/edit-remote-files/
diff --git a/development/zed/doinst.sh b/development/zed/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/development/zed/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/development/zed/slack-desc b/development/zed/slack-desc
new file mode 100644
index 0000000000..3c17d41d80
--- /dev/null
+++ b/development/zed/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+zed: zed (text and code editor)
+zed:
+zed: Zed is a fully offline-capable, open source, keyboard-focused,
+zed: text and code editor for power users.
+zed:
+zed: You can use Zed to edit local files as well as remote files
+zed: on any server.
+zed:
+zed:
+zed: http://zedapp.org/
+zed:
diff --git a/development/zed/zed.SlackBuild b/development/zed/zed.SlackBuild
new file mode 100644
index 0000000000..30be078846
--- /dev/null
+++ b/development/zed/zed.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for zed
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License along
+# with this program (most likely, a file named COPYING).  If not, see
+# <https://www.gnu.org/licenses/>.
+
+PRGNAM=zed
+SRCNAM=Zed
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-3}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-${PRGNAM}
+OUTPUT=${OUTPUT:-/tmp}
+
+SHORTARCH=`getconf LONG_BIT`
+
+if [ "$ARCH" = "i486" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf ${PRGNAM}
+tar -xvf $CWD/${PRGNAM}-linux${SHORTARCH}-v${VERSION}.tar.gz
+cd ${PRGNAM}
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/opt/${PRGNAM}/libs/
+cp -Rav * $PKG/opt/${PRGNAM}
+
+## fixes udev1 dependency
+ln -sfv /usr/lib${LIBDIRSUFFIX}/libudev.so $PKG/opt/${PRGNAM}/libs/libudev.so.1
+
+mkdir -p $PKG/usr/bin
+
+## we make our own script since
+## we have to set the lib path
+cat <<EOT > $PKG/usr/bin/${PRGNAM}
+#!/bin/sh
+## fix libudev issue
+LD_LIBRARY_PATH=/opt/${PRGNAM}/libs/ /opt/${PRGNAM}/${PRGNAM}
+EOT
+
+chmod 755 $PKG/usr/bin/${PRGNAM}
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -sf /opt/${PRGNAM}/${SRCNAM}.png $PKG/usr/share/pixmaps/${PRGNAM}.png
+
+mkdir -p $PKG/usr/share/applications
+cat $CWD/${PRGNAM}.desktop > $PKG/usr/share/applications/${PRGNAM}.desktop
+
+mkdir -p $PKG/usr/doc/${PRGNAM}-${VERSION}
+cat $CWD/${PRGNAM}.SlackBuild > $PKG/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
+cat $CWD/README > $PKG/usr/doc/${PRGNAM}-${VERSION}/README
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}
diff --git a/development/zed/zed.desktop b/development/zed/zed.desktop
new file mode 100644
index 0000000000..8543525fe5
--- /dev/null
+++ b/development/zed/zed.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Zed
+Comment=A text and code editor for power users.
+Exec=zed %U
+Icon=/usr/share/pixmaps/zed.png
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Utility;TextEditor;
diff --git a/development/zed/zed.info b/development/zed/zed.info
new file mode 100644
index 0000000000..a34b455914
--- /dev/null
+++ b/development/zed/zed.info
@@ -0,0 +1,10 @@
+PRGNAM="zed"
+VERSION="1.1.0"
+HOMEPAGE="http://zedapp.org/"
+DOWNLOAD="http://download.zedapp.org/zed-linux32-v1.1.0.tar.gz"
+MD5SUM="43b7912ea9717c0c8946a3921f133e6e"
+DOWNLOAD_x86_64="http://download.zedapp.org/zed-linux64-v1.1.0.tar.gz"
+MD5SUM_x86_64="3b221d81275c425ed7f2cf1f34a52e05"
+REQUIRES=""
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
diff --git a/games/BeastieWorker-levels/BeastieWorker-levels.info b/games/BeastieWorker-levels/BeastieWorker-levels.info
index 22e8707c85..8dff2305f3 100644
--- a/games/BeastieWorker-levels/BeastieWorker-levels.info
+++ b/games/BeastieWorker-levels/BeastieWorker-levels.info
@@ -1,5 +1,5 @@
 PRGNAM="BeastieWorker-levels"
-VERSION="1.50"
+VERSION="01.50"
 HOMEPAGE="http://beastieworker.sourceforge.net"
 DOWNLOAD="http://sourceforge.net/projects/beastieworker/files/levels/levels/BeastieWorker-levels-01_50.tar.gz"
 MD5SUM="b787a772b0db5b0fd1d07f611787ffcc"
diff --git a/games/KAdventure/KAdventure.SlackBuild b/games/KAdventure/KAdventure.SlackBuild
new file mode 100644
index 0000000000..a17d12542b
--- /dev/null
+++ b/games/KAdventure/KAdventure.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for KAdventure
+
+# Copyright 2015 Tim Dickson, email: dickson.tim@googlemail.com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=KAdventure
+VERSION=${VERSION:-gitfdc9579}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-master
+unzip $CWD/$PRGNAM-master.zip||unzip $CWD/master.zip
+cd $PRGNAM-master
+
+#we'll patch the qml files to remove a runtime warning
+#upstream will be fixing this eventually.
+sed -i "s/Qt 4.7/QtQuick 1.1/" src/*.qml
+sed -i "s/Qt 4.7/QtQuick 1.1/" levels/BouncingBall.qml
+sed -i "s/Qt 4.7/QtQuick 1.1/" objects/*.qml
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+#mkdir -p build
+qmake QMAKE_CFLAGS="$SLKCFLAGS" QMAKE_CXXFLAGS="$SLKCFLAGS" -config release
+make
+
+#the make file has no install info so we do things ourselves
+mkdir -p $PKG/usr/bin  $PKG/usr/share/applications/
+cp $PRGNAM $PKG/usr/bin
+mkdir -p $PKG/usr/share/applications/ $PKG/usr/share/icons/hicolor/{128x128,48x48,16x16}/apps
+cp images/player.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
+convert images/player.png -resize 128x128 $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
+convert images/player.png -resize 16x16 $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+#lets strip the executable
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Copy program documentation into the package
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp README.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cd ..
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+#now make the package
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/KAdventure/KAdventure.desktop b/games/KAdventure/KAdventure.desktop
new file mode 100644
index 0000000000..eff962bede
--- /dev/null
+++ b/games/KAdventure/KAdventure.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=KAdventure
+Comment=Simple 2D puzzle Game. Guide the man to the exit
+Exec=KAdventure
+Icon=KAdventure.png
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Game;LogicGame;
diff --git a/games/KAdventure/KAdventure.info b/games/KAdventure/KAdventure.info
new file mode 100644
index 0000000000..de0bfc8613
--- /dev/null
+++ b/games/KAdventure/KAdventure.info
@@ -0,0 +1,10 @@
+PRGNAM="KAdventure"
+VERSION="gitfdc9579"
+HOMEPAGE="https://github.com/arendjr/KAdventure/"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/KAdventure/KAdventure-master.zip"
+MD5SUM="a089f6a795190fcd570edecd3e4b5460"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim@googlemail.com"
diff --git a/games/KAdventure/README b/games/KAdventure/README
new file mode 100644
index 0000000000..70afbd010e
--- /dev/null
+++ b/games/KAdventure/README
@@ -0,0 +1,7 @@
+KAdventure, a simple 2D qt puzzle game
+
+Guide the man to the exit. There are fifteen levels.
+you can create and load your own levels. look at the source
+for examples.
+ 
+Software By Arend van Beelen jr.
diff --git a/games/KAdventure/doinst.sh b/games/KAdventure/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/KAdventure/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/KAdventure/slack-desc b/games/KAdventure/slack-desc
new file mode 100644
index 0000000000..07c4014d77
--- /dev/null
+++ b/games/KAdventure/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+KAdventure: KAdventure (a simple 2D qt puzzle game)
+KAdventure:
+KAdventure: Guide the man to the exit. There are fifteen levels.
+KAdventure: you can create and load your own levels. look at the source
+KAdventure: for examples.
+KAdventure:
+KAdventure: Software By Arend van Beelen jr.
+KAdventure:
+KAdventure:
+KAdventure:
+KAdventure: https://github.com/arendjr/KAdventure/
diff --git a/games/KoboDeluxe/KoboDeluxe.info b/games/KoboDeluxe/KoboDeluxe.info
index 822b6a1b53..f40a701579 100644
--- a/games/KoboDeluxe/KoboDeluxe.info
+++ b/games/KoboDeluxe/KoboDeluxe.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Black Rider"
-EMAIL="black_rider@esdebian.org"
+EMAIL="softwareworks@use.startmail.com"
diff --git a/games/Pyfa/Pyfa.SlackBuild b/games/Pyfa/Pyfa.SlackBuild
index 822944282a..f566731f77 100644
--- a/games/Pyfa/Pyfa.SlackBuild
+++ b/games/Pyfa/Pyfa.SlackBuild
@@ -26,6 +26,7 @@ PRGNAM=Pyfa
 VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+ARCH=noarch
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -64,5 +65,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$BUILD$TAG.${PKGTYPE:-tgz}
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/SLADE/SLADE.SlackBuild b/games/SLADE/SLADE.SlackBuild
index 53e52f9287..37d5411e46 100644
--- a/games/SLADE/SLADE.SlackBuild
+++ b/games/SLADE/SLADE.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SLADE
-VERSION=${VERSION:-3.1.0.4}
+VERSION=${VERSION:-3.1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -75,7 +75,7 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
 cd ..
 
 mkdir -p $PKG/usr/bin
@@ -86,9 +86,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README* *.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/SLADE/SLADE.info b/games/SLADE/SLADE.info
index 08280d91a5..f4ba476b75 100644
--- a/games/SLADE/SLADE.info
+++ b/games/SLADE/SLADE.info
@@ -1,8 +1,8 @@
 PRGNAM="SLADE"
-VERSION="3.1.0.4"
+VERSION="3.1.0.5"
 HOMEPAGE="http://slade.mancubus.net/"
-DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.1.0.4.tar.gz"
-MD5SUM="62f76d23f0b41cb3e445734f2b37ca52"
+DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.1.0.5.tar.gz"
+MD5SUM="c21646d102f936528e47bf75119c0701"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3 SFML ftgl fluidsynth FreeImage"
diff --git a/games/Tempus-Irae/README b/games/Tempus-Irae/README
new file mode 100644
index 0000000000..ee09b416cb
--- /dev/null
+++ b/games/Tempus-Irae/README
@@ -0,0 +1,19 @@
+Tempus-Irae (game data for use with alephone package)
+
+Tempus Irae, a new scenario in the Marathon universe built upon
+the Marathon Infinity engine. In Tempus Irae the player travels
+back in time... to Renaissance Italy.
+
+Tempus Irae combines over twenty-two thousand polygons of solo
+maps with literally hundreds of new textures. New sounds, scenery
+items, and shapes are combined with gorgeous terminal pictures and
+chapter screens, as well as a first-rate script.
+
+The Aleph One version of Tempus Irae includes both Tempus Irae and
+Tempus Irae 2: The Lost Levelsi.
+
+Included in the package is a shell script wrapper. Type "tempus-irae"
+or select Tempus Irae from the KDE or XFCE "Games" menu. 
+
+To install the gamedata in /opt instead of /usr to save space in the 
+root partition use use OPT=yes ./Tempus-Irae.SlackBuild
diff --git a/games/Tempus-Irae/Tempus-Irae.SlackBuild b/games/Tempus-Irae/Tempus-Irae.SlackBuild
new file mode 100644
index 0000000000..50925fd801
--- /dev/null
+++ b/games/Tempus-Irae/Tempus-Irae.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for Tempus Irae
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Tempus-Irae
+VERSION=${VERSION:-20060615} # Last modified date from the zipfile's http header
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+# install gamedata in opt instead of usr
+OPT=${OPT:-no}
+if [ "${OPT:-yes}" == "yes" ]; then
+    DATA="/opt/AlephOne"
+else
+    DATA="/usr/share/AlephOne/gamedata"
+fi
+
+ZIPNAME=$(echo $PRGNAM | tr - _)
+ZIPFILE=$ZIPNAME.zip
+WRAPPER=$(echo $PRGNAM | tr '[A-Z]' '[a-z]')
+DATADIR=$PKG$DATA
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $DATADIR
+unzip $CWD/$ZIPFILE -d $DATADIR
+
+chown -R root:root $DATADIR
+
+# NB: the usual find predicate is different (zipfile stores +x permissions
+# on some files for no good reason)
+find $DATADIR \
+ \( -type f -exec chmod 644 {} \; \) -o \
+ \( -type d -exec chmod 755 {} \; \)
+
+# Write launcher script to the user's path
+mkdir -p $PKG/usr/games
+cat > $PKG/usr/games/$WRAPPER <<EOF
+#!/bin/sh
+ALEPHONE_DATA="$DATA/$ZIPNAME"
+export ALEPHONE_DATA
+exec alephone "\$@"
+EOF
+find $PKG/usr/games -perm 644 -exec chmod 755 {} \;
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$WRAPPER.desktop <<EOF
+[Desktop Entry]
+Name=$(echo $PRGNAM | tr - " ")
+Exec=$WRAPPER
+Icon=alephone
+Type=Application
+Comment=$(echo $PRGNAM | tr - " ") (first-person shooter game)
+Categories=Game;ActionGame;
+EOF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/Tempus-Irae/Tempus-Irae.info b/games/Tempus-Irae/Tempus-Irae.info
new file mode 100644
index 0000000000..e90b2be18c
--- /dev/null
+++ b/games/Tempus-Irae/Tempus-Irae.info
@@ -0,0 +1,10 @@
+PRGNAM="Tempus-Irae"
+VERSION="20060615"
+HOMEPAGE="http://nardo.bungie.org/home.php"
+DOWNLOAD="http://nardofiles.bungie.org/Tempus_Irae.zip"
+MD5SUM="4a707967e062c12236a71f3cfd29602b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="alephone"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/Tempus-Irae/doinst.sh b/games/Tempus-Irae/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/Tempus-Irae/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/Tempus-Irae/slack-desc b/games/Tempus-Irae/slack-desc
new file mode 100644
index 0000000000..e02302de59
--- /dev/null
+++ b/games/Tempus-Irae/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+Tempus-Irae: Tempus-Irae (game data for use with alephone package)
+Tempus-Irae:
+Tempus-Irae: In Tempus Irae the player travels back in time... to Renaissance
+Tempus-Irae: Italy.
+Tempus-Irae:
+Tempus-Irae: Tempus Irae for Aleph One features hi-res textures and stunning
+Tempus-Irae: level architecture.
+Tempus-Irae:
+Tempus-Irae: Homepage: http://nardo.bungie.org/home.php
+Tempus-Irae:
+Tempus-Irae:
diff --git a/games/UrbanTerror/UrbanTerror.info b/games/UrbanTerror/UrbanTerror.info
index 0a38a0851e..d357eec6a1 100644
--- a/games/UrbanTerror/UrbanTerror.info
+++ b/games/UrbanTerror/UrbanTerror.info
@@ -1,7 +1,7 @@
 PRGNAM="UrbanTerror"
 VERSION="4.2.015"
 HOMEPAGE="http://www.urbanterror.info"
-DOWNLOAD="http://mirror.urtstats.net/urbanterror/UrbanTerror42_full015.zip"
+DOWNLOAD="https://up.barbatos.fr/urt/UrbanTerror42_full015.zip"
 MD5SUM="735a8aaf5b2641a32f9006cb386a81b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/ValyriaTear/ValyriaTear.SlackBuild b/games/ValyriaTear/ValyriaTear.SlackBuild
index 4ab8661c2e..bc654b13f8 100644
--- a/games/ValyriaTear/ValyriaTear.SlackBuild
+++ b/games/ValyriaTear/ValyriaTear.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/games/ace/README b/games/ace/README
new file mode 100644
index 0000000000..2c74643d0e
--- /dev/null
+++ b/games/ace/README
@@ -0,0 +1,8 @@
+ace - a set of Unix/X solitaire games
+
+The Ace of Penguins is a set of Unix/X solitaire games
+based on the ones available for Windows(tm)
+but with a number of enhancements.
+The latest version includes clones of freecell, golf, mastermind, 
+merlin, minesweeper, pegged, solitaire, taipei (with editor)
+and thornq.
diff --git a/games/ace/ace.SlackBuild b/games/ace/ace.SlackBuild
new file mode 100644
index 0000000000..34edbe8c7b
--- /dev/null
+++ b/games/ace/ace.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackware build script for ace.
+
+# Written by G. Schoenmakers
+
+PRGNAM=ace
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a docs/COPYING docs/intro.html docs/toolkit.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/ace/ace.info b/games/ace/ace.info
new file mode 100644
index 0000000000..872341481a
--- /dev/null
+++ b/games/ace/ace.info
@@ -0,0 +1,10 @@
+PRGNAM="ace"
+VERSION="1.4"
+HOMEPAGE="http://www.delorie.com/store/ace/"
+DOWNLOAD="http://www.delorie.com/store/ace/ace-1.4.tar.gz"
+MD5SUM="b80169fa59d69758bb9686f31a84ad2b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="G. Schoenmakers"
+EMAIL="gschoen@iinet.net.au"
diff --git a/games/ace/slack-desc b/games/ace/slack-desc
new file mode 100644
index 0000000000..2a5984fc64
--- /dev/null
+++ b/games/ace/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+ace: ace (Unix/X solitaire games)
+ace:
+ace: The Ace of Penguins is a set of Unix/X solitaire games
+ace: based on the ones available for Windows(tm)
+ace: but with a number of enhancements.
+ace: The latest version includes clones of freecell, golf, mastermind, 
+ace: merlin, minesweeper, pegged, solitaire, taipei (with editor)
+ace: and thornq.
+ace:
+ace: Homepage: http://www.delorie.com/store/ace/
+ace:
diff --git a/games/adom/adom.SlackBuild b/games/adom/adom.SlackBuild
index 3698e2926f..9bd43b75b9 100644
--- a/games/adom/adom.SlackBuild
+++ b/games/adom/adom.SlackBuild
@@ -7,7 +7,7 @@
 # in a clean .tgz package, ready to be installed.
 
 PRGNAM=adom
-VERSION=${VERSION:-1.2.0_pre23}
+VERSION=${VERSION:-r60}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,7 +41,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_linux_debian_${ARCHBITS}_${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}_linux_debian_${ARCHBITS}_${VERSION}_pub.tar.gz
 cd $PRGNAM
 chown -R root:root .
 find -L . \
@@ -50,7 +50,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-install -m 0755 -D $PRGNAM $PKG/usr/games/$PRGNAM
+install -m 2755 -D -g games $PRGNAM $PKG/usr/games/$PRGNAM
+install -m 0644 -D ${CWD}/adom_ds.cfg ${PKG}/etc/adom_ds.cfg.new
+install -m 0775 -D -g games -d ${PKG}/var/lib/adom
+# we create the HISCORE file here, so that it's not created and owned by the first user to run adom.
+touch ${PKG}/var/lib/adom/HISCORE.new
+chown -c root:games ${PKG}/var/lib/adom/HISCORE.new
+chmod -c 664 ${PKG}/var/lib/adom/HISCORE.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/{adomfaq.txt,credits.txt,manual.txt,readme1st.txt} licenses \
@@ -59,6 +65,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/adom/adom.info b/games/adom/adom.info
index be1eb638b9..b9a482bcfd 100644
--- a/games/adom/adom.info
+++ b/games/adom/adom.info
@@ -1,10 +1,10 @@
 PRGNAM="adom"
-VERSION="1.2.0_pre23"
+VERSION="r60"
 HOMEPAGE="http://www.ancientdomainsofmystery.com/"
-DOWNLOAD="http://www.ancardia.com/download/adom_linux_debian_32_1.2.0_pre23.tar.gz"
-MD5SUM="8ee33a8eb47eaeb633f04d1cf027ecb7"
-DOWNLOAD_x86_64="http://www.ancardia.com/download/adom_linux_debian_64_1.2.0_pre23.tar.gz"
-MD5SUM_x86_64="1c371b0ea4ff5579bed0dd10bd8ec795"
+DOWNLOAD="http://www.ancardia.com/download/adom_linux_debian_32_r60_pub.tar.gz"
+MD5SUM="68d94adaee52cf5739bd2a3ecbbf489a"
+DOWNLOAD_x86_64="http://www.ancardia.com/download/adom_linux_debian_64_r60_pub.tar.gz"
+MD5SUM_x86_64="4bbd8748509f5f407d9f3a9289763fc8"
 REQUIRES=""
 MAINTAINER="pyllyukko"
 EMAIL="pyllyukko AT maimed dot org"
diff --git a/games/adom/adom_ds.cfg b/games/adom/adom_ds.cfg
new file mode 100644
index 0000000000..41f3a8226d
--- /dev/null
+++ b/games/adom/adom_ds.cfg
@@ -0,0 +1 @@
+/var/lib/adom
diff --git a/games/adom/doinst.sh b/games/adom/doinst.sh
new file mode 100644
index 0000000000..ef11d52bc3
--- /dev/null
+++ b/games/adom/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ -s "$OLD" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/adom_ds.cfg.new
+config var/lib/adom/HISCORE.new
diff --git a/games/ags/ags.SlackBuild b/games/ags/ags.SlackBuild
index b1058086d7..1073df2703 100644
--- a/games/ags/ags.SlackBuild
+++ b/games/ags/ags.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ags
-VERSION=${VERSION:-3.3.4.1}
+VERSION=${VERSION:-3.3.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,7 +66,7 @@ cd $TMP
 
 rm -rf allegro-${ALLEGRO_VERSION}
 rm -rf dumb-${DUMB_VERSION}
-rm -rf allegro${ALLEGRO_VERSION}
+rm -rf ags-v.${VERSION}
 
 # Build Allegro 4 first.
 
@@ -121,7 +121,7 @@ make install
 # And finaly install Adventure Game Studio.
 
 cd $TMP
-tar xvf $CWD/v.${VERSION}.tar.gz
+tar xvf $CWD/v.${VERSION}.tar.gz || tar xvf $CWD/ags-v.${VERSION}.tar.gz
 cd ags-v.$VERSION
 
 chown -R root:root .
diff --git a/games/ags/ags.info b/games/ags/ags.info
index ad85dae307..8b6014fe2c 100644
--- a/games/ags/ags.info
+++ b/games/ags/ags.info
@@ -1,10 +1,10 @@
 PRGNAM="ags"
-VERSION="3.3.4.1"
+VERSION="3.3.4.2"
 HOMEPAGE="https://github.com/adventuregamestudio/ags"
-DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.3.4.1.tar.gz \
+DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.3.4.2.tar.gz \
           http://downloads.sourceforge.net/project/alleg/allegro/4.4.2/allegro-4.4.2.tar.gz \
           http://downloads.sourceforge.net/project/dumb/dumb/0.9.3/dumb-0.9.3.tar.gz"
-MD5SUM="615837a61d47378fe6ec71f4cbd06836 \
+MD5SUM="d60df16bed23b62b621e19924171f06c \
         4db71b0460fc99926ae91d223199c2e6 \
 		f48da5b990aa8aa822d3b6a951baf5c2"
 DOWNLOAD_x86_64=""
diff --git a/games/alephone/alephone.SlackBuild b/games/alephone/alephone.SlackBuild
index 73d2a82bb9..06ff691383 100644
--- a/games/alephone/alephone.SlackBuild
+++ b/games/alephone/alephone.SlackBuild
@@ -6,8 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20150915 bkw:
+# - update for 20150620 release
+# - ffmpeg patches no longer needed
+# - move binary to /usr/games
+
 PRGNAM=alephone
-VERSION=${VERSION:-20140104}
+VERSION=${VERSION:-20150620}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,24 +60,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch came from ArchLinux AUR, this is the two ffmpeg patches catted
-# together.
-patch -p1 < $CWD/ffmpeg_api.diff
-# Thanks to John Vogel for these ffmpeg patches:
-patch -p0 < $CWD/r5009.diff
-patch -p0 < $CWD/r5010.diff
-patch -p0 < $CWD/r5013.diff
-patch -p0 < $CWD/r5033.diff
-patch -p0 < $CWD/r5037.diff
-
-autoreconf
-
 [ "${FFMPEG:-yes}" = "no" ] && EXTRAOPT=--disable-ffmpeg
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   $EXTRAOPT \
+  --bindir=/usr/games \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
diff --git a/games/alephone/alephone.info b/games/alephone/alephone.info
index 02f36ce31b..07a914e54a 100644
--- a/games/alephone/alephone.info
+++ b/games/alephone/alephone.info
@@ -1,8 +1,8 @@
 PRGNAM="alephone"
-VERSION="20140104"
-HOMEPAGE="http://marathon.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/marathon/Aleph%20One/2014-01-04/AlephOne-20140104.tar.bz2"
-MD5SUM="5d7cad49eab566a8d6c1317a86055a7f"
+VERSION="20150620"
+HOMEPAGE="https://alephone.lhowon.org/"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20150620/AlephOne-20150620.tar.bz2"
+MD5SUM="561914ed5880c75877bc9eeb18429a37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua speex zziplib ffmpeg"
diff --git a/games/alephone/ffmpeg_api.diff b/games/alephone/ffmpeg_api.diff
deleted file mode 100644
index 3128e3d426..0000000000
--- a/games/alephone/ffmpeg_api.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -rupN AlephOne-20140104/Source_Files/FFmpeg/SDL_ffmpeg.c AlephOne-20140104.new/Source_Files/FFmpeg/SDL_ffmpeg.c
---- AlephOne-20140104/Source_Files/FFmpeg/SDL_ffmpeg.c	2013-07-05 02:33:29.000000000 +0200
-+++ AlephOne-20140104.new/Source_Files/FFmpeg/SDL_ffmpeg.c	2014-03-16 01:53:19.327213212 +0100
-@@ -48,6 +48,11 @@ extern "C"
- }
- #endif
- 
-+/* set magic number for 1 second of 48khz 32bit audio (removed from upstream) */
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- #include "SDL_ffmpeg.h"
- 
- #ifdef MSVC
-diff -rupN AlephOne-20140104/Source_Files/FFmpeg/Movie.cpp AlephOne-20140104.new/Source_Files/FFmpeg/Movie.cpp
---- AlephOne-20140104/Source_Files/FFmpeg/Movie.cpp	2014-01-04 03:19:57.000000000 +0100
-+++ AlephOne-20140104.new/Source_Files/FFmpeg/Movie.cpp	2014-03-16 01:43:32.030011019 +0100
-@@ -491,7 +491,7 @@ bool Movie::Setup()
-         
-         // tuning options
-         int aq = graphics_preferences->movie_export_audio_quality;
--        audio_stream->codec->global_quality = audio_stream->quality = FF_QP2LAMBDA * (aq / 10);
-+        audio_stream->codec->global_quality = FF_QP2LAMBDA * (aq / 10);
-         audio_stream->codec->flags |= CODEC_FLAG_QSCALE;
-         
-         // find correct sample format
diff --git a/games/alephone/r5009.diff b/games/alephone/r5009.diff
deleted file mode 100644
index 39f9e648cf..0000000000
--- a/games/alephone/r5009.diff
+++ /dev/null
@@ -1,385 +0,0 @@
-Index: Source_Files/Sound/FFmpegDecoder.cpp
-===================================================================
---- Source_Files/Sound/FFmpegDecoder.cpp	(revision 5008)
-+++ Source_Files/Sound/FFmpegDecoder.cpp	(revision 5009)
-@@ -199,10 +199,13 @@
-     
-     while (pkt_temp.size > 0)
-     {
--        AVFrame frame;
--        avcodec_get_frame_defaults(&frame);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,0)
-+        AVFrame *dframe = avcodec_alloc_frame();
-+#else
-+        AVFrame *dframe = av_frame_alloc();
-+#endif
-         int got_frame = 0;
--        int bytes_read = avcodec_decode_audio4(dec_ctx, &frame, &got_frame, &pkt_temp);
-+        int bytes_read = avcodec_decode_audio4(dec_ctx, dframe, &got_frame, &pkt_temp);
-         if (bytes_read < 0)
-         {
-             av_free_packet(&pkt);
-@@ -216,12 +219,12 @@
-             
-             int stride = -1;
-             if (channels > 1 && av_sample_fmt_is_planar(in_fmt))
--                stride = frame.extended_data[1] - frame.extended_data[0];
-+                stride = dframe->extended_data[1] - dframe->extended_data[0];
- 
--            int written = convert_audio(frame.nb_samples, channels,
-+            int written = convert_audio(dframe->nb_samples, channels,
-                                         stride,
--                                        in_fmt, frame.extended_data[0],
--                                        frame.nb_samples, channels,
-+                                        in_fmt, dframe->extended_data[0],
-+                                        dframe->nb_samples, channels,
-                                         -1,
-                                         out_fmt, av->temp_data);
-             
-@@ -230,6 +233,12 @@
-             pkt_temp.data += bytes_read;
-             pkt_temp.size -= bytes_read;
-         }
-+        
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,0)
-+        av_freep(&dframe);
-+#else
-+        av_frame_free(&dframe);
-+#endif
-     }
-     
-     av_free_packet(&pkt);
-Index: Source_Files/FFmpeg/Movie.cpp
-===================================================================
---- Source_Files/FFmpeg/Movie.cpp	(revision 5008)
-+++ Source_Files/FFmpeg/Movie.cpp	(revision 5009)
-@@ -85,6 +85,15 @@
- }
- #endif
- 
-+// FFmpeg compatibility
-+#ifndef AV_CODEC_ID_VP8
-+#define AV_CODEC_ID_VP8 CODEC_ID_VP8
-+#endif
-+#ifndef AV_CODEC_ID_VORBIS
-+#define AV_CODEC_ID_VORBIS CODEC_ID_VORBIS
-+#endif
-+
-+
- // shamelessly stolen from SDL 2.0
- static int get_cpu_count(void)
- {
-@@ -399,7 +408,7 @@
-     AVStream *video_stream;
-     if (success)
-     {
--        video_codec = avcodec_find_encoder(CODEC_ID_VP8);
-+        video_codec = avcodec_find_encoder(AV_CODEC_ID_VP8);
-         success = video_codec;
-         if (!success) err_msg = "Could not find VP8 encoder";
-     }
-@@ -445,7 +454,11 @@
-     }
-     if (success)
-     {
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,0)
-         av->video_frame = avcodec_alloc_frame();
-+#else
-+        av->video_frame = av_frame_alloc();
-+#endif
-         success = av->video_frame;
-         if (!success) err_msg = "Could not allocate video frame";
-     }
-@@ -466,7 +479,7 @@
-     AVStream *audio_stream;
-     if (success)
-     {
--        audio_codec = avcodec_find_encoder(CODEC_ID_VORBIS);
-+        audio_codec = avcodec_find_encoder(AV_CODEC_ID_VORBIS);
-         success = audio_codec;
-         if (!success) err_msg = "Could not find Vorbis encoder";
-     }
-@@ -511,7 +524,11 @@
-     }
-     if (success)
-     {
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,0)
-         av->audio_frame = avcodec_alloc_frame();
-+#else
-+        av->audio_frame = av_frame_alloc();
-+#endif
-         success = av->audio_frame;
-         if (!success) err_msg = "Could not allocate audio frame";
-     }
-@@ -550,6 +567,7 @@
-     // Start movie file
-     if (success)
-     {
-+        video_stream->time_base = (AVRational){1, TICKS_PER_SECOND};
-         avformat_write_header(av->fmt_ctx, NULL);
-     }
-     
-@@ -615,13 +633,15 @@
-     while (!done)
-     {
-         // add video
--        int vsize = avcodec_encode_video(vcodec,
--                                         av->video_buf, av->video_bufsize,
--                                         frame);
-+        AVPacket pkt;
-+        av_init_packet(&pkt);
-+        pkt.data = av->video_buf;
-+        pkt.size = av->video_bufsize;
-+        
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0)
-+        int vsize = avcodec_encode_video(vcodec, av->video_buf, av->video_bufsize, frame);
-         if (vsize > 0)
-         {
--            AVPacket pkt;
--            av_init_packet(&pkt);
-             if (vcodec->coded_frame->pts != AV_NOPTS_VALUE)
-             {
-                 pkt.pts = av_rescale_q(vcodec->coded_frame->pts,
-@@ -630,12 +650,19 @@
-             }
-             if (vcodec->coded_frame->key_frame)
-                 pkt.flags |= AV_PKT_FLAG_KEY;
-+            pkt.size = vsize;
-+        }
-+
-+#else
-+        int got_packet = 0;
-+        int vsize = avcodec_encode_video2(vcodec, &pkt, frame, &got_packet);
-+#endif
-+        if (vsize > 0)
-+        {
-             pkt.stream_index = vstream->index;
--            pkt.data = av->video_buf;
--            pkt.size = vsize;
-             av_interleaved_write_frame(av->fmt_ctx, &pkt);
--            av_free_packet(&pkt);
-         }
-+        av_free_packet(&pkt);
-         
-         if (!last || vsize <= 0)
-             done = true;
-@@ -679,7 +706,11 @@
-                       write_samples, acodec->channels, write_samples * write_bps,
-                       acodec->sample_fmt, av->audio_data_conv);
-                       
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
-         avcodec_get_frame_defaults(av->audio_frame);
-+#else
-+        av_frame_unref(av->audio_frame);
-+#endif
-         av->audio_frame->nb_samples = write_samples;
-         int asize = avcodec_fill_audio_frame(av->audio_frame, acodec->channels,
-                                              acodec->sample_fmt,
-@@ -695,7 +726,7 @@
-             if (0 == avcodec_encode_audio2(acodec, &pkt, av->audio_frame, &got_pkt)
-                 && got_pkt)
-             {
--                if (acodec->coded_frame->pts != AV_NOPTS_VALUE)
-+                if (acodec->coded_frame && acodec->coded_frame->pts != AV_NOPTS_VALUE)
-                 {
-                     pkt.pts = av_rescale_q(acodec->coded_frame->pts,
-                                            acodec->time_base,
-Index: Source_Files/FFmpeg/SDL_ffmpeg.c
-===================================================================
---- Source_Files/FFmpeg/SDL_ffmpeg.c	(revision 5008)
-+++ Source_Files/FFmpeg/SDL_ffmpeg.c	(revision 5009)
-@@ -48,6 +48,38 @@
- }
- #endif
- 
-+// FFmpeg compatibility
-+#ifndef AV_CODEC_ID_MPEG1VIDEO
-+#define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
-+#endif
-+#ifndef AV_CODEC_ID_MPEG2VIDEO
-+#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
-+#endif
-+#ifndef AV_CODEC_ID_MP2
-+#define AV_CODEC_ID_MP2 CODEC_ID_MP2
-+#endif
-+#ifndef AV_CODEC_ID_DVVIDEO
-+#define AV_CODEC_ID_DVVIDEO CODEC_ID_DVVIDEO
-+#endif
-+#ifndef AV_CODEC_ID_DVAUDIO
-+#define AV_CODEC_ID_DVAUDIO CODEC_ID_DVAUDIO
-+#endif
-+#ifndef AV_CODEC_ID_PCM_S16LE
-+#define AV_CODEC_ID_PCM_S16LE CODEC_ID_PCM_S16LE
-+#endif
-+#ifndef AV_CODEC_ID_PCM_S16BE
-+#define AV_CODEC_ID_PCM_S16BE CODEC_ID_PCM_S16BE
-+#endif
-+#ifndef AV_CODEC_ID_PCM_U16LE
-+#define AV_CODEC_ID_PCM_U16LE CODEC_ID_PCM_U16LE
-+#endif
-+#ifndef AV_CODEC_ID_PCM_U16BE
-+#define AV_CODEC_ID_PCM_U16BE CODEC_ID_PCM_U16BE
-+#endif
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- #include "SDL_ffmpeg.h"
- 
- #ifdef MSVC
-@@ -169,12 +201,12 @@
- 
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDVD =
- {
--    CODEC_ID_MPEG2VIDEO,
-+    AV_CODEC_ID_MPEG2VIDEO,
-     720, 576,
-     1, 25,
-     6000000,
-     -1, -1,
--    CODEC_ID_MP2,
-+    AV_CODEC_ID_MP2,
-     2, 48000,
-     192000,
-     -1, -1
-@@ -182,12 +214,12 @@
- 
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDV =
- {
--    CODEC_ID_DVVIDEO,
-+    AV_CODEC_ID_DVVIDEO,
-     720, 576,
-     1, 25,
-     6553600,
-     -1, -1,
--    CODEC_ID_DVAUDIO,
-+    AV_CODEC_ID_DVAUDIO,
-     2, 48000,
-     256000,
-     -1, -1
-@@ -324,7 +356,11 @@
-     {
-         if ( file->type == SDL_ffmpegInputStream )
-         {
-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,17,0)
-             av_close_input_file( file->_ffmpeg );
-+#else
-+            avformat_close_input( &file->_ffmpeg );
-+#endif
-         }
-         else if ( file->type == SDL_ffmpegOutputStream )
-         {
-@@ -448,7 +484,11 @@
-                 {
-                     stream->mutex = SDL_CreateMutex();
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,0)
-                     stream->decodeFrame = avcodec_alloc_frame();
-+#else
-+                    stream->decodeFrame = av_frame_alloc();
-+#endif
- 
-                     SDL_ffmpegStream **s = &file->vs;
-                     while ( *s )
-@@ -1301,11 +1341,17 @@
- {
-     if ( stream && stream->_ffmpeg && stream->_ffmpeg->codec )
-     {
--        if ( nominator ) *nominator = stream->_ffmpeg->r_frame_rate.num;
-+        AVRational frate;
-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55,12,100)
-+        frate = stream->_ffmpeg->r_frame_rate;
-+#else
-+        frate = av_stream_get_r_frame_rate(stream->_ffmpeg);
-+#endif
-+        if ( nominator ) *nominator = frate.num;
- 
--        if ( denominator ) *denominator = stream->_ffmpeg->r_frame_rate.den;
-+        if ( denominator ) *denominator = frate.den;
- 
--        return ( float )stream->_ffmpeg->r_frame_rate.num / stream->_ffmpeg->r_frame_rate.den;
-+        return ( float )frate.num / frate.den;
-     }
-     else
-     {
-@@ -1587,13 +1633,13 @@
-     stream->codec->pix_fmt = PIX_FMT_YUV420P;
- 
-     /* set mpeg2 codec parameters */
--    if ( stream->codec->codec_id == CODEC_ID_MPEG2VIDEO )
-+    if ( stream->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO )
-     {
-         stream->codec->max_b_frames = 2;
-     }
- 
-     /* set mpeg1 codec parameters */
--    if ( stream->codec->codec_id == CODEC_ID_MPEG1VIDEO )
-+    if ( stream->codec->codec_id == AV_CODEC_ID_MPEG1VIDEO )
-     {
-         /* needed to avoid using macroblocks in which some coeffs overflow
-            this doesnt happen with normal video, it just happens here as the
-@@ -1757,10 +1803,10 @@
- 
-             switch ( stream->codec->codec_id )
-             {
--                case CODEC_ID_PCM_S16LE:
--                case CODEC_ID_PCM_S16BE:
--                case CODEC_ID_PCM_U16LE:
--                case CODEC_ID_PCM_U16BE:
-+                case AV_CODEC_ID_PCM_S16LE:
-+                case AV_CODEC_ID_PCM_S16BE:
-+                case AV_CODEC_ID_PCM_U16LE:
-+                case AV_CODEC_ID_PCM_U16BE:
-                     str->encodeAudioInputSize >>= 1;
-                     break;
-                 default:
-@@ -2032,19 +2078,41 @@
-     while ( size > 0 )
-     {
-         /* Decode the packet */
--
--#if ( LIBAVCODEC_VERSION_MAJOR <= 52 && LIBAVCODEC_VERSION_MINOR <= 20 )
--        int len = avcodec_decode_audio2( file->audioStream->_ffmpeg->codec, ( int16_t* )file->audioStream->sampleBuffer, &audioSize, pack->data, pack->size );
--#else
--        int len = avcodec_decode_audio3( file->audioStream->_ffmpeg->codec, ( int16_t* )file->audioStream->sampleBuffer, &audioSize, pack );
-+        AVCodecContext *avctx = file->audioStream->_ffmpeg->codec;
-+        AVFrame dframe;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,28,1)
-+        avcodec_get_frame_defaults(&dframe);
- #endif
--
--        /* if an error occured, we skip the frame */
--        if ( len <= 0 || !audioSize )
-+        int got_frame = 0;
-+        int len = avcodec_decode_audio4( avctx, &dframe, &got_frame, pack );
-+        
-+        if (len < 0 || !got_frame)
-         {
-             SDL_ffmpegSetError( "error decoding audio frame" );
-             break;
-         }
-+        
-+        int planar = av_sample_fmt_is_planar( avctx->sample_fmt );
-+        int plane_size;
-+        int data_size = av_samples_get_buffer_size( &plane_size, avctx->channels, dframe.nb_samples, avctx->sample_fmt, 1 );
-+        if ( data_size > 10000 )
-+        {
-+            SDL_ffmpegSetError( "too much data in decoded audio frame" );
-+            break;
-+        }
-+        memcpy( file->audioStream->sampleBuffer, dframe.extended_data[0], plane_size );
-+        audioSize = plane_size;
-+        if ( planar && avctx->channels > 1 )
-+        {
-+            int8_t *out = file->audioStream->sampleBuffer + plane_size;
-+            int ch;
-+            for ( ch = 1; ch < avctx->channels; ch++ )
-+            {
-+                memcpy( out, dframe.extended_data[ch], plane_size );
-+                out += plane_size;
-+                audioSize += plane_size;
-+            }
-+        }
- 
-         /* change pointers */
-         data += len;
diff --git a/games/alephone/r5010.diff b/games/alephone/r5010.diff
deleted file mode 100644
index ff010424fa..0000000000
--- a/games/alephone/r5010.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 5009)
-+++ configure.ac	(revision 5010)
-@@ -195,7 +195,7 @@
- 
- if [[ "x$enable_ffmpeg" = "xyes" ]]; then
- dnl Check for libavcodec
--PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.35.0 libavformat >= 53.21.0 libavutil >= 51.22.0 libswscale >= 2.1.0], [
-+PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.61.100 libavformat >= 53.32.100 libavutil >= 51.35.100 libswscale >= 2.1.100], [
- 			    CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS"
- 			    LIBS="$FFMPEG_LIBS $LIBS"
- 			    AC_DEFINE(HAVE_FFMPEG, 1, [ffmpeg support enabled])
diff --git a/games/alephone/r5013.diff b/games/alephone/r5013.diff
deleted file mode 100644
index 48f621d852..0000000000
--- a/games/alephone/r5013.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: Source_Files/Sound/FFmpegDecoder.cpp
-===================================================================
---- Source_Files/Sound/FFmpegDecoder.cpp	(revision 5012)
-+++ Source_Files/Sound/FFmpegDecoder.cpp	(revision 5013)
-@@ -21,6 +21,9 @@
-  
-  */
- 
-+// make FFmpeg happy
-+#define __STDC_CONSTANT_MACROS
-+
- #include "FFmpegDecoder.h"
- 
- #ifdef HAVE_FFMPEG
diff --git a/games/alephone/r5033.diff b/games/alephone/r5033.diff
deleted file mode 100644
index 54f7ea355a..0000000000
--- a/games/alephone/r5033.diff
+++ /dev/null
@@ -1,514 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 5032)
-+++ configure.ac	(revision 5033)
-@@ -1,9 +1,13 @@
- dnl Process this file with autoconf to produce a configure script.
--dnl Written in 2000 by Christian Bauer <Christian.Bauer@uni-mainz.de>
-+dnl Written by Christian Bauer and the Aleph One developers.
- 
--AC_INIT([Aleph One/SDL], m4_esyscmd([ grep '^#define A1_DATE_VERSION' Source_Files/Misc/alephversion.h | sed -e 's/\(.*\"\)\(.*\)\(\"\)/\2/g' | tr -d '\n']), [http://sourceforge.net/bugs/?group_id=1997], [AlephOne])
-+AC_INIT([Aleph One],
-+        m4_esyscmd([ grep '^#define A1_DATE_VERSION' Source_Files/Misc/alephversion.h | sed -e 's/\(.*\"\)\(.*\)\(\"\)/\2/g' | tr -d '\n']),
-+        [http://sourceforge.net/p/marathon/bugs/],
-+        [AlephOne],
-+        [http://marathon.sourceforge.net/])
- AC_CONFIG_SRCDIR([Source_Files/shell.cpp])
--AC_PREREQ(2.52)
-+AC_PREREQ([2.65])
- 
- dnl Detect the canonical host and target build environment.
- AC_CANONICAL_HOST
-@@ -11,288 +15,212 @@
- 
- dnl Init automake.
- AM_INIT_AUTOMAKE
--AM_CONFIG_HEADER(config.h)
-+AM_CONFIG_HEADER([config.h])
- 
- dnl Configure options.
--AC_ARG_ENABLE(opengl, 
--[  --enable-opengl         use OpenGL for rendering [default=yes]], , enable_opengl=yes)
--AC_ARG_ENABLE(mad, 
--[  --enable-mad            use libmad for mp3 playback [default=yes]], , enable_mad=yes)
--AC_ARG_ENABLE(ffmpeg,
--[  --enable-ffmpeg         use ffmpeg for audio/video playback and film export [default=yes]], , enable_ffmpeg=yes)
--AC_ARG_ENABLE(sndfile, 
--[  --enable-sndfile        use libsndfile for decoding audio files [default=yes]], , enable_sndfile=yes)
--AC_ARG_ENABLE(vorbis, 
--[  --enable-vorbis         enable ogg/vorbis music playback [default=yes]], , enable_vorbis=yes)
--AC_ARG_ENABLE(lua, 
--[  --enable-lua            use built-in Lua scripting [default=yes]], , enable_lua=yes)
--AC_ARG_ENABLE(smpeg, 
--[  --enable-smpeg          use SMPEG for movie playback [default=yes]], , enable_smpeg=yes)
--AC_ARG_ENABLE(speex, 
--[  --enable-speex          enable Speex net mic playback [default=yes]], , enable_speex=yes)
--AC_ARG_ENABLE(alsa,
--[  --enable-alsa           enable ALSA net mic transmission [default=yes]], , enable_alsa=yes)
--AC_ARG_ENABLE(zzip,
--[  --enable-zzip           enable zziplib support [default=yes]], , enable_zzip=yes)
--AC_ARG_ENABLE(png,
--[  --enable-png            enable PNG screenshot support [default=yes]], , enable_png=yes)
- 
--dnl Checks for programs.
-+dnl AX_ARG_ENABLE(option, desc)
-+AC_DEFUN([AX_ARG_ENABLE],
-+         [ desc_$1="$2"
-+           AC_ARG_ENABLE([$1], AS_HELP_STRING([--disable-$1], [do not include $2])) ])
-+dnl AX_ARG_WITH(option)
-+AC_DEFUN([AX_ARG_WITH],
-+         [ desc_$1="$2"
-+           AC_ARG_WITH([$1], AS_HELP_STRING([--without-$1], [do not use $2])) ])
-+
-+AX_ARG_ENABLE([opengl], [OpenGL rendering])
-+AX_ARG_ENABLE([lua], [built-in Lua scripting])
-+
-+AX_ARG_WITH([sdl_image], [SDL_image support])
-+AX_ARG_WITH([ffmpeg], [FFmpeg playback and film export])
-+AX_ARG_WITH([mad], [libmad MP3 playback])
-+AX_ARG_WITH([sndfile], [libsndfile audio decoding])
-+AX_ARG_WITH([vorbis], [libvorbis Ogg/Vorbis music playback])
-+AX_ARG_WITH([smpeg], [SMPEG movie playback])
-+AX_ARG_WITH([speex], [Speex net mic playback])
-+AX_ARG_WITH([alsa], [ALSA net mic transmission])
-+AX_ARG_WITH([zzip], [zziplib support])
-+AX_ARG_WITH([png], [libpng PNG screenshot support])
-+
-+
-+dnl Check for programs.
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_CXX
- AC_PROG_CXXCPP
-+AC_PROG_OBJCXX
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- 
--dnl some platform specific stuff
--case $target in
--*-*-mingw32*)
--	AC_CHECK_TOOL(WINDRES, windres, :)
--	;;
--*-*-netbsd*)
--	CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"	
--	;;
--*)
--	;;
--esac
-+dnl Some platform specific stuff.
-+AS_CASE([$target],
-+        [*-*-mingw32*],
-+        [ make_windows=true
-+          AC_CHECK_TOOL([WINDRES], [windres], [:])
-+          AC_DEFINE([WIN32_DISABLE_MUSIC], [1], [Win32 music disabled])
-+          LIBS="$LIBS -ldsound -lwsock32" ],
-+        [*-*-netbsd*],
-+        [CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"])
-+AM_CONDITIONAL([MAKE_WINDOWS], [test "x$make_windows" = "xtrue"])
- 
--dnl Checks for headers.
--AC_CHECK_HEADERS(unistd.h)
--AC_CHECK_HEADERS(pwd.h)
-+dnl Set target system name.
-+AC_DEFINE_UNQUOTED([TARGET_PLATFORM], ["$target_os $target_cpu"], [Target platform name])
- 
--dnl Checks for library functions.
--AC_CHECK_FUNC(snprintf, [
--  AC_DEFINE(HAVE_SNPRINTF, 1, [snprintf() is available])
--])
--AC_CHECK_FUNC(vsnprintf, [
--  AC_DEFINE(HAVE_VSNPRINTF, 1, [vsnprintf() is available])
--])
-+dnl Check for headers.
-+AC_CHECK_HEADERS([unistd.h pwd.h])
- 
--AC_CHECK_FUNC(mkstemp, [
--  AC_DEFINE(LUA_USE_MKSTEMP, 1, [mkstemp() is available])
--])
--AC_CHECK_FUNC(sysconf, [
--  AC_DEFINE(HAVE_SYSCONF, 1, [sysconf() is available])
--])
--AC_CHECK_FUNC(sysctlbyname, [
--  AC_DEFINE(HAVE_SYSCTLBYNAME, 1, [sysctlbyname() is available])
--])
-+dnl Check for boost functions.
-+AC_LANG_PUSH(C++)
-+AC_CHECK_HEADER([boost/bind.hpp],
-+                ,
-+                [AC_MSG_ERROR([You need boost/bind.hpp from the boost library to run Aleph One.])])
-+AC_CHECK_HEADER([boost/function.hpp],
-+                ,
-+                [AC_MSG_ERROR([You need boost/function.hpp from the boost library to run Aleph One.])])
-+AC_LANG_POP(C++)
- 
--dnl Check for SDL.
--AM_PATH_SDL(1.2.0, , AC_MSG_ERROR([You need SDL 1.2 to run Aleph One.]))
--CPPFLAGS="$CPPFLAGS $SDL_CFLAGS -DSDL"
--LIBS="$LIBS $SDL_LIBS"
-+dnl Check for library functions.
-+AC_CHECK_FUNCS([snprintf vsnprintf sysconf sysctlbyname])
-+AC_CHECK_FUNC([mkstemp],
-+              [AC_DEFINE([LUA_USE_MKSTEMP], [1], [mkstemp() available])])
- 
--dnl Check for SDL_image.
--AC_CHECK_HEADERS(SDL_image.h, [
--  AC_CHECK_LIB(SDL_image, IMG_Load, [
--    LIBS="-lSDL_image $LIBS"
--    AC_DEFINE(HAVE_SDL_IMAGE, 1, [SDL_image support is enabled])
--  ])
--])
-+dnl Check for net functions.
-+AC_SEARCH_LIBS([gethostbyname], [nsl])
-+AC_SEARCH_LIBS([socket], [socket],
-+               ,
-+               [AC_CHECK_LIB([nsl], [socket],
-+                             [ LIBS="$LIBS -lsocket -lnsl" ],
-+                             ,
-+                             [-lsocket])])
- 
--AC_CHECK_HEADERS(SDL_ttf.h, [
-- AC_CHECK_LIB(SDL_ttf, TTF_Init, [
--   LIBS="-lSDL_ttf $LIBS"
--   AC_DEFINE(HAVE_SDL_TTF, 1, [SDL_TTF support is enabled])
-- ])],
-- AC_MSG_ERROR([You need SDL_ttf to run Aleph One.])
--)
-+dnl Check for libraries.
- 
--dnl Check for SDL_net.
--AC_CHECK_HEADERS(SDL_net.h, [
--  AC_CHECK_LIB(SDL_net, SDLNet_Init, [
--    LIBS="-lSDL_net $LIBS"
--    AC_DEFINE(HAVE_SDL_NET, 1, [SDL_net support is enabled])
--  ])
--])
--if [[ "x$ac_cv_lib_SDL_net_SDLNet_Init" != xyes ]]; then
--  AC_MSG_ERROR([You need SDL_net to run Aleph One.])
--fi
--AM_CONDITIONAL(HAVE_SDL_NET, test x$ac_cv_lib_SDL_net_SDLNet_Init = xyes)
-+dnl AX_REQUIRE_LIB(desc, define, header, lib, func)
-+AC_DEFUN([AX_REQUIRE_LIB],
-+         [ AC_CHECK_HEADERS([$3], [AC_CHECK_LIB([$4], [$5])])
-+           AS_IF([test "x${ac_cv_lib_$4_$5}" = "xyes"],
-+                 [AC_DEFINE([HAVE_$2], [1], [$1 support enabled])],
-+                 [AC_MSG_ERROR([You need $1 to run Aleph One.])]) ])
- 
--AC_SEARCH_LIBS(gethostbyname, nsl)
--AC_SEARCH_LIBS(socket, socket, ,
--    [AC_CHECK_LIB(nsl, socket, LIBS="$LIBS -lsocket -lnsl", , -lsocket)])
-+dnl Check for required SDL dependencies.
-+AM_PATH_SDL(1.2.0, , AC_MSG_ERROR([You need SDL 1.2 to run Aleph One.]))
-+CPPFLAGS="$CPPFLAGS $SDL_CFLAGS -DSDL"
-+LIBS="$LIBS $SDL_LIBS"
- 
-+AX_REQUIRE_LIB([SDL_ttf], [SDL_TTF],
-+               [SDL_ttf.h], [SDL_ttf], [TTF_Init])
-+AX_REQUIRE_LIB([SDL_net], [SDL_NET],
-+               [SDL_net.h], [SDL_net], [SDLNet_Init])
- 
--dnl Check for zlib
--AC_CHECK_HEADER(zlib.h, , AC_ERROR([Aleph One requires zlib]))
--AC_CHECK_LIB(z, zlibVersion, LIBS="-lz $LIBS", AC_ERROR([Aleph One requires zlib]))
-+dnl Check for zlib.
-+AX_REQUIRE_LIB([zlib], [ZLIB],
-+               [zlib.h], [z], [zlibVersion])
- 
--dnl Check for zziplib
--have_zzip=false
--if [[ "x$enable_zzip" = "xyes" ]]; then
--PKG_CHECK_MODULES([ZZIP], [zziplib >= 0.10.75], [
--			  CPPFLAGS="$ZZIP_CFLAGS $CPPFLAGS"
--			  LIBS="$ZZIP_LIBS $LIBS"
--			  have_zzip=true
--			  AC_DEFINE(HAVE_ZZIP, 1, [ZZIP support enabled])
--])
--fi
--AM_CONDITIONAL(BUILD_ZZIP_RWOPS, test x$have_zzip = xtrue)
-+dnl Check for OpenGL.
-+AS_IF([test "x$enable_opengl" != "xno"],
-+      [ AC_MSG_CHECKING([for OpenGL support])
-+        compiled_opengl=no
-+        AS_CASE([$target],
-+                [*-*-cygwin* | *-*-mingw32*],
-+                [ SYS_GL_LIBS="-lGLEW -lopengl32 -lglu32"
-+                  LIBS="$LIBS -lstdc++" ],
-+                [*-*-darwin*],
-+                [ SYS_GL_LIBS="-F/System/Library/Frameworks -framework AGL -framework OpenGL"
-+                  CPPFLAGS="$CPPFLAGS -D__DARWIN__ -F/System/Library/Frameworks -I/System/Library/Frameworks/OpenGL.framework/Headers" ],
-+                [*-*-linux*],
-+                [ SYS_GL_LIBS="-lGL -lpthread" ],
-+                [ SYS_GL_LIBS="-lGL" ])
-+        AC_TRY_COMPILE([
-+          #ifndef __DARWIN__
-+          #include <GL/gl.h>
-+          #else
-+          #include <OpenGL/gl.h>
-+          #endif
-+          ],
-+          ,
-+          [ compiled_opengl=yes ])
-+        AC_MSG_RESULT($compiled_opengl)
-+        AS_IF([test "x$compiled_opengl" = "xyes"],
-+              [ have_opengl=true
-+                AC_DEFINE([HAVE_OPENGL], [1], [OpenGL support enabled])
-+                AC_CHECK_LIB([GLU], [gluScaleImage],
-+                             [SYS_GL_LIBS="$SYS_GL_LIBS -lGLU"],
-+                             ,
-+                             [$SYS_GL_LIBS])
-+                LIBS="$LIBS $SYS_GL_LIBS"
-+                AC_CHECK_HEADERS([GL/glext.h], [], [], [#include <GL/gl.h>]) ],
-+              [ AS_IF([test "x$enable_opengl" = "xyes"],
-+                      [AC_MSG_ERROR([OpenGL support requested but not available])],
-+                      [AC_MSG_WARN([OpenGL not available])]) ]) ])
-+AM_CONDITIONAL([MAKE_OPENGL], [test "x$have_opengl" = "xtrue" ])
- 
--have_png=false
--if [[ "x$enable_png" = "xyes" ]]; then
--PKG_CHECK_MODULES([PNG], [libpng], [
--		  CPPFLAGS="$PNG_CFLAGS $CPPFLAGS"
--		  LIBS="$PNG_LIBS $LIBS"
--		  have_png=true
--		  AC_DEFINE(HAVE_PNG, 1, [PNG support enabled])]
--)
--fi
--AM_CONDITIONAL(HAVE_PNG, test x$have_png = xtrue)
-+dnl Enable Lua.
-+AS_IF([test "x$enable_lua" != "xno"],
-+      [ have_lua=true
-+        AC_DEFINE([HAVE_LUA], [1], [Lua support enabled]) ])
- 
--dnl Check for boost/bind
--AC_LANG_PUSH(C++)
--AC_CHECK_HEADER([boost/bind.hpp], , [AC_MSG_ERROR([You need boost/bind.hpp from the boost library to run Aleph One])])
--AC_LANG_POP(C++)
- 
--dnl Check for boost/function
--AC_LANG_PUSH(C++)
--AC_CHECK_HEADER([boost/function.hpp], , [AC_MSG_ERROR([You need boost/function.hpp from the boost library to run Aleph One])])
--AC_LANG_POP(C++)
-+dnl Check optional packages.
- 
--if [[ "x$enable_smpeg" = "xyes" ]]; then
--dnl Check for SMPEG
--AC_CHECK_HEADERS([smpeg/smpeg.h], [
--  AC_CHECK_LIB(smpeg, SMPEG_new, [
--    LIBS="-lsmpeg $LIBS"
--    AC_DEFINE(HAVE_SMPEG, 1, [SMPEG movie playback is enabled])
--  ])
--])
--fi	    
-+dnl AX_CHECK_FEATURE_LIB(option, define, header, lib, func)
-+AC_DEFUN([AX_CHECK_FEATURE_LIB],
-+         [ AS_IF([test "x${with_$1}" != "xno"],
-+                 [ AC_CHECK_HEADERS([$3], [AC_CHECK_LIB([$4], [$5])])
-+                   AS_IF([test "x${ac_cv_lib_$4_$5}" = "xyes"],
-+                         [ have_$1=true
-+                           AC_DEFINE([HAVE_$2], [1], [${desc_$1} enabled]) ],
-+                         [AS_IF([test "x${with_$1}" = "xyes"],
-+                                [AC_MSG_ERROR([${desc_$1} requested but not found])])])
-+                 ]) ])
-+dnl AX_CHECK_FEATURE_PKG(option, define, package, lib)
-+AC_DEFUN([AX_CHECK_FEATURE_PKG],
-+         [ AS_IF([test "x${with_$1}" != "xno"],
-+                 [ PKG_CHECK_MODULES([$3], [$4],
-+                                     [ CPPFLAGS="${[$3]_CFLAGS} $CPPFLAGS"
-+                                       LIBS="${[$3]_LIBS} $LIBS"
-+                                       have_$1=true
-+                                       AC_DEFINE([HAVE_$2], [1], [${desc_$1} enabled]) ],
-+                                     [AS_IF([test "x${with_$1}" = "xyes"],
-+                                            [AC_MSG_ERROR([${desc_$1} requested but not available])])])
-+           
-+                 ])
-+            AM_CONDITIONAL([HAVE_$2], [test "x${have_$1}" = "xtrue"])
-+          ])
- 
--if [[ "x$enable_mad" = "xyes" ]]; then
--dnl Check for libmad
--AC_CHECK_HEADERS([mad.h], [
--			  AC_CHECK_LIB(mad, mad_stream_init, [
--			  LIBS="-lmad $LIBS"
--			  AC_DEFINE(HAVE_MAD, 1, [MAD mp3 playback is enabled])
--])
--])
--fi
-+AX_CHECK_FEATURE_LIB([sdl_image], [SDL_IMAGE],
-+                     [SDL_image.h], [SDL_image], [IMG_Load])
- 
--if [[ "x$enable_sndfile" = "xyes" ]]; then
--dnl Check for libsndfile
--AC_CHECK_HEADERS([sndfile.h], [
--			      AC_CHECK_LIB(sndfile, sf_open, [
--			      LIBS="-lsndfile $LIBS"
--			      AC_DEFINE(HAVE_SNDFILE, 1, [libsndfile support is enabled])
--])
--])
--fi
-+AX_CHECK_FEATURE_PKG([ffmpeg], [FFMPEG],
-+                     [FFMPEG], [libavcodec >= 53.61.100 libavformat >= 53.32.100 libavutil >= 51.35.100 libswscale >= 2.1.1])
- 
--if [[ "x$enable_vorbis" = "xyes" ]]; then
--dnl Check for vorbisfile
--PKG_CHECK_MODULES([VORBISFILE], [vorbisfile], [
--			  CPPFLAGS="$VORBISFILE_CFLAGS $CPPFLAGS"
--			  LIBS="$VORBISFILE_LIBS $LIBS"
--			  AC_DEFINE(HAVE_VORBISFILE, 1, [vorbis support enabled])
--])
--fi
-+AX_CHECK_FEATURE_LIB([mad], [MAD],
-+                     [mad.h], [mad], [mad_stream_init])
- 
--if [[ "x$enable_ffmpeg" = "xyes" ]]; then
--dnl Check for libavcodec
--PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.61.100 libavformat >= 53.32.100 libavutil >= 51.35.100 libswscale >= 2.1.100], [
--			    CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS"
--			    LIBS="$FFMPEG_LIBS $LIBS"
--			    AC_DEFINE(HAVE_FFMPEG, 1, [ffmpeg support enabled])
--			    have_ffmpeg=true
--])
--fi
--AM_CONDITIONAL(HAVE_FFMPEG, test x$have_ffmpeg = xtrue)
-+AX_CHECK_FEATURE_LIB([sndfile], [SNDFILE],
-+                     [sndfile.h], [sndfile], [sf_open])
- 
--if [[ "x$enable_lua" = "xyes" ]]; then
--AC_DEFINE(HAVE_LUA, 1, [Lua support is enabled])
--fi
-+AX_CHECK_FEATURE_PKG([vorbis], [VORBISFILE],
-+                     [VORBISFILE], [vorbisfile])
- 
--if [[ "x$enable_speex" = "xyes" ]]; then
--dnl Check for Speex
--AC_CHECK_HEADERS(speex/speex.h, [
--  AC_CHECK_LIB(speex, speex_decoder_init, [
--    LIBS="-lspeex $LIBS"
--    AC_DEFINE(SPEEX, 1, [Speex support is enabled])
--  ])
--  AC_CHECK_LIB(speexdsp, speex_preprocess_state_init, [
--  LIBS="-lspeexdsp $LIBS"
--])
--])
--fi
-+AX_CHECK_FEATURE_LIB([smpeg], [SMPEG],
-+                     [smpeg/smpeg.h], [smpeg], [SMPEG_new])
- 
--if [[ "x$enable_alsa" = "xyes" ]]; then
--dnl Check for ALSA
--AC_CHECK_HEADERS([alsa/asoundlib.h], [
--  AC_CHECK_LIB(asound, snd_pcm_open, [
--    LIBS="-lasound $LIBS"
--    AC_DEFINE(HAVE_ALSA, 1, [ALSA netmic is enabled])
--  ])
--])
--fi
-+AX_CHECK_FEATURE_LIB([speex], [SPEEX],
-+                     [speex/speex.h], [speex], [speex_decoder_init])
-+AS_IF([test "x$have_speex" = "xyes"],
-+      [AC_CHECK_LIB([speexdsp], [speex_preprocess_state_init])])
- 
--dnl Figure out which OpenGL library to use
--case "$target" in
--  *-*-cygwin* | *-*-mingw32*)
--    SYS_GL_LIBS="-lGLEW -lopengl32 -lglu32"
--    LIBS="$LIBS -lstdc++"
--    ;;
--  *-*-darwin*)
--    SYS_GL_LIBS="-F/System/Library/Frameworks -framework AGL -framework OpenGL"
--    CPPFLAGS="$CPPFLAGS -D__DARWIN__ -F/System/Library/Frameworks  -I/System/Library/Frameworks/OpenGL.framework/Headers"
--    ;;
--  *-*-linux*)
--    SYS_GL_LIBS="-lGL -lpthread"	
--    ;;	
--  *)
--    SYS_GL_LIBS="-lGL"
--    ;;
--esac
-+AX_CHECK_FEATURE_LIB([alsa], [ALSA],
-+                     [alsa/asoundlib.h], [asound], [snd_pcm_open])
- 
--dnl Check for OpenGL.
--if [[ "x$enable_opengl" = "xyes" ]]; then
--  AC_MSG_CHECKING(for OpenGL support)
--  have_opengl=no
--  AC_TRY_COMPILE([
--   #ifndef __DARWIN__
--   #include <GL/gl.h>
--   #else
--   #include <OpenGL/gl.h>
--   #endif
--  ],[
--  ],[
--  have_opengl=yes
--  ])
--  AC_MSG_RESULT($have_opengl)
--  if test x$have_opengl = xyes; then
--    AC_DEFINE(HAVE_OPENGL, 1, [OpenGL support is enabled])
--    AC_CHECK_LIB(GLU, gluScaleImage, [SYS_GL_LIBS="$SYS_GL_LIBS -lGLU"], , $SYS_GL_LIBS)
--    LIBS="$LIBS $SYS_GL_LIBS"
--    AC_CHECK_HEADERS(GL/glext.h, [], [], [#include <GL/gl.h>])
--    make_opengl=true
--  else
--    AC_MSG_WARN([Could not find OpenGL, ignoring --enable-opengl.])
--    make_opengl=false
--  fi
--fi
--AM_CONDITIONAL(MAKE_OPENGL, test x$make_opengl = xtrue)
-+AX_CHECK_FEATURE_PKG([zzip], [ZZIP],
-+                     [ZZIP], [zziplib >= 0.10.75])
-+AM_CONDITIONAL([BUILD_ZZIP_RWOPS], [test "x$have_zzip" = "xtrue"])
- 
--dnl Set target system name.
--AC_DEFINE_UNQUOTED(TARGET_PLATFORM, "$target_os $target_cpu", [Target platform name])
-+AX_CHECK_FEATURE_PKG([png], [PNG],
-+                     [PNG], [libpng])
- 
--dnl add some windows goodies
--case $target in
--*-*-mingw32*)
--	make_windows=true
--	AC_DEFINE(WIN32_DISABLE_MUSIC, 1, [Win32 music is disabled])
--	LIBS="$LIBS -ldsound -lwsock32"
--	;;
--*)
--	make_windows=false ;;
--esac
--AM_CONDITIONAL(MAKE_WINDOWS, test x$make_windows = xtrue)
- 
--
- dnl Generate Makefiles.
- AC_CONFIG_FILES([
- Makefile
-@@ -321,5 +249,32 @@
- ])
- AC_OUTPUT
- 
--dnl Print summary.
--echo "Configuration done. Now type \"make\"."
-+dnl Print summary of enabled/disabled options.
-+
-+dnl AX_PRINT_SUMMARY(option)
-+AC_DEFUN([AX_PRINT_SUMMARY],
-+         [ AS_IF([test "x${have_$1}" = "xtrue"],
-+                 [AS_ECHO(["    Enabled: ${desc_$1}"])],
-+                 [test "x${enable_$1}" = "xno" ||
-+                  test "x${with_$1}" = "xno"],
-+                 [AS_ECHO(["   Disabled: ${desc_$1}"])],
-+                 [AS_ECHO(["  Not found: ${desc_$1}"])])
-+         ])
-+
-+AS_ECHO([""])
-+AS_ECHO(["Summary of optional features:"])
-+AS_ECHO([""])
-+AX_PRINT_SUMMARY([opengl])
-+AX_PRINT_SUMMARY([lua])
-+AX_PRINT_SUMMARY([sdl_image])
-+AX_PRINT_SUMMARY([ffmpeg])
-+AX_PRINT_SUMMARY([mad])
-+AX_PRINT_SUMMARY([sndfile])
-+AX_PRINT_SUMMARY([vorbis])
-+AX_PRINT_SUMMARY([smpeg])
-+AX_PRINT_SUMMARY([speex])
-+AX_PRINT_SUMMARY([alsa])
-+AX_PRINT_SUMMARY([zzip])
-+AX_PRINT_SUMMARY([png])
-+AS_ECHO([""])
-+AS_ECHO(["Configuration done. Now type \"make\"."])
diff --git a/games/alephone/r5037.diff b/games/alephone/r5037.diff
deleted file mode 100644
index 852d75245e..0000000000
--- a/games/alephone/r5037.diff
+++ /dev/null
@@ -1,193 +0,0 @@
-Index: Source_Files/FFmpeg/Movie.cpp
-===================================================================
---- Source_Files/FFmpeg/Movie.cpp	(revision 5036)
-+++ Source_Files/FFmpeg/Movie.cpp	(revision 5037)
-@@ -138,6 +138,9 @@
-     AVFormatContext *fmt_ctx;
-     int video_stream_idx;
-     int audio_stream_idx;
-+    
-+    size_t video_counter;
-+    size_t audio_counter;
- };
- typedef struct libav_vars libav_vars_t;
- 
-@@ -495,6 +498,7 @@
-         audio_stream->codec->codec_id = audio_codec->id;
-         audio_stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-         audio_stream->codec->sample_rate = mx->obtained.freq;
-+        audio_stream->codec->time_base = (AVRational){1, mx->obtained.freq};
-         audio_stream->codec->channels = 2;
-         
-         if (av->fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
-@@ -507,19 +511,8 @@
-         audio_stream->codec->global_quality = FF_QP2LAMBDA * (aq / 10);
-         audio_stream->codec->flags |= CODEC_FLAG_QSCALE;
-         
--        // find correct sample format
--        audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_S16;
-+        audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_FLTP;
-         success = (0 <= avcodec_open2(audio_stream->codec, audio_codec, NULL));
--        if (!success)
--        {
--            audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_FLT;
--            success = (0 <= avcodec_open2(audio_stream->codec, audio_codec, NULL));
--        }
--        if (!success)
--        {
--            audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_FLTP;
--            success = (0 <= avcodec_open2(audio_stream->codec, audio_codec, NULL));
--        }
-         if (!success) err_msg = "Could not open audio codec";
-     }
-     if (success)
-@@ -568,6 +561,7 @@
-     if (success)
-     {
-         video_stream->time_base = (AVRational){1, TICKS_PER_SECOND};
-+        audio_stream->time_base = (AVRational){1, mx->obtained.freq};
-         avformat_write_header(av->fmt_ctx, NULL);
-     }
-     
-@@ -625,7 +619,7 @@
-     
-         sws_scale(av->sws_ctx, pdata, pitch, 0, temp_surface->h,
-                   av->video_frame->data, av->video_frame->linesize);
--        av->video_frame->pts = vcodec->frame_number;
-+        av->video_frame->pts = av->video_counter++;
-         frame = av->video_frame;
-     }
-     
-@@ -638,33 +632,22 @@
-         pkt.data = av->video_buf;
-         pkt.size = av->video_bufsize;
-         
--#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0)
--        int vsize = avcodec_encode_video(vcodec, av->video_buf, av->video_bufsize, frame);
--        if (vsize > 0)
--        {
--            if (vcodec->coded_frame->pts != AV_NOPTS_VALUE)
--            {
--                pkt.pts = av_rescale_q(vcodec->coded_frame->pts,
--                                       vcodec->time_base,
--                                       vstream->time_base);
--            }
--            if (vcodec->coded_frame->key_frame)
--                pkt.flags |= AV_PKT_FLAG_KEY;
--            pkt.size = vsize;
--        }
--
--#else
-         int got_packet = 0;
-         int vsize = avcodec_encode_video2(vcodec, &pkt, frame, &got_packet);
--#endif
--        if (vsize > 0)
-+        if (vsize == 0 && got_packet)
-         {
-+            if (pkt.pts != AV_NOPTS_VALUE && pkt.pts < pkt.dts)
-+                pkt.pts = pkt.dts;
-+            if (pkt.pts != AV_NOPTS_VALUE)
-+                pkt.pts = av_rescale_q(pkt.pts, vcodec->time_base, vstream->time_base);
-+            if (pkt.dts != AV_NOPTS_VALUE)
-+                pkt.dts = av_rescale_q(pkt.dts, vcodec->time_base, vstream->time_base);
-+            pkt.duration = av_rescale_q(pkt.duration, vcodec->time_base, vstream->time_base);
-             pkt.stream_index = vstream->index;
-             av_interleaved_write_frame(av->fmt_ctx, &pkt);
-+            av_free_packet(&pkt);
-         }
--        av_free_packet(&pkt);
--        
--        if (!last || vsize <= 0)
-+        if (!last || vsize < 0 || !got_packet)
-             done = true;
-     }
- }
-@@ -712,6 +695,10 @@
-         av_frame_unref(av->audio_frame);
- #endif
-         av->audio_frame->nb_samples = write_samples;
-+        av->audio_frame->pts = av_rescale_q(av->audio_counter,
-+                                            (AVRational){1, acodec->sample_rate},
-+                                            acodec->time_base);
-+        av->audio_counter += write_samples;
-         int asize = avcodec_fill_audio_frame(av->audio_frame, acodec->channels,
-                                              acodec->sample_fmt,
-                                              av->audio_data_conv,
-@@ -726,24 +713,57 @@
-             if (0 == avcodec_encode_audio2(acodec, &pkt, av->audio_frame, &got_pkt)
-                 && got_pkt)
-             {
--                if (acodec->coded_frame && acodec->coded_frame->pts != AV_NOPTS_VALUE)
--                {
--                    pkt.pts = av_rescale_q(acodec->coded_frame->pts,
--                                           acodec->time_base,
--                                           astream->time_base);
--                }
-+                if (pkt.pts != AV_NOPTS_VALUE && pkt.pts < pkt.dts)
-+                    pkt.pts = pkt.dts;
-+                if (pkt.pts != AV_NOPTS_VALUE)
-+                    pkt.pts = av_rescale_q(pkt.pts, acodec->time_base, astream->time_base);
-+                if (pkt.dts != AV_NOPTS_VALUE)
-+                    pkt.dts = av_rescale_q(pkt.dts, acodec->time_base, astream->time_base);
-+                pkt.duration = av_rescale_q(pkt.duration, acodec->time_base, astream->time_base);
-                 pkt.stream_index = astream->index;
--                pkt.flags |= AV_PKT_FLAG_KEY;
-                 av_interleaved_write_frame(av->fmt_ctx, &pkt);
-                 av_free_packet(&pkt);
-             }
-         }
-     }
-+    if (last)
-+    {
-+        bool done = false;
-+        while (!done)
-+        {
-+            AVPacket pkt;
-+            memset(&pkt, 0, sizeof(AVPacket));
-+            av_init_packet(&pkt);
-+            
-+            int got_pkt = 0;
-+            if (0 == avcodec_encode_audio2(acodec, &pkt, NULL, &got_pkt)
-+                && got_pkt)
-+            {
-+                if (pkt.pts != AV_NOPTS_VALUE && pkt.pts < pkt.dts)
-+                    pkt.pts = pkt.dts;
-+                if (pkt.pts != AV_NOPTS_VALUE)
-+                    pkt.pts = av_rescale_q(pkt.pts, acodec->time_base, astream->time_base);
-+                if (pkt.dts != AV_NOPTS_VALUE)
-+                    pkt.dts = av_rescale_q(pkt.dts, acodec->time_base, astream->time_base);
-+                pkt.duration = av_rescale_q(pkt.duration, acodec->time_base, astream->time_base);
-+                pkt.stream_index = astream->index;
-+                av_interleaved_write_frame(av->fmt_ctx, &pkt);
-+                av_free_packet(&pkt);
-+            }
-+            else
-+            {
-+                done = true;
-+            }
-+        }
-+        
-+    }
-     
- }
- 
- void Movie::EncodeThread()
- {
-+	av->video_counter = 0;
-+	av->audio_counter = 0;
- 	while (true)
- 	{
- 		SDL_SemWait(encodeReady);
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 5036)
-+++ configure.ac	(revision 5037)
-@@ -191,7 +191,7 @@
-                      [SDL_image.h], [SDL_image], [IMG_Load])
- 
- AX_CHECK_FEATURE_PKG([ffmpeg], [FFMPEG],
--                     [FFMPEG], [libavcodec >= 53.61.100 libavformat >= 53.32.100 libavutil >= 51.35.100 libswscale >= 2.1.1])
-+                     [FFMPEG], [libavcodec >= 54.35.0 libavformat >= 54.20.0 libavutil >= 52.3.0 libswscale >= 2.1.1])
- 
- AX_CHECK_FEATURE_LIB([mad], [MAD],
-                      [mad.h], [mad], [mad_stream_init])
diff --git a/games/angband/angband.SlackBuild b/games/angband/angband.SlackBuild
index 82cffe17f9..83ccdf16e1 100644
--- a/games/angband/angband.SlackBuild
+++ b/games/angband/angband.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=angband
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-4.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,7 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 LDFLAGS="-lSDL" \
+./autogen.sh
 ./configure \
   --enable-sdl \
   --prefix=/usr \
@@ -99,7 +100,7 @@ cp $CWD/angband.png $PKG/usr/share/pixmaps
 cp $CWD/angband.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changes.txt  compiling.txt  copying.txt  faq.txt  readme.txt  thanks.txt lib/help/ \
+cp -a changes.txt compiling.txt copying.txt faq.txt readme.txt thanks.txt lib/help/ \
     $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/angband/angband.info b/games/angband/angband.info
index 0c61d95a72..71fb344c9b 100644
--- a/games/angband/angband.info
+++ b/games/angband/angband.info
@@ -1,8 +1,8 @@
 PRGNAM="angband"
-VERSION="4.0.0"
+VERSION="4.0.4"
 HOMEPAGE="http://www.rephial.org/"
-DOWNLOAD="http://rephial.org/downloads/4.0/angband-4.0.0.tar.gz"
-MD5SUM="3813f95f46166ff383923eaba462b194"
+DOWNLOAD="http://rephial.org/downloads/4.0/angband-4.0.4.tar.gz"
+MD5SUM="40896f314f2024b91303506adeff37ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/assaultcube-reloaded/assaultcube-reloaded.SlackBuild b/games/assaultcube-reloaded/assaultcube-reloaded.SlackBuild
index 786af04ee7..0350085b36 100644
--- a/games/assaultcube-reloaded/assaultcube-reloaded.SlackBuild
+++ b/games/assaultcube-reloaded/assaultcube-reloaded.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for assaultcube-reloaded
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=assaultcube-reloaded
 SRCNAM=acr
-VERSION=${VERSION:-2.6.2}
+VERSION=${VERSION:-2.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/assaultcube-reloaded/assaultcube-reloaded.info b/games/assaultcube-reloaded/assaultcube-reloaded.info
index 7e7880e2c1..5d6bee5d83 100644
--- a/games/assaultcube-reloaded/assaultcube-reloaded.info
+++ b/games/assaultcube-reloaded/assaultcube-reloaded.info
@@ -1,8 +1,8 @@
 PRGNAM="assaultcube-reloaded"
-VERSION="2.6.2"
+VERSION="2.6.3"
 HOMEPAGE="http://acr.victorz.ca/"
-DOWNLOAD="https://github.com/acreloaded/acr/archive/v2.6.2.tar.gz"
-MD5SUM="31659ae86f3adbabfd303384b04a9786"
+DOWNLOAD="https://github.com/acreloaded/acr/archive/v2.6.3.tar.gz"
+MD5SUM="260e71aa128710012a94e53fdde61286"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL enet"
diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild
index a85d308613..75264f496e 100644
--- a/games/astromenace/astromenace.SlackBuild
+++ b/games/astromenace/astromenace.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for AstroMenace
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 SRCNAM=astromenace-src
 PRGNAM=$(echo $SRCNAM | cut -c1-11)
 VERSION=${VERSION:-1.3.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix freetype2 header path
+patch -p1 < $CWD/ft2_path.patch
+
 mkdir -p build
   cmake ./ # create Makefile
   make     # build game
diff --git a/games/astromenace/ft2_path.patch b/games/astromenace/ft2_path.patch
new file mode 100644
index 0000000000..ecae574d4c
--- /dev/null
+++ b/games/astromenace/ft2_path.patch
@@ -0,0 +1,11 @@
+--- AstroMenace/CMakeLists.orig.txt	2015-09-25 05:48:58.014083691 +0300
++++ AstroMenace/CMakeLists.txt	2015-09-25 05:59:11.322416282 +0300
+@@ -192,7 +192,7 @@
+ ELSE(FREETYPE_LIBRARY)
+ 	MESSAGE(FATAL_ERROR "freetype not found")
+ ENDIF(FREETYPE_LIBRARY)
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 /usr/include/freetype2/config/ftheader.h
+ 	HINTS
+ 	$ENV{FREETYPE_DIR}/include/freetype2
+ 	PATHS
diff --git a/games/atanks/README b/games/atanks/README
index 92a9f77002..e4bf275106 100644
--- a/games/atanks/README
+++ b/games/atanks/README
@@ -1,3 +1,5 @@
+Atomic tanks is a cross-platform 2d artillery game.
+
 Annihilate the other tanks to earn money, then spend it on bigger
 and better shields and weapons to wipe out the opposition. Features
 a wide array of weapons, AI players, destructible landscape,
diff --git a/games/atanks/atanks.SlackBuild b/games/atanks/atanks.SlackBuild
index 79c0143498..ef3d1d5aa3 100644
--- a/games/atanks/atanks.SlackBuild
+++ b/games/atanks/atanks.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=atanks
-VERSION=${VERSION:-6.2}
+VERSION=${VERSION:-6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,8 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING Changelog README README_ru.txt TODO credits.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING Changelog README README_ru.txt TODO credits.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/atanks/atanks.info b/games/atanks/atanks.info
index a2e3dd3a0f..52bde0ac03 100644
--- a/games/atanks/atanks.info
+++ b/games/atanks/atanks.info
@@ -1,10 +1,10 @@
 PRGNAM="atanks"
-VERSION="6.2"
+VERSION="6.4"
 HOMEPAGE="http://atanks.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/atanks/atanks/atanks-6.2/atanks-6.2.tar.gz"
-MD5SUM="8f2f3a43848828c221ff51d8bdc44dcf"
+DOWNLOAD="http://downloads.sourceforge.net/project/atanks/atanks/atanks-6.4/atanks-6.4.tar.gz"
+MD5SUM="0a7a1c3b13682f4c208c6564aa5d7b2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="allegro4"
 MAINTAINER="Eugene M."
-EMAIL="damagedone@gmx.com"
\ No newline at end of file
+EMAIL="damagedone@gmx.com"
diff --git a/games/atari++/atari++.SlackBuild b/games/atari++/atari++.SlackBuild
index 3197501f5a..05cefcf782 100644
--- a/games/atari++/atari++.SlackBuild
+++ b/games/atari++/atari++.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=atari++
-VERSION=${VERSION:-1.73}
+VERSION=${VERSION:-1.80}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/atari++/atari++.info b/games/atari++/atari++.info
index 8ebb524adf..e35c40c1e8 100644
--- a/games/atari++/atari++.info
+++ b/games/atari++/atari++.info
@@ -1,8 +1,8 @@
 PRGNAM="atari++"
-VERSION="1.73"
+VERSION="1.80"
 HOMEPAGE="http://www.xl-project.com/"
-DOWNLOAD="http://www.xl-project.com/download/atari++_1.73.tar.gz"
-MD5SUM="13af66f605282f84ae33359e4c8d740a"
+DOWNLOAD="http://www.xl-project.com/download/atari++_1.80.tar.gz"
+MD5SUM="eee3a0abd023350d8dac0859dae00eab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/bastet/bastet.info b/games/bastet/bastet.info
index 93bbfcad11..a39107930b 100644
--- a/games/bastet/bastet.info
+++ b/games/bastet/bastet.info
@@ -2,7 +2,7 @@ PRGNAM="bastet"
 VERSION="0.43.1"
 HOMEPAGE="http://fph.altervista.org/prog/bastet.html"
 DOWNLOAD="https://github.com/fph/bastet/archive/0.43.1.zip"
-MD5SUM="8d0a325d0c94fbb921d6a46f574f3a87"
+MD5SUM="c85ae3df00c6da353306c26b02e364b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/bitfighter/bitfighter.info b/games/bitfighter/bitfighter.info
index 83def2edd7..f3b7c3d165 100644
--- a/games/bitfighter/bitfighter.info
+++ b/games/bitfighter/bitfighter.info
@@ -1,7 +1,7 @@
 PRGNAM="bitfighter"
 VERSION="019e"
 HOMEPAGE="http://bitfighter.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/bitfighter.mirror/Bitfighter%20019e/bitfighter-019e.tar.gz \
+DOWNLOAD="http://bitfighter.org/files/bitfighter-019e.tar.gz \
           https://bitfighter.googlecode.com/files/classic_level_pack.zip"
 MD5SUM="66ff2a80f4ffd7cd354667e906323759 \
         cb32039b47026e176d3f1f3639bd1a9f"
diff --git a/games/bluemoon/bluemoon.info b/games/bluemoon/bluemoon.info
index 01d4cbb432..136a2ce2e3 100644
--- a/games/bluemoon/bluemoon.info
+++ b/games/bluemoon/bluemoon.info
@@ -2,9 +2,9 @@ PRGNAM="bluemoon"
 VERSION="1.3.2"
 HOMEPAGE="http://keldon.net/bluemoon/"
 DOWNLOAD="http://keldon.net/bluemoon/bluemoon-1.3.2.tar.gz \
-          http://www.fantasyflightgames.com/PDF/bluemoonrules.pdf"
+          http://www.fantasyflightgames.com/ffg_content/Blue_Moon/bluemoonrules.pdf"
 MD5SUM="86af3a644b2a293a18d0e3d9e86c3279 \
-        7da016e9a51c87c6db4a3bc18eaa9d05"
+        f9321011dea2654bd3024645514d3475"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index 0d4562cdb7..68be44b1a6 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=chocolate-doom
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/chocolate-doom/chocolate-doom.info b/games/chocolate-doom/chocolate-doom.info
index f639731dc2..8374b1bc0f 100644
--- a/games/chocolate-doom/chocolate-doom.info
+++ b/games/chocolate-doom/chocolate-doom.info
@@ -1,8 +1,8 @@
 PRGNAM="chocolate-doom"
-VERSION="2.1.0"
+VERSION="2.2.1"
 HOMEPAGE="http://www.chocolate-doom.org/"
-DOWNLOAD="http://www.chocolate-doom.org/downloads/2.1.0/chocolate-doom-2.1.0.tar.gz"
-MD5SUM="b4c4e9063e94f269292a4fa946ebf33c"
+DOWNLOAD="http://www.chocolate-doom.org/downloads/2.2.1/chocolate-doom-2.2.1.tar.gz"
+MD5SUM="20ef24c517f701023aa187c07b587ce6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/chocolate_duke3D/README b/games/chocolate_duke3D/README
new file mode 100644
index 0000000000..7094080d50
--- /dev/null
+++ b/games/chocolate_duke3D/README
@@ -0,0 +1,10 @@
+Chocolate Duke Nukem 3D is the equivalent of Chocolate Doom.
+
+A port that:
+
+ 1. Remains as faithful as possible to the original source code.
+ 2. Portable and compiling in one click on Windows, OS X and Linux.
+ 3. Aimed at education, with lots of comments and documentation added in order to help programmers 
+    to understand and learn.
+
+Note: Place "duke3d.grp" from any legit Duke 3D copy to /usr/share/games/duke3d to play.
diff --git a/games/chocolate_duke3D/chocolate-duke3d b/games/chocolate_duke3D/chocolate-duke3d
new file mode 100644
index 0000000000..8a51d7d26b
--- /dev/null
+++ b/games/chocolate_duke3D/chocolate-duke3d
@@ -0,0 +1,4 @@
+ #!/bin/bash
+
+cd /usr/share/games/duke3d
+./chocolate-duke3d $*
diff --git a/games/chocolate_duke3D/chocolate-duke3d.desktop b/games/chocolate_duke3D/chocolate-duke3d.desktop
new file mode 100644
index 0000000000..c7cd53403f
--- /dev/null
+++ b/games/chocolate_duke3D/chocolate-duke3d.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Chocolate Duke 3D
+GenericName=Vanilla Duke Nukem 3D experience.
+Type=Application
+Comment=Faithful Duke Nukem 3D port, similar to Chocolate Doom.
+Exec=chocolate-duke3d
+Icon=chocolate-duke3d
+Terminal=false
+Categories=Game
diff --git a/games/chocolate_duke3D/chocolate-duke3d.png b/games/chocolate_duke3D/chocolate-duke3d.png
new file mode 100644
index 0000000000..125d60e10c
--- /dev/null
+++ b/games/chocolate_duke3D/chocolate-duke3d.png
diff --git a/games/chocolate_duke3D/chocolate_duke3D.SlackBuild b/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
new file mode 100644
index 0000000000..d7735997b8
--- /dev/null
+++ b/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for Chocolate Duke 3D
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=chocolate_duke3D
+VERSION=${VERSION:-dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+GAMDIR=usr/share/games/duke3d
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/$VERSION.zip
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+./autogen.sh
+./configure
+make
+
+# Copies over compiled binary
+install -D -m 0755 chocolate-duke3d $PKG/$GAMDIR/chocolate-duke3d
+
+# Desktop and launcher related stuff
+install -D -m 0644 $CWD/chocolate-duke3d.png $PKG/usr/share/pixmaps/chocolate-duke3d.png
+install -D -m 0644 $CWD/chocolate-duke3d.desktop $PKG/usr/share/applications/chocolate-duke3d.desktop
+install -D -m 0755 $CWD/chocolate-duke3d $PKG/usr/games/chocolate-duke3d
+
+# Make it so the games group can access the folder
+chgrp games $PKG/$GAMDIR
+chmod 774 $PKG/$GAMDIR
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/chocolate_duke3D/chocolate_duke3D.info b/games/chocolate_duke3D/chocolate_duke3D.info
new file mode 100644
index 0000000000..5b0adb37a2
--- /dev/null
+++ b/games/chocolate_duke3D/chocolate_duke3D.info
@@ -0,0 +1,10 @@
+PRGNAM="chocolate_duke3D"
+VERSION="dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc"
+HOMEPAGE="https://github.com/fabiensanglard/chocolate_duke3D/"
+DOWNLOAD="https://github.com/fabiensanglard/chocolate_duke3D/archive/dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc.zip"
+MD5SUM="ce87a33d07de869584261191404e6f16"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="enet"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/games/chocolate_duke3D/slack-desc b/games/chocolate_duke3D/slack-desc
new file mode 100644
index 0000000000..3317390329
--- /dev/null
+++ b/games/chocolate_duke3D/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+    		|-----handy-ruler------------------------------------------------------|
+chocolate_duke3D: chocolate_duke3D (Faithful Duke Nukem 3D port)
+chocolate_duke3D:      
+chocolate_duke3D: Chocolate Duke Nukem 3D is the equivalent of Chocolate Doom.
+chocolate_duke3D: A port that:
+chocolate_duke3D: Remains as faithful as possible to the original source code.
+chocolate_duke3D: Portable and compiling in one click on Windows, OS X and Linux.
+chocolate_duke3D: Aimed at education, with lots of comments and documentation added
+chocolate_duke3D: in order to help programmers to understand and learn.
+chocolate_duke3D: 
+chocolate_duke3D: Homepage: https://github.com/fabiensanglard/chocolate_duke3D
+chocolate_duke3D:
diff --git a/games/crispy-doom/README b/games/crispy-doom/README
new file mode 100644
index 0000000000..dd3e67c1c7
--- /dev/null
+++ b/games/crispy-doom/README
@@ -0,0 +1,5 @@
+Crispy Doom is a fork of Chocolate Doom that provides a higher
+display resolution, removes the static limits of the Doom engine and
+offers further optional visual, tactical and physical enhancements
+remaining entirely config file, savegame, netplay and demo compatible
+with the original.
diff --git a/games/crispy-doom/crispy-doom.SlackBuild b/games/crispy-doom/crispy-doom.SlackBuild
new file mode 100644
index 0000000000..680fe26c91
--- /dev/null
+++ b/games/crispy-doom/crispy-doom.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for crispy-doom
+
+# Copyright 2015 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=crispy-doom
+VERSION=${VERSION:-3.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sh autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog HACKING NEWS NOT-BUGS PHILOSOPHY README README.Crispy.htm \
+  README.Music README.Strife TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/crispy-doom/crispy-doom.info b/games/crispy-doom/crispy-doom.info
new file mode 100644
index 0000000000..fb3a710e1b
--- /dev/null
+++ b/games/crispy-doom/crispy-doom.info
@@ -0,0 +1,10 @@
+PRGNAM="crispy-doom"
+VERSION="3.2"
+HOMEPAGE="http://www.chocolate-doom.org/wiki/index.php/Crispy_Doom"
+DOWNLOAD="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-3.2.tar.gz"
+MD5SUM="6c6374bfa928f61c217cde07fe0b67c9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/games/crispy-doom/slack-desc b/games/crispy-doom/slack-desc
new file mode 100644
index 0000000000..7c7d93ea66
--- /dev/null
+++ b/games/crispy-doom/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+crispy-doom: crispy-doom (Doom source port)
+crispy-doom:
+crispy-doom: Crispy Doom is a fork of Chocolate Doom that provides a higher
+crispy-doom: display resolution, removes the static limits of the Doom engine and
+crispy-doom: offers further optional visual, tactical and physical enhancements
+crispy-doom: remaining entirely config file, savegame, netplay and demo compatible
+crispy-doom: with the original.
+crispy-doom:
+crispy-doom: http://www.chocolate-doom.org/wiki/index.php/Crispy_Doom
+crispy-doom:
+crispy-doom:
diff --git a/games/dhewm3/README b/games/dhewm3/README
new file mode 100644
index 0000000000..f6951ef694
--- /dev/null
+++ b/games/dhewm3/README
@@ -0,0 +1,21 @@
+The goal of dhewm 3 is bring DOOM 3 with the help of SDL to all suitable platforms.
+
+Compared to the original DOOM 3, the changes of dhewm 3 worth mentioning are:
+
+* 64bit port
+* SDL for low level OS support, OpenGL and input handling
+* OpenAL for audio output, all OS specific audio backends are gone
+* OpenAL EFX for EAX reverb effects (read: EAX-like sound effects on all platforms/hardware)
+* Better support for widescreen (and arbitrary display resolutions)
+* A portable build system based on CMake
+
+This engine will only work with the original Doom 3 and Resurrection of Evil expansion pack
+and not the newer Doom 3 BFG.
+
+To build the dedicated server or to disable building the base game code, the core or d3xp
+game code use:  BASE="no" CORE="no" D3XP="no" SERVER="yes" ./dhewm3.SlackBuild
+
+Doom 3 and the Resurrection of Evil expansion pack data are not included with dhewm 3 and are
+still covered by the original EULA. They must be acquired separately such as from the retail
+DVDs or with SteamCMD. The data pak00*.pk4 files need to be placed in /usr/share/dhewm3/base
+for Doom 3 and /usr/share/dhewm3/d3xp for RoE, symbolic links to the data directories will work.
diff --git a/games/dhewm3/dhewm3.SlackBuild b/games/dhewm3/dhewm3.SlackBuild
new file mode 100644
index 0000000000..480f7cf0ce
--- /dev/null
+++ b/games/dhewm3/dhewm3.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for dhewm3
+
+# Copyright 2016 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=dhewm3
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+BASE=${BASE:-yes} CORE=${CORE:-yes} D3XP=${D3XP:-yes} SERVER=${SERVER:-no}
+if [ "${BASE:-no}" = "no" ]; then base="-DBASE:BOOL=OFF"; else base=""; fi
+if [ "${CORE:-no}" = "no" ]; then core="-DCORE:BOOL=OFF"; else core=""; fi
+if [ "${D3XP:-no}" = "no" ]; then d3xp="-DD3XP:BOOL=OFF"; else d3xp=""; fi
+if [ "${SERVER:-yes}" = "yes" ]; then server="-DDEDICATED:BOOL=ON"; else server=""; fi
+
+mkdir -p neo/build
+cd neo/build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_BINDIR=/usr/games \
+    $base $core $d3xp $server \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ../..
+
+mkdir -p $PKG/usr/share/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/dhewm3/dhewm3.info b/games/dhewm3/dhewm3.info
new file mode 100644
index 0000000000..740f948e41
--- /dev/null
+++ b/games/dhewm3/dhewm3.info
@@ -0,0 +1,10 @@
+PRGNAM="dhewm3"
+VERSION="1.4.0"
+HOMEPAGE="https://github.com/dhewm/dhewm3"
+DOWNLOAD="https://github.com/dhewm/dhewm3/archive/1.4.0.tar.gz"
+MD5SUM="6cabb092cf7a428ac248d700ad3c0212"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="OpenAL SDL2"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/games/dhewm3/slack-desc b/games/dhewm3/slack-desc
new file mode 100644
index 0000000000..4668a2f939
--- /dev/null
+++ b/games/dhewm3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+dhewm3: dhewm3 (Doom 3 GPL source port)
+dhewm3:
+dhewm3: The goal of dhewm 3 is bring DOOM 3 with the help of SDL to all
+dhewm3: suitable platforms.
+dhewm3:
+dhewm3: Homepage: https://github.com/dhewm/dhewm3
+dhewm3:
+dhewm3:
+dhewm3:
+dhewm3:
+dhewm3:
diff --git a/games/doomsday/doomsday.SlackBuild b/games/doomsday/doomsday.SlackBuild
index 9ff75f37d1..7556c03d3c 100644
--- a/games/doomsday/doomsday.SlackBuild
+++ b/games/doomsday/doomsday.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for doomsday
 
-# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=doomsday
 SRCNAM=${PRGNAM}-stable
-VERSION=${VERSION:-1.15.1}
+VERSION=${VERSION:-1.15.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/doomsday/doomsday.info b/games/doomsday/doomsday.info
index 918f849c79..4e8dbc1031 100644
--- a/games/doomsday/doomsday.info
+++ b/games/doomsday/doomsday.info
@@ -1,8 +1,8 @@
 PRGNAM="doomsday"
-VERSION="1.15.1"
+VERSION="1.15.7"
 HOMEPAGE="http://dengine.net"
-DOWNLOAD="http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.15.1/doomsday-stable-1.15.1.tar.gz"
-MD5SUM="c896b0b0021d325f736d84a396132389"
+DOWNLOAD="http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.15.7/doomsday-stable-1.15.7.tar.gz"
+MD5SUM="4650cfa3b843a61d13b1e46e9a449ac8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython OpenAL fmodapi assimp SDL2_mixer"
diff --git a/games/exult/README b/games/exult/README
new file mode 100644
index 0000000000..b267663d09
--- /dev/null
+++ b/games/exult/README
@@ -0,0 +1,12 @@
+Ultima 7, an RPG from the early 1990's, still has a huge following. But, being a DOS game
+with a very nonstandard memory manager, it is difficult to run it on the latest computers.
+Exult is a project to create an Ultima 7 game engine that runs on modern operating systems,
+capable of using the data and graphics files that come with the game.
+
+Exult aims to let those people who own Ultima 7 (copyright 1993) play the game on modern
+hardware, in as close to (or perhaps even surpassing) its original splendor as is possible.
+You need to own "Ultima 7: The Black Gate" and/or "Ultima 7: Serpent Isle" and optionally the
+add-ons (not required to run) in order to use Exult, and we encourage you to buy a legal copy.
+
+exult_audio.zip is only needed for using digital audio with exult, it can be skipped if digital
+audio is not wanted.
\ No newline at end of file
diff --git a/games/exult/doinst.sh b/games/exult/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/exult/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/exult/exult.SlackBuild b/games/exult/exult.SlackBuild
new file mode 100644
index 0000000000..0d316d97de
--- /dev/null
+++ b/games/exult/exult.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for exult
+
+# Copyright 2016 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=exult
+VERSION=${VERSION:-1.5.0_svn}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+if [ -f $CWD/${PRGNAM}_audio.zip ]; then
+  unzip $CWD/${PRGNAM}_audio.zip -d $PKG/usr/share/$PRGNAM
+  chown -R root:root $PKG/usr/share/$PRGNAM
+  find $PKG/usr/share/$PRGNAM \
+   \( -type f -exec chmod 644 {} \; \) -o \
+   \( -type d -exec chmod 755 {} \; \)
+fi
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README* TODO.xml $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/share/$PRGNAM -type f -iname 'readme*.txt' -exec mv -t $PKG/usr/doc/$PRGNAM-$VERSION {} \+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/exult/exult.info b/games/exult/exult.info
new file mode 100644
index 0000000000..6bf4d1b10f
--- /dev/null
+++ b/games/exult/exult.info
@@ -0,0 +1,12 @@
+PRGNAM="exult"
+VERSION="1.5.0_svn"
+HOMEPAGE="http://exult.sourceforge.net/"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/exult-1.5.0_svn.tar.xz
+          http://downloads.sourceforge.net/project/exult/exult-data/exult_audio.zip"
+MD5SUM="fcc6b6c7aa4ed2af7c9e1f9097b8fe28
+        1905328f00bbbfee33812c1942bc7880"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/games/exult/slack-desc b/games/exult/slack-desc
new file mode 100644
index 0000000000..e4e9cdb2c0
--- /dev/null
+++ b/games/exult/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+exult: exult (game engine for running Ultima7)
+exult:
+exult: As computers evolve, we risk losing classic games from the not-so-
+exult: distant past. One of these, Ultima 7, an RPG from the early 1990's,
+exult: still has a huge following, and many consider it to be one of the
+exult: most immersive games ever produced. Exult is a project to recreate
+exult: Ultima 7 for modern operating systems, using the game's original
+exult: plot, data, and graphics files. 
+exult:
+exult: Homepage: http://exult.sourceforge.net/
+exult:
diff --git a/games/fgo/fgo.SlackBuild b/games/fgo/fgo.SlackBuild
index 9cfdd0c280..1726a0944e 100644
--- a/games/fgo/fgo.SlackBuild
+++ b/games/fgo/fgo.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for FGo!, a graphical front end for FlightGear
+# Slackware build script for fgo
 
-# Copyright 2013-2014 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2013-2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -54,7 +54,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 PRGDIR=$PKG/opt/$PRGNAM
 PRGDAT=$PKG/opt/$PRGNAM/data
diff --git a/games/fgo/fgo.info b/games/fgo/fgo.info
index ed678d8d7b..57873142bf 100644
--- a/games/fgo/fgo.info
+++ b/games/fgo/fgo.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FlightGear"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/games/fgo/slack-desc b/games/fgo/slack-desc
index eacd13533b..a8b6920b3b 100644
--- a/games/fgo/slack-desc
+++ b/games/fgo/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-fgo: FGo! (a simple and fast front end for FlightGear Flight Simulator)
+fgo: fgo (a simple and fast front end for FlightGear Flight Simulator)
 fgo:
 fgo: FGo! is a simple and fast graphical front end for FlightGear, written
 fgo: in Python by Robert Leda. It combines a simple graphical interface,
diff --git a/games/foobillardplus/foobillardplus.SlackBuild b/games/foobillardplus/foobillardplus.SlackBuild
index 2fb56a002e..e49e989d54 100644
--- a/games/foobillardplus/foobillardplus.SlackBuild
+++ b/games/foobillardplus/foobillardplus.SlackBuild
@@ -28,7 +28,7 @@
 PRGNAM=foobillardplus
 VERSION=${VERSION:-3.43beta}
 SRCVERSION=${SRCVERSION:-170}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -86,6 +86,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
+
+# copy missing .desktop file
+cp $CWD/$PRGNAM.desktop .
+
 make install DESTDIR=$PKG \
   datadir=$PKG/usr/games/$PRGNAM/data \
   datarootdir=$PKG/usr/games/$PRGNAM/data
diff --git a/games/foobillardplus/foobillardplus.desktop b/games/foobillardplus/foobillardplus.desktop
index d0f9f043fd..d45ea2e4dc 100644
--- a/games/foobillardplus/foobillardplus.desktop
+++ b/games/foobillardplus/foobillardplus.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=FooBillard++
 GenericName=OpenGL billard game
 Comment=Free OpenGL billard game for Linux
-Exec=foobillard
+Exec=foobillardplus
 Icon=foobillardplus
 Terminal=false
 Type=Application
diff --git a/games/freeciv/freeciv.SlackBuild b/games/freeciv/freeciv.SlackBuild
index 62957280bb..bd87b6b18d 100644
--- a/games/freeciv/freeciv.SlackBuild
+++ b/games/freeciv/freeciv.SlackBuild
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=freeciv
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/freeciv/freeciv.info b/games/freeciv/freeciv.info
index c2054b3c2b..73e7a7fb23 100644
--- a/games/freeciv/freeciv.info
+++ b/games/freeciv/freeciv.info
@@ -1,8 +1,8 @@
 PRGNAM="freeciv"
-VERSION="2.5.0"
+VERSION="2.5.1"
 HOMEPAGE="http://www.freeciv.org"
-DOWNLOAD="http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.0.tar.bz2"
-MD5SUM="8a61ecd986853200326711446c573f1b"
+DOWNLOAD="http://prdownloads.sourceforge.net/freeciv/freeciv-2.5.1.tar.bz2"
+MD5SUM="b94bf68ce5f3611c71fac9753598b046"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/freeminer/doinst.sh b/games/freeminer/doinst.sh
index 9424ce43ff..3e5691a052 100644
--- a/games/freeminer/doinst.sh
+++ b/games/freeminer/doinst.sh
@@ -2,10 +2,6 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
diff --git a/games/freeminer/freeminer.SlackBuild b/games/freeminer/freeminer.SlackBuild
index 461647ae40..df671af79d 100644
--- a/games/freeminer/freeminer.SlackBuild
+++ b/games/freeminer/freeminer.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for freeminer
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# I thank Larry Hajali for update to version 0.4.13.7
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=freeminer
-VERSION=${VERSION:-0.4.12.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.4.13.7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -67,16 +68,27 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix jsoncpp detection.
+sed -i '/find_path/s|)| /usr/include/jsoncpp)|' cmake/Modules/FindJson.cmake
 
 mkdir -p build
 cd build
   cmake \
-    -DRUN_IN_PLACE=0 \
+    -DRUN_IN_PLACE:BOOL=0 \
+    -DENABLE_SYSTEM_JSONCPP:BOOL=1 \
+    -DENABLE_SYSTEM_MSGPACK:BOOL=1 \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCUSTOM_BINDIR:PATH=games \
+    -DCUSTOM_MANDIR:PATH=man \
+    -DCUSTOM_LOCALEDIR:PATH=share/locale \
+    -DCUSTOM_DOCDIR:PATH=doc/$PRGNAM-$VERSION \
+    -DCUSTOM_EXAMPLE_CONF_DIR:PATH=doc/$PRGNAM-$VERSION \
     -DCMAKE_BUILD_TYPE=Release ..
+  
   make
   make install DESTDIR=$PKG
 cd ..
@@ -84,15 +96,10 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man
-mv $PKG/usr/share/man/man6 $PKG/usr/man
-rm -rf $PKG/usr/share/man
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt *md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/freeminer/freeminer.info b/games/freeminer/freeminer.info
index 00c707dca8..330d1ff33d 100644
--- a/games/freeminer/freeminer.info
+++ b/games/freeminer/freeminer.info
@@ -1,10 +1,10 @@
 PRGNAM="freeminer"
-VERSION="0.4.12.6"
+VERSION="0.4.13.7"
 HOMEPAGE="http://freeminer.org/"
-DOWNLOAD="https://github.com/freeminer/freeminer/archive/0.4.12.6.tar.gz"
-MD5SUM="69b208e741cec259696bd9b53b68252c"
+DOWNLOAD="https://github.com/freeminer/freeminer/archive/0.4.13.7.tar.gz"
+MD5SUM="902ae3142a5bcf57fbf9f8c2a36bebe9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL luajit irrlicht enet msgpack-c"
+REQUIRES="OpenAL luajit irrlicht enet msgpack-c jsoncpp"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/freeorion/README b/games/freeorion/README
index 0fb8645188..400386ef5d 100644
--- a/games/freeorion/README
+++ b/games/freeorion/README
@@ -3,3 +3,6 @@ galactic conquest (4X) computer game being designed and built
 by the FreeOrion project. FreeOrion is inspired by the tradition
 of the Master of Orion games, but is not a clone or remake of that
 series or any other game.
+
+Note: for mitigating a hard to track segfault bug in freeoriond, clang is
+used to compile freeorion instead of gcc
diff --git a/games/freeorion/doinst.sh b/games/freeorion/doinst.sh
index 58e0b447c3..0a02ce22c8 100644
--- a/games/freeorion/doinst.sh
+++ b/games/freeorion/doinst.sh
@@ -4,4 +4,5 @@ fi
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
diff --git a/games/freeorion/freeorion.SlackBuild b/games/freeorion/freeorion.SlackBuild
index 4de14e5337..3d772c0161 100644
--- a/games/freeorion/freeorion.SlackBuild
+++ b/games/freeorion/freeorion.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for freeorion
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=freeorion
 SRCNAM=FreeOrion
-VERSION=${VERSION:-0.4.3}
+PRGNAM=${SRCNAM,,}
+SRCVER=${SRCVER:-v0.4.5_2015-09-01.f203162}
+VERSION=$(echo $SRCVER | cut -c2-6)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +61,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${SRCNAM}_${SRCVER}_Source.tar.gz
+mv src-tarball $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,9 +72,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# tell cmake to use clang
+export CC=/usr/bin/clang
+export CXX=/usr/bin/clang++
+
 mkdir -p build
 cd build
   cmake \
+    -D_CMAKE_TOOLCHAIN_PREFIX=llvm- \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -86,7 +93,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changelog.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md changelog.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/freeorion/freeorion.info b/games/freeorion/freeorion.info
index 38241fa6a9..2df9f235c0 100644
--- a/games/freeorion/freeorion.info
+++ b/games/freeorion/freeorion.info
@@ -1,10 +1,10 @@
 PRGNAM="freeorion"
-VERSION="0.4.3"
+VERSION="0.4.5"
 HOMEPAGE="http://www.freeorion.org"
-DOWNLOAD="https://github.com/dslackw/FreeOrion/archive/0.4.3.tar.gz"
-MD5SUM="7dd9fd65951d8f0d9f06779394cec694"
+DOWNLOAD="https://github.com/freeorion/freeorion/releases/download/v0.4.5/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz"
+MD5SUM="706b8e9ab2ee29575a927e6f1c772d61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL FreeImage bullet ois ogre"
+REQUIRES="SDL2 OpenAL"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/frotz/frotz.SlackBuild b/games/frotz/frotz.SlackBuild
index b1e9570c6f..3110ac572d 100644
--- a/games/frotz/frotz.SlackBuild
+++ b/games/frotz/frotz.SlackBuild
@@ -8,8 +8,10 @@
 # - updated for Slackware 14 and frotz 2.43d
 # - include dumb terminal frotz in build
 
+# 20150904 bkw: updated for frotz 2.44
+
 PRGNAM=frotz
-VERSION=${VERSION:-2.43d}
+VERSION=${VERSION:-2.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/frotz/frotz.info b/games/frotz/frotz.info
index 7e073a4f0d..a14a402164 100644
--- a/games/frotz/frotz.info
+++ b/games/frotz/frotz.info
@@ -1,8 +1,8 @@
 PRGNAM="frotz"
-VERSION="2.43d"
+VERSION="2.44"
 HOMEPAGE="http://frotz.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/frotz/frotz/2.43/frotz-2.43d.tar.gz"
-MD5SUM="6f4211c9180c75214cda1020c7db2629"
+DOWNLOAD="http://downloads.sourceforge.net/project/frotz/frotz/frotz-2.44.tar.gz"
+MD5SUM="705457af0e2cf745ce7f6bc243f05968"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/frozen-bubble/frozen-bubble.info b/games/frozen-bubble/frozen-bubble.info
index 750d2efb12..c08d948e24 100644
--- a/games/frozen-bubble/frozen-bubble.info
+++ b/games/frozen-bubble/frozen-bubble.info
@@ -6,5 +6,5 @@ MD5SUM="62fa4d53aaaa506eb38dd6595c0ed7cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Compress-Bzip2 perl-File-Slurp perl-IPC-System-Simple perl-Locale-Maketext-Lexicon perl-SDL"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Heinz Wiesinger"
+EMAIL="pprkut@liwjatan.at"
diff --git a/games/galaxyv2/galaxyv2.SlackBuild b/games/galaxyv2/galaxyv2.SlackBuild
index 919d79150f..2fc38b44b8 100644
--- a/games/galaxyv2/galaxyv2.SlackBuild
+++ b/games/galaxyv2/galaxyv2.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd build/linux
-make all
+make -j1 all
 cd $TMP/${PRGNAM}_${VERSION}_src
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/games/galaxyv2/galaxyv2.info b/games/galaxyv2/galaxyv2.info
index 8d914c3882..e6bcdd87fe 100644
--- a/games/galaxyv2/galaxyv2.info
+++ b/games/galaxyv2/galaxyv2.info
@@ -2,7 +2,7 @@ PRGNAM="galaxyv2"
 VERSION="1.85"
 HOMEPAGE="http://www.galaxy-forces.com/"
 DOWNLOAD="http://downloads.sourceforge.net/galaxyv2/galaxyv2_1.85_src.zip"
-MD5SUM="db2dc720165f9c3bbbbdffbd7828d128"
+MD5SUM="87473e6ceba751c71760ecd538707070"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/game_1945/game_1945.SlackBuild b/games/game_1945/game_1945.SlackBuild
index 4eb76515b0..9c6827254c 100644
--- a/games/game_1945/game_1945.SlackBuild
+++ b/games/game_1945/game_1945.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM
-unzip $CWD/$SRCNAM.zip
+unzip $CWD/$SRCNAM.zip || unzip $CWD/$PRGNAM.zip
 cd $SRCNAM
 chown -R root:root .
 find -L . \
diff --git a/games/generator_cbiere/generator_cbiere.SlackBuild b/games/generator_cbiere/generator_cbiere.SlackBuild
index de96929a20..b8d41d2090 100644
--- a/games/generator_cbiere/generator_cbiere.SlackBuild
+++ b/games/generator_cbiere/generator_cbiere.SlackBuild
@@ -63,7 +63,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -std=gnu89" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/games/ggmud/README b/games/ggmud/README
new file mode 100644
index 0000000000..e1250c119a
--- /dev/null
+++ b/games/ggmud/README
@@ -0,0 +1,5 @@
+GGMud is a terminal-based MUD/MOO/MUSH client designed to be light, extensible, and portable. It
+includes a custom scripting language which supports event triggers, timers, macros, aliases, speed
+walking, varibles and if clauses, Connection Wizard with auto login, among other features. It uses
+Lua as an external scripting language. GGMud supports MCCP (Mud Client Compression Protocol),
+support for 4/5 proxies, ANSI 16 colors, and MUD TELNET emulation.
diff --git a/games/ggmud/doinst.sh b/games/ggmud/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/ggmud/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/ggmud/ggmud-link.diff b/games/ggmud/ggmud-link.diff
new file mode 100644
index 0000000000..02eae42f89
--- /dev/null
+++ b/games/ggmud/ggmud-link.diff
@@ -0,0 +1,9 @@
+diff -rupN ./CMakeLists.txt ./CMakeLists.txt
+--- ./CMakeLists.txt	2015-09-26 02:34:29.547077049 -0700
++++ ./CMakeLists.txt	2015-09-25 22:58:00.000000000 -0700
+@@ -65,4 +65,4 @@ add_executable(ggmud WIN32 alias.c ansi.
+                            ${ADDITIONAL_SOURCES}
+               )
+ 
+-target_link_libraries(ggmud tt lua sq3 httpfetch zlib ${GTK2_LIBRARIES} ${ADDITIONAL_LIBS} ${GTHREAD_LIBRARIES})
++target_link_libraries(ggmud tt lua sq3 httpfetch zlib dl m ${GTK2_LIBRARIES} ${ADDITIONAL_LIBS} ${GTHREAD_LIBRARIES})
diff --git a/games/ggmud/ggmud.SlackBuild b/games/ggmud/ggmud.SlackBuild
new file mode 100644
index 0000000000..ed50b7cca3
--- /dev/null
+++ b/games/ggmud/ggmud.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for ggmud
+# Copyright 2015 Eric Underhill <uhillem@gmail.com>
+#
+# Based on slackbuild by Michael Bueker <m.bueker@berlin.de>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ggmud
+VERSION=${VERSION:-0.9.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+# For those of you that don't install anything to /opt, be sure to change
+# the symlink creation line in doinst.sh to match to the location defined
+# here if changed.
+OPT=${OPT:-/opt}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xzvf $CWD/$PRGNAM-$VERSION-src.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Apply patch so everything will link correctly.
+#cp $CWD/ggmud-link.diff $TMP/$PRGNAM-$VERSION
+patch -p0 < $CWD/ggmud-link.diff
+
+mkdir build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE="release" \
+    ..
+  make
+  # make install DESTDIR=$PKG
+  # No make install exists for this application. Must do it manually.
+  # Because ggmud expects it's conf files to be in the same directory as 
+  # itself, it is best to install to /opt/ggmud to keep it's files together
+  # and to keep from cluttering up /usr/bin with non binaries.
+  mkdir -p $PKG/$OPT/$PRGNAM
+  cp $TMP/$PRGNAM-$VERSION/build/$PRGNAM $PKG/$OPT/$PRGNAM
+  cp $TMP/$PRGNAM-$VERSION/gg_help.txt $PKG/$OPT/$PRGNAM
+  cp $TMP/$PRGNAM-$VERSION/leu/* $PKG/$OPT/$PRGNAM
+cd -
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+(
+ mkdir -p $PKG/usr/bin
+ cd $PKG/usr/bin
+ ln -s /opt/ggmud/ggmud .
+)
+
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cp $TMP/$PRGNAM-$VERSION/pixmaps/*  $PKG/usr/share/pixmaps/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/ggmud/ggmud.desktop b/games/ggmud/ggmud.desktop
new file mode 100644
index 0000000000..d614cdf9aa
--- /dev/null
+++ b/games/ggmud/ggmud.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Comment=a MUD/MOO/MUSH terminal client
+Comment[fr_FR]=un terminal client de MUD/MOO/MUSH
+Exec=ggmud
+GenericName=MUD terminal client
+GenericName[fr_FR]=terminal client de MUD
+Icon=ggmud.png
+Name=ggmud
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Game
diff --git a/games/ggmud/ggmud.info b/games/ggmud/ggmud.info
new file mode 100644
index 0000000000..a1a0933540
--- /dev/null
+++ b/games/ggmud/ggmud.info
@@ -0,0 +1,10 @@
+PRGNAM="ggmud"
+VERSION="0.9.3"
+HOMEPAGE="www.ggsoft.org/ggmud/index.html"
+DOWNLOAD="http://downloads.sourceforge.net/ggmud/ggmud-0.9.3-src.tgz"
+MD5SUM="b07b984f2286ff76def2bdd6016eabb5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eric Underhill"
+EMAIL="uhillem@gmail.com"
diff --git a/games/ggmud/ggmud.png b/games/ggmud/ggmud.png
new file mode 100644
index 0000000000..e8cc1cfe78
--- /dev/null
+++ b/games/ggmud/ggmud.png
diff --git a/games/ggmud/icon.png b/games/ggmud/icon.png
new file mode 100644
index 0000000000..c7377cb814
--- /dev/null
+++ b/games/ggmud/icon.png
diff --git a/games/ggmud/slack-desc b/games/ggmud/slack-desc
new file mode 100644
index 0000000000..7968d04e97
--- /dev/null
+++ b/games/ggmud/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ggmud: ggmud (console MUD client)
+ggmud:
+ggmud: GGMud is a lightweight terminal based MUD client. It supports a host
+ggmud: of expected features expected from a modern MUD client including
+ggmud: triggers, aliases, gags, highlights, macros, support for external Lua
+ggmud: scripting language, and support for Tintin commands. Based on ZMud,
+ggmud: SClient, and TinTin++.
+ggmud:
+ggmud: home: http://www.ggsoft.org/ggmud/index.html
+ggmud:
+ggmud: online manual: http://www.ggsoft.org/ggmud/doc/index.html
diff --git a/games/glbsp/fltkconf.diff b/games/glbsp/fltkconf.diff
new file mode 100644
index 0000000000..de68545c36
--- /dev/null
+++ b/games/glbsp/fltkconf.diff
@@ -0,0 +1,29 @@
+diff -Naur glbsp-2.24-source/Makefile.unx glbsp-2.24-source.patched/Makefile.unx
+--- glbsp-2.24-source/Makefile.unx	2007-07-25 23:14:34.000000000 -0400
++++ glbsp-2.24-source.patched/Makefile.unx	2015-11-26 07:20:52.012999000 -0500
+@@ -94,9 +94,8 @@
+ 
+ # ----- GUI PROGRAM ---------------------------------------------
+ 
+-FLTK_FLAGS=-I$(FLTK_DIR) -I$(FLTK_DIR)/zlib
+-FLTK_LIBS=-L$(FLTK_DIR)/lib -lfltk_images -lpng -lz -ljpeg \
+-          -lfltk -lX11 -lXext
++FLTK_FLAGS=$(shell fltk-config --cflags)
++FLTK_LIBS=$(shell fltk-config --use-images --ldflags)
+ 
+ ## may need: -L/usr/X11R6/lib
+ 
+diff -Naur glbsp-2.24-source/nodeview/Makefile.unx glbsp-2.24-source.patched/nodeview/Makefile.unx
+--- glbsp-2.24-source/nodeview/Makefile.unx	2007-05-21 09:17:03.000000000 -0400
++++ glbsp-2.24-source.patched/nodeview/Makefile.unx	2015-11-26 07:23:19.660999000 -0500
+@@ -7,8 +7,8 @@
+ BIN=nodeview
+ SRC_DIR=nodeview
+ 
+-FLTK_CFLAGS=-I/usr/local/lib
+-FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
++FLTK_CFLAGS=$(shell fltk-config --cflags)
++FLTK_LIBS=$(shell fltk-config --use-images --ldflags)
+ 
+ CC=gcc
+ CXX=g++
diff --git a/games/glbsp/glbsp.SlackBuild b/games/glbsp/glbsp.SlackBuild
index 83129d89b8..5c05572cb0 100644
--- a/games/glbsp/glbsp.SlackBuild
+++ b/games/glbsp/glbsp.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151126 bkw: fix build for -current (preparing for 14.2)
+
 PRGNAM=glbsp
 VERSION=${VERSION:-2.24}
 BUILD=${BUILD:-1}
@@ -55,12 +57,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Use fltk-config --cflags and --ldflags instead of hardcoded values
+patch -p1 < $CWD/fltkconf.diff
+
 # Upstream doesn't build a shared lib, but we will by default.
 if [ "${STATIC:-no}" != "yes" ]; then
 	patch -p1 < $CWD/dynamic_libglbsp.diff
 fi
 
 sed -i "s/-O2/$SLKCFLAGS/" Makefile.unx
+
 make -f Makefile.unx
 make -f Makefile.unx install \
   INSTALL_PREFIX=$PKG/usr \
diff --git a/games/glxosd/glxosd.SlackBuild b/games/glxosd/glxosd.SlackBuild
index 647079cf64..4d193b3864 100644
--- a/games/glxosd/glxosd.SlackBuild
+++ b/games/glxosd/glxosd.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=glxosd
 SRCNAM=GLXOSD
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/glxosd/glxosd.info b/games/glxosd/glxosd.info
index dadfc497ae..614088398f 100644
--- a/games/glxosd/glxosd.info
+++ b/games/glxosd/glxosd.info
@@ -1,8 +1,8 @@
 PRGNAM="glxosd"
-VERSION="2.3.3"
+VERSION="2.5.0"
 HOMEPAGE="http://glxosd.nickguletskii.com/"
-DOWNLOAD="https://github.com/nickguletskii/GLXOSD/archive/2.3.3.tar.gz"
-MD5SUM="f8171c4d4e8d26c5b755109cfde21876"
+DOWNLOAD="https://github.com/nickguletskii/GLXOSD/archive/2.5.0.tar.gz"
+MD5SUM="4a5f34b0415d4d6a68a64bed6004136c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/goonies/goonies.info b/games/goonies/goonies.info
index 9f6568b6b7..1010694aa1 100644
--- a/games/goonies/goonies.info
+++ b/games/goonies/goonies.info
@@ -1,7 +1,7 @@
 PRGNAM="goonies"
 VERSION="1.4.1528"
 HOMEPAGE="http://www.braingames.getput.com/goonies/"
-DOWNLOAD="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/goonies.src_1.4.1528.tgz"
 MD5SUM="7c220958a0766fb716d2d0081c81e8bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/gottet/gottet.SlackBuild b/games/gottet/gottet.SlackBuild
index a603c3f861..7357936c83 100644
--- a/games/gottet/gottet.SlackBuild
+++ b/games/gottet/gottet.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/games/gtklife/gtklife.SlackBuild b/games/gtklife/gtklife.SlackBuild
index 0c8981bf69..2aab9d50c8 100644
--- a/games/gtklife/gtklife.SlackBuild
+++ b/games/gtklife/gtklife.SlackBuild
@@ -53,7 +53,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -std=gnu89" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/games/hedgewars/hedgewars.SlackBuild b/games/hedgewars/hedgewars.SlackBuild
index 64d0f9606b..1879ecf452 100644
--- a/games/hedgewars/hedgewars.SlackBuild
+++ b/games/hedgewars/hedgewars.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for Hedgewars.
 
-# Black Rider [black_rider@esdebian.org]
+# Black Rider [softwareworks@use.startmail.com]
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hedgewars
-VERSION=${VERSION:-0.9.21.1}
+VERSION=${VERSION:-0.9.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-SRC_VERSION=${SRC_VERSION:-0.9.21}
+SRC_VERSION=${SRC_VERSION:-0.9.22}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/games/hedgewars/hedgewars.info b/games/hedgewars/hedgewars.info
index 15584c9a2d..9e988c1b69 100644
--- a/games/hedgewars/hedgewars.info
+++ b/games/hedgewars/hedgewars.info
@@ -1,10 +1,10 @@
 PRGNAM="hedgewars"
-VERSION="0.9.21.1"
+VERSION="0.9.22"
 HOMEPAGE="http://www.hedgewars.org"
-DOWNLOAD="http://download.gna.org/hedgewars/hedgewars-src-0.9.21.1.tar.bz2"
-MD5SUM="5c87b1ff54c861ae0cae6a9c1198f957"
+DOWNLOAD="http://download.gna.org/hedgewars/hedgewars-src-0.9.22.tar.bz2"
+MD5SUM="fb00330e3630f5f37aa22df2723e55f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fpc lua"
 MAINTAINER="Black Rider"
-EMAIL="black_rider@esdebian.org"
+EMAIL="softwareworks@use.startmail.com"
diff --git a/games/ifm/README b/games/ifm/README
new file mode 100644
index 0000000000..848696ebd6
--- /dev/null
+++ b/games/ifm/README
@@ -0,0 +1,5 @@
+IFM is a language for keeping track of your progress through an Interactive
+Fiction game, and a program for producing various different sorts of output
+using it. You can record each room you visit and its relation to other
+rooms, the initial locations of useful items you find, and the tasks you need
+to perform in order to solve the game.
diff --git a/games/ifm/ifm.SlackBuild b/games/ifm/ifm.SlackBuild
new file mode 100644
index 0000000000..e50b6a93f1
--- /dev/null
+++ b/games/ifm/ifm.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for <appname>
+
+# Copyright 2015 Andrew Lobanov
+
+PRGNAM=ifm
+VERSION=${VERSION:-5.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/ifm/ifm.info b/games/ifm/ifm.info
new file mode 100644
index 0000000000..0c03648446
--- /dev/null
+++ b/games/ifm/ifm.info
@@ -0,0 +1,10 @@
+PRGNAM="ifm"
+VERSION="5.4"
+HOMEPAGE="http://ifm.readthedocs.org/en/latest/contents.html"
+DOWNLOAD="http://www.ifarchive.org/if-archive/mapping-tools/ifm-5.4.tar.gz"
+MD5SUM="fa18a544fc0fec2ddc452777317357ea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrew Lobanov"
+EMAIL="spline1986@gmail.com"
diff --git a/games/ifm/slack-desc b/games/ifm/slack-desc
new file mode 100644
index 0000000000..3b0cdd58cf
--- /dev/null
+++ b/games/ifm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+ifm: ifm (Interactive fiction mapper)
+ifm:
+ifm: IFM is a language for keeping track of your progress through an
+ifm: Interactive Fiction game, and a program for producing various
+ifm: different sorts of output using it. You can record each room you
+ifm: visit and its relation to other rooms, the initial locations of
+ifm: useful items you find, and the tasks you need to perform in order to
+ifm: solve the game.
+ifm:
+ifm:
+ifm:
diff --git a/games/instead/instead.SlackBuild b/games/instead/instead.SlackBuild
index 3b9775e902..117d5f298a 100644
--- a/games/instead/instead.SlackBuild
+++ b/games/instead/instead.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Andrew Lobanov <spline @ rooker dot ru>
 
 PRGNAM=instead
-VERSION=${VERSION:-2.2.3}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-SBo}
 
@@ -57,12 +57,13 @@ cd build
 cmake \
  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
  -DBINDIR=bin \
- -DDOCDIR=doc \
+ -DDOCDIR=doc/instead \
  -DMANDIR=man \
- -DDATADIR=share \
+ -DDATADIR=share/instead \
  -DICONDIR=share/pixmaps \
  -DDESKTOPDIR=share/applications \
- -DLANGDIR=share/lang \
+ -DLANGDIR=share/instead/lang/ \
+ -DWITH_SDL2=ON \
  ../
 make
 make install DESTDIR=$PKG
diff --git a/games/instead/instead.info b/games/instead/instead.info
index 7836210939..dfa8105429 100644
--- a/games/instead/instead.info
+++ b/games/instead/instead.info
@@ -1,10 +1,10 @@
 PRGNAM="instead"
-VERSION="2.2.3"
+VERSION="2.3.0"
 HOMEPAGE="http://instead.syscall.ru/"
-DOWNLOAD="http://downloads.sourceforge.net/project/instead/instead/2.2.3/instead_2.2.3.tar.gz"
-MD5SUM="8bee01d435e240e4e7585e3b96393313"
+DOWNLOAD="http://sourceforge.net/projects/instead/files/instead/2.3.0/instead_2.3.0.tar.gz"
+MD5SUM="39776169ac5202de47e862a39d7f790b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES="lua SDL2_mixer SDL2_image SDL2_ttf"
 MAINTAINER="Andrew Lobanov"
 EMAIL="spline1986@gmail.com"
diff --git a/games/jackhammer/README b/games/jackhammer/README
new file mode 100644
index 0000000000..2b27e7ee65
--- /dev/null
+++ b/games/jackhammer/README
@@ -0,0 +1,6 @@
+Jackhammer is a brand new level editor for games with a quake-style BSP architecture. The aim is to
+develop a convenient cross-platform tool capable of incorporating the best features of existing
+editors, such as Valve Hammer Editor, Q3Radiant and others. Despite Quake and Half-Life having been
+released a long time ago, the large community have arisen around, still developing mods and games on
+their bases. However the existing editors suffer from fundamental disadvantages their users are well
+familiar with. Jackhammer does aspire to be the universal level design tool for classic games.
diff --git a/games/jackhammer/doinst.sh b/games/jackhammer/doinst.sh
new file mode 100644
index 0000000000..6dca820c05
--- /dev/null
+++ b/games/jackhammer/doinst.sh
@@ -0,0 +1,18 @@
+# Based on qstat's "doinst.sh" by David Somero
+# Handle configuration files
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+# List of configuration files (they should end in .new)
+
+config opt/Jackhammer/VDKGameCfg.ini.new
+config opt/Jackhammer/VDKRunCfg.ini.new
+config opt/Jackhammer/VDKSettings.ini.new
diff --git a/games/jackhammer/jackhammer b/games/jackhammer/jackhammer
new file mode 100644
index 0000000000..1006f4ffc4
--- /dev/null
+++ b/games/jackhammer/jackhammer
@@ -0,0 +1,4 @@
+ #!/bin/bash
+
+cd /opt/Jackhammer
+./jackhammer.sh
diff --git a/games/jackhammer/jackhammer.SlackBuild b/games/jackhammer/jackhammer.SlackBuild
new file mode 100644
index 0000000000..f4aa1a621c
--- /dev/null
+++ b/games/jackhammer/jackhammer.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for Jackhammer
+
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# TeamSpeak3 SlackBuild by Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=jackhammer
+VERSION=${VERSION:-11855}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+JDIR=opt/Jackhammer
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  JARCH="x64"
+else
+  JARCH="x86"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $PKG/opt
+chmod +x $CWD/"$PRGNAM"_"$VERSION"_linux_"$JARCH".run
+$CWD/"$PRGNAM"_"$VERSION"_linux_"$JARCH".run --noexec --target $PKG/$JDIR
+cd $PKG/$JDIR
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Desktop and launcher related stuff
+install -D -m 0644 $PRGNAM.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
+install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 0755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
+
+# This is so we don't overwrite configs
+mv $PKG/$JDIR/VDKGameCfg.ini $PKG/$JDIR/VDKGameCfg.ini.new
+mv $PKG/$JDIR/VDKRunCfg.ini $PKG/$JDIR/VDKRunCfg.ini.new
+mv $PKG/$JDIR/VDKSettings.ini $PKG/$JDIR/VDKSettings.ini.new
+
+# Cleanup
+rm -f $PKG/$JDIR/$PRGNAM.desktop
+rm -f $PKG/$JDIR/libQtCore.so.4
+rm -f $PKG/$JDIR/libQtGui.so.4
+rm -f $PKG/$JDIR/libQtNetwork.so.4
+rm -f $PKG/$JDIR/libQtOpenGL.so.4
+
+# Make it so we have write access to the folder
+chgrp -R users $PKG/$JDIR
+chmod -R 774 $PKG/$JDIR
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/$JDIR/readme_en.rtf $PKG/$JDIR/readme_ru.rtf $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/jackhammer/jackhammer.desktop b/games/jackhammer/jackhammer.desktop
new file mode 100644
index 0000000000..200865fd31
--- /dev/null
+++ b/games/jackhammer/jackhammer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.1.700
+Type=Application
+Name=Jackhammer
+GenericName=Jackhammer
+Comment=Jackhammer (VDK)
+Exec=jackhammer
+Icon=jackhammer
+X-Window-Icon=jackhammer
+Terminal=false
+Categories=Utility;Application;
diff --git a/games/jackhammer/jackhammer.info b/games/jackhammer/jackhammer.info
new file mode 100644
index 0000000000..c982cc6142
--- /dev/null
+++ b/games/jackhammer/jackhammer.info
@@ -0,0 +1,10 @@
+PRGNAM="jackhammer"
+VERSION="11855"
+HOMEPAGE="http://jackhammer.hlfx.ru/"
+DOWNLOAD="http://jackhammer.hlfx.ru/pub/jackhammer_11855_linux_x86.run"
+MD5SUM="e8f2085785c9cb67f202d30942fcde9a"
+DOWNLOAD_x86_64="http://jackhammer.hlfx.ru/pub/jackhammer_11855_linux_x64.run"
+MD5SUM_x86_64="2bd87a39b8554d92e4d0877b7806b61b"
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/games/jackhammer/slack-desc b/games/jackhammer/slack-desc
new file mode 100644
index 0000000000..349e1ca7c1
--- /dev/null
+++ b/games/jackhammer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+jackhammer: jackhammer (Jackhammer Level Editor)
+jackhammer:
+jackhammer: Jackhammer is a brand new level editor for games with a quake-style
+jackhammer: BSP architecture (Half-Life, Quake, Quake II). The aim is to develop
+jackhammer: a convenient cross-platform tool capable of incorporating the best
+jackhammer: features of existing editors, such as Valve Hammer Editor, Q3Radiant
+jackhammer: and others.
+jackhammer:
+jackhammer:
+jackhammer: Homepage: http://jackhammer.hlfx.ru/
+jackhammer:
diff --git a/games/jezzball-kazzmir/jezzball-kazzmir.SlackBuild b/games/jezzball-kazzmir/jezzball-kazzmir.SlackBuild
index 180547aba8..e35c6365dd 100644
--- a/games/jezzball-kazzmir/jezzball-kazzmir.SlackBuild
+++ b/games/jezzball-kazzmir/jezzball-kazzmir.SlackBuild
@@ -12,7 +12,7 @@
 
 PRGNAM=jezzball-kazzmir
 VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,6 +65,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# 20151122 bkw: use allegro4's loadpng instead of the bundled one. fixes
+# build on -current, does no harm on 14.1.
+patch -p1 < $CWD/loadpng.diff
+
 sed -i 's,\./data\|data/,'"$DATADIR"',' src/main.cpp
 sed -i 's,score\.jzb,'$SCOREDIR'/&,' src/score.cpp
 
diff --git a/games/jezzball-kazzmir/loadpng.diff b/games/jezzball-kazzmir/loadpng.diff
new file mode 100644
index 0000000000..64ab30a2ef
--- /dev/null
+++ b/games/jezzball-kazzmir/loadpng.diff
@@ -0,0 +1,900 @@
+diff -Naur jezzball-1.1/SConstruct jezzball-1.1.patched/SConstruct
+--- jezzball-1.1/SConstruct	2007-09-09 18:07:10.000000000 -0400
++++ jezzball-1.1.patched/SConstruct	2015-11-22 01:16:48.000000000 -0500
+@@ -27,18 +27,13 @@
+ score.cpp
+ """))
+ 
+-sources.append( map( lambda x: 'build/loadpng/%s' % x, Split("""
+-loadpng.c
+-regpng.c
+-savepng.c
+-""")));
+-
+ env.Append( LIBS = ['jpgal'] )
+ 
+ if isWindows():
+ 	env.Append( LIBS = ['png', 'alleg'] )
+ else:
+ 	env.ParseConfig( 'allegro-config --libs --cflags' )
++	env.Append( LIBS = ['loadpng'] )
+ 	env.ParseConfig( 'libpng-config --libs' )
+ 
+ env.Append( CCFLAGS = '-O2' )
+diff -Naur jezzball-1.1/src/loadpng/loadpng.c jezzball-1.1.patched/src/loadpng/loadpng.c
+--- jezzball-1.1/src/loadpng/loadpng.c	2007-09-09 18:02:37.000000000 -0400
++++ jezzball-1.1.patched/src/loadpng/loadpng.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,400 +0,0 @@
+-/* loadpng, Allegro wrapper routines for libpng
+- * by Peter Wang (tjaden@users.sf.net).
+- *
+- * This file is hereby placed in the public domain.
+- */
+-
+-
+-#include <png.h>
+-#include <allegro.h>
+-#include <allegro/internal/aintern.h>
+-#include "loadpng.h"
+-
+-/* We need internals _color_load_depth and _fixup_loaded_bitmap.  The
+- * first can be replaced by the new get_color_depth() function which
+- * is in Allegro 4.1 branch.  But it's not worth it to break 4.0
+- * compatibility.
+- */
+-
+-
+-
+-double _png_screen_gamma = -1.0;
+-int _png_compression_level = Z_BEST_COMPRESSION;
+-
+-
+-
+-/* get_gamma:
+- *  Get screen gamma value one of three ways.
+- */
+-static double get_gamma(void)
+-{
+-    if (_png_screen_gamma == -1.0) {
+-	/* Use the environment variable if available.
+-	 * 2.2 is a good guess for PC monitors.
+-	 * 1.1 is good for my laptop.
+-	 */
+-	AL_CONST char *gamma_str = getenv("SCREEN_GAMMA");
+-	return (gamma_str) ? atof(gamma_str) : 2.2;
+-    }
+-
+-    return _png_screen_gamma;
+-}
+-
+-
+-
+-/* read_data:
+- *  Custom read function to use Allegro packfile routines,
+- *  rather than C streams (so we can read from datafiles!)
+- */
+-static void read_data(png_structp png_ptr, png_bytep data, png_uint_32 length)
+-{
+-    PACKFILE *f = (PACKFILE *)png_get_io_ptr(png_ptr);
+-    if ((png_uint_32)pack_fread(data, length, f) != length)
+-	png_error(png_ptr, "read error (loadpng calling pack_fread)");
+-}
+-
+-
+-
+-/* check_if_png:
+- *  Check if input file is really PNG format.
+- */
+-#define PNG_BYTES_TO_CHECK 4
+-
+-static int check_if_png(PACKFILE *fp)
+-{
+-    unsigned char buf[PNG_BYTES_TO_CHECK];
+-
+-    ASSERT(fp);
+-
+-    if (pack_fread(buf, PNG_BYTES_TO_CHECK, fp) != PNG_BYTES_TO_CHECK)
+-	return 0;
+-
+-    return (png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK) == 0);
+-}
+-
+-
+-
+-/* really_load_png:
+- *  Worker routine, used by load_png and load_memory_png.
+- */
+-static BITMAP *really_load_png(png_structp png_ptr, png_infop info_ptr, RGB *pal)
+-{
+-    BITMAP *bmp;
+-    PALETTE tmppal;
+-    png_uint_32 width, height, rowbytes;
+-    int bit_depth, color_type, interlace_type;
+-    double image_gamma, screen_gamma;
+-    int intent;
+-    int bpp, dest_bpp;
+-    int tRNS_to_alpha = FALSE;
+-    int number_passes, pass;
+-
+-    ASSERT(png_ptr && info_ptr && rgb);
+-
+-    /* The call to png_read_info() gives us all of the information from the
+-     * PNG file before the first IDAT (image data chunk).
+-     */
+-    png_read_info(png_ptr, info_ptr);
+-
+-    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-		 &interlace_type, NULL, NULL);
+-
+-    /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
+-     * byte into separate bytes (useful for paletted and grayscale images).
+-     */
+-    png_set_packing(png_ptr);
+-
+-    /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+-    if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
+-	png_set_expand(png_ptr);
+-
+-    /* Adds a full alpha channel if there is transparency information
+-     * in a tRNS chunk. */
+-    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+-	png_set_tRNS_to_alpha(png_ptr);
+-	tRNS_to_alpha = TRUE;
+-    }
+-
+-    /* Convert 16-bits per colour component to 8-bits per colour component. */
+-    if (bit_depth == 16)
+-	png_set_strip_16(png_ptr);
+-
+-    /* Convert grayscale to RGB triplets */
+-    if ((color_type == PNG_COLOR_TYPE_GRAY) ||
+-	(color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+-	png_set_gray_to_rgb(png_ptr);
+-
+-    /* Optionally, tell libpng to handle the gamma correction for us. */
+-    if (_png_screen_gamma != 0.0) {
+-	screen_gamma = get_gamma();
+-
+-	if (png_get_sRGB(png_ptr, info_ptr, &intent))
+-	    png_set_gamma(png_ptr, screen_gamma, 0.45455);
+-	else {
+-	    if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
+-		png_set_gamma(png_ptr, screen_gamma, image_gamma);
+-	    else
+-		png_set_gamma(png_ptr, screen_gamma, 0.45455);
+-	}
+-    }
+-
+-    /* Turn on interlace handling. */
+-    number_passes = png_set_interlace_handling(png_ptr);
+-    
+-    /* Call to gamma correct and add the background to the palette
+-     * and update info structure.
+-     */
+-    png_read_update_info(png_ptr, info_ptr);
+-    
+-    /* Even if the user doesn't supply space for a palette, we want
+-     * one for the load process.
+-     */
+-    if (!pal)
+-	pal = tmppal;
+-    
+-    /* Palettes. */
+-    if (color_type & PNG_COLOR_MASK_PALETTE) {
+-	int num_palette, i;
+-	png_colorp palette;
+-
+-	if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
+-	    /* We don't actually dither, we just copy the palette. */
+-	    for (i = 0; ((i < num_palette) && (i < 256)); i++) {
+-		pal[i].r = palette[i].red >> 2;		/* 256 -> 64 */
+-		pal[i].g = palette[i].green >> 2;
+-		pal[i].b = palette[i].blue >> 2;
+-	    }
+-
+-	    for (; i < 256; i++)
+-		pal[i].r = pal[i].g = pal[i].b = 0;
+-	}
+-    }
+-    else {
+-	generate_332_palette(pal);
+-    }
+-
+-    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+-
+-    /* Allocate the memory to hold the image using the fields of info_ptr. */
+-    bpp = rowbytes * 8 / width;
+-
+-    /* Allegro cannot handle less than 8 bpp. */
+-    if (bpp < 8)
+-	bpp = 8;
+-
+-    dest_bpp = _color_load_depth(bpp, (bpp == 32));
+-    bmp = create_bitmap_ex(bpp, width, height);
+-
+-    /* Maybe flip RGB to BGR. */
+-    if ((bpp == 24) || (bpp == 32)) {
+-	int c = makecol_depth(bpp, 0, 0, 255);
+-	unsigned char *pc = (unsigned char *)&c;
+-	if (pc[0] == 255)
+-	    png_set_bgr(png_ptr);
+-#ifdef ALLEGRO_BIG_ENDIAN	    
+-	png_set_swap_alpha(png_ptr);
+-#endif	    
+-    }
+-
+-    /* Read the image, one line at a line (easier to debug!) */
+-    for (pass = 0; pass < number_passes; pass++) {
+-	png_uint_32 y;
+-	for (y = 0; y < height; y++)
+-	    png_read_row(png_ptr, bmp->line[y], NULL);
+-    }
+-
+-    /* Let Allegro convert the image into the desired colour depth. */
+-    if (dest_bpp != bpp)
+-	bmp = _fixup_loaded_bitmap(bmp, pal, dest_bpp);
+-
+-    /* Read rest of file, and get additional chunks in info_ptr. */
+-    png_read_end(png_ptr, info_ptr);
+-
+-    return bmp;
+-}
+-
+-
+-
+-/* load_png:
+- *  Load a PNG file from disk, doing colour coversion if required.
+- */
+-BITMAP *load_png(AL_CONST char *filename, RGB *pal)
+-{
+-    PACKFILE *fp;
+-    BITMAP *bmp;
+-
+-    ASSERT(filename);
+-
+-    fp = pack_fopen(filename, "r");
+-    if (!fp)
+-	return NULL;
+-
+-    bmp = load_png_pf(fp, pal);
+-
+-    pack_fclose(fp);
+-
+-    return bmp;
+-}
+-
+-
+-
+-/* load_png_pf:
+- *  Load a PNG file from disk, doing colour coversion if required.
+- */
+-BITMAP *load_png_pf(PACKFILE *fp, RGB *pal)
+-{
+-    BITMAP *bmp;
+-    png_structp png_ptr;
+-    png_infop info_ptr;
+-
+-    ASSERT(fp);
+-
+-    if (!check_if_png(fp)) {
+-	return NULL;
+-    }
+-
+-    /* Create and initialize the png_struct with the desired error handler
+-     * functions.  If you want to use the default stderr and longjump method,
+-     * you can supply NULL for the last three parameters.  We also supply the
+-     * the compiler header file version, so that we know if the application
+-     * was compiled with a compatible version of the library.
+-     */
+-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+-				     (void *)NULL, NULL, NULL);
+-    if (!png_ptr) {
+-	return NULL;
+-    }
+-
+-    /* Allocate/initialize the memory for image information. */
+-    info_ptr = png_create_info_struct(png_ptr);
+-    if (!info_ptr) {
+-	png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+-	return NULL;
+-    }
+-
+-    /* Set error handling if you are using the setjmp/longjmp method (this is
+-     * the normal method of doing things with libpng).  REQUIRED unless you
+-     * set up your own error handlers in the png_create_read_struct() earlier.
+-     */
+-    if (setjmp(png_ptr->jmpbuf)) {
+-	/* Free all of the memory associated with the png_ptr and info_ptr */
+-	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+-	/* If we get here, we had a problem reading the file */
+-	return NULL;
+-    }
+-
+-    /* Use Allegro packfile routines. */
+-    png_set_read_fn(png_ptr, fp, (png_rw_ptr)read_data);
+-
+-    /* We have already read some of the signature. */
+-    png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK);
+-
+-    /* Really load the image now. */
+-    bmp = really_load_png(png_ptr, info_ptr, pal);
+-
+-    /* Clean up after the read, and free any memory allocated. */
+-    png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+-
+-    return bmp;
+-}
+-
+-
+-
+-/* read_data_memory:
+- *  Custom reader function to read a PNG file from a memory buffer.
+- */
+-
+-typedef struct {
+-    AL_CONST unsigned char *buffer;
+-    png_uint_32 bufsize;
+-    png_uint_32 current_pos;
+-} MEMORY_READER_STATE;
+-
+-static void read_data_memory(png_structp png_ptr, png_bytep data, png_uint_32 length)
+-{
+-    MEMORY_READER_STATE *f = (MEMORY_READER_STATE *)png_get_io_ptr(png_ptr);
+-
+-    if (length > (f->bufsize - f->current_pos))
+-	png_error(png_ptr, "read error in read_data_memory (loadpng)");
+-
+-    memcpy(data, f->buffer + f->current_pos, length);
+-    f->current_pos += length;
+-}
+-
+-
+-
+-/* check_if_png_memory:
+- *  Check if input buffer is really PNG format.
+- */
+-static int check_if_png_memory(AL_CONST void *buffer)
+-{
+-    unsigned char *buf = (unsigned char *)buffer;
+-    return (png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK) == 0);
+-}
+-
+-
+-
+-/* load_memory_png:
+- *  Load a PNG file from memory, doing colour coversion if required.
+- */
+-BITMAP *load_memory_png(AL_CONST void *buffer, int bufsize, RGB *pal)
+-{
+-    MEMORY_READER_STATE memory_reader_state;
+-    BITMAP *bmp;
+-    png_structp png_ptr;
+-    png_infop info_ptr;
+-
+-    if (!buffer || (bufsize <= 0))
+-    	return NULL;
+-
+-    if (!check_if_png_memory(buffer))
+-	return NULL;
+-
+-    /* Create and initialize the png_struct with the desired error handler
+-     * functions.  If you want to use the default stderr and longjump method,
+-     * you can supply NULL for the last three parameters.  We also supply the
+-     * the compiler header file version, so that we know if the application
+-     * was compiled with a compatible version of the library.
+-     */
+-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+-				     (void *)NULL, NULL, NULL);
+-    if (!png_ptr)
+-	return NULL;
+-
+-    /* Allocate/initialize the memory for image information. */
+-    info_ptr = png_create_info_struct(png_ptr);
+-    if (!info_ptr) {
+-	png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+-	return NULL;
+-    }
+-
+-    /* Set error handling if you are using the setjmp/longjmp method (this is
+-     * the normal method of doing things with libpng).  REQUIRED unless you
+-     * set up your own error handlers in the png_create_read_struct() earlier.
+-     */
+-    if (setjmp(png_ptr->jmpbuf)) {
+-	/* Free all of the memory associated with the png_ptr and info_ptr */
+-	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+-	/* If we get here, we had a problem reading the file */
+-	return NULL;
+-    }
+-
+-    /* Set up the reader state. */
+-    memory_reader_state.buffer = (unsigned char *)buffer;
+-    memory_reader_state.bufsize = bufsize;
+-    memory_reader_state.current_pos = PNG_BYTES_TO_CHECK;
+-
+-    /* Tell libpng to use our custom reader. */
+-    png_set_read_fn(png_ptr, &memory_reader_state, (png_rw_ptr)read_data_memory);
+-
+-    /* We have already read some of the signature. */
+-    png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK);
+-
+-    /* Really load the image now. */
+-    bmp = really_load_png(png_ptr, info_ptr, pal);
+-
+-    /* Clean up after the read, and free any memory allocated. */
+-    png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+-    
+-    return bmp;
+-}
+diff -Naur jezzball-1.1/src/loadpng/loadpng.h jezzball-1.1.patched/src/loadpng/loadpng.h
+--- jezzball-1.1/src/loadpng/loadpng.h	2007-09-09 18:02:37.000000000 -0400
++++ jezzball-1.1.patched/src/loadpng/loadpng.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,75 +0,0 @@
+-/* loadpng.h */
+-/* This file is hereby placed in the public domain. */
+-#ifndef _included_loadpng_h_
+-#define _included_loadpng_h_
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-
+-
+-/* Overkill :-) */
+-#define LOADPNG_VERSION		1
+-#define LOADPNG_SUBVERSION	5
+-#define LOADPNG_VERSIONSTR	"1.5"
+-
+-
+-/* _png_screen_gamma is slightly overloaded (sorry):
+- *
+- * A value of 0.0 means: Don't do any gamma correction in load_png()
+- * and load_memory_png().  This meaning was introduced in v1.4.
+- *
+- * A value of -1.0 means: Use the value from the environment variable
+- * SCREEN_GAMMA (if available), otherwise fallback to a value of 2.2
+- * (a good guess for PC monitors, and the value for sRGB colourspace).
+- * This is the default.
+- *
+- * Otherwise, the value of _png_screen_gamma is taken as-is.
+- */
+-extern double _png_screen_gamma;
+-
+-
+-/* Choose zlib compression level for saving file.
+- * Default is Z_BEST_COMPRESSION.
+- */
+-extern int _png_compression_level;
+-
+-
+-/* Load a PNG from disk. */
+-extern BITMAP *load_png(AL_CONST char *filename, RGB *pal);
+-
+-/* Load a PNG from some place. */
+-extern BITMAP *load_png_pf(PACKFILE *fp, RGB *pal);
+-
+-/* Load a PNG from memory. */
+-extern BITMAP *load_memory_png(AL_CONST void *buffer, int buffer_size, RGB *pal);
+-
+-/* Save a bitmap to disk in PNG format. */
+-extern int save_png(AL_CONST char *filename, BITMAP *bmp, AL_CONST RGB *pal);
+-
+-/* Adds `PNG' to Allegro's internal file type table.
+- * You can then just use load_bitmap and save_bitmap as usual.
+- */
+-extern void register_png_file_type(void);
+-
+-/* Register an datafile type ID with Allegro, so that when an object
+- * with that type ID is encountered while loading a datafile, that
+- * object will be loaded as a PNG file.
+- */
+-extern void register_png_datafile_object(int id);
+-
+-/* This is supposed to resemble jpgalleg_init in JPGalleg 2.0, just in
+- * case you are lazier than lazy.  It contains these 3 lines of code:
+- *  register_png_datafile_object(DAT_ID('P','N','G',' '));
+- *  register_png_file_type();
+- *  return 0;
+- */
+-extern int loadpng_init(void);
+-
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _included_loadpng_h */
+diff -Naur jezzball-1.1/src/loadpng/regpng.c jezzball-1.1.patched/src/loadpng/regpng.c
+--- jezzball-1.1/src/loadpng/regpng.c	2007-09-09 18:02:37.000000000 -0400
++++ jezzball-1.1.patched/src/loadpng/regpng.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,68 +0,0 @@
+-/* loadpng, Allegro wrapper routines for libpng
+- * by Peter Wang (tjaden@users.sf.net).
+- *
+- * This file is hereby placed in the public domain.
+- */
+-
+-
+-#include <allegro.h>
+-#include "loadpng.h"
+-
+-
+-
+-/* register_png_file_type:
+- */
+-void register_png_file_type(void)
+-{
+-    register_bitmap_file_type("png", load_png, save_png);
+-}
+-
+-
+-
+-/* register_png_datafile_object:
+- */
+-
+-static void *load_datafile_png(PACKFILE *f, long size)
+-{
+-    BITMAP *bmp;
+-    void *buffer;
+-
+-    buffer = malloc(size);
+-    if (!buffer)
+-	return NULL;
+-
+-    if (pack_fread(buffer, size, f) != size) {
+-	free(buffer);
+-	return NULL;
+-    }
+-
+-    bmp = load_memory_png(buffer, size, NULL);
+-
+-    free(buffer);
+-
+-    return bmp;
+-}
+-
+-static void destroy_datafile_png(void *data)
+-{
+-    if (data) {
+-	destroy_bitmap((BITMAP *)data);
+-    }
+-}
+-
+-void register_png_datafile_object(int id)
+-{
+-    register_datafile_object(id, load_datafile_png, destroy_datafile_png);
+-}
+-
+-
+-
+-/* loadpng_init:
+- *  This is supposed to resemble jpgalleg_init in JPGalleg 2.0.
+- */
+-int loadpng_init(void)
+-{
+-    register_png_datafile_object(DAT_ID('P','N','G',' '));
+-    register_png_file_type();
+-    return 0;
+-}
+diff -Naur jezzball-1.1/src/loadpng/savepng.c jezzball-1.1.patched/src/loadpng/savepng.c
+--- jezzball-1.1/src/loadpng/savepng.c	2007-09-09 18:02:37.000000000 -0400
++++ jezzball-1.1.patched/src/loadpng/savepng.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,306 +0,0 @@
+-/* loadpng, Allegro wrapper routines for libpng
+- * by Peter Wang (tjaden@users.sf.net).
+- *
+- * This file is hereby placed in the public domain.
+- */
+-
+-
+-#include <png.h>
+-#include <allegro.h>
+-#include "loadpng.h"
+-
+-
+-
+-/* write_data:
+- *  Custom write function to use Allegro packfile routines,
+- *  rather than C streams.
+- */
+-static void write_data(png_structp png_ptr, png_bytep data, png_uint_32 length)
+-{
+-    PACKFILE *f = (PACKFILE *)png_get_io_ptr(png_ptr);
+-    if ((png_uint_32)pack_fwrite(data, length, f) != length)
+-	png_error(png_ptr, "write error (loadpng calling pack_fwrite)");
+-}
+-
+-/* Don't think Allegro has any problem with buffering
+- * (rather, Allegro provides no way to flush packfiles).
+- */
+-static void flush_data(png_structp png_ptr) { (void)png_ptr; }
+-
+-
+-
+-/* save_indexed:
+- *  Core save routine for 8 bpp images.
+- * */
+-static int save_indexed(png_structp png_ptr, BITMAP *bmp)
+-{
+-    ASSERT(bitmap_color_depth(bmp) == 8);
+-
+-    if (is_memory_bitmap(bmp)) { /* fast path */
+-	int y;
+-
+-	for (y=0; y<bmp->h; y++) {
+-	    png_write_row(png_ptr, bmp->line[y]);
+-	}
+-
+-	return 1;
+-    }
+-    else {			/* generic case */
+-	unsigned char *rowdata;
+-	int x, y;
+-
+-	rowdata = (unsigned char *)malloc(bmp->w * 3);
+-	if (!rowdata)
+-	    return 0;
+-
+-	for (y=0; y<bmp->h; y++) {
+-	    unsigned char *p = rowdata;
+-
+-	    for (x=0; x<bmp->w; x++) {
+-		*p++ = getpixel(bmp, x, y);
+-	    }
+-	
+-	    png_write_row(png_ptr, rowdata);
+-	}
+-	
+-	free(rowdata);
+-
+-	return 1;
+-    }
+-}
+-
+-
+-
+-/* save_rgb:
+- *  Core save routine for 15/16/24 bpp images (original by Martijn Versteegh).
+- */
+-static int save_rgb(png_structp png_ptr, BITMAP *bmp)
+-{
+-    AL_CONST int depth = bitmap_color_depth(bmp);
+-    unsigned char *rowdata;
+-    int y, x;
+-
+-    ASSERT(depth == 15 || depth == 16 || depth == 24);
+-
+-    rowdata = (unsigned char *)malloc(bmp->w * 3);
+-    if (!rowdata)
+-	return 0;
+-
+-    for (y=0; y<bmp->h; y++) {
+-	unsigned char *p = rowdata;
+-
+-	if (depth == 15) {
+-	    for (x = 0; x < bmp->w; x++) {
+-		int c = getpixel(bmp, x, y);
+-		*p++ = getr15(c);
+-		*p++ = getg15(c);
+-		*p++ = getb15(c);
+-	    }
+-	}
+-	else if (depth == 16) {
+-	    for (x = 0; x < bmp->w; x++) {
+-		int c = getpixel(bmp, x, y);
+-		*p++ = getr16(c);
+-		*p++ = getg16(c);
+-		*p++ = getb16(c);
+-	    }
+-	}
+-	else { /* depth == 24 */
+-	    for (x = 0; x < bmp->w; x++) {
+-		int c = getpixel(bmp, x, y);
+-		*p++ = getr24(c);
+-		*p++ = getg24(c);
+-		*p++ = getb24(c);
+-	    }
+-	}
+-
+-	png_write_row(png_ptr, rowdata);
+-    }
+-
+-    free(rowdata);
+-
+-    return 1;
+-}
+-
+-
+-
+-/* save_rgba:
+- *  Core save routine for 32 bpp images.
+- */
+-static int save_rgba(png_structp png_ptr, BITMAP *bmp)
+-{
+-    unsigned char *rowdata;
+-    int x, y;
+-
+-    ASSERT(bitmap_color_depth(bmp) == 32);
+-
+-    rowdata = (unsigned char *)malloc(bmp->w * 4);
+-    if (!rowdata)
+-	return 0;
+-
+-    for (y=0; y<bmp->h; y++) {
+-	unsigned char *p = rowdata;
+-	
+-        for (x=0; x<bmp->w; x++) {
+-            int c = getpixel(bmp, x, y);
+-	    *p++ = getr32(c);
+-	    *p++ = getg32(c);
+-	    *p++ = getb32(c);
+-	    *p++ = geta32(c);
+-        }
+-
+-        png_write_row(png_ptr, rowdata);
+-    }
+-
+-    free(rowdata);
+-
+-    return 1;
+-}
+-
+-
+-
+-/* save_png:
+- *  Writes a non-interlaced, no-frills PNG, taking the usual save_xyz
+- *  parameters.  Returns non-zero on error.
+- */
+-static int really_save_png(PACKFILE *fp, BITMAP *bmp, AL_CONST RGB *pal)
+-{
+-    png_structp png_ptr = NULL;
+-    png_infop info_ptr = NULL;
+-    int depth;
+-    int colour_type;
+-
+-    depth = bitmap_color_depth(bmp);
+-    if (depth == 8 && !pal)
+-	return -1;
+-
+-    /* Create and initialize the png_struct with the
+-     * desired error handler functions.
+-     */
+-    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-				      (void *)NULL, NULL, NULL);
+-    if (!png_ptr)
+-	goto Error;
+-
+-    /* Allocate/initialize the image information data. */
+-    info_ptr = png_create_info_struct(png_ptr);
+-    if (!info_ptr)
+-	goto Error;
+-
+-    /* Set error handling. */
+-    if (setjmp(png_ptr->jmpbuf)) {
+-	/* If we get here, we had a problem reading the file. */
+-	goto Error;
+-    }
+-
+-    /* Use packfile routines. */
+-    png_set_write_fn(png_ptr, fp, (png_rw_ptr)write_data, flush_data);
+-
+-    /* Set the image information here.  Width and height are up to 2^31,
+-     * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
+-     * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
+-     * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
+-     * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
+-     * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
+-     * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE.
+-     */
+-    if (depth == 8)
+-	colour_type = PNG_COLOR_TYPE_PALETTE;
+-    else if (depth == 32)
+-	colour_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-    else
+-	colour_type = PNG_COLOR_TYPE_RGB;
+-
+-    /* Set compression level. */
+-    png_set_compression_level(png_ptr, _png_compression_level);
+-
+-    png_set_IHDR(png_ptr, info_ptr, bmp->w, bmp->h, 8, colour_type,
+-		 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
+-		 PNG_FILTER_TYPE_BASE);
+-
+-    /* Set the palette if there is one.  Required for indexed-color images. */
+-    if (colour_type == PNG_COLOR_TYPE_PALETTE) {
+-	png_color palette[256];
+-	int i;
+-
+-	for (i = 0; i < 256; i++) {
+-	    palette[i].red   = _rgb_scale_6[pal[i].r];   /* 64 -> 256 */
+-	    palette[i].green = _rgb_scale_6[pal[i].g];
+-	    palette[i].blue  = _rgb_scale_6[pal[i].b];
+-	}
+-
+-	/* Set palette colors. */
+-	png_set_PLTE(png_ptr, info_ptr, palette, 256);
+-    }
+-
+-    /* Optionally write comments into the image ... Nah. */
+-
+-    /* Write the file header information. */
+-    png_write_info(png_ptr, info_ptr);
+-
+-    /* Once we write out the header, the compression type on the text
+-     * chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
+-     * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again
+-     * at the end.
+-     */
+-
+-    /* Save the data. */
+-    switch (depth) {
+-	case 8:
+-	    if (!save_indexed(png_ptr, bmp))
+-		goto Error;
+-	    break;
+-	case 15:
+-	case 16:
+-	case 24:
+-	    if (!save_rgb(png_ptr, bmp))
+-		goto Error;
+-	    break;
+-	case 32:
+-	    if (!save_rgba(png_ptr, bmp))
+-		goto Error;
+-	    break;
+-	default:
+-	    ASSERT(FALSE);
+-	    goto Error;
+-    }
+-
+-    png_write_end(png_ptr, info_ptr);
+-
+-    png_destroy_write_struct(&png_ptr, &info_ptr);
+-
+-    return 0;
+-
+-  Error:
+-
+-    if (png_ptr) {
+-	if (info_ptr)
+-	    png_destroy_write_struct(&png_ptr, &info_ptr);
+-	else
+-	    png_destroy_write_struct(&png_ptr, NULL);
+-    }
+-
+-    return -1;
+-}
+-
+-
+-int save_png(AL_CONST char *filename, BITMAP *bmp, AL_CONST RGB *pal)
+-{
+-    PACKFILE *fp;
+-    int result;
+-
+-    ASSERT(filename);
+-    ASSERT(bmp);
+-
+-    fp = pack_fopen(filename, "w");
+-    if (!fp)
+-	return -1;
+-    
+-    acquire_bitmap(bmp);
+-    result = really_save_png(fp, bmp, pal);
+-    release_bitmap(bmp);
+-
+-    pack_fclose(fp);
+-
+-    return result;
+-}
+diff -Naur jezzball-1.1/src/main.cpp jezzball-1.1.patched/src/main.cpp
+--- jezzball-1.1/src/main.cpp	2007-09-09 18:07:10.000000000 -0400
++++ jezzball-1.1.patched/src/main.cpp	2015-11-22 01:14:03.000000000 -0500
+@@ -2,7 +2,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <stdlib.h>
+-#include "loadpng/loadpng.h"
++#include <loadpng.h>
+ #include <jpgalleg.h>
+ #include "game.h"
+ #include "mouse.h"
diff --git a/games/lgogdownloader/lgogdownloader.SlackBuild b/games/lgogdownloader/lgogdownloader.SlackBuild
index 79b6c4c508..9b0ca161d9 100644
--- a/games/lgogdownloader/lgogdownloader.SlackBuild
+++ b/games/lgogdownloader/lgogdownloader.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lgogdownloader
-VERSION=${VERSION:-2.20}
+VERSION=${VERSION:-2.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,9 +84,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-find . -type f -exec sed -i 's|#include <jsoncpp/json/json.h>|#include <jsoncpp/json.h>|' {} \;
-sed -i "s|CFLAGS_RELEASE =  \$(CFLAGS) -O2|CFLAGS_RELEASE = \$(CFLAGS) $SLKCFLAGS|" Makefile
-
 make release
 make install MANPREFIX=/usr DESTDIR=$PKG
 
diff --git a/games/lgogdownloader/lgogdownloader.info b/games/lgogdownloader/lgogdownloader.info
index eede324d8b..6adb7e9890 100644
--- a/games/lgogdownloader/lgogdownloader.info
+++ b/games/lgogdownloader/lgogdownloader.info
@@ -1,8 +1,8 @@
 PRGNAM="lgogdownloader"
-VERSION="2.20"
+VERSION="2.26"
 HOMEPAGE="https://sites.google.com/site/gogdownloader/home/"
-DOWNLOAD="https://sites.google.com/site/gogdownloader/lgogdownloader-2.20.tar.gz"
-MD5SUM="e9b89918addaa763430141a15a24b5e7"
+DOWNLOAD="https://sites.google.com/site/gogdownloader/lgogdownloader-2.26.tar.gz"
+MD5SUM="c55507e0f329113d1a221842f56720b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="htmlcxx jsoncpp liboauth rhash tinyxml"
diff --git a/games/lutris/lutris.SlackBuild b/games/lutris/lutris.SlackBuild
index 42b31e005c..4b9edec5d2 100644
--- a/games/lutris/lutris.SlackBuild
+++ b/games/lutris/lutris.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/games/mame/README b/games/mame/README
index cda7229230..75c9eafa8e 100644
--- a/games/mame/README
+++ b/games/mame/README
@@ -4,6 +4,12 @@ to reproduce that game as faithfully as possible on a more modern general
 purpose computer.  MAME can currently emulate several thousand different 
 classic arcade video games from the late 1970s through the modern era.
 
-To build MESS, pass MESS=yes to the script. To build UME pass UME=yes to
-the script. To disable building of MAME, pass MAME=no to the script. These
-can be combined.
+MESS (Multi Emulator Super System) is the sister project of MAME. MESS
+documents the hardware for a wide variety of (mostly vintage) computers,
+video game consoles, and calculators, as MAME does for arcade games.
+
+Modern versions of MAME now include MESS, so there's no need for a
+separate MESS build or binary.
+
+This build requires around 2GB of storage in /tmp (or whatever you set
+TMP to in the environment).
diff --git a/games/mame/desktop/mame.png b/games/mame/desktop/mame.png
new file mode 100644
index 0000000000..4767e894c4
--- /dev/null
+++ b/games/mame/desktop/mame.png
diff --git a/games/mame/desktop/mame.xpm b/games/mame/desktop/mame.xpm
deleted file mode 100644
index 514ed28870..0000000000
--- a/games/mame/desktop/mame.xpm
+++ /dev/null
@@ -1,161 +0,0 @@
-/* XPM */
-static char * mame_xpm[] = {
-"32 32 126 2",
-"  	c None",
-". 	c #1A85BC",
-"+ 	c #1A7EB8",
-"@ 	c #197CB5",
-"# 	c #1F74B5",
-"$ 	c #1764A5",
-"% 	c #1766A9",
-"& 	c #1867AA",
-"* 	c #186CAC",
-"= 	c #1870AE",
-"- 	c #11042C",
-"; 	c #1C024F",
-"> 	c #1E0043",
-", 	c #160139",
-"' 	c #0C0415",
-") 	c #240155",
-"! 	c #160436",
-"~ 	c #26005C",
-"{ 	c #1A1354",
-"] 	c #0B0438",
-"^ 	c #12051E",
-"/ 	c #000003",
-"( 	c #0C133F",
-"_ 	c #1C025A",
-": 	c #0C0219",
-"< 	c #29015F",
-"[ 	c #545180",
-"} 	c #689BB3",
-"| 	c #0A0842",
-"1 	c #140521",
-"2 	c #215582",
-"3 	c #64849B",
-"4 	c #397393",
-"5 	c #2D016B",
-"6 	c #07030B",
-"7 	c #328AC5",
-"8 	c #120645",
-"9 	c #0D040D",
-"0 	c #46A0CE",
-"a 	c #356E8F",
-"b 	c #2B0166",
-"c 	c #250467",
-"d 	c #36017B",
-"e 	c #525274",
-"f 	c #3680B8",
-"g 	c #57B2E6",
-"h 	c #499FD6",
-"i 	c #3B7A9E",
-"j 	c #2D0173",
-"k 	c #340082",
-"l 	c #390282",
-"m 	c #5BB6E7",
-"n 	c #2175B8",
-"o 	c #47AFE6",
-"p 	c #131543",
-"q 	c #27037A",
-"r 	c #5D528A",
-"s 	c #6ED0FE",
-"t 	c #5FC3F5",
-"u 	c #3A049E",
-"v 	c #5400BA",
-"w 	c #3E0196",
-"x 	c #360190",
-"y 	c #2273B4",
-"z 	c #63D5FE",
-"A 	c #6FCBFC",
-"B 	c #140A53",
-"C 	c #43B2E8",
-"D 	c #4DBAF3",
-"E 	c #60C1F3",
-"F 	c #15144D",
-"G 	c #4F5263",
-"H 	c #4CB4ED",
-"I 	c #5CCBFE",
-"J 	c #68879E",
-"K 	c #4DB5F0",
-"L 	c #5500C3",
-"M 	c #4F526B",
-"N 	c #368EC9",
-"O 	c #3D7CA0",
-"P 	c #0E0624",
-"Q 	c #11113C",
-"R 	c #5800D2",
-"S 	c #6B54AF",
-"T 	c #5FD2FE",
-"U 	c #56BFF6",
-"V 	c #57C4FC",
-"W 	c #62BCF1",
-"X 	c #97D9FF",
-"Y 	c #2782CC",
-"Z 	c #5E5293",
-"` 	c #5CC3F9",
-" .	c #89D2FB",
-"..	c #5CBCED",
-"+.	c #92D6FA",
-"@.	c #2B739F",
-"#.	c #2987B8",
-"$.	c #5DBDF1",
-"%.	c #75DAFE",
-"&.	c #327FAB",
-"*.	c #42A6DC",
-"=.	c #1C0454",
-"-.	c #86D4FB",
-";.	c #184D70",
-">.	c #2C7FB1",
-",.	c #56C2F5",
-"'.	c #43A2D5",
-").	c #3FA4D7",
-"!.	c #4D5964",
-"~.	c #56B9ED",
-"{.	c #63DAFE",
-"].	c #7DD0FC",
-"^.	c #2974A3",
-"/.	c #23076B",
-"(.	c #48A5D6",
-"_.	c #77CFFD",
-":.	c #360077",
-"<.	c #2781AF",
-"[.	c #316F96",
-"}.	c #4A5A69",
-"|.	c #250573",
-"1.	c #06101B",
-"2.	c #57B7EF",
-"3.	c #32016F",
-"4.	c #4CA8DA",
-"5.	c #175FA3",
-"                                                                ",
-"                                                                ",
-"    . . . . . . + + + @ @ @ @ @ @ @ # # # # # # # # # # # #     ",
-"    . $ $ % % % % & & & & * * * * * * * # # # # # # # # # =     ",
-"    . $ - ; > ; > ; , ' ' , ) ! ; ~ ) ) ; { ] ) ! - ^ / # =     ",
-"    . % ( _ > : : > ; ' ' ; < > < ~ ) ~ [ } | ) 1 ^ ' / # 2 3 4 ",
-"    . % ( 5 > / 6 > ~ - 1 ) 5 ) 5 ) ) [ } 7 8 ) - ^ 9 / 2 3 0 a ",
-"    . % ( 5 ! / ' ; ~ ! - b c ~ d _ e 0 f g 8 < ! 1 ' / 3 0 h i ",
-"    . % ( j > : - ) b > > k ) b l [ 0 # m m 8 b > ! : 3 0 n o i ",
-"    + % p k d < ) c q j l d > j r 0 # o s m 8 5 ) ! 3 0 # o t i ",
-"    + & p u v w 5 b x u x > - [ 0 y o z A m B j ) 3 0 # C D E i ",
-"    + & F u v u ~ ) u u c - G 0 y H I I s m B b J 0 # K D D E i ",
-"    + & p u L x > , u v j M 0 # H I I I A m F 3 N # D D D H E O ",
-"    @ & ( u L d P , v L r 0 # H z I I I A m } N y D D D D H t O ",
-"    @ & Q u L k > b R S 0 # H T T I I I A U 7 # U V D D K H W O ",
-"    @ & Q u R u j w S } y H z z z z X V A t Y V V D D D K H W i ",
-"    @ * F v R v u Z 0 y H z T z s X D V ` V V V V U  .K H H ..i ",
-"    @ * { v L v Z 0 y H z T T s +.@.#.` ` V V V U +.H H H H $.i ",
-"    @ * { u j [ 0 y H z z T %.+.2 B &.` V V V U +.*.7 o H H ..i ",
-"    @ * p =.M 0 n H z z z %.-.;.j b >.` V ` ,.+.'.p @.*.H H ..i ",
-"    @ * ( M 0 y H z z z %. .;.8 u 5 >.` V t +.).p ] @.*.H H ..i ",
-"    # * !.f y ~.{.z z -.].;.] > x c >.` V +.'.p ) ! ^.*.H H ..i ",
-"    # a 0 y ~.{.z z -.].;./.< ~ d ~ >.` +.'.p b b , ^.(.H H ..i ",
-"    4 f y H {.{.z X _.;.q x :.b j ) <.+.'.p c c b ! [.(.C H ..i ",
-"  }.f N W %.%.%.%.A 2 |.u w x d k =.>.0 ( ] > ; < ! [.*.m m W O ",
-"1.O 7 ~.~.~.2.2.g ;._ x k k k d 3.8 &.( ' ' 1 ! > / ^.'.4.4.4.2 ",
-"] ] 2 2 8 8 8 8 8 _ :.c ) > > > > ! ( 9 : ^ ' 1 : / 6 6 2 ;.6 / ",
-"    # # 5 b b 3.:.j ; > ! 1 ^ ! , > > - 1 ' 9 9 6 / / / . 5.    ",
-"    # # # # # # # # # # # # # @ @ @ @ @ @ @ @ + + + . . . 5.    ",
-"    # # # # # # = = * = * * * * & * * * % $ $ $ $ $ $ 5.5.5.    ",
-"                                                                ",
-"                                                                "};
diff --git a/games/mame/desktop/mess.desktop b/games/mame/desktop/mess.desktop
deleted file mode 100644
index 1681187c4f..0000000000
--- a/games/mame/desktop/mess.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MESS
-Comment=MESS(tm) Multi Emulator Super System
-Exec=/usr/games/mess
-Icon=mess
-Terminal=false
-Type=Application
-Categories=Game;
diff --git a/games/mame/desktop/mess.xpm b/games/mame/desktop/mess.xpm
deleted file mode 100644
index 3aa416ae57..0000000000
--- a/games/mame/desktop/mess.xpm
+++ /dev/null
@@ -1,581 +0,0 @@
-/* XPM */
-static char * mess_xpm[] = {
-"64 64 514 2",
-"  	c None",
-". 	c #A1672F",
-"+ 	c #AE793D",
-"@ 	c #A36C34",
-"# 	c #9B6028",
-"$ 	c #9C642B",
-"% 	c #AC773D",
-"& 	c #A36D33",
-"* 	c #DCBD7C",
-"= 	c #A26F35",
-"- 	c #A36A33",
-"; 	c #D5B676",
-"> 	c #AA793E",
-", 	c #A16D32",
-"' 	c #DBBE7D",
-") 	c #FBEDA6",
-"! 	c #A56D35",
-"~ 	c #A16B2F",
-"{ 	c #E5C887",
-"] 	c #EAD490",
-"^ 	c #AC773E",
-"/ 	c #A26C32",
-"( 	c #DCBC7D",
-"_ 	c #FCE3AB",
-": 	c #FCE7A9",
-"< 	c #A36E33",
-"[ 	c #A26B32",
-"} 	c #DEC081",
-"| 	c #FCE3A8",
-"1 	c #EAD38E",
-"2 	c #A16C33",
-"3 	c #DBBE7B",
-"4 	c #FDE2A6",
-"5 	c #FDD8A9",
-"6 	c #FCE6A7",
-"7 	c #A46F35",
-"8 	c #D9B877",
-"9 	c #FDE1A6",
-"0 	c #FDD8A8",
-"a 	c #E9D390",
-"b 	c #A26D32",
-"c 	c #DBBE7C",
-"d 	c #FDE1A5",
-"e 	c #FED8A4",
-"f 	c #FED8A5",
-"g 	c #FCE6A6",
-"h 	c #A46D33",
-"i 	c #A67235",
-"j 	c #D3B070",
-"k 	c #FBE3A6",
-"l 	c #AC783D",
-"m 	c #DBBE7A",
-"n 	c #FCE1A2",
-"o 	c #FED6A0",
-"p 	c #FED6A2",
-"q 	c #FDE6A4",
-"r 	c #A46E34",
-"s 	c #A9783C",
-"t 	c #CCA769",
-"u 	c #FDE2A2",
-"v 	c #FED6A3",
-"w 	c #FFD6A2",
-"x 	c #FED6A1",
-"y 	c #E9D38E",
-"z 	c #DCBD7A",
-"A 	c #FDE09F",
-"B 	c #FED59B",
-"C 	c #FED49E",
-"D 	c #FED49D",
-"E 	c #FDE6A3",
-"F 	c #AF7E40",
-"G 	c #C49E60",
-"H 	c #FBE2A0",
-"I 	c #FDD59D",
-"J 	c #FED59D",
-"K 	c #E9D28D",
-"L 	c #AC763D",
-"M 	c #A16E34",
-"N 	c #DCBE7E",
-"O 	c #FCDD9D",
-"P 	c #FDD498",
-"Q 	c #FED39A",
-"R 	c #FED49A",
-"S 	c #FEE5A0",
-"T 	c #A56E34",
-"U 	c #B5854A",
-"V 	c #BD9656",
-"W 	c #FCE29F",
-"X 	c #FED499",
-"Y 	c #EAD18E",
-"Z 	c #DCBE7D",
-"` 	c #FCDE9D",
-" .	c #FED096",
-"..	c #FED196",
-"+.	c #FFD196",
-"@.	c #FEE49F",
-"#.	c #B98D4E",
-"$.	c #B78D50",
-"%.	c #FAE19E",
-"&.	c #FDD396",
-"*.	c #FED197",
-"=.	c #FED296",
-"-.	c #EAD18F",
-";.	c #A26E33",
-">.	c #DDBD7A",
-",.	c #FCD282",
-"'.	c #FCC479",
-").	c #FCC57A",
-"!.	c #FDC77C",
-"~.	c #FDC984",
-"{.	c #FDCD8A",
-"].	c #FECF91",
-"^.	c #FDD092",
-"/.	c #FDE39D",
-"(.	c #A56D34",
-"_.	c #C09659",
-":.	c #B48448",
-"<.	c #F8E09B",
-"[.	c #FDD192",
-"}.	c #FED093",
-"|.	c #FED094",
-"1.	c #FED092",
-"2.	c #FED091",
-"3.	c #FDD08F",
-"4.	c #EBD18D",
-"5.	c #AA783C",
-"6.	c #DDBE7B",
-"7.	c #FACA71",
-"8.	c #FDB450",
-"9.	c #FCB450",
-"0.	c #FEB450",
-"a.	c #FDB554",
-"b.	c #FEB657",
-"c.	c #FEBB61",
-"d.	c #FDDC90",
-"e.	c #C79F5F",
-"f.	c #AF7D42",
-"g.	c #F6DD9A",
-"h.	c #FDD08E",
-"i.	c #FDCE8D",
-"j.	c #FFCE8E",
-"k.	c #FECE8E",
-"l.	c #FCBF6B",
-"m.	c #EBCF88",
-"n.	c #A16D33",
-"o.	c #DEBE7A",
-"p.	c #F9C971",
-"q.	c #FDB24E",
-"r.	c #FDB34D",
-"s.	c #FEB24D",
-"t.	c #FEB34D",
-"u.	c #FEB34E",
-"v.	c #FDB34F",
-"w.	c #FCD985",
-"x.	c #A56C36",
-"y.	c #CBAA68",
-"z.	c #AC763C",
-"A.	c #F2DB96",
-"B.	c #FECC8A",
-"C.	c #FECD8A",
-"D.	c #FDCC8A",
-"E.	c #FDCA83",
-"F.	c #FBBA5E",
-"G.	c #EAD085",
-"H.	c #AB773D",
-"I.	c #DEBE79",
-"J.	c #F9C96B",
-"K.	c #FDB24D",
-"L.	c #FDB14C",
-"M.	c #FDB24A",
-"N.	c #FCD986",
-"O.	c #D2B270",
-"P.	c #A77038",
-"Q.	c #F0D489",
-"R.	c #FDC779",
-"S.	c #FEC984",
-"T.	c #FFCA85",
-"U.	c #FECA85",
-"V.	c #FDC77B",
-"W.	c #FDB457",
-"X.	c #FEB14C",
-"Y.	c #EAD084",
-"Z.	c #A46D34",
-"`.	c #DEBF7B",
-" +	c #FAC86D",
-".+	c #FDB048",
-"++	c #FEB14A",
-"@+	c #FCD982",
-"#+	c #CCA86A",
-"$+	c #A36E35",
-"%+	c #ECD186",
-"&+	c #FBBC5D",
-"*+	c #FDB04B",
-"=+	c #FDB656",
-"-+	c #FEC272",
-";+	c #FCC982",
-">+	c #FDC983",
-",+	c #FEC678",
-"'+	c #FCB454",
-")+	c #FEB049",
-"!+	c #FEB14B",
-"~+	c #ECCF87",
-"{+	c #DEBF7A",
-"]+	c #FAC669",
-"^+	c #FDAF47",
-"/+	c #FEAF48",
-"(+	c #FFAF46",
-"_+	c #A16931",
-":+	c #E8CD82",
-"<+	c #FBBD5C",
-"[+	c #FDAF46",
-"}+	c #FEAE47",
-"|+	c #FEAF47",
-"1+	c #FEB85C",
-"2+	c #FDC371",
-"3+	c #FEB045",
-"4+	c #FEAF46",
-"5+	c #FEB046",
-"6+	c #A16C35",
-"7+	c #F9C568",
-"8+	c #FDAD45",
-"9+	c #FEAE44",
-"0+	c #FFAE44",
-"a+	c #FFAD44",
-"b+	c #FAD681",
-"c+	c #A8763A",
-"d+	c #E3C581",
-"e+	c #FBC05F",
-"f+	c #FEAD44",
-"g+	c #FEAE46",
-"h+	c #FFAE45",
-"i+	c #EBD087",
-"j+	c #AD773C",
-"k+	c #A36C33",
-"l+	c #DFBF7A",
-"m+	c #FBC465",
-"n+	c #FDAD41",
-"o+	c #FEAD41",
-"p+	c #FBD880",
-"q+	c #E5CD84",
-"r+	c #FCC362",
-"s+	c #FDAD42",
-"t+	c #EAD087",
-"u+	c #A26D34",
-"v+	c #DFC07A",
-"w+	c #FAC565",
-"x+	c #FEAB40",
-"y+	c #FEAC3F",
-"z+	c #FEAC3E",
-"A+	c #FEAC3D",
-"B+	c #FBD580",
-"C+	c #FBC565",
-"D+	c #EAD086",
-"E+	c #A36C32",
-"F+	c #E0C07A",
-"G+	c #FBC362",
-"H+	c #FDAB3C",
-"I+	c #FEAB3D",
-"J+	c #FFAB3E",
-"K+	c #FFAA3D",
-"L+	c #FBB44C",
-"M+	c #FBAA3A",
-"N+	c #FEAB3E",
-"O+	c #AC773F",
-"P+	c #A46C32",
-"Q+	c #E0C07B",
-"R+	c #F9C360",
-"S+	c #FDA93B",
-"T+	c #FEA93A",
-"U+	c #FFA93A",
-"V+	c #FEAA3A",
-"W+	c #FEAA39",
-"X+	c #FEA939",
-"Y+	c #FEA93B",
-"Z+	c #FBC15D",
-"`+	c #FDA937",
-" @	c #FEA937",
-".@	c #FEA936",
-"+@	c #FCAA38",
-"@@	c #FDA938",
-"#@	c #A46A32",
-"$@	c #DFC17B",
-"%@	c #FAC05B",
-"&@	c #FDA736",
-"*@	c #FEA735",
-"=@	c #FEA835",
-"-@	c #FCA832",
-";@	c #FBC05C",
-">@	c #FDC25C",
-",@	c #FEA734",
-"'@	c #FBAA37",
-")@	c #FBD074",
-"!@	c #FDAE3E",
-"~@	c #DFC27B",
-"{@	c #FBC058",
-"]@	c #FDA532",
-"^@	c #FDA632",
-"/@	c #FEA732",
-"(@	c #FDA732",
-"_@	c #FBBF5A",
-":@	c #F3E297",
-"<@	c #FCC35F",
-"[@	c #FDA633",
-"}@	c #FDA734",
-"|@	c #FACF75",
-"1@	c #F5E59C",
-"2@	c #FEA733",
-"3@	c #FCA62D",
-"4@	c #FEA531",
-"5@	c #FEA630",
-"6@	c #FEA530",
-"7@	c #FDA62E",
-"8@	c #FBBF58",
-"9@	c #DFC27C",
-"0@	c #BF9957",
-"a@	c #FEC25E",
-"b@	c #FDA62F",
-"c@	c #FEA631",
-"d@	c #FDA630",
-"e@	c #FACF71",
-"f@	c #C9A161",
-"g@	c #DABC77",
-"h@	c #FDAC3B",
-"i@	c #FBBD56",
-"j@	c #FEA32C",
-"k@	c #FDA42D",
-"l@	c #FEA52C",
-"m@	c #FDA52D",
-"n@	c #FBBE58",
-"o@	c #E0C27C",
-"p@	c #9D632B",
-"q@	c #BD9154",
-"r@	c #FEC15E",
-"s@	c #FEA52D",
-"t@	c #C8A160",
-"u@	c #9A5C27",
-"v@	c #D9BB77",
-"w@	c #FDAB3A",
-"x@	c #A46A35",
-"y@	c #DFC47C",
-"z@	c #FBBD57",
-"A@	c #FCA32A",
-"B@	c #FEA32B",
-"C@	c #FCA42A",
-"D@	c #E0C17B",
-"E@	c #C09759",
-"F@	c #BD9153",
-"G@	c #FEC15A",
-"H@	c #FDA32A",
-"I@	c #FDA42C",
-"J@	c #FACD70",
-"K@	c #C7A162",
-"L@	c #AB7B3F",
-"M@	c #B48248",
-"N@	c #DABB78",
-"O@	c #FDAA37",
-"P@	c #FBBB51",
-"Q@	c #FDA226",
-"R@	c #FEA228",
-"S@	c #FFA328",
-"T@	c #FBBC53",
-"U@	c #E1C17C",
-"V@	c #A26D33",
-"W@	c #BD9253",
-"X@	c #FEC059",
-"Y@	c #FDA229",
-"Z@	c #FDA32B",
-"`@	c #F9CE70",
-" #	c #C6A062",
-".#	c #AB7A3E",
-"+#	c #BB9154",
-"@#	c #DABA78",
-"##	c #FEAA36",
-"$#	c #A56A32",
-"%#	c #DFC37C",
-"&#	c #FBBB52",
-"*#	c #FDA125",
-"=#	c #FEA126",
-"-#	c #FEA026",
-";#	c #FFA026",
-">#	c #FDA027",
-",#	c #FBBC51",
-"'#	c #BC9153",
-")#	c #FEBF58",
-"!#	c #FEA125",
-"~#	c #FEA024",
-"{#	c #FACD6F",
-"]#	c #C6A061",
-"^#	c #AE7A3D",
-"/#	c #BB9054",
-"(#	c #D9BB79",
-"_#	c #FDA831",
-":#	c #A26A31",
-"<#	c #E0C37D",
-"[#	c #FAB84C",
-"}#	c #FD9F20",
-"|#	c #FE9F22",
-"1#	c #FF9F22",
-"2#	c #FE9F23",
-"3#	c #FBBC50",
-"4#	c #E0C17E",
-"5#	c #FEBE57",
-"6#	c #FDA024",
-"7#	c #FDA025",
-"8#	c #F9CD6F",
-"9#	c #C59F61",
-"0#	c #AB7A3C",
-"a#	c #BD9052",
-"b#	c #FDA830",
-"c#	c #E0C47D",
-"d#	c #FCBA4D",
-"e#	c #FC9E1F",
-"f#	c #FE9E21",
-"g#	c #FF9E22",
-"h#	c #FD9E1F",
-"i#	c #FBBB4D",
-"j#	c #FEBF53",
-"k#	c #FE9F1F",
-"l#	c #FCA024",
-"m#	c #FACC6B",
-"n#	c #C69F5F",
-"o#	c #BD9053",
-"p#	c #D9BB78",
-"q#	c #FEA62C",
-"r#	c #A16A31",
-"s#	c #E0C57E",
-"t#	c #FBB74B",
-"u#	c #FC9D1B",
-"v#	c #FE9D1D",
-"w#	c #FF9E1D",
-"x#	c #FE9E1E",
-"y#	c #FABB4C",
-"z#	c #E1C07C",
-"A#	c #BC9154",
-"B#	c #FDBE52",
-"C#	c #FD9D1E",
-"D#	c #FD9E20",
-"E#	c #F9CD6B",
-"F#	c #C69F60",
-"G#	c #AC7A3F",
-"H#	c #FEA62B",
-"I#	c #A36A32",
-"J#	c #E0C57C",
-"K#	c #FAB748",
-"L#	c #FE9B1B",
-"M#	c #FE9C1C",
-"N#	c #FF9C1C",
-"O#	c #FD9C1A",
-"P#	c #FABA4C",
-"Q#	c #FDBD50",
-"R#	c #F9CC6A",
-"S#	c #FDA527",
-"T#	c #A16A30",
-"U#	c #E1C67D",
-"V#	c #FAB645",
-"W#	c #FD9B17",
-"X#	c #FE9C19",
-"Y#	c #FE9B18",
-"Z#	c #FE9B19",
-"`#	c #FBB848",
-" $	c #E0BF7C",
-".$	c #FDBD53",
-"+$	c #F8CD6A",
-"@$	c #C79F60",
-"#$	c #AD7A3F",
-"$$	c #FCA426",
-"%$	c #FE9A18",
-"&$	c #FDA631",
-"*$	c #A36932",
-"=$	c #E2C57D",
-"-$	c #FAB644",
-";$	c #FD9A14",
-">$	c #FE9A17",
-",$	c #FC9A15",
-"'$	c #FAE290",
-")$	c #C59E5E",
-"!$	c #AF7A3E",
-"~$	c #BD9054",
-"{$	c #DABC7A",
-"]$	c #FDA224",
-"^$	c #A16930",
-"/$	c #E2C67D",
-"($	c #FAB342",
-"_$	c #FE9812",
-":$	c #FD9811",
-"<$	c #FF9A14",
-"[$	c #FE9914",
-"}$	c #FBB747",
-"|$	c #DFC07C",
-"1$	c #BB9052",
-"2$	c #C59D61",
-"3$	c #AC7B3B",
-"4$	c #FDA223",
-"5$	c #E2C886",
-"6$	c #FBE894",
-"7$	c #FAD97C",
-"8$	c #FCD97C",
-"9$	c #FCD97D",
-"0$	c #DEC07A",
-"a$	c #A26B31",
-"b$	c #9F602B",
-"c$	c #BE9052",
-"d$	c #D8BC79",
-"e$	c #A66F36",
-"f$	c #9F612A",
-"g$	c #985B24",
-"h$	c #995E26",
-"i$	c #9A5E26",
-"j$	c #9B5D27",
-"k$	c #9D5D28",
-"l$	c #9E672D",
-"m$	c #BE9054",
-"n$	c #975F26",
-"o$	c #985D25",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                  .                               +             ",
-"                                                                                @ #                             $ %             ",
-"                                                                              & * =                           - ; >             ",
-"                                                                            , ' ) !                         ~ { ] ^             ",
-"                                                                          / ( _ : <                       [ } | 1 ^             ",
-"                                                                        2 3 4 5 6 &                     7 8 9 0 a %             ",
-"                                                                      b c d e f g h                   i j k e e a l             ",
-"                                                                    @ m n o p p q r                 s t u v w x y %             ",
-"                                                                  b z A B C D C E r               F G H I J D D K L             ",
-"                                                                M N O P Q R Q Q S T             U V W P Q R Q X Y %             ",
-"                                                              & Z `  ...+.+.+.+.@.T           #.$.%.&.*.+.+.+.=.-.%             ",
-"                                                            ;.>.,.'.).!.~.{.].^./.(.        _.:.<.[.}.|.}.1.2.3.4.5.            ",
-"                                                          & 6.7.8.8.9.8.0.a.b.c.d.r       e.f.g.h.i.j.j.j.k.{.l.m.5.            ",
-"                                                        n.o.p.q.r.s.t.u.u.v.v.t.w.x.    y.z.A.h.B.C.C.C.D.E.F.v.G.H.            ",
-"                                                      & I.J.K.L.M.M.M.M.M.M.M.M.N.(.  O.P.Q.R.S.T.T.T.U.V.W.X.K.Y.H.            ",
-"                                                    Z.`. +.+++++++++++++++++++++@+h #+$+%+&+*+=+-+;+>+,+'+)+!+++~+%             ",
-"                                                  & {+]+^+/+(+(+(+(+(+(+(+(+(+(+@+Z._+:+<+[+}+|+/+1+2+8.3+4+(+5+~+%             ",
-"                                                6+{+7+8+9+9+0+0+0+0+0+0+0+0+0+a+b+c+d+e+9+9+0+9+9+f+g+f+h+9+0+9+i+j+            ",
-"                                              k+l+m+n+n+o+o+o+o+o+o+o+o+o+o+o+o+p+q+r+s+o+o+o+o+o+o+o+o+o+o+o+s+t+j+            ",
-"                                            u+v+w+x+y+z+z+z+z+z+z+z+z+z+z+z+z+A+B+C+y+y+z+z+z+z+z+z+z+z+z+z+z+y+D+L             ",
-"                                          E+F+G+H+I+J+J+J+J+J+J+J+J+J+J+J+J+J+K+L+M+J+J+J+J+J+J+J+J+J+J+J+J+J+N+D+O+            ",
-"                                        P+Q+R+S+T+T+U+U+U+U+U+U+U+V+W+X+U+U+U+U+X+T+U+U+U+T+X+W+U+U+U+U+U+U+U+Y+Y.H.            ",
-"                                      E+Q+Z+`+ @.@.@.@.@.@.@.@.@.@.@+@ @.@.@.@.@.@.@.@.@.@.@@@ @.@.@.@.@.@.@.@ @y %             ",
-"                                    #@$@%@&@*@=@=@=@=@=@=@=@=@=@-@;@>@,@=@=@=@=@=@=@=@=@*@'@)@!@=@=@=@=@=@=@=@*@K L             ",
-"                                  / ~@{@]@^@/@/@/@/@/@/@/@/@/@(@_@:@<@[@/@/@/@/@/@/@/@(@}@|@1@!@/@/@/@/@/@/@/@2@Y %             ",
-"                                [ ~@_@3@4@5@5@5@5@5@5@5@5@6@7@8@9@0@a@b@5@5@5@5@5@c@d@2@e@f@g@h@5@5@5@5@5@5@5@d@-.%             ",
-"                              [ ~@i@j@k@l@l@l@l@l@l@l@l@l@m@n@o@p@q@r@m@l@l@l@l@l@s@7@e@t@u@v@w@l@l@l@l@l@l@l@/@4.5.            ",
-"                            x@y@z@A@B@B@B@B@B@B@B@B@B@B@C@i@D@& E@F@G@H@B@B@B@B@H@I@J@K@L@M@N@O@B@B@B@B@B@B@B@/@m.5.            ",
-"                          [ y@P@Q@R@S@S@S@S@S@S@S@S@S@R@T@U@V@    W@X@Y@S@S@S@R@Z@`@ #.#  +#@###S@S@S@S@S@S@/@/@G.H.            ",
-"                        $#%#&#*#=#-#;#;#;#;#;#;#;#-#>#,#Q+&       '#)#!#;#=#~#H@{#]#^#    /#(#_#;#;#;#;#;#;#/@/@Y.H.            ",
-"                      :#<#[#}#|#1#1#1#1#1#1#1#1#1#2#3#4#&         F@5#6#1#|#7#8#9#0#      a#(#b#1#1#1#1#1#/@/@/@~+%             ",
-"                    :#c#d#e#f#f#g#g#g#g#g#g#g#f#h#i#F+&           q@j#}#k#l#m#n#^#        o#p#q#g#g#g#g#g#/@/@/@~+%             ",
-"                  r#s#t#u#v#w#w#w#w#w#w#w#w#w#x#y#z#V@            A#B#C#D#E#F#G#          o#p#H#w#w#w#w#W+/@/@/@i+j+            ",
-"                I#J#K#L#M#M#N#N#N#N#N#N#N#L#O#P#F+&               '#Q#e#R#e.^#            o#p#S#N#N#N#N#5@/@/@/@t+j+            ",
-"              T#U#V#W#X#Y#Y#Y#Y#Y#Y#Y#Y#Y#Z#`# $b                 '#.$+$@$#$              o#p#$$Y#%$Y#&$5@/@/@/@D+L             ",
-"            *$=$-$;$%$%$%$%$%$%$%$%$%$>$,$`#F+/                   A#'$)$!$                ~${$]$%$%$%$/@/@/@/@/@D+O+            ",
-"          ^$/$($_$:$<$<$<$<$<$<$<$<$<$[$}$|$/                     1$2$3$                  ~${$4$<$<$<$/@/@/@/@/@Y.H.            ",
-"        _+5$6$7$8$8$8$8$8$8$8$8$8$8$8$9$0$a$                      b$!$                    c$d$8$8$8$8$8$8$8$8$8$9$e$            ",
-"      f$g$h$i$j$k$k$k$k$k$k$k$k$k$k$k$k$l$                        #$                      m$n$k$k$k$k$k$k$k$k$k$k$o$            ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                "};
diff --git a/games/mame/desktop/ume.desktop b/games/mame/desktop/ume.desktop
deleted file mode 100644
index e00340a5d0..0000000000
--- a/games/mame/desktop/ume.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=UME
-Comment=UME Universal Machine Emulator
-Exec=/usr/games/ume
-Icon=ume
-Terminal=false
-Type=Application
-Categories=Game;
diff --git a/games/mame/desktop/ume.xpm b/games/mame/desktop/ume.xpm
deleted file mode 100644
index 50df1baedb..0000000000
--- a/games/mame/desktop/ume.xpm
+++ /dev/null
@@ -1,1918 +0,0 @@
-/* XPM */
-static char * ume_xpm[] = {
-"256 256 1659 2",
-"  	c None",
-". 	c #2D94B5",
-"+ 	c #FFD095",
-"@ 	c #429EBD",
-"# 	c #449FBD",
-"$ 	c #FFCD8F",
-"% 	c #FFD5A1",
-"& 	c #3E9DBC",
-"* 	c #57A9C5",
-"= 	c #3E9CBB",
-"- 	c #FFCE8F",
-"; 	c #FFD29A",
-"> 	c #FFD49E",
-", 	c #54A8C4",
-"' 	c #52A7C3",
-") 	c #3F9DBB",
-"! 	c #FFCD8E",
-"~ 	c #FFD29B",
-"{ 	c #FFD097",
-"] 	c #FFD49F",
-"^ 	c #54A9C4",
-"/ 	c #4EA5C2",
-"( 	c #53A7C3",
-"_ 	c #FFCC8E",
-": 	c #FFD299",
-"< 	c #FFD198",
-"[ 	c #FFD098",
-"} 	c #3E9EBD",
-"| 	c #4EA6C2",
-"1 	c #4FA5C2",
-"2 	c #FFCC8D",
-"3 	c #FFD19A",
-"4 	c #3D9EBD",
-"5 	c #4FA6C2",
-"6 	c #FFD199",
-"7 	c #FFD197",
-"8 	c #3E9FBE",
-"9 	c #55AAC5",
-"0 	c #FFCB8C",
-"a 	c #FFD096",
-"b 	c #3D9FBE",
-"c 	c #54AAC6",
-"d 	c #4EA7C3",
-"e 	c #4FA7C3",
-"f 	c #FFCB8B",
-"g 	c #3C9FBE",
-"h 	c #55ABC6",
-"i 	c #4EA8C4",
-"j 	c #4FA8C4",
-"k 	c #FFCA8A",
-"l 	c #3C9FBF",
-"m 	c #55AAC6",
-"n 	c #FFCA89",
-"o 	c #FFCF94",
-"p 	c #3A9FBE",
-"q 	c #56ACC7",
-"r 	c #4EA7C4",
-"s 	c #FFCF93",
-"t 	c #FFCF95",
-"u 	c #3AA0BF",
-"v 	c #56ADC7",
-"w 	c #FFCA88",
-"x 	c #FFCF96",
-"y 	c #56ADC8",
-"z 	c #4EA9C5",
-"A 	c #4FA9C5",
-"B 	c #FFC988",
-"C 	c #FFCE93",
-"D 	c #39A0BF",
-"E 	c #56AEC8",
-"F 	c #FFC987",
-"G 	c #FFCE92",
-"H 	c #41A4C1",
-"I 	c #54ADC8",
-"J 	c #4EAAC6",
-"K 	c #4FAAC6",
-"L 	c #FFC986",
-"M 	c #FFCD91",
-"N 	c #49A7C5",
-"O 	c #50AAC6",
-"P 	c #FFCD90",
-"Q 	c #48A7C5",
-"R 	c #51ABC6",
-"S 	c #51ABC7",
-"T 	c #FFC884",
-"U 	c #48A8C6",
-"V 	c #4FABC7",
-"W 	c #52ACC7",
-"X 	c #48A9C6",
-"Y 	c #4FACC7",
-"Z 	c #52ACC8",
-"` 	c #50ABC7",
-" .	c #FFC784",
-"..	c #FFCE91",
-"+.	c #4FACC8",
-"@.	c #52ADC8",
-"#.	c #FFC783",
-"$.	c #52ADC9",
-"%.	c #50ACC8",
-"&.	c #FFC682",
-"*.	c #52AECA",
-"=.	c #FFCC8F",
-"-.	c #47A9C7",
-";.	c #4FADC8",
-">.	c #52AEC9",
-",.	c #50ADC9",
-"'.	c #FFC681",
-").	c #48AAC7",
-"!.	c #4FADC9",
-"~.	c #FFC680",
-"{.	c #47AAC8",
-"].	c #4FAEC9",
-"^.	c #FFC67F",
-"/.	c #4FAECA",
-"(.	c #52AFCA",
-"_.	c #FFC57F",
-":.	c #47ABC8",
-"<.	c #52AFCB",
-"[.	c #50AECA",
-"}.	c #FFC57E",
-"|.	c #FFCC8C",
-"1.	c #FFCB8A",
-"2.	c #4FAFCA",
-"3.	c #52B0CC",
-"4.	c #52B0CB",
-"5.	c #50AFCB",
-"6.	c #FFC47C",
-"7.	c #FFCB89",
-"8.	c #46ACC9",
-"9.	c #4FB0CB",
-"0.	c #47ACCA",
-"a.	c #4FB0CC",
-"b.	c #52B1CC",
-"c.	c #FFC37A",
-"d.	c #FFCA87",
-"e.	c #46ACCA",
-"f.	c #52B1CD",
-"g.	c #50B0CC",
-"h.	c #FFC47A",
-"i.	c #46ADCA",
-"j.	c #4FB1CD",
-"k.	c #52B2CD",
-"l.	c #FFC379",
-"m.	c #46ADCB",
-"n.	c #50B1CD",
-"o.	c #FFC985",
-"p.	c #FFC278",
-"q.	c #FFC989",
-"r.	c #45AECB",
-"s.	c #4FB2CE",
-"t.	c #FFC277",
-"u.	c #FFC885",
-"v.	c #46AECC",
-"w.	c #52B3CE",
-"x.	c #FFC176",
-"y.	c #47AECC",
-"z.	c #50B2CE",
-"A.	c #52B3CF",
-"B.	c #FFC175",
-"C.	c #FFC883",
-"D.	c #46AFCD",
-"E.	c #50B3CF",
-"F.	c #52B4CF",
-"G.	c #FFC782",
-"H.	c #46AFCC",
-"I.	c #50B4CF",
-"J.	c #53B4D0",
-"K.	c #51B3CF",
-"L.	c #FFC074",
-"M.	c #FFC886",
-"N.	c #50B4D0",
-"O.	c #53B5D0",
-"P.	c #FFC073",
-"Q.	c #FFC785",
-"R.	c #51B4D0",
-"S.	c #FFBF71",
-"T.	c #46B0CE",
-"U.	c #FFC070",
-"V.	c #50B5D0",
-"W.	c #53B5D1",
-"X.	c #FFBF70",
-"Y.	c #45B1CF",
-"Z.	c #50B5D1",
-"`.	c #53B6D1",
-" +	c #FFBF6F",
-".+	c #46B1CF",
-"++	c #50B6D2",
-"@+	c #51B5D1",
-"#+	c #FFBC69",
-"$+	c #FFC67E",
-"%+	c #53B7D2",
-"&+	c #51B6D2",
-"*+	c #FFC47B",
-"=+	c #44B1CF",
-"-+	c #50B6D1",
-";+	c #FFC276",
-">+	c #FFC37B",
-",+	c #44B2D0",
-"'+	c #FFC275",
-")+	c #FFC57D",
-"!+	c #45B2D1",
-"~+	c #50B7D3",
-"{+	c #53B7D3",
-"]+	c #FFC47D",
-"^+	c #44B3D1",
-"/+	c #53B8D3",
-"(+	c #44B2D1",
-"_+	c #50B8D4",
-":+	c #53B8D4",
-"<+	c #51B7D3",
-"[+	c #FFC174",
-"}+	c #43B3D1",
-"|+	c #53B9D4",
-"1+	c #FFC378",
-"2+	c #FFC57C",
-"3+	c #51B8D4",
-"4+	c #FFC173",
-"5+	c #42B3D2",
-"6+	c #FFC072",
-"7+	c #43B4D2",
-"8+	c #50B9D5",
-"9+	c #53B9D5",
-"0+	c #FFC071",
-"a+	c #FFC479",
-"b+	c #41B4D2",
-"c+	c #52BAD5",
-"d+	c #FED39E",
-"e+	c #42B4D3",
-"f+	c #50BAD6",
-"g+	c #53BAD6",
-"h+	c #51B9D5",
-"i+	c #FED098",
-"j+	c #FFD69E",
-"k+	c #43B5D3",
-"l+	c #53BBD6",
-"m+	c #51B8D3",
-"n+	c #52B6D3",
-"o+	c #52B6D2",
-"p+	c #53B6D2",
-"q+	c #52B5D1",
-"r+	c #52B4D0",
-"s+	c #50B3D0",
-"t+	c #50B2CF",
-"u+	c #FDD098",
-"v+	c #FFD497",
-"w+	c #E3CAA2",
-"x+	c #3EB3D2",
-"y+	c #50BBD6",
-"z+	c #52BBD6",
-"A+	c #50B9D6",
-"B+	c #54B9D5",
-"C+	c #57BAD5",
-"D+	c #56BAD5",
-"E+	c #50B6D3",
-"F+	c #4FB5D2",
-"G+	c #4CB4D1",
-"H+	c #49B3D0",
-"I+	c #47B2CF",
-"J+	c #49B1CF",
-"K+	c #4CB2CF",
-"L+	c #4EB3CF",
-"M+	c #56B6D1",
-"N+	c #57B6D1",
-"O+	c #54B4D0",
-"P+	c #51B3CE",
-"Q+	c #FDCF97",
-"R+	c #FFD597",
-"S+	c #DDC59D",
-"T+	c #6598AE",
-"U+	c #3FB4D3",
-"V+	c #50BBD7",
-"W+	c #52BCD7",
-"X+	c #56BCD7",
-"Y+	c #55BBD6",
-"Z+	c #48B6D3",
-"`+	c #3CB0CF",
-" @	c #30AACC",
-".@	c #25A6C9",
-"+@	c #1CA2C6",
-"@@	c #159EC4",
-"#@	c #0E9BC2",
-"$@	c #0999C0",
-"%@	c #0998C0",
-"&@	c #0897BF",
-"*@	c #0996BE",
-"=@	c #0C98BE",
-"-@	c #149ABF",
-";@	c #1C9DC1",
-">@	c #26A1C4",
-",@	c #31A6C6",
-"'@	c #40ACCA",
-")@	c #4CB0CD",
-"!@	c #56B3CF",
-"~@	c #4FB0CD",
-"{@	c #FFBE6E",
-"]@	c #FFC377",
-"^@	c #FFD496",
-"/@	c #E2C79D",
-"(@	c #5A92A9",
-"_@	c #4E8FAD",
-":@	c #3FB5D4",
-"<@	c #54BCD8",
-"[@	c #57BED8",
-"}@	c #51BBD7",
-"|@	c #47B6D4",
-"1@	c #35AFCF",
-"2@	c #24A8CB",
-"3@	c #14A0C7",
-"4@	c #089BC3",
-"5@	c #0599C2",
-"6@	c #0197C0",
-"7@	c #0097C0",
-"8@	c #0297C0",
-"9@	c #0397BF",
-"0@	c #0597BF",
-"a@	c #0597BE",
-"b@	c #0596BE",
-"c@	c #0595BD",
-"d@	c #0593BC",
-"e@	c #0392BA",
-"f@	c #0291BA",
-"g@	c #0090BA",
-"h@	c #0290B9",
-"i@	c #0691BA",
-"j@	c #0B93BB",
-"k@	c #1C9BBF",
-"l@	c #30A3C5",
-"m@	c #45ADCA",
-"n@	c #52B2CE",
-"o@	c #55B3CF",
-"p@	c #51B1CC",
-"q@	c #4FAFCC",
-"r@	c #FFD396",
-"s@	c #E3C79D",
-"t@	c #5F95AA",
-"u@	c #4488A8",
-"v@	c #5893AD",
-"w@	c #37B2D2",
-"x@	c #51BCD8",
-"y@	c #43B6D4",
-"z@	c #2CACCE",
-"A@	c #17A3C9",
-"B@	c #089DC5",
-"C@	c #029BC4",
-"D@	c #0199C2",
-"E@	c #049AC2",
-"F@	c #059BC2",
-"G@	c #069AC2",
-"H@	c #079AC1",
-"I@	c #0798C0",
-"J@	c #0697BF",
-"K@	c #0696BE",
-"L@	c #0695BD",
-"M@	c #0694BC",
-"N@	c #0793BB",
-"O@	c #0794BB",
-"P@	c #0793BA",
-"Q@	c #0692BA",
-"R@	c #0491B9",
-"S@	c #018FB8",
-"T@	c #018EB7",
-"U@	c #0791B8",
-"V@	c #1998BD",
-"W@	c #33A4C4",
-"X@	c #4CAECB",
-"Y@	c #55B2CE",
-"Z@	c #4FAECB",
-"`@	c #FFBE6D",
-" #	c #FDCF96",
-".#	c #FFD395",
-"+#	c #E4C89D",
-"@#	c #5F96AA",
-"##	c #478BAA",
-"$#	c #4D8DA8",
-"%#	c #5592AD",
-"&#	c #25ABCE",
-"*#	c #2FAFD0",
-"=#	c #16A5CA",
-"-#	c #069EC6",
-";#	c #049CC4",
-">#	c #069CC4",
-",#	c #079CC4",
-"'#	c #079CC3",
-")#	c #079BC3",
-"!#	c #069BC3",
-"~#	c #0699C1",
-"{#	c #0698C0",
-"]#	c #0693BB",
-"^#	c #0591B9",
-"/#	c #0691B9",
-"(#	c #0691B8",
-"_#	c #0590B8",
-":#	c #018DB6",
-"<#	c #0D92B9",
-"[#	c #299EC1",
-"}#	c #48ABC9",
-"|#	c #55B1CD",
-"1#	c #4FAFCB",
-"2#	c #FFBD6C",
-"3#	c #FDCF95",
-"4#	c #E5C99C",
-"5#	c #6197AA",
-"6#	c #468BAA",
-"7#	c #508FAA",
-"8#	c #4A8BA8",
-"9#	c #079EC7",
-"0#	c #0AA0C8",
-"a#	c #039EC6",
-"b#	c #049DC6",
-"c#	c #079EC6",
-"d#	c #0690B8",
-"e#	c #068FB7",
-"f#	c #038EB6",
-"g#	c #008CB5",
-"h#	c #098FB6",
-"i#	c #279DBF",
-"j#	c #49ACC9",
-"k#	c #55B1CC",
-"l#	c #51AFCB",
-"m#	c #4FADCA",
-"n#	c #409CBA",
-"o#	c #FBBB6A",
-"p#	c #FFBF72",
-"q#	c #FFD393",
-"r#	c #E6C99B",
-"s#	c #6297AA",
-"t#	c #4D8EAA",
-"u#	c #4B8BA8",
-"v#	c #059DC6",
-"w#	c #059FC7",
-"x#	c #08A0C8",
-"y#	c #089FC7",
-"z#	c #079DC5",
-"A#	c #058FB7",
-"B#	c #058EB6",
-"C#	c #068EB6",
-"D#	c #048DB5",
-"E#	c #008BB4",
-"F#	c #0A8FB6",
-"G#	c #2D9EC0",
-"H#	c #4EADCA",
-"I#	c #54B0CB",
-"J#	c #54A6C1",
-"K#	c #3C9FC3",
-"L#	c #FFC470",
-"M#	c #FCBE70",
-"N#	c #FDCE95",
-"O#	c #E8C99B",
-"P#	c #6498AA",
-"Q#	c #458BAA",
-"R#	c #4E8EAA",
-"S#	c #46B6D5",
-"T#	c #009BC5",
-"U#	c #0BA2C9",
-"V#	c #079FC7",
-"W#	c #058DB5",
-"X#	c #068DB5",
-"Y#	c #048CB4",
-"Z#	c #008AB2",
-"`#	c #1191B7",
-" $	c #3AA4C4",
-".$	c #54AFCB",
-"+$	c #52ADCA",
-"@$	c #4FACC9",
-"#$	c #52A6C1",
-"$$	c #48A4C4",
-"%$	c #62AABC",
-"&$	c #E8B976",
-"*$	c #FEC074",
-"=$	c #FDCE94",
-"-$	c #FFD193",
-";$	c #E9CA9B",
-">$	c #6599AB",
-",$	c #448BAA",
-"'$	c #4EBBD8",
-")$	c #07A0C8",
-"!$	c #068DB4",
-"~$	c #028AB3",
-"{$	c #038AB3",
-"]$	c #2198BB",
-"^$	c #4BAAC7",
-"/$	c #5FA9BE",
-"($	c #E3BD81",
-"_$	c #FFC06F",
-":$	c #FEBF73",
-"<$	c #FDCE93",
-"[$	c #FFD192",
-"}$	c #EBCA9A",
-"|$	c #689AAB",
-"1$	c #448BAB",
-"2$	c #4FBCD9",
-"3$	c #009AC5",
-"4$	c #0BA3CA",
-"5$	c #058CB4",
-"6$	c #068CB4",
-"7$	c #058BB3",
-"8$	c #0088B1",
-"9$	c #0D8EB4",
-"0$	c #39A3C2",
-"a$	c #54AFCA",
-"b$	c #51ADC9",
-"c$	c #4FA6C3",
-"d$	c #51A6C1",
-"e$	c #48A5C4",
-"f$	c #5EA9BE",
-"g$	c #E1BD81",
-"h$	c #FFC06B",
-"i$	c #FDBF73",
-"j$	c #FFCD92",
-"k$	c #FDCD93",
-"l$	c #FFD191",
-"m$	c #ECCB98",
-"n$	c #6A9BAB",
-"o$	c #448CAC",
-"p$	c #5090AB",
-"q$	c #009AC6",
-"r$	c #0CA3CA",
-"s$	c #07A1C9",
-"t$	c #068BB3",
-"u$	c #0389B1",
-"v$	c #0289B1",
-"w$	c #2599BB",
-"x$	c #53ADC9",
-"y$	c #51A7C1",
-"z$	c #49A5C4",
-"A$	c #5CA9BE",
-"B$	c #E0BD81",
-"C$	c #FDBF72",
-"D$	c #FDCD92",
-"E$	c #FFD091",
-"F$	c #EECC98",
-"G$	c #6B9CAB",
-"H$	c #438CAD",
-"I$	c #5091AB",
-"J$	c #4D8FAB",
-"K$	c #4FBDDA",
-"L$	c #009BC6",
-"M$	c #0CA4CB",
-"N$	c #068AB2",
-"O$	c #058AB2",
-"P$	c #0087B0",
-"Q$	c #138FB5",
-"R$	c #44A7C4",
-"S$	c #55AEC9",
-"T$	c #4FAAC7",
-"U$	c #51A7C2",
-"V$	c #4AA5C4",
-"W$	c #5BA8BF",
-"X$	c #DFBC81",
-"Y$	c #FDBF71",
-"Z$	c #FFD090",
-"`$	c #EFCB97",
-" %	c #6C9CAB",
-".%	c #5091AC",
-"+%	c #4D8FAC",
-"@%	c #009CC7",
-"#%	c #0CA5CC",
-"$%	c #07A2CA",
-"%%	c #0689B1",
-"&%	c #0287B0",
-"*%	c #0889B1",
-"=%	c #359FC0",
-"-%	c #55ADC8",
-";%	c #51A8C3",
-">%	c #4AA6C5",
-",%	c #5AA9C0",
-"'%	c #DDBB82",
-")%	c #FFC06A",
-"!%	c #FDCC91",
-"~%	c #FFCF90",
-"{%	c #F0CC96",
-"]%	c #6E9DAB",
-"^%	c #428CAE",
-"/%	c #4D90AC",
-"(%	c #0589B1",
-"_%	c #0487AF",
-":%	c #0286AF",
-"<%	c #2697BA",
-"[%	c #50ABC6",
-"}%	c #4EA9C6",
-"|%	c #4AA7C6",
-"1%	c #59A9C1",
-"2%	c #DCBB82",
-"3%	c #FFBF69",
-"4%	c #FDBF70",
-"5%	c #FDCC90",
-"6%	c #F2CC96",
-"7%	c #709EAB",
-"8%	c #5091AD",
-"9%	c #009DC7",
-"0%	c #07A3CB",
-"a%	c #0588B0",
-"b%	c #0688B0",
-"c%	c #0084AD",
-"d%	c #178FB5",
-"e%	c #49A7C4",
-"f%	c #53ACC7",
-"g%	c #4DAAC6",
-"h%	c #57AAC3",
-"i%	c #DABB82",
-"j%	c #FFBF67",
-"k%	c #FFCE8E",
-"l%	c #F3CC95",
-"m%	c #719FAB",
-"n%	c #428DAE",
-"o%	c #4D90AD",
-"p%	c #009DC8",
-"q%	c #0CA6CD",
-"r%	c #0588AF",
-"s%	c #0787AF",
-"t%	c #0184AD",
-"u%	c #0D8AB1",
-"v%	c #3FA3C1",
-"w%	c #54ACC8",
-"x%	c #56AAC3",
-"y%	c #D9BB83",
-"z%	c #FFC067",
-"A%	c #FCBE6F",
-"B%	c #FECC8F",
-"C%	c #F4CC94",
-"D%	c #739FAB",
-"E%	c #5192AD",
-"F%	c #009EC9",
-"G%	c #0587AF",
-"H%	c #0285AD",
-"I%	c #0586AE",
-"J%	c #339CBD",
-"K%	c #53ACC6",
-"L%	c #51A9C3",
-"M%	c #4BA7C6",
-"N%	c #55AAC3",
-"O%	c #D8BB83",
-"P%	c #FFBE67",
-"Q%	c #FCBE6E",
-"R%	c #FFBE6F",
-"S%	c #FECD8F",
-"T%	c #F5CD93",
-"U%	c #75A0AB",
-"V%	c #418EAF",
-"W%	c #4D91AD",
-"X%	c #0CA7CE",
-"Y%	c #07A4CC",
-"Z%	c #07A4CB",
-"`%	c #0486AE",
-" &	c #0385AD",
-".&	c #0183AC",
-"+&	c #2695B9",
-"@&	c #54AAC5",
-"#&	c #4DA8C6",
-"$&	c #54A9C3",
-"%&	c #D7BB83",
-"&&	c #FFBF66",
-"*&	c #FCBD6E",
-"=&	c #FECC8E",
-"-&	c #FFCE8D",
-";&	c #F6CD93",
-">&	c #76A1AB",
-",&	c #418EB0",
-"'&	c #5193AE",
-")&	c #009FCA",
-"!&	c #07A5CD",
-"~&	c #0486AD",
-"{&	c #0282AA",
-"]&	c #178EB6",
-"^&	c #4CA8C6",
-"/&	c #D6BB85",
-"(&	c #FFBE64",
-"_&	c #FFBD6D",
-":&	c #FDCB8E",
-"<&	c #FFCD8D",
-"[&	c #F7CD92",
-"}&	c #77A2AB",
-"|&	c #418FB1",
-"1&	c #5194AE",
-"2&	c #4D92AE",
-"3&	c #0CA8CF",
-"4&	c #0685AB",
-"5&	c #0285AF",
-"6&	c #0A82A9",
-"7&	c #C09F56",
-"8&	c #FFBA59",
-"9&	c #FBBE71",
-"0&	c #FFBD6B",
-"a&	c #FDCB8D",
-"b&	c #F8CD91",
-"c&	c #79A3AA",
-"d&	c #5194AF",
-"e&	c #4D92AF",
-"f&	c #00A0CB",
-"g&	c #07A6CE",
-"h&	c #0587AE",
-"i&	c #0686AC",
-"j&	c #0285B0",
-"k&	c #0B85AC",
-"l&	c #BD994B",
-"m&	c #FFA11F",
-"n&	c #FBA131",
-"o&	c #FFB459",
-"p&	c #FECB8C",
-"q&	c #FFCD8C",
-"r&	c #F9CD91",
-"s&	c #7AA3AA",
-"t&	c #408FB1",
-"u&	c #4D93AF",
-"v&	c #0CA9CF",
-"w&	c #0286B0",
-"x&	c #0A85AD",
-"y&	c #BB984B",
-"z&	c #FFA120",
-"A&	c #FBA02E",
-"B&	c #FF9F2A",
-"C&	c #FFA02B",
-"D&	c #FFB04E",
-"E&	c #FFBF6E",
-"F&	c #FECA8C",
-"G&	c #FFCC8B",
-"H&	c #FACD90",
-"I&	c #7DA4AA",
-"J&	c #00A1CC",
-"K&	c #0CA9D0",
-"L&	c #0787AD",
-"M&	c #0986AF",
-"N&	c #B9984B",
-"O&	c #FB9F2C",
-"P&	c #FFA02C",
-"Q&	c #FF9F29",
-"R&	c #FFAA43",
-"S&	c #FFBD6A",
-"T&	c #FECC8B",
-"U&	c #FACC8F",
-"V&	c #7EA4AA",
-"W&	c #4290B2",
-"X&	c #00A2CC",
-"Y&	c #07A7CF",
-"Z&	c #0587B0",
-"`&	c #0386B0",
-" *	c #0886AF",
-".*	c #B8984C",
-"+*	c #FB9F2B",
-"@*	c #FFA02A",
-"#*	c #FFA12D",
-"$*	c #FFA12E",
-"%*	c #FFA739",
-"&*	c #FFB963",
-"**	c #FECB8B",
-"=*	c #FECC8A",
-"-*	c #FBCD8E",
-";*	c #7FA5AA",
-">*	c #4190B2",
-",*	c #5295B0",
-"'*	c #00A2CD",
-")*	c #0DAAD1",
-"!*	c #0788AE",
-"~*	c #0387B1",
-"{*	c #0786B0",
-"]*	c #B6974C",
-"^*	c #FFA01E",
-"/*	c #FFA12F",
-"(*	c #FFA12C",
-"_*	c #FFA331",
-":*	c #FFB457",
-"<*	c #FECB8A",
-"[*	c #FBCD8D",
-"}*	c #81A5AA",
-"|*	c #4191B3",
-"1*	c #4E94B0",
-"2*	c #0DABD2",
-"3*	c #08A8D0",
-"4*	c #08A7CF",
-"5*	c #0588B1",
-"6*	c #0487B1",
-"7*	c #0786B1",
-"8*	c #B5984C",
-"9*	c #FFA01C",
-"0*	c #FB9E2A",
-"a*	c #FF9F28",
-"b*	c #FFA230",
-"c*	c #FFA02D",
-"d*	c #FFAE49",
-"e*	c #FECA89",
-"f*	c #FECC89",
-"g*	c #FCCD8D",
-"h*	c #82A6A9",
-"i*	c #5296B0",
-"j*	c #00A3CD",
-"k*	c #08A9D1",
-"l*	c #0789AF",
-"m*	c #0488B2",
-"n*	c #0687B2",
-"o*	c #B3974D",
-"p*	c #FB9E29",
-"q*	c #FF9E28",
-"r*	c #FFA22F",
-"s*	c #FFA231",
-"t*	c #FFA83D",
-"u*	c #FFB964",
-"v*	c #FFC075",
-"w*	c #FEC989",
-"x*	c #FECB88",
-"y*	c #FDCD8C",
-"z*	c #83A6A9",
-"A*	c #4E95B1",
-"B*	c #00A3CE",
-"C*	c #0789B0",
-"D*	c #0688B3",
-"E*	c #B2974D",
-"F*	c #FF9F1B",
-"G*	c #FF9E26",
-"H*	c #FFA332",
-"I*	c #FFA333",
-"J*	c #FFB354",
-"K*	c #FFBF73",
-"L*	c #FECA88",
-"M*	c #FDCC8B",
-"N*	c #85A7A9",
-"O*	c #4191B4",
-"P*	c #00A4CF",
-"Q*	c #0DACD3",
-"R*	c #078AB1",
-"S*	c #0489B3",
-"T*	c #0588B4",
-"U*	c #AF964F",
-"V*	c #FF9E19",
-"W*	c #FB9D28",
-"X*	c #FFAB44",
-"Y*	c #FFBB68",
-"Z*	c #FEC988",
-"`*	c #86A8A9",
-" =	c #4192B4",
-".=	c #00A5CF",
-"+=	c #0DACD4",
-"@=	c #08AAD2",
-"#=	c #048AB4",
-"$=	c #0489B5",
-"%=	c #AD964F",
-"&=	c #FB9D27",
-"*=	c #FF9D25",
-"==	c #FFA434",
-"-=	c #FFA232",
-";=	c #FFA536",
-">=	c #FFB355",
-",=	c #FEC987",
-"'=	c #FECA87",
-")=	c #88A8A9",
-"!=	c #4193B5",
-"~=	c #5196B0",
-"{=	c #00A5D0",
-"]=	c #0DADD4",
-"^=	c #078BB1",
-"/=	c #058AB3",
-"(=	c #048AB6",
-"_=	c #AB9650",
-":=	c #FF9D18",
-"<=	c #FB9C26",
-"[=	c #FF9D24",
-"}=	c #FFA433",
-"|=	c #FFA435",
-"1=	c #FFAA41",
-"2=	c #FFB962",
-"3=	c #FFC274",
-"4=	c #FEC986",
-"5=	c #FECC88",
-"6=	c #89A9A8",
-"7=	c #4193B6",
-"8=	c #5197B1",
-"9=	c #4E95B2",
-"0=	c #08ABD3",
-"a=	c #058BB4",
-"b=	c #078BB2",
-"c=	c #038AB6",
-"d=	c #A99652",
-"e=	c #FB9C25",
-"f=	c #FFA537",
-"g=	c #FFAE4C",
-"h=	c #FFBC6A",
-"i=	c #FFCC87",
-"j=	c #8AAAA8",
-"k=	c #4194B6",
-"l=	c #5198B2",
-"m=	c #4E96B2",
-"n=	c #498AA7",
-"o=	c #5591AD",
-"p=	c #0DAED5",
-"q=	c #078CB3",
-"r=	c #028AB7",
-"s=	c #A69551",
-"t=	c #FF9D17",
-"u=	c #FF9C22",
-"v=	c #FFA638",
-"w=	c #FFA535",
-"x=	c #FFA73A",
-"y=	c #FFB252",
-"z=	c #FEC985",
-"A=	c #FFCB87",
-"B=	c #8CAAA8",
-"C=	c #4E97B3",
-"D=	c #4D8DAA",
-"E=	c #4C8DA9",
-"F=	c #4C8EAA",
-"G=	c #4F8FAB",
-"H=	c #5793AE",
-"I=	c #00A6D2",
-"J=	c #08ACD4",
-"K=	c #08ACD3",
-"L=	c #058CB5",
-"M=	c #068BB4",
-"N=	c #018AB8",
-"O=	c #A49554",
-"P=	c #FF9C15",
-"Q=	c #FB9B24",
-"R=	c #FFA63A",
-"S=	c #FFA639",
-"T=	c #FFB253",
-"U=	c #FDC985",
-"V=	c #FFCB86",
-"W=	c #8DAAA7",
-"X=	c #4194B7",
-"Y=	c #4C8FAB",
-"Z=	c #4D8FAA",
-"`=	c #5391AD",
-" -	c #4F90AB",
-".-	c #4488A5",
-"+-	c #2B7799",
-"@-	c #257395",
-"#-	c #00A7D2",
-"$-	c #0DAFD6",
-"%-	c #078DB4",
-"&-	c #068CB5",
-"*-	c #018BB9",
-"=-	c #A29555",
-"--	c #FB9B23",
-";-	c #FF9C21",
-">-	c #FFA637",
-",-	c #FFA73B",
-"'-	c #FFA538",
-")-	c #FFA93E",
-"!-	c #FFB151",
-"~-	c #FEC885",
-"{-	c #FDC984",
-"]-	c #FFCB85",
-"^-	c #90ABA7",
-"/-	c #5198B3",
-"(-	c #4C8FAC",
-"_-	c #4E91AD",
-":-	c #5292AE",
-"<-	c #5292AD",
-"[-	c #4C8DAA",
-"}-	c #3E85A3",
-"|-	c #2A789A",
-"1-	c #156A8F",
-"2-	c #055F86",
-"3-	c #005780",
-"4-	c #0E6288",
-"5-	c #00A7D3",
-"6-	c #08ADD5",
-"7-	c #008BBA",
-"8-	c #9E9556",
-"9-	c #FF9B14",
-"0-	c #FB9B22",
-"a-	c #FF9B20",
-"b-	c #FF9B21",
-"c-	c #FFA73C",
-"d-	c #FFA83C",
-"e-	c #FFAE4A",
-"f-	c #FFB85F",
-"g-	c #FEC884",
-"h-	c #FDC884",
-"i-	c #FFCB84",
-"j-	c #91ACA6",
-"k-	c #4295B7",
-"l-	c #4E97B4",
-"m-	c #4C93AF",
-"n-	c #4C91AE",
-"o-	c #4F92AE",
-"p-	c #5293AF",
-"q-	c #5293B0",
-"r-	c #458BA8",
-"s-	c #3480A0",
-"t-	c #217396",
-"u-	c #0D668C",
-"v-	c #015E86",
-"w-	c #005B84",
-"x-	c #005A83",
-"y-	c #015D84",
-"z-	c #10658B",
-"A-	c #00A8D3",
-"B-	c #0DB0D7",
-"C-	c #068DB6",
-"D-	c #008CBB",
-"E-	c #9C9458",
-"F-	c #FB9A21",
-"G-	c #FFA83E",
-"H-	c #FDC883",
-"I-	c #93ADA6",
-"J-	c #4295B8",
-"K-	c #4E98B4",
-"L-	c #4D95B1",
-"M-	c #4D94B1",
-"N-	c #4F94B0",
-"O-	c #5095B1",
-"P-	c #5396B1",
-"Q-	c #4C91AD",
-"R-	c #448CA9",
-"S-	c #3481A1",
-"T-	c #24779A",
-"U-	c #126C90",
-"V-	c #04628A",
-"W-	c #005E86",
-"X-	c #005D85",
-"Y-	c #025F86",
-"Z-	c #025E85",
-"`-	c #025D85",
-" ;	c #005A82",
-".;	c #0F648A",
-"+;	c #00A8D4",
-"@;	c #08AED6",
-"#;	c #068EB5",
-"$;	c #008CBC",
-"%;	c #999559",
-"&;	c #FF9B13",
-"*;	c #FB9A20",
-"=;	c #FF9B1F",
-"-;	c #FFA93F",
-";;	c #FFA940",
-">;	c #FFAA40",
-",;	c #FFA83F",
-"';	c #FFAB45",
-");	c #FFB75F",
-"!;	c #FFBE6C",
-"~;	c #FFC781",
-"{;	c #FEC783",
-"];	c #FDC882",
-"^;	c #FFCA82",
-"/;	c #93ACA4",
-"(;	c #4195B8",
-"_;	c #4F99B3",
-":;	c #4D97B3",
-"<;	c #4D96B3",
-"[;	c #4D96B2",
-"};	c #4F95B1",
-"|;	c #4F96B1",
-"1;	c #5097B2",
-"2;	c #5297B3",
-"3;	c #5397B2",
-"4;	c #4F95B0",
-"5;	c #468FAB",
-"6;	c #3987A6",
-"7;	c #2C7E9F",
-"8;	c #1E7598",
-"9;	c #0F6B91",
-"0;	c #03648B",
-"a;	c #006087",
-"b;	c #005E87",
-"c;	c #005F88",
-"d;	c #016088",
-"e;	c #026088",
-"f;	c #015D85",
-"g;	c #0DB1D8",
-"h;	c #96945B",
-"i;	c #FF9A12",
-"j;	c #FB9A1F",
-"k;	c #FF9A1E",
-"l;	c #FFA941",
-"m;	c #FFAA42",
-"n;	c #FFAD49",
-"o;	c #FFB75E",
-"p;	c #FFBB67",
-"q;	c #FFC47E",
-"r;	c #FCC884",
-"s;	c #FFCD83",
-"t;	c #9BB2A7",
-"u;	c #489ABB",
-"v;	c #569DB7",
-"w;	c #549CB6",
-"x;	c #549BB6",
-"y;	c #549BB7",
-"z;	c #5299B5",
-"A;	c #5199B4",
-"B;	c #5098B3",
-"C;	c #4C94B0",
-"D;	c #4A93AF",
-"E;	c #428EAB",
-"F;	c #3988A8",
-"G;	c #3082A3",
-"H;	c #257B9E",
-"I;	c #1A7599",
-"J;	c #0E6D93",
-"K;	c #04668D",
-"L;	c #00648C",
-"M;	c #006189",
-"N;	c #006088",
-"O;	c #00628A",
-"P;	c #026189",
-"Q;	c #02628A",
-"R;	c #015F87",
-"S;	c #00A9D4",
-"T;	c #0DB0D8",
-"U;	c #08AFD7",
-"V;	c #068FB6",
-"W;	c #078EB6",
-"X;	c #008DBD",
-"Y;	c #93945D",
-"Z;	c #FF9912",
-"`;	c #FC991E",
-" >	c #FF9A1D",
-".>	c #FFAB43",
-"+>	c #FFAC46",
-"@>	c #FFAF4C",
-"#>	c #FFB04F",
-"$>	c #FEB255",
-"%>	c #FDB65A",
-"&>	c #FFBA5D",
-"*>	c #74968D",
-"=>	c #177EA8",
-"->	c #2A83A4",
-";>	c #2984A5",
-">>	c #2A84A5",
-",>	c #2B83A5",
-"'>	c #2982A4",
-")>	c #2881A3",
-"!>	c #267FA2",
-"~>	c #227DA0",
-"{>	c #1F7B9E",
-"]>	c #1A779C",
-"^>	c #147398",
-"/>	c #0D6F95",
-"(>	c #076A92",
-"_>	c #04688F",
-":>	c #01678F",
-"<>	c #00638C",
-"[>	c #00628B",
-"}>	c #00638B",
-"|>	c #01648C",
-"1>	c #02648C",
-"2>	c #02648B",
-"3>	c #01628A",
-"4>	c #016189",
-"5>	c #00AAD5",
-"6>	c #0690B7",
-"7>	c #078FB6",
-"8>	c #8F945F",
-"9>	c #FF9911",
-"0>	c #FC991D",
-"a>	c #FF991C",
-"b>	c #FFAC47",
-"c>	c #FFAD4A",
-"d>	c #FEAD4A",
-"e>	c #FDAD4A",
-"f>	c #FFB147",
-"g>	c #6B8776",
-"h>	c #006798",
-"i>	c #026B92",
-"j>	c #006A92",
-"k>	c #006A93",
-"l>	c #006992",
-"m>	c #006891",
-"n>	c #006790",
-"o>	c #00678F",
-"p>	c #02678F",
-"q>	c #03678E",
-"r>	c #03678F",
-"s>	c #02668D",
-"t>	c #02658C",
-"u>	c #01638B",
-"v>	c #00ABD6",
-"w>	c #0DB2D9",
-"x>	c #0790B7",
-"y>	c #008FBF",
-"z>	c #8B9462",
-"A>	c #FF9811",
-"B>	c #FC991C",
-"C>	c #FFAD48",
-"D>	c #FEAE4A",
-"E>	c #FDAE4B",
-"F>	c #FFB249",
-"G>	c #6E8B78",
-"H>	c #006B9C",
-"I>	c #066F96",
-"J>	c #036F96",
-"K>	c #036E96",
-"L>	c #036D95",
-"M>	c #036D94",
-"N>	c #036C94",
-"O>	c #036B93",
-"P>	c #036B92",
-"Q>	c #036A91",
-"R>	c #036990",
-"S>	c #026890",
-"T>	c #02668E",
-"U>	c #01658D",
-"V>	c #0DB2DA",
-"W>	c #08B0D8",
-"X>	c #008FC0",
-"Y>	c #889363",
-"Z>	c #FF9810",
-"`>	c #FC981B",
-" ,	c #FF991B",
-".,	c #FDAE4A",
-"+,	c #718B77",
-"@,	c #006C9C",
-"#,	c #057096",
-"$,	c #026E96",
-"%,	c #026D95",
-"&,	c #026C94",
-"*,	c #026B93",
-"=,	c #026A92",
-"-,	c #026991",
-";,	c #00ACD7",
-">,	c #08B1D9",
-",,	c #0890B7",
-"',	c #0090C1",
-"),	c #849366",
-"!,	c #FF980F",
-"~,	c #FC981A",
-"{,	c #FF981A",
-"],	c #FF991A",
-"^,	c #FEAD49",
-"/,	c #FCAD4A",
-"(,	c #738C76",
-"_,	c #006C9D",
-":,	c #026F97",
-"<,	c #0DB3DB",
-"[,	c #0891B7",
-"},	c #819468",
-"|,	c #FF970F",
-"1,	c #FC971A",
-"2,	c #FE981A",
-"3,	c #FEAD48",
-"4,	c #FDAD49",
-"5,	c #FFB146",
-"6,	c #768D75",
-"7,	c #057197",
-"8,	c #027097",
-"9,	c #08B2DA",
-"0,	c #0692B9",
-"a,	c #0091C2",
-"b,	c #7E946A",
-"c,	c #FF970E",
-"d,	c #FC9718",
-"e,	c #FE9719",
-"f,	c #FF9819",
-"g,	c #FEAC47",
-"h,	c #FCAD48",
-"i,	c #FFB044",
-"j,	c #7A8D74",
-"k,	c #006D9D",
-"l,	c #057097",
-"m,	c #027098",
-"n,	c #026F98",
-"o,	c #00ADD8",
-"p,	c #0EB4DB",
-"q,	c #0992B9",
-"r,	c #7A936C",
-"s,	c #FC9717",
-"t,	c #FE9718",
-"u,	c #FF9818",
-"v,	c #FCAC48",
-"w,	c #7D8F72",
-"x,	c #006E9E",
-"y,	c #057198",
-"z,	c #00AED9",
-"A,	c #0EB4DC",
-"B,	c #0A93B9",
-"C,	c #78936F",
-"D,	c #FF960C",
-"E,	c #FD9616",
-"F,	c #FE9717",
-"G,	c #FF9717",
-"H,	c #FEAC48",
-"I,	c #FFAF41",
-"J,	c #809070",
-"K,	c #006E9F",
-"L,	c #067299",
-"M,	c #037198",
-"N,	c #0EB5DC",
-"O,	c #09B3DB",
-"P,	c #0694BB",
-"Q,	c #0B94B9",
-"R,	c #008EC1",
-"S,	c #5A9587",
-"T,	c #FF960B",
-"U,	c #FC9616",
-"V,	c #FE9617",
-"W,	c #FF9716",
-"X,	c #FF9718",
-"Y,	c #FCAC49",
-"Z,	c #FFAC3B",
-"`,	c #B49C62",
-" '	c #006F9E",
-".'	c #05729A",
-"+'	c #047199",
-"@'	c #027099",
-"#'	c #00AFDA",
-"$'	c #0EB6DD",
-"%'	c #0994BC",
-"&'	c #4EB9E1",
-"*'	c #FE8E00",
-"='	c #FD981A",
-"-'	c #FF9616",
-";'	c #FAA335",
-">'	c #006793",
-",'	c #08759B",
-"''	c #037199",
-")'	c #037098",
-"!'	c #0EB6DE",
-"~'	c #09B4DC",
-"{'	c #08B3DB",
-"]'	c #0A95BC",
-"^'	c #008FB8",
-"/'	c #4EB0CB",
-"('	c #FD8D01",
-"_'	c #FFA436",
-":'	c #006791",
-"<'	c #08759C",
-"['	c #00B0DB",
-"}'	c #09B5DD",
-"|'	c #0995BD",
-"1'	c #0290BA",
-"2'	c #1496BD",
-"3'	c #FF8D01",
-"4'	c #FFAC48",
-"5'	c #006792",
-"6'	c #0EB7DF",
-"7'	c #0896BD",
-"8'	c #0593BB",
-"9'	c #0591BA",
-"0'	c #00B1DC",
-"a'	c #09B6DE",
-"b'	c #0896BE",
-"c'	c #0591BB",
-"d'	c #00B1DD",
-"e'	c #0EB8DF",
-"f'	c #0594BC",
-"g'	c #0592BC",
-"h'	c #00B2DD",
-"i'	c #0EB8E0",
-"j'	c #0897BE",
-"k'	c #0594BD",
-"l'	c #00B2DE",
-"m'	c #0EB9E0",
-"n'	c #09B7DF",
-"o'	c #0898BF",
-"p'	c #00B3DF",
-"q'	c #0EB9E1",
-"r'	c #0898C0",
-"s'	c #0595BE",
-"t'	c #0EBAE2",
-"u'	c #09B8E0",
-"v'	c #09B9E1",
-"w'	c #0899C1",
-"x'	c #0596BF",
-"y'	c #00B4E0",
-"z'	c #00B5E1",
-"A'	c #0EBBE3",
-"B'	c #089AC2",
-"C'	c #0597C0",
-"D'	c #01B7E2",
-"E'	c #0CBBE3",
-"F'	c #09BAE2",
-"G'	c #0598C0",
-"H'	c #09BAE3",
-"I'	c #0ABAE3",
-"J'	c #0ABBE3",
-"K'	c #089BC2",
-"L'	c #07BBE3",
-"M'	c #08BBE4",
-"N'	c #0BBCE3",
-"O'	c #0599C1",
-"P'	c #0BBCE4",
-"Q'	c #09BBE3",
-"R'	c #089CC4",
-"S'	c #07BCE4",
-"T'	c #0BBDE4",
-"U'	c #059AC2",
-"V'	c #0598C1",
-"W'	c #08BCE5",
-"X'	c #09BCE4",
-"Y'	c #059AC3",
-"Z'	c #0BBDE5",
-"`'	c #059BC3",
-" )	c #08BDE6",
-".)	c #09BDE6",
-"+)	c #0BBEE5",
-"@)	c #09BDE5",
-"#)	c #099EC5",
-"$)	c #09BEE6",
-"%)	c #0CBEE6",
-"&)	c #099EC6",
-"*)	c #0699C2",
-"=)	c #09BEE7",
-"-)	c #0CBFE7",
-";)	c #0ABEE6",
-">)	c #099FC6",
-",)	c #069AC3",
-"')	c #08BEE7",
-"))	c #0CC0E7",
-"!)	c #0ABEE7",
-"~)	c #099FC7",
-"{)	c #069DC5",
-"])	c #FFA22E",
-"^)	c #09BFE7",
-"/)	c #0ABFE7",
-"()	c #09A0C8",
-"_)	c #069BC4",
-":)	c #08BFE8",
-"<)	c #09BFE8",
-"[)	c #0CC0E8",
-"})	c #069CC5",
-"|)	c #09C0E9",
-"1)	c #0CC1E8",
-"2)	c #09A1C9",
-"3)	c #069FC7",
-"4)	c #08C0E9",
-"5)	c #0CC1E9",
-"6)	c #0AC0E8",
-"7)	c #069DC6",
-"8)	c #FF9F2B",
-"9)	c #09C1EA",
-"0)	c #0CC2E9",
-"a)	c #0AC1E9",
-"b)	c #09A2C9",
-"c)	c #08C1EA",
-"d)	c #0CC2EA",
-"e)	c #09A2CA",
-"f)	c #06A0C8",
-"g)	c #09C2EA",
-"h)	c #0AC2EA",
-"i)	c #09A3CA",
-"j)	c #069EC8",
-"k)	c #08C2EB",
-"l)	c #09C2EB",
-"m)	c #0CC3EB",
-"n)	c #09A3CB",
-"o)	c #06A1C9",
-"p)	c #FF9E27",
-"q)	c #08C2EC",
-"r)	c #09C3EB",
-"s)	c #0CC4EB",
-"t)	c #0AC2EB",
-"u)	c #09A4CC",
-"v)	c #06A2CA",
-"w)	c #069FC9",
-"x)	c #08C3ED",
-"y)	c #09C3EC",
-"z)	c #0CC4EC",
-"A)	c #0AC3EB",
-"B)	c #09A4CB",
-"C)	c #06A0C9",
-"D)	c #FF9D26",
-"E)	c #09C4ED",
-"F)	c #0CC5EC",
-"G)	c #06A0CA",
-"H)	c #0CC5ED",
-"I)	c #0AC4EC",
-"J)	c #09A5CD",
-"K)	c #06A3CB",
-"L)	c #08C4EE",
-"M)	c #0CC6ED",
-"N)	c #0AC5ED",
-"O)	c #09A6CD",
-"P)	c #06A1CA",
-"Q)	c #FF9C23",
-"R)	c #08C5EE",
-"S)	c #09C5EE",
-"T)	c #09A6CE",
-"U)	c #06A4CC",
-"V)	c #06A2CB",
-"W)	c #08C5EF",
-"X)	c #09C6EE",
-"Y)	c #0CC6EE",
-"Z)	c #09A7CE",
-"`)	c #06A3CC",
-" !	c #FF9B22",
-".!	c #08C6EF",
-"+!	c #09C6EF",
-"@!	c #0CC7EF",
-"#!	c #0AC6EE",
-"$!	c #06A5CD",
-"%!	c #FF9D23",
-"&!	c #08C6F0",
-"*!	c #09C7EF",
-"=!	c #0CC8EF",
-"-!	c #0AC6EF",
-";!	c #09A7CF",
-">!	c #06A4CD",
-",!	c #09C7F0",
-"'!	c #0CC8F0",
-")!	c #0AC7EF",
-"!!	c #09A8CF",
-"~!	c #06A6CE",
-"{!	c #FF9A1F",
-"]!	c #0CC9F0",
-"^!	c #0AA8D0",
-"/!	c #0AC8F0",
-"(!	c #0AA9D1",
-"_!	c #06A5CE",
-":!	c #0AAAD1",
-"<!	c #FF991D",
-"[!	c #07A8D0",
-"}!	c #07A6CF",
-"|!	c #FF9B1E",
-"1!	c #0AAAD2",
-"2!	c #0AABD2",
-"3!	c #FF9615",
-"4!	c #09ABD3",
-"5!	c #09AAD2",
-"6!	c #FF930D",
-"7!	c #0BACD3",
-"8!	c #01A6CF",
-"9!	c #FF920D",
-"0!	c #FF920C",
-"a!	c #FF920B",
-"b!	c #FF910A",
-"c!	c #FF9109",
-"d!	c #FF9108",
-"e!	c #FF9007",
-"f!	c #FF9006",
-"g!	c #0DB1D7",
-"h!	c #FF8F05",
-"i!	c #FF8E05",
-"j!	c #FF8E03",
-"k!	c #08C7F0",
-"l!	c #0DC8F0",
-"m!	c #0BC8F0",
-"n!	c #0BC7EF",
-"o!	c #0BC6EE",
-"p!	c #0BC5ED",
-"q!	c #0BC4EC",
-"r!	c #0BC3EB",
-"s!	c #0BC2EA",
-"t!	c #0BC1E9",
-"u!	c #0BC0E8",
-"v!	c #0BBFE7",
-"w!	c #0BBEE6",
-"x!	c #0ABDE5",
-"y!	c #0ABCE4",
-"z!	c #0ABAE2",
-"A!	c #0AB9E1",
-"B!	c #0AB8E0",
-"C!	c #0AB7DF",
-"D!	c #0AB6DE",
-"E!	c #0AB5DD",
-"F!	c #0AB4DC",
-"G!	c #0AB3DB",
-"H!	c #09B2DA",
-"I!	c #09B1D9",
-"J!	c #FF8F06",
-"K!	c #006892",
-"L!	c #09769C",
-"M!	c #047299",
-"N!	c #037097",
-"O!	c #036E95",
-"P!	c #036C93",
-"Q!	c #03688F",
-"R!	c #02638A",
-"S!	c #026289",
-"T!	c #026188",
-"U!	c #026087",
-"V!	c #035E85",
-"W!	c #005B82",
-"X!	c #10658A",
-"Y!	c #06C6F0",
-"Z!	c #06C7F0",
-"`!	c #06C6EF",
-" ~	c #06C5EE",
-".~	c #06C4ED",
-"+~	c #06C3EC",
-"@~	c #06C2EB",
-"#~	c #06C1EA",
-"$~	c #06C0E9",
-"%~	c #06BFE8",
-"&~	c #06BEE7",
-"*~	c #06BDE6",
-"=~	c #05BCE5",
-"-~	c #05BBE4",
-";~	c #05BAE3",
-">~	c #05B9E2",
-",~	c #05B8E1",
-"'~	c #05B7E0",
-")~	c #05B6DF",
-"!~	c #05B6DE",
-"~~	c #05B5DD",
-"{~	c #05B4DC",
-"]~	c #05B3DB",
-"^~	c #05B2DA",
-"/~	c #04B2DA",
-"(~	c #04B1D9",
-"_~	c #04B0D8",
-":~	c #06B1D8",
-"<~	c #FF8400",
-"[~	c #006490",
-"}~	c #05739A",
-"|~	c #006F97",
-"1~	c #006E96",
-"2~	c #006D95",
-"3~	c #006C94",
-"4~	c #006B93",
-"5~	c #006991",
-"6~	c #006890",
-"7~	c #00668E",
-"8~	c #00658D",
-"9~	c #005F87",
-"0~	c #005C84",
-"a~	c #005B83",
-"b~	c #015B83",
-"c~	c #005880",
-"d~	c #10C9F1",
-"e~	c #1ACCF1",
-"f~	c #17CBF1",
-"g~	c #17CAF0",
-"h~	c #17C9EF",
-"i~	c #17C8EE",
-"j~	c #17C7ED",
-"k~	c #17C6EC",
-"l~	c #17C5EB",
-"m~	c #17C4EA",
-"n~	c #17C3E9",
-"o~	c #17C2E8",
-"p~	c #17C1E8",
-"q~	c #17C1E7",
-"r~	c #16C1E6",
-"s~	c #16C0E5",
-"t~	c #16BFE5",
-"u~	c #16BEE4",
-"v~	c #16BDE3",
-"w~	c #16BCE2",
-"x~	c #16BBE1",
-"y~	c #16BAE0",
-"z~	c #16B9DF",
-"A~	c #16B8DE",
-"B~	c #16B7DD",
-"C~	c #15B7DD",
-"D~	c #15B6DC",
-"E~	c #17B6DB",
-"F~	c #0BB2D9",
-"G~	c #157CA1",
-"H~	c #11799E",
-"I~	c #10789E",
-"J~	c #10779D",
-"K~	c #10769C",
-"L~	c #10759B",
-"M~	c #10749A",
-"N~	c #107399",
-"O~	c #107298",
-"P~	c #107197",
-"Q~	c #107096",
-"R~	c #106F95",
-"S~	c #106E94",
-"T~	c #0F6D93",
-"U~	c #0F6C92",
-"V~	c #0F6A90",
-"W~	c #0F698F",
-"X~	c #0F698E",
-"Y~	c #0F688D",
-"Z~	c #0F678C",
-"`~	c #0F668C",
-" {	c #10668C",
-".{	c #0B6389",
-"+{	c #1C6D91",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                      .                                                                                                                                               +         ",
-"                                                                                                                                                                                                                                                                                                                                                                    @ #                                                                                                                                             $ %         ",
-"                                                                                                                                                                                                                                                                                                                                                                  & * =                                                                                                                                           - ; >         ",
-"                                                                                                                                                                                                                                                                                                                                                                & , ' )                                                                                                                                         ! ~ { ]         ",
-"                                                                                                                                                                                                                                                                                                                                                              & ^ / ( )                                                                                                                                       _ : < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                            } , | 1 ( )                                                                                                                                     2 3 { < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                          4 ^ | 5 1 ( )                                                                                                                                   2 6 { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                        8 9 | 5 5 1 ( )                                                                                                                                 0 < a { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                      b c d e 5 5 1 ( )                                                                                                                               f < a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                    g h i e 5 5 5 1 ( )                                                                                                                             f < + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                  b h i j e 5 5 5 1 ( )                                                                                                                           k { + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                                l m i j j e 5 5 5 1 ( )                                                                                                                         n a o + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                              p q r j j j e 5 5 5 1 ( )                                                                                                                       n a s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                            u v i j j j j e 5 5 5 1 ( )                                                                                                                     w x s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                          u y z A j j j j e 5 5 5 1 ( )                                                                                                                   B t C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                        D E z A A j j j j e 5 5 5 1 ( )                                                                                                                 F t G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                      H I J K A A j j j j e 5 5 5 1 ( )                                                                                                               L C M G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                    N K O K A A A j j j j e 5 5 5 1 ( )                                                                                                             L C P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                  Q J R K K A A A j j j j e 5 5 5 1 ( )                                                                                                           L C P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                                Q K S K K K A A A j j j j e 5 5 5 1 ( )                                                                                                         T G P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                              U V W K K K K A A A j j j j e 5 5 5 1 ( )                                                                                                       T G $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                            X Y Z ` ` K K K A A A j j j j e 5 5 5 1 ( )                                                                                                      ...! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                          X +.@.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                                   #.M _ $ $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                        X +.$.%.%.` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                                 &.P _ ! ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                      X +.*.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                               &.=.2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                    -.;.>.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                             '.=.0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                  ).!.>.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                           ~.=.0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                                {.].*.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                         ^._ f 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                              {./.(.,.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                       _.2 f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                            :./.<.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                     }.|.1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                          :.2.3.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                   }.0 n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                        :.2.4.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                                 6.0 n 7.1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                      8.2.4.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                               6.f w n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                    8.9.3.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                             6.k F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                  0.a.b.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                           c.k F d.n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                                e.a.f.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                         h.k F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                              i.j.k.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                       l.n L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                            m.j.k.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                     l.w o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                          m.j.k.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                   p.q.o.L L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                        r.s.k.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                                 t.F u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                      v.s.w.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                               x.F T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                    y.z.A.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                             B.L C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                  D.E.F.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                           B.L G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                                H.I.J.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                         L.M.G.#.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                              D.N.O.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                       P.Q.&.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                            D.N.O.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                     S.u.~.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                          T.I.O.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                   U.M.^.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                        T.V.W.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                 X.u.^.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                      Y.Z.`.R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                                +T ^.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                    .+++`.@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                             #+u.$+~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                  Y.++%+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                           _.~.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                                Y.++%+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                         t.*+_.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                              =+-+%+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                       ;+>+_.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                            ,+++%+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                     '+>+}.)+}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                          !+~+{+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                   '+c.]+6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                        ^+~+/+&+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                                 B.c.6.6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                      (+_+:+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                               [+c.6.*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                    }+_+|+<+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                             P.1+2+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                  ^+3+|+3+<+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                           4+p.*+h.*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                                5+_+|+3+3+<+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                         6+p.c.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                              7+8+9+3+3+3+<+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                       0+t.h.l.a+*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ >         ",
-"                                                                                                                                                                                                                                            b+8+c+3+3+3+3+<+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                     S.x.l.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 < [ d+        ",
-"                                                                                                                                                                                                                                          e+f+g+h+h+3+3+3+<+<+<+&+&+&+&+@+@+R.R.R.R.K.K.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                   X.x.p.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { { < i+j+        ",
-"                                                                                                                                                                                                                                        k+f+l+h+h+8+_+_+_+m+<+n+o+{+{+{+p+q+r+r+R.s+t+E.z.z.n.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                  +B.1+t.1+l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { 7 u+v+w+        ",
-"                                                                                                                                                                                                                                      x+y+z+f+A+h+9+B+C+D+:+E+F+G+H+I+I+J+K+L+s+W.M+N+O+P+z.j.n.n.n.g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )                +B.1+t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { { Q+R+S+T+        ",
-"                                                                                                                                                                                                                                    U+V+W+l+X+Y+8+Z+`+ @.@+@@@#@$@%@&@&@*@*@=@-@;@>@,@'@)@A.!@k.j.~@g.g.5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )             {@[+]@;+t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a { Q+^@/@(@_@        ",
-"                                                                                                                                                                                                                                  :@<@[@}@|@1@2@3@4@5@6@7@8@9@0@0@a@b@b@c@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@5.5.5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )           {@P.;+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + + a Q+r@s@t@u@v@        ",
-"                                                                                                                                                                                                                                w@x@y@z@A@B@C@D@E@F@G@H@H@I@I@J@J@J@K@K@L@L@M@N@N@O@P@Q@R@S@T@U@V@W@X@Y@3.Z@5.5.[.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )         `@P.'+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + +  #.#+#@###$#%#        ",
-"                                                                                                                                                                                                                              &#*#=#-#C@;#>#,#'#)#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#/#(#_#T@:#<#[#}#|#3.1#5.[.[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( )       2#6+'+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t + 3#.#4#5#6#7#8#%#        ",
-"                                                                                                                                                                                                                            9#0#a#b#c#B@B@>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#d#e#f#g#h#i#j#k#l#m#[.,.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 ( n#    o#p#B.[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s t 3#q#r#s#6#7#t#u#%#        ",
-"                                                                                                                                                                                                                          v#w#x#y#y#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#C#D#E#F#G#H#I#m#!.,.,.%.%.` ` V K K K A A A j j j j e 5 5 5 1 J#K#  L#M#L.P.[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s s N#q#O#P#Q#7#t#R#8#%#        ",
-"                                                                                                                                                                                                                        S#T#U#V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#X#Y#Z#`# $.$+$@$,.%.%.` ` V K K K A A A j j j j e 5 5 5 #$$$%$&$ +*$P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C s =$-$;$>$,$7#t#t#R#8#%#        ",
-"                                                                                                                                                                                                                      '$T#U#)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#!$!$~${$]$^$.$@$%.%.` ` V K K K A A A j j j j e 5 5 #$$$/$($_$:$6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G G C <$[$}$|$1$7#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                                    2$3$4$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$6$7$8$9$0$a$b$+.%.` V K K K A A A j j j j e c$d$e$f$g$h$i$6+6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P j$G k$l$m$n$o$p$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                                  2$q$r$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$t$u$v$w$+.x$V ` ` K K K A A A j j j j e y$z$A$B$h$C$S.p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P G D$E$F$G$H$I$J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                                K$L$M$s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$N$O$P$Q$R$S$T$K K K K A A A j j j j U$V$W$X$h$Y$X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P P D$Z$`$ %H$.%+%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                              K$@%#%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$%%&%*%=%-%` J K K A A A j j j ;%>%,%'%)%Y$X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P P !%~%{%]%^%.%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                            K$@%#%$%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%%%_%:%<%[%S }%K A A A j j ;%|%1%2%3%4%X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ P 5%- 6%7%^%8%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                            9%#%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%b%c%d%e%f%g%A A A j ;%|%h%i%j%M# +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! $ 5%k%l%m%n%8%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                          p%q%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%r%s%t%u%v%w%z A A ;%|%x%y%z%A%{@ +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ _ ! B%- C%D%n%E%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                        F%q%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%r%G%G%H%I%J%K%A L%M%N%O%P%Q%`@R% +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ ! S%k%T%U%V%E%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                      F%X%Y%Z%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%G%G%`%I% &.&+&@&#&$&%&&&*&`@`@R% +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 _ =&-&;&>&,&'&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                    )&X%!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%G%G%G%`%`%~&{&]&^&/&(&*&_&`@`@R% +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 2 :&<&[&}&|&1&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                  )&3&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%G%G%_%`%`%4&5&6&7&8&9&0&_&`@`@R% +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 0 a&<&b&c&|&d&e&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                                f&3&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%G%G%h&`%i&j&k&l&m&n&o&X.2#`@`@R% +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f 0 0 p&q&r&s&t&d&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                              f&v&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%G%G%_%i&w&x&y&z&A&B&C&D&R%E&`@R% +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f f F&G&H&I&t&d&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                            J&K&g&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%G%G%L&w&M&N&z&O&C&P&P&Q&R&S&X.`@ +X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.f p&T&U&V&W&d&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                          X&K&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%Z&L&`& *.*m&+*@*C&C&#*$*B&%*&*P.E&X.X.X.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n n 1.**=*-*;*>*,*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                        '*)*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%a%a%!*~*{*]*^*+*Q&B&C&C&#*#*/*(*_*:*6+0+ +S.p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n 7.<*=*[*}*|*,*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                      '*2*3*4*Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%5*!*6*7*8*9*0*a*Q&B&C&C&#*#*$*b*$*c*d*{@P. +p#p#6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n n e*f*g*h*|*i*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                    j*2*k*3*4*Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$(%l*m*n*o*9*p*q*a*Q&B&C&C&#*#*$*r*b*s*#*t*u*v*S.S.6+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F F n w*x*y*z*|*i*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                  B*2*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$O$C*m*D*E*F*p*G*q*a*Q&B&C&C&#*#*$*r*r*s*H*b*I*J*K*L.0+P.[+[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F d.e*L*M*N*O*i*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                                P*Q*k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$O$R*S*T*U*V*W*G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*I*H*b*X*Y*;+P.P.[+[+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F F Z*L*=*`* =i*A*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                              .=+=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$7$R*#=$=%=V*&=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*==-=;=>=6+t.4+4+'+;+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L F ,='=f*)=!=~=A*A*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                            {=]=@=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$7$7$^=/=(=_=:=<=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=H*1=2=t.;+3='+t.t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.L ,=4=5=6=7=8=9=A*A*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#R#8#%#        ",
-"                                                                                                                                                                          {=]=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$a=b=/=c=d=:=e=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=f=|=;=g=h=1+1+;+t.t.p.l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.o.,=4=i=j=k=l=m=A*A*A*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#t#t#t#t#n=o=        ",
-"                                                                                                                                                                        {=p=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#5$5$q=a=r=s=t=e=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=v=w=x=y=E&h.l.;+]@l.l.l.*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.o.4=z=A=B=k=l=C=m=A*A*A*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%/%J$t#D=E=F=G=7#H=        ",
-"                                                                                                                                                                      I=p=J=K=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#L=q=M=N=O=P=Q=u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=f=R=S=;=t*T=`@c.*+l.1+a+*+*+*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T u.z=U=V=W=X=l=C=C=m=A*A*A*A*A*1*1*u&u&u&u&u&2&W%W%o%o%/%/%Y=F=Z=p$`= -.-+-@-        ",
-"                                                                                                                                                                    #-$-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#W#%-&-*-=-P=--;-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=,-,-'-)-!-#+l.2+*+h.h.*+6.6.}.}.}.^.~.~.~.'.G.G.G.C.T ~-{-]-^-X=/-C=C=C=m=A*A*A*A*A*1*1*u&u&u&u&u&2&W%W%(-(-o%_-:-<-[-}-|-1-2-3-4-        ",
-"                                                                                                                                                                  5-$-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#W#%-&-7-8-9-0-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-c-d-x=t*e-f-6+2+^.2+6.*+)+}.}.^.~.~.~.'.G.G.G.C.g-h-i-j-k-/-l-C=C=C=m=A*A*A*A*A*1*1*u&u&u&m-n-n-W%o-p-q-o%r-s-t-u-v-w-x-y-x-z-        ",
-"                                                                                                                                                                A-B-6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B#B#%-C-D-E-9-F-a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*G-G-t*c-R&y=&*[+2+~.~._.}.$+$+^.~.'.G.G.G.g-H-i-I-J-/-K-l-C=C=C=m=A*A*A*L-M-u&u&m-u&N-O-P-d&Q-R-S-T-U-V-W-w-X-v-Y-Z-`- ;.;        ",
-"                                                                                                                                                              +;B-@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A#B##;X#$;%;&;*;=;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;;;>;)-,;';!-);!;l.}.~;T #.~;&.&.G.{;];^;/;(;_;:;<;<;[;<;:;m=9=};|;1;2;3;3;4;m-5;6;7;8;9;0;a;W-b;c;d;e;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                            +;g;@;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#A##;C#$;h;i;j;k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;l;R&R&m;1=;;X*n;T=o;p;X.1+q;'.{;r;s;t;u;v;w;x;y;y;x;z;A;B;L-C;D;E;F;G;H;I;J;K;L;M;N;M;O;P;Q;P;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                          S;T;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#_#V;W;X;Y;Z;`; >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*';+>+>';X*';n;@>#>$>%>&>*>=>->;>>>,>'>)>!>~>{>]>^>/>(>_>:><>[>}>}>}>|>1>2>Q;3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                        5>g;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#_#6>7>X;8>9>0>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>b>n;n;c>e-d>e>f>g>h>i>j>k>j>l>m>n>o>n>n>o>o>o>:>:>p>q>r>s>t>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                      v>w>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#_#6>x>y>z>A>B>a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>b>C>C>e-D>E>F>G>H>I>J>K>K>L>M>M>N>O>O>P>Q>R>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                    v>V>W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#^#6>x>X>Y>Z>`> ,a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>b>C>C>d>.,f>+,@,#,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                  ;,V>>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@^#(#,,',),!,~,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>b>C>^,/,f>(,_,#,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                                ;,<,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@Q@/#[,',},|,1,2,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>b>3,4,5,6,@,7,8,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                              ;,<,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@0,U@a,b,c,d,e,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>g,h,i,j,k,l,m,n,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                            o,p,9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#Q@q,a,r,c,s,t,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>+>v,i,w,x,y,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                          z,A,9,9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#]#]#B,a,C,D,E,F,G,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*+>H,I,J,K,L,M,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                        z,N,O,O,9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@P,]#Q,R,S,T,U,V,W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*X*Y,Z,`, '.'+'@'m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                      #'$'O,O,O,9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]#%'8$&'  *'='-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;.>X*C>;'    >',''')'m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                    #'!'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@M@]'^'/'    ('f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;m;m;R&C>_'      :'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                  ['!'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@L@|'1'2'      3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;l;m;m;4'w=        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                                ['6'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@L@7'8'9'        3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;1=1=b>==l.        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                              0'6'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@K@b'd@c'          3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;;;+>I*p.          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                            d'e'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@J@K@&@f'g'            3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G--;-;';}=t.            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                          h'i'a'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@J@K@j'k'g'              3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*)-)-R&==;+              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                        l'm'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#{#J@o'k'd@                3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*G-.>|=2#                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                      p'q'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#J@r's'd@                  3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-t*t*;;t*%*                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                    p't'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#{#r's'k'                    3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,-d--;d-%*                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                  p't'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#{#w'x'k'                      3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-,--;,-S=                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                                y't'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#~#w'0@s'                        3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=,-G-,-v=                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                              z'A'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@~#B'C's'                          3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=x=t*S=>-                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                            D'E'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#!#G@B'G'x'                            3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-S=S=d-S=;=                            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                          H'I'J'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#G@K'G'x'                              3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=>-v=,-v=;=                              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                        L'M'N'F'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#!#4@O'x'                                3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=f=,-f=w=                                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                      L'M'P'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#!#R'5@C'                                  3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=;=f=R=;===                                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                    S'M'T'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#>#R'U'V'                                    3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=w=;=S=w===                                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                  S'W'T'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#>#B@Y'V'                                      3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=|=|=v=|=H*                                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                                W'W'Z'X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z#z#B@`'5@                                        3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}===f===H*                                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                               ).)+)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#z##)`'5@                                          3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*}=f=}=_*                                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                             )$)%)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#V#c#&)>#*)                                            3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*I*;=H*b*                                            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                           )=)-);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#c#>)>#,)                                              3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*H*|=_*r*                                              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                        ')=)))!);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#V#~){),)                                                3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*s*_*==s*])                                                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                      ')^)-)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$V#()-#_)                                                  3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*b*}=b*c*                                                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                    :)<)[)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$)$()-#})                                                    3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*r*I*r*P&                                                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                  :)|)1)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$)$2)3)})                                                      3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*r*H*$*C&                                                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                                4)|)5)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$s$2)3)7)                                                        3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*$*_*#*8)                                                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                              4)9)0)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%s$b)3)7)                                                          3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&#*#*b*#*B&                                                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                            c)9)d)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%0%$%e)f)7)                                                            3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&P&r*P&Q&                                                            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                          c)g)d)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%$%i)f)j)                                                              3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&C&C&/*C&q*                                                              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                        k)l)m)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%0%n)o)j)                                                                3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&@*C&$*@*p)                                                                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                      q)r)s)t)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%0%u)v)w)                                                                  3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&B&#*Q&p)                                                                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                    x)y)z)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%0%B)v)C)                                                                    3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*Q&P&Q&D)                                                                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                  x)E)F)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&Y%u)v)G)                                                                      3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*q*a*C&a**=                                                                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                                x)E)H)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&!&J)K)G)                                                                        3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*p)@*p)[=                                                                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                              L)E)M)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&!&O)K)P)                                                                          3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*G*B&G*Q)                                                                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                            R)S)M)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&g&T)U)V)                                                                            3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=G*Q&*=u=                                                                            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                          W)X)Y)N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&Y&g&Z)U)`)                                                                              3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=*=a*[= !                                                                              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                        .!+!@!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&Y&g&Z)$!`)                                                                                3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=[=[=p)%!b-                                                                                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                      &!*!=!-!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*4*Y&;!$!>!                                                                                  3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=Q)G*Q)a-                                                                                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                    &!,!'!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*Y&!!~!>!                                                                                    3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-u=u=D)u={!                                                                                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                  &!,!]!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*3*^!~!>!                                                                                      3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-;-u=*=;-k;                                                                                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                                &!,!'!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*k*(!Y&_!                                                                                        3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-b-[=a-k;                                                                                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                              &!,!]!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*k*:!Y&_!                                                                                          3'f,-'W,X,u,f,{,],a>a> >k;k;a-a-Q)=;<!                                                                                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                            &!,!]!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=k*:![!}!                                                                                            3'f,-'W,X,u,f,{,],a>a> >k;|!=;u=k;a>                                                                                            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                          &!,!]!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=0=@=1![!Y&                                                                                              3'f,-'W,X,u,f,{,],a>a> >k;k;b-{!a>                                                                                              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                        &!,!]!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=@=2![!Y&                                                                                                3'f,-'W,X,u,f,{,],a>a> >k;{!Q)3!                                                                                                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                      &!,!]!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=0=4!5!3*                                                                                                  3'f,-'W,X,u,f,{,],a>a> >k;[=6!                                                                                                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                    &!,!]!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=K=0=7!8!                                                                                                    3'f,-'W,X,u,f,{,],a>a> >Q)9!                                                                                                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                  &!,!]!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=0=]=P*                                                                                                      3'f,-'W,X,u,f,{,],a>a>u=0!                                                                                                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                                &!,!]!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=J=]=P*                                                                                                        3'f,-'W,X,u,f,{,], ,b-a!                                                                                                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                              &!,!]!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-J=p={=                                                                                                          3'f,-'W,X,u,f,{,],b-b!                                                                                                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                            &!,!]!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-6-p={=                                                                                                            3'f,-'W,X,u,f,{,a-c!                                                                                                            5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                          &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;6-$-{=                                                                                                              3'f,-'W,X,u,f,{!d!                                                                                                              5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                        &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;U;@;$-I=                                                                                                                3'f,-'W,X,X,k;e!                                                                                                                5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                      &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;@;B-I=                                                                                                                  3'f,-'W,G, >f!                                                                                                                  5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                    &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;U;g!5-                                                                                                                    3'f,W,W,<!h!                                                                                                                    5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                  &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;U;g;A-                                                                                                                      3'f,-'a>i!                                                                                                                      5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"                &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>U;T;+;                                                                                                                        3'f, ,j!                                                                                                                        5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"              &!,!]!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!/!)!)!)!#!N)N)N)I)A)A)A)h)h)a)a)6)/)/)/)/);)@)@)X'X'Q'Q'Q'F'v'v'v'u'n'n'n'a'a'}'}'~'O,O,{'9,9,>,>,W>g;+;                                                                                                                          3'{!j!                                                                                                                          5'<'''m,m,m,m,:,$,$,%,%,&,&,&,*,=,=,=,-,S>S>S>p>p>T>T>U>|>|>|>|>u>3>3>4>4>d;d;d;R;v-v-v-f;`- ;.;        ",
-"            k!,!l!m!m!m!m!m!m!m!m!m!m!m!m!m!m!m!m!m!m!m!n!n!n!o!p!p!p!q!r!r!r!s!s!t!t!u!v!v!v!v!w!x!x!y!y!J'J'J'z!A!A!A!B!C!C!C!D!D!E!E!F!G!G!O,H!H!I!I!w>S;                                                                                                                            f!J!                                                                                                                            K!L!M!M,M,M,M,N!J>J>O!O!M>M>M>P!P>P>P>Q>R>R>R>Q!Q!q>q>s>t>t>t>t>2>R!R!S!S!T!T!T!U!Y-Y-Y-Z-V!W!X!        ",
-"          Y!Y!k!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!Z!`!`!`! ~.~.~.~+~@~@~@~#~#~$~$~%~&~&~&~&~*~=~=~-~-~;~;~;~>~,~,~,~'~)~)~!~~~~~{~{~]~^~^~/~(~(~_~:~5>                                                                                                                              <~                                                                                                                              [~}~|~1~1~1~1~2~3~3~4~4~j>j>j>5~6~6~6~o>7~7~7~8~8~L;L;}>O;O;O;O;M;N;N;9~9~W-W-W-X-0~0~0~a~b~c~4-        ",
-"          d~e~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~f~g~g~g~h~i~i~i~j~k~k~k~l~l~m~m~n~o~o~o~p~q~r~r~s~s~t~t~t~u~v~v~v~w~x~x~x~y~y~z~z~A~B~B~C~D~D~E~F~                                                                                                                                                                                                                                                                |~G~H~I~I~I~I~J~K~K~L~L~M~M~M~N~O~O~O~P~Q~Q~Q~R~R~S~S~T~U~U~U~U~9;V~V~W~W~X~X~X~Y~Z~Z~Z~`~ {.{+{        ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                "};
diff --git a/games/mame/mame.SlackBuild b/games/mame/mame.SlackBuild
index 6d7251bc99..452b4061ff 100644
--- a/games/mame/mame.SlackBuild
+++ b/games/mame/mame.SlackBuild
@@ -1,31 +1,25 @@
 #!/bin/sh
-#
-# Slackware build script for M.A.M.E.
-#
-# Copyright 2010-2015  Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Adapted from sdlmame.SlackBuild, Written by B. Watson (yalhcru@gmail.com)
+
+# Slackware build script for mame
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Adapted from Erik W. Hanson's mame.SlackBuild for older mame versions,
+# which was originally adapted from sdlmame.SlackBuild by B. Watson.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20151112 bkw:
+# - Updated for v0.167, after missing several releases (sorry!)
+# - Get rid of MESS and UME options, mame has basically turned
+#   into UME at this point (includes old mame + mess in one binary)
+# - Use shipped man pages from the source, instead of our own
+# - Add new tools: castool floptool imgtool nlwav
+# - Use icon extracted from mame.ico in the source
+# - Update .ini file slightly (sound=sdl, not sound=1)
 
 PRGNAM=mame
-VERSION=${VERSION:-0.160}
+VERSION=${VERSION:-0.167}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,6 +36,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
+# NB nonstandard flags here. Upstream defaults to -O3, so we'll leave
+# that as-is. Only the arch-specific stuff goes here.
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -49,88 +45,124 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS=""
+  SLKCFLAGS="-fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS=""
   LIBDIRSUFFIX=""
 fi
 
+SHORTNAME=${PRGNAM}${VERSION/./}
+DIRNAME=$PRGNAM-$SHORTNAME
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION/./}
-tar xvf $CWD/${PRGNAM}-${PRGNAM}${VERSION/./}.tar.gz || tar xvf $CWD/${PRGNAM}${VERSION/./}.tar.gz
-cd ${PRGNAM}-${PRGNAM}${VERSION/./}
+rm -rf $DIRNAME
+tar xvf $CWD/$DIRNAME.tar.gz || tar xvf $CWD/$SHORTNAME.tar.gz
+cd $DIRNAME
 chown -R root:root .
+
+# This isn't standard template code, but it executes maybe a hundred
+# times as fast, and does the same thing.
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -print0 | \
+  xargs -0 chmod 755
+find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# This makes mame look for its config file (mame.ini) in $HOME/.mame, then /etc.
-echo 'DEFS += -DINI_PATH="\"\$$HOME/.mame;/etc\""' >> makefile
-
-# This is purely cosmetic.
-sed -i 's/DISTRO = generic/DISTRO = slackware/' src/osd/sdl/sdl.mak
-
+  -o -perm 440 -o -perm 400 \) -print0 | \
+  xargs -0 chmod 644
+
+# OK, building modern mame is a bit of a PITA. It uses genie (written
+# in lua, a fork of premake), but you don't get to run genie directly,
+# you got a main makefile that builds lua, then builds genie, then runs
+# genie with arguments based on the options in the main makefile. Also,
+# it uses python to convert XML layout files to C++ code.
+
+# Where possible, use system libraries instead of building the ones
+# bundled with the mame source. However, SBo's lua and Slackware's
+# sqlite3 are too old for mame.
+#USE_SYSTEM_LIB_SQLITE3=1 USE_SYSTEM_LIB_LUA=1 \
+
+# Not going to USE_SYSTEM_LIB_PORTAUDIO or USE_SYSTEM_LIB_PORTMIDI,
+# the bundled versions are fine and I don't want a mile-long dependency
+# tree. Using an external portmidi dep would make mame require Oracle's
+# JDK! In case you're wondering, only the C code in the bundled portmidi
+# is built (no Java needed).
+
+# The OVERRIDE_CC and OVERRIDE_CXX are there because mame's build ignores
+# $PATH when searching for gcc/g++, and won't find my ccache symlinks in
+# /usr/local/bin. On a normal (non-ccache-using) system, these options
+# do nothing (they use the compilers in /usr/bin, which is the default
+# anyway) and you can forget about them. (Mini-rant: PATH has been a
+# standard mechanism on both Unix and DOS/Windows systems for what,
+# 30 or 40 years now? Come on people...)
+
+# This is purely cosmetic, and can't be set on the make command line.
+sed -i 's,ubuntu-intrepid,slackware,g' scripts/genie.lua
+sed -i 's/DISTRO := generic/DISTRO := slackware/' makefile
+
+# SDL_INI_PATH needs to contain a $ character. I haven't figured out
+# how (or even if) I can pass this through multiple layers of make
+# calling genie which calls make again, so screw it:
+sed -i 's,\.;ini,/etc,' src/osd/sdl/sdlmain.c
+
+# Tried several variants of this, none work, ended up using sed:
+#SDL_INI_PATH='$$HOME/.mame;/etc' \
+
+# Having ARCH set in the env will break the build, hence ARCH=""
+
+make USE_SYSTEM_LIB_EXPAT=1 \
+     USE_SYSTEM_LIB_ZLIB=1 \
+     USE_SYSTEM_LIB_JPEG=1 \
+     USE_SYSTEM_LIB_FLAC=1 \
+     OPT_FLAGS="$SLKCFLAGS" \
+     OVERRIDE_CC="$( which gcc )" \
+     OVERRIDE_CXX="$( which g++ )" \
+     ARCH="" \
+     VERBOSE=1 \
+     NOWERROR=1 \
+     TOOLS=1 \
+     TARGET=$PRGNAM \
+     SUBTARGET=$PRGNAM
+
+# No 'make install' target, do it manually.
 mkdir -p $PKG/usr/games $PKG/etc $PKG/usr/man/man6 \
          $PKG/usr/share/applications $PKG/usr/share/pixmaps
 
-# Build and install mame;
-if [ "${MAME:-yes}" = "yes" ]; then
-  echo "BUILDING MAME"
-  make BUILD_FLAC=0 BUILD_JPEG=0 BUILD_EXPAT=0 SUFFIX64="" \
-       BUILD_JPEGLIB=0 BUILD_SQLITE3=0 ARCHOPTS="$SLKCFLAGS" TARGET=mame
-  cp mame $PKG/usr/games
-  cat $CWD/mame.ini > $PKG/etc/mame.ini.new
-  sed 's/@VERSION@/'$VERSION'/g' < $CWD/man/mame.6 | gzip -9c > $PKG/usr/man/man6/mame.6.gz
-  cp $CWD/desktop/mame.desktop $PKG/usr/share/applications
-  cp $CWD/desktop/mame.xpm $PKG/usr/share/pixmaps
-fi
-
-# Optionally build and install mess:
-if [ "${MESS:-no}" = "yes" ]; then
-  echo "BUILDING MESS"
-  make BUILD_FLAC=0 BUILD_JPEG=0 BUILD_EXPAT=0 SUFFIX64="" \
-       BUILD_JPEGLIB=0 BUILD_SQLITE3=0 ARCHOPTS="$SLKCFLAGS" TARGET=mess
-  cp mess $PKG/usr/games
-  gzip -9c $CWD/man/mess.6 > $PKG/usr/man/man6/mess.6.gz
-  cp $CWD/desktop/mess.desktop $PKG/usr/share/applications
-  cp $CWD/desktop/mess.xpm $PKG/usr/share/pixmaps
-fi
-
-# Optionally build and install ume:
-if [ "${UME:-no}" = "yes" ]; then
-  echo "BUILDING UME"
-  make BUILD_FLAC=0 BUILD_JPEG=0 BUILD_EXPAT=0 SUFFIX64="" \
-       BUILD_JPEGLIB=0 BUILD_SQLITE3=0 ARCHOPTS="$SLKCFLAGS" TARGET=ume
-  cp ume $PKG/usr/games
-  cp $CWD/desktop/ume.desktop $PKG/usr/share/applications
-  cp $CWD/desktop/ume.xpm $PKG/usr/share/pixmaps
-fi
-
-# Build and install the tools:
-echo "BUILDING TOOLS"
-make BUILD_JPEG=0 BUILD_EXPAT=0 SUFFIX64="" ARCHOPTS="$SLKCFLAGS" \
-     BUILD_JPEGLIB=0 BUILD_SQLITE3=0 tools
-cp testkeys romcmp jedutil unidasm ldresample ldverify \
+# Deal with upstream's executable-naming silliness.
+[ -e ${PRGNAM}64 ] && mv ${PRGNAM}64 $PRGNAM
+[ -e ${PRGNAM}32 ] && mv ${PRGNAM}32 $PRGNAM
+install -s -m0755 -oroot -groot $PRGNAM $PKG/usr/games/$PRGNAM
+
+# .desktop borrowed from Ludovic Lechapt's Debian package.
+# Icon extracted from src/mame/osd/windows/mame/mame.ico with icotool.
+gzip -9c < src/osd/sdl/man/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
+cat $CWD/desktop/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat $CWD/desktop/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat $CWD/$PRGNAM.ini > $PKG/etc/$PRGNAM.ini.new
+
+# Install the tools:
+install -s -m0755 -oroot -groot \
+   castool floptool imgtool nlwav \
+   testkeys romcmp jedutil unidasm ldresample ldverify \
    regrep srcclean src2html chdman nltool pngcmp split \
    $PKG/usr/games/
 
+# Upstream uses section 1 for their utilities' man pages, we want 6.
+for i in src/osd/sdl/man/*.1; do
+  sed '/^\.TH/s,\<1\>,6,' $i | \
+    gzip -9c > $PKG/usr/man/man6/$( basename $i .1 ).6.gz
+done
+
 # Create empty dirs for the user to populate with ROMs and such.
 for i in roms samples artwork ctrlr font cheat; do
   mkdir -p $PKG/usr/share/games/mame/$i
 done
 
-# Man pages, .desktop, and icon borrowed from Ludovic Lechapt's Debian package.
-for i in chdman jedutil ldverify romcmp testkeys; do
-  gzip -9c $CWD/man/$i.6 > $PKG/usr/man/man6/$i.6.gz
-done
-
 mkdir -p $PKG/usr/doc/${PRGNAM}-$VERSION
 cp docs/* $PKG/usr/doc/${PRGNAM}-$VERSION
 cat $CWD/${PRGNAM}.SlackBuild > $PKG/usr/doc/${PRGNAM}-$VERSION/${PRGNAM}.SlackBuild
diff --git a/games/mame/mame.desktop b/games/mame/mame.desktop
deleted file mode 100644
index 9760346da4..0000000000
--- a/games/mame/mame.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MAME
-Comment=MAME(tm) arcade emulator
-Exec=/usr/games/mame
-Icon=mame
-Terminal=false
-Type=Application
-Categories=Game;
diff --git a/games/mame/mame.info b/games/mame/mame.info
index f2b65ff1e6..19103b0d45 100644
--- a/games/mame/mame.info
+++ b/games/mame/mame.info
@@ -1,10 +1,10 @@
 PRGNAM="mame"
-VERSION="0.160"
+VERSION="0.167"
 HOMEPAGE="http://mamedev.org/"
-DOWNLOAD="https://github.com/mamedev/mame/archive/mame0160.tar.gz"
-MD5SUM="5e05cd67773708e559c339be6b2062c7"
+DOWNLOAD="https://github.com/mamedev/mame/archive/mame0167.tar.gz"
+MD5SUM="70b1e2cde55dc47ca75e401f919fb905"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_ttf"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/mame/mame.ini b/games/mame/mame.ini
index 6cba13f204..a613c52183 100644
--- a/games/mame/mame.ini
+++ b/games/mame/mame.ini
@@ -97,7 +97,7 @@ flicker                   0
 #
 # CORE SOUND OPTIONS
 #
-sound                     1
+sound                     sdl
 samplerate                48000
 samples                   1
 volume                    0
diff --git a/games/mame/mame.xpm b/games/mame/mame.xpm
deleted file mode 100644
index 514ed28870..0000000000
--- a/games/mame/mame.xpm
+++ /dev/null
@@ -1,161 +0,0 @@
-/* XPM */
-static char * mame_xpm[] = {
-"32 32 126 2",
-"  	c None",
-". 	c #1A85BC",
-"+ 	c #1A7EB8",
-"@ 	c #197CB5",
-"# 	c #1F74B5",
-"$ 	c #1764A5",
-"% 	c #1766A9",
-"& 	c #1867AA",
-"* 	c #186CAC",
-"= 	c #1870AE",
-"- 	c #11042C",
-"; 	c #1C024F",
-"> 	c #1E0043",
-", 	c #160139",
-"' 	c #0C0415",
-") 	c #240155",
-"! 	c #160436",
-"~ 	c #26005C",
-"{ 	c #1A1354",
-"] 	c #0B0438",
-"^ 	c #12051E",
-"/ 	c #000003",
-"( 	c #0C133F",
-"_ 	c #1C025A",
-": 	c #0C0219",
-"< 	c #29015F",
-"[ 	c #545180",
-"} 	c #689BB3",
-"| 	c #0A0842",
-"1 	c #140521",
-"2 	c #215582",
-"3 	c #64849B",
-"4 	c #397393",
-"5 	c #2D016B",
-"6 	c #07030B",
-"7 	c #328AC5",
-"8 	c #120645",
-"9 	c #0D040D",
-"0 	c #46A0CE",
-"a 	c #356E8F",
-"b 	c #2B0166",
-"c 	c #250467",
-"d 	c #36017B",
-"e 	c #525274",
-"f 	c #3680B8",
-"g 	c #57B2E6",
-"h 	c #499FD6",
-"i 	c #3B7A9E",
-"j 	c #2D0173",
-"k 	c #340082",
-"l 	c #390282",
-"m 	c #5BB6E7",
-"n 	c #2175B8",
-"o 	c #47AFE6",
-"p 	c #131543",
-"q 	c #27037A",
-"r 	c #5D528A",
-"s 	c #6ED0FE",
-"t 	c #5FC3F5",
-"u 	c #3A049E",
-"v 	c #5400BA",
-"w 	c #3E0196",
-"x 	c #360190",
-"y 	c #2273B4",
-"z 	c #63D5FE",
-"A 	c #6FCBFC",
-"B 	c #140A53",
-"C 	c #43B2E8",
-"D 	c #4DBAF3",
-"E 	c #60C1F3",
-"F 	c #15144D",
-"G 	c #4F5263",
-"H 	c #4CB4ED",
-"I 	c #5CCBFE",
-"J 	c #68879E",
-"K 	c #4DB5F0",
-"L 	c #5500C3",
-"M 	c #4F526B",
-"N 	c #368EC9",
-"O 	c #3D7CA0",
-"P 	c #0E0624",
-"Q 	c #11113C",
-"R 	c #5800D2",
-"S 	c #6B54AF",
-"T 	c #5FD2FE",
-"U 	c #56BFF6",
-"V 	c #57C4FC",
-"W 	c #62BCF1",
-"X 	c #97D9FF",
-"Y 	c #2782CC",
-"Z 	c #5E5293",
-"` 	c #5CC3F9",
-" .	c #89D2FB",
-"..	c #5CBCED",
-"+.	c #92D6FA",
-"@.	c #2B739F",
-"#.	c #2987B8",
-"$.	c #5DBDF1",
-"%.	c #75DAFE",
-"&.	c #327FAB",
-"*.	c #42A6DC",
-"=.	c #1C0454",
-"-.	c #86D4FB",
-";.	c #184D70",
-">.	c #2C7FB1",
-",.	c #56C2F5",
-"'.	c #43A2D5",
-").	c #3FA4D7",
-"!.	c #4D5964",
-"~.	c #56B9ED",
-"{.	c #63DAFE",
-"].	c #7DD0FC",
-"^.	c #2974A3",
-"/.	c #23076B",
-"(.	c #48A5D6",
-"_.	c #77CFFD",
-":.	c #360077",
-"<.	c #2781AF",
-"[.	c #316F96",
-"}.	c #4A5A69",
-"|.	c #250573",
-"1.	c #06101B",
-"2.	c #57B7EF",
-"3.	c #32016F",
-"4.	c #4CA8DA",
-"5.	c #175FA3",
-"                                                                ",
-"                                                                ",
-"    . . . . . . + + + @ @ @ @ @ @ @ # # # # # # # # # # # #     ",
-"    . $ $ % % % % & & & & * * * * * * * # # # # # # # # # =     ",
-"    . $ - ; > ; > ; , ' ' , ) ! ; ~ ) ) ; { ] ) ! - ^ / # =     ",
-"    . % ( _ > : : > ; ' ' ; < > < ~ ) ~ [ } | ) 1 ^ ' / # 2 3 4 ",
-"    . % ( 5 > / 6 > ~ - 1 ) 5 ) 5 ) ) [ } 7 8 ) - ^ 9 / 2 3 0 a ",
-"    . % ( 5 ! / ' ; ~ ! - b c ~ d _ e 0 f g 8 < ! 1 ' / 3 0 h i ",
-"    . % ( j > : - ) b > > k ) b l [ 0 # m m 8 b > ! : 3 0 n o i ",
-"    + % p k d < ) c q j l d > j r 0 # o s m 8 5 ) ! 3 0 # o t i ",
-"    + & p u v w 5 b x u x > - [ 0 y o z A m B j ) 3 0 # C D E i ",
-"    + & F u v u ~ ) u u c - G 0 y H I I s m B b J 0 # K D D E i ",
-"    + & p u L x > , u v j M 0 # H I I I A m F 3 N # D D D H E O ",
-"    @ & ( u L d P , v L r 0 # H z I I I A m } N y D D D D H t O ",
-"    @ & Q u L k > b R S 0 # H T T I I I A U 7 # U V D D K H W O ",
-"    @ & Q u R u j w S } y H z z z z X V A t Y V V D D D K H W i ",
-"    @ * F v R v u Z 0 y H z T z s X D V ` V V V V U  .K H H ..i ",
-"    @ * { v L v Z 0 y H z T T s +.@.#.` ` V V V U +.H H H H $.i ",
-"    @ * { u j [ 0 y H z z T %.+.2 B &.` V V V U +.*.7 o H H ..i ",
-"    @ * p =.M 0 n H z z z %.-.;.j b >.` V ` ,.+.'.p @.*.H H ..i ",
-"    @ * ( M 0 y H z z z %. .;.8 u 5 >.` V t +.).p ] @.*.H H ..i ",
-"    # * !.f y ~.{.z z -.].;.] > x c >.` V +.'.p ) ! ^.*.H H ..i ",
-"    # a 0 y ~.{.z z -.].;./.< ~ d ~ >.` +.'.p b b , ^.(.H H ..i ",
-"    4 f y H {.{.z X _.;.q x :.b j ) <.+.'.p c c b ! [.(.C H ..i ",
-"  }.f N W %.%.%.%.A 2 |.u w x d k =.>.0 ( ] > ; < ! [.*.m m W O ",
-"1.O 7 ~.~.~.2.2.g ;._ x k k k d 3.8 &.( ' ' 1 ! > / ^.'.4.4.4.2 ",
-"] ] 2 2 8 8 8 8 8 _ :.c ) > > > > ! ( 9 : ^ ' 1 : / 6 6 2 ;.6 / ",
-"    # # 5 b b 3.:.j ; > ! 1 ^ ! , > > - 1 ' 9 9 6 / / / . 5.    ",
-"    # # # # # # # # # # # # # @ @ @ @ @ @ @ @ + + + . . . 5.    ",
-"    # # # # # # = = * = * * * * & * * * % $ $ $ $ $ $ 5.5.5.    ",
-"                                                                ",
-"                                                                "};
diff --git a/games/mame/man/chdman.6 b/games/mame/man/chdman.6
deleted file mode 100644
index a5eea6d5e2..0000000000
--- a/games/mame/man/chdman.6
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CHDMAN 6 "December 11, 2008"
-
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-
-.SH "NAME"
-chdman \- CHD compression frontend.
-
-.SH "SYNOPSIS"
-.B chdman
-.RI "OPTION CHDFILE [OPTIONS]"
-
-.SH "DESCRIPTION"
-MAME Compressed Hunks of Data (CHD) manager.
-
-.SH "OPTIONS"
-.IP "-info input.chd"
-.IP "-createraw inputhd.raw output.chd [inputoffs [hunksize]]"
-.IP "-createhd inputhd.raw output.chd [inputoffs [cylinders heads sectors [sectorsize [hunksize]]]]"
-.IP "-createblankhd output.chd cylinders heads sectors [sectorsize [hunksize]]"
-.IP "-createcd input.toc output.chd"
-.IP "-createav input.avi output.chd [firstframe [numframes]]"
-.IP "-copydata input.chd output.chd"
-.IP "-extract input.chd output.raw"
-.IP "-extractcd input.chd output.toc output.bin"
-.IP "-extractav input.chd output.avi [firstframe [numframes]]"
-.IP "-verify input.chd"
-.IP "-verifyfix input.chd"
-.IP "-update input.chd output.chd"
-.IP "-chomp inout.chd output.chd maxhunk"
-.IP "-merge parent.chd diff.chd output.chd"
-.IP "-diff parent.chd compare.chd diff.chd"
-.IP "-setchs inout.chd cylinders heads sectors"
-.IP "-fixavdata inout.chd"
-
-.SH "COPYRIGHT"
-Copyright (C) 1997-2008, Nicola Salmoria and the MAME(tm) team
-
-.SH "AUTHOR"
-Written by Nicola Salmoria and the MAME(tm) team.
-
-.sp 3
-This manual page was written by Ludovic Lechapt <ludomatic@gmail.com>,
-for the Debian project but may be used by others.
diff --git a/games/mame/man/jedutil.6 b/games/mame/man/jedutil.6
deleted file mode 100644
index 22ab96e7f9..0000000000
--- a/games/mame/man/jedutil.6
+++ /dev/null
@@ -1,43 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH JEDUTIL 6 "December 11, 2008"
-
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-
-.SH "NAME"
-jedutil \- JEDEC file utilities.
-
-.SH "SYNOPSIS"
-.B jedutil
-.RI "SOURCE TARGET [OPTION]"
-
-.SH "DESCRIPTION"
-JED file converter.
-
-.SH "OPTIONS"
-.IP "<source.jed> <target.bin> [fuses]"
-convert JED to binary form
-.IP "<source.bin> <target.jed>"
-convert binary to JED form
-
-.SH "COPYRIGHT"
-Copyright (C) 1997-2008, Nicola Salmoria and the MAME(tm) team
-
-.SH "AUTHOR"
-Written by Nicola Salmoria and the MAME(tm) team.
-
-.sp 3
-This manual page was written by Ludovic Lechapt <ludomatic@gmail.com>,
-for the Debian project but may be used by others.
diff --git a/games/mame/man/ldverify.6 b/games/mame/man/ldverify.6
deleted file mode 100644
index 591d24dde5..0000000000
--- a/games/mame/man/ldverify.6
+++ /dev/null
@@ -1,44 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LDVERIFY 6 "December 11, 2008"
-
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-
-.SH "NAME"
-ldverify \- Laserdisc AVI/CHD verifier.
-
-.SH "SYNOPSIS"
-.B ldverify
-.RI "FILENAME"
-
-.SH "DESCRIPTION"
-Utility that checks a laserdisc's data files. Those files are stored in AVI or
-CHD format.
-
-.SH "OPTIONS"
-.IP "<avifile.avi>"
-checks the avi file.
-.IP "<chdfile.chd>"
-checks the chd file.
-
-.SH "COPYRIGHT"
-Copyright (C) 1997-2008, Nicola Salmoria and the MAME(tm) team
-
-.SH "AUTHOR"
-Written by Nicola Salmoria and the MAME(tm) team.
-
-.sp 3
-This manual page was written by Ludovic Lechapt <ludomatic@gmail.com>,
-for the Debian project but may be used by others.
diff --git a/games/mame/man/mame.6 b/games/mame/man/mame.6
deleted file mode 100644
index 13241ce3de..0000000000
--- a/games/mame/man/mame.6
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MAME 6 "March 4, 2009"
-
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-
-.SH "NAME"
-mame \- Multiple Arcade Machine Emulator
-
-.SH "SYNOPSIS"
-.B mame
-.RI "[ Options ] [ ROM_name ]"
-
-.SH "DESCRIPTION"
-Multiple Arcade Machine Emulator using the Simple Direct Media Layer.
-.br
-This manual page documents sdlmame, which is a port of MAME(tm) (Multiple Arcade Machine Emulator) that uses SDL (Simple Direct Media Layer).
-.br
-.ad b
-\fBMAME\fP is an emulator: it reproduces, more or less faithfully, the behaviour of several arcade machines.
-But hardware is useless without software, so an image of the ROMs which run on that hardware is required.
-\fBSuch ROMs, like any other commercial software, are copyrighted material and it is therefore illegal to use them if you don't own the original arcade machine\fP.
-Needless to say, ROMs are not distributed together with MAME(tm).
-Distribution of MAME(tm) together with ROM images is a violation of copyright law and should be promptly reported to the authors so that appropriate legal action can be taken.
-.br
-Keep in mind that you NEED the ROM images to play a game because MAME is not a game emulator, just an arcade machine one.
-.br
-More informations on MAME(tm) available at http://mame.net/
-.br
-\fBSDLMAME\fP original sources are available at http://rbelmont.mameworld.info/
-
-.SH "OPTIONS"
-.B \-showusage
-Show a brief list of options.
-.TP
-.B \-showconfig
-Show a list of configuration options.
-.TP
-.B \-createconfig
-Create a default mame.ini file.
-.TP
-.br
-Basic Startup Options:
-.TP
-.B \-rompath \fI/path/to/rom/files/zipped\fP
-Specify path to ROMsets and hard disk images
-.TP
-.B \-samplepath \fI/path/to/samples\fP
-Specify path to samplesets
-.TP
-.B \-artpath \fI/path/to/artwork/files\fP
-Specify path to artwork files
-.TP
-.B \-ctrlrpath \fI/path/to/controller/definition\fP
-Specify path to controller definitions
-.TP
-.B \-inipath \fI/path/to/ini/file\fP
-Specify path to ini files
-.TP
-.B \-fontpath \fI/path/to/the/fonts\fP
-Specify path to font files
-.TP
-See \fB/usr/doc/sdlmame-@VERSION@/config.txt for more information
-on available options.
-
-.SH "EXAMPLE"
-.B mame
-will launch the emulator in fullscreen mode with game list detected.
-.B mame \fIgridlee\fP
-will launch the game "Gridlee" in fullscreen mode.
-.TP
-.B mame -window \fIgridlee\fP
-will launch the game "Gridlee" in a window.
-.TP
-.B mame -inipath \fI~/.mame/mame.ini\fP gridlee
-will launch the game "Gridlee" using a custom "mame.ini" file stored in the folder ".mame" of your home directory (usually "/home/yourusername/").
-.TP
-.B mame -showconfig
-will output all the mame current configuration.
-
-.SH "FILES"
-.B ~/.mame/mame.ini
-Per-user mame config files. If present, this is used instead of the system-wide
-config.
-.TP
-.B /etc/mame.ini
-System-wide config file for mame, not used if ~/.mame/mame.ini exists.
-.TP
-.B /usr/share/games/mame/
-This is the default location (set in mame.ini) where mame will look for the roms, samples,
-artwork, ctrlr, font, and cheat directories. In other words, read-only
-data. Note that these directories are initially empty when mame is
-installed (except for the font directory).
-.TP
-.B /usr/share/games/mame/roms
-ROM and CHD images. Normally ROMs are kept in zip files named after
-the games, but they may also be extracted into subdirectories named
-after the games instead. CHDs should be placed in subdirectories named
-after the games. See the MAME FAQ for more information:
-.TP
-.nh
-\fIhttp://mamedev.org/devwiki/index.php?title=Frequently_Asked_Questions\fR
-.hy
-.TP
-.B /usr/share/games/mame/artwork
-Cabinet artwork.
-.TP
-.B /usr/share/games/mame/samples
-Audio samples for games whose audio hardware isn't emulated by mame.
-You can find these at various sites on the web. One collection can be
-found at
-.nh
-.TP
-\fIhttp://www.arcadeathome.com/mamewav.phtml\fR
-.hy
-.TP
-.B /usr/share/games/mame/ctrlr
-Custom controller definitions.
-.TP
-.B /usr/share/games/mame/font
-The systemwide mame user interface font lives here, as "ui.bdf". You can replace
-the UI font by replacing this file with some other BDF font. To replace
-on a per-user basis, copy the font to ~/.mame/ui.bdf and delete ~/.mame/ui.bdc
-if it exists.
-.TP
-.B /usr/share/games/mame/cheat
-.TP
-.B /usr/share/games/mame/cheat.zip
-Cheats database. Recent versions of MAME use an XML format for the
-cheat definitions. Normally all the cheats are stored in a zip file "cheat.zip".
-The cheat/ directory is for individual XML files (e.g. if you're developing
-your own cheat for pacman, you'd put it in cheat/pacman.xml). There's no
-need to unpack the cheat.zip unless you're planning to modify it.
-Note that the old cheat.dat format is no longer supported. You can find
-an XML cheat.zip at
-.TP
-.nh
-\fIhttp://cheat.retrogames.com/forums/viewtopic.php?t=3110\fR
-.hy
-.TP
-(Note: the zip file you download from there needs to be unzipped. It
-contains a cheats.zip file; this is the one you copy to /usr/share/games/mame/cheat.zip)
-.TP
-.B ~/.mame/
-This is the default location (set in mame.ini) where mame will create its
-cfg, sta, and other writable data directories (and the files therein).
-See \fB/usr/doc/sdlmame-@VERSION@/config.txt for more information.
-
-.SH "SEE ALSO"
-MAME documentation in \fB/usr/doc/sdlmame-@VERSION@\fR
-.br
-The MAME web site at \fIhttp://mamedev.org/\fR
-
-.SH "COPYRIGHT"
-MAME(tm) - Copyright (C) 1997-2008, Nicola Salmoria and the MAME(tm) team
-.br
-MAME - Copyright (C) Olivier Galibert and R. Belmont.
-
-.SH "AUTHOR"
-MAME(tm) was written by Nicola Salmoria and the MAME(tm) team.
-.br
-sdlmame was written by Olivier Galibert and R. Belmont.
-.sp 3
-This manual page was written by Ludovic Lechapt <ludomatic@gmail.com>,
-for the Debian project but may be used by others, like Ubuntu :)
-.sp 3
-This manual page has been modified by B. Watson <yalhcru@gmail.com> for SlackBuilds.org.
diff --git a/games/mame/man/mess.6 b/games/mame/man/mess.6
deleted file mode 100644
index 879fd0568f..0000000000
--- a/games/mame/man/mess.6
+++ /dev/null
@@ -1,1064 +0,0 @@
-.\"  -*- nroff -*-
-.\"
-.\" mess.6
-.\"
-.\" Man page created from usage and source information:
-.\" * commands: see src/emu/clifront.c clifront.h
-.\" * options: core entries, see src/emu/emuopts.c emuopts.h
-.\"            SDL-specific entries, see src/osd/sdl/sdlmain.c osdsdl.h
-.\" Cesare Falco <cesare.falco@gmail.com>, March 2011
-.\"
-.\" Some text borrowed from the xmame 0.106 man page,
-.\" done by Rene Herrmann <rene.herrmann@berlin.de>, September 2000
-.\" and updated by Andrew Burton <burtona@gol.com>, July 2003
-.\"
-.\" Other info's taken from MESS Wiki as well:
-.\" http://mess.redump.net/
-.\"
-.\"
-.TH mess 6 2011-03-02 0.141 "The Multiple Emulator Super System (MESS)"
-.\"
-.\"
-.\" NAME chapter
-.SH NAME
-MESS \- The Multiple Emulator Super System
-.\"
-.\"
-.\" SYNOPSIS chapter
-.SH SYNOPSIS
-.B mess
-.RI [ options ]
-.I system
-.\"
-.\"
-.\" DESCRIPTION chapter
-.SH DESCRIPTION
-MESS documents the hardware for a wide variety of (mostly vintage) computers,
-video game consoles, and calculators through software emulation. As a nice
-side effect, MESS allows software and games for these hardware platforms
-to run on modern PCs.
-.\"
-.\"
-.\" OPTIONS chapter
-.SH OPTIONS
-.\"
-.\" *******************************************************
-.SS Core commands
-.\" *******************************************************
-.TP
-.B \-help, \-?
-Displays current MESS version and copyright notice.
-.TP
-.B \-validate, \-valid
-Performs internal validation on every driver in MESS. Run this
-before submitting changes to ensure that you haven't violated any of
-the core system rules.
-.\"
-.\" *******************************************************
-.SS Configuration commands
-.\" *******************************************************
-.TP
-.B \-createconfig, \-cc
-Creates the default 'mess.ini' file in the current directory. All the
-configuration options (not commands) described below can be permanently
-changed by editing this configuration file.
-.TP
-.B \-showconfig, \-sc
-Displays the current configuration settings.
-.TP
-.B \-showusage, \-su
-Displays a summary of all the command line options. For options that
-are not mentioned here, the short summary given by \-showusage
-is usually sufficient.
-.\"
-.\" *******************************************************
-.SS Frontend commands
-.\" *******************************************************
-All the '\-list' commands below write info to the screen.
-If you wish to write the info to a textfile instead, use redirection.
-For example,
-.B mess \-listxml > ~/messlist.xml
-writes the full list of supported systems to 'messlist.xml' in your
-home directory.
-.TP
-.B \-listxml, \-lx \fR[\fIsystem\fR|\fIwildcard\fR]
-List comprehensive details for all of the supported systems. The output
-is quite long, so it is usually better to redirect this into a file.
-The output is in XML format. By default all systems are listed; however,
-you can limit this list by specifying a driver name or wildcard.
-.TP
-.B \-listfull, \-ll \fR[\fIsystem\fR|\fIwildcard\fR]
-Displays a list of system driver names and descriptions. By default all
-systems are listed; however, you can limit this list by specifying a
-driver name or wildcard.
-.TP
-.B \-listsource, \-ls \fR[\fIsystem\fR|\fIwildcard\fR]
-Displays a list of drivers and the names of the source files their system
-drivers live in. Useful for finding which driver a system runs on in
-order to fix bugs. By default all systems are listed; however, you can
-limit this list by specifying a driver name or wildcard.
-.TP
-.B \-listclones, \-lc \fR[\fIsystem\fR|\fIwildcard\fR]
-Displays a list of clones. By default all clones are listed; however,
-you can limit this list by specifying a driver name or wildcard.
-.TP
-.B \-listbrothers, \-lb \fR[\fIsystem\fR|\fIwildcard\fR]
-Displays a list of "brothers" or other drivers from same sourcefile.
-By default all systems are listed; however, you can limit this list by
-specifying a driver name or wildcard.
-.TP
-.B \-listcrc
-Displays a full list of CRCs of all ROM images referenced by all
-drivers within MESS code.
-.TP
-.B \-listroms \fIsystem
-Displays a list of ROM images referenced by the specified system.
-.TP
-.B \-listsamples \fIsystem
-Displays a list of samples referenced by the specified system.
-.TP
-.B \-verifyroms \fR[\fIsystem\fR|\fIwildcard\fR]
-Checks for invalid or missing ROM images. By default all drivers that
-have valid ZIP files or directories in the rom path are verified;
-however, you can limit this list by specifying a driver name or
-wildcard.
-.TP
-.B \-verifysamples \fR[\fIsystem\fR|\fIwildcard\fR]
-Checks for invalid or missing samples. By default all drivers that
-have valid ZIP files or directories in the samplepath are verified;
-however, you can limit this list by specifying a driver name or wildcard.
-.TP
-.B \-romident
-Attempts to identify ROM files, if they are known to MESS, in the
-specified .zip file or directory. This command can be used to try and
-identify ROM sets taken from unknown boards. On exit, the errorlevel
-is returned as one of the following:
-.RS
-.TP
-.B 0
-all files were identified
-.TP
-.B 7
-all files were identified except for some "non\-ROM" files
-.TP
-.B 8
-some files were identified
-.TP
-.B 9
-no files were identified
-.RE
-.TP
-.B \-listdevices, \-ld
-Output the list of devices referenced by a given system or set of systems.
-.TP
-.B \-listmedia, \-lm
-Output the list of available media for the system.
-.TP
-.B \-listsoftware
-Output the list of known software for the system.
-.\"
-.\" *******************************************************
-.SS Configuration options
-.\" *******************************************************
-.TP
-.B \-[no]readconfig, \-[no]rc
-Enables or disables the reading of the config files. When enabled
-(which is the default), MESS reads the following config files in order:
-.RS
-.TP 15
-.B mess.ini
-the main configuration file
-.TP
-.IB driver .ini
-based on the source file name of the system driver
-.TP
-.IB parent .ini
-for clones only, may be called recursively
-.TP
-.IB system .ini
-note this sometimes resolves to the same of the source driver
-.P
-The settings in the later ini's override those in the earlier ini's.
-The default is ON (\-readconfig).
-.RE
-.\"
-.\" *******************************************************
-.SS Search path options
-.\" *******************************************************
-Be careful to use the path, directory and file options in
-mess.ini ONLY. Otherwise, the outcome may be unpredictable and not
-consistent across releases.
-.TP
-.B \-rompath, \-rp, \-biospath, \-bp \fIpath
-Specifies a list of paths within which to find ROM or hard disk images.
-Multiple paths can be specified by separating them with semicolons.
-The default is 'roms' (that is, a directory 'roms' in the same directory
-as the MESS executable).
-.TP
-.B \-samplepath, \-sp \fIpath
-Specifies a list of paths within which to find sample files. Multiple
-paths can be specified by separating them with semicolons. The default
-is 'samples' (that is, a directory 'samples' in the same directory as
-the MESS executable).
-.TP
-.B \-artpath, \-artwork_directory \fIpath
-Specifies a list of paths within which to find artwork files. Multiple
-paths can be specified by separating them with semicolons. The default
-is 'artwork' (that is, a directory 'artwork' in the same directory as
-the MESS executable).
-.TP
-.B \-ctrlrpath, \-ctrlr_directory \fIpath
-Specifies a list of paths within which to find controller\-specific
-configuration files. Multiple paths can be specified by separating
-them with semicolons. The default is 'ctrlr' (that is, a
-directory 'ctrlr' in the same directory as the MESS executable).
-.TP
-.B \-inipath \fIpath
-Specifies a list of paths within which to find .ini files. Multiple
-paths can be specified by separating them with semicolons. The default
-is '/etc/mess'.
-.TP
-.B \-fontpath \fIpath
-Specifies a list of paths within which to find .bdf font files. Multiple
-paths can be specified by separating them with semicolons. The default
-is '.' (that is, search in the same directory as the MESS executable).
-.TP
-.B \-cheatpath \fIpath
-Specifies a list of paths within which to find cheat files. Multiple
-paths can be specified by separating them with semicolons. The default
-is 'cheat' (that is, a directory 'cheat' in the same directory as
-the MESS executable).
-.TP
-.B \-crosshairpath \fIpath
-Specifies a list of paths within which to find crosshair files. Multiple
-paths can be specified by separating them with semicolons. The default
-is 'crosshair' (that is, a directory 'crosshair' in the same directory as
-the MESS executable).  If the Crosshair is set to default in the menu,
-MESS will look for system/cross#.png and then cross#.png in the
-specified path, where # is the player number.  Failing that,
-MESS will use built\-in default crosshairs.
-.TP
-.B \-hashpath \fIpath
-Specifies a list of paths within which to search for software hash files.
-Multiple paths can be specified by separating them with semicolons.
-The default is 'hash' (that is, a directory 'hash' in the same directory
-as the MESS executable).
-.\"
-.\" *******************************************************
-.SS Output Directory Options
-.\" *******************************************************
-.TP
-.B \-cfg_directory \fIpath
-Specifies a single directory where configuration files are stored.
-Configuration files store user configurable settings that are read at
-startup and written when MESS exits. The default is 'cfg' (that is,
-a directory 'cfg' in the same directory as the MESS executable). If this
-directory does not exist, it will be automatically created.
-.TP
-.B \-nvram_directory \fIpath
-Specifies a single directory where NVRAM files are stored. NVRAM files
-store the contents of EEPROM and non\-volatile RAM (NVRAM) for systems
-which used this type of hardware. This data is read at startup and
-written when MESS exits. The default is 'nvram' (that is, a
-directory 'nvram' in the same directory as the MESS executable). If this
-directory does not exist, it will be automatically created.
-.TP
-.B \-memcard_directory \fIpath
-Specifies a single directory where memory card files are stored. Memory
-card files store the contents of removable memory cards for systems which
-used this type of hardware. This data is read and written under control
-of the user via the 'Memory Card' menu in the user interface. The
-default is 'memcard' (that is, a directory 'memcard' in the same
-directory as the MESS executable). If this directory does not exist,
-it will be automatically created.
-.TP
-.B \-input_directory \fIpath
-Specifies a single directory where input recording files are stored.
-Input recordings are created via the \-record option and played back via
-the \-playback option. The default is 'inp' (that is, a directory 'inp'
-in the same directory as the MESS executable). If this directory
-does not exist, it will be automatically created.
-.TP
-.B \-state_directory \fIpath
-Specifies a single directory where save state files are stored. Save
-state files are read and written either upon user request, or when using
-the \-autosave option. The default is 'sta' (that is, a directory 'sta'
-in the same directory as the MESS executable). If this directory does
-not exist, it will be automatically created.
-.TP
-.B \-snapshot_directory \fIpath
-Specifies a single directory where screen snapshots are stored, when
-requested by the user. The default is 'snap' (that is, a directory 'snap'
-in the same directory as the MESS executable). If this directory
-does not exist, it will be automatically created.
-.TP
-.B \-diff_directory \fIpath
-Specifies a single directory where hard drive differencing files are
-stored. Hard drive differencing files store any data that is written
-back to a hard disk image, in order to preserve the original image. The
-differencing files are created at startup when a system with a hard disk
-image. The default is 'diff' (that is, a directory 'diff' in the same
-directory as the MESS executable). If this directory does not exist,
-it will be automatically created.
-.TP
-.B \-comment_directory \fIpath
-Specifies a single directory where debugger comment files are stored.
-Debugger comment files are written by the debugger when comments are
-added to the disassembly for a system. The default is 'comments' (that is,
-a directory 'comments' in the same directory as the MESS executable).
-If this directory does not exist, it will be automatically created.
-.\"
-.\" *******************************************************
-.SS State/playback options
-.\" *******************************************************
-.TP
-.B \-state \fIslot
-Immediately after starting the specified system, will cause the save
-state in the specified slot to be loaded.
-.TP
-.B \-[no]autosave
-When enabled, automatically creates a save state file when exiting MESS
-and automatically attempts to reload it when later starting MESS with
-the same system. This only works for systems that have explicitly enabled
-save state support in their driver. The default is OFF (\-noautosave).
-.TP
-.B \-playback, \-pb \fIfile
-Specifies a file from which to play back a series of system inputs. This
-feature does not work reliably for all systems, but can be used to watch
-a previously recorded system session from start to finish. In order to
-make things consistent, you should only record and playback with all
-configuration (.cfg), NVRAM (.nv), and memory card files deleted. The
-default is NULL (no playback).
-.TP
-.B \-record, \-rec \fIfile
-Specifies a file to record all input from a system session. This can be
-used to record a system session for later playback. This feature does not
-work reliably for all systems, but can be used to watch a previously
-recorded system session from start to finish. In order to make things
-consistent, you should only record and playback with all configuration
-(.cfg), NVRAM (.nv), and memory card files deleted. The default is NULL
-(no recording).
-.TP
-.B \-snapname \fIname
-Describes how MESS should name files for snapshots.
-.I name
-is a string that provides a template that is used to generate a file name.
-Three simple substitutions are provided:
-.RS
-.TP
-.B /
-represents the path separator on any target platform (even Windows)
-.TP
-.B %g
-represents the driver name of the current system
-.TP
-.B %i
-represents an incrementing index. If omitted, then each snapshot taken
-will overwrite the previous one; otherwise, MESS will find the next
-empty value for %i and use that for a file name.
-.P
-The default is '%g/%i', which creates a separate folder for each system,
-and names the snapshots under it starting with 0000 and increasing
-from there.
-.RE
-.TP
-.B \-snapsize \fIwidth\fRx\fIheight
-Hard\-codes the size for snapshots and movie recording. By default,
-MESS will create snapshots at the system's current resolution in raw
-pixels, and will create movies at the system's starting resolution in
-raw pixels. If you specify this option, then MESS will create both
-snapshots and movies at the size specified, and will bilinear filter
-the result. Note that this size does not automatically rotate if the
-system is vertically oriented. The default is 'auto'.
-.TP
-.B \-snapview internal\fR|\fBauto\fR|\fIview
-Specifies the view to use when rendering snapshots and movies.
-.RS
-.TP 12
-.B internal
-renders a separate snapshot per screen or renders movies only of the
-first screen using the special 'internal' view.
-.TP
-.B auto
-selects the first view with all screens present
-.TP
-.I view
-select the first view whose name matches all the characters.
-For example,
-.B mame \-snapview native
-will match the "Native (15:14)" view even though it is not a perfect
-match.
-.P
-The default value is 'internal'.
-.RE
-.TP
-.B \-mngwrite \fIfile
-Writes each video frame to the given file in MNG format, producing
-an animation of the system session.
-Note that \-mngwrite only writes video frames; it does not save any audio
-data. Use \-wavwrite for that, and reassemble the audio/video using
-offline tools. The default is NULL (no recording).
-.TP
-.B \-aviwrite \fIfile
-Stream video and sound data to the given file
-in AVI format, producing an animation of the system session complete
-with sound. The default is NULL (no recording).
-.TP
-.B \-wavwrite \fIfile
-Writes the final mixer output to the given file
-in WAV format, producing an audio recording of the system session.
-The default is NULL (no recording).
-.TP
-.B \-[no]burnin
-Tracks brightness of the screen during play and at the end of
-emulation generates a PNG that can be used to simulate burn\-in
-effects on other systems. The resulting PNG is created such that the
-least\-used areas of the screen are fully white (since burned\-in areas
-are darker, all other areas of the screen must be lightened a touch).
-The intention is that this PNG can be loaded via an artwork file with
-a low alpha (e.g, 0.1\-0.2 seems to work well) and blended over the
-entire screen. The PNG files are saved in the snap directory under
-the system/burnin\-<screen.name>.png. The default is OFF (\-noburnin).
-.\"
-.\" *******************************************************
-.SS Performance options
-.\" *******************************************************
-.TP
-.B \-[no]autoframeskip, \-[no]afs
-Automatically determines the frameskip level while you're playing the
-system, adjusting it constantly in a frantic attempt to keep the system
-running at full speed. Turning this on overrides the value you have set
-for \-frameskip below. The default is OFF (\-noautoframeskip).
-.TP
-.B \-frameskip, \-fs \fIvalue
-Specifies the frameskip value (autoframeskip must be disabled). This is the
-number of frames out of every 12 to drop when running. For example, if you
-say \-frameskip 2, then MESS will display 10 out of every 12 frames. By
-skipping those frames, you may be able to get full speed in a system that
-requires more horsepower than your computer has. The default value is 0,
-which skips no frames.
-.TP
-.B \-seconds_to_run, \-str \fIvalue
-This option can be used for benchmarking and automated testing. It tells
-MESS to stop execution after a fixed number of seconds. By combining
-this with a fixed set of other command line options, you can set up a
-consistent environment for benchmarking MESS performance. In addition,
-upon exit, the \-str option will write a screenshot called final.png
-to the system's snapshot directory.
-.TP
-.B \-[no]throttle
-Configures the default thottling setting. When throttling is on, MESS
-attempts to keep the system running at the system's intended speed. When
-throttling is off, MESS runs the system as fast as it can. Note that the
-fastest speed is more often than not limited by your graphics card,
-especially for older systems. The default is ON (\-throttle).
-.TP
-.B \-[no]sleep
-Allows MESS to give time back to the system when running with \-throttle.
-This allows other programs to have some CPU time, assuming that the
-system isn't taxing 100% of your CPU resources. This option can potentially
-cause hiccups in performance if other demanding programs are running.
-The default is ON (\-sleep).
-.TP
-.B \-speed
-Controls the speed of gameplay, relative to realtime; smaller numbers are
-slower. Default is 1.00.
-.TP
-.B \-refreshspeed, \-rs
-Automatically adjusts the \-speed parameter to keep the effective refresh
-rate below that of the lowest screen refresh rate.
-.\"
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.TP
-.B \-multithreading, \-mt
-Enable multithreading; this enables rendering and blitting on a separate
-thread. The default is OFF.
-.TP
-.B \-numprocessors, \-np
-Set number of processors; this overrides the number the system reports.
-.TP
-.B \-sdlvideofps
-Show SDL video performance.
-.\"
-.\" *******************************************************
-.SS Rotation options
-.\" *******************************************************
-.TP
-.B \-[no]rotate
-Rotate the system to match its normal state (horizontal/vertical). This
-ensures that both vertically and horizontally oriented systems show up
-correctly without the need to rotate your monitor. If you want to keep
-the system displaying 'raw' on the screen the way the actual machine would
-have, turn this option off. The default is ON (\-rotate).
-.TP
-.B \-[no]ror
-.TP
-.B \-[no]rol
-Rotate the system screen to the right (clockwise) or left
-(counter\-clockwise) relative to either its normal state (if \-rotate
-is specified) or its native state (if \-norotate is specified). The
-default for both of these options is OFF (\-noror \-norol).
-.TP
-.B \-[no]autoror
-.TP
-.B \-[no]autorol
-These options are designed for use with pivoting screens that only
-pivot in a single direction. If your screen only pivots clockwise,
-use \-autorol to ensure that the system will fill the screen either
-horizontally or vertically in one of the directions you can handle.
-If your screen only pivots counter\-clockwise, use \-autoror.
-.TP
-.B \-[no]flipx
-.TP
-.B \-[no]flipy
-Flip (mirror) the system screen either horizontally (\-flipx) or
-vertically (\-flipy). The flips are applied after the \-rotate and
-\-ror/\-rol options are applied. The default for both of these options
-is OFF (\-noflipx \-noflipy).
-.\"
-.\" *******************************************************
-.SS Artwork options
-.\" *******************************************************
-.TP
-.B \-[no]artwork_crop, \-[no]artcrop
-Enable cropping of artwork to the system screen area only. This
-option can also be controlled via the Video Options menu in the user
-interface. The default is OFF (\-noartwork_crop).
-.TP
-.B \-[no]use_backdrops, \-[no]backdrop
-Enables/disables the display of backdrops. The default is ON
-(\-use_backdrops).
-.TP
-.B \-[no]use_overlays, \-[no]overlay
-Enables/disables the display of overlays. The default is ON
-(\-use_overlays).
-.TP
-.B \-[no]use_bezels, \-[no]bezel
-Enables/disables the display of bezels. The default is ON
-(\-use_bezels).
-.\"
-.\" *******************************************************
-.SS Screen options
-.\" *******************************************************
-.TP
-.B \-brightness \fIvalue
-Controls the default brightness, or black level, of the system screens.
-This option does not affect the artwork or other parts of the display.
-Using the MESS UI, you can individually set the brightness for each system
-screen; this option controls the initial value for all visible system
-screens. The standard value is 1.0. Selecting lower values (down to 0.1)
-will produce a darkened display, while selecting higher values (up to
-2.0) will give a brighter display. The default is 1.0.
-.TP
-.B \-contrast \fIvalue
-Controls the contrast, or white level, of the system screens. This option
-does not affect the artwork or other parts of the display. Using the
-MESS UI, you can individually set the contrast for each system screen;
-this option controls the initial value for all visible system screens. The
-standard value is 1.0. Selecting lower values (down to 0.1) will produce
-a dimmer display, while selecting higher values (up to 2.0) will
-give a more saturated display. The default is 1.0.
-.TP
-.B \-gamma \fIvalue
-Controls the gamma, which produces a potentially nonlinear black to
-white ramp, for the system screens. This option does not affect the
-artwork or other parts of the display. Using the MESS UI, you can
-individually set the gamma for each system screen; this option controls
-the initial value for all visible system screens. The standard value is
-1.0, which gives a linear ramp from black to white. Selecting lower
-values (down to 0.1) will increase the nonlinearity toward black,
-while selecting higher values (up to 3.0) will push the nonlinearity
-toward white. The default is 1.0.
-.TP
-.B \-pause_brightness \fIvalue
-This controls the brightness level when MESS is paused. The default
-value is 0.65.
-.\"
-.\" *******************************************************
-.SS Vector rendering options
-.\" *******************************************************
-.TP
-.B \-[no]antialias, \-[no]aa
-Enables antialiased line rendering for vector systems. The default is ON
-(\-antialias).
-.TP
-.B \-beam \fIwidth
-Sets the width of the vectors. This is a scaling factor against the
-standard vector width. A value of 1.0 will keep the default vector line
-width. Smaller values will reduce the width, and larger values will
-increase the width. The default is 1.0.
-.TP
-.B \-flicker \fIvalue
-Simulates a vector "flicker" effect, similar to a vector monitor that
-needs adjustment. This option requires a float argument in the range of
-0.00\-100.00 (0=none, 100=maximum). The default is 0.
-.\"
-.\" *******************************************************
-.SS Video options
-.\" *******************************************************
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.TP
-.B \-video soft\fR|\fBopengl\fR|\fBopengl16\fR|\fBnone
-Specifies which video subsystem to use for drawing:
-.RS
-.TP 12
-.B soft
-uses software rendering, which is slower but more compatible.
-.TP
-.B opengl
-uses OpenGL and your graphics accelerator to speed up many
-aspects of drawing MESS including compositing artwork, overlays, and
-bezels, as well as stretching the image to fit your screen.
-.TP
-.B opengl16
-uses alternate OpenGL code, which should provide faster
-output on some cards.
-.TP
-.B none
-does no drawing and is intended for CPU benchmarking.
-.P
-Default is 'soft'.
-.RE
-.TP
-.B \-[no]window, \-[no]w
-Run MESS in either full screen or a window. This is a fully\-featured window
-mode where the window resizes as necessary to track what the system does.
-And you can resize it yourself with your OS's standard window controls.
-The default is OFF (\-nowindow).
-.TP
-.B \-[no]maximize, \-[no]max
-Controls initial window size in windowed mode. If it is set on, the
-window will initially be set to the maximum supported size when you
-start MESS. If it is turned off, the window will start out at the
-smallest supported size. This option only has an effect when the
-\-window option is used. The default is ON (\-maximize).
-.TP
-.B \-keepaspect, \-ka
-Forces the correct aspect ratio. This means when you're resizing the window
-in windowed mode the actual system image will resize in discrete steps to
-maintain the proper shape of the system graphics. If you turn this off you can
-resize the window to anything you like and get funny squishing and stretching.
-The same applies for full\-screen. Default is ON (\-keepaspect).
-.TP
-.B \-unevenstretch, \-ues
-Allow non\-integer stretch factors. Video purists should stay far, far away
-from this option, while everyone else will be happy to know that it lets you
-fill the screen properly in full\-screen mode. Default is ON (\-unevenstretch).
-.TP
-.B \-effect none\fR|\fIfile
-Name of a PNG file to use for visual effects, or 'none'. Default is 'none'.
-.TP
-.B \-centerh
-Center horizontally within the view area. Default is ON (\-centerh).
-.TP
-.B \-centerv
-Center vertically within the view area. Default is ON (\-centerv).
-.TP
-.B \-waitvsync
-Enable waiting for the start of VBLANK before flipping screens;
-reduces tearing effects.
-.\"
-.\" *******************************************************
-.SS Software video rendering subsystem options
-.\" *******************************************************
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-All the options in this group are available only with softare video
-rendering subsystem (\-video soft).
-.TP
-.B \-prescale \fIvalue
-Scale screen rendering by this amount in software. Default is 1.
-.TP
-.B \-scalemode, \-sm none\fR|\fBasync\fR|\fByv12\fR|\fByuy2\fR\
-|\fByv12x2\fR|\fByuy2x2
-Hardware scaling mode.
-.RS
-.TP 12
-.B none
-use software rendering
-.TP
-.B async
-async overlay
-.TP
-.B yv12
-yv12 overlay
-.TP
-.B yuy2
-yuy2 overlay
-.TP
-.B yv12x2
-yv12 overlay using x2 prescaling
-.TP
-.B yuy2x2
-yuy2 overlay using x2 prescaling
-.P
-Default is 'none'.
-.RE
-.\"
-.\" *******************************************************
-.SS OpenGL video rendering subsystem options
-.\" *******************************************************
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-All the options in this group are available only with OpenGL video
-rendering subsystem (\-video opengl or \-video opengl16).
-.TP
-.B \-filter, \-glfilter, \-flt
-Enable bilinear filtering on screen output. Default is ON (\-filter).
-.TP
-.B \-gl_forcepow2texture
-Force power of two textures. Default is NO.
-.TP
-.B \-gl_notexturerect
-Don't use OpenGL GL_ARB_texture_rectangle. Default is ON: turn off
-(set this to 0) if corruption occurs in OpenGL mode, at cost of some
-performance loss.
-.TP
-.B \-gl_vbo
-Enable OpenGL VBO, if available, for a performance increase.
-Default is ON: turn off (set this to 0) if corruption occurs.
-.TP
-.B \-gl_pbo
-Enable OpenGL PBO, if available, for a performance increase.
-Default is ON: turn off (set this to 0) if corruption occurs.
-.TP
-.B \-gl_glsl
-Enable OpenGL GLSL, if available, for a performance increase.
-.TP
-.B \-gl_glsl_filter \fIvalue
-Enable OpenGL GLSL filtering instead of FF filtering. Allowed values are
-.RS
-.TP 8
-.B 0
-plain
-.TP
-.B 1
-bilinear
-.P
-Default is 1.
-.RE
-.TP
-.BR \-glsl_shader_mame #
-Preferred custom OpenGL GLSL shader set mame bitmap, with # ranging
-from 0 to 9.
-.TP
-.BR \-glsl_shader_screen #
-Preferred custom OpenGL GLSL shader screen bitmap, with # ranging
-from 0 to 9.
-.TP
-.B \-gl_glsl_vid_attr
-Enable OpenGL GLSL handling of brightness and contrast. Better RGB system
-performance for free. Default is ON.
-.TP
-.B \-resolution, \-r
-Select the resolution to use in full\-screen mode; \-switchres must
-be enabled for this to work.
-.\"
-.\" *******************************************************
-.SS Full screen options
-.\" *******************************************************
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.TP
-.B \-[no]switchres
-Affects full screen mode only. Chooses if MESS can try to change the
-screen resolution (color depth is normally left alone) when in
-full\-screen mode. If it's off, you always get your desktop resolution
-in full\-screen mode (which can be useful for LCDs).
-.TP
-.B \-useallheads
-Split full screen image across monitors.
-.\"
-.\" *******************************************************
-.SS Sound options
-.\" *******************************************************
-.TP
-.B \-[no]sound
-Enable or disable sound altogether. The default is ON (\-sound).
-.TP
-.B \-samplerate, \-sr \fIvalue
-Sets the audio sample rate. Smaller values (e.g. 11025) cause lower
-audio quality but faster emulation speed. Higher values (e.g. 48000)
-cause higher audio quality but slower emulation speed. The default is
-48000.
-.TP
-.B \-[no]samples
-Use samples if available. The default is ON (\-samples).
-.TP
-.B \-volume, \-vol \fIvalue
-Sets the startup volume. It can later be changed with the user interface
-(see Keys section). The volume is an attenuation in dB:
-for example, '\-volume \-12' will start with \-12dB attenuation.
-The default is 0.
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.TP
-.B \-audio_latency \fIvalue
-This controls the amount of latency built into the audio streaming.
-The latency parameter controls the lower threshold. The default is 3;
-increase to reduce glitches, decrease for responsiveness.
-.\"
-.\" *******************************************************
-.SS Input options
-.\" *******************************************************
-.TP
-.B \-[no]coin_lockout, \-[no]coinlock
-Enables simulation of the "coin lockout" feature that is implemented
-on a number of arcade game PCBs. It was up to the operator whether or not
-the coin lockout outputs were actually connected to the coin
-mechanisms. If this feature is enabled, then attempts to enter a coin
-while the lockout is active will fail and will display a popup message
-in the user interface. If this feature is disabled, the coin lockout
-signal will be ignored. The default is ON (\-coin_lockout).
-.TP
-.B \-ctrlr \fIcontroller
-Enables support for special controllers. Configuration files are
-loaded from the ctrlrpath. They are in the same format as the .cfg
-files that are saved, but only control configuration data is read
-from the file. The default is NULL (no controller file).
-.TP
-.B \-[no]mouse
-Controls whether or not MESS looks for a mouse controller to use. Note
-that in many cases, lightguns are treated as mice by the operating
-system, so you may need to enable this to enable lightgun support. When
-this is enabled, you will not be able to use your mouse while running
-MESS. If you want to get control of your computer back, you will need
-to either pause MESS or quit. The default is OFF (\-nomouse).
-.TP
-.B \-[no]joystick, \-[no]joy
-Controls whether or not MESS looks for joystick/gamepad controllers.
-The default is ON (\-joystick).
-.TP
-.B \-[no]lightgun, \-[no]gun
-Controls whether or not MESS makes use of lightgun controllers.
-Note that most lightguns map to the mouse, so using \-lightgun and
-\-mouse together may produce strange results. The default is OFF
-(\-nolightgun).
-.TP
-.B \-[no]multikeyboard, \-[no]multikey
-Determines whether MESS differentiates between multiple keyboards.
-Some systems may report more than one keyboard; by default, the data
-from all of these keyboards is combined so that it looks like a single
-keyboard. Turning this option on will enable MESS to report keypresses
-on different keyboards independently. The default is OFF
-(\-nomultikeyboard).
-.TP
-.B \-[no]multimouse
-Determines whether MESS differentiates between multiple mice. Some
-systems may report more than one mouse device; by default, the data
-from all of these mice is combined so that it looks like a single
-mouse. Turning this option on will enable MESS to report mouse
-movement and button presses on different mice independently. The
-default is OFF (\-nomultimouse).
-.TP
-.B \-[no]steadykey, \-[no]steady
-Some systems require two or more buttons to be pressed at exactly the
-same time to make special moves. Due to limitations in the PC keyboard
-hardware, it can be difficult or even impossible to accomplish that
-using the standard keyboard handling. This option selects a different
-handling that makes it easier to register simultaneous button presses,
-but has the disadvantage of making controls less responsive. The
-default is OFF (\-nosteadykey).
-.TP
-.B \-[no]offscreen_reload, \-[no]reload
-Controls whether or not MESS treats a second button input from a
-lightgun as a reload signal. In this case, MESS will report the gun's
-position as (0,MAX) with the trigger held, which is equivalent to an
-offscreen reload. This is only needed for systems that required you to
-shoot offscreen to reload, and then only if your gun does not support
-off screen reloads. The default is OFF (\-nooffscreen_reload).
-.TP
-.B \-joystick_map, \-joymap \fImap
-Controls how joystick values map to digital joystick controls.
-See /usr/share/doc/mame\-common/config.txt for full details on
-joymap format.
-.TP
-.B \-joystick_deadzone, \-joy_deadzone, \-jdz \fIvalue
-If you play with an analog joystick, the center can drift a little.
-joystick_deadzone tells how far along an axis you must move before the
-axis starts to change. This option expects a float in the range of
-0.0 to 1.0. Where 0 is the center of the joystick and 1 is the outer
-limit. The default is 0.3.
-.TP
-.B \-joystick_saturation, \-joy_saturation, \-jsat \fIvalue
-If you play with an analog joystick, the ends can drift a little,
-and may not match in the +/\- directions. joystick_saturation tells how
-far along an axis movement change will be accepted before it reaches
-the maximum range. This option expects a float in the range of 0.0 to
-1.0, where 0 is the center of the joystick and 1 is the outer limit.
-The default is 0.85.
-.TP
-.B \-natural, \-nat
-Specifies whether to use a natural keyboard or not.
-.TP
-.B \-uimodekey, \-umk
-Specifies the key used to toggle between full and partial UI mode.
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.TP
-.B \-keymap
-Enable keymap for non\-QWERTY keyboards. Used in conjunction
-with \-keymap_file.
-.TP
-.B \-keymap_file \fIfile
-Specifies the full path to the keymap file to be used. A few
-keymap files are available in /usr/share/games/mame\-common/keymaps.
-.TP
-.B \-joy_idx1 \fIjoystick
-.TP
-.B \-joy_idx2 \fIjoystick
-.TP
-.B \-joy_idx3 \fIjoystick
-.TP
-.B \-joy_idx4 \fIjoystick
-.TP
-.B \-joy_idx5 \fIjoystick
-.TP
-.B \-joy_idx6 \fIjoystick
-.TP
-.B \-joy_idx7 \fIjoystick
-.TP
-.B \-joy_idx8 \fIjoystick
-With these options you can assign a joystick to a
-specific index in MESS. Even if the kernel will list the joysticks
-in a different order on the next boot, MESS will still see the joystick
-as e.g. 'Joystick 2'. Use
-.B mess \-v
-to see which joysticks are recognized. Default is AUTO.
-.TP
-.B \-sixaxis
-Use special handling for PS3 Sixaxis controllers.
-.TP
-.B \-videodriver, \-vd x11\fR|\fBdirectfb\fR|\fBauto
-SDL video driver to use; auto selects SDL default.
-.TP
-.B \-audiodriver, \-ad alsa\fR|\fBarts\fR|\fBauto
-SDL audio driver to use; auto selects SDL default.
-.TP
-.B \-gl_lib alsa\fR|\fBarts\fR|\fBauto
-Alternative libGL.so to use; auto selects SDL default.
-.\"
-.\" *******************************************************
-.SS Input automatic enable options
-.\" *******************************************************
-.TP
-.B \-paddle_device, \-paddle none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-adstick_device, \-adstick none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-pedal_device, \-pedal none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-dial_device, \-dial none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-trackball_device, \-trackball none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-lightgun_device none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-positional_device none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-.TP
-.B \-mouse_device none\fR|\fBkeyboard\fR|\fBmouse\fR\
-|\fBlightgun\fR|\fBjoystick
-Each of these options controls auto\-enabling the mouse, or joystick
-depending on the presence of a particular class of analog
-control for a particular system. For example, if you specify the option
-\-paddle mouse, then any system that has a paddle control will automatically
-enable mouse controls just as if you had explicitly specified \-mouse.
-Note that these controls override the values of \-[no]mouse,
-\-[no]joystick, etc.
-.\"
-.\" *******************************************************
-.SS Debugging options
-.\" *******************************************************
-.TP
-.B \-[no]log
-Creates a file called error.log which contains all of the internal
-log messages generated by the MESS core and system drivers. The default
-is OFF (\-nolog).
-.TP
-.B \-[no]verbose, \-[no]v
-Displays internal diagnostic information. This information is very
-useful for debugging problems with your configuration.
-Please use the \-verbose option and include the resulting information
-when reporting bugs. The default is OFF (\-noverbose).
-.TP
-.B \-update_in_pause
-Enables updating the screen bitmap while the system is paused. This is
-useful for debuggin in some scenarios (and gets in the way in others).
-.TP
-.B \-[no]debug, \-[no]d
-Activates the integrated debugger. By default, the debugger is entered
-by pressing the tilde (~) key during emulation. It is also entered
-immediately at startup. The default is OFF (\-nodebug).
-.TP
-.B \-debugscript \fIfile
-Specifies a file that contains a list of debugger commands to execute
-immediately upon startup. The default is NULL (no commands).
-.TP
-.B \-debug_internal, \-di
-Use the internal debugger for debugging.
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.\" SDL specific
-.\" +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-.TP
-.B \-[no]oslog
-Outputs the error.log data to the system debugger. This can be used at
-the same time as \-log to output the log data to both targets as well.
-Default is OFF (\-nooslog).
-.\"
-.\" *******************************************************
-.SS UI options
-.\" *******************************************************
-.TP
-.B \-uifont
-Specify a font to use.
-.TP
-.B \-newui, \-nu
-Use the new MESS UI.
-.\"
-.\" *******************************************************
-.SS Misc options
-.\" *******************************************************
-.TP
-.B \-bios default\fR|\fIbios
-Specifies the specific BIOS to use with the current system, for
-systems that make use of a BIOS. The \-listxml output will list all of
-the possible BIOS names for a system. The default is 'default'.
-.TP
-.B \-[no]cheat, \-[no]c
-Enables the reading of the cheat database, if present, and the Cheat
-menu in the user interface. The	default is OFF (\-nocheat).
-.TP
-.B \-[no]skip_gameinfo
-Forces MESS to skip displaying the system info screen. The default is OFF
-(\-noskip_gameinfo).
-.TP
-.B \-ramsize, \-ram
-Size of RAM (if supported by driver).
-.TP
-.B \-writeconfig, \-wc
-Writes configuration to
-.IB driver .ini
-on exit.
-.\"
-.\"
-.\" FILES chapter
-.SH FILES
-.TP
-.B /etc/mess/mess.ini
-Main configuration file
diff --git a/games/mame/man/romcmp.6 b/games/mame/man/romcmp.6
deleted file mode 100644
index 347c2e9a61..0000000000
--- a/games/mame/man/romcmp.6
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ROMCMP 6 "December 11, 2008"
-
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-
-.SH "NAME"
-romcmp \- ROM comparison utility program.
-
-.SH "SYNOPSIS"
-.B romcmp
-.RI "[OPTION] [FOLDER|ZIPFILE] [FOLDER|ZIPFILE]"
-
-.SH "DESCRIPTION"
-Utility that checks/compare a single or set of ROMs.
-
-.SH "OPTIONS"
-.IP "-d"
-enable slower (more comprehensive) comparison.
-
-.SH "COPYRIGHT"
-Copyright (C) 1997-2008, Nicola Salmoria and the MAME(tm) team
-
-.SH "AUTHOR"
-Written by Nicola Salmoria and the MAME(tm) team.
-
-.sp 3
-This manual page was written by Ludovic Lechapt <ludomatic@gmail.com>,
-for the Debian project but may be used by others.
diff --git a/games/mame/man/testkeys.6 b/games/mame/man/testkeys.6
deleted file mode 100644
index 1900c9c0a4..0000000000
--- a/games/mame/man/testkeys.6
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TESTKEYS 6 "December 11, 2008"
-
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-
-.SH "NAME"
-testkeys \- Code identifier for key pressed.
-
-.SH "SYNOPSIS"
-.B testkeys
-.RI ""
-
-.SH "DESCRIPTION"
-Utility that returns the code of the key being pressed or released.
-
-.SH "COPYRIGHT"
-Copyright (C) 1997-2008, Nicola Salmoria and the MAME(tm) team
-
-.SH "AUTHOR"
-Written by Nicola Salmoria and the MAME(tm) team.
-
-.sp 3
-This manual page was written by Ludovic Lechapt <ludomatic@gmail.com>,
-for the Debian project but may be used by others.
diff --git a/games/marathon-data/marathon-data.SlackBuild b/games/marathon-data/marathon-data.SlackBuild
index 033cb4169f..1f87988270 100644
--- a/games/marathon-data/marathon-data.SlackBuild
+++ b/games/marathon-data/marathon-data.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=marathon-data
-VERSION=${VERSION:-20140104}
+VERSION=${VERSION:-20150620}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,9 +44,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 # back in some future release
 #mv $DATADIR/"$ZIPNAME"/*.html $PKG/usr/doc/$PRGNAM-$VERSION
 
-mkdir -p $PKG/usr/bin
-cat $CWD/$WRAPPER > $PKG/usr/bin/$WRAPPER
-chmod 0755 $PKG/usr/bin/$WRAPPER
+mkdir -p $PKG/usr/games
+cat $CWD/$WRAPPER > $PKG/usr/games/$WRAPPER
+chmod 0755 $PKG/usr/games/$WRAPPER
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$WRAPPER.desktop > $PKG/usr/share/applications/$WRAPPER.desktop
diff --git a/games/marathon-data/marathon-data.info b/games/marathon-data/marathon-data.info
index 4e242e43ae..68f3df7415 100644
--- a/games/marathon-data/marathon-data.info
+++ b/games/marathon-data/marathon-data.info
@@ -1,8 +1,8 @@
 PRGNAM="marathon-data"
-VERSION="20140104"
-HOMEPAGE="http://marathon.sourceforge.net/"
-DOWNLOAD="http://files3.bungie.org/trilogy/Marathon-20140104-Data.zip"
-MD5SUM="df0480526f539c31cd4856072a24aa94"
+VERSION="20150620"
+HOMEPAGE="https://alephone.lhowon.org/"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20150620/Marathon-20150620-Data.zip"
+MD5SUM="0d32fb35b670f0dd055f7f1c75da0952"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="alephone"
diff --git a/games/marathon-eternal-data/README b/games/marathon-eternal-data/README
new file mode 100644
index 0000000000..7f31d0b017
--- /dev/null
+++ b/games/marathon-eternal-data/README
@@ -0,0 +1,24 @@
+marathon-eternal-data (game data for use with alephone)
+
+Eternal is a free scenario for Aleph One, the multi-platform,
+open-source, first-person-shooter engine derived from Bungie's
+Marathon engine. It continues the story of the Marathon trilogy,
+and is a nearly total conversion, featuring:
+
+  * Fifty-two new levels, some revisiting familiar locations from
+    the original Marathon trilogy.  
+  * Over six hundred fifty new high-resolution textures, including
+    a dozen original landscape textures, from a variety of human
+    and alien environments.
+  * Eight all new weapons, many of which must be scavenged from your
+    defeated enemies.
+  * Over a dozen tracks of original music, including many remixes of
+    your favorite tracks from the original Marathon.
+  * And several new creatures and characters, alongside the complete
+    cast from the original trilogy.
+
+Included in the package is a shell script wrapper. Type "marathon-eternal"
+or select Marathon Eternal X from the KDE or XFCE "Games" menu.
+
+To install the gamedata in /opt instead of /usr to save space in the
+root partition use use OPT=yes ./marathon-eternal-data.SlackBuild
diff --git a/games/marathon-eternal-data/doinst.sh b/games/marathon-eternal-data/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/marathon-eternal-data/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/marathon-eternal-data/marathon-eternal-data.SlackBuild b/games/marathon-eternal-data/marathon-eternal-data.SlackBuild
new file mode 100644
index 0000000000..48a007448a
--- /dev/null
+++ b/games/marathon-eternal-data/marathon-eternal-data.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for Marathon Eternal X
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=marathon-eternal-data
+VERSION=${VERSION:-1.1.0}
+SRCVER=$(echo $VERSION | tr -d .)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+# install gamedata in opt instead of usr
+OPT=${OPT:-no}
+if [ "${OPT:-yes}" == "yes" ]; then
+    DATA="/opt/AlephOne"
+else
+    DATA="/usr/share/AlephOne/gamedata"
+fi
+
+ZIPNAME=EternalX
+ZIPFILE=${ZIPNAME}v${SRCVER}Full.zip
+WRAPPER=marathon-eternal
+DATADIR=$PKG$DATA
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $DATADIR
+unzip $CWD/$ZIPFILE -d $DATADIR
+
+chown -R root:root $DATADIR
+
+# NB: the usual find predicate is different (zipfile stores +x permissions
+# on some files for no good reason)
+find $DATADIR \
+ \( -type f -exec chmod 644 {} \; \) -o \
+ \( -type d -exec chmod 755 {} \; \)
+
+# Write launcher script to the user's path
+mkdir -p $PKG/usr/games
+cat > $PKG/usr/games/$WRAPPER <<EOF
+#!/bin/sh
+ALEPHONE_DATA="$DATA/Eternal $VERSION"
+export ALEPHONE_DATA
+exec alephone "\$@"
+EOF
+find $PKG/usr/games -perm 644 -exec chmod 755 {} \;
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$WRAPPER.desktop <<EOF
+[Desktop Entry]
+Name=Marathon Eternal X
+Exec=$WRAPPER
+Icon=alephone
+Type=Application
+Comment=Marathon Eternal X (first-person shooter game)
+Categories=Game;ActionGame;
+EOF
+
+# Don't want this
+rm -rf $DATADIR/__MACOSX
+
+# Remove unneeded hidden files
+find $DATADIR -name ".[^.]*" -mindepth 1 -print0 | xargs -0r rm -rf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/marathon-eternal-data/marathon-eternal-data.info b/games/marathon-eternal-data/marathon-eternal-data.info
new file mode 100644
index 0000000000..f1405ce9f0
--- /dev/null
+++ b/games/marathon-eternal-data/marathon-eternal-data.info
@@ -0,0 +1,10 @@
+PRGNAM="marathon-eternal-data"
+VERSION="1.1.0"
+HOMEPAGE="http://eternal.bungie.org/index.php"
+DOWNLOAD="http://eternal.bungie.org/files/_releases/EternalXv110Full.zip"
+MD5SUM="9881140a7836c46869a3c985ce2c1709"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="alephone"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/games/marathon-eternal-data/slack-desc b/games/marathon-eternal-data/slack-desc
new file mode 100644
index 0000000000..7b1d9556bd
--- /dev/null
+++ b/games/marathon-eternal-data/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+marathon-eternal-data: marathon-eternal-data (game data for use with alephone)
+marathon-eternal-data:
+marathon-eternal-data: Eternal is a free scenario for Aleph One, the multi-platform,
+marathon-eternal-data: open-source, first-person-shooter engine derived from Bungie's
+marathon-eternal-data: Marathon engine. It continues the story of the Marathon trilogy,
+marathon-eternal-data: and is a nearly total conversion.
+marathon-eternal-data:
+marathon-eternal-data: Homepage: http://eternal.bungie.org/index.php
+marathon-eternal-data:
+marathon-eternal-data:
+marathon-eternal-data:
diff --git a/games/marathon-evil-data/README b/games/marathon-evil-data/README
new file mode 100644
index 0000000000..bf560ac4fa
--- /dev/null
+++ b/games/marathon-evil-data/README
@@ -0,0 +1,12 @@
+marathon-evil-data (game data for use with alephone)
+
+Marathon: EVIL was the first conversion for Marathon Infinity, and
+is regarded as one of the scariest and finest.
+
+Marathon: EVIL features a few new weapons and monsters.
+
+Included in the package is a shell script wrapper. Type "marathon-evil"
+or select Marathon EVIL from the KDE or XFCE "Games" menu.
+
+To install the gamedata in /opt instead of /usr to save space in the
+root partition use use OPT=yes ./marathon-evil-data.SlackBuild
diff --git a/games/marathon-evil-data/doinst.sh b/games/marathon-evil-data/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/marathon-evil-data/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/marathon-evil-data/marathon-evil-data.SlackBuild b/games/marathon-evil-data/marathon-evil-data.SlackBuild
new file mode 100644
index 0000000000..157d417124
--- /dev/null
+++ b/games/marathon-evil-data/marathon-evil-data.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for Marathon: EVIL
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=marathon-evil-data
+VERSION=${VERSION:-20110331} # Last modified date from the zipfile's http header
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+# install gamedata in opt instead of usr
+OPT=${OPT:-no}
+if [ "${OPT:-yes}" == "yes" ]; then
+    DATA="/opt/AlephOne"
+else
+    DATA="/usr/share/AlephOne/gamedata"
+fi
+
+ZIPNAME=MarathonEvil
+ZIPFILE=$ZIPNAME.zip
+WRAPPER=marathon-evil
+DATADIR=$PKG$DATA
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $DATADIR
+unzip $CWD/$ZIPFILE -d $DATADIR
+
+chown -R root:root $DATADIR
+
+# NB: the usual find predicate is different (zipfile stores +x permissions
+# on some files for no good reason)
+find $DATADIR \
+ \( -type f -exec chmod 644 {} \; \) -o \
+ \( -type d -exec chmod 755 {} \; \)
+
+# Write launcher script to the user's path
+mkdir -p $PKG/usr/games
+cat > $PKG/usr/games/$WRAPPER <<EOF
+#!/bin/sh
+ALEPHONE_DATA="$DATA/Marathon EVIL"
+export ALEPHONE_DATA
+exec alephone "\$@"
+EOF
+find $PKG/usr/games -perm 644 -exec chmod 755 {} \;
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$WRAPPER.desktop <<EOF
+[Desktop Entry]
+Name=Marathon EVIL
+Exec=$WRAPPER
+Icon=alephone
+Type=Application
+Comment=Marathon: EVIL (first-person shooter game)
+Categories=Game;ActionGame;
+EOF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/marathon-evil-data/marathon-evil-data.info b/games/marathon-evil-data/marathon-evil-data.info
new file mode 100644
index 0000000000..f69d50d11f
--- /dev/null
+++ b/games/marathon-evil-data/marathon-evil-data.info
@@ -0,0 +1,10 @@
+PRGNAM="marathon-evil-data"
+VERSION="20110331"
+HOMEPAGE="http://bighouse.bungie.org/evil/"
+DOWNLOAD="http://files3.bungie.org/trilogy/MarathonEvil.zip"
+MD5SUM="3438be7747dae785c3ed52da3aa8d2da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="alephone"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/marathon-evil-data/slack-desc b/games/marathon-evil-data/slack-desc
new file mode 100644
index 0000000000..e81818ec15
--- /dev/null
+++ b/games/marathon-evil-data/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+marathon-evil-data: marathon-evil-data (game data for use with alephone)
+marathon-evil-data:
+marathon-evil-data: Marathon: EVIL was the first conversion for Marathon Infinity, and
+marathon-evil-data: is regarded as one of the scariest and finest.
+marathon-evil-data:
+marathon-evil-data: Marathon: EVIL features a few new weapons and monsters.
+marathon-evil-data:
+marathon-evil-data: Homepage: http://bighouse.bungie.org/evil/
+marathon-evil-data:
+marathon-evil-data:
+marathon-evil-data:
\ No newline at end of file
diff --git a/games/marathon-infinity-data/marathon-infinity-data.SlackBuild b/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
index c9512d2ca3..20454ae935 100644
--- a/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
+++ b/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=marathon-infinity-data
-VERSION=${VERSION:-20140104}
+VERSION=${VERSION:-20150620}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,9 +39,9 @@ find $DATADIR \
  \( -type f -exec chmod 644 {} \; \) -o \
  \( -type d -exec chmod 755 {} \; \)
 
-mkdir -p $PKG/usr/bin
-cat $CWD/$WRAPPER > $PKG/usr/bin/$WRAPPER
-chmod 0755 $PKG/usr/bin/$WRAPPER
+mkdir -p $PKG/usr/games
+cat $CWD/$WRAPPER > $PKG/usr/games/$WRAPPER
+chmod 0755 $PKG/usr/games/$WRAPPER
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$WRAPPER.desktop > $PKG/usr/share/applications/$WRAPPER.desktop
diff --git a/games/marathon-infinity-data/marathon-infinity-data.info b/games/marathon-infinity-data/marathon-infinity-data.info
index a6214adb08..ff5c57e3a7 100644
--- a/games/marathon-infinity-data/marathon-infinity-data.info
+++ b/games/marathon-infinity-data/marathon-infinity-data.info
@@ -1,8 +1,8 @@
 PRGNAM="marathon-infinity-data"
-VERSION="20140104"
-HOMEPAGE="http://marathon.sourceforge.net/games/infinity.php"
-DOWNLOAD="http://files3.bungie.org/trilogy/MarathonInfinity-20140104-Data.zip"
-MD5SUM="a0c4047674809f889aa328961fcddba3"
+VERSION="20150620"
+HOMEPAGE="https://alephone.lhowon.org/"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20150620/MarathonInfinity-20150620-Data.zip"
+MD5SUM="a9293f7d54f3c2051dd1b33829210ae2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="alephone"
diff --git a/games/marathon-red-data/README b/games/marathon-red-data/README
new file mode 100644
index 0000000000..dd6e12c259
--- /dev/null
+++ b/games/marathon-red-data/README
@@ -0,0 +1,12 @@
+marathon-red-data (game data for use with alephone package)
+
+Created to be a survival horror-esque conversion, Marathon RED is
+widely known as the single most difficult of all conversions.
+
+Marathon RED features a new arsenal of weapons, new monsters and textures.
+
+Included in the package is a shell script wrapper. Type "marathon-red"
+or select Marathon RED from the KDE or XFCE "Games" menu.
+
+To install the gamedata in /opt instead of /usr to save space in the
+root partition use use OPT=yes ./marathon-red-data.SlackBuild
diff --git a/games/marathon-red-data/doinst.sh b/games/marathon-red-data/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/marathon-red-data/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/marathon-red-data/marathon-red-data.SlackBuild b/games/marathon-red-data/marathon-red-data.SlackBuild
new file mode 100644
index 0000000000..e7913bee73
--- /dev/null
+++ b/games/marathon-red-data/marathon-red-data.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for Marathon RED
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=marathon-red-data
+VERSION=${VERSION:-20110331} # Last modified date from the zipfile's http header
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+# install gamedata in opt instead of usr
+OPT=${OPT:-no}
+if [ "${OPT:-yes}" == "yes" ]; then
+    DATA="/opt/AlephOne"
+else
+    DATA="/usr/share/AlephOne/gamedata"
+fi
+
+ZIPNAME=MarathonRED
+ZIPFILE=$ZIPNAME.zip
+WRAPPER=marathon-red
+DATADIR=$PKG$DATA
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $DATADIR
+unzip $CWD/$ZIPFILE -d $DATADIR
+
+chown -R root:root $DATADIR
+
+# NB: the usual find predicate is different (zipfile stores +x permissions
+# on some files for no good reason)
+find $DATADIR \
+ \( -type f -exec chmod 644 {} \; \) -o \
+ \( -type d -exec chmod 755 {} \; \)
+
+# Write launcher script to the user's path
+mkdir -p $PKG/usr/games
+cat > $PKG/usr/games/$WRAPPER <<EOF
+#!/bin/sh
+ALEPHONE_DATA="$DATA/Marathon RED"
+export ALEPHONE_DATA
+exec alephone "\$@"
+EOF
+find $PKG/usr/games -perm 644 -exec chmod 755 {} \;
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$WRAPPER.desktop <<EOF
+[Desktop Entry]
+Name=Marathon RED
+Exec=$WRAPPER
+Icon=alephone
+Type=Application
+Comment=Marathon RED (first-person shooter game)
+Categories=Game;ActionGame;
+EOF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/marathon-red-data/marathon-red-data.info b/games/marathon-red-data/marathon-red-data.info
new file mode 100644
index 0000000000..ce48750016
--- /dev/null
+++ b/games/marathon-red-data/marathon-red-data.info
@@ -0,0 +1,10 @@
+PRGNAM="marathon-red-data"
+VERSION="20110331"
+HOMEPAGE="http://bighouse.bungie.org/red/"
+DOWNLOAD="http://files3.bungie.org/trilogy/MarathonRED.zip"
+MD5SUM="a6b2318e1e1d52230faf6656c694e7b7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="alephone"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/marathon-red-data/slack-desc b/games/marathon-red-data/slack-desc
new file mode 100644
index 0000000000..32ce06cfc2
--- /dev/null
+++ b/games/marathon-red-data/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+marathon-red-data: marathon-red-data (game data for use with alephone package)
+marathon-red-data:
+marathon-red-data: Created to be a survival horror-esque conversion, Marathon RED is
+marathon-red-data: widely known as the single most difficult of all conversions.
+marathon-red-data:
+marathon-red-data: Marathon RED features a new arsenal of weapons, new monsters and textures.
+marathon-red-data:
+marathon-red-data: Homepage: http://bighouse.bungie.org/red/
+marathon-red-data:
+marathon-red-data:
+marathon-red-data:
diff --git a/games/marathon-rubicon-data/README b/games/marathon-rubicon-data/README
new file mode 100644
index 0000000000..117728dbac
--- /dev/null
+++ b/games/marathon-rubicon-data/README
@@ -0,0 +1,13 @@
+marathon-rubicon-data (game data for use with alephone)
+
+Rubicon X is a free, cross platform, first person shooter that
+continues the story of Bungie’s Marathon trilogy. First released as
+Marathon:Rubicon in 2001, Rubicon X is a complete overhaul of the
+original. It features all new high-resolution artwork, new and
+updated maps, and enough surprises to feel like a whole new game.
+
+Included in the package is a shell script wrapper. Type "marathon-rubicon"
+or select Marathon Rubicon X from the KDE or XFCE "Games" menu.
+
+To install the gamedata in /opt instead of /usr to save space in the
+root partition use use OPT=yes ./marathon-rubicon-data.SlackBuild
diff --git a/games/marathon-rubicon-data/doinst.sh b/games/marathon-rubicon-data/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/marathon-rubicon-data/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/marathon-rubicon-data/marathon-rubicon-data.SlackBuild b/games/marathon-rubicon-data/marathon-rubicon-data.SlackBuild
new file mode 100644
index 0000000000..7838eaf523
--- /dev/null
+++ b/games/marathon-rubicon-data/marathon-rubicon-data.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for Marathon: Rubicon X
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=marathon-rubicon-data
+VERSION=${VERSION:-20060807} # Last modified date from the zipfile's http header
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+# install gamedata in opt instead of usr
+OPT=${OPT:-no}
+if [ "${OPT:-yes}" == "yes" ]; then
+    DATA="/opt/AlephOne"
+else
+    DATA="/usr/share/AlephOne/gamedata"
+fi
+
+ZIPNAME=marathonRubiconX
+ZIPFILE=$ZIPNAME.zip
+WRAPPER=marathon-rubicon
+DATADIR=$PKG$DATA
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $DATADIR
+unzip $CWD/$ZIPFILE -d $DATADIR
+
+chown -R root:root $DATADIR
+
+# NB: the usual find predicate is different (zipfile stores +x permissions
+# on some files for no good reason)
+find $DATADIR \
+ \( -type f -exec chmod 644 {} \; \) -o \
+ \( -type d -exec chmod 755 {} \; \)
+
+# Write launcher script to the user's path
+mkdir -p $PKG/usr/games
+cat > $PKG/usr/games/$WRAPPER <<EOF
+#!/bin/sh
+ALEPHONE_DATA="$DATA/Rubicon X Æ’"
+export ALEPHONE_DATA
+exec alephone "\$@"
+EOF
+find $PKG/usr/games -perm 644 -exec chmod 755 {} \;
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$WRAPPER.desktop <<EOF
+[Desktop Entry]
+Name=Marathon Rubicon X 
+Exec=$WRAPPER
+Icon=alephone
+Type=Application
+Comment=Marathon: Rubicon X (first-person shooter game)
+Categories=Game;ActionGame;
+EOF
+
+# Don't want this
+rm -rf $DATADIR/__MACOSX
+
+# Remove unneeded hidden files
+find $DATADIR -name ".[^.]*" -mindepth 1 -print0 | xargs -0r rm -rf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/marathon-rubicon-data/marathon-rubicon-data.info b/games/marathon-rubicon-data/marathon-rubicon-data.info
new file mode 100644
index 0000000000..9d743b8502
--- /dev/null
+++ b/games/marathon-rubicon-data/marathon-rubicon-data.info
@@ -0,0 +1,10 @@
+PRGNAM="marathon-rubicon-data"
+VERSION="20060807"
+HOMEPAGE="http://www.marathonrubicon.com/"
+DOWNLOAD="http://files5.bungie.org/marathon/marathonRubiconX.zip"
+MD5SUM="a91a091d4b02082464e7a93f551ba221"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="alephone"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/marathon-rubicon-data/slack-desc b/games/marathon-rubicon-data/slack-desc
new file mode 100644
index 0000000000..4acc9e4bd0
--- /dev/null
+++ b/games/marathon-rubicon-data/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+marathon-rubicon-data: marathon-rubicon-data (game data for use with alephone)
+marathon-rubicon-data:
+marathon-rubicon-data: Rubicon X is a free, cross platform, first person shooter that
+marathon-rubicon-data: continues the story of Bungie’s Marathon trilogy. First released as
+marathon-rubicon-data: Marathon:Rubicon in 2001, Rubicon X is a complete overhaul of the
+marathon-rubicon-data: original. It features all new high-resolution artwork, new and
+marathon-rubicon-data: updated maps, and enough surprises to feel like a whole new game.
+marathon-rubicon-data:
+marathon-rubicon-data: Homepage: http://www.marathonrubicon.com/
+marathon-rubicon-data:
+marathon-rubicon-data:
diff --git a/games/marathon2-data/marathon2-data.SlackBuild b/games/marathon2-data/marathon2-data.SlackBuild
index 2b44e5260b..b62cad707e 100644
--- a/games/marathon2-data/marathon2-data.SlackBuild
+++ b/games/marathon2-data/marathon2-data.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=marathon2-data
-VERSION=${VERSION:-20140104}
+VERSION=${VERSION:-20150620}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,9 +39,9 @@ find $DATADIR \
  \( -type f -exec chmod 644 {} \; \) -o \
  \( -type d -exec chmod 755 {} \; \)
 
-mkdir -p $PKG/usr/bin
-cat $CWD/$WRAPPER > $PKG/usr/bin/$WRAPPER
-chmod 0755 $PKG/usr/bin/$WRAPPER
+mkdir -p $PKG/usr/games
+cat $CWD/$WRAPPER > $PKG/usr/games/$WRAPPER
+chmod 0755 $PKG/usr/games/$WRAPPER
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$WRAPPER.desktop > $PKG/usr/share/applications/$WRAPPER.desktop
diff --git a/games/marathon2-data/marathon2-data.info b/games/marathon2-data/marathon2-data.info
index ec8f9e8563..a434772afb 100644
--- a/games/marathon2-data/marathon2-data.info
+++ b/games/marathon2-data/marathon2-data.info
@@ -1,8 +1,8 @@
 PRGNAM="marathon2-data"
-VERSION="20140104"
-HOMEPAGE="http://marathon.sourceforge.net/"
-DOWNLOAD="http://files3.bungie.org/trilogy/Marathon2-20140104-Data.zip"
-MD5SUM="c5107a37174c3b42f134d31a6aff18b5"
+VERSION="20150620"
+HOMEPAGE="https://alephone.lhowon.org/"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20150620/Marathon2-20150620-Data.zip"
+MD5SUM="3f63fa7aaae381989a4500ae0f219ab3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="alephone"
diff --git a/games/mednafen/mednafen.SlackBuild b/games/mednafen/mednafen.SlackBuild
index a086ca6724..6fb093d10c 100644
--- a/games/mednafen/mednafen.SlackBuild
+++ b/games/mednafen/mednafen.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Slackware build script for mednafen
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mednafen
-VERSION=${VERSION:-0.9.38.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.9.38.7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,8 +70,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+##
+## Switched to clang as 14.1's version of gcc will compile mednafen,
+## but will not run mednafen, failing a compiler code generation
+## test (http://forum.fobby.net/index.php?t=msg&th=1126&start=0&).
+## Unfortunately our version of clang has its own issues ...
+## The 'CXXFLAGS': "-D__float128=void" and "-D__STRICT_ANSI__",
+## will both work, but seem to give a drop in performance
+## on some machines. Using "-std=c++11" works on stable
+## and current, and seems to be the best option at this point.
+##
+## Note that the CLANGFLAGS are only set if the user has
+## the affected version of llvm.
+##
+if [ "`clang --version | grep '3.3'`" ]; then
+  CLANGFLAGS="-std=c++11"
+fi
+
 CC=clang CXX=clang++ \
-CXXFLAGS+="-D__STRICT_ANSI__" \
+CXXFLAGS+="$CLANGFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib$LIBDIRSUFFIX \
diff --git a/games/mednafen/mednafen.info b/games/mednafen/mednafen.info
index b99781e2d4..7c25c62bce 100644
--- a/games/mednafen/mednafen.info
+++ b/games/mednafen/mednafen.info
@@ -1,8 +1,8 @@
 PRGNAM="mednafen"
-VERSION="0.9.38.5"
+VERSION="0.9.38.7"
 HOMEPAGE="http://mednafen.sourceforge.net"
-DOWNLOAD="https://prdownloads.sourceforge.net/mednafen/mednafen-0.9.38.5.tar.bz2"
-MD5SUM="ad8d2bea9dd3ae85c8c380c2cd031632"
+DOWNLOAD="http://mednafen.fobby.net/releases/files/mednafen-0.9.38.7.tar.bz2"
+MD5SUM="e49c6b4c0c8278bc01c63cba9b54498c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/mgba/README b/games/mgba/README
index 71b0ed148c..f3535e2251 100644
--- a/games/mgba/README
+++ b/games/mgba/README
@@ -2,9 +2,18 @@ mGBA is an emulator for running Game Boy Advance games. It aims to be
 faster and more accurate than many existing Game Boy Advance
 emulators, as well as adding features that other emulators lack.
 
-Optional dependencies are:
+The following optional dependencies will be automatically detected.
 
-* qt5 (for the GUI)
 * SDL2
 * libedit (for the command-line debugger)
 * ffmpeg
+
+If you have Qt 5 and CMake 3, then you can build mGBA with a GUI:
+
+    QT=on ./mGBA.SlackBuild
+
+As an alternative to running mGBA as an application, you might consider
+running RetroArch with its mGBA core. RetroArch SlackBuilds, including
+one for its mGBA core, are here:
+
+	https://github.com/duganchen/slackware-libretro
diff --git a/games/mgba/correct_libdir.patch b/games/mgba/correct_libdir.patch
deleted file mode 100644
index 582d94f38e..0000000000
--- a/games/mgba/correct_libdir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN mgba-0.2.1.orig/CMakeLists.txt mgba-0.2.1/CMakeLists.txt
---- mgba-0.2.1.orig/CMakeLists.txt	2015-05-13 22:07:20.000000000 -0700
-+++ mgba-0.2.1/CMakeLists.txt	2015-07-19 16:17:46.572058303 -0700
-@@ -37,7 +37,11 @@ if(NOT CMAKE_BUILD_TYPE)
- 	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type (e.g. Release or Debug)" FORCE)
- endif()
- 
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+if (NOT DEFINED LIBDIR)
-+	set(LIBDIR "lib")
-+endif()
-+
-+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
- 
- include(GNUInstallDirs)
- 
-@@ -322,14 +326,14 @@ if(BUILD_SHARED)
- 	if(BUILD_STATIC)
- 		add_library(${BINARY_NAME}-static STATIC ${SRC})
- 		set_target_properties(${BINARY_NAME}-static PROPERTIES COMPILE_DEFINITIONS "${FEATURE_DEFINES}")
--		install(TARGETS ${BINARY_NAME}-static DESTINATION lib COMPONENT lib${BINARY_NAME})
-+		install(TARGETS ${BINARY_NAME}-static DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME})
- 	endif()
- else()
- 	add_library(${BINARY_NAME} STATIC ${SRC})
- endif()
- 
- target_link_libraries(${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB})
--install(TARGETS ${BINARY_NAME} DESTINATION lib COMPONENT lib${BINARY_NAME})
-+install(TARGETS ${BINARY_NAME} DESTINATION ${LIBDIR} COMPONENT lib${BINARY_NAME})
- set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI} COMPILE_DEFINITIONS "${FEATURE_DEFINES}")
- 
- if(BUILD_LIBRETRO)
diff --git a/games/mgba/mgba.SlackBuild b/games/mgba/mgba.SlackBuild
index 51eee66448..96878322b4 100644
--- a/games/mgba/mgba.SlackBuild
+++ b/games/mgba/mgba.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mgba
-VERSION=${VERSION:-0.2.1}
+VERSION=${VERSION:-0.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,6 +40,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Set to on to build the Qt GUI. Requires Qt 5 and CMake 3.
+QT=${QT:-off}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -60,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,9 +73,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 
-# Install libraries into the correct directories.
-patch -p1 --verbose < $CWD/correct_libdir.patch
-
 mkdir -p build
 cd build
   cmake \
@@ -80,6 +80,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DLIBDIR=lib$LIBDIRSUFFIX \
+	-DBUILD_QT=${QT} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/games/mgba/mgba.info b/games/mgba/mgba.info
index bd0e373af7..f401703943 100644
--- a/games/mgba/mgba.info
+++ b/games/mgba/mgba.info
@@ -1,10 +1,10 @@
 PRGNAM="mgba"
-VERSION="0.2.1"
-HOMEPAGE="https://endrift.com/mgba/"
-DOWNLOAD="https://github.com/mgba-emu/mgba/archive/0.2.1.tar.gz"
-MD5SUM="7138c88638baeabe20aa05805b862698"
+VERSION="0.3.2"
+HOMEPAGE="https://mgba.io/"
+DOWNLOAD="https://github.com/mgba-emu/mgba/archive/0.3.2.tar.gz"
+MD5SUM="04d111daa79b21b96219f7e884245ddc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README%"
+REQUIRES=""
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/games/minetest/minetest.SlackBuild b/games/minetest/minetest.SlackBuild
index b2d82a5041..7de6b197bd 100644
--- a/games/minetest/minetest.SlackBuild
+++ b/games/minetest/minetest.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for minetest
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=minetest
-VERSION=${VERSION:-0.4.12}
+VERSION=${VERSION:-0.4.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix man page path
+sed -i "s/share\/man/man/" CMakeLists.txt
+
 mkdir -p build
 cd build
   cmake \
@@ -84,15 +87,11 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man
-mv $PKG/usr/share/man/man6 $PKG/usr/man
-rm -rf $PKG/usr/share/man
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt minetest.conf* doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/minetest/minetest.info b/games/minetest/minetest.info
index 96791f3edd..36e8505540 100644
--- a/games/minetest/minetest.info
+++ b/games/minetest/minetest.info
@@ -1,8 +1,8 @@
 PRGNAM="minetest"
-VERSION="0.4.12"
+VERSION="0.4.13"
 HOMEPAGE="http://minetest.net/"
-DOWNLOAD="https://github.com/minetest/minetest/archive/0.4.12.tar.gz"
-MD5SUM="67d383346ffa08819d062a65614291d6"
+DOWNLOAD="https://github.com/minetest/minetest/archive/0.4.13.tar.gz"
+MD5SUM="e3385b55faeb1164ac5349dd9b21b461"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL luajit irrlicht"
diff --git a/games/minetest_game/minetest_game.SlackBuild b/games/minetest_game/minetest_game.SlackBuild
index a2f186b496..d7441d3fbb 100644
--- a/games/minetest_game/minetest_game.SlackBuild
+++ b/games/minetest_game/minetest_game.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for minetest_game
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=minetest_game
-VERSION=${VERSION:-0.4.12}
+VERSION=${VERSION:-0.4.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/minetest_game/minetest_game.info b/games/minetest_game/minetest_game.info
index 222e808aff..c58ec1126b 100644
--- a/games/minetest_game/minetest_game.info
+++ b/games/minetest_game/minetest_game.info
@@ -1,8 +1,8 @@
 PRGNAM="minetest_game"
-VERSION="0.4.12"
+VERSION="0.4.13"
 HOMEPAGE="http://minetest.net/"
-DOWNLOAD="https://github.com/minetest/minetest_game/archive/0.4.12.tar.gz"
-MD5SUM="3fb2f7c3ec549a38f6458d2269075071"
+DOWNLOAD="https://github.com/minetest/minetest_game/archive/0.4.13.tar.gz"
+MD5SUM="cc02e8844bbfbd14a3545a202ef38772"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="minetest"
diff --git a/games/mog/mog.info b/games/mog/mog.info
index 3e7962f948..5b348cbab9 100644
--- a/games/mog/mog.info
+++ b/games/mog/mog.info
@@ -1,7 +1,7 @@
 PRGNAM="mog"
 VERSION="0.63.1458"
 HOMEPAGE="http://www.braingames.getput.com/mog/"
-DOWNLOAD="http://braingames.jorito.net/mog/downloads/mog.src_0.63-1548.tgz"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mog.src_0.63-1548.tgz"
 MD5SUM="68604c258ce7347662777d853d895769"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/naev/README b/games/naev/README
index 8ba1031ac0..359f56c996 100644
--- a/games/naev/README
+++ b/games/naev/README
@@ -8,4 +8,5 @@ missions, equipment, and ships; Even the galaxy itself grows larger with each
 release. For the literarily-inclined, there are large amounts of lore 
 accompanying everything from planets to equipment.
 
-The ndata download (included in the info file) is required to play.
+The ndata download (included in the info file) is required to play. This is
+a very large file (289M as of 0.6.0) so metered connections beware.
diff --git a/games/naev/naev.SlackBuild b/games/naev/naev.SlackBuild
index 2a5605d8dd..82059af66f 100644
--- a/games/naev/naev.SlackBuild
+++ b/games/naev/naev.SlackBuild
@@ -22,7 +22,7 @@
 # that is unlikely, as I am rather tall.
 
 PRGNAM=naev
-VERSION=0.5.3
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,7 +66,7 @@ find -L . \
   -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/$PRGNAM
-cat $CWD/ndata-$VERSION > $PKG/usr/share/$PRGNAM/ndata
+cat $CWD/ndata-$VERSION.zip > $PKG/usr/share/$PRGNAM/ndata
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/games/naev/naev.info b/games/naev/naev.info
index f0731a3364..5641e9625c 100644
--- a/games/naev/naev.info
+++ b/games/naev/naev.info
@@ -1,10 +1,10 @@
 PRGNAM="naev"
-VERSION="0.5.3"
+VERSION="0.6.0"
 HOMEPAGE="http://blog.naev.org"
-DOWNLOAD="http://sourceforge.net/projects/naev/files/naev-0.5.3/naev-0.5.3.tar.bz2 \
-          http://sourceforge.net/projects/naev/files/naev-0.5.3/ndata-0.5.3"
-MD5SUM="bec719b3daa33ec190d785120a7b0159 \
-        652db194ffd2f45fc5f8ecee2ad2985c"
+DOWNLOAD="http://sourceforge.net/projects/naev/files/naev-0.6.0/naev-0.6.0.tar.bz2 \
+          http://sourceforge.net/projects/naev/files/naev-0.6.0/ndata-0.6.0.zip"
+MD5SUM="b796352ae810c986934d9259dc12b0dc \
+        b4b4d92af0dc1fb5d6dc32407427e82e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="JK Wood"
diff --git a/games/nestopia/README b/games/nestopia/README
index f82e5e9794..15ad9c5da2 100644
--- a/games/nestopia/README
+++ b/games/nestopia/README
@@ -7,4 +7,9 @@ A 1Ghz CPU and 128MB RAM are required to get the best performance.
 A Disk System BIOS (disksys.rom) is optional and, of course, not included. If
 you have one, put it in ~/.nestopia
 
-Note: parallel building is supported with a max of 2 jobs.
+Note 1: parallel building is supported with a max of 2 jobs.
+
+Note 2: To play NES games, consider using RetroArch with the Nestopia core
+instead. SlackBuilds can be found here:
+
+	https://github.com/duganchen/slackware-libretro
diff --git a/games/nethack/README b/games/nethack/README
index 5a26958455..5c86accf45 100644
--- a/games/nethack/README
+++ b/games/nethack/README
@@ -4,3 +4,5 @@ different landscape - the random number generator provides an
 essentially unlimited number of variations of the dungeon and its 
 denizens to be discovered by the player in one of a number of
 characters: you can pick your race, your role, and your gender.
+
+User accounts that play this need to be members of the "games" group.
diff --git a/games/nethack/nethack.SlackBuild b/games/nethack/nethack.SlackBuild
index 1dbdda24da..9b3d9b5e8e 100644
--- a/games/nethack/nethack.SlackBuild
+++ b/games/nethack/nethack.SlackBuild
@@ -2,14 +2,15 @@
 
 # Slackware build script for nethack.
 
-# Written by Dugan Chen (thedoogster@gmail.com)
+# Written by Dugan Chen (thedoogster [at] gmail [dot] com)
+# Based on the Arch Linux PkgBuild.
 
 PRGNAM=nethack
-VERSION=${VERSION:-3.4.3}
+VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVER=${SRCVER:-343}
+SRCVER=${SRCVER:-360}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -53,44 +54,48 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-sh sys/unix/setup.sh
-
-sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/var/games/nethack/|' \
-  -e '/^#define COMPRESS\s/ s|/usr/bin/compress|/bin/gzip|' \
-  -e '/^#define COMPRESS_EXTENSION/ s|".Z"|".gz"|' \
-  -e 's|^/\* \(#define DLB\) \*/|\1|' -i include/config.h
-
 sed -e 's|^/\* \(#define LINUX\) \*/|\1|' \
-  -e 's|^/\* \(#define TIMED_DELAY\) \*/|\1|' -i include/unixconf.h
-
-sed -e 's|^# \(WINTTYLIB = -lncurses\)|\1|' \
-  -e 's|^WINTTYLIB = -ltermlib|#&|' -i src/Makefile
+    -e 's|^/\* \(#define TIMED_DELAY\) \*/|\1|' -i include/unixconf.h
 
 # we are setting up for setgid games, so modify all necessary permissions
 # to allow full access for groups
-sed -e '/^GAMEDIR\s*=/ s|/games/.*$|/var/games/$(GAME)|' \
-  -e '/^GAMEUID\s*=/ s|games|root|' \
-  -e '/^GAMEGRP\s*=/ s|bin|games|' \
-  -e '/^GAMEPERM\s*=/ s|04755|02755|' \
-  -e '/^FILEPERM\s*=/ s|0644|0664|' \
-  -e '/^DIRPERM\s*=/ s|0755|0775|' \
-  -e '/^SHELLDIR\s*=/ s|/games|/usr/bin|' -i Makefile
-
-sed -e "/^MANDIR\s*=/s|/usr/man/man6|$PKG/usr/man/man6|" -i doc/Makefile
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make
-
-install -dm755 $PKG/usr/man/man6
-install -dm775 $PKG/var/games/
-make PREFIX=$PKG install manpages
+
+sed -e '/^HACKDIR/ s|/games/lib/\$(GAME)dir|/var/games/nethack/|' \
+    -e '/^SHELLDIR/ s|/games|/usr/bin|' \
+    -e '/^VARDIRPERM/ s|0755|0775|' \
+    -e '/^VARFILEPERM/ s|0600|0664|' \
+    -e '/^GAMEPERM/ s|0755|02755|' \
+    -e 's|\(DSYSCF_FILE=\)\\"[^"]*\\"|\1\\"/var/games/nethack/sysconf\\"|' \
+    -e 's|\(DHACKDIR=\)\\"[^"]*\\"|\1\\"/var/games/nethack/\\"|' -i sys/unix/hints/linux
+
+sed -e 's|^#GAMEUID.*|GAMEUID = root|' \
+    -e 's|^#GAMEGRP.*|GAMEGRP = games|' \
+    -e '/^FILEPERM\s*=/ s|0644|0664|' \
+    -e '/^DIRPERM\s*=/ s|0755|0775|' -i sys/unix/Makefile.top
+
+sed -e "/^MANDIR\s*=/s|/usr/man/man6|$PKG/usr/man/man6|" -i sys/unix/Makefile.doc
+
+cd sys/unix
+sh setup.sh hints/linux
+cd ../..
+make install PREFIX=$PKG
+mkdir -p $PKG/usr/man/man6
+make PREFIX=$PKG -j1 install manpages # Multi-threaded builds fail.
+
 sed -e "s|HACKDIR=$PKG/|HACKDIR=/|" \
-  -e 's|HACK=$HACKDIR|HACK=/usr/lib/nethack|' \
-  -i $PKG/usr/bin/nethack
+    -e "s|HACK=\$HACKDIR|HACK=/usr/lib$LIBDIRSUFFIX/nethack|" \
+    -i $PKG/usr/bin/nethack
+
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/nethack
+mv $PKG/var/games/nethack/{nethack,recover} $PKG/usr/lib$LIBDIRSUFFIX/nethack/
+
+# FS#43414: /var/games should be owned by root:games.
+chown -R root:games $PKG/var/games/
+chown root:games $PKG/usr/lib$LIBDIRSUFFIX/nethack/nethack
 
-install -dm755 $PKG/usr/lib/nethack
-mv $PKG/var/games/nethack/{nethack,recover} $PKG/usr/lib/nethack/
+# FS#43414: /var/games should be owned by root:games.
+mkdir -p $PKG/var/games
+chown -R root:games $PKG/var/games/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/games/nethack/nethack.info b/games/nethack/nethack.info
index c26b958d74..144925420e 100644
--- a/games/nethack/nethack.info
+++ b/games/nethack/nethack.info
@@ -1,10 +1,10 @@
 PRGNAM="nethack"
-VERSION="3.4.3"
+VERSION="3.6.0"
 HOMEPAGE="http://nethack.org"
-DOWNLOAD="http://downloads.sourceforge.net/project/nethack/nethack/3.4.3/nethack-343-src.tgz"
-MD5SUM="21479c95990eefe7650df582426457f9"
+DOWNLOAD="http://downloads.sourceforge.net/project/nethack/nethack/3.6.0/nethack-360-src.tgz"
+MD5SUM="d42147b26e5fb4746fb72536ce145984"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dugan Chen"
-EMAIL="thedoogster@gmail.com"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/games/nsudoku/nsudoku.SlackBuild b/games/nsudoku/nsudoku.SlackBuild
index 54dfa0a789..5467c50a8f 100644
--- a/games/nsudoku/nsudoku.SlackBuild
+++ b/games/nsudoku/nsudoku.SlackBuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # Slackware build script for nsudoku
-
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 
 # Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
@@ -25,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nsudoku
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/nsudoku/nsudoku.info b/games/nsudoku/nsudoku.info
index 5ca4e430f1..31cbeed0c0 100644
--- a/games/nsudoku/nsudoku.info
+++ b/games/nsudoku/nsudoku.info
@@ -1,8 +1,8 @@
 PRGNAM="nsudoku"
-VERSION="1.2"
+VERSION="1.3"
 HOMEPAGE="http://www.sh1fty.com/nsudoku/"
 DOWNLOAD="http://sh1fty.com/nsudoku/nsudoku.c"
-MD5SUM="6569177ea48ed4c2193150964ccb7d5c"
+MD5SUM="cae8ddb55879427631d995a2e6b16e55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/nuvie/README b/games/nuvie/README
new file mode 100644
index 0000000000..33179e114a
--- /dev/null
+++ b/games/nuvie/README
@@ -0,0 +1,11 @@
+nuvie (New Ultima VI Engine)
+
+Nuvie, pronounced 'New-Vee' is an open sourced game engine for playing Origin's games
+Ultima 6, Martian Dreams and Savage Empire on modern operating systems. Ultima 6 is
+fully playable from start to finish with Nuvie. Nuvie also contains many enhancements
+to the original game engine including new UI modes, featuring drag'n'drop and full map
+view mode. Alternate graphics are also supported.
+
+The game data required for using nuvie is not included and must be acquired separately.
+The data directory from an Ultima collection CD is enough. The game data's location has
+to be specified in /usr/share/nuvie/nuvie.cfg or in $HOME/.nuvierc.
diff --git a/games/nuvie/doinst.sh b/games/nuvie/doinst.sh
new file mode 100644
index 0000000000..10df7d698e
--- /dev/null
+++ b/games/nuvie/doinst.sh
@@ -0,0 +1,35 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms usr/share/nuvie/nuvie.cfg.new
diff --git a/games/nuvie/nuvie.SlackBuild b/games/nuvie/nuvie.SlackBuild
new file mode 100644
index 0000000000..79af657479
--- /dev/null
+++ b/games/nuvie/nuvie.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for nuvie
+
+# Copyright 2016 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=nuvie
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Copy missing data files
+cp -aR data/{images,maps,scripts} $PKG/usr/share/$PRGNAM
+
+# Install nuvie.cfg
+install -Dm0644 $PRGNAM.cfg.sample $PKG/usr/share/$PRGNAM/$PRGNAM.cfg.new
+sed -i "s|./data|/usr/share/$PRGNAM|" $PKG/usr/share/$PRGNAM/$PRGNAM.cfg.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README TODO $PRGNAM.cfg.sample $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/nuvie/nuvie.info b/games/nuvie/nuvie.info
new file mode 100644
index 0000000000..09c5da4f02
--- /dev/null
+++ b/games/nuvie/nuvie.info
@@ -0,0 +1,10 @@
+PRGNAM="nuvie"
+VERSION="0.5"
+HOMEPAGE="http://nuvie.sourceforge.net"
+DOWNLOAD="http://downloads.sourceforge.net/project/nuvie/Nuvie/0.5/nuvie-0.5.tgz"
+MD5SUM="49a7829c576d5203de38b3bc224c2009"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/games/nuvie/slack-desc b/games/nuvie/slack-desc
new file mode 100644
index 0000000000..4e50fd2e7d
--- /dev/null
+++ b/games/nuvie/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+nuvie: nuvie (New Ultima VI Engine)
+nuvie:
+nuvie: Nuvie (Pronounced New-Vee) is an open source engine for Origin's games
+nuvie: Ultima 6, Martian Dreams and The Savage Empire. It uses the original
+nuvie: data files from the games. It should be able to run on any platform
+nuvie: that is supported by the SDL library.
+nuvie:
+nuvie: Homepage: http://nuvie.sourceforge.net
+nuvie:
+nuvie:
+nuvie:
diff --git a/games/openjazz/openjazz.SlackBuild b/games/openjazz/openjazz.SlackBuild
index a159e77b31..45898631b8 100644
--- a/games/openjazz/openjazz.SlackBuild
+++ b/games/openjazz/openjazz.SlackBuild
@@ -79,7 +79,8 @@ patch -p1 < $CWD/paths.diff
 autoreconf -if
 
 # HOMEDIR should be defined on *nix, for some reason it's not automatically.
-SLKCFLAGS="$SLKCFLAGS -DHOMEDIR"
+# 20151119 bkw: modplug header in wrong place (or, is it?)
+SLKCFLAGS="$SLKCFLAGS -DHOMEDIR -I/usr/include/libmodplug"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/games/openmw/openmw.SlackBuild b/games/openmw/openmw.SlackBuild
index 29dfac59dd..17af98cf54 100644
--- a/games/openmw/openmw.SlackBuild
+++ b/games/openmw/openmw.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmw
-VERSION=${VERSION:-0.36.1}
+VERSION=${VERSION:-0.37.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/openmw/openmw.info b/games/openmw/openmw.info
index c1bb8351df..682da63beb 100644
--- a/games/openmw/openmw.info
+++ b/games/openmw/openmw.info
@@ -1,10 +1,10 @@
 PRGNAM="openmw"
-VERSION="0.36.1"
+VERSION="0.37.0"
 HOMEPAGE="https://openmw.org"
-DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.36.1.tar.gz"
-MD5SUM="927f944ebe5523dec6f88c5dd5abd879"
+DOWNLOAD="https://github.com/OpenMW/openmw/archive/openmw-0.37.0.tar.gz"
+MD5SUM="2177f7c18a024d9308c68291a2eb9799"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="FreeImage OpenAL unshield ffmpeg SDL2 MyGUI bullet "
+REQUIRES="FreeImage OpenAL unshield ffmpeg OpenSceneGraph SDL2 MyGUI bullet"
 MAINTAINER="Talos Thoren"
 EMAIL="talosthoren@gmail.com"
diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild
index c99b5f3b83..72f1c8af50 100644
--- a/games/openttd/openttd.SlackBuild
+++ b/games/openttd/openttd.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openttd
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-1.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/openttd/openttd.info b/games/openttd/openttd.info
index 6b1adbb2f2..7566899e16 100644
--- a/games/openttd/openttd.info
+++ b/games/openttd/openttd.info
@@ -1,11 +1,11 @@
 PRGNAM="openttd"
-VERSION="1.5.1"
+VERSION="1.5.3"
 HOMEPAGE="http://www.openttd.org"
-DOWNLOAD="http://binaries.openttd.org/releases/1.5.1/openttd-1.5.1-source.tar.xz \
+DOWNLOAD="http://binaries.openttd.org/releases/1.5.3/openttd-1.5.3-source.tar.xz \
           http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip \
           http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip \
           http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip"
-MD5SUM="f4676d2fef2fa6ec401b328a780e9d29 \
+MD5SUM="d7a07405756ed81d40b8d702e164f61c \
         e64352d0578822c6e5388b631b3086f7 \
         858b79d44aea6de5e15d9d1439e86cc3 \
         3605b82f24153500c8a1804e4420168a"
diff --git a/games/opentyrian/opentyrian.info b/games/opentyrian/opentyrian.info
index 844cdbfcab..47c0bd02ae 100644
--- a/games/opentyrian/opentyrian.info
+++ b/games/opentyrian/opentyrian.info
@@ -1,6 +1,6 @@
 PRGNAM="opentyrian"
 VERSION="2.1.20130907"
-HOMEPAGE="http://code.google.com/p/opentyrian/"
+HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 DOWNLOAD="http://www.camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.tar.gz \
           http://camanis.net/tyrian/tyrian21.zip"
 MD5SUM="978686c5a1dfbac69a2161aadf084c2b \
diff --git a/games/peg-e/peg-e.SlackBuild b/games/peg-e/peg-e.SlackBuild
index 8ffd6b20c4..093c7a1ac6 100644
--- a/games/peg-e/peg-e.SlackBuild
+++ b/games/peg-e/peg-e.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for peg-e
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=peg-e
-VERSION=${VERSION:-1.1.2}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,12 +64,14 @@ tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+sed -i '/man.path/s|share/man|man|' $PRGNAM.pro
+
+qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
   PREFIX=/usr BINDIR=games -o Makefile $PRGNAM.pro
 
 make
@@ -60,10 +80,10 @@ make install INSTALL_ROOT=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog COPYING CREDITS INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING CREDITS INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/peg-e/peg-e.info b/games/peg-e/peg-e.info
index d7b1b9c616..cc9fc6a7ad 100644
--- a/games/peg-e/peg-e.info
+++ b/games/peg-e/peg-e.info
@@ -1,10 +1,10 @@
 PRGNAM="peg-e"
-VERSION="1.1.2"
+VERSION="1.2.1"
 HOMEPAGE="http://gottcode.org/peg-e/"
-DOWNLOAD="http://gottcode.org/peg-e/peg-e-1.1.2-src.tar.bz2"
-MD5SUM="36f63d22192e8e8b8dc2dbf5f33be7ac"
+DOWNLOAD="http://gottcode.org/peg-e/peg-e-1.2.1-src.tar.bz2"
+MD5SUM="fabd0e3cbd3b06052787ac786b7ac41b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/games/pinball/README b/games/pinball/README
new file mode 100644
index 0000000000..859d0f02ec
--- /dev/null
+++ b/games/pinball/README
@@ -0,0 +1,2 @@
+The Emilia Pinball: project is an open source pinball: simulator
+intended for linux machines by Henrik Enqvist.
diff --git a/games/pinball/pinball-0.3.1-cstddef.patch b/games/pinball/pinball-0.3.1-cstddef.patch
new file mode 100644
index 0000000000..0be44d1eea
--- /dev/null
+++ b/games/pinball/pinball-0.3.1-cstddef.patch
@@ -0,0 +1,30 @@
+--- base/Behavior.cpp~	2003-11-20 10:46:16.000000000 -0600
++++ base/Behavior.cpp	2011-02-09 13:19:13.651559002 -0600
+@@ -6,6 +6,7 @@
+     email                : henqvist@excite.com
+  ***************************************************************************/
+ 
++#include <cstddef>
+ #include "Private.h"
+ #include "Behavior.h"
+ #include "Group.h"
+--- base/BehaviorVisitor.cpp~	2003-11-20 10:46:16.000000000 -0600
++++ base/BehaviorVisitor.cpp	2011-02-09 13:26:17.561558995 -0600
+@@ -6,6 +6,7 @@
+     email                : henqvist@excite.com
+  ***************************************************************************/
+ 
++#include <cstddef>
+ #include "BehaviorVisitor.h"
+ #include "Behavior.h"
+ #include "Group.h"
+--- base/SignalSender.cpp~	2003-11-20 10:46:16.000000000 -0600
++++ base/SignalSender.cpp	2011-02-09 13:35:29.151558926 -0600
+@@ -7,6 +7,7 @@
+  ***************************************************************************/
+ 
+ 
++#include <cstddef>
+ #include "Private.h"
+ #include "SignalSender.h"
+ #include "Group.h"
diff --git a/games/pinball/pinball-0.3.1-hiscore.patch b/games/pinball/pinball-0.3.1-hiscore.patch
new file mode 100644
index 0000000000..bf40674097
--- /dev/null
+++ b/games/pinball/pinball-0.3.1-hiscore.patch
@@ -0,0 +1,39 @@
+--- pinball-0.3.1/src/Table.cpp~	2006-08-03 14:59:16.000000000 +0200
++++ pinball-0.3.1/src/Table.cpp	2006-08-03 14:59:16.000000000 +0200
+@@ -247,14 +247,9 @@
+   // Clear old high scores
+   m_mapHighScores.clear();
+ 
+-  //!rzr+ : fix w32
+-  string sFileName =  m_sTableName + "/" + HIGH_SCORES_FILENAME;
+-#ifdef RZR_PATHRELATIVE
+-  sFileName = string( Config::getInstance()->getExeDir() )
+-    +"/"+ m_sTableName +".cfg";
+-#else
+-  sFileName = string(EM_HIGHSCORE_DIR) + "/" + sFileName;
+-#endif //!rzr-
++  char *home = getenv("HOME");
++  string sFileName = string(home? home:".") + "/.emilia/" + m_sTableName +
++    ".hiscore";
+ 
+   ifstream file(sFileName.c_str());
+   if (!file) {
+@@ -308,14 +303,10 @@
+     cerr << "No current table name! (the first time is normal...)" << endl;
+     return false;
+   }
+-  //!rzr+ : fix w32
+-  string sFileName =  m_sTableName + "/" + HIGH_SCORES_FILENAME;
+-#ifdef RZR_PATHRELATIVE
+-  sFileName = string( Config::getInstance()->getExeDir() )
+-    +"/"+ m_sTableName +".cfg";
+-#else
+-  sFileName = string(EM_HIGHSCORE_DIR) + "/" + sFileName;
+-#endif //!rzr-
++
++  char *home = getenv("HOME");
++  string sFileName = string(home? home:".") + "/.emilia/" + m_sTableName +
++    ".hiscore";
+ 
+   ofstream file(sFileName.c_str());//, ios_base::out | ios_base::trunc);
+   if (!file) {
diff --git a/games/pinball/pinball-0.3.1-lacomment.patch b/games/pinball/pinball-0.3.1-lacomment.patch
new file mode 100644
index 0000000000..60a93bc548
--- /dev/null
+++ b/games/pinball/pinball-0.3.1-lacomment.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.in~	2010-11-15 10:55:51.000000000 -0600
++++ src/Makefile.in	2010-11-15 11:07:27.427255000 -0600
+@@ -505,7 +505,7 @@
+ 	uninstall-pinincludeHEADERS uninstall-pinlibLIBRARIES
+ 
+ 
+-dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
++#dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
+ 
+ # !+rzr : This trick workaround a bad generated rule (under Linux mingw32)
+ # src/ litool returns:  -L/usr/local//lib /usr/lib/libjpeg.so
+--- test/Makefile.in~	2010-11-15 11:11:07.000000000 -0600
++++ test/Makefile.in	2010-11-15 11:12:46.119254852 -0600
+@@ -621,7 +621,7 @@
+ 	mostlyclean-generic mostlyclean-libtool tags uninstall \
+ 	uninstall-am uninstall-info-am uninstall-testlibLTLIBRARIES
+ 
+-dnl noinst_PROGRAMS = unittest
++#dnl noinst_PROGRAMS = unittest
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/games/pinball/pinball-0.3.1-strictproto.patch b/games/pinball/pinball-0.3.1-strictproto.patch
new file mode 100644
index 0000000000..89a7fe9fa3
--- /dev/null
+++ b/games/pinball/pinball-0.3.1-strictproto.patch
@@ -0,0 +1,7 @@
+--- base/Config.cpp.orig	2009-03-02 10:46:40.000000000 -0600
++++ base/Config.cpp	2009-03-02 10:46:40.000000000 -0600
+@@ -426,2 +426,2 @@
+-    char* ptr=0; 
+-    char* ptrw = 0;
++    const char* ptr=0; 
++    const char* ptrw = 0;
diff --git a/games/pinball/pinball-0.3.1-sys-ltdl.patch b/games/pinball/pinball-0.3.1-sys-ltdl.patch
new file mode 100644
index 0000000000..19ecad5afb
--- /dev/null
+++ b/games/pinball/pinball-0.3.1-sys-ltdl.patch
@@ -0,0 +1,152 @@
+--- pinball-0.3.1/Makefile.in~	2006-08-03 12:18:40.000000000 +0200
++++ pinball-0.3.1/Makefile.in	2006-08-03 12:18:40.000000000 +0200
+@@ -107,7 +107,7 @@
+ install_sh = @install_sh@
+ AUTOMAKE_OPTIONS = gnu
+ 
+-SUBDIRS = libltdl addon base data src test
++SUBDIRS = addon base data src test
+ 
+ EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
+ 
+--- pinball-0.3.1/src/Makefile.in~	2006-08-03 12:20:12.000000000 +0200
++++ pinball-0.3.1/src/Makefile.in	2006-08-03 12:20:12.000000000 +0200
+@@ -114,9 +114,9 @@
+ 
+ pinlib_LIBRARIES = libemilia_pin.a
+ 
+-INCLUDES = -I../base -I../addon @INCLTDL@
++INCLUDES = -I../base -I../addon
+ 
+-pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
++pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ pinball_LDFLAGS = -export-dynamic
+ 
+ pinball_SOURCES = Pinball.cpp
+--- pinball-0.3.1/src/Makefile.am~	2006-08-03 12:20:35.000000000 +0200
++++ pinball-0.3.1/src/Makefile.am	2006-08-03 12:20:35.000000000 +0200
+@@ -7,9 +7,9 @@
+ 
+ pinlib_LIBRARIES = libemilia_pin.a
+ 
+-INCLUDES = -I../base -I../addon @INCLTDL@
++INCLUDES = -I../base -I../addon
+ 
+-pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
++pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ pinball_LDFLAGS = -export-dynamic
+ 
+ pinball_SOURCES = Pinball.cpp
+--- pinball-0.3.1/Makefile.am~	2006-08-03 12:18:12.000000000 +0200
++++ pinball-0.3.1/Makefile.am	2006-08-03 12:18:12.000000000 +0200
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
+-SUBDIRS = libltdl addon base data src test
++SUBDIRS = addon base data src test
+ 
+ EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
+ 
+--- pinball-0.3.1/configure.ac~	2006-08-03 12:17:50.000000000 +0200
++++ pinball-0.3.1/configure.ac	2006-08-03 12:17:50.000000000 +0200
+@@ -14,19 +14,13 @@
+ CFLAGS="-g -W -Wall -O2"
+ CXXFLAGS="-g -W -Wall -O2"
+ 
+-AC_CONFIG_SUBDIRS(libltdl)
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_LIBTOOL_DLOPEN
+-AC_LIBLTDL_CONVENIENCE
+ AC_PROG_LIBTOOL
+ 
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
+-
+ dnl *******************************************
+ dnl PATHS AND DIRS ****************************
+ dnl data dirs, fuck I hate autoconf, spent 4 hours getting this right, had to 
+--- pinball-0.3.1/test/Makefile.in~	2006-08-03 12:21:11.000000000 +0200
++++ pinball-0.3.1/test/Makefile.in	2006-08-03 12:21:11.000000000 +0200
+@@ -112,8 +112,8 @@
+ 
+ noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
+ 
+-INCLUDES = -I../base -I../addon -I../src @INCLTDL@
+-LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
++INCLUDES = -I../base -I../addon -I../src
++LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ 
+ testlib_LTLIBRARIES = libModuleTest.la
+ 
+--- pinball-0.3.1/test/Makefile.am~	2006-08-03 12:20:53.000000000 +0200
++++ pinball-0.3.1/test/Makefile.am	2006-08-03 12:20:53.000000000 +0200
+@@ -6,8 +6,8 @@
+ noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
+ dnl noinst_PROGRAMS = unittest
+ 
+-INCLUDES = -I../base -I../addon -I../src @INCLTDL@
+-LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
++INCLUDES = -I../base -I../addon -I../src
++LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ 
+ testlib_LTLIBRARIES = libModuleTest.la
+ 
+--- pinball-0.3.1/configure~	2006-08-03 12:16:59.000000000 +0200
++++ pinball-0.3.1/configure	2006-08-03 12:16:59.000000000 +0200
+@@ -431,7 +431,6 @@
+ PACKAGE_STRING='pinball 0.3.1'
+ PACKAGE_BUGREPORT='henqvist@users.sourceforge.net'
+ 
+-ac_subdirs_all="$ac_subdirs_all libltdl"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -469,7 +468,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE subdirs CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL INCLTDL LIBLTDL EM_DATADIR EM_LIBDIR EM_BUILD_ROOT EM_HIGHSCORE_DIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS MATHLIB GL_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS ALLEGRO_CONFIG ALLEGRO_CFLAGS ALLEGRO_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE subdirs CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL EM_DATADIR EM_LIBDIR EM_BUILD_ROOT EM_HIGHSCORE_DIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS MATHLIB GL_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS ALLEGRO_CONFIG ALLEGRO_CFLAGS ALLEGRO_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -1959,7 +1958,6 @@
+ 
+ 
+ 
+-subdirs="$subdirs libltdl"
+ 
+ 
+ ac_ext=c
+@@ -3439,18 +3437,6 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-  case $enable_ltdl_convenience in
+-  no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+-echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/''libltdl'
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-
+ # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+   enableval="$enable_shared"
+@@ -11788,8 +11774,6 @@
+ s,@CPP@,$CPP,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@LIBTOOL@,$LIBTOOL,;t t
+-s,@INCLTDL@,$INCLTDL,;t t
+-s,@LIBLTDL@,$LIBLTDL,;t t
+ s,@EM_DATADIR@,$EM_DATADIR,;t t
+ s,@EM_LIBDIR@,$EM_LIBDIR,;t t
+ s,@EM_BUILD_ROOT@,$EM_BUILD_ROOT,;t t
diff --git a/games/pinball/pinball.SlackBuild b/games/pinball/pinball.SlackBuild
new file mode 100644
index 0000000000..71aeeca0a9
--- /dev/null
+++ b/games/pinball/pinball.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for pinball
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pinball
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -Np0 -i $CWD/pinball-0.3.1-cstddef.patch
+patch -Np1 -i $CWD/pinball-0.3.1-hiscore.patch
+patch -Np0 -i $CWD/pinball-0.3.1-lacomment.patch
+patch -Np0 -i $CWD/pinball-0.3.1-strictproto.patch
+patch -Np1 -i $CWD/pinball-0.3.1-sys-ltdl.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-sdltest \
+  --with-x \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+
+# Remove executable flag from some docs
+find $PKG/usr/doc -type f -exec chmod -x {} \;
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/pinball/pinball.info b/games/pinball/pinball.info
new file mode 100644
index 0000000000..1e85ea5d65
--- /dev/null
+++ b/games/pinball/pinball.info
@@ -0,0 +1,10 @@
+PRGNAM="pinball"
+VERSION="0.3.1"
+HOMEPAGE="http://pinball.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/pinball/files/pinball/pinball-0.3.1/pinball-0.3.1.tar.gz"
+MD5SUM="f28e8f49e0db8e9491e4d9f0c13c36c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/games/pinball/slack-desc b/games/pinball/slack-desc
new file mode 100644
index 0000000000..695f047ee8
--- /dev/null
+++ b/games/pinball/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+pinball: pinball (open source pinball: simulator)
+pinball:
+pinball: The Emilia Pinball: project is an open source pinball: simulator
+pinball: intended for linux machines by Henrik Enqvist.
+pinball:
+pinball: Homepage: http://pinball:.sourceforge.net/
+pinball:
+pinball:
+pinball:
+pinball:
+pinball:
diff --git a/games/pioneer/README b/games/pioneer/README
new file mode 100644
index 0000000000..104a41ee2c
--- /dev/null
+++ b/games/pioneer/README
@@ -0,0 +1,11 @@
+Pioneer is a space adventure game set in the Milky Way galaxy at the turn of
+the 31st century.
+
+The game is open-ended, and you are free to explore the millions of star
+systems in the game. You can land on planets, slingshot past gas giants, and
+burn yourself to a crisp flying between binary star systems. You can try your
+hand at piracy, make your fortune trading between systems, or do missions for
+the various factions fighting for power, freedom or self-determination.
+
+OpenGL core profile version 3.1 or newer is a runtime dependency, to determine
+what version of OpenGL is installed use: glxinfo | grep "core profile version"
diff --git a/games/pioneer/doinst.sh b/games/pioneer/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/pioneer/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild
new file mode 100644
index 0000000000..97881b45fe
--- /dev/null
+++ b/games/pioneer/pioneer.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# Slackware build script for Pioneer
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pioneer
+VERSION=${VERSION:-20151214}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Generate the configure file
+./bootstrap
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/opt/$PRGNAM-$VERSION \
+  --bindir=/opt/$PRGNAM-$VERSION \
+  --with-strip \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Write launcher scripts to the user's path
+mkdir -p $PKG/usr/games
+cd $PKG/usr/games
+cat > modelcompiler <<EOF
+#! /bin/sh
+cd /opt/$PRGNAM-$VERSION
+./modelcompiler
+EOF
+cat > pioneer <<EOF
+#! /bin/sh
+cd /opt/$PRGNAM-$VERSION
+./pioneer
+EOF
+find . -perm 644 -exec chmod 755 {} \;
+cd -
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
+[Desktop Entry]
+Name=$(echo "${PRGNAM^}")
+Exec=$PRGNAM
+Icon=badge-full
+Type=Application
+Comment=$(echo "${PRGNAM^}") (space adventure game)
+Categories=Game;AdventureGame;
+EOF
+
+# Add data files to package
+mv ${PKG}data $PKG/opt/$PRGNAM-$VERSION/data
+cp -a data/listdata* $PKG/opt/$PRGNAM-$VERSION/data
+
+# Add missing icons to package
+for size in $(find /usr/share/icons/hicolor -type d -mindepth 1 -maxdepth 1 -exec basename {} \;); do
+    if ls application-icon/pngs/*${size}* 1>/dev/null 2>/dev/null; then
+	mkdir -p $PKG/usr/share/icons/hicolor/${size}/apps
+	cp -a application-icon/pngs/*${size}*.png $PKG/usr/share/icons/hicolor/${size}/apps
+    elif [ "$size" = "scalable" ]; then
+	mkdir -p $PKG/usr/share/icons/hicolor/${size}/apps
+	cp -a application-icon/*.svg $PKG/usr/share/icons/hicolor/${size}/apps
+    fi
+done
+
+# Remove empty .gitignore files
+find $PKG/opt/$PRGNAM-$VERSION/data -name ".gitignore" -exec rm -f {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -aR licenses *.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/pioneer/pioneer.info b/games/pioneer/pioneer.info
new file mode 100644
index 0000000000..0513740045
--- /dev/null
+++ b/games/pioneer/pioneer.info
@@ -0,0 +1,10 @@
+PRGNAM="pioneer"
+VERSION="20151214"
+HOMEPAGE="http://pioneerspacesim.net/"
+DOWNLOAD="https://github.com/pioneerspacesim/pioneer/archive/20151214.tar.gz"
+MD5SUM="59a12be6e2f8e4ae0d2ff7e7ebe02603"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2_image assimp libsigc++"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/pioneer/slack-desc b/games/pioneer/slack-desc
new file mode 100644
index 0000000000..1ce95d7b91
--- /dev/null
+++ b/games/pioneer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+pioneer: pioneer (A game of lonely space adventure)
+pioneer:
+pioneer: Pioneer is a space adventure game set in the Milky Way galaxy at the
+pioneer: turn of the 31st century. The game is open-ended, and you are free to
+pioneer: explore the millions of star systems in the game. You can land on
+pioneer: planets, slingshot past gas giants, and burn yourself to a crisp
+pioneer: flying between binary star systems.
+pioneer: 
+pioneer: Homepage: http://pioneerspacesim.net/
+pioneer:
+pioneer:
\ No newline at end of file
diff --git a/games/pom1/pom1.info b/games/pom1/pom1.info
index a3816b6cd3..0e4e757e1b 100644
--- a/games/pom1/pom1.info
+++ b/games/pom1/pom1.info
@@ -2,7 +2,7 @@ PRGNAM="pom1"
 VERSION="1.0.0"
 HOMEPAGE="http://pom1.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/project/pom1/pom1/1.0.0/pom1-1.0.0.tar.gz"
-MD5SUM="0446748fcc7c393a8250afd809fa4ba5"
+MD5SUM="fbea72f26ab9f1771e8171021406b194"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/prboom-plus/README b/games/prboom-plus/README
index 61162ca9cd..43eafc4b0e 100644
--- a/games/prboom-plus/README
+++ b/games/prboom-plus/README
@@ -5,10 +5,7 @@ variable gamespeed, re-record, walkcam, chasecam, full full mouselook, fov and
 other features along with full compatibility with the original Doom/Doom2
 engines.
 
-FluidSynth, needed for soundfont support, is a recommended optional dependency.
-To get soundfont support, edit ~/.prboom-plus/prboom-plus.cfg. Set
-snd_midiplayer to "fluidsynth" and snd_soundfont to the path to the soundfont
-(.sf2) file.
+FluidSynth, needed for soundfont support, is an  optional dependency.
 
 The documentation refers to a directory into which an IWAD file (doom.wad,
 doom2.wad, tnt.wad, plutonia.wad, or the shareware doom1.wad) may be placed.
diff --git a/games/prboom-plus/prboom-plus.SlackBuild b/games/prboom-plus/prboom-plus.SlackBuild
index c7a5bf4f48..2ac6a047c3 100644
--- a/games/prboom-plus/prboom-plus.SlackBuild
+++ b/games/prboom-plus/prboom-plus.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Dugan Chen (thedoogster@gmail.com)
 
 PRGNAM=prboom-plus
-VERSION=${VERSION:-2.5.1.3}
+VERSION=${VERSION:-2.5.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/prboom-plus/prboom-plus.info b/games/prboom-plus/prboom-plus.info
index 872b684d5a..450e3d6e19 100644
--- a/games/prboom-plus/prboom-plus.info
+++ b/games/prboom-plus/prboom-plus.info
@@ -1,8 +1,8 @@
 PRGNAM="prboom-plus"
-VERSION="2.5.1.3"
+VERSION="2.5.1.4"
 HOMEPAGE="http://prboom-plus.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/prboom-plus/prboom-plus/2.5.1.3/prboom-plus-2.5.1.3.tar.gz"
-MD5SUM="9401c48fb0aa0a1d2d78ef0008a25993"
+DOWNLOAD="http://downloads.sourceforge.net/project/prboom-plus/prboom-plus/2.5.1.4/prboom-plus-2.5.1.4.tar.gz"
+MD5SUM="eff7878d4542259a2bd6b2fef79962ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/pybik/README b/games/pybik/README
new file mode 100644
index 0000000000..f0fdd1e126
--- /dev/null
+++ b/games/pybik/README
@@ -0,0 +1 @@
+Pybik is a 3D puzzle game about the cube invented by Ernő Rubik.
diff --git a/games/pybik/doinst.sh b/games/pybik/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/pybik/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/pybik/pybik.SlackBuild b/games/pybik/pybik.SlackBuild
new file mode 100644
index 0000000000..df65d48661
--- /dev/null
+++ b/games/pybik/pybik.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for pybik
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pybik
+VERSION=${VERSION:-2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix man page path
+sed -i "s/share\/man/man/" setup.py
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/pybik/pybik.info b/games/pybik/pybik.info
new file mode 100644
index 0000000000..d73ec241e6
--- /dev/null
+++ b/games/pybik/pybik.info
@@ -0,0 +1,10 @@
+PRGNAM="pybik"
+VERSION="2.1"
+HOMEPAGE="https://launchpad.net/pybik/"
+DOWNLOAD="https://launchpad.net/pybik/trunk/2.1/+download/pybik-2.1.tar.gz"
+MD5SUM="bb551ba5c45ee834988b91ab7ff48d4f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-PyQt5"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/pybik/slack-desc b/games/pybik/slack-desc
new file mode 100644
index 0000000000..ba3086c778
--- /dev/null
+++ b/games/pybik/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+pybik: pybik (puzzle game)
+pybik:
+pybik: Pybik is a 3D puzzle game about the cube invented by Ernő Rubik.
+pybik:
+pybik: Homepage: https://launchpad.net/pybik/
+pybik:
+pybik:
+pybik:
+pybik:
+pybik:
+pybik:
diff --git a/games/qstat/README b/games/qstat/README
index e289ae78d4..50eb41b35d 100644
--- a/games/qstat/README
+++ b/games/qstat/README
@@ -2,6 +2,3 @@ QStat is a command-line program that displays information about Internet game se
 The servers are either down, non-responsive, or running a game.
 For servers running a game, the server name, map name, current number of players,
 and response time are displayed. Server rules and player information may also be displayed.
-
-A copy of the of the GitHub repo is hosted on my website, dated with the last commit date.
-I only have mirrored it, removed the hidden git folder, and put it in a tarball. Nothing else was changed.
diff --git a/games/qstat/qstat.SlackBuild b/games/qstat/qstat.SlackBuild
index f333093f67..1256760a64 100644
--- a/games/qstat/qstat.SlackBuild
+++ b/games/qstat/qstat.SlackBuild
@@ -27,7 +27,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qstat
-VERSION=${VERSION:-10072015}
+VERSION=${VERSION:-2d841880730d8704abaa6444a525bf144c1bee9d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+unzip $CWD/$PRGNAM-$VERSION.zip || unzip  $CWD/$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/games/qstat/qstat.info b/games/qstat/qstat.info
index 64d1f807c3..f3afb30054 100644
--- a/games/qstat/qstat.info
+++ b/games/qstat/qstat.info
@@ -1,8 +1,8 @@
 PRGNAM="qstat"
-VERSION="10072015"
+VERSION="2d841880730d8704abaa6444a525bf144c1bee9d"
 HOMEPAGE="https://github.com/multiplay/qstat"
-DOWNLOAD="http://www.bloodbathsoftworks.com/xylemon/uploads/sbomirrors/qstat-10072015.tar.gz"
-MD5SUM="bb50be36dcb6e83448d4c3c7b09f3b96"
+DOWNLOAD="https://github.com/multiplay/qstat/archive/2d841880730d8704abaa6444a525bf144c1bee9d.zip"
+MD5SUM="a05658e3855861c074c6560169bbdf49"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/qzdl/README b/games/qzdl/README
new file mode 100644
index 0000000000..e5f61a7665
--- /dev/null
+++ b/games/qzdl/README
@@ -0,0 +1,4 @@
+A simple Qt launcher for Doom engines. Can be used to play default Doom WADs or custom ones.
+
+Note: The original website seems to be down, so ignore any warnings from the update checker. You can
+disable it in the "Settings" tab.
diff --git a/games/qzdl/qzdl.SlackBuild b/games/qzdl/qzdl.SlackBuild
new file mode 100644
index 0000000000..ed1f610ded
--- /dev/null
+++ b/games/qzdl/qzdl.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for qzdl
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=qzdl
+VERSION=${VERSION:-3.2.2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+
+# Makes bin directory and copies over executable
+mkdir -p $PKG/usr/bin
+cp -a zdl $PKG/usr/bin
+
+# Makes desktop file related directories
+mkdir -p $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/pixmaps
+
+# Copies over desktop file and icon
+cp -a $CWD/qzdl.desktop $PKG/usr/share/applications
+cp -a res/zdl3.svg $PKG/usr/share/pixmaps
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/qzdl/qzdl.desktop b/games/qzdl/qzdl.desktop
new file mode 100644
index 0000000000..cb38c704bd
--- /dev/null
+++ b/games/qzdl/qzdl.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=qzdl
+GenericName=Launcher for Doom Engines
+Type=Application
+Comment=A Qt launcher for various Doom engines like Chocolate Doom.
+Exec=zdl
+Icon=zdl3
+Terminal=false
+Categories=Game
diff --git a/games/qzdl/qzdl.info b/games/qzdl/qzdl.info
new file mode 100644
index 0000000000..6022144da0
--- /dev/null
+++ b/games/qzdl/qzdl.info
@@ -0,0 +1,10 @@
+PRGNAM="qzdl"
+VERSION="3.2.2.3"
+HOMEPAGE="https://github.com/qbasicer/qzdl"
+DOWNLOAD="https://github.com/qbasicer/qzdl/archive/v3.2.2.3.tar.gz"
+MD5SUM="50e61034d288d57ab3aecbd03dcf946a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/games/qzdl/slack-desc b/games/qzdl/slack-desc
new file mode 100644
index 0000000000..6d6b6e70cb
--- /dev/null
+++ b/games/qzdl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler--------------------------------------------------------|
+qzdl: qzdl (Qt Doom Launcher)
+qzdl:
+qzdl: A simple Qt launcher for Doom engines. Can be used to play default Doom
+qzdl: WADs or custom ones.
+qzdl:
+qzdl: Homepage: https://github.com/qbasicer/qzdl
+qzdl:
+qzdl:
+qzdl:
+qzdl:
+qzdl:
diff --git a/games/redeclipse/redeclipse.info b/games/redeclipse/redeclipse.info
index 507f3f1feb..d833b1932b 100644
--- a/games/redeclipse/redeclipse.info
+++ b/games/redeclipse/redeclipse.info
@@ -2,7 +2,7 @@ PRGNAM="redeclipse"
 VERSION="1.5"
 HOMEPAGE="http://www.redeclipse.net"
 DOWNLOAD="http://www.indiedb.com/downloads/mirror/82335/101/7e7aba44e58a90f256321e5a7cb4879b"
-MD5SUM="7c0f211630225923166eefa6c1778241"
+MD5SUM="f12b05a32ad1f6e0cb4e83e53cc286b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/roadfighter/roadfighter.info b/games/roadfighter/roadfighter.info
index d883f290a0..48224f68b4 100644
--- a/games/roadfighter/roadfighter.info
+++ b/games/roadfighter/roadfighter.info
@@ -1,7 +1,7 @@
 PRGNAM="roadfighter"
 VERSION="1.0.1269"
 HOMEPAGE="http://www.braingames.getput.com/roadf/"
-DOWNLOAD="http://braingames.jorito.net/roadfighter/downloads/roadfighter.src_1.0.1269.tgz"
+DOWNLOAD="ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/roadfighter.src_1.0.1269.tgz"
 MD5SUM="a1626dda4d17ae30bbdd9c1ede2cd555"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/roccat-tools/README b/games/roccat-tools/README
new file mode 100644
index 0000000000..8685fa42e3
--- /dev/null
+++ b/games/roccat-tools/README
@@ -0,0 +1,93 @@
+The roccat-tools package contains the userland applications needed to
+configure and make extended use of the supported Roccat devices. It
+consists of a shared library and other files shared by device specific
+applications for Roccat hardware.
+
+Currently the following devices are supported:
+
+# Keyboards
+Arvo (ROC-12-500) [arvo]
+Isku (ROC-12-700) [isku]
+IskuFX (ROC-12-900) [iskufx]
+Ryos MK/Glow/Pro (ROC-12-601, ROC-12-750, ROC-12-850) [ryosmk]
+Ryos TKL Pro (ROC-12-650) [ryostkl]
+
+# Mice
+Kone (ROC-11-500, ROC-11-501) [kone]
+Kone[+] (ROC-11-800) [koneplus]
+KonePure (ROC-11-700) [konepure]
+KonePureMilitary (ROC-11-711) [konepuremilitary]
+KonePureOptical (ROC-11-710) [konepureoptical]
+KonePureOpticalBlack (ROC-11-714-B) [konepureoptical]
+KoneXTD (ROC-11-810) [konextd]
+KoneXTDOptical (ROC-11-811) [konextdoptical]
+Kova[+] (ROC-11-520) [kovaplus]
+Lua (ROC-11-310) [lua]
+Nyth (ROC-11-900, ?) [nyth]
+Pyra (ROC-11-300, ROC-11-510) [pyra]
+Savu (ROC-11-600) [savu]
+Tyon Black/White (ROC-11-850, ROC-11-851) [tyon]
+
+Support for all devices is built by default. To compile support for a
+specific device set the DEVICES variable to a semicolon delimited list
+of devices to compile support for, such as
+
+	DEVICES="isku;koneplus"
+
+You will need a dedicated group to run roccat-tools. This will add the
+'roccat' group and not conflict with anything else on SBo:
+
+	groupadd -r -g 318 roccat
+
+Set the GROUP variable to whatever you create here before running the 
+script, otherwise the default 'roccat' will be used.
+
+To use the device features as normal user you have to add yourself and
+all other users to the group that was created
+
+	usermod -a -G $GROUP $USER
+
+Do a logout/login to apply your new group ownership and replug your
+device and everything should work as expected.
+
+You can optionally compile support for Lua 5.1 or 5.2 if you want
+scripting possibilities. This will add lua or lua52 as a dependency,
+both available at SBo. Set the Lua version like this:
+
+	LUAVERSION="5.1"
+
+If you have an old Kone (ROC-11-500, ROC-11-501) you, in certain cases,
+may additionally need the kmod-roccat package which is currently not 
+avaiable at SBo.
+
+# This package contains
+
+* roccateventhandler
+
+	A eventhandler that takes care of displaying OSD events and handles
+	quicklaunching and talk events.
+
+* roccatDEVICEcontrol
+
+	A console application mainly meant as helper for background tasks.
+	For basic usage information on roccatDEVICEcontrol please read
+	the manpage.
+
+* roccatDEVICEconfig
+
+	Graphical user interfaces to modify the profiles of your devices.
+	You should find them in the settings folder of your window
+	manager, or you can call them from the console.
+
+# Known issues
+
+	If you get annoying SHIFT_L key events when entering keys in
+	DEVICEconfig you might have a video application like xine running
+	which tries to disable the screensaver in the most stupid way. You
+	have to switch off this functionality or close the culprit.
+
+	If some key events don't show up in DEVICEconfig then you might have
+	software like xbindkeys running. You have to turn off these tools
+	for editing keys or macros in DEVICEconfig. Another possibility is
+	that the translation table is missing some keys (in fact at this
+	time it only supports a standard 105-keys keyboard)
diff --git a/games/roccat-tools/doinst.sh b/games/roccat-tools/doinst.sh
new file mode 100644
index 0000000000..f7d09ab55f
--- /dev/null
+++ b/games/roccat-tools/doinst.sh
@@ -0,0 +1,16 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+/sbin/ldconfig
+/sbin/udevadm control --reload-rules
diff --git a/games/roccat-tools/roccat-tools.SlackBuild b/games/roccat-tools/roccat-tools.SlackBuild
new file mode 100644
index 0000000000..5d26b064f7
--- /dev/null
+++ b/games/roccat-tools/roccat-tools.SlackBuild
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+# Slackware build script for roccat-tools
+
+# Copyright 2015 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=roccat-tools
+VERSION=${VERSION:-3.7.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+GROUP=${GROUP:-roccat}
+
+# Check the system group for roccat:
+if ! grep -q ^"$GROUP": /etc/group ; then
+  echo "  You will need a dedicated group to run roccat-tools"
+  echo "    # groupadd -r -g 318 $GROUP"
+  echo "  should do the job."
+  exit 1
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if [ "${DEVICES:-all}" == "all" ]; then
+        HW=""
+else
+        HW="-DDEVICES='$DEVICES'"
+fi
+
+if [ "${LUAVERSION:-no}" == "no" ]; then
+        LUA=""
+else
+        LUA="-DWITH_LUA='$LUAVERSION'"
+fi
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    $HW \
+    $LUA \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/var/lib/roccat
+chown root:$GROUP $PKG/var/lib/roccat
+chmod 2770 $PKG/var/lib/roccat
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Man pages
+mkdir -p $PKG/usr/man/de
+mkdir -p $PKG/usr/man/en
+mv $PKG/usr/share/man/en/man1 $PKG/usr/man/en
+mv $PKG/usr/share/man/de/man1 $PKG/usr/man/de
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+rm -rf $PKG/usr/share/man
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/roccat-tools/roccat-tools.info b/games/roccat-tools/roccat-tools.info
new file mode 100644
index 0000000000..0881247937
--- /dev/null
+++ b/games/roccat-tools/roccat-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="roccat-tools"
+VERSION="3.7.1"
+HOMEPAGE="Homepage: http://sourceforge.net/projects/roccat/"
+DOWNLOAD="http://downloads.sourceforge.net/roccat/roccat-tools-3.7.1.tar.bz2"
+MD5SUM="ef0d0b990fbdbf66993fcee5869430bf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libgaminggear"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/games/roccat-tools/slack-desc b/games/roccat-tools/slack-desc
new file mode 100644
index 0000000000..acc99e2d93
--- /dev/null
+++ b/games/roccat-tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+roccat-tools: roccat-tools (Roccat common files)
+roccat-tools:
+roccat-tools: The roccat-tools package contains the userland applications needed to
+roccat-tools: configure and make extended use of the supported Roccat devices. It
+roccat-tools: consists of a shared library and other files shared by device
+roccat-tools: specific applications for Roccat hardware.
+roccat-tools:
+roccat-tools:
+roccat-tools: Homepage: http://sourceforge.net/projects/roccat/
+roccat-tools:
+roccat-tools:
diff --git a/games/scid_vs_pc/scid_vs_pc.SlackBuild b/games/scid_vs_pc/scid_vs_pc.SlackBuild
index 310789d0fe..5db2ad0e97 100644
--- a/games/scid_vs_pc/scid_vs_pc.SlackBuild
+++ b/games/scid_vs_pc/scid_vs_pc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Scid vs. PC
 
-# Copyright 2013-2014 - Fernando Giannasi - São Paulo - Brazil
+# Copyright 2013-2015 - Fernando Giannasi - Sao Paulo - Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scid_vs_pc
-VERSION=${VERSION:-4.13}
+VERSION=${VERSION:-4.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/scid_vs_pc/scid_vs_pc.info b/games/scid_vs_pc/scid_vs_pc.info
index 66d21e8ab8..3db1d0ba91 100644
--- a/games/scid_vs_pc/scid_vs_pc.info
+++ b/games/scid_vs_pc/scid_vs_pc.info
@@ -1,8 +1,8 @@
 PRGNAM="scid_vs_pc"
-VERSION="4.13"
+VERSION="4.14"
 HOMEPAGE="http://scidvspc.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/scidvspc/source/scid_vs_pc-4.13.tgz"
-MD5SUM="f4e1277ffe83c00d0ff7759211a5801a"
+DOWNLOAD="http://downloads.sourceforge.net/project/scidvspc/source/scid_vs_pc-4.14.tgz"
+MD5SUM="2bf8507ede7e16595c8249997f1afc9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/snes9x/snes9x.info b/games/snes9x/snes9x.info
index c490e9fdea..bedf934452 100644
--- a/games/snes9x/snes9x.info
+++ b/games/snes9x/snes9x.info
@@ -1,7 +1,7 @@
 PRGNAM="snes9x"
 VERSION="1.53"
-HOMEPAGE="http://code.google.com/p/snes9x-gtk/"
-DOWNLOAD="http://snes9x-gtk.googlecode.com/files/snes9x-1.53-src.tar.bz2"
+HOMEPAGE="https://github.com/snes9xgit/snes9x"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/snes9x-1.53-src.tar.bz2"
 MD5SUM="69ec1743a1da7de7b5d55a43b0e2ed10"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/solarus-quest-editor/README b/games/solarus-quest-editor/README
new file mode 100644
index 0000000000..93415b90c8
--- /dev/null
+++ b/games/solarus-quest-editor/README
@@ -0,0 +1,3 @@
+Solarus Quest Editor is a free and open-source game editor for Solarus, licensed
+under GPL. It is written in C++ with Qt. It helps you managing your project, and
+editing maps, sprites, tilesets, dialogs, scripts, musics and sounds.
diff --git a/games/solarus-quest-editor/doinst.sh b/games/solarus-quest-editor/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/solarus-quest-editor/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/solarus-quest-editor/slack-desc b/games/solarus-quest-editor/slack-desc
new file mode 100644
index 0000000000..7deb5bf5fb
--- /dev/null
+++ b/games/solarus-quest-editor/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+solarus-quest-editor: solarus-quest-editor (GUI to edit quests for the Solarus engine)
+solarus-quest-editor:
+solarus-quest-editor: Solarus Quest Editor is a free and open-source game editor for
+solarus-quest-editor: Solarus, licensed under GPL. It is written in C++ with Qt. It helps
+solarus-quest-editor: you managing your project, and editing maps, sprites, tilesets,
+solarus-quest-editor: dialogs, scripts, musics and sounds. 
+solarus-quest-editor:
+solarus-quest-editor: Homepage: http://www.solarus-games.org/
+solarus-quest-editor:
+solarus-quest-editor:
+solarus-quest-editor:
diff --git a/games/solarus-quest-editor/solarus-quest-editor.SlackBuild b/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
new file mode 100644
index 0000000000..b332f2260a
--- /dev/null
+++ b/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for solarus-quest-editor
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=solarus-quest-editor
+VERSION=${VERSION:-1.4.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  install -Dm0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+cd ..
+
+install -Dm0644 images/logo/sqe-logo.png $PKG/usr/share/pixmaps/sqe-logo.png
+install -Dm0644 resources/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Add missing icons to package
+for size in $(find /usr/share/icons/hicolor -type d -mindepth 1 -maxdepth 1 -exec basename {} \; | cut -f1 -d"x"); do
+    if ls images/icon/*${size}* 1>/dev/null 2>/dev/null; then
+	mkdir -p $PKG/usr/share/icons/hicolor/${size}x${size}/apps
+	cp -a images/icon/*${size}*.png \
+	   $PKG/usr/share/icons/hicolor/${size}x${size}/apps
+    fi
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog README.md license*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/solarus-quest-editor/solarus-quest-editor.info b/games/solarus-quest-editor/solarus-quest-editor.info
new file mode 100644
index 0000000000..bb3e6572ce
--- /dev/null
+++ b/games/solarus-quest-editor/solarus-quest-editor.info
@@ -0,0 +1,10 @@
+PRGNAM="solarus-quest-editor"
+VERSION="1.4.5"
+HOMEPAGE="http://www.solarus-games.org/"
+DOWNLOAD="https://github.com/christopho/solarus-quest-editor/archive/v1.4.5.tar.gz"
+MD5SUM="2af8a97bb53aac488974e69d81972050"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="solarus qt5"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/solarus/README b/games/solarus/README
new file mode 100644
index 0000000000..46b3821055
--- /dev/null
+++ b/games/solarus/README
@@ -0,0 +1,7 @@
+Solarus is a free and open-source game engine, licensed under GPL v3.
+It is written from scratch in C++ and uses SDL2 (it’s not an emulator).
+Development began in 2006. The goal of the engine is to allow people to
+create their own Action-RPG games (also called Zelda-like games). It is
+totally independent from Nintendo.
+
+This will require game data like zsdx.
diff --git a/games/solarus/slack-desc b/games/solarus/slack-desc
new file mode 100644
index 0000000000..3c91b8dff6
--- /dev/null
+++ b/games/solarus/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+solarus: solarus (an ARPG game engine)
+solarus:
+solarus: Solarus is a free and open-source Action-RPG game engine, licensed
+solarus: under GPL, and written in C++. It runs quests in Lua, and can work on
+solarus: a great number of platforms.
+solarus: 
+solarus: Homepage: http://www.solarus-games.org/
+solarus:
+solarus:
+solarus:
+solarus:
diff --git a/games/solarus/solarus.SlackBuild b/games/solarus/solarus.SlackBuild
new file mode 100644
index 0000000000..19d36b2fa4
--- /dev/null
+++ b/games/solarus/solarus.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for solarus
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=solarus
+VERSION=${VERSION:-1.4.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSOLARUS_LIBRARY_INSTALL_DESTINATION:PATH=lib${LIBDIRSUFFIX} \
+    -DDEFAULT_QUEST=/usr/share/solarus/zsdx \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -Dm0644 $PRGNAM.6 $PKG/usr/man/man6/$PRGNAM.6
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog README.md license.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/solarus/solarus.info b/games/solarus/solarus.info
new file mode 100644
index 0000000000..ca62ac141f
--- /dev/null
+++ b/games/solarus/solarus.info
@@ -0,0 +1,10 @@
+PRGNAM="solarus"
+VERSION="1.4.5"
+HOMEPAGE="http://www.solarus-games.org/"
+DOWNLOAD="http://www.solarus-games.org/downloads/solarus/solarus-1.4.5-src.tar.gz"
+MD5SUM="d61023d53aaae4fc68517aa262c7cf04"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="OpenAL SDL2_image SDL2_ttf libmodplug luajit physfs"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/games/starfighter/starfighter.SlackBuild b/games/starfighter/starfighter.SlackBuild
index 9951aa89aa..2b90f7e198 100644
--- a/games/starfighter/starfighter.SlackBuild
+++ b/games/starfighter/starfighter.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Tim Dickson   dickson.tim at googlemail.com
 
 PRGNAM=starfighter
-VERSION=${VERSION:-1.3.3}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/starfighter/starfighter.info b/games/starfighter/starfighter.info
index e4ea114fa8..159f0039e0 100644
--- a/games/starfighter/starfighter.info
+++ b/games/starfighter/starfighter.info
@@ -1,8 +1,8 @@
 PRGNAM="starfighter"
-VERSION="1.3.3"
+VERSION="1.4"
 HOMEPAGE="http://www.nongnu.org/starfighter/"
-DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/starfighter/1.3/starfighter-1.3.3-src.tar.gz"
-MD5SUM="dc979625ac596d9b9b48e4403639e808"
+DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/starfighter/1.4/starfighter-1.4-src.tar.gz"
+MD5SUM="171c4eb507f33a0202ca8fed291280d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2_image SDL2_mixer"
diff --git a/games/stone_soup/stone_soup.SlackBuild b/games/stone_soup/stone_soup.SlackBuild
index f1057c7723..6c02bbd071 100644
--- a/games/stone_soup/stone_soup.SlackBuild
+++ b/games/stone_soup/stone_soup.SlackBuild
@@ -5,7 +5,7 @@
 # Written by David Melik <dchmelik @ gmail dot com>
 
 PRGNAM=stone_soup
-VERSION=${VERSION:-0.16.1}
+VERSION=${VERSION:-0.16.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/stone_soup/stone_soup.info b/games/stone_soup/stone_soup.info
index 7d56fa1163..c964965dd3 100644
--- a/games/stone_soup/stone_soup.info
+++ b/games/stone_soup/stone_soup.info
@@ -1,8 +1,8 @@
 PRGNAM="stone_soup"
-VERSION="0.16.1"
+VERSION="0.16.2"
 HOMEPAGE="http://crawl.develz.org/"
-DOWNLOAD="http://crawl.develz.org/release/stone_soup-0.16.1-nodeps.tar.xz"
-MD5SUM="1758251f14fb9e874e49e2d1516c1e19"
+DOWNLOAD="http://crawl.develz.org/release/stone_soup-0.16.2-nodeps.tar.xz"
+MD5SUM="55b3b478d8f2321a32cfcf86e1d17841"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua SDL2_image"
diff --git a/games/supermariowar/supermariowar.SlackBuild b/games/supermariowar/supermariowar.SlackBuild
index 37d84ea39c..416831766e 100644
--- a/games/supermariowar/supermariowar.SlackBuild
+++ b/games/supermariowar/supermariowar.SlackBuild
@@ -60,7 +60,13 @@ zcat $CWD/compilefixes.diff.gz | patch -p1
 
 # the configure script isn't autoconf (yay), but it has CRLFs (boo)
 sed -i 's,\r,,g' configure
-sh configure
+
+# 20151122 bkw: PNG screenshots stopped working in -current, let's check
+# for it. When this is disabled, screenshots get saved as BMP instead.
+[ "$( pkg-config --modversion libpng | cut -d. -f1,2 )" != "1.4" ] && \
+  PNGOPT="--no-png-save"
+
+sh configure $PNGOPT
 sed -i "/^CFLAGS/s,$, $SLKCFLAGS -fpermissive," configuration
 
 make
diff --git a/games/supermariowar/supermariowar.info b/games/supermariowar/supermariowar.info
index ba680b8c17..bcf655c192 100644
--- a/games/supermariowar/supermariowar.info
+++ b/games/supermariowar/supermariowar.info
@@ -1,6 +1,6 @@
 PRGNAM="supermariowar"
 VERSION="r16"
-HOMEPAGE="https://code.google.com/p/supermariowar/"
+HOMEPAGE="https://github.com/mmatyas/supermariowar"
 DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/supermariowar-r16.tar.gz"
 MD5SUM="f64f5471b1d8811265ebbf799915ac76"
 DOWNLOAD_x86_64=""
diff --git a/games/supertux/supertux-gcc4.2.patch b/games/supertux/supertux-gcc4.2.patch
deleted file mode 100644
index 5168cc0bf1..0000000000
--- a/games/supertux/supertux-gcc4.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur supertux-0.1.3.orig/src/menu.h supertux-0.1.3/src/menu.h
---- supertux-0.1.3.orig/src/menu.h	2005-06-21 23:16:07.000000000 +0200
-+++ supertux-0.1.3/src/menu.h	2008-08-16 01:48:12.000000000 +0200
-@@ -207,7 +207,7 @@
- 
-   bool isToggled(int id);
- 
--  void Menu::get_controlfield_key_into_input(MenuItem *item);
-+  void get_controlfield_key_into_input(MenuItem *item);
- 
-   void draw   ();
-   void draw_item(int index, int menu_width, int menu_height);
diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild
index 19386fd63c..72e00c5c77 100644
--- a/games/supertux/supertux.SlackBuild
+++ b/games/supertux/supertux.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for supertux
 
-# Copyright 2006-2011  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2011,2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=supertux
-VERSION=0.1.3
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,12 +42,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -65,31 +69,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# gcc4 compile patch
-patch -p1 < $CWD/supertux-gcc4.2.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --with-x \
-  --program-prefix="" \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_SUBDIR_BIN=bin \
+    -DINSTALL_SUBDIR_SHARE=share/$PRGNAM \
+    -DINSTALL_SUBDIR_DOC=doc/$PRGNAM-$VERSION \
+    -DLIB_SUBDIR=lib${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Fix path to icon in .desktop file
 sed -i s%'Icon=supertux.png'%'Icon=supertux'%g \
-  $PKG/usr/share/applications/supertux.desktop
+  $PKG/usr/share/applications/supertux2.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL LEVELDESIGN \
-  NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION/
+# Docs are already installed by the build system
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/supertux/supertux.info b/games/supertux/supertux.info
index d16ac8d4e1..299d644b04 100644
--- a/games/supertux/supertux.info
+++ b/games/supertux/supertux.info
@@ -1,10 +1,10 @@
 PRGNAM="supertux"
-VERSION="0.1.3"
-HOMEPAGE="http://sourceforge.net/projects/supertux.berlios/"
-DOWNLOAD="http://sourceforge.net/projects/supertux.berlios/files/supertux-0.1.3.tar.bz2"
-MD5SUM="f2fc288459f33d5cd8f645fbca737a63"
+VERSION="0.4.0"
+HOMEPAGE="https://github.com/SuperTux/supertux"
+DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2"
+MD5SUM="8acc3aa1077f0da95c99fdd5f4925088"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="SDL2_image OpenAL physfs"
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/games/supertux2/README b/games/supertux2/README
deleted file mode 100644
index af8644473b..0000000000
--- a/games/supertux2/README
+++ /dev/null
@@ -1,10 +0,0 @@
-SuperTux is a jump'n'run game with strong inspiration from the Super
-Mario Bros games for the various Nintendo platforms. Run and jump
-through multiple worlds, fighting off enemies by jumping on them,
-bumping them from below or tossing objects at them, grabbing power-ups
-and other stuff on the way.
-
-This is the development snapshot: an unstable version of SuperTux,
-meant as a technology preview and for people who are not afraid to
-write bug reports. Please keep in mind that this is a work in progress!
-Everything you see here is subject to change and may even be removed.
diff --git a/games/supertux2/slack-desc b/games/supertux2/slack-desc
deleted file mode 100644
index 3c009f7eb8..0000000000
--- a/games/supertux2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-supertux2: supertux2 (The development snapshot of SuperTux)
-supertux2:
-supertux2: SuperTux is a jump'n'run game with strong inspiration from the
-supertux2: Super Mario Bros. games for the various Nintendo platforms.
-supertux2: Run and jump through multiple worlds, fighting off enemies by
-supertux2: jumping on them, bumping them from below or tossing objects at
-supertux2: them, grabbing power-ups and other stuff on the way.
-supertux2:
-supertux2:
-supertux2:
-supertux2:
diff --git a/games/supertux2/supertux2.SlackBuild b/games/supertux2/supertux2.SlackBuild
deleted file mode 100644
index 8e94cb4659..0000000000
--- a/games/supertux2/supertux2.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for supertux2
-
-# Copyright 2012-2015  Petar Petrov, petar.petrov@student.oulu.fi
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=supertux2
-VERSION=${VERSION:-0.3.5a}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=supertux
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_SUBDIR_BIN=games \
-    -DINSTALL_SUBDIR_SHARE=share/games/$PRGNAM \
-    -DINSTALL_SUBDIR_DOC=doc/$PRGNAM-$VERSION \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-# Manpage does not get copied automatically
-install -D man/man6/$PRGNAM.6 $PKG/usr/man/man6/$PRGNAM.6
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  WHATSNEW.txt data/AUTHORS docs/milestone2.html  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/supertux2/supertux2.info b/games/supertux2/supertux2.info
deleted file mode 100644
index 7796eab4d4..0000000000
--- a/games/supertux2/supertux2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="supertux2"
-VERSION="0.3.5a"
-HOMEPAGE="http://supertux.github.io/"
-DOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v0.3.5a/supertux-0.3.5a.tar.bz2"
-MD5SUM="43b7d3d0d07f8b17e3d21f7ecc2d1f9f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="OpenAL physfs SDL2_image"
-MAINTAINER="Petar Petrov"
-EMAIL="petar.petrov@student.oulu.fi"
diff --git a/games/supertuxkart/supertuxkart.SlackBuild b/games/supertuxkart/supertuxkart.SlackBuild
index 2755bbcf56..5b0e50b4c5 100644
--- a/games/supertuxkart/supertuxkart.SlackBuild
+++ b/games/supertuxkart/supertuxkart.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=supertuxkart
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/supertuxkart/supertuxkart.info b/games/supertuxkart/supertuxkart.info
index 09af60c5a1..d5f1385a2f 100644
--- a/games/supertuxkart/supertuxkart.info
+++ b/games/supertuxkart/supertuxkart.info
@@ -1,8 +1,8 @@
 PRGNAM="supertuxkart"
-VERSION="0.9"
+VERSION="0.9.1"
 HOMEPAGE="http://supertuxkart.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9/supertuxkart-0.9-src.tar.xz"
-MD5SUM="ae07569ab02c88ca4d49017df7731923"
+DOWNLOAD="http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.1/supertuxkart-0.9.1-src.tar.xz"
+MD5SUM="5d87d943f2e746043aed87dc80004701"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL"
diff --git a/games/taipan/README b/games/taipan/README
new file mode 100644
index 0000000000..af4463e597
--- /dev/null
+++ b/games/taipan/README
@@ -0,0 +1,3 @@
+taipan (ncurses 1-player turn-based strategy game)
+
+Modern version of Art Canfil's classic, Taipan. Sail the South Pacific and accumulate wealth while avoiding pirates.
diff --git a/games/taipan/slack-desc b/games/taipan/slack-desc
new file mode 100644
index 0000000000..c007f158f0
--- /dev/null
+++ b/games/taipan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+taipan: taipan (ncurses 1-player turn-based strategy game)
+taipan:
+taipan: Modern version of Art Canfil's classic, Taipan. Sail the South
+taipan: Pacific and accumulate wealth while avoiding pirates.
+taipan:
+taipan:
+taipan:
+taipan:
+taipan:
+taipan:
+taipan:
diff --git a/games/taipan/taipan.SlackBuild b/games/taipan/taipan.SlackBuild
new file mode 100644
index 0000000000..35be4bb88f
--- /dev/null
+++ b/games/taipan/taipan.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Slackware build script for taipan
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=taipan
+VERSION=${VERSION:-0.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# why does it want to be installed setuid root? holdover
+# from the svgalib version? it doesn't seem to write a high
+# score file or savagames or anything.
+sed -i 's,4755,0755,' Makefile
+
+make CFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/games
+make install bindir=$PKG/usr/games
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/taipan/taipan.info b/games/taipan/taipan.info
new file mode 100644
index 0000000000..c629fb87dc
--- /dev/null
+++ b/games/taipan/taipan.info
@@ -0,0 +1,10 @@
+PRGNAM="taipan"
+VERSION="0.9"
+HOMEPAGE="http://www.ibiblio.org/pub/linux/games/textrpg/taipan-0.9.lsm"
+DOWNLOAD="http://www.ibiblio.org/pub/linux/games/textrpg/taipan-0.9.tar.gz"
+MD5SUM="c622420bb218082ca3cfd9b619fbf8b8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/teeworlds/teeworlds.SlackBuild b/games/teeworlds/teeworlds.SlackBuild
index f639f57538..31f50de1b4 100644
--- a/games/teeworlds/teeworlds.SlackBuild
+++ b/games/teeworlds/teeworlds.SlackBuild
@@ -55,7 +55,7 @@ else
 fi
 
 OS=$(uname | tr [:upper:] [:lower:])
-SRCNAM=$PRGNAM-$VERSION-$OS\_$ARCH
+SRCNAM=$PRGNAM-$VERSION-$OS\_x86_64
 
 # Automatically tarball selected by architecture
 #if [ "$ARCH" = "x86_64" ]; then
diff --git a/games/tome4/tome4.SlackBuild b/games/tome4/tome4.SlackBuild
index 8bac0f3c0d..274b87647a 100644
--- a/games/tome4/tome4.SlackBuild
+++ b/games/tome4/tome4.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tome4
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=tome4
 SRCNAM=t-engine4-src
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/tome4/tome4.info b/games/tome4/tome4.info
index 78776d5aa9..64c1fb3963 100644
--- a/games/tome4/tome4.info
+++ b/games/tome4/tome4.info
@@ -1,10 +1,10 @@
 PRGNAM="tome4"
-VERSION="1.3.1"
+VERSION="1.3.3"
 HOMEPAGE="http://te4.org/"
-DOWNLOAD="http://te4.org/dl/t-engine/t-engine4-src-1.3.1.tar.bz2"
-MD5SUM="f04ce24809b4740419234f440877c77f"
+DOWNLOAD="http://te4.org/dl/t-engine/t-engine4-src-1.3.3.tar.bz2"
+MD5SUM="6c208b21c269699b9453190be8f874ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="premake SDL2_image SDL2_ttf OpenAL"
+REQUIRES="premake SDL2_image SDL2_ttf SDL2_mixer OpenAL"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/triplea/triplea.SlackBuild b/games/triplea/triplea.SlackBuild
index 8d0884864e..9f4ed8a5a6 100644
--- a/games/triplea/triplea.SlackBuild
+++ b/games/triplea/triplea.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for triplea
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=triplea
-SRCVER=${SRCVER:-1_8_0_5_all_platforms}
+SRCVER=${SRCVER:-1_8_0_9_all_platforms}
 VERSION=$(echo $SRCVER | tr _ . | cut -c1-7)
 SRCDIR=$(echo $SRCVER | cut -c1-7)
 BUILD=${BUILD:-1}
@@ -71,10 +71,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# fix /bin/bash^M: bad interpreter
+sed -i -e 's/\r$//' triplea_unix.sh
+
 mkdir -p $PKG/usr/bin $PKG/usr/share/games/$PRGNAM
 DATA="assets bin dice_servers icons maps old"
 for item in $DATA; do
diff --git a/games/triplea/triplea.info b/games/triplea/triplea.info
index 8db22de49e..fb5d7f380f 100644
--- a/games/triplea/triplea.info
+++ b/games/triplea/triplea.info
@@ -1,8 +1,8 @@
 PRGNAM="triplea"
-VERSION="1.8.0.5"
+VERSION="1.8.0.9"
 HOMEPAGE="http://triplea.sourceforge.net/mywiki/TripleA"
-DOWNLOAD="http://downloads.sourceforge.net/project/tripleamaps/TripleA/stable/1_8_0_5_extra_maps/triplea_1_8_0_5_all_platforms.zip"
-MD5SUM="61c21b07f088cd68725ab99bb06cc05b"
+DOWNLOAD="http://downloads.sourceforge.net/project/tripleamaps/TripleA/stable/1_8_0_9/triplea_1_8_0_9_all_platforms.zip"
+MD5SUM="0b2d29a6710980b99f401632b9944156"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/games/tt/README b/games/tt/README
index 7002e30890..d2aa8e01a0 100644
--- a/games/tt/README
+++ b/games/tt/README
@@ -1 +1,4 @@
 Tetris running in a terminal window.
+
+This is the tetris game that was included in ancient Slackware
+releases, and removed in Slackware 3.3.
diff --git a/games/tworld/tworld.SlackBuild b/games/tworld/tworld.SlackBuild
index 4cb27229f9..b9f6625b2b 100644
--- a/games/tworld/tworld.SlackBuild
+++ b/games/tworld/tworld.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tworld
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Greece-Orestiada
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tworld
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  --datadir=/usr/share/games \
+  --datadir=/usr/share \
   --build=$ARCH-slackware-linux
 
 make
@@ -84,11 +84,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/bin \
          $PKG/usr/man/man6 \
-         $PKG/usr/share/games/$PRGNAM/{sets,data,res}
+         $PKG/usr/share/$PRGNAM/{sets,data,res}
 install -D -m0755 tworld $PKG/usr/bin
-install -D -m0644 sets/* $PKG/usr/share/games/$PRGNAM/sets
-install -D -m0644 res/* $PKG/usr/share/games/$PRGNAM/res
-install -D -m0644 data/* $PKG/usr/share/games/$PRGNAM/data
+install -D -m0644 sets/* $PKG/usr/share/$PRGNAM/sets
+install -D -m0644 res/* $PKG/usr/share/$PRGNAM/res
+install -D -m0644 data/* $PKG/usr/share/$PRGNAM/data
 
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/games/tworld/tworld.info b/games/tworld/tworld.info
index e253f09edc..72bf24072b 100644
--- a/games/tworld/tworld.info
+++ b/games/tworld/tworld.info
@@ -1,8 +1,8 @@
 PRGNAM="tworld"
-VERSION="1.3.0"
+VERSION="1.3.2"
 HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/tworld/"
-DOWNLOAD="http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0.tar.gz"
-MD5SUM="03a1f5e750562b6d47b8984bb1640ec0"
+DOWNLOAD="http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.2.tar.gz"
+MD5SUM="d12e84f14f206068a1a4a025b07bb825"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/ufoai/README b/games/ufoai/README
index 9ce95441cf..192f4d18fc 100644
--- a/games/ufoai/README
+++ b/games/ufoai/README
@@ -16,3 +16,6 @@ If you're going to install the package on a host whose CPU lacks streaming
 SIMD extensions, set SSE=no in the script's environment. To find out
 whether SSE is supported, try "grep sse /proc/cpuinfo". If you get no
 output, you don't have SSE.
+
+By default, ufoai is built with SDL1. If you'd prefer SDL2, install
+SDL2 and SDL2_ttf, then run this script with SDL2=yes in the environment.
diff --git a/games/ufoai/ufoai.SlackBuild b/games/ufoai/ufoai.SlackBuild
index 395573bd04..91fa4efc5a 100644
--- a/games/ufoai/ufoai.SlackBuild
+++ b/games/ufoai/ufoai.SlackBuild
@@ -24,9 +24,14 @@
 # - allow building the radiant editor. I have no idea if it's working
 #   correctly, since I have no idea how to use it.
 
+# 20151126 bkw:
+# - fix build on systems that have SDL2 but not SDL2_ttf
+# - add SDL2 environment variable
+# - move binaries to /usr/games
+
 PRGNAM=ufoai
 VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -86,6 +91,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+[ "${SDL2:-no}" = "no" ] && EXTRAOPT="--disable-sdl2"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -98,6 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \
    --enable-ufo \
    --enable-ufoded \
    --enable-ufoslicer \
+   $EXTRAOPT \
    $radiant
 
 make
@@ -108,7 +116,7 @@ make pk3
 BINARIES=
 
 # Manual install: first the data...
-mkdir -p $PKG/usr/share/games/$PRGNAM $PKG/usr/bin
+mkdir -p $PKG/usr/share/games/$PRGNAM $PKG/usr/games
 cp -a base $PKG/usr/share/games/$PRGNAM/
 
 # ...then the binaries
@@ -119,7 +127,7 @@ if [ "$radiant" = "--enable-uforadiant" ]; then
 fi
 
 BINARIES="$BINARIES ufo ufoded ufo2map ufomodel memory ufoslicer"
-install -s -m0755 $BINARIES $PKG/usr/bin/
+install -s -m0755 $BINARIES $PKG/usr/games/
 
 # .desktop files, icons and man pages...
 mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/man/man6
@@ -128,11 +136,7 @@ install -m 0644 debian/*.xpm $PKG/usr/share/pixmaps/
 install -m 0644 debian/*.6 $PKG/usr/man/man6/
 gzip $PKG/usr/man/man6/*.6
 
-# Remove wrong execution path from .desktop files
-# and get rid of uforadiant stuff if we don't have uforadiant
-# [ 20140826 bkw: actually /usr/games is where they should go, but
-#   I won't change this just to be changing it ]
-sed -i "s|/usr/games/||" $PKG/usr/share/applications/*.desktop
+# Get rid of uforadiant stuff if we don't have uforadiant
 [ "$radiant" = "" ] && rm $PKG/usr/share/applications/uforadiant.desktop \
   $PKG/usr/man/man6/uforadiant.6.gz $PKG/usr/share/pixmaps/uforadiant.xpm
 
diff --git a/games/uqm/uqm.SlackBuild b/games/uqm/uqm.SlackBuild
index ffcf6eaffe..e5a81f5666 100644
--- a/games/uqm/uqm.SlackBuild
+++ b/games/uqm/uqm.SlackBuild
@@ -94,7 +94,7 @@ fi
 
 
 build_config | sh build.sh uqm config
-sed -i "s/-O3/$SLKCFLAGS/" build.vars
+sed -i -e "s/-O3/$SLKCFLAGS/" -e '/LDFLAGS/s,-lz,-lz -lm,' build.vars
 sh build.sh uqm
 
 strip $PRGNAM
diff --git a/games/ut2004/README b/games/ut2004/README
new file mode 100644
index 0000000000..f4a064b5c3
--- /dev/null
+++ b/games/ut2004/README
@@ -0,0 +1,26 @@
+Reload, rev up and ride out. The new Tournament is faster, higher and meaner. Land and air based
+vehicles take combat to a new level; while an arsenal of new weaponry, daunting arenas and battlefields
+and the challenge of the Assault and Onslaught modes make the gladiator blood sport of the future a
+brand new experience. Buckle up it's gonna be one hell of a ride!
+
+Optional bonus packs and more: http://liflg.org/?catid=6&gameid=17
+
+Notes:
+
+This takes the installer (which has the latest version) from Linux Installers For Linux Gamers and
+nicely installs it into a package following Slackware standards. This SlackBuild should detect if
+you're playing on a 32-bit or 64-bit system and install the correct bins.
+
+Your game data (and mods) must go into "/usr/share/games/ut2004". There is a home folder (.ut2004) for 
+your configs, but you'll need to be able to modify the contents located under the share/games folder.
+You should have permissions to modify this folder with the games group.
+
+It's probably best to put the game data downloaded from Steam or from your CDs in
+"/usr/share/games/ut2004" before installing this SlackBuild.
+
+You'll need to create a file named, "CDkey" in the "/usr/share/games/ut2004/System" directory. And in
+it, you need to provide the cd key you have from Steam or the retail box. Otherwise the game will
+fail to launch.
+
+The mod selection menu is broken, you'll need to launch mods with a parameter. Here is an example with
+Killing Floor: ut2004 -mod=KFMod20
diff --git a/games/ut2004/slack-desc b/games/ut2004/slack-desc
new file mode 100644
index 0000000000..2b84251c9e
--- /dev/null
+++ b/games/ut2004/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ut2004: ut2004 (Unreal Tournament 2004)
+ut2004:
+ut2004: Reload, rev up and ride out. The new Tournament is faster, higher and
+ut2004: meaner. Land and air based vehicles take combat to a new level;
+ut2004: while an arsenal of new weaponry, daunting arenas and battlefields
+ut2004: and the challenge of the Assault and Onslaught modes make the
+ut2004: gladiator blood sport of the future a brand new experience. Buckle
+ut2004: up it's gonna be one hell of a ride!
+ut2004:
+ut2004: Homepage: http://liflg.org
+ut2004: 
diff --git a/games/ut2004/ut2004 b/games/ut2004/ut2004
new file mode 100644
index 0000000000..9c239ed119
--- /dev/null
+++ b/games/ut2004/ut2004
@@ -0,0 +1,4 @@
+ #!/bin/bash
+
+cd /usr/share/games/ut2004/System/ 
+./ut2004 $*
diff --git a/games/ut2004/ut2004.SlackBuild b/games/ut2004/ut2004.SlackBuild
new file mode 100644
index 0000000000..1caeed1932
--- /dev/null
+++ b/games/ut2004/ut2004.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for ut2004
+
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# TeamSpeak3 SlackBuild by Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ut2004
+VERSION=${VERSION:-3369}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+GAMDIR=usr/share/games/ut2004
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  UARCH="amd64"
+else
+  UARCH="x86"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+mkdir -p $PKG/$GAMDIR
+chmod +x $CWD/"$PRGNAM"_"$VERSION"-english.midway.dvd-3.run
+$CWD/"$PRGNAM"_"$VERSION"-english.midway.dvd-3.run --noexec --target $PKG/$GAMDIR
+cd $PKG/$GAMDIR
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Extract binaries based on arch
+tar xvf linux-$UARCH.tar.gz
+rsync -a System patch/
+
+# Move launcher script
+chmod +x $PKG/$GAMDIR/bin/ut2004
+mv $PKG/$GAMDIR/bin/ut2004 $PKG/$GAMDIR/patch/System
+
+# Clean up
+rm -rf $PKG/$GAMDIR/bin $PKG/$GAMDIR/vcdk-* $PKG/$GAMDIR/setup* $PKG/$GAMDIR/linux-*
+rsync -a patch/* $PKG/$GAMDIR
+rm -rf $PKG/$GAMDIR/patch
+
+# Desktop and launcher related stuff
+install -D -m 0644 $PRGNAM.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
+install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 0755 $CWD/$PRGNAM $PKG/usr/games/$PRGNAM
+
+# Make it so the games group can access the folder
+chgrp -R games $PKG/$GAMDIR
+chmod -R 774 $PKG/$GAMDIR
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv EULA.txt README.liflg $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/ut2004/ut2004.desktop b/games/ut2004/ut2004.desktop
new file mode 100644
index 0000000000..5a7767ae45
--- /dev/null
+++ b/games/ut2004/ut2004.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Unreal Tournament 2004
+GenericName=Unreal Tournament 2004
+Type=Application
+Comment=The classic fast paced tournament shooter.
+Exec=ut2004
+Icon=ut2004
+Categories=Game
diff --git a/games/ut2004/ut2004.info b/games/ut2004/ut2004.info
new file mode 100644
index 0000000000..9d62f4c53a
--- /dev/null
+++ b/games/ut2004/ut2004.info
@@ -0,0 +1,10 @@
+PRGNAM="ut2004"
+VERSION="3369"
+HOMEPAGE="http://liflg.org/"
+DOWNLOAD="http://liflg.holarse-linuxgaming.de/files/final/ut2004_3369-english.midway.dvd-3.run"
+MD5SUM="18305704c69655c37ec45e79d64aef66"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/games/vbam/README b/games/vbam/README
index 7d4f664baf..c2116aa9d9 100644
--- a/games/vbam/README
+++ b/games/vbam/README
@@ -11,3 +11,13 @@ This application is the GTK GUI version of VisualBoyAdvance-M. The name of the
 executable is "gvbam".
 
 FFMPEG=ON will enable recording and playback. It requires FFMPEG.
+
+There are a couple of alternatives you might try instead of this VBAM
+SlackBuild.
+
+The first is mGBA, which is available on SlackBuilds.org.
+
+The second is RetroArch with the VBAM core. The SlackBuilds for that are
+here:
+
+https://github.com/duganchen/slackware-libretro
diff --git a/games/voxelands/voxelands.info b/games/voxelands/voxelands.info
index d74fd1bb5a..12e63d3948 100644
--- a/games/voxelands/voxelands.info
+++ b/games/voxelands/voxelands.info
@@ -1,7 +1,7 @@
 PRGNAM="voxelands"
 VERSION="1501.00"
 HOMEPAGE="http://voxelands.com/"
-DOWNLOAD="http://www.voxelands.com/downloads/voxelands-1501.00-src.tar.bz2"
+DOWNLOAD="http://www.voxelands.com/downloads/old/voxelands-1501.00-src.tar.bz2"
 MD5SUM="1051e84074882766e49928ec7bf31571"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/warsow/warsow.SlackBuild b/games/warsow/warsow.SlackBuild
index 57346a10f4..39fdda2ecf 100644
--- a/games/warsow/warsow.SlackBuild
+++ b/games/warsow/warsow.SlackBuild
@@ -22,99 +22,111 @@
 # Written by Andre Barboza <bmg.andre@gmail.com>
 # Updated by drhouse <housegregory299@gmail.com>
 # Updated by goarilla <goarilla@gmail.com>
-#   It now packages the unified tarball instead of compiling the source and merging the data
 
 PRGNAM=warsow
-VERSION=${VERSION:-1.51}
+VERSION=${VERSION:-2.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASE_VERSION=${BASE_VERSION:-1.51}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+case "$( uname -m )" in
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
-  esac
-fi
+esac
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
+CWD=$(pwd)
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "x86_64" ]; then
-  EXESUFFIX="x86_64"
+if [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
-  EXESUFFIX="i386"
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
-set -e
-rm -rf $PKG $TMP/$PRGNAM-$VERSION
-mkdir -p $TMP/$PRGNAM-$VERSION $PKG $OUTPUT
-cd $TMP/$PRGNAM-$VERSION
-tar -xvvzf "$CWD"/"$PRGNAM"_"$BASE_VERSION"_unified.tar.gz
-
-# warsow 1.51_unified base dir is warsow_15
-cd "$PRGNAM"_"15"
-
-# remove windows files
-find -L . -type f -iname '*.dll' -exec rm -vf -- '{}' \;
-find -L . -type f -iname '*.exe' -exec rm -vf -- '{}' \;
-
-# correct permissions
+set -eu
+
+rm -rf "$PKG"
+mkdir -p "${TMP}/${PRGNAM}-${VERSION}" "$PKG"
+mkdir -p "${PKG}/install"
+mkdir -p "${PKG}/usr/games"
+mkdir -p "${PKG}/usr/share/${PRGNAM}"
+mkdir -p "${PKG}/usr/doc/${PRGNAM}-${VERSION}"
+
+# no parent directory
+SDK="warsow_201_sdk.tar.gz"
+# ./warsow_20
+DATA="warsow_201_unified.tar.gz"
+
+tar -C "${PKG}/usr/doc/${PRGNAM}-${VERSION}" -xvf "$DATA" warsow_20/docs/
+mv "${PKG}/usr/doc/${PRGNAM}-${VERSION}/warsow_20/docs/"* "${PKG}/usr/doc/${PRGNAM}-${VERSION}/"
+rm -rf "${PKG}/usr/doc/${PRGNAM}-${VERSION}/warsow_20/"
+tar -C "${PKG}/usr/share/${PRGNAM}" -xvf "$DATA" warsow_20/basewsw
+mv "${PKG}/usr/share/${PRGNAM}/warsow_20/"* "${PKG}/usr/share/${PRGNAM}"
+rm -rf "${PKG}/usr/share/${PRGNAM}/warsow_20/"
+
+# unpack sdk
+tar -C "${TMP}/${PRGNAM}-${VERSION}" -xvf "$SDK"
+
+# build
+cd "${TMP}/${PRGNAM}-${VERSION}"
+cd source/source
+cmake .
+make
+
+# copy build
+cp -rf build/ "${PKG}/usr/share/${PRGNAM}/"
+
+# shuffle some files
+cd "$PKG"
+cd "usr/share/${PRGNAM}"
+mv basewsw basewsw.old
+mv build/* .
+mv basewsw/* basewsw.old/
+rm -rf basewsw/
+mv basewsw.old/ basewsw/
+rm -rf build
+cp "${CWD}/${PRGNAM}.SlackBuild" "${PKG}/usr/doc/${PRGNAM}-${VERSION}"
+
+# fix permissions of executables
+cd "$PKG"
+chmod 755 "usr/share/${PRGNAM}/warsow.${ARCH}"
+chmod 755 "usr/share/${PRGNAM}/wswtv_server.${ARCH}"
+chmod 755 "usr/share/${PRGNAM}/wsw_server.${ARCH}"
+
+# make wrappers
+cat >> usr/games/warsow << EOF
+#! /bin/sh
+ARCH="$ARCH"
+EOF
+cat >> usr/games/warsow << "EOF"
+cd /usr/share/warsow/ && exec ./"$(basename "$0").${ARCH}"
+EOF
+
+cp usr/games/warsow usr/games/wswtv_server
+cp usr/games/warsow usr/games/wsw_server
+
+# copy icons
+mkdir -p "${PKG}/usr/share/pixmaps/"
+cat "${CWD}/warsow.png" > "${PKG}/usr/share/pixmaps/warsow.png"
+mkdir -p "${PKG}/usr/share/applications"
+cat "${CWD}/warsow.desktop" > "${PKG}/usr/share/applications/warsow.desktop"
+
+# copy description
+cp "${CWD}/slack-desc" "${PKG}/install"
+
+# set permissions
 chown -R root:root .
-# goarilla: plus 700
-find -L . \
- \( -perm 700 -o -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/games
-
-# fix and place the wrapper scripts
-cat warsow | sed 's|^BINARY_DIR=$|BINARY_DIR=/usr/share/warsow|' > $PKG/usr/games/warsow
-cat wsw_server | sed 's|^BINARY_DIR=$|BINARY_DIR=/usr/share/warsow|' > $PKG/usr/games/wsw_server
-cat wswtv_server | sed 's|^BINARY_DIR=$|BINARY_DIR=/usr/share/warsow|' > $PKG/usr/games/wswtv_server
-(cd $PKG/usr/games; chmod 0755 *)
-
-mkdir -p $PKG/usr/share/warsow/basewsw/
-
-# copy executables
-cp -a warsow.* "$PKG"/usr/share/warsow/
-cp -a wsw_server.* "$PKG"/usr/share/warsow/
-cp -a wswtv_server.* "$PKG"/usr/share/warsow/
-
-# copy libs
-cp -ra libs "$PKG"/usr/share/warsow/
-
-# (2014/09/28)
-# fix libs' permissions in case SBo overrides the find
-# call to fix the permissions above
-#
-# Thanks to Andrew Conway for letting me know
-chmod 755  "$PKG"/usr/share/warsow/libs/
-#
-# copy data
-cp -ra basewsw/* $PKG/usr/share/warsow/basewsw/
-
-# copy icons and slacbuild
-mkdir -p $PKG/usr/share/pixmaps/
-cat $CWD/warsow.png > $PKG/usr/share/pixmaps/warsow.png
-mkdir -p $PKG/usr/share/applications
-cat $CWD/warsow.desktop > $PKG/usr/share/applications/warsow.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# set up install/
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+chmod 755 usr/games/{warsow,wswtv_server,wsw_server}
+find usr/doc/"${PRGNAM}-${VERSION}" -type f -print0 | xargs -0 chmod 644
+find usr/share/"${PRGNAM}"/basewsw -type f -print0 | xargs -0 chmod 644
+find usr/share/"${PRGNAM}"/basewsw -type d -print0 | xargs -0 chmod 755
 
 # build package
-cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/warsow/warsow.info b/games/warsow/warsow.info
index ee8c52d72e..6766991f9d 100644
--- a/games/warsow/warsow.info
+++ b/games/warsow/warsow.info
@@ -1,10 +1,12 @@
 PRGNAM="warsow"
-VERSION="1.51"
+VERSION="2.01"
 HOMEPAGE="http://www.warsow.net/"
-DOWNLOAD="http://update.warsow.net/mirror/warsow_1.51_unified.tar.gz"
-MD5SUM="482e2020b5463d8503f1f9fafe0c433d"
+DOWNLOAD="http://update.warsow.net/mirror/warsow_201_unified.tar.gz \
+          http://update.warsow.net/mirror/warsow_201_sdk.tar.gz"
+MD5SUM="fee194075847f9a2508f65da89b6cfea \
+        e66809592094f45ec853b460ccaaa579"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL"
-MAINTAINER="goarilla"
+REQUIRES="OpenAL SDL2"
+MAINTAINER="Kevin Paulus"
 EMAIL="goarilla@gmail.com"
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index 3f6e01b808..b260b53302 100644
--- a/games/wesnoth/wesnoth.SlackBuild
+++ b/games/wesnoth/wesnoth.SlackBuild
@@ -26,8 +26,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wesnoth
-VERSION=${VERSION:-1.12.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.12.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -94,7 +94,7 @@ scons \
  icondir=/usr/share/icons \
  desktopdir=/usr/share/applications \
  $OPT_SERVER \
- all
+ wesnoth exploder cutter wesnothd campaignd
 
 scons install destdir=$PKG
 
diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info
index f84956248e..74d16c2515 100644
--- a/games/wesnoth/wesnoth.info
+++ b/games/wesnoth/wesnoth.info
@@ -1,8 +1,8 @@
 PRGNAM="wesnoth"
-VERSION="1.12.4"
+VERSION="1.12.5"
 HOMEPAGE="http://www.wesnoth.org"
-DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.12.4.tar.bz2"
-MD5SUM="081fe60a06d6934cac9a40fd7350cc9f"
+DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.12.5.tar.bz2"
+MD5SUM="576a91355aa2c19698b09d4edc6b2f6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="scons"
diff --git a/games/wmquake/README b/games/wmquake/README
new file mode 100644
index 0000000000..f0b131e499
--- /dev/null
+++ b/games/wmquake/README
@@ -0,0 +1,16 @@
+Run id Software's legendary Quake inside a dockapp! Play full on software Quake, mods, or
+let it play demos. Fixed by Eukos for newer systems.
+
+Notes: 
+
+Be sure to start it with -nosound other wise it will segfault!
+
+Sound will not work because it uses a very old method. It MAY work on a system with
+OSS3 installed. The OSS version on SBo (OSS4) will NOT work with this game and neither
+will aoss for ALSA users.
+
+This SlackBuild moves the executable into, "/usr/share/games/quake/wmquake". This is to allow
+other Quake engines to be placed in here, for example: "/usr/share/games/quake/darkplaces".
+
+Your id1 folder (and mods) must go into, "/usr/share/games/quake/wmquake", for there is no home
+folder for data. You should have permissions to modify this folder with the games group.
diff --git a/games/wmquake/slack-desc b/games/wmquake/slack-desc
new file mode 100644
index 0000000000..9f40084c05
--- /dev/null
+++ b/games/wmquake/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler--------------------------------------------------------|
+wmquake: wmquake (Quake DockApp)
+wmquake: 
+wmquake: Run id Software's legendary Quake inside a dockapp! Play full on  
+wmquake: software Quake, mods, or let it play demos. Fixed by Eukos for newer
+wmquake: systems.
+wmquake: 
+wmquake: Homepage: http://bloodbathsoftworks.com/eukara/
+wmquake:
+wmquake:
+wmquake:
+wmquake:
diff --git a/games/wmquake/wmquake b/games/wmquake/wmquake
new file mode 100644
index 0000000000..fcdeb2c665
--- /dev/null
+++ b/games/wmquake/wmquake
@@ -0,0 +1,4 @@
+ #!/bin/bash
+
+cd /usr/share/games/quake/wmquake
+./wmquake $*
diff --git a/games/wmquake/wmquake.SlackBuild b/games/wmquake/wmquake.SlackBuild
new file mode 100644
index 0000000000..e31c4cf16e
--- /dev/null
+++ b/games/wmquake/wmquake.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for wmquake
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmquake
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+GAMDIR=usr/share/games/quake/wmquake
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+
+# Copies over compiled binary
+install -D -m 0755 $PRGNAM $PKG/$GAMDIR/$PRGNAM
+
+# Desktop and launcher related stuff
+install -D -m 0755 $CWD/$PRGNAM $PKG/usr/games/$PRGNAM
+
+# Make it so the games group can access the folder
+chgrp games $PKG/$GAMDIR
+chmod 774 $PKG/$GAMDIR
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.INSTALL README.source README.wmquake $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/wmquake/wmquake.info b/games/wmquake/wmquake.info
new file mode 100644
index 0000000000..32ce586e8a
--- /dev/null
+++ b/games/wmquake/wmquake.info
@@ -0,0 +1,10 @@
+PRGNAM="wmquake"
+VERSION="1.1"
+HOMEPAGE="http://bloodbathsoftworks.com/eukara/files/index.php?dir=UNIX%2Fapplications%2F"
+DOWNLOAD="http://bloodbathsoftworks.com/eukara/files/UNIX/applications/wmquake-1.1.tar.gz"
+MD5SUM="e84db45c669efd6bbfced8121512245b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/games/wolf4sdl/wolf4sdl.info b/games/wolf4sdl/wolf4sdl.info
index 857060f560..8a2277bd90 100644
--- a/games/wolf4sdl/wolf4sdl.info
+++ b/games/wolf4sdl/wolf4sdl.info
@@ -1,7 +1,7 @@
 PRGNAM="wolf4sdl"
 VERSION="1.7"
-HOMEPAGE="http://web.archive.org/web/20140728192012/http://www.chaos-software.de.vu/"
-DOWNLOAD="http://web.archive.org/web/20120419135331/http://www.alice-dsl.net/mkroll/bins/Wolf4SDL-1.7-src.zip \
+HOMEPAGE="https://github.com/mozzwald/wolf4sdl"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/Wolf4SDL-1.7-src.zip \
           http://downloads.sourceforge.net/project/wolfgl/Data/Demo/wolfdata.zip \
           http://downloads.sourceforge.net/project/wolfgl/Data/Demo/sdmdata.zip"
 MD5SUM="303f340598bfbe3440523c1ddb9f52e8 \
diff --git a/games/xroar/xroar.6 b/games/xroar/xroar.6
deleted file mode 100644
index dc5a19be7e..0000000000
--- a/games/xroar/xroar.6
+++ /dev/null
@@ -1,448 +0,0 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-.    ds C`
-.    ds C'
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
-..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
-..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
-.\}
-.rr rF
-.\" ========================================================================
-.\"
-.IX Title "XROAR 6"
-.TH XROAR 6 "2014-08-24" "0.32" "SlackBuilds.org"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-xroar \- Dragon and CoCo 1/2 emulator.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-xroar [\-c \s-1CONFFILE\s0] [\s-1OPTION\s0]...
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-XRoar is a Dragon emulator.  Due to hardware similarities, XRoar also emulates the Tandy Colour Computer
-(CoCo) models 1 & 2.
-.PP
-This man page just documents the command-line options to xroar. For full documentation,  see the info page for
-xroar, or the \s-1HTML\s0 documentation in /usr/doc/xroar\-_VERSION_/xroar.html.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\-c \s-1CONFFILE\s0" 5
-.IX Item "-c CONFFILE"
-specify a configuration file
-.IP "Machines" 5
-.IX Item "Machines"
-.PD 0
-.IP "\-default\-machine \s-1NAME\s0" 5
-.IX Item "-default-machine NAME"
-.PD
-default machine on startup
-.IP "\-machine \s-1NAME\s0" 5
-.IX Item "-machine NAME"
-configure named machine (\fB\-machine help\fR for list)
-.IP "\-machine\-desc \s-1TEXT\s0" 5
-.IX Item "-machine-desc TEXT"
-machine description
-.IP "\-machine\-arch \s-1ARCH\s0" 5
-.IX Item "-machine-arch ARCH"
-machine architecture (\fB\-machine\-arch help\fR for list)
-.IP "\-machine\-keyboard \s-1LAYOUT\s0" 5
-.IX Item "-machine-keyboard LAYOUT"
-keyboard layout (\fB\-machine\-keyboard\fR help for list)
-.IP "\-machine\-cpu \s-1CPU\s0" 5
-.IX Item "-machine-cpu CPU"
-machine \s-1CPU \s0(\fB\-machine\-cpu help\fR for list)
-.IP "\-bas \s-1NAME\s0" 5
-.IX Item "-bas NAME"
-\&\s-1BASIC ROM\s0 to use (CoCo only)
-.IP "\-extbas \s-1NAME\s0" 5
-.IX Item "-extbas NAME"
-Extended \s-1BASIC ROM\s0 to use
-.IP "\-altbas \s-1NAME\s0" 5
-.IX Item "-altbas NAME"
-64K mode Extended \s-1BASIC ROM \s0(Dragon 64)
-.IP "\-nobas" 5
-.IX Item "-nobas"
-disable \s-1BASIC\s0
-.IP "\-noextbas" 5
-.IX Item "-noextbas"
-disable Extended \s-1BASIC\s0
-.IP "\-noaltbas" 5
-.IX Item "-noaltbas"
-disable 64K mode Extended \s-1BASIC\s0
-.IP "\-ext\-charset \s-1NAME\s0" 5
-.IX Item "-ext-charset NAME"
-external character generator \s-1ROM\s0 to use
-.IP "\-tv\-type \s-1TYPE\s0" 5
-.IX Item "-tv-type TYPE"
-\&\s-1TV\s0 type (\fB\-tv\-type help\fR for list)
-.IP "\-vdg\-type \s-1TYPE\s0" 5
-.IX Item "-vdg-type TYPE"
-\&\s-1VDG\s0 type (6847 or 6847t1)
-.IP "\-ram \s-1KBYTES\s0" 5
-.IX Item "-ram KBYTES"
-amount of \s-1RAM\s0 in K
-.IP "\-machine\-cart \s-1NAME\s0" 5
-.IX Item "-machine-cart NAME"
-default cartridge for selected machine
-.IP "\-nodos" 5
-.IX Item "-nodos"
-don't automatically pick a \s-1DOS\s0 cartridge
-.IP "Cartridges" 5
-.IX Item "Cartridges"
-.PD 0
-.IP "\-cart \s-1NAME\s0" 5
-.IX Item "-cart NAME"
-.PD
-configure named cartridge (\fB\-cart help\fR for list)
-.IP "\-cart\-desc \s-1TEXT\s0" 5
-.IX Item "-cart-desc TEXT"
-cartridge description
-.IP "\-cart\-type \s-1TYPE\s0" 5
-.IX Item "-cart-type TYPE"
-cartridge base type (\fB\-cart\-type help\fR for list)
-.IP "\-cart\-rom \s-1NAME\s0" 5
-.IX Item "-cart-rom NAME"
-\&\s-1ROM\s0 image to load ($C000\-)
-.IP "\-cart\-rom2 \s-1NAME\s0" 5
-.IX Item "-cart-rom2 NAME"
-second \s-1ROM\s0 image to load ($E000\-)
-.IP "\-cart\-autorun" 5
-.IX Item "-cart-autorun"
-autorun cartridge
-.IP "\-cart\-becker" 5
-.IX Item "-cart-becker"
-enable becker port where supported
-.IP "Becker port" 5
-.IX Item "Becker port"
-.PD 0
-.IP "\-becker" 5
-.IX Item "-becker"
-.PD
-prefer becker-enabled \s-1DOS \s0(when picked automatically)
-.IP "\-becker\-ip \s-1ADDRESS\s0" 5
-.IX Item "-becker-ip ADDRESS"
-address or hostname of DriveWire server [127.0.0.1]
-.IP "\-becker\-port \s-1PORT\s0" 5
-.IX Item "-becker-port PORT"
-port of DriveWire server [65504]
-.IP "Files" 5
-.IX Item "Files"
-.PD 0
-.IP "\-load \s-1FILENAME\s0" 5
-.IX Item "-load FILENAME"
-.PD
-load or attach \s-1FILENAME\s0
-.IP "\-run \s-1FILENAME\s0" 5
-.IX Item "-run FILENAME"
-load or attach \s-1FILENAME\s0 and attempt autorun
-.IP "Cassettes" 5
-.IX Item "Cassettes"
-.PD 0
-.IP "\-tape\-write \s-1FILENAME\s0" 5
-.IX Item "-tape-write FILENAME"
-.PD
-open \s-1FILENAME\s0 for tape writing
-.IP "\-no\-tape\-fast" 5
-.IX Item "-no-tape-fast"
-disable fast tape loading
-.IP "\-tape\-pad" 5
-.IX Item "-tape-pad"
-force tape leader padding
-.IP "\-no\-tape\-pad\-auto" 5
-.IX Item "-no-tape-pad-auto"
-disable automatic leader padding
-.IP "\-tape\-rewrite" 5
-.IX Item "-tape-rewrite"
-enable tape rewriting
-.IP "Disks" 5
-.IX Item "Disks"
-.PD 0
-.IP "\-disk\-write\-back" 5
-.IX Item "-disk-write-back"
-.PD
-default to enabling write-back for disk images
-.IP "\-no\-disk\-auto\-os9" 5
-.IX Item "-no-disk-auto-os9"
-don't try to detect headerless \s-1OS\-9 JVC\s0 disk images
-.IP "Firmware \s-1ROM\s0 images" 5
-.IX Item "Firmware ROM images"
-.PD 0
-.IP "\-rompath \s-1PATH\s0" 5
-.IX Item "-rompath PATH"
-.PD
-\&\s-1ROM\s0 search path (colon-separated list)
-.IP "\-romlist NAME=LIST" 5
-.IX Item "-romlist NAME=LIST"
-define a \s-1ROM\s0 list
-.IP "\-romlist\-print" 5
-.IX Item "-romlist-print"
-print defined \s-1ROM\s0 lists
-.IP "\-crclist NAME=LIST" 5
-.IX Item "-crclist NAME=LIST"
-define a \s-1ROM CRC\s0 list
-.IP "\-crclist\-print" 5
-.IX Item "-crclist-print"
-print defined \s-1ROM CRC\s0 lists
-.IP "\-force\-crc\-match" 5
-.IX Item "-force-crc-match"
-force per-architecture \s-1CRC\s0 matches
-.IP "User interface" 5
-.IX Item "User interface"
-.PD 0
-.IP "\-ui \s-1MODULE\s0" 5
-.IX Item "-ui MODULE"
-.PD
-user-interface module (\fB\-ui help\fR for list)
-.IP "Video" 5
-.IX Item "Video"
-.PD 0
-.IP "\-vo \s-1MODULE\s0" 5
-.IX Item "-vo MODULE"
-.PD
-video module (\fB\-vo help\fR for list)
-.IP "\-fs" 5
-.IX Item "-fs"
-start emulator full-screen if possible
-.IP "\-fskip \s-1FRAMES\s0" 5
-.IX Item "-fskip FRAMES"
-frameskip (default: 0)
-.IP "\-ccr \s-1RENDERER\s0" 5
-.IX Item "-ccr RENDERER"
-cross-colour renderer (\fB\-ccr help\fR for list)
-.IP "\-geometry WxH+X+Y" 5
-.IX Item "-geometry WxH+X+Y"
-initial emulator geometry
-.IP "\-invert\-text" 5
-.IX Item "-invert-text"
-start with text mode inverted
-.IP "Audio" 5
-.IX Item "Audio"
-.PD 0
-.IP "\-ao \s-1MODULE\s0" 5
-.IX Item "-ao MODULE"
-.PD
-audio module (\fB\-ao help\fR for list)
-.IP "\-ao\-device \s-1STRING\s0" 5
-.IX Item "-ao-device STRING"
-device to use for audio module
-.IP "\-ao\-format \s-1FMT\s0" 5
-.IX Item "-ao-format FMT"
-set audio sample format (\fB\-ao\-format help\fR for list)
-.IP "\-ao\-rate \s-1HZ\s0" 5
-.IX Item "-ao-rate HZ"
-set audio frame rate (if supported by module)
-.IP "\-ao\-channels N" 5
-.IX Item "-ao-channels N"
-set number of audio channels, 1 or 2
-.IP "\-ao\-fragments N" 5
-.IX Item "-ao-fragments N"
-set number of audio fragments
-.IP "\-ao\-fragment\-ms \s-1MS\s0" 5
-.IX Item "-ao-fragment-ms MS"
-set audio fragment size in ms (if supported)
-.IP "\-ao\-fragment\-frames N" 5
-.IX Item "-ao-fragment-frames N"
-set audio fragment size in samples (if supported)
-.IP "\-ao\-buffer\-ms \s-1MS\s0" 5
-.IX Item "-ao-buffer-ms MS"
-set total audio buffer size in ms (if supported)
-.IP "\-ao\-buffer\-frames N" 5
-.IX Item "-ao-buffer-frames N"
-set total audio buffer size in samples (if supported)
-.IP "\-volume \s-1VOLUME\s0" 5
-.IX Item "-volume VOLUME"
-audio volume (0 \- 100)
-.IP "\-fast\-sound" 5
-.IX Item "-fast-sound"
-faster but less accurate sound
-.IP "Keyboard" 5
-.IX Item "Keyboard"
-.PD 0
-.IP "\-keymap \s-1CODE\s0" 5
-.IX Item "-keymap CODE"
-.PD
-host keyboard type (\fB\-keymap help\fR for list)
-.IP "\-kbd\-translate" 5
-.IX Item "-kbd-translate"
-enable keyboard translation
-.IP "\-type \s-1STRING\s0" 5
-.IX Item "-type STRING"
-intercept \s-1ROM\s0 calls to type \s-1STRING\s0 into \s-1BASIC\s0
-.IP "Joysticks" 5
-.IX Item "Joysticks"
-See \s-1JOYSTICK SPECS\s0 below for the description of the \s-1SPEC\s0 arguments.
-.IP "\-joy \s-1NAME\s0" 5
-.IX Item "-joy NAME"
-configure named joystick (\fB\-joy help\fR for list)
-.IP "\-joy\-desc \s-1TEXT\s0" 5
-.IX Item "-joy-desc TEXT"
-joystick description
-.IP "\-joy\-axis AXIS=SPEC" 5
-.IX Item "-joy-axis AXIS=SPEC"
-configure joystick axis
-.IP "\-joy\-button BTN=SPEC" 5
-.IX Item "-joy-button BTN=SPEC"
-configure joystick button
-.IP "\-joy\-right \s-1NAME\s0" 5
-.IX Item "-joy-right NAME"
-map right joystick
-.IP "\-joy\-left \s-1NAME\s0" 5
-.IX Item "-joy-left NAME"
-map left joystick
-.IP "\-joy\-virtual \s-1NAME\s0" 5
-.IX Item "-joy-virtual NAME"
-specify the `virtual' joystick to cycle [kjoy0]
-.IP "Printing" 5
-.IX Item "Printing"
-.PD 0
-.IP "\-lp\-file \s-1FILENAME\s0" 5
-.IX Item "-lp-file FILENAME"
-.PD
-append Dragon printer output to \s-1FILENAME\s0
-.IP "\-lp\-pipe \s-1COMMAND\s0" 5
-.IX Item "-lp-pipe COMMAND"
-pipe Dragon printer output to \s-1COMMAND\s0
-.IP "Debugging" 5
-.IX Item "Debugging"
-.PD 0
-.IP "\-gdb" 5
-.IX Item "-gdb"
-.PD
-disable \s-1GDB\s0 target
-.IP "\-gdb\-ip" 5
-.IX Item "-gdb-ip"
-address of interface for \s-1GDB\s0 target [localhost]
-.IP "\-gdb\-port" 5
-.IX Item "-gdb-port"
-port for \s-1GDB\s0 target to listen on [65520]
-.IP "\-trace" 5
-.IX Item "-trace"
-start with trace mode on
-.IP "\-debug\-ui \s-1FLAGS\s0" 5
-.IX Item "-debug-ui FLAGS"
-\&\s-1UI\s0 debugging (see manual, or \-1 for all)
-.IP "\-debug\-file \s-1FLAGS\s0" 5
-.IX Item "-debug-file FLAGS"
-file debugging (see manual, or \-1 for all)
-.IP "\-debug\-fdc \s-1FLAGS\s0" 5
-.IX Item "-debug-fdc FLAGS"
-\&\s-1FDC\s0 debugging (see manual, or \-1 for all)
-.IP "\-debug\-gdb \s-1FLAGS\s0" 5
-.IX Item "-debug-gdb FLAGS"
-\&\s-1GDB\s0 target debugging (see manual, or \-1 for all)
-.IP "\-v, verbose \s-1LEVEL\s0" 5
-.IX Item "-v, verbose LEVEL"
-general debug verbosity (0\-3) [1]
-.IP "\-q, \-\-quiet" 5
-.IX Item "-q, --quiet"
-equivalent to \-\-verbose 0
-.IP "\-timeout \s-1SECONDS\s0" 5
-.IX Item "-timeout SECONDS"
-run for \s-1SECONDS\s0 then quit
-.SH "Other options"
-.IX Header "Other options"
-.IP "\-config\-print" 5
-.IX Item "-config-print"
-print full configuration to standard output
-.IP "\-h, \-\-help" 5
-.IX Item "-h, --help"
-display this help and exit
-.IP "\-V, \-\-version" 5
-.IX Item "-V, --version"
-output version information and exit
-.SH "JOYSTICK SPECS"
-.IX Header "JOYSTICK SPECS"
-Joystick SPECs are of the form [\s-1INTERFACE:\s0][ARG[,ARG]...], from:
-.PP
-.Vb 1
-\&        INTERFACE       Axis ARGs                       Button ARGs
-\&
-\&        physical        joystick\-index,[\-]axis\-index    joystick\-index,button\-index
-\&        keyboard        key\-name0,key\-name1             key\-name
-\&        mouse           screen\-offset0,screen\-offset1   button\-number
-.Ve
-.PP
-For physical joysticks a `\-' before the axis index inverts the axis.  \s-1AXIS 0\s0 is the X\-axis, and \s-1AXIS 1\s0 the
-Y\-axis.  \s-1BTN 0\s0 is the only one used so far, but in the future \s-1BTN 1\s0 will be the second button on certain CoCo
-joysticks.
-.SH "COPYRIGHT"
-.IX Header "COPYRIGHT"
-xroar is Copyright (c) 2009 Ciaran Anscomb
-.PP
-This man page written by B. Watson for the SlackBuilds.org project (but it may be used by anyone).
-.PP
-This is free software.  You may redistribute copies of it under the terms of the \s-1GNU\s0 General Public License
-<http://www.gnu.org/licenses/gpl.html>.  There is \s-1NO WARRANTY,\s0 to the extent permitted by law.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-The info page for xroar (includes much information not found in this man page).
-.PP
-http://en.wikipedia.org/wiki/TRS\-80_Color_Computer
-.PP
-http://archive.worldofdragon.org/index.php?title=Main_Page
-.PP
-http://archive.worldofdragon.org/archive/index.php
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index 49d407a920..457fde3316 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20150912 bkw:
+# - update for 0.33.2
+# - use upstream's man page, get rid of mine
+
 # 20140824 bkw:
 # - update for 0.32
 # - somehow I lost the POD source to the man page, recreate from xroar.6
@@ -30,7 +34,7 @@
 # - mention gtkglext in README as an optional dep
 
 PRGNAM=xroar
-VERSION=${VERSION:-0.32}
+VERSION=${VERSION:-0.33.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -104,6 +108,13 @@ make
 make install DESTDIR=$PKG
 strip $PKG/usr/bin/$PRGNAM
 
+# man page needs to be in section 6, since this is in games/
+mkdir -p $PKG/usr/man/man6
+sed '1s,\<1\>,6,' \
+  < $PKG/usr/man/man1/$PRGNAM.1 \
+  | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
+rm -rf $PKG/usr/man/man1
+
 mv $PKG/usr/share/info $PKG/usr/info
 rm -rf $PKG/usr/share
 rm -f $PKG/usr/info/dir
@@ -131,10 +142,6 @@ if [ ! -e $PKG/usr/share/$PRGNAM/roms/d32.rom ]; then
 	ln -s mini-dragon.rom $PKG/usr/share/$PRGNAM/roms/d32.rom
 fi
 
-# Man page written for this SlackBuild
-mkdir -p $PKG/usr/man/man6
-sed "s,_VERSION_,$VERSION,g" < $CWD/$PRGNAM.6 | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
-
 # Icon taken from Fedora package here:
 # ftp://mirror.switch.ch/pool/3/mirror/rpmfusion/free/fedora/updates/8/i386/xroar-0.21-2.fc8.i386.rpm
 # Current versions of xroar include windows and mac icons that are larger,
@@ -151,7 +158,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 
 # HTML version of the info page, for those who hate info pages...
-make doc/$PRGNAM.html
+( cd doc && make $PRGNAM.html )
 cp doc/$PRGNAM.html doc/*png $PKG/usr/doc/$PRGNAM-$VERSION
 
 # Don't keep duplicates of the doc images, use symlinks
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index 3fbd389a38..5be24338b4 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,8 +1,8 @@
 PRGNAM="xroar"
-VERSION="0.32"
+VERSION="0.33.2"
 HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://www.6809.org.uk/xroar/download/0.32/xroar-0.32.tar.gz"
-MD5SUM="744c99c9fe08479963394391b54f6c78"
+DOWNLOAD="http://www.6809.org.uk/xroar/dl/0.33/xroar-0.33.2.tar.gz"
+MD5SUM="d17eb0c201d0c8572fb4f89605ea0f79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/xroar/xroar.pod b/games/xroar/xroar.pod
deleted file mode 100644
index a01e29cd8b..0000000000
--- a/games/xroar/xroar.pod
+++ /dev/null
@@ -1,449 +0,0 @@
-# pod source for xroar man page. convert with:
-# pod2man --stderr -s6 -r0.32 -u -cSlackBuilds.org xroar.pod > xroar.6
-
-=head1 NAME
-
-xroar - Dragon and CoCo 1/2 emulator.
-
-=head1 SYNOPSIS
-
-xroar [-c CONFFILE] [OPTION]...
-
-=head1 DESCRIPTION
-
-XRoar is a Dragon emulator.  Due to hardware similarities, XRoar also emulates the Tandy Colour Computer
-(CoCo) models 1 & 2.
-
-This man page just documents the command-line options to xroar. For full documentation,  see the info page for
-xroar, or the HTML documentation in /usr/doc/xroar-_VERSION_/xroar.html.
-
-=head1 OPTIONS
-
-=over 5
-
-=item -c CONFFILE
-
-specify a configuration file
-
-=item Machines
-
-=item -default-machine NAME
-
-default machine on startup
-
-=item -machine NAME
-
-configure named machine (B<-machine help> for list)
-
-=item -machine-desc TEXT
-
-machine description
-
-=item -machine-arch ARCH
-
-machine architecture (B<-machine-arch help> for list)
-
-=item -machine-keyboard LAYOUT
-
-keyboard layout (B<-machine-keyboard> help for list)
-
-=item -machine-cpu CPU
-
-machine CPU (B<-machine-cpu help> for list)
-
-=item -bas NAME
-
-BASIC ROM to use (CoCo only)
-
-=item -extbas NAME
-
-Extended BASIC ROM to use
-
-=item -altbas NAME
-
-64K mode Extended BASIC ROM (Dragon 64)
-
-=item -nobas
-
-disable BASIC
-
-=item -noextbas
-
-disable Extended BASIC
-
-=item -noaltbas
-
-disable 64K mode Extended BASIC
-
-=item -ext-charset NAME
-
-external character generator ROM to use
-
-=item -tv-type TYPE
-
-TV type (B<-tv-type help> for list)
-
-=item -vdg-type TYPE
-
-VDG type (6847 or 6847t1)
-
-=item -ram KBYTES
-
-amount of RAM in K
-
-=item -machine-cart NAME
-
-default cartridge for selected machine
-
-=item -nodos
-
-don't automatically pick a DOS cartridge
-
-=item Cartridges
-
-=item -cart NAME
-
-configure named cartridge (B<-cart help> for list)
-
-=item -cart-desc TEXT
-
-cartridge description
-
-=item -cart-type TYPE
-
-cartridge base type (B<-cart-type help> for list)
-
-=item -cart-rom NAME
-
-ROM image to load ($C000-)
-
-=item -cart-rom2 NAME
-
-second ROM image to load ($E000-)
-
-=item -cart-autorun
-
-autorun cartridge
-
-=item -cart-becker
-
-enable becker port where supported
-
-=item Becker port
-
-=item -becker
-
-prefer becker-enabled DOS (when picked automatically)
-
-=item -becker-ip ADDRESS
-
-address or hostname of DriveWire server [127.0.0.1]
-
-=item -becker-port PORT
-
-port of DriveWire server [65504]
-
-=item Files
-
-=item -load FILENAME
-
-load or attach FILENAME
-
-=item -run FILENAME
-
-load or attach FILENAME and attempt autorun
-
-=item Cassettes
-
-=item -tape-write FILENAME
-
-open FILENAME for tape writing
-
-=item -no-tape-fast
-
-disable fast tape loading
-
-=item -tape-pad
-
-force tape leader padding
-
-=item -no-tape-pad-auto
-
-disable automatic leader padding
-
-=item -tape-rewrite
-
-enable tape rewriting
-
-=item Disks
-
-=item -disk-write-back
-
-default to enabling write-back for disk images
-
-=item -no-disk-auto-os9
-
-don't try to detect headerless OS-9 JVC disk images
-
-=item Firmware ROM images
-
-=item -rompath PATH
-
-ROM search path (colon-separated list)
-
-=item -romlist NAME=LIST
-
-define a ROM list
-
-=item -romlist-print
-
-print defined ROM lists
-
-=item -crclist NAME=LIST
-
-define a ROM CRC list
-
-=item -crclist-print
-
-print defined ROM CRC lists
-
-=item -force-crc-match
-
-force per-architecture CRC matches
-
-=item User interface
-
-=item -ui MODULE
-
-user-interface module (B<-ui help> for list)
-
-=item Video
-
-=item -vo MODULE
-
-video module (B<-vo help> for list)
-
-=item -fs
-
-start emulator full-screen if possible
-
-=item -fskip FRAMES
-
-frameskip (default: 0)
-
-=item -ccr RENDERER
-
-cross-colour renderer (B<-ccr help> for list)
-
-=item -geometry WxH+X+Y
-
-initial emulator geometry
-
-=item -invert-text
-
-start with text mode inverted
-
-=item Audio
-
-=item -ao MODULE
-
-audio module (B<-ao help> for list)
-
-=item -ao-device STRING
-
-device to use for audio module
-
-=item -ao-format FMT
-
-set audio sample format (B<-ao-format help> for list)
-
-=item -ao-rate HZ
-
-set audio frame rate (if supported by module)
-
-=item -ao-channels N
-
-set number of audio channels, 1 or 2
-
-=item -ao-fragments N
-
-set number of audio fragments
-
-=item -ao-fragment-ms MS
-
-set audio fragment size in ms (if supported)
-
-=item -ao-fragment-frames N
-
-set audio fragment size in samples (if supported)
-
-=item -ao-buffer-ms MS
-
-set total audio buffer size in ms (if supported)
-
-=item -ao-buffer-frames N
-
-set total audio buffer size in samples (if supported)
-
-=item -volume VOLUME
-
-audio volume (0 - 100)
-
-=item -fast-sound
-
-faster but less accurate sound
-
-=item Keyboard
-
-=item -keymap CODE
-
-host keyboard type (B<-keymap help> for list)
-
-=item -kbd-translate
-
-enable keyboard translation
-
-=item -type STRING
-
-intercept ROM calls to type STRING into BASIC
-
-=item Joysticks
-
-See JOYSTICK SPECS below for the description of the SPEC arguments.
-
-=item -joy NAME
-
-configure named joystick (B<-joy help> for list)
-
-=item -joy-desc TEXT
-
-joystick description
-
-=item -joy-axis AXIS=SPEC
-
-configure joystick axis
-
-=item -joy-button BTN=SPEC
-
-configure joystick button
-
-=item -joy-right NAME
-
-map right joystick
-
-=item -joy-left NAME
-
-map left joystick
-
-=item -joy-virtual NAME
-
-specify the `virtual' joystick to cycle [kjoy0]
-
-=item Printing
-
-=item -lp-file FILENAME
-
-append Dragon printer output to FILENAME
-
-=item -lp-pipe COMMAND
-
-pipe Dragon printer output to COMMAND
-
-=item Debugging
-
-=item -gdb
-
-disable GDB target
-
-=item -gdb-ip
-
-address of interface for GDB target [localhost]
-
-=item -gdb-port
-
-port for GDB target to listen on [65520]
-
-=item -trace
-
-start with trace mode on
-
-=item -debug-ui FLAGS
-
-UI debugging (see manual, or -1 for all)
-
-=item -debug-file FLAGS
-
-file debugging (see manual, or -1 for all)
-
-=item -debug-fdc FLAGS
-
-FDC debugging (see manual, or -1 for all)
-
-=item -debug-gdb FLAGS
-
-GDB target debugging (see manual, or -1 for all)
-
-=item -v, verbose LEVEL
-
-general debug verbosity (0-3) [1]
-
-=item -q, --quiet
-
-equivalent to --verbose 0
-
-=item -timeout SECONDS
-
-run for SECONDS then quit
-
-=back
-
-=head1 Other options
-
-=over 5
-
-=item -config-print
-
-print full configuration to standard output
-
-=item -h, --help
-
-display this help and exit
-
-=item -V, --version
-
-output version information and exit
-
-=back
-
-=head1 JOYSTICK SPECS
-
-Joystick SPECs are of the form [INTERFACE:][ARG[,ARG]...], from:
-
-	INTERFACE       Axis ARGs                       Button ARGs
-
-	physical        joystick-index,[-]axis-index    joystick-index,button-index
-	keyboard        key-name0,key-name1             key-name
-	mouse           screen-offset0,screen-offset1   button-number
-
-For physical joysticks a `-' before the axis index inverts the axis.  AXIS 0 is the X-axis, and AXIS 1 the
-Y-axis.  BTN 0 is the only one used so far, but in the future BTN 1 will be the second button on certain CoCo
-joysticks.
-
-=head1 COPYRIGHT
-
-xroar is Copyright (c) 2009 Ciaran Anscomb
-
-This man page written by B. Watson for the SlackBuilds.org project (but it may be used by anyone).
-
-This is free software.  You may redistribute copies of it under the terms of the GNU General Public License
-<http://www.gnu.org/licenses/gpl.html>.  There is NO WARRANTY, to the extent permitted by law.
-
-=head1 SEE ALSO
-
-The info page for xroar (includes much information not found in this man page).
-
-http://en.wikipedia.org/wiki/TRS-80_Color_Computer
-
-http://archive.worldofdragon.org/index.php?title=Main_Page
-
-http://archive.worldofdragon.org/archive/index.php
diff --git a/games/xspacewarp/xspacewarp.SlackBuild b/games/xspacewarp/xspacewarp.SlackBuild
index 9edc916eb6..ebf1b21109 100644
--- a/games/xspacewarp/xspacewarp.SlackBuild
+++ b/games/xspacewarp/xspacewarp.SlackBuild
@@ -11,7 +11,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/games/yae/yae.SlackBuild b/games/yae/yae.SlackBuild
index 60f492aa1b..cf183232e6 100644
--- a/games/yae/yae.SlackBuild
+++ b/games/yae/yae.SlackBuild
@@ -86,9 +86,12 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then
   sed -i 's,unsigned *long,unsigned int,g' scanline*.c
 fi
 
-# distributed configure script is too darn old
+# distributed configure script is too darn old. the file moved
+# between Slack 14.1 and 14.2, so:
 rm -f config.sub config.guess configure
-cp /usr/share/libtool/config/config.sub .
+CONFSUB=/usr/share/libtool/config/config.sub
+[ -e "$CONFSUB" ] || CONFSUB=/usr/share/libtool/build-aux/config.sub
+cp $CONFSUB .
 autoreconf -if
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/games/yahtzee/yahtzee.SlackBuild b/games/yahtzee/yahtzee.SlackBuild
index 106520c817..f95048dfa6 100644
--- a/games/yahtzee/yahtzee.SlackBuild
+++ b/games/yahtzee/yahtzee.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=yahtzee
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/yahtzee/yahtzee.info b/games/yahtzee/yahtzee.info
index 3c4d89468f..7f81b26c4e 100644
--- a/games/yahtzee/yahtzee.info
+++ b/games/yahtzee/yahtzee.info
@@ -1,8 +1,8 @@
 PRGNAM="yahtzee"
-VERSION="1.5"
+VERSION="1.6"
 HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/yahtzee.html"
-DOWNLOAD="http://www.muppetlabs.com/~breadbox/pub/software/yahtzee-1.5.tar.gz"
-MD5SUM="4f2eeb8165f25ac111badea8bdbbefd1"
+DOWNLOAD="http://www.muppetlabs.com/~breadbox/pub/software/yahtzee-1.6.tar.gz"
+MD5SUM="6ad1c98eb0136ac378425d469d270060"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/yamagi-quake2/README b/games/yamagi-quake2/README
index a29faa69a2..5830a34c3a 100644
--- a/games/yamagi-quake2/README
+++ b/games/yamagi-quake2/README
@@ -8,7 +8,7 @@ do:
 
 Before playing, copy your Quake2 data files into the appropriate subdirectories
 of /usr/share/quake2.  Please refer to the README files in
-/usr/doc/yamagi-quake2-5.30/ for details.
+/usr/doc/yamagi-quake2-5.31/ for details.
 
 To get a reasonable default configuration, copy
-/usr/doc/yamagi-quake2-5.30/yq2.cfg to your baseq2 directory.
+/usr/doc/yamagi-quake2-5.31/yq2.cfg to your baseq2 directory.
diff --git a/games/yamagi-quake2/yamagi-quake2.SlackBuild b/games/yamagi-quake2/yamagi-quake2.SlackBuild
index 6638b185d7..62dd32cb31 100644
--- a/games/yamagi-quake2/yamagi-quake2.SlackBuild
+++ b/games/yamagi-quake2/yamagi-quake2.SlackBuild
@@ -25,13 +25,13 @@
 # Includes components from the Arch Linux AUR builds.
 
 PRGNAM=yamagi-quake2
-VERSION=${VERSION:-5.30}
+VERSION=${VERSION:-5.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CTFVER=${CTFVER:-1.02}
-XATRIXVER=${XATRIXVER:-2.02}
-ROGUEVER=${ROGUEVER:-2.01}
+CTFVER=${CTFVER:-1.03}
+XATRIXVER=${XATRIXVER:-2.03}
+ROGUEVER=${ROGUEVER:-2.02}
 
 WITH_OPENAL=${WITH_OPENAL:-no}
 
diff --git a/games/yamagi-quake2/yamagi-quake2.info b/games/yamagi-quake2/yamagi-quake2.info
index ca63676f6c..17b0bbdbab 100644
--- a/games/yamagi-quake2/yamagi-quake2.info
+++ b/games/yamagi-quake2/yamagi-quake2.info
@@ -1,14 +1,14 @@
 PRGNAM="yamagi-quake2"
-VERSION="5.30"
+VERSION="5.32"
 HOMEPAGE="http://www.yamagi.org/quake2/"
-DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-5.30.tar.xz \
-          http://deponie.yamagi.org/quake2/quake2-ctf-1.02.tar.xz \
-          http://deponie.yamagi.org/quake2/quake2-xatrix-2.02.tar.xz  \
-          http://deponie.yamagi.org/quake2/quake2-rogue-2.01.tar.xz"
-MD5SUM="1dcfa4dbabe3a34f31b9f9acf3aa4b45 \
-        cb54db38b0216d04f27b6ccb605679d0 \
-        36e453613620aaa312d8b6ef654b9cdc \
-        57cdc9d42c60e3f0ef7dc7d339379bc1"
+DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-5.32.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-ctf-1.03.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-xatrix-2.03.tar.xz  \
+          http://deponie.yamagi.org/quake2/quake2-rogue-2.02.tar.xz"
+MD5SUM="bd16a8e0053777ab082b9354cd0212fc \
+        aa79d20551a662c9e34b2da7a0e9e796 \
+        403daa902c3d5894fa5b89231bc3da8b \
+        f8167234a9fbcbb92d225b8a6d17bb05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
diff --git a/games/zelda-roth-se/README b/games/zelda-roth-se/README
new file mode 100644
index 0000000000..a23147f7ff
--- /dev/null
+++ b/games/zelda-roth-se/README
@@ -0,0 +1,7 @@
+Zelda Return of the Hylian Solarus Edition is a remake of the original Zelda
+Return of the Hylian, a short and pleasant fangame from Vincent Jouillat. The
+original game was developed in C++ and was released in 2006.
+
+This new version was developed with the Solarus engine by Christopho, Mymy and
+Vincent Jouillat. While this is essentially the same game, a lot of details were
+improved thanks to the use of Solarus.
diff --git a/games/zelda-roth-se/doinst.sh b/games/zelda-roth-se/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/zelda-roth-se/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/zelda-roth-se/slack-desc b/games/zelda-roth-se/slack-desc
new file mode 100644
index 0000000000..7dc6af1621
--- /dev/null
+++ b/games/zelda-roth-se/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+zelda-roth-se: zelda-roth-se (Zelda fangame for the Solarus engine)
+zelda-roth-se:
+zelda-roth-se: Zelda Return of the Hylian Solarus Edition is a remake of the
+zelda-roth-se: original Zelda Return of the Hylian, a short and pleasant fangame
+zelda-roth-se: from Vincent Jouillat. The original game was developed in C++ and was
+zelda-roth-se: released in 2006.
+zelda-roth-se:
+zelda-roth-se: Homepage: http://www.solarus-games.org/
+zelda-roth-se:
+zelda-roth-se:
+zelda-roth-se:
diff --git a/games/zelda-roth-se/zelda-roth-se.SlackBuild b/games/zelda-roth-se/zelda-roth-se.SlackBuild
new file mode 100644
index 0000000000..3c106a5ede
--- /dev/null
+++ b/games/zelda-roth-se/zelda-roth-se.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for Zelda Return of the Hylian Solarus Edition
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=zelda-roth-se
+SRCNAM=$(echo $PRGNAM | tr - _)
+VERSION=${VERSION:-1.0.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+install -Dm0644 ${SRCNAM}_title_small.png $PKG/usr/share/pixmaps/${SRCNAM}_title_small.png
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
+[Desktop Entry]
+Name=Zelda Return of the Hylian
+Exec=$SRCNAM
+Icon=${SRCNAM}_title_small.png
+Type=Application
+Comment=Zelda Return of the Hylian (action rpg game)
+Categories=Game;ActionGame;
+EOF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog.txt readme.md todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/zelda-roth-se/zelda-roth-se.info b/games/zelda-roth-se/zelda-roth-se.info
new file mode 100644
index 0000000000..7c4e438ab6
--- /dev/null
+++ b/games/zelda-roth-se/zelda-roth-se.info
@@ -0,0 +1,10 @@
+PRGNAM="zelda-roth-se"
+VERSION="1.0.8"
+HOMEPAGE="http://www.solarus-games.org/"
+DOWNLOAD="https://github.com/christopho/zelda_roth_se/archive/v1.0.8.tar.gz"
+MD5SUM="b7f80e228f86ab85b32b8b6631ba094f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="solarus"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/games/zod-engine/zod-engine.info b/games/zod-engine/zod-engine.info
index 1bd879d9ff..c1318a790b 100644
--- a/games/zod-engine/zod-engine.info
+++ b/games/zod-engine/zod-engine.info
@@ -1,5 +1,5 @@
 PRGNAM="zod-engine"
-VERSION="2011-09-06"
+VERSION="2011.09.06"
 HOMEPAGE="http://zod.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/project/zod/linux_releases/zod_linux-2011-09-06.tar.gz"
 MD5SUM="ab366b279e43add48d66e3d8224cfafa"
diff --git a/games/zsdx/README b/games/zsdx/README
new file mode 100644
index 0000000000..9e3f615cc8
--- /dev/null
+++ b/games/zsdx/README
@@ -0,0 +1,15 @@
+The Legend of Zelda: Mystery of Solarus DX is set to be a direct sequel to
+The Legend of Zelda: A Link to the Past on the SNES, using the same graphics
+and game mechanisms. Zelda Mystery of Solarus DX is the first game made with
+the Solarus engine and in fact, Solarus was primarily designed for this game.
+
+Zelda: Mystery of Solarus DX is actually an enhanced remake of a first creation,
+Zelda: Mystery of Solarus. This first creation, developed with RPG Maker 2000,
+was released in 2002 and was only available in French. The DX project was unveiled
+on April 1st, 2008. Its objectives are to correct the many flaws of its predecessor:
+the battle system, the bosses, the use of items, etc.
+
+However, that is hardly all of it as new graphical elements and musics will accompany
+you throughout the game. This Deluxe version will be the opportunity for players to
+relive the adventure in a brand new way, or to discover it for the first time if you’ve
+never played it before!
diff --git a/games/zsdx/doinst.sh b/games/zsdx/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/zsdx/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/zsdx/slack-desc b/games/zsdx/slack-desc
new file mode 100644
index 0000000000..9cb356cfc8
--- /dev/null
+++ b/games/zsdx/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+zsdx: zsdx (Zelda fangame for the solarus engine)
+zsdx:
+zsdx: The Legend of Zelda: Mystery of Solarus DX is set to be a direct
+zsdx: sequel to The Legend of Zelda: A Link to the Past on the SNES, using
+zsdx: the same graphics and game mechanisms. Zelda Mystery of Solarus DX is
+zsdx: the first game made with the Solarus engine and in fact, Solarus was
+zsdx: primarily designed for this game.
+zsdx:
+zsdx: Homeage: http://www.solarus-games.org/
+zsdx:
+zsdx:
diff --git a/games/zsdx/zsdx.SlackBuild b/games/zsdx/zsdx.SlackBuild
new file mode 100644
index 0000000000..0af528d4af
--- /dev/null
+++ b/games/zsdx/zsdx.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Slackware build script for Zelda: Mystery of Solarus DX
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=zsdx
+VERSION=${VERSION:-1.10.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Write a desktop file
+mkdir -p $PKG/usr/share/applications
+cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
+[Desktop Entry]
+Name=Zelda: Mystery of Solarus DX
+Exec=$PRGNAM
+Icon=${PRGNAM}_icon
+Type=Application
+Comment=Zelda: Mystery of Solarus DX (action rpg game)
+Categories=Game;ActionGame;
+EOF
+
+# Add missing icons to package
+for size in $(find /usr/share/icons/hicolor -type d -mindepth 1 -maxdepth 1 -exec basename {} \; | cut -f1 -d"x"); do
+    if ls build/icons/*${size}* 1>/dev/null 2>/dev/null; then
+	mkdir -p $PKG/usr/share/icons/hicolor/${size}x${size}/apps
+	cp -a build/icons/*${size}*.png \
+	   $PKG/usr/share/icons/hicolor/${size}x${size}/apps/${PRGNAM}_icon.png
+    fi
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog license.txt readme.txt work/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/zsdx/zsdx.info b/games/zsdx/zsdx.info
new file mode 100644
index 0000000000..a85d592603
--- /dev/null
+++ b/games/zsdx/zsdx.info
@@ -0,0 +1,10 @@
+PRGNAM="zsdx"
+VERSION="1.10.3"
+HOMEPAGE="http://www.solarus-games.org/"
+DOWNLOAD="https://github.com/christopho/zsdx/archive/zsdx-1.10.3.tar.gz"
+MD5SUM="616e0f67b3ce4266a0036271804cbd92"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="solarus"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/gis/Fiona/Fiona.SlackBuild b/gis/Fiona/Fiona.SlackBuild
index cb321e181b..44f5c5e692 100644
--- a/gis/Fiona/Fiona.SlackBuild
+++ b/gis/Fiona/Fiona.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Fiona
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/Fiona/Fiona.info b/gis/Fiona/Fiona.info
index 943ed549c6..78d80de152 100644
--- a/gis/Fiona/Fiona.info
+++ b/gis/Fiona/Fiona.info
@@ -1,8 +1,8 @@
 PRGNAM="Fiona"
-VERSION="1.6.0"
+VERSION="1.6.2"
 HOMEPAGE="https://github.com/Toblerity/Fiona"
-DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.6.0.tar.gz"
-MD5SUM="8c6aa26205ce51d3da7215ae55075c58"
+DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.6.2.tar.gz"
+MD5SUM="394867b29d6516b61ccedb1aea424f69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Cython gdal six"
diff --git a/gis/OTB/OTB.SlackBuild b/gis/OTB/OTB.SlackBuild
index 3139d0336f..0c7f7e499f 100644
--- a/gis/OTB/OTB.SlackBuild
+++ b/gis/OTB/OTB.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=OTB
 VERSION=${VERSION:-4.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/gis/OTB/README b/gis/OTB/README
index 5d59dbc84d..2f8f0e7bb6 100644
--- a/gis/OTB/README
+++ b/gis/OTB/README
@@ -6,8 +6,7 @@ algorithms for high resolution optical images (Pleiades, SPOT, QuickBird,
 WorldView, Landsat, Ikonos), hyperspectral sensors (Hyperion) or SAR
 (TerraSarX, ERS, Palsar) are available.
 
-OTB may make use of the following optional dependencies: mapnik (use MAPNIK=on)
-and opencv (use OPENCV=on).
+OTB may use the following optional dependency: opencv (use OPENCV=on).
 
 If the following packages are installed OTB will be built and linked against
 them: muParser, OpenSceneGraph and tinyxml. Otherwise, internal copies of the
diff --git a/gis/SFCGAL/SFCGAL.SlackBuild b/gis/SFCGAL/SFCGAL.SlackBuild
index 4cdd0a7128..f1294d04f0 100644
--- a/gis/SFCGAL/SFCGAL.SlackBuild
+++ b/gis/SFCGAL/SFCGAL.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SFCGAL
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/SFCGAL/SFCGAL.info b/gis/SFCGAL/SFCGAL.info
index 2bfc5485aa..6ba6759740 100644
--- a/gis/SFCGAL/SFCGAL.info
+++ b/gis/SFCGAL/SFCGAL.info
@@ -1,8 +1,8 @@
 PRGNAM="SFCGAL"
-VERSION="1.1.0"
+VERSION="1.2.0"
 HOMEPAGE="http://www.sfcgal.org"
-DOWNLOAD="https://github.com/Oslandia/SFCGAL/archive/v1.1.0.tar.gz"
-MD5SUM="b4817a47d17b2292cee6199f7b49c31c"
+DOWNLOAD="https://github.com/Oslandia/SFCGAL/archive/v1.2.0.tar.gz"
+MD5SUM="dcda434cd92db887b29579a2fc6c8088"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CGAL"
diff --git a/gis/cligj/cligj.SlackBuild b/gis/cligj/cligj.SlackBuild
index 5cfa30e30e..27bf63b894 100644
--- a/gis/cligj/cligj.SlackBuild
+++ b/gis/cligj/cligj.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cligj
-VERSION=${VERSION:-0.2.0}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/cligj/cligj.info b/gis/cligj/cligj.info
index 75753413b4..56344aed92 100644
--- a/gis/cligj/cligj.info
+++ b/gis/cligj/cligj.info
@@ -1,8 +1,8 @@
 PRGNAM="cligj"
-VERSION="0.2.0"
+VERSION="0.4.0"
 HOMEPAGE="https://github.com/mapbox/cligj"
-DOWNLOAD="https://github.com/mapbox/cligj/archive/0.2.0.tar.gz"
-MD5SUM="5e246c3487167c5a32956074ba9c698c"
+DOWNLOAD="https://github.com/mapbox/cligj/archive/0.4.0.tar.gz"
+MD5SUM="f95e862644749619b29260647fa13633"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="click"
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index a18220fec6..26d1206b96 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -24,7 +24,7 @@
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=gdal
-VERSION=${VERSION:-1.11.2}
+VERSION=${VERSION:-1.11.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -106,9 +106,9 @@ fi
 # and libtiff, but this can cause segfaults in other software linked against
 # the real libjpeg (eg. qgis calling qt). Enable JPEG12 only if you need it:
 if [ ${JPEG12:-no} = "yes" ]; then
-   WITHLIST+=" --with-jpeg=internal --with-libtiff=internal"
+   WITHLIST+=" --with-jpeg=internal"
 else
-   WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX} --with-libtiff=/usr/lib${LIBDIRSUFFIX}"
+   WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}"
 fi
 
 # Thanks to the people at Arch for this:
@@ -135,6 +135,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-mysql \
   --with-python \
   --with-poppler \
+  --with-libtiff=internal \
+  --with-rename-internal-libtiff-symbols=yes \
+  --with-geotiff=internal \
+  --with-rename-internal-libgeotiff-symbols=yes \
   $WITHLIST \
   --build=$ARCH-slackware-linux
 
@@ -144,12 +148,13 @@ make install DESTDIR=$PKG
 # Kill erroneously installed .dox files
 rm $PKG/usr/bin/*.dox
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 make -f GNUmakefile -B man
 make install-man DESTDIR=$PKG
-gzip -9 $PKG/usr/man/man?/* || exit 1
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 make -f GNUmakefile -B docs
 # --docdir is ignored :-(
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index daa0c83862..3942d89a94 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -1,8 +1,8 @@
 PRGNAM="gdal"
-VERSION="1.11.2"
+VERSION="1.11.3"
 HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.xz"
-MD5SUM="90221810dd9ca656ee23d434d4266ef6"
+DOWNLOAD="http://download.osgeo.org/gdal/1.11.3/gdal-1.11.3.tar.xz"
+MD5SUM="129a235798e2883c8cf6fd6862213da2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos proj"
diff --git a/gis/geos/geos.SlackBuild b/gis/geos/geos.SlackBuild
index a2c160d4b8..530fc41899 100644
--- a/gis/geos/geos.SlackBuild
+++ b/gis/geos/geos.SlackBuild
@@ -5,7 +5,7 @@
 # Maintained by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 
 PRGNAM=geos
-VERSION=${VERSION:-3.4.2}
+VERSION=${VERSION:-3.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/geos/geos.info b/gis/geos/geos.info
index d7d815e035..b76fa9b781 100644
--- a/gis/geos/geos.info
+++ b/gis/geos/geos.info
@@ -1,8 +1,8 @@
 PRGNAM="geos"
-VERSION="3.4.2"
+VERSION="3.5.0"
 HOMEPAGE="http://trac.osgeo.org/geos/"
-DOWNLOAD="http://download.osgeo.org/geos/geos-3.4.2.tar.bz2"
-MD5SUM="fc5df2d926eb7e67f988a43a92683bae"
+DOWNLOAD="http://download.osgeo.org/geos/geos-3.5.0.tar.bz2"
+MD5SUM="136842690be7f504fba46b3c539438dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/gis/grass/grass.SlackBuild b/gis/grass/grass.SlackBuild
index ca03ff82c7..604364013a 100644
--- a/gis/grass/grass.SlackBuild
+++ b/gis/grass/grass.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=grass
-VERSION=${VERSION:-7.0.1}
+VERSION=${VERSION:-7.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/grass/grass.info b/gis/grass/grass.info
index 4938dd6507..b5294f582c 100644
--- a/gis/grass/grass.info
+++ b/gis/grass/grass.info
@@ -1,8 +1,8 @@
 PRGNAM="grass"
-VERSION="7.0.1"
+VERSION="7.0.2"
 HOMEPAGE="http://grass.osgeo.org/"
-DOWNLOAD="http://grass.osgeo.org/grass70/source/grass-7.0.1.tar.gz"
-MD5SUM="bda8f612443a935b9da78dba85733db4"
+DOWNLOAD="http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz"
+MD5SUM="1f2c8f5cba2fe2d681a01b9519180e9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal numpy wxPython"
diff --git a/gis/mapnik/README b/gis/mapnik/README
index 09f8877b87..cf54387091 100644
--- a/gis/mapnik/README
+++ b/gis/mapnik/README
@@ -4,6 +4,5 @@ used for both desktop map design and web development.
 Optional dependencies: 
 - gdal: GDAL and OGR plugin support
 - libwebp: WebP image support
-- librasterlite: SpatiaLite raster support
 - postgis: PostGIS plugin support
 - proj: reprojection support
diff --git a/gis/mapnik/mapnik.SlackBuild b/gis/mapnik/mapnik.SlackBuild
index ec36b386df..5c1fa7b431 100644
--- a/gis/mapnik/mapnik.SlackBuild
+++ b/gis/mapnik/mapnik.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mapnik
-VERSION=${VERSION:-3.0.0}
+VERSION=${VERSION:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,7 +79,7 @@ find -L . \
   PREFIX=/usr \
   LIBDIR_SCHEMA=lib$LIBDIRSUFFIX \
   SYSTEM_FONTS=/usr/share/fonts \
-  INPUT_PLUGINS=sqlite,ogr,shape,geojson,gdal,pgraster,raster,topojson,postgis,csv,rasterlite,osm \
+  INPUT_PLUGINS=sqlite,ogr,shape,geojson,gdal,pgraster,raster,topojson,postgis,csv \
   DESTDIR=$PKG
 make
 make install
diff --git a/gis/mapnik/mapnik.info b/gis/mapnik/mapnik.info
index 2816a639a9..5b52d0f7fd 100644
--- a/gis/mapnik/mapnik.info
+++ b/gis/mapnik/mapnik.info
@@ -1,8 +1,8 @@
 PRGNAM="mapnik"
-VERSION="3.0.0"
+VERSION="3.0.2"
 HOMEPAGE="http://mapnik.org"
-DOWNLOAD="http://mapnik.s3.amazonaws.com/dist/v3.0.0/mapnik-v3.0.0.tar.bz2"
-MD5SUM="f121e48f735d547d9e37a77b0534f0a4"
+DOWNLOAD="http://mapnik.s3.amazonaws.com/dist/v3.0.2/mapnik-v3.0.2.tar.bz2"
+MD5SUM="0e4b84f273927dc4a90d67d19bce601b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/gis/osm-gps-map/README b/gis/osm-gps-map/README
new file mode 100644
index 0000000000..497ece375d
--- /dev/null
+++ b/gis/osm-gps-map/README
@@ -0,0 +1,7 @@
+osm-gps-map is a Gtk mapping widget (with Python bindings) that, given
+GPS co-ordinates, draws a GPS track and points of interest on a moving map
+display.
+
+osm-gps-map downloads map data from a number of websites, including
+openstreetmap.org, openaerialmap.org and others, and can be used to build
+desktop mapping or geolocation applications.
diff --git a/gis/osm-gps-map/osm-gps-map.SlackBuild b/gis/osm-gps-map/osm-gps-map.SlackBuild
new file mode 100644
index 0000000000..8868ed1562
--- /dev/null
+++ b/gis/osm-gps-map/osm-gps-map.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for osm-gps-map
+
+# Copyright 2015 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=osm-gps-map
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-introspection=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/gis/osm-gps-map/osm-gps-map.info b/gis/osm-gps-map/osm-gps-map.info
new file mode 100644
index 0000000000..9e05521623
--- /dev/null
+++ b/gis/osm-gps-map/osm-gps-map.info
@@ -0,0 +1,10 @@
+PRGNAM="osm-gps-map"
+VERSION="1.1.0"
+HOMEPAGE="http://nzjrs.github.io/osm-gps-map/"
+DOWNLOAD="https://github.com/nzjrs/osm-gps-map/archive/1.1.0.tar.gz"
+MD5SUM="5e9dc55922a597798ef4411130815212"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gnome-common"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/gis/osm-gps-map/slack-desc b/gis/osm-gps-map/slack-desc
new file mode 100644
index 0000000000..5499526148
--- /dev/null
+++ b/gis/osm-gps-map/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+osm-gps-map: osm-gps-map (gtk mapping widget)
+osm-gps-map:
+osm-gps-map: osm-gps-map is a Gtk mapping widget (with Python bindings) that,
+osm-gps-map: given GPS co-ordinates, draws a GPS track and points of interest on
+osm-gps-map: a moving map display.
+osm-gps-map:
+osm-gps-map: osm-gps-map downloads map data from a number of websites, including
+osm-gps-map: openstreetmap.org, openaerialmap.org and others, and can be used to
+osm-gps-map: build desktop mapping or geolocation applications.
+osm-gps-map:
+osm-gps-map: Homepage: http://nzjrs.github.io/osm-gps-map/
diff --git a/gis/pdal/pdal.SlackBuild b/gis/pdal/pdal.SlackBuild
index 658e88ba1d..4659bf938f 100644
--- a/gis/pdal/pdal.SlackBuild
+++ b/gis/pdal/pdal.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdal
-VERSION=${VERSION:-0.9.9}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pdal/pdal.info b/gis/pdal/pdal.info
index 5d4c59da63..6eb75053d5 100644
--- a/gis/pdal/pdal.info
+++ b/gis/pdal/pdal.info
@@ -1,8 +1,8 @@
 PRGNAM="pdal"
-VERSION="0.9.9"
+VERSION="1.1.0"
 HOMEPAGE="http://pointcloud.org"
-DOWNLOAD="https://github.com/PDAL/PDAL/archive/0.9.9.tar.gz"
-MD5SUM="5b3bc9500f788d163b509f814daf182c"
+DOWNLOAD="https://github.com/PDAL/PDAL/archive/1.1.0.tar.gz"
+MD5SUM="cd4b4573f9ec16b2fffe8863eae14cec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal laszip libgeotiff postgresql"
diff --git a/gis/pgrouting/pgrouting.SlackBuild b/gis/pgrouting/pgrouting.SlackBuild
index 6a981de880..ae9075220f 100644
--- a/gis/pgrouting/pgrouting.SlackBuild
+++ b/gis/pgrouting/pgrouting.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pgrouting
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +60,10 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
+rm -rf $TMP/$PRGNAM-$PRGNAM-$VERSION
 cd $TMP
-if [ -e $CWD/v$VERSION.tar.gz ]; then
-  tar xvf $CWD/v$VERSION.tar.gz
-else
-  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/gis/pgrouting/pgrouting.info b/gis/pgrouting/pgrouting.info
index 3333078229..11a1a014c3 100644
--- a/gis/pgrouting/pgrouting.info
+++ b/gis/pgrouting/pgrouting.info
@@ -1,8 +1,8 @@
 PRGNAM="pgrouting"
-VERSION="2.0.0"
+VERSION="2.1.0"
 HOMEPAGE="http://pgrouting.org"
-DOWNLOAD="https://github.com/pgRouting/pgrouting/archive/v2.0.0.tar.gz"
-MD5SUM="a7b573b7aa4d038bdb24d2401bb33013"
+DOWNLOAD="https://github.com/pgRouting/pgrouting/archive/pgrouting-2.1.0.tar.gz"
+MD5SUM="c500b11d63893ba295ff6ef8ed255093"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CGAL postgis"
diff --git a/gis/pointcloud/pointcloud.SlackBuild b/gis/pointcloud/pointcloud.SlackBuild
index 12d8c5365b..c37bfef672 100644
--- a/gis/pointcloud/pointcloud.SlackBuild
+++ b/gis/pointcloud/pointcloud.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pointcloud
-VERSION=${VERSION:-0.1.0}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/pointcloud/pointcloud.info b/gis/pointcloud/pointcloud.info
index 154f241463..edee771d3b 100644
--- a/gis/pointcloud/pointcloud.info
+++ b/gis/pointcloud/pointcloud.info
@@ -1,8 +1,8 @@
 PRGNAM="pointcloud"
-VERSION="0.1.0"
+VERSION="1.0.1"
 HOMEPAGE="https://github.com/pramsey/pointcloud"
-DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v0.1.0.tar.gz"
-MD5SUM="c3b687deab244f2c57aa3a370c723e1f"
+DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v1.0.1.tar.gz"
+MD5SUM="cceb8ae6985fc7fa5c5bf74ec412da68"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cunit postgresql"
diff --git a/gis/postgis/README b/gis/postgis/README
index cfb68cd12c..89beccb748 100644
--- a/gis/postgis/README
+++ b/gis/postgis/README
@@ -5,9 +5,6 @@ backend spatial database for geographic information systems
 (GIS).
 
 SFCGAL is an optional dependency for advanced 3D support. 
-These advanced functions are not included in the postgis 
-extension, but they can be make available by loading 
-/usr/share/postgresql/contrib/postgis-2.1/sfcgal.sql.
 
 To disable the GTK-based graphical interface for shp2pgsql,
 set GUI=no.
diff --git a/gis/postgis/postgis.SlackBuild b/gis/postgis/postgis.SlackBuild
index bc6c60d329..17ed9f8f20 100644
--- a/gis/postgis/postgis.SlackBuild
+++ b/gis/postgis/postgis.SlackBuild
@@ -25,8 +25,8 @@
 # Maintained by Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 
 PRGNAM=postgis
-VERSION=${VERSION:-2.1.8}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.2.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -91,7 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
   $SHP2PGSQL_GUI \
   --build=$ARCH-slackware-linux
 
-make
+make -j1
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/gis/postgis/postgis.info b/gis/postgis/postgis.info
index 89be3a5ce9..7d68ed6899 100644
--- a/gis/postgis/postgis.info
+++ b/gis/postgis/postgis.info
@@ -1,8 +1,8 @@
 PRGNAM="postgis"
-VERSION="2.1.8"
+VERSION="2.2.0"
 HOMEPAGE="http://postgis.org"
-DOWNLOAD="http://download.osgeo.org/postgis/source/postgis-2.1.8.tar.gz"
-MD5SUM="c33923e37424978a1306ce461c1d14ed"
+DOWNLOAD="http://download.osgeo.org/postgis/source/postgis-2.2.0.tar.gz"
+MD5SUM="9b3dbeabb3f821bb27b94b9f82ff2785"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal json-c postgresql"
diff --git a/gis/proj/proj.SlackBuild b/gis/proj/proj.SlackBuild
index 2f9393268e..2d5f3b5ced 100644
--- a/gis/proj/proj.SlackBuild
+++ b/gis/proj/proj.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=proj
-VERSION=${VERSION:-4.9.1}
+VERSION=${VERSION:-4.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/proj/proj.info b/gis/proj/proj.info
index 9f27f79ca0..24f951b5d0 100644
--- a/gis/proj/proj.info
+++ b/gis/proj/proj.info
@@ -1,8 +1,8 @@
 PRGNAM="proj"
-VERSION="4.9.1"
+VERSION="4.9.2"
 HOMEPAGE="http://trac.osgeo.org/proj/"
-DOWNLOAD="http://download.osgeo.org/proj/proj-4.9.1.tar.gz"
-MD5SUM="3cbb2a964fd19a496f5f4265a717d31c"
+DOWNLOAD="http://download.osgeo.org/proj/proj-4.9.2.tar.gz"
+MD5SUM="9843131676e31bbd903d60ae7dc76cf9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
index 0cdd36aa3d..9aabfdd52e 100644
--- a/gis/qgis/qgis.SlackBuild
+++ b/gis/qgis/qgis.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=qgis
 VERSION=${VERSION:-2.10.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -89,6 +89,8 @@ cmake . \
   -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
   -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
   -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
+  -DWITH_INTERNAL_QWTPOLAR="off" \
+  -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
   $WITHSERVER \
   $WITHGRASS
 
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index a6b8be51f3..f4104b3f87 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://qgis.org/downloads/qgis-2.10.1.tar.bz2"
 MD5SUM="8d719b6013ba0e2adb9a2dd642e9e9c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gdal libspatialindex libspatialite numpy psycopg2 qwt"
+REQUIRES="gdal libspatialindex libspatialite numpy psycopg2 qwtpolar"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/gis/rasterio/rasterio.SlackBuild b/gis/rasterio/rasterio.SlackBuild
index 973d192ccb..6d8fefbd1b 100644
--- a/gis/rasterio/rasterio.SlackBuild
+++ b/gis/rasterio/rasterio.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rasterio
-VERSION=${VERSION:-0.21}
+VERSION=${VERSION:-0.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/gis/rasterio/rasterio.info b/gis/rasterio/rasterio.info
index 1f436b9ba0..a3e5983d41 100644
--- a/gis/rasterio/rasterio.info
+++ b/gis/rasterio/rasterio.info
@@ -1,10 +1,10 @@
 PRGNAM="rasterio"
-VERSION="0.21"
+VERSION="0.31.0"
 HOMEPAGE="https://github.com/mapbox/rasterio"
-DOWNLOAD="https://github.com/mapbox/rasterio/archive/0.21.tar.gz"
-MD5SUM="4e6b05f52d8d048ef32796d37424528c"
+DOWNLOAD="https://github.com/mapbox/rasterio/archive/0.31.0.tar.gz"
+MD5SUM="7cb1af370a3cf470623a3a4902740685"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="affine cligj Cython enum34 gdal numpy pysetuptools"
+REQUIRES="affine click-plugins cligj Cython enum34 gdal numpy snuggs"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
new file mode 100644
index 0000000000..8359268966
--- /dev/null
+++ b/graphics/Blender/Blender.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# Slackware build script for blender
+
+# Copyright 2015-16 Christoph Willing Brisbane, Australia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SRCNAM=blender
+PKGNAM=Blender
+VERSION=${VERSION:-2.74}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])")
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$SRCNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+patch -p0 < $CWD/buildinfo-$VERSION.diff
+patch -p0 < $CWD/patch-${VERSION}-use-python35.diff
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake ../ \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
+    -DWITH_BUILDINFO:BOOL=ON \
+    -DWITH_OPENCOLLADA:BOOL=ON \
+    -DWITH_OPENCOLORIO:BOOL=ON \
+    -DPYTHON_VERSION=$PYTHON_VERSION \
+    -DWITH_PYTHON_INSTALL:BOOL=ON \
+    -DWITH_PYTHON_INSTALL_NUMPY:BOOL=ON \
+    -DWITH_CODEC_FFMPEG:BOOL=ON \
+    -DWITH_OPENAL:BOOL=ON \
+    -DWITH_JACK:BOOL=ON \
+    -DWITH_JACK_DYNLOAD:BOOL=ON \
+    -DPYTHON_LIBPATH:PATH=/usr/lib${LIBDIRSUFFIX} \
+    -DWITH_CODEC_SNDFILE:BOOL=ON \
+    -DWITH_FFTW3:BOOL=ON \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -DWITH_IMAGE_REDCODE:BOOL=ON \
+    -DWITH_IMAGE_OPENJPEG:BOOL=ON \
+    -DWITH_SYSTEM_OPENJPEG:BOOL=ON \
+    -DWITH_MEM_JEMALLOC:BOOL=ON \
+    -DWITH_MEM_VALGRIND:BOOL=ON \
+    -DWITH_MOD_OCEANSIM:BOOL=ON \
+    -DWITH_SDL:BOOL=ON \
+    -DWITH_SDL_DYNLOAD:BOOL=ON \
+    -DCMAKE_BUILD_TYPE=Release \
+
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+BLENDERBINS="blender blenderplayer"
+for bin in $BLENDERBINS ; do
+  mv $PKG/usr/bin/$bin $PKG/usr/bin/$bin.bin
+  cat <<EOF >$PKG/usr/bin/$bin
+#!/bin/sh
+export PYTHONPATH=/usr/share/$SRCNAM/$VERSION/python/lib$LIBDIRSUFFIX/python$PYTHON_VERSION
+export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada
+exec $bin.bin
+EOF
+  chmod 0755 $PKG/usr/bin/$bin
+done
+
+mkdir -p $PKG/usr/man/man1
+./doc/manpage/blender.1.py build/bin/blender $PKG/usr/man/man1/blender.1
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+mv $PKG/usr/share/doc/$SRCNAM/*  $PKG/usr/doc/$PKGNAM-$VERSION/
+rm -rf $PKG/usr/share/doc
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info
new file mode 100644
index 0000000000..22323b3195
--- /dev/null
+++ b/graphics/Blender/Blender.info
@@ -0,0 +1,10 @@
+PRGNAM="Blender"
+VERSION="2.74"
+HOMEPAGE="http://blender.org"
+DOWNLOAD="http://mirror.cs.umn.edu/blender.org/source/blender-2.74.tar.gz"
+MD5SUM="488151953d69d63bedd8ed59f92daf3b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ffmpeg jack-audio-connection-kit opencollada openjpeg python-requests valgrind numpy3 SDL2 openimageio freealut jemalloc"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@iinet.net.au"
diff --git a/graphics/Blender/README b/graphics/Blender/README
new file mode 100644
index 0000000000..d415695a6c
--- /dev/null
+++ b/graphics/Blender/README
@@ -0,0 +1,9 @@
+Blender is an integrated suite of free and open source tools enabling
+the creation of a broad range of 3D content with the singular
+benefits of cross- platform interoperability. It can be used to
+create 3D visualizations, stills as well as broadcast and cinema
+quality video. It features fully integrated creation suite, offering
+a broad range of essential tools  for the creation of 3D content,
+including modeling, uv-mapping, texturing, particle and other
+simulation, scripting, rendering, compositing,post-production, and
+game creation.
diff --git a/graphics/Blender/README.Slackware b/graphics/Blender/README.Slackware
new file mode 100644
index 0000000000..1d819e7c3f
--- /dev/null
+++ b/graphics/Blender/README.Slackware
@@ -0,0 +1,80 @@
+This script builds Blender from its source code, rather than repackaging
+an existing binary version. The process is therefore more complex and
+time consuming but allows finer tuning of capabilities of the resulting
+package. Working through the prerequisite packages from the REQUIRES field
+of Blender.info results in the following basic build order:
+	multimedia/ffmpeg
+	audio/jack-audio-connection-kit
+	libraries/opencv
+	graphics/opencollada
+	libraries/OpenAL
+	libraries/openjpeg
+	python/python3
+	python/python-requests
+	development/valgrind
+	libraries/LibRaw
+	libraries/libwebp
+	development/numpy3
+	development/SDL2
+	graphics/opencolorio
+	graphics/openimageio
+	libraries/jemalloc
+	libraries/freealut
+	graphics/Blender
+
+When generating a new build order, python3 should first be added to the
+REQUIRES field of python-requests.info.
+
+To facilitate the greatest utility for Blender, its is strongly
+suggested that a number of standard SBo packages be built with
+a more complete set of features than provided by the default scripts:
+    1. the opencv package could/should first be built with additional
+features by preinstalling some other packages e.g.
+REQUIRES="
+opencl-headers libjpeg-turbo ffmpeg Sphinx libdc1394
+numpy3 gtkglext tbb jdk
+"
+The cmake configuration in opencv.SlackBuild can be replaced with:
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_PRECOMPILED_HEADERS=OFF \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
+    -DWITH_TBB=ON \
+    -DWITH_OPENCL=ON \
+    -DWITH_OPENGL=ON \
+    -DWITH_QT=ON \
+    -DWITH_XINE=ON \
+    -DBUILD_EXAMPLES=ON \
+    -DINSTALL_C_EXAMPLES=ON \
+    -DINSTALL_PYTHON_EXAMPLES=ON \
+    -DBUILD_NEW_PYTHON_SUPPORT=ON \
+    -DWITH_FFMPEG=ON \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_1394:BOOL=ON \
+    ..
+
+If resources allow, the very large cudatoolkit package is another
+possible package which may be preinstalled and be utilised by the
+opencv build process.
+
+    2. the ffmpeg package could/should first be built with additional
+features by preinstalling some other packages e.g.
+REQUIRES="lame x264
+speex libbluray xvidcore OpenAL libmodplug frei0r libdc1394 libavc1394
+libiec61883 ladspa_sdk gsm rtmpdump libvpx libva twolame celt faac
+dirac schroedinger openjpeg "
+
+    3. the numpy SlackBuild at SBo does not build the python3 modules
+which are needed to be useful for any numpy-related python scripting in
+blender. It is therefore numpy3 which is the prerequisite for this build
+of blender.
+
+Due to the official versions of some software packages included in
+Slackware 14.1, the most recent version of Blender that can be built from
+the source code is Blender-2.74. Building more recent versions of
+Blender would require replacement of at least the openexr and ilmbase
+packages (both already updated in -current).
diff --git a/graphics/Blender/buildinfo-2.74.diff b/graphics/Blender/buildinfo-2.74.diff
new file mode 100644
index 0000000000..4bac93d751
--- /dev/null
+++ b/graphics/Blender/buildinfo-2.74.diff
@@ -0,0 +1,18 @@
+--- build_files/cmake/buildinfo.cmake.orig	2015-07-28 11:59:14.020100604 +0000
++++ build_files/cmake/buildinfo.cmake	2015-07-28 12:18:20.021045004 +0000
+@@ -138,11 +138,12 @@
+ 	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+ 
++# Timestamp from $(date --date='TZ="UTC" 16:56 07-Jul-15' +%s) - time & date of commit
+ # Write a file with the BUILD_HASH define
+ file(WRITE buildinfo.h.txt
+-	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
+-	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
+-	"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
++	"#define BUILD_HASH \"rB000dfc03190d\"\n"
++	"#define BUILD_COMMIT_TIMESTAMP 1427816340\n"
++	"#define BUILD_BRANCH \"master\"\n"
+ 	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
+ 	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
+ )
diff --git a/graphics/Blender/buildinfo-2.75a.diff b/graphics/Blender/buildinfo-2.75a.diff
new file mode 100644
index 0000000000..21d9da6115
--- /dev/null
+++ b/graphics/Blender/buildinfo-2.75a.diff
@@ -0,0 +1,18 @@
+--- build_files/cmake/buildinfo.cmake.orig	2015-07-28 11:59:14.020100604 +0000
++++ build_files/cmake/buildinfo.cmake	2015-07-28 12:18:20.021045004 +0000
+@@ -138,11 +138,12 @@
+ 	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+ 
++# Timestamp from $(date --date='TZ="UTC" 16:56 07-Jul-15' +%s) - time & date of commit
+ # Write a file with the BUILD_HASH define
+ file(WRITE buildinfo.h.txt
+-	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
+-	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
+-	"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
++	"#define BUILD_HASH \"rBc27589e19fc0\"\n"
++	"#define BUILD_COMMIT_TIMESTAMP 1436288160\n"
++	"#define BUILD_BRANCH \"master\"\n"
+ 	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
+ 	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
+ )
diff --git a/graphics/Blender/buildinfo-2.76b.diff b/graphics/Blender/buildinfo-2.76b.diff
new file mode 100644
index 0000000000..ccb7c2380e
--- /dev/null
+++ b/graphics/Blender/buildinfo-2.76b.diff
@@ -0,0 +1,18 @@
+--- build_files/cmake/buildinfo.cmake.orig	2015-07-28 11:59:14.020100604 +0000
++++ build_files/cmake/buildinfo.cmake	2015-07-28 12:18:20.021045004 +0000
+@@ -138,11 +138,12 @@
+ 	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+ 
++# Timestamp from $(date --date='TZ="UTC" 10:59 04-Nov-15' +%s) - time & date of commit
+ # Write a file with the BUILD_HASH define
+ file(WRITE buildinfo.h.txt
+-	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
+-	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
+-	"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
++	"#define BUILD_HASH \"rBf337feaf5a1d\"\n"
++	"#define BUILD_COMMIT_TIMESTAMP 1446634740\n"
++	"#define BUILD_BRANCH \"master\"\n"
+ 	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
+ 	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
+ )
diff --git a/graphics/Blender/doinst.sh b/graphics/Blender/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/graphics/Blender/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/graphics/Blender/patch-2.74-use-python35.diff b/graphics/Blender/patch-2.74-use-python35.diff
new file mode 100644
index 0000000000..b10942bf38
--- /dev/null
+++ b/graphics/Blender/patch-2.74-use-python35.diff
@@ -0,0 +1,318 @@
+--- source/blender/python/generic/py_capi_utils.h.orig	2015-03-25 21:01:17.000000000 +1000
++++ source/blender/python/generic/py_capi_utils.h	2016-01-07 23:41:12.118573813 +1000
+@@ -32,13 +32,18 @@
+ void			PyC_LineSpit(void);
+ void			PyC_StackSpit(void);
+ PyObject *		PyC_ExceptionBuffer(void);
++PyObject *		PyC_ExceptionBuffer_Simple(void);
+ PyObject *		PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...);
+ PyObject *		PyC_FrozenSetFromStrings(const char **strings);
+ PyObject *		PyC_Err_Format_Prefix(PyObject *exception_type_prefix, const char *format, ...);
+ void			PyC_FileAndNum(const char **filename, int *lineno);
+ void			PyC_FileAndNum_Safe(const char **filename, int *lineno); /* checks python is running */
+-int				PyC_AsArray(void *array, PyObject *value, const Py_ssize_t length,
+-                            const PyTypeObject *type, const bool is_double, const char *error_prefix);
++int             PyC_AsArray_FAST(
++        void *array, PyObject *value_fast, const Py_ssize_t length,
++        const PyTypeObject *type, const bool is_double, const char *error_prefix);
++int             PyC_AsArray(
++        void *array, PyObject *value, const Py_ssize_t length,
++        const PyTypeObject *type, const bool is_double, const char *error_prefix);
+ PyObject *      PyC_FromArray(const void *array, int length, const PyTypeObject *type,
+                               const bool is_double, const char *error_prefix);
+ void            PyC_Tuple_Fill(PyObject *tuple, PyObject *value);
+@@ -74,6 +79,8 @@
+ int       PyC_FlagSet_ToBitfield(PyC_FlagSet *items, PyObject *value, int *r_value, const char *error_prefix);
+ PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag);
+ 
+-int PyC_RunString_AsNumber(const char *expr, double *value, const char *filename);
++bool PyC_RunString_AsNumber(const char *expr, double *value, const char *filename);
++
++int PyC_ParseBool(PyObject *o, void *p);
+ 
+ #endif  /* __PY_CAPI_UTILS_H__ */
+--- source/blender/python/generic/py_capi_utils.c.orig	2015-03-25 21:01:17.000000000 +1000
++++ source/blender/python/generic/py_capi_utils.c	2016-01-07 23:41:12.114573720 +1000
+@@ -29,7 +29,6 @@
+  * BLI_string_utf8() for unicode conversion.
+  */
+ 
+-
+ #include <Python.h>
+ #include <frameobject.h>
+ 
+@@ -37,10 +36,12 @@
+ 
+ #include "py_capi_utils.h"
+ 
+-#include "../generic/python_utildefines.h"
++#include "python_utildefines.h"
+ 
++#ifndef MATH_STANDALONE
+ /* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
+ #include "BLI_string_utf8.h"
++#endif
+ 
+ #ifdef _WIN32
+ #include "BLI_path_util.h"  /* BLI_setenv() */
+@@ -48,21 +49,17 @@
+ #endif
+ 
+ /* array utility function */
+-int PyC_AsArray(void *array, PyObject *value, const Py_ssize_t length,
+-                const PyTypeObject *type, const bool is_double, const char *error_prefix)
++int PyC_AsArray_FAST(
++        void *array, PyObject *value_fast, const Py_ssize_t length,
++        const PyTypeObject *type, const bool is_double, const char *error_prefix)
+ {
+-	PyObject *value_fast;
+-	Py_ssize_t value_len;
++	const Py_ssize_t value_len = PySequence_Fast_GET_SIZE(value_fast);
++	PyObject **value_fast_items = PySequence_Fast_ITEMS(value_fast);
+ 	Py_ssize_t i;
+ 
+-	if (!(value_fast = PySequence_Fast(value, error_prefix))) {
+-		return -1;
+-	}
+-
+-	value_len = PySequence_Fast_GET_SIZE(value_fast);
++	BLI_assert(PyList_Check(value_fast) || PyTuple_Check(value_fast));
+ 
+ 	if (value_len != length) {
+-		Py_DECREF(value);
+ 		PyErr_Format(PyExc_TypeError,
+ 		             "%.200s: invalid sequence length. expected %d, got %d",
+ 		             error_prefix, length, value_len);
+@@ -74,13 +71,13 @@
+ 		if (is_double) {
+ 			double *array_double = array;
+ 			for (i = 0; i < length; i++) {
+-				array_double[i] = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value_fast, i));
++				array_double[i] = PyFloat_AsDouble(value_fast_items[i]);
+ 			}
+ 		}
+ 		else {
+ 			float *array_float = array;
+ 			for (i = 0; i < length; i++) {
+-				array_float[i] = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value_fast, i));
++				array_float[i] = PyFloat_AsDouble(value_fast_items[i]);
+ 			}
+ 		}
+ 	}
+@@ -88,25 +85,22 @@
+ 		/* could use is_double for 'long int' but no use now */
+ 		int *array_int = array;
+ 		for (i = 0; i < length; i++) {
+-			array_int[i] = PyLong_AsLong(PySequence_Fast_GET_ITEM(value_fast, i));
++			array_int[i] = PyLong_AsLong(value_fast_items[i]);
+ 		}
+ 	}
+ 	else if (type == &PyBool_Type) {
+ 		int *array_bool = array;
+ 		for (i = 0; i < length; i++) {
+-			array_bool[i] = (PyLong_AsLong(PySequence_Fast_GET_ITEM(value_fast, i)) != 0);
++			array_bool[i] = (PyLong_AsLong(value_fast_items[i]) != 0);
+ 		}
+ 	}
+ 	else {
+-		Py_DECREF(value_fast);
+ 		PyErr_Format(PyExc_TypeError,
+ 		             "%s: internal error %s is invalid",
+ 		             error_prefix, type->tp_name);
+ 		return -1;
+ 	}
+ 
+-	Py_DECREF(value_fast);
+-
+ 	if (PyErr_Occurred()) {
+ 		PyErr_Format(PyExc_TypeError,
+ 		             "%s: one or more items could not be used as a %s",
+@@ -117,6 +111,22 @@
+ 	return 0;
+ }
+ 
++int PyC_AsArray(
++        void *array, PyObject *value, const Py_ssize_t length,
++        const PyTypeObject *type, const bool is_double, const char *error_prefix)
++{
++	PyObject *value_fast;
++	int ret;
++
++	if (!(value_fast = PySequence_Fast(value, error_prefix))) {
++		return -1;
++	}
++
++	ret = PyC_AsArray_FAST(array, value_fast, length, type, is_double, error_prefix);
++	Py_DECREF(value_fast);
++	return ret;
++}
++
+ /* array utility function */
+ PyObject *PyC_FromArray(const void *array, int length, const PyTypeObject *type,
+                         const bool is_double, const char *error_prefix)
+@@ -191,6 +201,27 @@
+ 	}
+ }
+ 
++/**
++ * Use with PyArg_ParseTuple's "O&" formatting.
++ */
++int PyC_ParseBool(PyObject *o, void *p)
++{
++	bool *bool_p = p;
++	long value;
++	if (((value = PyLong_AsLong(o)) == -1) || !ELEM(value, 0, 1)) {
++		PyErr_Format(PyExc_ValueError,
++		             "expected a bool or int (0/1), got %s",
++		             Py_TYPE(o)->tp_name);
++		return 0;
++	}
++
++	*bool_p = value ? true : false;
++	return 1;
++}
++
++
++#ifndef MATH_STANDALONE
++
+ /* for debugging */
+ void PyC_ObSpit(const char *name, PyObject *var)
+ {
+@@ -478,6 +509,34 @@
+ }
+ #endif
+ 
++PyObject *PyC_ExceptionBuffer_Simple(void)
++{
++	PyObject *string_io_buf;
++
++	PyObject *error_type, *error_value, *error_traceback;
++
++	if (!PyErr_Occurred())
++		return NULL;
++
++	PyErr_Fetch(&error_type, &error_value, &error_traceback);
++
++	if (error_value == NULL) {
++		return NULL;
++	}
++
++	string_io_buf = PyObject_Str(error_value);
++	/* Python does this too */
++	if (UNLIKELY(string_io_buf == NULL)) {
++		string_io_buf = PyUnicode_FromFormat(
++		        "<unprintable %s object>", Py_TYPE(error_value)->tp_name);
++	}
++
++	PyErr_Restore(error_type, error_value, error_traceback);
++
++	PyErr_Print();
++	PyErr_Clear();
++	return string_io_buf;
++}
+ 
+ /* string conversion, escape non-unicode chars, coerce must be set to NULL */
+ const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
+@@ -497,15 +556,6 @@
+ 		if (PyBytes_Check(py_str)) {
+ 			return PyBytes_AS_STRING(py_str);
+ 		}
+-#ifdef WIN32
+-		/* bug [#31856] oddly enough, Python3.2 --> 3.3 on Windows will throw an
+-		 * exception here this needs to be fixed in python:
+-		 * see: bugs.python.org/issue15859 */
+-		else if (!PyUnicode_Check(py_str)) {
+-			PyErr_BadArgument();
+-			return NULL;
+-		}
+-#endif
+ 		else if ((*coerce = PyUnicode_EncodeFSDefault(py_str))) {
+ 			return PyBytes_AS_STRING(*coerce);
+ 		}
+@@ -629,7 +679,8 @@
+ 
+ bool PyC_IsInterpreterActive(void)
+ {
+-	return (((PyThreadState *)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL);
++	/* instead of PyThreadState_Get, which calls Py_FatalError */
++	return (PyThreadState_GetDict() != NULL);
+ }
+ 
+ /* Would be nice if python had this built in
+@@ -673,7 +724,7 @@
+ 			}
+ 
+ 			if (ret == NULL) {
+-				printf("PyC_InlineRun error, line:%d\n", __LINE__);
++				printf("%s error, line:%d\n", __func__, __LINE__);
+ 				PyErr_Print();
+ 				PyErr_Clear();
+ 
+@@ -747,7 +798,7 @@
+ 						Py_DECREF(ret);
+ 					}
+ 					else {
+-						printf("PyC_InlineRun error on arg '%d', line:%d\n", i, __LINE__);
++						printf("%s error on arg '%d', line:%d\n", __func__, i, __LINE__);
+ 						PyC_ObSpit("failed converting:", item_new);
+ 						PyErr_Print();
+ 						PyErr_Clear();
+@@ -758,11 +809,11 @@
+ 				va_end(vargs);
+ 			}
+ 			else {
+-				printf("PyC_InlineRun error, 'values' not a list, line:%d\n", __LINE__);
++				printf("%s error, 'values' not a list, line:%d\n", __func__, __LINE__);
+ 			}
+ 		}
+ 		else {
+-			printf("PyC_InlineRun error line:%d\n", __LINE__);
++			printf("%s error line:%d\n", __func__, __LINE__);
+ 			PyErr_Print();
+ 			PyErr_Clear();
+ 		}
+@@ -920,14 +971,14 @@
+ 
+ 
+ /**
+- * \return -1 on error, else 0
++ * \return success
+  *
+  * \note it is caller's responsibility to acquire & release GIL!
+  */
+-int PyC_RunString_AsNumber(const char *expr, double *value, const char *filename)
++bool PyC_RunString_AsNumber(const char *expr, double *value, const char *filename)
+ {
+ 	PyObject *py_dict, *mod, *retval;
+-	int error_ret = 0;
++	bool ok = true;
+ 	PyObject *main_mod = NULL;
+ 
+ 	PyC_MainModule_Backup(&main_mod);
+@@ -947,7 +998,7 @@
+ 	retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict);
+ 
+ 	if (retval == NULL) {
+-		error_ret = -1;
++		ok = false;
+ 	}
+ 	else {
+ 		double val;
+@@ -973,7 +1024,7 @@
+ 		Py_DECREF(retval);
+ 
+ 		if (val == -1 && PyErr_Occurred()) {
+-			error_ret = -1;
++			ok = false;
+ 		}
+ 		else if (!finite(val)) {
+ 			*value = 0.0;
+@@ -985,5 +1036,7 @@
+ 
+ 	PyC_MainModule_Restore(main_mod);
+ 
+-	return error_ret;
++	return ok;
+ }
++
++#endif  /* #ifndef MATH_STANDALONE */
diff --git a/graphics/Blender/patch-2.76b-use-python35.diff b/graphics/Blender/patch-2.76b-use-python35.diff
new file mode 100644
index 0000000000..176908b59e
--- /dev/null
+++ b/graphics/Blender/patch-2.76b-use-python35.diff
@@ -0,0 +1,170 @@
+--- source/blender/python/generic/py_capi_utils.h.orig	2015-11-02 23:25:38.000000000 +1000
++++ source/blender/python/generic/py_capi_utils.h	2016-01-08 19:16:13.796355344 +1000
+@@ -79,7 +79,7 @@
+ int       PyC_FlagSet_ToBitfield(PyC_FlagSet *items, PyObject *value, int *r_value, const char *error_prefix);
+ PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag);
+ 
+-int PyC_RunString_AsNumber(const char *expr, double *value, const char *filename);
++bool PyC_RunString_AsNumber(const char *expr, double *value, const char *filename);
+ 
+ int PyC_ParseBool(PyObject *o, void *p);
+ 
+--- source/blender/python/generic/py_capi_utils.c.orig	2015-11-04 20:02:15.000000000 +1000
++++ source/blender/python/generic/py_capi_utils.c	2016-01-08 19:16:13.784355344 +1000
+@@ -29,7 +29,6 @@
+  * BLI_string_utf8() for unicode conversion.
+  */
+ 
+-
+ #include <Python.h>
+ #include <frameobject.h>
+ 
+@@ -39,8 +38,10 @@
+ 
+ #include "python_utildefines.h"
+ 
++#ifndef MATH_STANDALONE
+ /* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
+ #include "BLI_string_utf8.h"
++#endif
+ 
+ #ifdef _WIN32
+ #include "BLI_path_util.h"  /* BLI_setenv() */
+@@ -200,6 +201,27 @@
+ 	}
+ }
+ 
++/**
++ * Use with PyArg_ParseTuple's "O&" formatting.
++ */
++int PyC_ParseBool(PyObject *o, void *p)
++{
++	bool *bool_p = p;
++	long value;
++	if (((value = PyLong_AsLong(o)) == -1) || !ELEM(value, 0, 1)) {
++		PyErr_Format(PyExc_ValueError,
++		             "expected a bool or int (0/1), got %s",
++		             Py_TYPE(o)->tp_name);
++		return 0;
++	}
++
++	*bool_p = value ? true : false;
++	return 1;
++}
++
++
++#ifndef MATH_STANDALONE
++
+ /* for debugging */
+ void PyC_ObSpit(const char *name, PyObject *var)
+ {
+@@ -534,15 +556,6 @@
+ 		if (PyBytes_Check(py_str)) {
+ 			return PyBytes_AS_STRING(py_str);
+ 		}
+-#ifdef WIN32
+-		/* bug [#31856] oddly enough, Python3.2 --> 3.3 on Windows will throw an
+-		 * exception here this needs to be fixed in python:
+-		 * see: bugs.python.org/issue15859 */
+-		else if (!PyUnicode_Check(py_str)) {
+-			PyErr_BadArgument();
+-			return NULL;
+-		}
+-#endif
+ 		else if ((*coerce = PyUnicode_EncodeFSDefault(py_str))) {
+ 			return PyBytes_AS_STRING(*coerce);
+ 		}
+@@ -711,7 +724,7 @@
+ 			}
+ 
+ 			if (ret == NULL) {
+-				printf("PyC_InlineRun error, line:%d\n", __LINE__);
++				printf("%s error, line:%d\n", __func__, __LINE__);
+ 				PyErr_Print();
+ 				PyErr_Clear();
+ 
+@@ -785,7 +798,7 @@
+ 						Py_DECREF(ret);
+ 					}
+ 					else {
+-						printf("PyC_InlineRun error on arg '%d', line:%d\n", i, __LINE__);
++						printf("%s error on arg '%d', line:%d\n", __func__, i, __LINE__);
+ 						PyC_ObSpit("failed converting:", item_new);
+ 						PyErr_Print();
+ 						PyErr_Clear();
+@@ -796,11 +809,11 @@
+ 				va_end(vargs);
+ 			}
+ 			else {
+-				printf("PyC_InlineRun error, 'values' not a list, line:%d\n", __LINE__);
++				printf("%s error, 'values' not a list, line:%d\n", __func__, __LINE__);
+ 			}
+ 		}
+ 		else {
+-			printf("PyC_InlineRun error line:%d\n", __LINE__);
++			printf("%s error line:%d\n", __func__, __LINE__);
+ 			PyErr_Print();
+ 			PyErr_Clear();
+ 		}
+@@ -958,14 +971,14 @@
+ 
+ 
+ /**
+- * \return -1 on error, else 0
++ * \return success
+  *
+  * \note it is caller's responsibility to acquire & release GIL!
+  */
+-int PyC_RunString_AsNumber(const char *expr, double *value, const char *filename)
++bool PyC_RunString_AsNumber(const char *expr, double *value, const char *filename)
+ {
+ 	PyObject *py_dict, *mod, *retval;
+-	int error_ret = 0;
++	bool ok = true;
+ 	PyObject *main_mod = NULL;
+ 
+ 	PyC_MainModule_Backup(&main_mod);
+@@ -985,7 +998,7 @@
+ 	retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict);
+ 
+ 	if (retval == NULL) {
+-		error_ret = -1;
++		ok = false;
+ 	}
+ 	else {
+ 		double val;
+@@ -1011,7 +1024,7 @@
+ 		Py_DECREF(retval);
+ 
+ 		if (val == -1 && PyErr_Occurred()) {
+-			error_ret = -1;
++			ok = false;
+ 		}
+ 		else if (!finite(val)) {
+ 			*value = 0.0;
+@@ -1023,23 +1036,7 @@
+ 
+ 	PyC_MainModule_Restore(main_mod);
+ 
+-	return error_ret;
++	return ok;
+ }
+ 
+-/**
+- * Use with PyArg_ParseTuple's "O&" formatting.
+- */
+-int PyC_ParseBool(PyObject *o, void *p)
+-{
+-	bool *bool_p = p;
+-	long value;
+-	if (((value = PyLong_AsLong(o)) == -1) || !ELEM(value, 0, 1)) {
+-		PyErr_Format(PyExc_ValueError,
+-		             "expected a bool or int (0/1), got %s",
+-		             Py_TYPE(o)->tp_name);
+-		return 0;
+-	}
+-
+-	*bool_p = value ? true : false;
+-	return 1;
+-}
++#endif  /* #ifndef MATH_STANDALONE */
diff --git a/graphics/Blender/slack-desc b/graphics/Blender/slack-desc
new file mode 100644
index 0000000000..bafa0f8d7a
--- /dev/null
+++ b/graphics/Blender/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+Blender: Blender (3D Content Creation Suite)
+Blender:
+Blender: Blender is the free open source 3D content creation suite, available
+Blender: for all major operating systems under the GNU General Public License.
+Blender:
+Blender: http://blender.org
+Blender:
+Blender:
+Blender:
+Blender:
+Blender:
diff --git a/graphics/CairoSVG/CairoSVG.SlackBuild b/graphics/CairoSVG/CairoSVG.SlackBuild
index 31eb00cdd6..57ec000b90 100644
--- a/graphics/CairoSVG/CairoSVG.SlackBuild
+++ b/graphics/CairoSVG/CairoSVG.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CairoSVG
-VERSION=${VERSION:-1.0.15}
+VERSION=${VERSION:-1.0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/CairoSVG/CairoSVG.info b/graphics/CairoSVG/CairoSVG.info
index b070cd60dc..3eee9dbd31 100644
--- a/graphics/CairoSVG/CairoSVG.info
+++ b/graphics/CairoSVG/CairoSVG.info
@@ -1,8 +1,8 @@
 PRGNAM="CairoSVG"
-VERSION="1.0.15"
+VERSION="1.0.19"
 HOMEPAGE="http://cairosvg.org"
-DOWNLOAD="http://pypi.python.org/packages/source/C/CairoSVG/CairoSVG-1.0.15.tar.gz"
-MD5SUM="9e4375b34d7c160f1fac4344bf1235a0"
+DOWNLOAD="http://pypi.python.org/packages/source/C/CairoSVG/CairoSVG-1.0.19.tar.gz"
+MD5SUM="bfb1f2f6ebcf98c70310618eb2b491b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cairocffi"
diff --git a/graphics/GPS/GPS.SlackBuild b/graphics/GPS/GPS.SlackBuild
index 5386a4871a..14cae597f3 100644
--- a/graphics/GPS/GPS.SlackBuild
+++ b/graphics/GPS/GPS.SlackBuild
@@ -39,19 +39,23 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-cp $CWD/${PRGNAM}_${VERSION}.tar.gz $TMP
-chown root:root ${PRGNAM}_${VERSION}.tar.gz
+cd $PKG
 
 mkdir -p $PKG/usr/share/gimp/2.0/
-tar -xf $TMP/${PRGNAM}_${VERSION}.tar.gz -C $PKG/usr/share/gimp/2.0/
+tar -xf $CWD/${PRGNAM}_${VERSION}.tar.gz -C $PKG/usr/share/gimp/2.0/
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/GPS/doinst.sh b/graphics/GPS/doinst.sh
deleted file mode 100644
index fdf2b79202..0000000000
--- a/graphics/GPS/doinst.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-chmod -R 755 /usr/share/gimp/2.0/{brushes,dynamics,gradients,palettes,patterns,splashes,tool-presets,License*,Read*}
-chown -R root:root /usr/share/gimp/2.0/{brushes,dynamics,gradients,palettes,patterns,splashes,tool-presets,License*,Read*}
diff --git a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild
index cb49f9902e..fbc6261121 100644
--- a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild
+++ b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild
@@ -2,10 +2,24 @@
 
 # Slackware build script for GraphicsMagick
 
-# Written by Giovanne Castro <giovannefc@terra.com.br>
+# Originally written by Giovanne Castro <giovannefc@terra.com.br>
+
+# Updated by B. Watson <yalhcru@gmail.com>, as the original author is
+# MIA. Original version had no license; I'm licensing the update under the
+# terms of the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20150803 bkw:
+# - updated for v1.3.21
+# - install docs to /usr/doc/$PRGNAM-$VERSION, not /usr/share/doc
+# - build perl bindings (PerlMagick)
+# - build Tcl bindings (TclMagick)
+# - document optional deps in README
+
+# 20151127 bkw:
+# - fix build on -current, in anticipation of 14.2
 
 PRGNAM=GraphicsMagick
-VERSION=${VERSION:-1.3.17}
+VERSION=${VERSION:-1.3.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +71,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --program-prefix= \
   --with-x \
   --with-frozenpaths=no \
@@ -71,20 +86,103 @@ CXXFLAGS="$SLKCFLAGS" \
 make INSTALLDIRS=vendor
 make install INSTALLDIRS=vendor DESTDIR=$PKG
 
+### Build the perl module
+
+# In the olden days, PerlMagick was a separate module, not part of
+# GraphicsMagick, and it had its own SlackBuild. These days, PerlMagick
+# is integrated into the GraphicsMagick source. Supposedly, PerlMagick
+# has to be built after GraphicsMagick is installed system-wide, but
+# I've come up with functional (if unattractive) way around that.
+
+cd PerlMagick
+
+# munge Makefile.PL to build using the includes/libs we just installed
+# to $PKG, instead of systemwide ones.
+sed -i \
+  -e "/magick_CFLAGS/s,=',&-I$PKG/usr/include ," \
+  -e "/magick_LDFLAGS/s,=',&-L$PKG/usr/lib$LIBDIRSUFFIX ," \
+  Makefile.PL
+
+# don't know why we have to explicitly force -lGraphicsMagick here...
+perl Makefile.PL \
+  LIBS=-lGraphicsMagick \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+
+# 'make test' will attempt to display an image, if it thinks it's running
+# in X. Let's not do this. Also, use the shared libs in $PKG.
+# The rungm.sh script sets up the environment so GraphicsMagick will look
+# for its support files in the source tree instead of /usr.
+DISPLAY="" \
+LD_PRELOAD="$PKG/usr/lib$LIBDIRSUFFIX/lib$PRGNAM.so" \
+  ../rungm.sh make test
+
+make install DESTDIR=$PKG
+
+cd -
+### Done with perl module
+
+### Build the tcl module, if & only if GraphicsMagick was already
+#   installed system-wide. This means, to get tcl bindings, you have to
+#   build twice. You can thank libtool and its .la files (with hard-coded
+#   paths) for this stupidity. I could probably spend more time with
+#   this and fix it (like the perl stuff above), but I suspect nobody
+#   really cares about TclMagick.
+
+GMVER="$(pkg-config --silence-errors --modversion $PRGNAM || true)"
+if [ "$GMVER" = "$VERSION" ]; then
+  cd TclMagick
+
+# LIBS needed to avoid libTclMagick.so: undefined symbol: tclStubsPtr
+  source /usr/lib$LIBDIRSUFFIX/tclConfig.sh
+
+  LIBS="$TCL_STUB_LIB_FLAG" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --mandir=/usr/man \
+    --with-magick=/usr/bin/${PRGNAM}Wand-config \
+    --with-tcl=/usr/lib$LIBDIRSUFFIX \
+    --with-tk=/usr/lib$LIBDIRSUFFIX
+
+  make
+  make install DESTDIR=$PKG
+
+  WITHTCL=WITH
+  cd -
+else
+  cat <<EOF
+Building without Tcl/Tk bindings. If you need TclMagick, install this
+package, then re-run the SlackBuild and reinstall the package. The 2nd
+build will include TclMagick.
+EOF
+  WITHTCL=WITHOUT
+fi
+### Done with tcl module
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog NEWS.txt README.txt TODO.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITHTCL@,$WITHTCL," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/GraphicsMagick/GraphicsMagick.info b/graphics/GraphicsMagick/GraphicsMagick.info
index a72fa6220a..d99cf62e01 100644
--- a/graphics/GraphicsMagick/GraphicsMagick.info
+++ b/graphics/GraphicsMagick/GraphicsMagick.info
@@ -1,10 +1,10 @@
 PRGNAM="GraphicsMagick"
-VERSION="1.3.17"
+VERSION="1.3.21"
 HOMEPAGE="http://www.graphicsmagick.org/"
-DOWNLOAD="http://downloads.sourceforge.net/graphicsmagick/GraphicsMagick-1.3.17.tar.bz2"
-MD5SUM="2b9438889304c07bdfcf589075d00b57"
+DOWNLOAD="http://downloads.sourceforge.net/graphicsmagick/GraphicsMagick-1.3.21.tar.bz2"
+MD5SUM="fcf543de2d74514376cfd0418cc30989"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Giovanne Castro"
-EMAIL="giovannefc@terra.com.br"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/GraphicsMagick/README b/graphics/GraphicsMagick/README
index 63a67b881a..4fb410f87f 100644
--- a/graphics/GraphicsMagick/README
+++ b/graphics/GraphicsMagick/README
@@ -1,5 +1,32 @@
+GraphicsMagick (Image Processing System)
+
 GraphicsMagick is the swiss army knife of image processing.
 Provides a robust and efficient collection of tools and libraries
 which support reading, writing, and manipulating an image in over
 88 major formats including important formats like DPX, GIF, JPEG,
 JPEG-2000, PNG, PDF, PNM, and TIFF.
+
+Starting with version 1.3.21, this build now includes PerlMagick, the
+perl language bindings for GraphicsMagick.
+
+This build can also include Tcl/Tk bindings (TclMagick). To do this,
+first 'removepkg GraphicsMagick' if an older version is installed. Then,
+run the build script, install the GraphicsMagick package, then run the
+build script again and reinstall the (newly-rebuilt) package. This has
+to be done on every version upgrade as well (though only if you need
+TclMagick, of course).
+
+Optional dependencies: Some file formats require extra libraries. These
+are all autodetected at build time.
+
+libwebp (.webp support)
+jbigkit (.jbg, .jbig support)
+dcraw (Raw camera files, various filename extensions)
+
+Unsupported: These file formats require software that isn't currently
+available on SBo. If you submit a build for one of these, please let
+me know so I can document it here.
+
+ralcgm (.cgm, Computer Graphics Metafile)
+hp2xx (.hpg, .hpgl, HP Graphics Language)
+flashpix (.fpx, not supported on Linux)
diff --git a/graphics/GraphicsMagick/slack-desc b/graphics/GraphicsMagick/slack-desc
index 63641bc89d..b40d096e21 100644
--- a/graphics/GraphicsMagick/slack-desc
+++ b/graphics/GraphicsMagick/slack-desc
@@ -16,4 +16,4 @@ GraphicsMagick: JPEG-2000, PNG, PDF, PNM, and TIFF.
 GraphicsMagick:
 GraphicsMagick: Home Page: http://www.graphicsmagick.org/
 GraphicsMagick:
-GraphicsMagick:
+GraphicsMagick: This package built @WITHTCL@ Tcl/Tk support (TclMagick)
diff --git a/graphics/PyMOL/PyMOL.SlackBuild b/graphics/PyMOL/PyMOL.SlackBuild
index 224ad0e546..18eff0c81a 100644
--- a/graphics/PyMOL/PyMOL.SlackBuild
+++ b/graphics/PyMOL/PyMOL.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for PyMOL
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=PyMOL
 SRCNAM=$(echo ${PRGNAM,,}-v)
-VERSION=${VERSION:-1.7.6.0}
+VERSION=${VERSION:-1.8.0.0}
 SRCDIR=$(echo $SRCNAM | cut -c1-5)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/graphics/PyMOL/PyMOL.info b/graphics/PyMOL/PyMOL.info
index 75f2f7709f..6a86ff94b2 100644
--- a/graphics/PyMOL/PyMOL.info
+++ b/graphics/PyMOL/PyMOL.info
@@ -1,8 +1,8 @@
 PRGNAM="PyMOL"
-VERSION="1.7.6.0"
+VERSION="1.8.0.0"
 HOMEPAGE="http://pymol.org"
-DOWNLOAD="http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v1.7.6.0.tar.bz2"
-MD5SUM="ec06f784fbb31ab276bb2960c25dc865"
+DOWNLOAD="http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v1.8.0.0.tar.bz2"
+MD5SUM="59d6e74377427aab5c5a5b7c9d53a4e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-pmw"
diff --git a/graphics/Shellpic/Shellpic.SlackBuild b/graphics/Shellpic/Shellpic.SlackBuild
index 6de3ba2269..3f2a3adb75 100644
--- a/graphics/Shellpic/Shellpic.SlackBuild
+++ b/graphics/Shellpic/Shellpic.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Shellpic
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Shellpic
-VERSION=${VERSION:-1.6.1}
+SRCNAM=$(echo ${PRGNAM,})
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || $CWD/v$VERSION.tar.gz 
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -75,7 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.rst LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/Shellpic/Shellpic.info b/graphics/Shellpic/Shellpic.info
index 90b9185c7c..66bcab77a6 100644
--- a/graphics/Shellpic/Shellpic.info
+++ b/graphics/Shellpic/Shellpic.info
@@ -1,8 +1,8 @@
 PRGNAM="Shellpic"
-VERSION="1.6.1"
+VERSION="1.6.2"
 HOMEPAGE="https://github.com/larsjsol/shellpic"
-DOWNLOAD="https://pypi.python.org/packages/source/S/Shellpic/Shellpic-1.6.1.tar.gz"
-MD5SUM="5c22d7af906c024fd884faeb4213d000"
+DOWNLOAD="https://github.com/larsjsol/shellpic/archive/v1.6.2.tar.gz"
+MD5SUM="ab2cfb28d63e05fd8d750832476fcf0b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/advancecomp/advancecomp.SlackBuild b/graphics/advancecomp/advancecomp.SlackBuild
index 46fbe37c7a..caebde7dc9 100644
--- a/graphics/advancecomp/advancecomp.SlackBuild
+++ b/graphics/advancecomp/advancecomp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for advancecomp
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=advancecomp
-VERSION=${VERSION:-1.19}
+VERSION=${VERSION:-1.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/advancecomp/advancecomp.info b/graphics/advancecomp/advancecomp.info
index 22394b3716..701aa421e7 100644
--- a/graphics/advancecomp/advancecomp.info
+++ b/graphics/advancecomp/advancecomp.info
@@ -1,8 +1,8 @@
 PRGNAM="advancecomp"
-VERSION="1.19"
-HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
-DOWNLOAD="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz"
-MD5SUM="371548ce4cc38cb452c20414cbd8c4fe"
+VERSION="1.20"
+HOMEPAGE="http://www.advancemame.it/"
+DOWNLOAD="https://github.com/amadvance/advancecomp/releases/download/v1.20/advancecomp-1.20.tar.gz"
+MD5SUM="c53a2c3a806fab1d3a99a1f1be83f148"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/autotrace/README b/graphics/autotrace/README
new file mode 100644
index 0000000000..251884c7d2
--- /dev/null
+++ b/graphics/autotrace/README
@@ -0,0 +1,9 @@
+AutoTrace is a utility for converting bitmap into vector graphics and
+is a free replacement of CorelTrace & Adobe Streamline.
+Features:
+- Tracing outline and midline
+- Color reduction and Despeckling
+- Import Formats: BMP, TGA, PNM, PPM, PGM, PBM and those supported
+  by ImageMagick.
+- Export Formats: Postscript, svg,xfig, swf, pstoedit, emf, dxf,
+cgm, mif, p2e and sk.
diff --git a/graphics/autotrace/autotrace.SlackBuild b/graphics/autotrace/autotrace.SlackBuild
new file mode 100644
index 0000000000..8c70177a3d
--- /dev/null
+++ b/graphics/autotrace/autotrace.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+#
+# Slackware build script for autotrace
+#
+# Copyright 2015 Citizen X  Clearwater, Florida, USA
+# Maintainer Citizen X <citizen.anon.x@gmail.com>
+# All rights reserved.
+#
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=autotrace
+VERSION=${VERSION:-0.31.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --without-pstoedit \
+  --enable-static=no \
+  --enable-shared=yes \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/autotrace/autotrace.info b/graphics/autotrace/autotrace.info
new file mode 100644
index 0000000000..8be1f60d2b
--- /dev/null
+++ b/graphics/autotrace/autotrace.info
@@ -0,0 +1,10 @@
+PRGNAM="autotrace"
+VERSION="0.31.1"
+HOMEPAGE="http://autotrace.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/autotrace/files/AutoTrace/0.31.1/autotrace-0.31.1.tar.gz"
+MD5SUM="54eabbb38d2076ded6d271e1ee4d0783"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Citizen X"
+EMAIL="citizen.anon.x@gmail.com"
diff --git a/graphics/autotrace/slack-desc b/graphics/autotrace/slack-desc
new file mode 100644
index 0000000000..29ad7943bf
--- /dev/null
+++ b/graphics/autotrace/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+autotrace: autotrace (Bitmap to vector graphics converter)
+autotrace: AutoTrace is a utility for converting bitmap into vector graphics and
+autotrace: is a free replacement of CorelTrace & Adobe Streamline.
+autotrace: Features:
+autotrace: - Tracing outline and midline
+autotrace: - Color reduction and Despeckling
+autotrace: - Import Formats: BMP, TGA, PNM, PPM, PGM, PBM and those supported
+autotrace:   by ImageMagick.
+autotrace: - Export Formats: Postscript, svg,xfig, swf, pstoedit, emf, dxf,
+autotrace: cgm, mif, p2e and sk.
+autotrace: Homepage: http://autotrace.sourceforge.net/
diff --git a/graphics/blender/README b/graphics/blender/README
index e7f2068b70..1dc1788be2 100644
--- a/graphics/blender/README
+++ b/graphics/blender/README
@@ -1,2 +1,5 @@
 Blender is the free open source 3D content creation suite, available
 for all major operating systems under the GNU General Public License.
+
+This version repackages the binary bundle, if you wish to build
+from source look for 'Blender' on SBo.
diff --git a/graphics/blender/blender.SlackBuild b/graphics/blender/blender.SlackBuild
index 90f5a58f7b..31be9ec9cb 100644
--- a/graphics/blender/blender.SlackBuild
+++ b/graphics/blender/blender.SlackBuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # Slackware build script for Blender
-
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 
 # Copyright 2008-2013  Robby Workman  Northport, AL, USA
@@ -27,7 +26,7 @@
 # Thanks to Giorgio Peron <giorgio.peron@gmail.com> for some build tips
 
 PRGNAM=blender
-VERSION=${VERSION:-2.75a}
+VERSION=${VERSION:-2.76b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/blender/blender.info b/graphics/blender/blender.info
index f3cc7bb110..27799abc18 100644
--- a/graphics/blender/blender.info
+++ b/graphics/blender/blender.info
@@ -1,10 +1,10 @@
 PRGNAM="blender"
-VERSION="2.75a"
+VERSION="2.76b"
 HOMEPAGE="http://blender.org"
-DOWNLOAD="http://ftp.nluug.nl/pub/graphics/blender/release/Blender2.75/blender-2.75a-linux-glibc211-i686.tar.bz2"
-MD5SUM="a3221088ec49ec29b53f309b27fe559e"
-DOWNLOAD_x86_64="http://ftp.nluug.nl/pub/graphics/blender/release/Blender2.75/blender-2.75a-linux-glibc211-x86_64.tar.bz2"
-MD5SUM_x86_64="ece7d7c06f123db82b5d8d1265126cc6"
+DOWNLOAD="http://ftp.nluug.nl/pub/graphics/blender/release/Blender2.76/blender-2.76b-linux-glibc211-i686.tar.bz2"
+MD5SUM="9b71b1653e90dd06ba8c70dae9743397"
+DOWNLOAD_x86_64="http://ftp.nluug.nl/pub/graphics/blender/release/Blender2.76/blender-2.76b-linux-glibc211-x86_64.tar.bz2"
+MD5SUM_x86_64="e588925227f699cc93b62bc00eb58916"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/graphics/brlcad/README b/graphics/brlcad/README
index 912b351a52..51b6b0a313 100644
--- a/graphics/brlcad/README
+++ b/graphics/brlcad/README
@@ -6,3 +6,6 @@ representation, with more than 20 years of active development.
 
 NOTE: This package needs about 7GB of space to build, so adapt your
 OUTPUT and TMP variables if necessary.
+
+WARNING: There is a known conflict with the 'qt5' package, remove it
+before building.
diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild
index 1440fc77c3..b7b569d824 100644
--- a/graphics/darktable/darktable.SlackBuild
+++ b/graphics/darktable/darktable.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=darktable
-VERSION=${VERSION:-1.6.8}
+VERSION=${VERSION:-1.6.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info
index 256dc4c6b8..49e4cbc8be 100644
--- a/graphics/darktable/darktable.info
+++ b/graphics/darktable/darktable.info
@@ -1,8 +1,8 @@
 PRGNAM="darktable"
-VERSION="1.6.8"
+VERSION="1.6.9"
 HOMEPAGE="http://darktable.sourceforge.net/"
-DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-1.6.8/darktable-1.6.8.tar.xz"
-MD5SUM="ff6651082a8aba9c686191628e95e099"
+DOWNLOAD="https://github.com/darktable-org/darktable/releases/download/release-1.6.9/darktable-1.6.9.tar.xz"
+MD5SUM="d4a52d06c37209afc31c0d0ffdc87ed9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lensfun"
diff --git a/graphics/dia/README b/graphics/dia/README
index c333d2364b..06d252b1ec 100644
--- a/graphics/dia/README
+++ b/graphics/dia/README
@@ -1,9 +1,6 @@
-Dia (diagram creation program)
-
-Dia is inspired by the commercial Windows program 'Visio', though
-more geared towards informal diagrams for casual use. It can be used
-to draw many different kinds of diagrams. It currently has special
-objects to help draw entity relationship diagrams, UML diagrams,
-flowcharts, network diagrams, and many other diagrams. It is also
-possible to add support for new shapes by writing simple XML files,
-using a subset of SVG to draw the shape.
+Dia is an application for creating technical diagrams. Its interface and
+features are loosely patterned after the Windows program Visio. Its features
+include multiple-page printing, export to many formats (EPS, SVG, CGM and
+PNG) and the ability to use custom shapes created by the user as simple XML
+descriptions. Dia is useful for drawing UML diagrams, network maps and
+flowcharts.
diff --git a/graphics/dia/dia-enable-html-docs.patch b/graphics/dia/dia-enable-html-docs.patch
new file mode 100644
index 0000000000..9bc02e1c0c
--- /dev/null
+++ b/graphics/dia/dia-enable-html-docs.patch
@@ -0,0 +1,26 @@
+diff -u a/configure.in b/configure.in
+--- a/configure.in	2015-10-10 20:23:14.257728818 +0200
++++ b/configure.in	2015-10-10 20:23:44.512728478 +0200
+@@ -532,10 +532,10 @@
+  AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+ fi
+ hardbook_ok=no
+-xsltproc_ok=no
++xsltproc_ok=yes
+ if test "x$with_hardbooks" = "xno"; then
+   AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+-  AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno")
++  AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
+   AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
+   AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
+ else
+@@ -549,9 +549,6 @@
+       hardbook_ok=yes
+     fi
+   fi
+-  if test "x$xsltproc" != "xno" ; then
+-    xsltproc_ok=yes
+-  fi
+ fi
+ 
+ 
diff --git a/graphics/dia/dia.SlackBuild b/graphics/dia/dia.SlackBuild
index 0ac1d62b6b..a3dd7b330c 100644
--- a/graphics/dia/dia.SlackBuild
+++ b/graphics/dia/dia.SlackBuild
@@ -1,13 +1,23 @@
 #!/bin/sh
 
 # Slackware build script for dia
-# Written by Matt Hayes (dominian@slackadelic.com
-# Updated for 64bit by Ash Wiren (ash@spooksoftware.com  19-08-2009
-# Currently mantained by Dugan Chen (thedoogster@gmail.com)))
+
+# Originally written by Matt Hayes <dominian at slackadelic dot com>
+# Updated for 64bit by Ash Wiren <ash at spooksoftware dot com> (19.08.2009)
+# Maintained by Dugan Chen <thedoogster at gmail dot com> (<= 18.09.2015)
+#
+# Updated and currently maintained by Philip Lacroix <slackph at posteo dot de>
+#
+# 19.09.2015:
+# - reviewed and updated for dia 0.97.3.
+# 10.10.2015:
+# - enabled HTML documentation (based on patch by Mike Gorse, SUSE);
+# - enabled python and cairo plug-ins, SWIG;
+# - disabled gnome code (deprecated).
 
 PRGNAM=dia
-VERSION=0.97.2
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.97.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,19 +54,18 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix the location of the French manpages.
-sed -i 's/$(datadir)\/man/@mandir@/' doc/fr/Makefile.in
+# Enable HTML documentation, necessary for online help functionality.
+patch configure.in < $CWD/dia-enable-html-docs.patch
 
-# apply patches from upstream
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
 autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
@@ -66,22 +75,32 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-swig \
+  --with-cairo \
+  --with-python \
+  --disable-gnome \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PRGMAN=$PKG/usr/man
+PRGSHR=$PKG/usr/share
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Move French man page to correct location; compress both.
+mv $PRGSHR/man/fr $PRGMAN/
+gzip -9 $PRGMAN/{,fr/}man1/$PRGNAM.1
+rmdir $PRGSHR/man
 
-# docdir already exists :-)
-cp -a \
-  AUTHORS COPYING ChangeLog ChangeLog.pre-git KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Install documentation.
+cp -a AUTHORS COPYING ChangeLog* KNOWN_BUGS MAINTAINERS NEWS README \
+     \RELEASE-PROCESS THANKS TODO $PRGDOC/
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/dia/dia.info b/graphics/dia/dia.info
index 1a98d8887e..43eb72c30a 100644
--- a/graphics/dia/dia.info
+++ b/graphics/dia/dia.info
@@ -1,10 +1,10 @@
 PRGNAM="dia"
-VERSION="0.97.2"
-HOMEPAGE="http://live.gnome.org/Dia"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.2.tar.xz"
-MD5SUM="1e1180a513fb567709b09bc19f12105e"
+VERSION="0.97.3"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dia/"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.3.tar.xz"
+MD5SUM="0e744a0f6a6c4cb6a089e4d955392c3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster@gmail.com"
+MAINTAINER="Philip Lacroix"
+EMAIL="slackph at posteo dot de"
diff --git a/graphics/dia/patches/0001-Bug-668587-Double-free-for-some-SVG-rendering.patch b/graphics/dia/patches/0001-Bug-668587-Double-free-for-some-SVG-rendering.patch
deleted file mode 100644
index 2354be3ed1..0000000000
--- a/graphics/dia/patches/0001-Bug-668587-Double-free-for-some-SVG-rendering.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From aa94ba030885f3105e6452929d04917a2ef94393 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sun, 8 Apr 2012 14:42:41 +0200
-Subject: [PATCH 01/24] Bug 668587 - Double free() for some SVG rendering
-
-The fix for bug 665648 introduced a memory corruption.
-Now the #if-0'ed code as well as the #else branch respect
-DiaSvgRender::get_fill_style() having a const return.
-(cherry picked from commit 47bb76af3ba20b5e83be79a874df02c405934899)
----
- lib/diasvgrenderer.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
-index 4dc0695..14aefc4 100644
---- a/lib/diasvgrenderer.c
-+++ b/lib/diasvgrenderer.c
-@@ -677,13 +677,15 @@ draw_text_line(DiaRenderer *self, TextLine *text_line,
-  
-   saved_width = renderer->linewidth;
-   renderer->linewidth = 0.001;
--  style = (char*)get_fill_style(renderer, colour);
-   /* return value must not be freed */
-   renderer->linewidth = saved_width;
- #if 0 /* would need a unit: https://bugzilla.mozilla.org/show_bug.cgi?id=707071#c4 */
--  tmp = g_strdup_printf("%s; font-size: %s", style,
-+  style = g_strdup_printf("%s; font-size: %s", get_fill_style(renderer, colour),
- 			dia_svg_dtostr(d_buf, text_line_get_height(text_line)));
--  style = tmp;
-+#else
-+  /* get_fill_style: the return value of this function must not be saved 
-+   * anywhere. And of course it must not be free'd */
-+  style = g_strdup (get_fill_style(renderer, colour));
- #endif
-   /* This is going to break for non-LTR texts, as SVG thinks 'start' is
-    * 'right' for those. */
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0002-Bug-665335-Only-include-glib.h-the-other-headers-are.patch b/graphics/dia/patches/0002-Bug-665335-Only-include-glib.h-the-other-headers-are.patch
deleted file mode 100644
index 8d0f217374..0000000000
--- a/graphics/dia/patches/0002-Bug-665335-Only-include-glib.h-the-other-headers-are.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ae61326cf5e7aaba6e72af757a5cd33efe8280a1 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Thu, 1 Dec 2011 22:08:12 +0100
-Subject: [PATCH 02/24] Bug 665335: Only #include <glib.h>: the other headers
- are implicit
-
----
- objects/custom/shape_typeinfo.c | 2 +-
- plug-ins/pgf/render_pgf.c       | 2 +-
- tests/test-boundingbox.c        | 3 ---
- tests/test-objects.c            | 4 ----
- 4 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c
-index c6133b1..3fb3d73 100644
---- a/objects/custom/shape_typeinfo.c
-+++ b/objects/custom/shape_typeinfo.c
-@@ -27,7 +27,7 @@
- #include "custom_util.h"
- #include <string.h>
- #include <stdarg.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- #include <libxml/parser.h>
- 
-diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
-index 3fe5bbd..24b812e 100644
---- a/plug-ins/pgf/render_pgf.c
-+++ b/plug-ins/pgf/render_pgf.c
-@@ -61,7 +61,7 @@ TODO:
- #endif
- #include <errno.h>
- 
--#include <glib/gprintf.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- 
- #include "intl.h"
-diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c
-index 7adaab5..a13d018 100644
---- a/tests/test-boundingbox.c
-+++ b/tests/test-boundingbox.c
-@@ -28,9 +28,6 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#if GLIB_CHECK_VERSION(2,16,0)
--#include <glib/gtestutils.h>
--#endif
- #include "dialib.h"
- 
- /*
-diff --git a/tests/test-objects.c b/tests/test-objects.c
-index 57d5675..c5980a5 100644
---- a/tests/test-objects.c
-+++ b/tests/test-objects.c
-@@ -28,10 +28,6 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#if GLIB_CHECK_VERSION(2,16,0)
--#include <glib/gtestutils.h>
--#endif
--
- #include "object.h"
- #include "plug-ins.h"
- #include "dialib.h"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0003-Bug-585004-implicit-declaration-of-function-finite-2.patch b/graphics/dia/patches/0003-Bug-585004-implicit-declaration-of-function-finite-2.patch
deleted file mode 100644
index 0c91b1391e..0000000000
--- a/graphics/dia/patches/0003-Bug-585004-implicit-declaration-of-function-finite-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3a589dedfbf2b0ada111a3e2cb6b14837f2c8b5e Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sat, 6 Jun 2009 20:01:38 +0200
-Subject: [PATCH 03/24] Bug #585004 - implicit declaration of function 'finite'
- (2nd iteration)
-
-To get the definition either _BSD_SOURCE or _SVID_SOURCE needs to
-be defined before inclusion of <math.h>.
-Removed HAVE_CONFIG_H and chanegd inclusion order
-(cherry picked from commit 8f363f6dd82f9fbf502fceaf1d73a258c17593db)
----
- objects/standard/arc.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/objects/standard/arc.c b/objects/standard/arc.c
-index 28302a6..3a50838 100644
---- a/objects/standard/arc.c
-+++ b/objects/standard/arc.c
-@@ -16,13 +16,11 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#ifdef HAVE_CONFIG_H
- #include <config.h>
--#endif
- 
--#include <assert.h>
- #define _BSD_SOURCE 1 /* to get finite */
- #include <math.h>
-+#include <assert.h>
- 
- #include "intl.h"
- #include "object.h"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0004-Updated-Polish-translation.patch b/graphics/dia/patches/0004-Updated-Polish-translation.patch
deleted file mode 100644
index d7cf668d5c..0000000000
--- a/graphics/dia/patches/0004-Updated-Polish-translation.patch
+++ /dev/null
@@ -1,15925 +0,0 @@
-From 86c616a8970c90594e0120caae791c9dd833ac50 Mon Sep 17 00:00:00 2001
-From: Maciej Jaros <egil@wp.pl>
-Date: Fri, 18 May 2012 16:26:31 +0200
-Subject: [PATCH 04/24] Updated Polish translation
-
----
- po/pl.po | 11051 +++++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 5943 insertions(+), 5108 deletions(-)
-
-diff --git a/po/pl.po b/po/pl.po
-index 83f9a6c..2719a15 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -1,165 +1,208 @@
--# Copyright (C) 2001-2002 Free Software Foundation, Inc.
- # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--# Aktualną wersję tego pliku możesz odnaleźć w repozytorium cvs.gnome.pl
--# (:pserver:anonymous@cvs.gnome.pl:/gnomepl, puste hasło)
-+# Aviary.pl
- # Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
--# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas na adres:
--# translators@gnome.pl
-+# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-+# gnomepl@aviary.pl
- # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-+# Maciej Jaros <egil@wp.pl>, 2009.
- msgid ""
- msgstr ""
- "Project-Id-Version: dia\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-01-28 12:03+0100\n"
--"PO-Revision-Date: 2005-06-02 19:54-0700\n"
--"Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
--"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
-+"POT-Creation-Date: 2012-05-18 16:25+0200\n"
-+"PO-Revision-Date: 2012-05-18 16:17+0200\n"
-+"Last-Translator: Maciej Jaros <egil@wp.pl>\n"
-+"Language-Team: Polish <gnomepl@aviary.pl>\n"
-+"Language: pl\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%10>=2 && n%10<=4 && (n%100<10 "
-+"|| n%100>=20) ? 1 : 2);\n"
-+"X-Poedit-Language: Polish\n"
-+"X-Poedit-Country: Poland\n"
- 
- #. This is not an errror
--#: ../app/app_procs.c:260
-+#: ../app/app_procs.c:208
- #, c-format
- msgid "Warning: invalid layer range %lu - %lu\n"
- msgstr ""
- 
--#: ../app/app_procs.c:272
-+#: ../app/app_procs.c:220
- #, c-format
- msgid "Warning: Layer %lu (%s) selected more than once.\n"
- msgstr ""
- 
--#: ../app/app_procs.c:298
-+#: ../app/app_procs.c:246
- #, c-format
- msgid "Warning: Layer %d (%s) selected more than once.\n"
- msgstr ""
- 
--#: ../app/app_procs.c:307
-+#: ../app/app_procs.c:255
- #, c-format
--msgid "Warning: There is no layer named %s\n"
-+msgid "Warning: There is no layer named %s.\n"
- msgstr ""
- 
--#: ../app/app_procs.c:389
-+#: ../app/app_procs.c:337
- #, c-format
- msgid "%s error: don't know how to export into %s\n"
--msgstr "Błąd %s: nie wiadomo w jak wyeksportować do %s\n"
-+msgstr "Błąd %s: nie wiadomo jak wyeksportować do %s\n"
- 
--#: ../app/app_procs.c:398
--#, c-format
--msgid "%s error: input and output file name is identical: %s"
-+#: ../app/app_procs.c:346
-+#, fuzzy, c-format
-+msgid "%s error: input and output filenames are identical: %s"
- msgstr "Błąd %s: nazwa pliku wejściowego i wynikowego są identyczne: %s"
- 
--#: ../app/app_procs.c:406
-+#: ../app/app_procs.c:354
- #, c-format
- msgid "%s error: need valid input file %s\n"
- msgstr "Błąd %s: wymagany poprawny plik wejściowy %s\n"
- 
- #. if (!quiet)
--#: ../app/app_procs.c:431
-+#: ../app/app_procs.c:382
- #, c-format
- msgid "%s --> %s\n"
- msgstr "%s --> %s\n"
- 
--#: ../app/app_procs.c:577
--#, fuzzy, c-format
-+#: ../app/app_procs.c:553
-+#, c-format
- msgid "Can't find output format/filter %s\n"
--msgstr "Nie można znaleźć formatu wyjściowego %s\n"
-+msgstr "Nie można znaleźć formatu/filtra wyjściowego %s\n"
-+
-+#: ../app/app_procs.c:623
-+#, c-format
-+msgid "Input directory '%s' must exist!\n"
-+msgstr ""
-+
-+#: ../app/app_procs.c:640
-+#, c-format
-+msgid "Output directory '%s' must exist!\n"
-+msgstr ""
- 
- #. Translators:  The argument is a list of options, not to be translated
--#: ../app/app_procs.c:669
-+#: ../app/app_procs.c:690
- #, c-format
- msgid "Select the filter/format out of: %s"
--msgstr ""
-+msgstr "Wybierz filtr/format z listy: %s"
- 
- #. &export_file_name
--#: ../app/app_procs.c:688 ../app/app_procs.c:715
-+#: ../app/app_procs.c:708
- msgid "Export loaded file and exit"
--msgstr "Eksportuje wczytany plik i kończy"
-+msgstr "Wyeksportuj wczytany plik i zakończy"
- 
--#: ../app/app_procs.c:688 ../app/app_procs.c:715 ../app/diaconv.c:94
-+#: ../app/app_procs.c:708
- msgid "OUTPUT"
- msgstr "WYJÅšCIE"
- 
- #. &export_file_format
- #. &export_format_string
--#. &export_file_format
--#: ../app/app_procs.c:690 ../app/app_procs.c:717
-+#: ../app/app_procs.c:710
- msgid "TYPE"
--msgstr ""
-+msgstr "TYP"
- 
--#: ../app/app_procs.c:692 ../app/app_procs.c:720
-+#: ../app/app_procs.c:712
- #, fuzzy
- msgid "Export graphics size"
--msgstr "Format pliku do wyeksportowania"
-+msgstr "Rozmiar eksportowanego pliku"
- 
--#: ../app/app_procs.c:692 ../app/app_procs.c:720
-+#: ../app/app_procs.c:712
- msgid "WxH"
- msgstr ""
- 
--#. 13.3.2004 sampo@iki.fi
--#: ../app/app_procs.c:694 ../app/app_procs.c:722
-+#: ../app/app_procs.c:714
- msgid ""
- "Show only specified layers (e.g. when exporting). Can be either the layer "
- "name or a range of layer numbers (X-Y)"
- msgstr ""
- 
--#: ../app/app_procs.c:695 ../app/app_procs.c:723
-+#: ../app/app_procs.c:715
- msgid "LAYER,LAYER,..."
- msgstr ""
- 
--#: ../app/app_procs.c:697 ../app/app_procs.c:725
-+#: ../app/app_procs.c:717
- msgid "Don't show the splash screen"
- msgstr "Bez ekranu powitalnego"
- 
--#: ../app/app_procs.c:699 ../app/app_procs.c:727
--msgid "Don't create empty diagram"
-+#: ../app/app_procs.c:719
-+msgid "Don't create an empty diagram"
-+msgstr ""
-+
-+#: ../app/app_procs.c:721
-+msgid "Start integrated user interface (diagrams in tabs)"
- msgstr ""
- 
--#: ../app/app_procs.c:701 ../app/app_procs.c:729
-+#: ../app/app_procs.c:723
- msgid "Send error messages to stderr instead of showing dialogs."
- msgstr ""
- "Przesyła komunikaty o błędach na wyjście standardowe zamiast wyświetla okien."
- 
--#: ../app/app_procs.c:703 ../app/app_procs.c:731
-+#: ../app/app_procs.c:725
-+msgid "Directory containing input files"
-+msgstr ""
-+
-+#: ../app/app_procs.c:725 ../app/app_procs.c:727
-+msgid "DIRECTORY"
-+msgstr "KATALOG"
-+
-+#: ../app/app_procs.c:727
-+msgid "Directory containing output files"
-+msgstr ""
-+
-+#: ../app/app_procs.c:729
- msgid "Display credits list and exit"
- msgstr "Wypisuje listę zasług i kończy działanie"
- 
--#: ../app/app_procs.c:705 ../app/app_procs.c:733
-+#: ../app/app_procs.c:731
- msgid "Generate verbose output"
- msgstr ""
- 
--#: ../app/app_procs.c:707 ../app/app_procs.c:735
-+#: ../app/app_procs.c:733
- msgid "Display version and exit"
- msgstr "Wypisuje numer wersji i kończy działanie"
- 
--#: ../app/app_procs.c:736 ../app/diaconv.c:95
--msgid "Show this help message"
--msgstr "Wypisuje ten komunikat pomocy"
-+#: ../app/app_procs.c:760
-+msgid "[FILE...]"
-+msgstr "[PLIK...]"
-+
-+#: ../app/app_procs.c:774
-+#, fuzzy, c-format
-+msgid "Invalid option?"
-+msgstr "Operacja ręczna"
-+
-+#: ../app/app_procs.c:797
-+#, fuzzy, c-format
-+msgid "Filename conversion failed: %s\n"
-+msgstr "Dia wersja %s, skompilowane %s %s\n"
-+
-+#: ../app/app_procs.c:810
-+#, c-format
-+msgid "Missing input: %s\n"
-+msgstr ""
- 
--#: ../app/app_procs.c:796
-+#: ../app/app_procs.c:835
- msgid "Can't connect to session manager!\n"
- msgstr "Nie można nawiązać połączenia z menedżerem sesji!\n"
- 
- #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
--#: ../app/app_procs.c:836
-+#: ../app/app_procs.c:877
- #, c-format
- msgid "Dia version %s, compiled %s %s\n"
--msgstr "Dia wersja %s, skompilowana %s %s\n"
-+msgstr "Dia wersja %s, skompilowane %s %s\n"
- 
--#: ../app/app_procs.c:838
-+#: ../app/app_procs.c:879
- #, c-format
- msgid "Dia version %s\n"
- msgstr "Dia wersja %s\n"
- 
--#: ../app/app_procs.c:895 ../app/diaconv.c:201 ../app/diaconv.c:203
--#, fuzzy, c-format
-+#: ../app/app_procs.c:921
-+#, fuzzy
- msgid ""
- "Couldn't find standard objects when looking for object-libs; exiting...\n"
- msgstr ""
- "Nie można odnaleźć standardowych obiektów w bibliotekach obiektów, "
- "zakończenie...\n"
- 
--#: ../app/app_procs.c:897
-+#: ../app/app_procs.c:923
- #, fuzzy, c-format
- msgid ""
- "Couldn't find standard objects when looking for object-libs in '%s'; "
-@@ -168,145 +211,125 @@ msgstr ""
- "Nie można odnaleźć standardowych obiektów w bibliotekach obiektów, "
- "zakończenie...\n"
- 
--#: ../app/app_procs.c:938
--#, fuzzy
-+#: ../app/app_procs.c:987
- msgid "Diagram1.dia"
--msgstr "Diagram%d.dia"
-+msgstr "Diagram1.dia"
- 
--#: ../app/app_procs.c:978
-+#: ../app/app_procs.c:1022
-+#, fuzzy
- msgid ""
- "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
--"describing how you can cause this message to appear.\n"
-+"describing how you caused this message to appear.\n"
- msgstr ""
- "To nie powinno się wydarzyć. Prześlij raport o błędzie na do\n"
- "bugzilla.gnome.org, opisując co spowodowało pojawienie się tego\n"
- "komunikatu. (w języku angielskim)\n"
- 
-+#: ../app/app_procs.c:1037
-+msgid "Exiting Dia"
-+msgstr "Kończenie działania programu Dia"
-+
- #. no standard buttons
--#: ../app/app_procs.c:991
-+#: ../app/app_procs.c:1101
- msgid "Quitting without saving modified diagrams"
--msgstr ""
-+msgstr "Zamykasz program bez zapisania zmodyfikowanych diagramów"
- 
--#: ../app/app_procs.c:993
--#, fuzzy
-+#: ../app/app_procs.c:1103
- msgid ""
- "Modified diagrams exist. Are you sure you want to quit Dia without saving "
- "them?"
- msgstr ""
--"IstniejÄ… zmodyfikowane diagramy.\n"
--"Czy na pewno chcesz zakończyć pracę z programem\n"
--"nie zapisujÄ…c ich?"
-+"IstniejÄ… zmodyfikowane, niezapisane diagramy.\n"
-+"Czy na pewno chcesz zakończyć bez zapisania zmian?"
- 
--#: ../app/app_procs.c:997
-+#: ../app/app_procs.c:1107
- msgid "Quit Dia"
- msgstr "Zakończ pracę z Dia"
- 
--#. This printf seems to prevent a race condition with unrefs.
--#. Yuck.  -Lars
--#: ../app/app_procs.c:1050
--msgid "Thank you for using Dia.\n"
--msgstr "Dziękujemy za korzystanie z Dia.\n"
--
--#: ../app/app_procs.c:1067 ../app/app_procs.c:1074
--msgid "Could not create per-user Dia config directory"
-+#: ../app/app_procs.c:1180 ../app/app_procs.c:1187
-+#, fuzzy
-+msgid "Could not create per-user Dia configuration directory"
- msgstr "Nie można utworzyć katalogu użytkownika z konfiguracją Dia"
- 
--#: ../app/app_procs.c:1077
-+#: ../app/app_procs.c:1190
-+#, fuzzy
- msgid ""
--"Could not create per-user Dia config directory. Please make sure that the "
--"environment variable HOME points to an existing directory."
-+"Could not create per-user Dia configuration directory. Please make sure that "
-+"the environment variable HOME points to an existing directory."
- msgstr ""
- "Nie można utworzyć katalogu konfiguracyjnego Dia dla użytkownika. Upewnij "
- "się czy zmienna środowiskowa HOME wskazuje na istniejący katalog."
- 
--#: ../app/app_procs.c:1100 ../app/diaconv.c:251
--msgid "Objects and filters internal to dia"
--msgstr "Wewnętrzne obiekty i filtry Dia"
--
--#: ../app/app_procs.c:1142 ../app/diaconv.c:121
--msgid "[OPTION...] [FILE...]"
--msgstr "[OPCJA...] [PLIK...]"
--
--#: ../app/app_procs.c:1145 ../app/diaconv.c:128
--#, c-format
--msgid ""
--"Error on option %s: %s.\n"
--"Run '%s --help' to see a full list of available command line options.\n"
--msgstr ""
--"BÅ‚Ä…d przy opcji %s: %s.\n"
--"Uruchom \"%s --help\", aby wypisać pełną listę dostępnych opcji.\n"
--
--#: ../app/app_procs.c:1169
-+#: ../app/app_procs.c:1213
- #, fuzzy
--msgid "[FILE...]"
--msgstr "[OPCJA...] [PLIK...]"
-+msgid "Objects and filters internal to Dia"
-+msgstr "Wewnętrzne obiekty i filtry Dia"
- 
--#: ../app/app_procs.c:1192
-+#: ../app/app_procs.c:1266
- #, c-format
--msgid "'%s' not found!\n"
--msgstr ""
--
--#: ../app/app_procs.c:1273
- msgid ""
- "The original author of Dia was:\n"
- "\n"
- msgstr ""
- 
--#: ../app/app_procs.c:1278
-+#: ../app/app_procs.c:1271
-+#, c-format
- msgid ""
- "\n"
- "The current maintainers of Dia are:\n"
- "\n"
- msgstr ""
- 
--#: ../app/app_procs.c:1283
-+#: ../app/app_procs.c:1276
-+#, c-format
- msgid ""
- "\n"
- "Other authors are:\n"
- "\n"
- msgstr ""
- 
--#: ../app/app_procs.c:1288
-+#: ../app/app_procs.c:1281
-+#, c-format
- msgid ""
- "\n"
- "Dia is documented by:\n"
- "\n"
- msgstr ""
- 
--#: ../app/autosave.c:91
--msgid "Recovering autosaved diagrams"
--msgstr "Odzyskiwanie automatycznie zapisanych diagramów"
--
--#: ../app/autosave.c:99
--msgid ""
--"Autosaved files exist.\n"
--"Please select those you wish to recover."
--msgstr ""
--"Pliki automatycznego zapisu nie istniejÄ….\n"
--"Wybierz te z nich, które mają być odzyskane."
--
--#: ../app/color_area.c:317 ../app/color_area.c:364
-+#: ../app/color_area.c:326 ../app/color_area.c:373
- msgid "Select foreground color"
- msgstr "Wybierz kolor pierwszoplanowy"
- 
--#: ../app/color_area.c:318 ../app/color_area.c:365
-+#: ../app/color_area.c:327 ../app/color_area.c:374
- msgid "Select background color"
- msgstr "Wybierz kolor tła"
- 
--#: ../app/commands.c:134
-+#: ../app/commands.c:130
-+msgid "No print plugin found!"
-+msgstr ""
-+
-+#: ../app/commands.c:149
- #, c-format
- msgid "Diagram%d.dia"
- msgstr "Diagram%d.dia"
- 
--#: ../app/commands.c:207
-+#: ../app/commands.c:248
-+msgid "No image from Clipboard to paste."
-+msgstr ""
-+
-+#: ../app/commands.c:298
-+msgid "No selected object can take an image."
-+msgstr ""
-+
-+#: ../app/commands.c:543
- msgid "No existing object to paste.\n"
- msgstr "Brak obiektu do wklejenia.\n"
- 
--#: ../app/commands.c:538 ../app/commands.c:576
-+#: ../app/commands.c:853 ../app/commands.c:891
- msgid "Could not find help directory"
- msgstr "Nie można odnaleźć katalogu pomocy"
- 
--#: ../app/commands.c:545
-+#: ../app/commands.c:860
- #, c-format
- msgid ""
- "Could not open help directory:\n"
-@@ -315,11 +338,13 @@ msgstr ""
- "Nie otworzyć katalogu z plikami pomocy:\n"
- "%s"
- 
--#: ../app/commands.c:612
-+#: ../app/commands.c:929
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
--msgstr "GNOME PL Team <translators@gnome.pl>"
-+msgstr ""
-+"GNOME PL Team <translators@gnome.pl>, 2000, 2001, 2002, 2003, 2004\n"
-+"Maciej Jaros <egil@wp.pl>, 2009"
- 
--#: ../app/commands.c:614
-+#: ../app/commands.c:931
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -335,17 +360,66 @@ msgid ""
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- msgstr ""
-+"Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n"
-+"i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n"
-+"przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według\n"
-+"wersji drugiej tej Licencji lub którejś z późniejszych wersji.\n"
-+"\n"
-+"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n"
-+"- jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
-+"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu\n"
-+"uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją\n"
-+"PublicznÄ… GNU.\n"
-+"\n"
-+"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
-+"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli\n"
-+"nie - proszę napisać do Free Software Foundation, Inc., 59 Temple Place -\n"
-+"Suite 330, Boston, MA 02111-1307, USA.\n"
- 
--#: ../app/commands.c:637
-+#: ../app/commands.c:958
- #, fuzzy
- msgid "A program for drawing structured diagrams."
- msgstr "Obiekty diagramu struktury funkcji"
- 
--#: ../app/defaults.c:43 ../app/defaults.c:146
-+#: ../app/confirm.c:65
-+#, c-format
-+msgid "You are about to print a diagram with %d pages."
-+msgstr ""
-+
-+#: ../app/confirm.c:67
-+#, c-format
-+msgid "You are about to export a diagram with %d pages."
-+msgstr ""
-+
-+#: ../app/confirm.c:69
-+#, c-format
-+msgid ""
-+"You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgstr ""
-+
-+#: ../app/confirm.c:77
-+msgid ""
-+"You can adjust the size of the diagram by changing the 'Scaling' in the "
-+"'Page Setup' dialog.\n"
-+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-+"the intended bounds."
-+msgstr ""
-+
-+#: ../app/confirm.c:81
-+#, fuzzy
-+msgid "Confirm Diagram Size"
-+msgstr "Diagram Dia"
-+
-+#: ../app/create_object.c:73
-+#, c-format
-+msgid "'%s' creation failed"
-+msgstr "Utworzenie \"%s\" nie powiodło się"
-+
-+#: ../app/defaults.c:44 ../app/defaults.c:147
- msgid "Object defaults"
- msgstr "Domyślne wartości obiektu"
- 
--#: ../app/defaults.c:61
-+#: ../app/defaults.c:62
- msgid "This object has no defaults."
- msgstr "Obiekt nie ma wartości domyślnych."
- 
-@@ -353,303 +427,212 @@ msgstr "Obiekt nie ma wartości domyślnych."
- msgid "Defaults: "
- msgstr "Wart. domyślne: "
- 
--#: ../app/dia-props.c:85
-+#: ../app/dia-props.c:86
- msgid "Diagram Properties"
- msgstr "Właściwości diagramu"
- 
--#: ../app/dia-props.c:119
-+#: ../app/dia-props.c:120
- msgid "Dynamic grid"
- msgstr "Dynamiczna siatka"
- 
--#: ../app/dia-props.c:127
-+#: ../app/dia-props.c:128
- msgid "x"
- msgstr "x"
- 
--#: ../app/dia-props.c:131
-+#: ../app/dia-props.c:132
- msgid "y"
- msgstr "y"
- 
--#: ../app/dia-props.c:136
-+#: ../app/dia-props.c:137
- msgid "Spacing"
- msgstr "Odstępy"
- 
--#: ../app/dia-props.c:156
-+#: ../app/dia-props.c:157
- msgid "Visible spacing"
- msgstr "Widzialne odstępy"
- 
- #. Hexes!
--#: ../app/dia-props.c:177 ../app/preferences.c:167
-+#: ../app/dia-props.c:178 ../app/preferences.c:243
- msgid "Hex grid"
--msgstr ""
-+msgstr "Siatka sześciokątna"
- 
--#: ../app/dia-props.c:185
--#, fuzzy
-+#: ../app/dia-props.c:186
- msgid "Hex grid size"
--msgstr "Format pliku do wyeksportowania"
-+msgstr "Wielkość sześciokąta"
- 
--#: ../app/dia-props.c:198
-+#: ../app/dia-props.c:199
- msgid "Grid"
- msgstr "Siatka"
- 
--#: ../app/dia-props.c:209 ../lib/diagramdata.c:113
-+#: ../app/dia-props.c:210 ../lib/diagramdata.c:117
- msgid "Background"
- msgstr "TÅ‚o"
- 
--#: ../app/dia-props.c:220 ../app/preferences.c:109
-+#: ../app/dia-props.c:221 ../app/preferences.c:122
- msgid "Grid Lines"
- msgstr "Linie siatki"
- 
--#: ../app/dia-props.c:231
-+#: ../app/dia-props.c:232
- msgid "Page Breaks"
- msgstr "Separatory stron"
- 
--#: ../app/dia-props.c:242
-+#: ../app/dia-props.c:243
- msgid "Colors"
- msgstr "Kolory"
- 
- #. Can we be sure that the filename is the 'proper title'?
--#: ../app/dia-props.c:263
-+#: ../app/dia-props.c:264
- #, c-format
- msgid "Diagram Properties: %s"
- msgstr "Właściwości diagramu: %s"
- 
--#: ../app/dia_embedd.c:352
--msgid "Could not initialize Bonobo!"
--msgstr "Nie można zainicjować Bonobo!"
--
--#: ../app/diacanvas.c:121
--#, fuzzy
--msgid "X position"
--msgstr "Pozycjonowanie"
--
--#: ../app/diacanvas.c:122
--msgid "X position of child widget"
--msgstr ""
--
--#: ../app/diacanvas.c:131
--#, fuzzy
--msgid "Y position"
--msgstr "Pozycjonowanie"
--
--#: ../app/diacanvas.c:132
--msgid "Y position of child widget"
--msgstr ""
--
--#. &export_file_format
--#: ../app/diaconv.c:92
--msgid "Export format to use"
--msgstr "Format pliku do wyeksportowania"
--
--#: ../app/diaconv.c:92
--msgid "eps,png,wmf,cgm,dxf,fig"
--msgstr "eps,png,wmf,cgm,dxf,fig"
--
--#. &export_file_name
--#: ../app/diaconv.c:94
--msgid "Export file name to use"
--msgstr "Nazwa pliku do wyeksportowania"
--
--#: ../app/diaconv.c:96
--msgid "Quiet operation"
--msgstr "Ukryta operacja"
--
--#: ../app/diaconv.c:149
--#, c-format
--msgid ""
--"Error: No arguments found.\n"
--"Run '%s --help' to see a full list of available command line options.\n"
--msgstr ""
--"Błąd: Nie znaleziono argumentów.\n"
--"Uruchom \"%s --help\", aby wypisać pełną listę dostępnych opcji.\n"
-+#: ../app/diagram.c:234
-+#, fuzzy, c-format
-+msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
-+msgstr "Nie można otworzyć \"%s\": %s"
- 
--#: ../app/diaconv.c:159
--#, c-format
--msgid "%s error: can specify only one of -t or -o."
--msgstr "Błąd %s: można wybrać tylko jedną z opcji -r lub -o."
-+#: ../app/diagram.c:237 ../lib/message.c:91 ../lib/message.c:297
-+msgid "Error"
-+msgstr "BÅ‚Ä…d"
- 
--#: ../app/diaconv.c:165
--#, c-format
--msgid ""
--"%s error: must specify only one of -t or -o.\n"
--"Run '%s --help' to see a full list of available command line options.\n"
-+#: ../app/diagram.c:1209
-+msgid "Trying to group with no selected objects."
- msgstr ""
--"Błąd %s: należy podać tylko jedną z opcji -t lub -o.\n"
--"Uruchom \"%s --help\", aby wypisać pełną listę dostępnych opcji.\n"
--
--#: ../app/diaconv.c:174
--#, c-format
--msgid "%s error: no input file."
--msgstr "Błąd %s: brak pliku wejściowego."
--
--#: ../app/diaconv.c:227
--#, c-format
--msgid "%s error: only one input file expected."
--msgstr "Błąd %s: spodziewano się tylko jednego pliku wejściowego."
--
--#: ../app/diaconv.c:240
--#, c-format
--msgid "%s error: popt library not available on this system"
--msgstr "Błąd %s: biblioteka popt nie jest dostępna w tym systemie"
--
--#: ../app/diagram_tree_menu.c:46
--msgid "/_Sort objects"
--msgstr "/_UporzÄ…dkuj obiekty"
--
--#: ../app/diagram_tree_menu.c:47
--msgid "/Sort objects/by _name"
--msgstr "/Uporządkuj obiekty/według _nazwy"
--
--#: ../app/diagram_tree_menu.c:49
--msgid "/Sort objects/by _type"
--msgstr "/Uporządkuj obiekty/według _typu"
--
--#: ../app/diagram_tree_menu.c:51
--msgid "/Sort objects/as _inserted"
--msgstr "/UporzÄ…dkuj obiekty/jako _wstawione"
--
--#: ../app/diagram_tree_menu.c:54
--msgid "/Sort objects/All by name"
--msgstr "/Uporządkuj obiekty/Wszystkie według nazwy"
--
--#: ../app/diagram_tree_menu.c:56
--msgid "/Sort objects/All by type"
--msgstr "/Uporządkuj obiekty/Wszystkie według typu"
--
--#: ../app/diagram_tree_menu.c:58
--msgid "/Sort objects/All as inserted"
--msgstr "/UporzÄ…dkuj obiekty/Wszystkie jako wstawione"
- 
--#: ../app/diagram_tree_menu.c:60
--msgid "/Sort objects/_Default"
--msgstr "/Uporządkuj obiekty/_Domyślnie"
-+#: ../app/diagram_tree_view.c:164
-+msgid "Diagram"
-+msgstr "Diagram"
- 
--#: ../app/diagram_tree_menu.c:61
--msgid "/Sort objects/Default/by _name"
--msgstr "/Uporządkuj obiekty/Domyślnie/według _nazwy"
-+#: ../app/diagram_tree_view.c:171
-+#: ../plug-ins/drs/dia-render-script-import.c:233
-+msgid "Layer"
-+msgstr "Warstwa"
- 
--#: ../app/diagram_tree_menu.c:63
--msgid "/Sort objects/Default/by _type"
--msgstr "/Uporządkuj obiekty/Domyślnie/według _typu"
--
--#: ../app/diagram_tree_menu.c:65
--msgid "/Sort objects/Default/as _inserted"
--msgstr "/Uporządkuj obiekty/Domyślnie/jako _wstawione"
--
--#: ../app/diagram_tree_menu.c:67
--msgid "/Sort _diagrams"
--msgstr "/UporzÄ…dkuj _diagramy"
--
--#: ../app/diagram_tree_menu.c:68
--msgid "/Sort _diagrams/by _name"
--msgstr "/Uporządkuj _diagramy/według _nazwy"
-+#: ../app/diagram_tree_view.c:177
-+#, fuzzy, c-format
-+msgid "%d Layer"
-+msgid_plural "%d Layers"
-+msgstr[0] "Dodaj warstwÄ™"
-+msgstr[1] "Dodaj warstwÄ™"
-+msgstr[2] "Dodaj warstwÄ™"
-+
-+#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
-+#: ../objects/Database/table.c:141 ../objects/Istar/actor.c:146
-+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:244
-+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-+msgid "Type"
-+msgstr "Typ"
- 
--#: ../app/diagram_tree_menu.c:70
--msgid "/Sort _diagrams/as _inserted"
--msgstr "/UporzÄ…dkuj _diagramy/jako _wstawione"
-+#: ../app/diagram_tree_view.c:184
-+#, fuzzy
-+msgid "object|Position"
-+msgstr "Pozycjonowanie"
- 
--#: ../app/diagram_tree_menu.c:72
--msgid "/Sort diagrams/_Default"
--msgstr "/Uporządkuj diagramy/_Domyślnie"
-+#: ../app/diagram_tree_view.c:187
-+#, fuzzy
-+msgid "Children"
-+msgstr "Zdejmij dzieci z rodzica"
- 
--#: ../app/diagram_tree_menu.c:73
--msgid "/Sort diagrams/Default/by _name"
--msgstr "/Uporządkuj diagramy/Domyślnie/według _nazwy"
-+#: ../app/diagram_tree_view.c:191
-+#, fuzzy, c-format
-+msgid "%d Object"
-+msgid_plural "%d Objects"
-+msgstr[0] "Obiekt"
-+msgstr[1] "Obiekt"
-+msgstr[2] "Obiekt"
- 
--#: ../app/diagram_tree_menu.c:75
--msgid "/Sort diagrams/Default/as _inserted"
--msgstr "/Uporządkuj diagramy/Domyślnie/jako _wstawione"
-+#: ../app/diagram_tree_view.c:448
-+#, fuzzy
-+msgid "Select"
-+msgstr "_Zaznaczenie"
- 
--#: ../app/diagram_tree_menu.c:83 ../app/diagram_tree_menu.c:94
--msgid "/_Locate"
--msgstr "/_Zlokalizuj"
-+#. Translators: Menu item Verb/Support/Position/Locate
-+#. Translators: Menu item Verb/Signal/Sense/Locate
-+#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:813
-+#: ../objects/FS/function.c:1055
-+msgid "Locate"
-+msgstr "Lokowanie"
- 
--#: ../app/diagram_tree_menu.c:84
--msgid "/_Properties"
--msgstr "/_Właściwości"
-+#: ../app/diagram_tree_view.c:450
-+msgid "Properties"
-+msgstr "Właściwości"
- 
--#: ../app/diagram_tree_menu.c:85
--msgid "/_Hide this type"
--msgstr "/_Ukryj ten typ"
-+#. *** board of value **************
-+#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:123
-+#: ../app/plugin-manager.c:262 ../objects/Database/table.c:139
-+#: ../objects/Database/table.c:185 ../objects/SISSI/sissi_dialog.c:734
-+#: ../objects/UML/association.c:238 ../objects/UML/class.c:145
-+#: ../objects/UML/large_package.c:133 ../objects/UML/umlattribute.c:37
-+#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
-+#: ../objects/UML/umlparameter.c:43
-+msgid "Name"
-+msgstr "Nazwa"
- 
--#: ../app/diagram_tree_window.c:80 ../app/preferences.c:110
-+#: ../app/diagram_tree_view.c:565
- msgid "Diagram Tree"
- msgstr "Drzewo diagramu"
- 
--#: ../app/diagram.c:221
--#, fuzzy, c-format
--msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
--msgstr "Nie można otworzyć \"%s\": %s"
--
--#: ../app/diagram.c:224 ../lib/message.c:78 ../lib/message.c:238
--msgid "Error"
--msgstr "BÅ‚Ä…d"
--
--#: ../app/dialogs.c:51
--msgid "Ok"
--msgstr "Ok"
--
--#: ../app/dialogs.c:52 ../app/paginate_psprint.c:320
--msgid "Cancel"
--msgstr "Anuluj"
--
- #. paper size
--#: ../app/diapagelayout.c:116
-+#: ../app/diapagelayout.c:155
- msgid "Paper Size"
- msgstr "Rozmiar papieru"
- 
- #. orientation
--#: ../app/diapagelayout.c:149
-+#: ../app/diapagelayout.c:184
- msgid "Orientation"
- msgstr "Ułożenie"
- 
- #. margins
--#: ../app/diapagelayout.c:187
-+#: ../app/diapagelayout.c:213
- msgid "Margins"
- msgstr "Marginesy"
- 
--#: ../app/diapagelayout.c:199
-+#: ../app/diapagelayout.c:225
- msgid "Top:"
- msgstr "Góra:"
- 
--#: ../app/diapagelayout.c:212
-+#: ../app/diapagelayout.c:238
- msgid "Bottom:"
- msgstr "Dół:"
- 
--#: ../app/diapagelayout.c:225
-+#: ../app/diapagelayout.c:251
- msgid "Left:"
- msgstr "Lewy:"
- 
--#: ../app/diapagelayout.c:238
-+#: ../app/diapagelayout.c:264
- msgid "Right:"
- msgstr "Prawy:"
- 
- #. Scaling
--#: ../app/diapagelayout.c:252
-+#: ../app/diapagelayout.c:278
- msgid "Scaling"
- msgstr "Skalowanie"
- 
--#: ../app/diapagelayout.c:263
-+#: ../app/diapagelayout.c:289
- msgid "Scale:"
- msgstr "Skala:"
- 
--#: ../app/diapagelayout.c:275
-+#: ../app/diapagelayout.c:301
- msgid "Fit to:"
- msgstr "Dopasowanie do:"
- 
--#: ../app/diapagelayout.c:287
-+#: ../app/diapagelayout.c:313
- msgid "by"
- msgstr "na"
- 
--#: ../app/diapagelayout.c:698
-+#: ../app/diapagelayout.c:728
- #, c-format
- msgid "%0.3gcm x %0.3gcm"
- msgstr "%0.3gcm x %0.3gcm"
- 
--#: ../app/diapagelayout.c:802 ../app/pagesetup.c:76
-+#: ../app/diapagelayout.c:832 ../app/pagesetup.c:77
- msgid "Page Setup"
- msgstr "Ustawienia strony"
- 
--#: ../app/disp_callbacks.c:84 ../app/properties.c:152
-+#: ../app/disp_callbacks.c:92 ../app/properties-dialog.c:156
- msgid ""
- "This object doesn't support Undo/Redo.\n"
- "Undo information erased."
-@@ -657,11 +640,19 @@ msgstr ""
- "Obiekt nie obsługuje operacji Cofnij/Ponów.\n"
- "Usunięto informację o cofnięciu."
- 
--#: ../app/disp_callbacks.c:119
--msgid "Properties..."
-+#: ../app/disp_callbacks.c:127
-+msgid "Properties…"
- msgstr "Właściwości..."
- 
--#: ../app/disp_callbacks.c:921
-+#: ../app/disp_callbacks.c:166
-+msgid "Follow link…"
-+msgstr ""
-+
-+#: ../app/disp_callbacks.c:288
-+msgid "Selection"
-+msgstr "Zaznaczenie"
-+
-+#: ../app/disp_callbacks.c:1114
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -669,35 +660,37 @@ msgstr ""
- "Upuszczony obiekt nie pasuje do swojego obiektu nadrzędnego.\n"
- "Rozwiń obiekt nadrzędny lub upuść obiekt gdziekolwiek."
- 
--#: ../app/display.c:94
--msgid "Diagram modified!"
--msgstr "Diagram został zmodyfikowany!"
--
- #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
- #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
- #.
--#: ../app/display.c:121
-+#: ../app/display.c:109
- #, fuzzy, c-format
- msgid "Selection of %d object"
- msgid_plural "Selection of %d objects"
--msgstr[0] "Arkusze i obiekty"
--msgstr[1] "Arkusze i obiekty"
-+msgstr[0] "Zaznaczono %d obiekt"
-+msgstr[1] "Zaznaczono %d obiekty"
-+msgstr[2] "Zaznaczono %d obiektów"
- 
--#: ../app/display.c:131
-+#: ../app/display.c:119
- #, fuzzy, c-format
- msgid "Selected '%s'"
- msgstr "_Zaznaczenie"
- 
--#: ../app/display.c:1130
-+#. we really should not come here but instead disable the menu command earlier
-+#: ../app/display.c:1149
-+msgid "No antialiased renderer found"
-+msgstr ""
-+
-+#: ../app/display.c:1297
- msgid "<unnamed>"
- msgstr "<bez nazwy>"
- 
- #. no standard buttons
--#: ../app/display.c:1136
-+#: ../app/display.c:1303
- msgid "Closing diagram without saving"
--msgstr ""
-+msgstr "Zamykasz diagram bez uprzedniego zapisania"
- 
--#: ../app/display.c:1139
-+#: ../app/display.c:1305
- #, c-format
- msgid ""
- "The diagram '%s'\n"
-@@ -706,91 +699,77 @@ msgstr ""
- "Diagram \"%s\"\n"
- "nie został zapisany. Czy chcesz zapisać zmiany teraz?"
- 
--#: ../app/display.c:1141
-+#: ../app/display.c:1307
- msgid "Close Diagram"
- msgstr "Zamknij diagram"
- 
--#: ../app/display.c:1146
--#, fuzzy
-+#: ../app/display.c:1312
- msgid "_Discard Changes"
--msgstr "Porzuć zmiany"
--
--#: ../app/export_png.c:136 ../app/load_save.c:951 ../app/render_eps.c:103
--#: ../plug-ins/cairo/diacairo.c:976 ../plug-ins/cgm/cgm.c:1151
--#: ../plug-ins/dxf/dxf-export.c:484 ../plug-ins/hpgl/hpgl.c:708
--#: ../plug-ins/metapost/render_metapost.c:1145
--#: ../plug-ins/pgf/render_pgf.c:1143
--#: ../plug-ins/pstricks/render_pstricks.c:914
--#: ../plug-ins/shape/shape-export.c:134 ../plug-ins/svg/render_svg.c:150
--#: ../plug-ins/vdx/vdx-export.c:1848 ../plug-ins/wpg/wpg.c:1070
--#: ../plug-ins/xfig/xfig-export.c:1136 ../plug-ins/xslt/xslt.c:93
--#, c-format
--msgid "Can't open output file %s: %s\n"
--msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
-+msgstr "_Nie zapisuj"
- 
--#: ../app/export_png.c:144
--msgid "Could not create PNG write structure"
--msgstr "Nie można utworzyć struktury zapisu PNG"
-+#: ../app/exit_dialog.c:77
-+msgid "Do Not Exit"
-+msgstr "Nie zamykaj"
- 
--#: ../app/export_png.c:153
--msgid "Could not create PNG header info structure"
--msgstr "Nie można utworzyć struktury informacyjnej nagłówka PNG"
-+#: ../app/exit_dialog.c:79
-+msgid "Exit Without Save"
-+msgstr "Wyjdź bez zapisania"
- 
--#: ../app/export_png.c:161
--msgid "Error occurred while writing PNG"
--msgstr "Podczas zapisu pliku PNG wystąpił błąd"
-+#: ../app/exit_dialog.c:81
-+msgid "Save Selected"
-+msgstr "Zapisz zaznaczone"
- 
--#. Create a dialog
--#: ../app/export_png.c:301
--msgid "PNG Export Options"
--msgstr "Opcje eksportu pliku PNG"
-+#: ../app/exit_dialog.c:87
-+msgid "The following are not saved:"
-+msgstr "Następujące diagramy nie są zapisane:"
- 
--#. Translators: Menu item Verb/Channel/Export
--#. Translators: Menu item Verb/Channel/Export/Export
--#: ../app/export_png.c:302 ../objects/FS/function.c:696
--#: ../objects/FS/function.c:698
--msgid "Export"
--msgstr "Eksportowanie"
-+#: ../app/exit_dialog.c:113
-+msgid "Save"
-+msgstr "Zapisz"
- 
--#: ../app/export_png.c:307
--msgid "Image width:"
--msgstr "Szerokość obrazu:"
-+#: ../app/exit_dialog.c:129
-+msgid "Path"
-+msgstr "Ścieżka"
- 
--#: ../app/export_png.c:310
--msgid "Image height:"
--msgstr "Wysokość obrazu:"
-+#: ../app/exit_dialog.c:142
-+msgid "Select All"
-+msgstr "Zaznacz wszystko"
- 
--#: ../app/export_png.c:356
--msgid "Portable Network Graphics"
--msgstr "PNG (Portable Network Graphics)"
-+#: ../app/exit_dialog.c:150
-+msgid "Select None"
-+msgstr "Wyczyść zaznaczenie"
-+
-+#: ../app/exit_dialog.c:236
-+msgid "Nothing selected for saving.  Would you like to try again?"
-+msgstr "Nie zaznaczono niczego do zapisania. Czy chcesz spróbować jeszcze raz?"
- 
--#: ../app/filedlg.c:129 ../app/filedlg.c:512
-+#: ../app/filedlg.c:143 ../app/filedlg.c:151 ../app/filedlg.c:167
-+#: ../app/filedlg.c:813 ../lib/widgets.c:406
-+msgid "Supported Formats"
-+msgstr "Wspierane formaty"
-+
-+#: ../app/filedlg.c:196 ../app/filedlg.c:198 ../app/filedlg.c:661
-+#: ../app/filedlg.c:663
- msgid "By extension"
- msgstr "Według rozszerzenia"
- 
--#: ../app/filedlg.c:214
-+#: ../app/filedlg.c:292
- msgid "Open Diagram"
--msgstr "Odczyt diagramu"
-+msgstr "Otwórz diagram"
- 
--#: ../app/filedlg.c:243
-+#: ../app/filedlg.c:325
- msgid "Open Options"
- msgstr "Opcje odczytu"
- 
--#: ../app/filedlg.c:251 ../app/filedlg.c:632
-+#: ../app/filedlg.c:333 ../app/filedlg.c:795
- msgid "Determine file type:"
- msgstr "Określenie typu pliku:"
- 
--#: ../app/filedlg.c:267 ../app/filedlg.c:645
--#, fuzzy
-+#: ../app/filedlg.c:353 ../app/filedlg.c:808 ../lib/widgets.c:414
- msgid "All Files"
--msgstr "Plik"
-+msgstr "Wszystkie pliki"
- 
--#: ../app/filedlg.c:272 ../app/filedlg.c:650
--#, fuzzy
--msgid "Supported Formats"
--msgstr "Ukryte operacje"
--
--#: ../app/filedlg.c:307 ../app/paginate_psprint.c:406
-+#: ../app/filedlg.c:392 ../plug-ins/postscript/paginate_psprint.c:416
- #, fuzzy
- msgid ""
- "Some characters in the filename are neither UTF-8\n"
-@@ -801,11 +780,13 @@ msgstr ""
- "nie sÄ… w kodowaniu ustawionym jako lokalne.\n"
- "Niektóre rzeczy mogą nie działać."
- 
--#: ../app/filedlg.c:317 ../app/filedlg.c:559 ../app/paginate_psprint.c:421
-+#: ../app/filedlg.c:402 ../app/filedlg.c:715
-+#: ../plug-ins/postscript/paginate_psprint.c:430
- msgid "File already exists"
- msgstr "Plik już istnieje"
- 
--#: ../app/filedlg.c:319 ../app/filedlg.c:561 ../app/paginate_psprint.c:413
-+#: ../app/filedlg.c:404 ../app/filedlg.c:717
-+#: ../plug-ins/postscript/paginate_psprint.c:426
- #, c-format
- msgid ""
- "The file '%s' already exists.\n"
-@@ -814,17 +795,17 @@ msgstr ""
- "Plik \"%s\" już istnieje.\n"
- "Czy chcesz go nadpisać?"
- 
--#: ../app/filedlg.c:369
-+#: ../app/filedlg.c:488
- msgid "Save Diagram"
- msgstr "Zapis diagramu"
- 
- #. Need better way to make it a reasonable size.  Isn't there some
- #. standard look for them (or is that just Gnome?)
--#: ../app/filedlg.c:381
-+#: ../app/filedlg.c:502
- msgid "Compress diagram files"
- msgstr "Kompresja zapisywanych plików"
- 
--#: ../app/filedlg.c:390
-+#: ../app/filedlg.c:511
- msgid ""
- "Compression reduces file size to less than 1/10th size and speeds up loading "
- "and saving.  Some text programs cannot manipulate compressed files."
-@@ -833,7 +814,7 @@ msgstr ""
- "przyspiesza wczytywanie i zapisywanie. Niektóre programu tekstowe nie "
- "potrafią wykonywać operacji na skompresowanych plikach."
- 
--#: ../app/filedlg.c:584
-+#: ../app/filedlg.c:741
- #, c-format
- msgid ""
- "Could not determine which export filter\n"
-@@ -842,134 +823,179 @@ msgstr ""
- "Nie można określić filtru do zapisu\n"
- "\"%s\"."
- 
--#: ../app/filedlg.c:607
-+#: ../app/filedlg.c:768
- msgid "Export Diagram"
- msgstr "Wyeksportuj diagram"
- 
--#: ../app/filedlg.c:624
-+#: ../app/filedlg.c:787
- msgid "Export Options"
- msgstr "Wyeksportuj opcje"
- 
--#: ../app/interface.c:57
-+#: ../app/find-and-replace.c:454
-+msgid "_Search for:"
-+msgstr "_Szukaj"
-+
-+#: ../app/find-and-replace.c:467
-+msgid "Replace _with:"
-+msgstr "Z_amień na:"
-+
-+#: ../app/find-and-replace.c:477
-+msgid "_Match case"
-+msgstr "Uwzględnij wielk_ość liter"
-+
-+#: ../app/find-and-replace.c:481
-+msgid "Match _entire word only"
-+msgstr "Tylko _całe wyrazy"
-+
-+#: ../app/find-and-replace.c:485
-+msgid "Match _all properties (not just object name)"
-+msgstr "Przeszukaj wszystkie właściwości (nie tylko nazwy)"
-+
-+#: ../app/find-and-replace.c:511
-+msgid "Find"
-+msgstr "Wyszukaj"
-+
-+#: ../app/find-and-replace.c:541 ../app/menus.c:259
-+msgid "Replace"
-+msgstr "Zamień"
-+
-+#: ../app/find-and-replace.c:544
-+msgid "Replace _All"
-+msgstr "Zamień _wszystkie"
-+
-+#. not adding the button in the list above to modify it's text;
-+#. * the default "Find and Replace" is just too long for my taste ;)
-+#.
-+#: ../app/find-and-replace.c:549
-+msgid "_Replace"
-+msgstr "_Zamień"
-+
-+#: ../app/interface.c:157
- msgid ""
- "Modify object(s)\n"
- "Use <Space> to toggle between this and other tools"
- msgstr ""
- 
-+#: ../app/interface.c:163
-+msgid ""
-+"Text edit(s)\n"
-+"Use <Esc> to leave this tool"
-+msgstr ""
-+
- #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
--#: ../app/interface.c:63 ../app/menus.c:187 ../objects/FS/function.c:986
-+#: ../app/interface.c:169 ../app/menus.c:225 ../objects/FS/function.c:991
- msgid "Magnify"
- msgstr "Powiększenie"
- 
--#: ../app/interface.c:69
-+#: ../app/interface.c:175
- msgid "Scroll around the diagram"
- msgstr "Przewijanie diagramu"
- 
--#: ../app/interface.c:75 ../app/menus.c:189 ../lib/properties.c:79
--#: ../lib/properties.h:520 ../objects/AADL/aadlbox.c:144
--#: ../objects/Jackson/requirement.c:142 ../objects/UML/activity.c:127
--#: ../objects/UML/actor.c:122 ../objects/UML/classicon.c:144
--#: ../objects/UML/component.c:128 ../objects/UML/component_feature.c:155
--#: ../objects/UML/node.c:127 ../objects/UML/note.c:121
--#: ../objects/UML/object.c:148 ../objects/UML/small_package.c:128
--#: ../objects/UML/state.c:152 ../objects/UML/usecase.c:138
--#: ../objects/custom/custom_object.c:200 ../objects/network/basestation.c:133
--#: ../objects/network/radiocell.c:125
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule
-+#: ../app/interface.c:181 ../app/menus.c:228 ../lib/properties.c:101
-+#: ../lib/properties.h:562 ../objects/AADL/aadlbox.c:153
-+#: ../objects/Jackson/requirement.c:135 ../objects/UML/activity.c:129
-+#: ../objects/UML/actor.c:123 ../objects/UML/classicon.c:148
-+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:160
-+#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-+#: ../objects/UML/note.c:121 ../objects/UML/object.c:167
-+#: ../objects/UML/small_package.c:132 ../objects/UML/state.c:158
-+#: ../objects/UML/usecase.c:139 ../objects/custom/custom_object.c:239
-+#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
- msgid "Text"
- msgstr "Tekst"
- 
--#: ../app/interface.c:81 ../app/menus.c:190
-+#: ../app/interface.c:187 ../app/menus.c:229
- msgid "Box"
- msgstr "ProstokÄ…t"
- 
--#: ../app/interface.c:87 ../app/menus.c:191
-+#: ../app/interface.c:193 ../app/menus.c:230
- msgid "Ellipse"
- msgstr "Elipsa"
- 
--#: ../app/interface.c:93 ../app/menus.c:192
-+#: ../app/interface.c:199 ../app/menus.c:231
- msgid "Polygon"
- msgstr "WielokÄ…t"
- 
--#: ../app/interface.c:99 ../app/menus.c:193
-+#: ../app/interface.c:205 ../app/menus.c:232
- msgid "Beziergon"
- msgstr "Obszar Beziera"
- 
--#: ../app/interface.c:105 ../app/menus.c:195 ../objects/standard/line.c:225
-+#: ../app/interface.c:211 ../app/menus.c:234 ../objects/standard/line.c:232
- msgid "Line"
--msgstr "Linia"
-+msgstr "Linia prosta"
- 
--#: ../app/interface.c:111 ../app/menus.c:196
-+#: ../app/interface.c:217 ../app/menus.c:235
- msgid "Arc"
- msgstr "�uk"
- 
--#: ../app/interface.c:117 ../app/menus.c:197
-+#: ../app/interface.c:223 ../app/menus.c:236
- msgid "Zigzagline"
- msgstr "Linia prostopadle Å‚amana"
- 
--#: ../app/interface.c:123 ../app/menus.c:198
-+#: ../app/interface.c:229 ../app/menus.c:237
- msgid "Polyline"
- msgstr "Linia Å‚amana"
- 
--#: ../app/interface.c:129 ../app/menus.c:199
-+#: ../app/interface.c:235 ../app/menus.c:238
- msgid "Bezierline"
- msgstr "Krzywa Beziera"
- 
--#: ../app/interface.c:135 ../app/menus.c:201
-+#: ../app/interface.c:241 ../app/menus.c:241
- msgid "Image"
- msgstr "Obraz"
- 
--#: ../app/interface.c:413
--msgid "Diagram menu."
--msgstr "Menu diagramu."
-+#: ../app/interface.c:248 ../app/menus.c:239
-+msgid "Outline"
-+msgstr "Obrys"
- 
--#: ../app/interface.c:451
-+#: ../app/interface.c:631 ../app/interface.c:864
- msgid "Pops up the Navigation window."
--msgstr ""
-+msgstr "Wyświetla wyskakujące okienko nawigacyjne"
-+
-+#: ../app/interface.c:826
-+msgid "Diagram menu."
-+msgstr "Menu diagramu."
- 
--#: ../app/interface.c:517
-+#: ../app/interface.c:926
- msgid "Zoom"
- msgstr "Powiększenie"
- 
--#: ../app/interface.c:532
-+#: ../app/interface.c:941
- msgid "Toggles snap-to-grid for this window."
- msgstr "Przełącza opcję wyrównywania do siatki dla tego okna."
- 
--#: ../app/interface.c:543
-+#: ../app/interface.c:952
- #, fuzzy
- msgid "Toggles object snapping for this window."
- msgstr "Przełącza opcję wyrównywania do siatki dla tego okna."
- 
--#: ../app/interface.c:608
--msgid "NULL tooldata in tool_select_update"
--msgstr "Dane narzędzia o wartości NULL w tool_select_update"
--
--#: ../app/interface.c:920
-+#: ../app/interface.c:1381
- #, fuzzy, c-format
- msgid "No sheet named %s"
- msgstr "Nazwa arkusza:"
- 
--#: ../app/interface.c:957
--#, fuzzy
-+#: ../app/interface.c:1419
- msgid "Other sheets"
--msgstr ""
--"%s\n"
--"Arkusz użytkownika"
-+msgstr "Inne arkusze"
- 
--#: ../app/interface.c:1015 ../sheets/Misc.sheet.in.h:3
--msgid "Misc"
--msgstr "Różne"
-+#: ../app/interface.c:1479 ../sheets/Flowchart.sheet.in.h:1
-+msgid "Flowchart"
-+msgstr "Diagram przepływu"
- 
--#: ../app/interface.c:1076
-+#: ../app/interface.c:1539
-+#, fuzzy
- msgid ""
- "Foreground & background colors for new objects.  The small black and white "
--"squares reset colors.  The small arrows swap colors.  Double click to change "
-+"squares reset colors.  The small arrows swap colors.  Double-click to change "
- "colors."
- msgstr ""
- "Kolor tła i obiektu. Para małych kwadratów (czarny i biały) przywraca "
- "domyślne kolory.  Strzałki zamieniają kolory.  Podwójne kliknięcie koloru "
- "pozwala go zmienić."
- 
--#: ../app/interface.c:1091
-+#: ../app/interface.c:1553
- msgid ""
- "Line widths.  Click on a line to set the default line width for new "
- "objects.  Double-click to set the line width more precisely."
-@@ -977,87 +1003,97 @@ msgstr ""
- "Szerokość linii.   Kliknij linię aby ustawić domyślną szerokość dla nowego "
- "obiektu. Podwójne kliknięcie umożliwia dokładniejszą zmianę szerokości linii."
- 
--#: ../app/interface.c:1131
-+#: ../app/interface.c:1596
-+#, fuzzy
- msgid ""
- "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
--"arrow parameters with Details..."
-+"arrow parameters with Details…"
- msgstr ""
- "Styl strzałki dla początku nowych linii. Kliknij aby wybrać strzałkę lub "
- "ustawić parametry strzałki za pomocą opcji Szczegóły..."
- 
--#: ../app/interface.c:1136
-+#: ../app/interface.c:1601
-+#, fuzzy
- msgid ""
- "Line style for new lines.  Click to pick a line style, or set line style "
--"parameters with Details..."
-+"parameters with Details…"
- msgstr ""
- "Styl nowych linii. Kliknij aby wybrać styl linii lub ustawić parametry stylu "
- "linii za pomocą opcji Szczegóły..."
- 
--#: ../app/interface.c:1150
-+#: ../app/interface.c:1617
-+#, fuzzy
- msgid ""
- "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
--"parameters with Details..."
-+"parameters with Details…"
- msgstr ""
- "Styl strzałki dla zakończenia nowych linii. Kliknij aby wybrać strzałkę lub "
- "ustawić parametry strzałki za pomocą opcji Szczegóły..."
- 
--#: ../app/interface.c:1260
-+#: ../app/interface.c:1676 ../app/interface.c:1800 ../dia.desktop.in.in.h:2
- msgid "Diagram Editor"
--msgstr "Edytor diagramu"
-+msgstr "Edytor diagramów"
- 
--#: ../app/layer_dialog.c:101
-+#: ../app/layer_dialog.c:165
- msgid "New Layer"
- msgstr "Nowa warstwa"
- 
--#: ../app/layer_dialog.c:102
-+#: ../app/layer_dialog.c:166
- msgid "Raise Layer"
- msgstr "PodnieÅ› warstwÄ™"
- 
--#: ../app/layer_dialog.c:103
-+#: ../app/layer_dialog.c:167
- msgid "Lower Layer"
- msgstr "Obniż warstwę"
- 
--#: ../app/layer_dialog.c:104
-+#: ../app/layer_dialog.c:168
- msgid "Delete Layer"
- msgstr "usuń warstwę"
- 
--#: ../app/layer_dialog.c:225
--msgid "Layers"
-+#: ../app/layer_dialog.c:311
-+msgid "Layers:"
- msgstr "Warstwy:"
- 
--#: ../app/layer_dialog.c:239
--#, fuzzy
-+#: ../app/layer_dialog.c:390
-+msgid "Layers"
-+msgstr "Warstwy"
-+
-+#: ../app/layer_dialog.c:404
- msgid "Diagram:"
--msgstr "Diagramy:"
-+msgstr "Diagram:"
- 
--#: ../app/layer_dialog.c:349
--#, fuzzy, c-format
-+#: ../app/layer_dialog.c:517 ../app/layer_dialog.c:1230
-+#, c-format
- msgid "New layer %d"
--msgstr "Nowa warstwa"
-+msgstr "Nowa warstwa %d"
- 
--#: ../app/layer_dialog.c:561
-+#: ../app/layer_dialog.c:732
- msgid "none"
- msgstr "brak"
- 
--#: ../app/layer_dialog.c:983
--msgid "Edit Layer Attributes"
--msgstr "Modyfikowanie atrybutów warstwy"
-+#: ../app/layer_dialog.c:1200
-+msgid "Edit Layer"
-+msgstr "Edytuj warstwÄ™"
- 
--#: ../app/layer_dialog.c:1002
-+#: ../app/layer_dialog.c:1200
-+msgid "Add Layer"
-+msgstr "Dodaj warstwÄ™"
-+
-+#: ../app/layer_dialog.c:1219
- msgid "Layer name:"
- msgstr "Nazwa warstwy:"
- 
--#: ../app/linewidth_area.c:246 ../lib/properties.h:481 ../lib/properties.h:484
--#: ../objects/chronogram/chronoline.c:181
--#: ../objects/chronogram/chronoref.c:160
-+#: ../app/linewidth_area.c:248 ../lib/properties.h:511 ../lib/properties.h:514
-+#: ../objects/chronogram/chronoline.c:183
-+#: ../objects/chronogram/chronoref.c:162
- msgid "Line width"
- msgstr "Szerokość linii"
- 
--#: ../app/linewidth_area.c:258
-+#: ../app/linewidth_area.c:260
- msgid "Line width:"
- msgstr "Szerokość linii:"
- 
--#: ../app/load_save.c:268
-+#: ../app/load_save.c:263
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
-@@ -1065,40 +1101,41 @@ msgstr ""
- "BÅ‚Ä…d przy wczytywaniu diagramu.\n"
- "Nie odnaleziono w dokumencie przyłączonego obiektu."
- 
--#: ../app/load_save.c:271
-+#: ../app/load_save.c:267
-+#, fuzzy, c-format
- msgid ""
- "Error loading diagram.\n"
--"connection handle does not exist."
-+"Connection handle %d does not exist on '%s'."
- msgstr ""
- "BÅ‚Ä…d przy odczycie diagramu.\n"
--"Uchwyt połączenia nie istnieje."
-+"Uchwyt połączenia %d nie istnieje w \"%s\"."
- 
--#: ../app/load_save.c:288
-+#: ../app/load_save.c:285
- #, fuzzy, c-format
- msgid ""
- "Error loading diagram.\n"
--"connection point %s does not exist."
-+"Connection point %d does not exist on '%s'."
- msgstr ""
- "BÅ‚Ä…d przy odczycie diagramu.\n"
--"Punkt połączenia nie istnieje."
-+"Punkt połączenia %d nie istnieje w \"%s\"."
- 
--#: ../app/load_save.c:313
-+#: ../app/load_save.c:325
- #, c-format
- msgid "Can't find parent %s of %s object\n"
- msgstr "Nie można znaleźć obiektu %s nadrzędnego w stosunku do obiektu %s\n"
- 
--#: ../app/load_save.c:359
-+#: ../app/load_save.c:375
- msgid "You must specify a file, not a directory.\n"
- msgstr "Należy podać plik, nie katalog.\n"
- 
--#: ../app/load_save.c:366 ../plug-ins/dxf/dxf-import.c:1306
--#: ../plug-ins/wpg/wpg.c:1175 ../plug-ins/xfig/xfig-import.c:1258
--#: ../plug-ins/xslt/xslt.c:85
-+#: ../app/load_save.c:382 ../plug-ins/dxf/dxf-import.c:1290
-+#: ../plug-ins/wpg/wpg.c:1181 ../plug-ins/xfig/xfig-import.c:1275
-+#: ../plug-ins/xslt/xslt.c:93
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "Nie można otworzyć: \"%s\" do odczytu.\n"
- 
--#: ../app/load_save.c:384 ../app/load_save.c:390
-+#: ../app/load_save.c:400 ../app/load_save.c:406
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1107,7 +1144,7 @@ msgstr ""
- "BÅ‚Ä…d przy odczycie diagramu %s.\n"
- "Nieznany typ pliku."
- 
--#: ../app/load_save.c:398
-+#: ../app/load_save.c:414
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1116,7 +1153,7 @@ msgstr ""
- "BÅ‚Ä…d przy odczycie diagramu %s.\n"
- "Plik nie jest plikiem Dia."
- 
--#: ../app/load_save.c:604
-+#: ../app/load_save.c:672
- #, c-format
- msgid ""
- "Error loading diagram:\n"
-@@ -1127,432 +1164,498 @@ msgstr ""
- "%s.\n"
- "Poprawny plik Dia definiuje co najmniej jednÄ… warstwÄ™."
- 
--#: ../app/load_save.c:912
--#, c-format
--msgid "No allowed to write to output file %s\n"
--msgstr ""
-+#: ../app/load_save.c:1015
-+#, fuzzy, c-format
-+msgid "Not allowed to write to output file %s\n"
-+msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
- 
--#: ../app/load_save.c:934
-+#: ../app/load_save.c:1047
- #, c-format
--msgid "No allowed to write temporary files in %s\n"
--msgstr ""
-+msgid "Not allowed to write temporary files in %s\n"
-+msgstr ""
-+
-+#: ../app/load_save.c:1069 ../plug-ins/cairo/diacairo.c:125
-+#: ../plug-ins/cgm/cgm.c:1170 ../plug-ins/drs/dia-render-script.c:124
-+#: ../plug-ins/dxf/dxf-export.c:599 ../plug-ins/hpgl/hpgl.c:710
-+#: ../plug-ins/libart/export_png.c:159
-+#: ../plug-ins/metapost/render_metapost.c:1180
-+#: ../plug-ins/pgf/render_pgf.c:1203 ../plug-ins/postscript/render_eps.c:105
-+#: ../plug-ins/pstricks/render_pstricks.c:919
-+#: ../plug-ins/shape/shape-export.c:138 ../plug-ins/svg/render_svg.c:198
-+#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wpg/wpg.c:1076
-+#: ../plug-ins/xfig/xfig-export.c:1157 ../plug-ins/xslt/xslt.c:101
-+#, c-format
-+msgid "Can't open output file %s: %s\n"
-+msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:962
-+#: ../app/load_save.c:1080
- #, fuzzy, c-format
- msgid "Internal error %d writing file %s\n"
- msgstr "Błąd %s: wymagany poprawny plik wejściowy %s\n"
- 
--#: ../app/load_save.c:976
-+#: ../app/load_save.c:1091
- #, fuzzy, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
- msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
- 
--#: ../app/load_save.c:1064 ../app/load_save.c:1069
--#, fuzzy
-+#: ../app/load_save.c:1234 ../app/load_save.c:1239
- msgid "Dia Diagram File"
--msgstr "Diagram Dia"
-+msgstr "Plik diagramu Dia"
-+
-+#: ../app/menus.c:62
-+msgid "Fit"
-+msgstr "Dopasuj"
- 
--#: ../app/menus.c:54
--#
-+#: ../app/menus.c:79
- msgid "_File"
- msgstr "_Plik"
- 
--#: ../app/menus.c:58
-+#: ../app/menus.c:80
-+msgid "Create a new diagram"
-+msgstr "Tworzy nowy diagram"
-+
-+#: ../app/menus.c:81
-+msgid "Open a diagram file"
-+msgstr "Otwiera plik diagramu"
-+
-+#: ../app/menus.c:83
- msgid "_Help"
- msgstr "Pomo_c"
- 
--#: ../app/menus.c:66
--#, fuzzy
--msgid "Sheets and Objects..."
--msgstr "_Arkusze i obiekty..."
-+#: ../app/menus.c:93
-+msgid "Sheets and Objects…"
-+msgstr "Arkusze i obiekty..."
- 
--#: ../app/menus.c:68
--#, fuzzy
--msgid "Plugins..."
--msgstr "_Wtyczki..."
-+#: ../app/menus.c:95
-+msgid "Plugins…"
-+msgstr "Wtyczki..."
- 
--#: ../app/menus.c:74
--#, fuzzy
--msgid "_Diagram tree..."
--msgstr "_Drzewo diagramu"
-+#: ../app/menus.c:96
-+msgid "_Diagram Tree…"
-+msgstr "_Drzewo diagramu..."
- 
--#: ../app/menus.c:82
--#, fuzzy
--msgid "_Export ..."
-+#: ../app/menus.c:101
-+msgid "Show Toolbar"
-+msgstr "Pokaż pasek narzędziowy"
-+
-+#: ../app/menus.c:102
-+msgid "Show Statusbar"
-+msgstr "Pokaż pasek stanu"
-+
-+#: ../app/menus.c:103
-+msgid "Show Layers"
-+msgstr "Pokaż warstwy"
-+
-+#: ../app/menus.c:109
-+msgid "Save the diagram"
-+msgstr "Zapisz diagram"
-+
-+#: ../app/menus.c:110
-+msgid "Save the diagram with a new name"
-+msgstr "Zapisuje diagram pod nowÄ… nazwÄ…"
-+
-+#: ../app/menus.c:111
-+msgid "_Export…"
- msgstr "_Eksportuj..."
- 
--#: ../app/menus.c:83
--msgid "Page Set_up..."
--msgstr "Ustawienia _strony..."
-+#: ../app/menus.c:111
-+msgid "Export the diagram"
-+msgstr "Eksportuje diagram"
-+
-+#: ../app/menus.c:112
-+msgid "_Diagram Properties"
-+msgstr "_Właściwości diagramu"
-+
-+#: ../app/menus.c:113
-+msgid "Page Set_up…"
-+msgstr "_Ustawienia strony..."
-+
-+#: ../app/menus.c:114
-+msgid "Print the diagram"
-+msgstr "Drukuje diagram"
- 
--#: ../app/menus.c:87 ../app/sheets_dialog.c:236
-+#: ../app/menus.c:117
- msgid "_Edit"
- msgstr "/Edycja"
- 
--#: ../app/menus.c:94
--#
-+#: ../app/menus.c:121
-+#, fuzzy
-+msgid "Copy selection"
-+msgstr "Konwekcja"
-+
-+#: ../app/menus.c:122
-+#, fuzzy
-+msgid "Cut selection"
-+msgstr "Wykrywanie wody"
-+
-+#: ../app/menus.c:123
-+#, fuzzy
-+msgid "Paste selection"
-+msgstr "Wykrywanie wody"
-+
-+#: ../app/menus.c:124
- msgid "_Duplicate"
- msgstr "Z_duplikuj"
- 
- #. the following used to bind to <control><shift>C which collides with Unicode input.
--#. * <control>>alt> doesn't work either
--#: ../app/menus.c:99
-+#. * <control><alt> doesn't work either
-+#: ../app/menus.c:132
- msgid "Copy Text"
- msgstr "Skopiuj tekst"
- 
--#: ../app/menus.c:100
-+#: ../app/menus.c:133
- msgid "Cut Text"
- msgstr "Wytnij tekst"
- 
--#: ../app/menus.c:101
-+#: ../app/menus.c:134
- msgid "Paste _Text"
- msgstr "Wklej _tekst"
- 
--#: ../app/menus.c:103
--#
--msgid "_Diagram"
--msgstr "_Diagram"
-+#: ../app/menus.c:136
-+msgid "Paste _Image"
-+msgstr "Wklej _obraz"
- 
--#: ../app/menus.c:105
--#, fuzzy
--msgid "_Layers..."
--msgstr "W_arstwy"
-+#: ../app/menus.c:138
-+msgid "_Layers"
-+msgstr "Wa_rstwy"
-+
-+#: ../app/menus.c:139
-+msgid "Add Layer…"
-+msgstr "Dodaj warstwÄ™..."
-+
-+#: ../app/menus.c:140
-+msgid "Rename Layer…"
-+msgstr "Zmień nazwę warstwy..."
-+
-+#: ../app/menus.c:141
-+msgid "Move Selection to Layer above"
-+msgstr "Przenieś zaznaczenie na wyższą warstwę"
- 
--#: ../app/menus.c:107
--#
-+#: ../app/menus.c:142
-+msgid "Move Selection to Layer below"
-+msgstr "Przenieś zaznaczenie na niższą warstwę"
-+
-+#: ../app/menus.c:143
-+msgid "_Layers…"
-+msgstr "Wa_rstwy..."
-+
-+#: ../app/menus.c:144
- msgid "_View"
- msgstr "_Widok"
- 
--#: ../app/menus.c:110
-+#: ../app/menus.c:145
-+msgid "Zoom in"
-+msgstr "Powiększenie"
-+
-+#: ../app/menus.c:146
-+msgid "Zoom out"
-+msgstr "Pomniejszenie"
-+
-+#: ../app/menus.c:147
- msgid "_Zoom"
- msgstr "P_owiększenie"
- 
--#: ../app/menus.c:111
--#, fuzzy
-+#: ../app/menus.c:148
- msgid "1600%"
--msgstr "15200"
-+msgstr "1600%"
- 
--#: ../app/menus.c:112
--#, fuzzy
-+#: ../app/menus.c:149 ../app/menus.c:574 ../app/menus.c:586
- msgid "800%"
--msgstr "15200"
-+msgstr "800%"
- 
--#: ../app/menus.c:113
-+#: ../app/menus.c:150 ../app/menus.c:575 ../app/menus.c:587
- msgid "400%"
--msgstr ""
-+msgstr "400%"
- 
--#: ../app/menus.c:114
-+#: ../app/menus.c:151
- msgid "283"
--msgstr ""
-+msgstr "283"
- 
--#: ../app/menus.c:115
--#, fuzzy
-+#: ../app/menus.c:152
- msgid "200"
--msgstr "15200"
-+msgstr "200"
- 
--#: ../app/menus.c:116
-+#: ../app/menus.c:153
- msgid "141"
--msgstr ""
-+msgstr "141"
- 
--#: ../app/menus.c:118
-+#: ../app/menus.c:155
- msgid "85"
--msgstr ""
-+msgstr "85"
- 
--#: ../app/menus.c:119
--#, fuzzy
-+#: ../app/menus.c:156
- msgid "70.7"
--msgstr "7507"
-+msgstr "71"
- 
--#: ../app/menus.c:120
--#, fuzzy
-+#: ../app/menus.c:157
- msgid "50"
--msgstr "7507"
-+msgstr "50"
- 
--#: ../app/menus.c:121
-+#: ../app/menus.c:158
- msgid "35.4"
--msgstr ""
-+msgstr "35"
- 
--#: ../app/menus.c:122
-+#: ../app/menus.c:159
- msgid "25"
--msgstr ""
-+msgstr "25"
-+
-+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
-+#: ../app/menus.c:161
-+#, fuzzy
-+msgid "Zoom fit"
-+msgstr "Powiększenie"
- 
- #. "display_toggle_entries" items go here
--#: ../app/menus.c:126
-+#: ../app/menus.c:165
- msgid "New _View"
- msgstr "_Nowy widok"
- 
--#: ../app/menus.c:127
--#, fuzzy
-+#: ../app/menus.c:166
- msgid "C_lone View"
--msgstr "_Nowy widok"
-+msgstr "S_klonuj widok"
- 
--#: ../app/menus.c:132
-+#: ../app/menus.c:169
- msgid "_Objects"
- msgstr "_Obiekty"
- 
--#: ../app/menus.c:133
-+#: ../app/menus.c:170
- msgid "Send to _Back"
--msgstr "Przesuń pod _spód"
-+msgstr "Przenieś pod _spód"
- 
--#: ../app/menus.c:134
-+#: ../app/menus.c:171
- msgid "Bring to _Front"
--msgstr "Przesuń na _wierzch"
-+msgstr "PrzenieÅ› na sam _wierzch"
- 
--#: ../app/menus.c:135
-+#: ../app/menus.c:172
- msgid "Send Backwards"
--msgstr "Przesyła pod spód"
-+msgstr "Przesuń do _tyłu"
- 
--#: ../app/menus.c:136
-+#: ../app/menus.c:173
- msgid "Bring Forwards"
--msgstr "Przesyła na wierzch"
-+msgstr "Przesuń do _przodu"
- 
--#: ../app/menus.c:138
-+#: ../app/menus.c:175
- msgid "_Group"
- msgstr "_Grupuj"
- 
- #. deliberately not using Ctrl+U for Ungroup
--#: ../app/menus.c:140
-+#: ../app/menus.c:177
- msgid "_Ungroup"
- msgstr "_Rozdziel"
- 
--#: ../app/menus.c:142
--#, fuzzy
-+#: ../app/menus.c:179
- msgid "_Parent"
--msgstr "Zapobieganie"
-+msgstr "_Wstaw na rodzica"
- 
--#: ../app/menus.c:143
-+#: ../app/menus.c:180
- msgid "_Unparent"
--msgstr ""
-+msgstr "_Zdejmij z rodzica"
- 
--#: ../app/menus.c:144
-+#: ../app/menus.c:181
- msgid "_Unparent Children"
--msgstr ""
-+msgstr "_Zdejmij dzieci z rodzica"
- 
- #. Translators: Menu item Verb/Support/Position/Align
--#: ../app/menus.c:146 ../objects/FS/function.c:806
-+#: ../app/menus.c:183 ../objects/FS/function.c:811
- msgid "Align"
- msgstr "Wyrównywanie"
- 
--#: ../app/menus.c:151 ../objects/standard/textobj.c:132
-+#: ../app/menus.c:188 ../objects/standard/textobj.c:137
- msgid "Top"
- msgstr "Góra"
- 
--#: ../app/menus.c:152
--#, fuzzy
-+#: ../app/menus.c:189
- msgid "Middle"
- msgstr "Åšrodek"
- 
--#: ../app/menus.c:153 ../objects/standard/textobj.c:131
-+#: ../app/menus.c:190 ../objects/standard/textobj.c:136
- msgid "Bottom"
- msgstr "Dół"
- 
--#: ../app/menus.c:155
--#, fuzzy
-+#: ../app/menus.c:192
- msgid "Spread Out Horizontally"
--msgstr "Obróć poziomo"
-+msgstr "Rozłóż równomiernie w poziomie"
- 
--#: ../app/menus.c:156
--#
-+#: ../app/menus.c:193
- msgid "Spread Out Vertically"
--msgstr "Wyrównanie pionowe"
-+msgstr "Rozłóż równomiernie w pionie"
- 
--#: ../app/menus.c:157
-+#: ../app/menus.c:194
- msgid "Adjacent"
--msgstr "Przyległe"
-+msgstr "Ułóż przylegająco"
- 
--#: ../app/menus.c:158
-+#: ../app/menus.c:195
- #, fuzzy
- msgid "Stacked"
--msgstr "Stan"
-+msgstr "Ułóż na sobie"
-+
-+#: ../app/menus.c:196 ../app/menus.c:206
-+msgid "Connected"
-+msgstr "SÄ…siednie"
- 
--#: ../app/menus.c:162
--#
-+#: ../app/menus.c:200
- msgid "_Select"
- msgstr "_Zaznaczenie"
- 
--#: ../app/menus.c:163
-+#: ../app/menus.c:201
- msgid "All"
- msgstr "Wszystko"
- 
--#: ../app/menus.c:164 ../lib/arrows.c:43 ../objects/Jackson/domain.c:96
--#: ../objects/UML/association.c:1183
-+#: ../app/menus.c:202 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:96
-+#: ../objects/UML/association.c:222 ../objects/UML/association.c:228
- msgid "None"
- msgstr "Brak"
- 
--#: ../app/menus.c:165
-+#: ../app/menus.c:203
- msgid "Invert"
- msgstr "Odwróć"
- 
--#: ../app/menus.c:167
-+#: ../app/menus.c:205
- msgid "Transitive"
--msgstr "Przechodnie"
--
--#: ../app/menus.c:168
--msgid "Connected"
--msgstr "Połączone"
-+msgstr "PowiÄ…zane"
- 
--#: ../app/menus.c:169
--#
-+#: ../app/menus.c:207
- msgid "Same Type"
- msgstr "Ten sam typ"
- 
- #. display_select_radio_entries go here
--#: ../app/menus.c:173
--#
-+#: ../app/menus.c:211
- msgid "Select By"
- msgstr "_Zaznaczenie"
- 
--#: ../app/menus.c:175
-+#: ../app/menus.c:213
- msgid "_Input Methods"
- msgstr "Metody we_jściowe"
- 
--#: ../app/menus.c:177
--#, fuzzy
-+#: ../app/menus.c:215
- msgid "D_ialogs"
--msgstr "Okna _dialogowe"
-+msgstr "Okna d_ialogowe"
- 
--#: ../app/menus.c:179
-+#: ../app/menus.c:217
- msgid "D_ebug"
--msgstr ""
-+msgstr "D_ebugowanie"
- 
--#: ../app/menus.c:185
-+#: ../app/menus.c:223
- msgid "_Tools"
- msgstr "_Narzędzia"
- 
--#: ../app/menus.c:186
-+#: ../app/menus.c:224
- msgid "Modify"
- msgstr "Modyfikacja"
- 
--#: ../app/menus.c:188
-+#: ../app/menus.c:226
-+msgid "Edit Text"
-+msgstr "Edycja tekstu"
-+
-+#: ../app/menus.c:227
- msgid "Scroll"
- msgstr "Przewijanie"
- 
--#: ../app/menus.c:210
--msgid "Fullscr_een"
--msgstr ""
--
--#. we must have all actions registered to avoid configuration specific ui-files and crashing in GTK+,
--#. * see: http://bugzilla.gnome.org/show_bug.cgi?id=396161
--#.
--#: ../app/menus.c:213 ../app/menus.c:218
--msgid "_AntiAliased"
-+#: ../app/menus.c:248
-+msgid "_Antialiased"
- msgstr "_Wygładzanie"
- 
--#: ../app/menus.c:220
-+#: ../app/menus.c:249
- msgid "Show _Grid"
- msgstr "Wyświetlanie _siatki"
- 
--#: ../app/menus.c:221
--msgid "_Snap To Grid"
-+#: ../app/menus.c:250
-+msgid "_Snap to Grid"
- msgstr "P_rzyciÄ…ganie do siatki"
- 
--#: ../app/menus.c:222
--#
--msgid "Snap To _Objects"
--msgstr "PrzyciÄ…ganie do siatki"
-+#: ../app/menus.c:251
-+msgid "Snap to _Objects"
-+msgstr "Przyciąganie do _obiektów"
- 
--#: ../app/menus.c:223
-+#: ../app/menus.c:252
- msgid "Show _Rulers"
- msgstr "Wyświet_lanie podziałki"
- 
--#: ../app/menus.c:224
-+#: ../app/menus.c:253
- msgid "Show _Connection Points"
--msgstr "Wyświetlanie _punktów połączenia"
--
--#: ../app/menus.c:230
--msgid "Replace"
--msgstr "ZastÄ…p"
-+msgstr "Wyświetlanie p_unktów połączeń"
- 
--#: ../app/menus.c:231
-+#: ../app/menus.c:260
- msgid "Union"
--msgstr "Zsumuj"
-+msgstr "Suma"
- 
--#: ../app/menus.c:232
--#, fuzzy
-+#: ../app/menus.c:261
- msgid "Intersection"
--msgstr "Przetnij"
-+msgstr "Część wspólna"
- 
- #. Translators: Menu item Verb/Channel/Export/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
--#: ../app/menus.c:233 ../app/sheets_dialog.c:785 ../objects/FS/function.c:706
--#: ../objects/FS/function.c:858 ../objects/FS/function.c:860
-+#: ../app/menus.c:262 ../objects/FS/function.c:711
-+#: ../objects/FS/function.c:863 ../objects/FS/function.c:865
- msgid "Remove"
- msgstr "Usuń"
- 
- #. Cannot also be called Invert, duplicate names caused keybinding problems
--#: ../app/menus.c:235
--#, fuzzy
-+#: ../app/menus.c:264
- msgid "Inverse"
--msgstr "Inwerter"
-+msgstr "Inwersja"
- 
--#: ../app/menus.c:278
-+#: ../app/menus.c:327
- msgid "NULL tooldata in tool_menu_select"
- msgstr "Dane narzędzia o wartości NULL w tool_menu_select"
- 
--#: ../app/modify_tool.c:344
--msgid "Couldn't get GTK settings"
--msgstr "Nie można pobrać ustawień GTK"
-+#: ../app/menus.c:576 ../app/menus.c:588
-+msgid "300%"
-+msgstr "300%"
- 
--#: ../app/newgroup.c:117
--#, fuzzy
--msgid "Open group"
--msgstr "_Rozdziel"
-+#: ../app/menus.c:577 ../app/menus.c:589
-+msgid "200%"
-+msgstr "200%"
- 
--#: ../app/paginate_psprint.c:271
--msgid "Select Printer"
--msgstr "Wybór drukarki"
-+#: ../app/menus.c:578 ../app/menus.c:590
-+msgid "150%"
-+msgstr "150%"
- 
--#: ../app/paginate_psprint.c:283 ../sheets/ciscocomputer.sheet.in.h:36
--msgid "Printer"
--msgstr "Drukarka"
-+#: ../app/menus.c:579 ../app/menus.c:591
-+msgid "100%"
-+msgstr "100%"
- 
--#: ../app/paginate_psprint.c:297 ../sheets/Misc.sheet.in.h:1
--msgid "File"
--msgstr "Plik"
-+#: ../app/menus.c:580 ../app/menus.c:592
-+msgid "75%"
-+msgstr "75%"
- 
--#: ../app/paginate_psprint.c:312
--msgid "OK"
--msgstr "OK"
-+#: ../app/menus.c:581 ../app/menus.c:593
-+msgid "50%"
-+msgstr "50%"
- 
--#: ../app/paginate_psprint.c:458
--#, fuzzy, c-format
--msgid "Could not run command '%s': %s"
--msgstr "Nie można wykonać polecenia \"%s\""
-+#: ../app/menus.c:582 ../app/menus.c:594
-+msgid "25%"
-+msgstr "25%"
- 
--#: ../app/paginate_psprint.c:461
--#, fuzzy, c-format
--msgid "Could not open '%s' for writing: %s"
--msgstr "Nie można otworzyć \"%s\" do zapisu"
-+#: ../app/menus.c:583 ../app/menus.c:595
-+msgid "10%"
-+msgstr "10%"
- 
--#: ../app/paginate_psprint.c:481
--#, c-format
--msgid "Printing error: command '%s' returned %d\n"
--msgstr ""
-+#: ../app/menus.c:621
-+msgid "Toggles snap-to-grid."
-+msgstr "Przełącza przyciąganie do siatki."
- 
--#: ../app/paginate_psprint.c:492
--#, c-format
--msgid "Printing error: command '%s' caused sigpipe."
--msgstr ""
-+#: ../app/menus.c:632
-+msgid "Toggles object snapping."
-+msgstr "Przełącza przyciąganie do obiektów."
-+
-+#: ../app/modify_tool.c:366
-+msgid "Couldn't get GTK+ settings"
-+msgstr "Nie można pobrać ustawień GTK+"
- 
- #: ../app/plugin-manager.c:200
--msgid "Plug-ins"
-+msgid "Plugins"
- msgstr "Wtyczki"
- 
- #: ../app/plugin-manager.c:255
- msgid "Loaded"
- msgstr "Wczytane"
- 
--#: ../app/plugin-manager.c:262 ../objects/UML/class.c:139
--#: ../objects/UML/large_package.c:131 ../objects/UML/umlattribute.c:37
--#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
--#: ../objects/UML/umlparameter.c:43
--msgid "Name"
--msgstr "Nazwa"
--
--#: ../app/plugin-manager.c:268
-+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-+#: ../objects/SISSI/sissi_dialog.c:880
- msgid "Description"
- msgstr "Opis"
- 
-@@ -1561,181 +1664,232 @@ msgid "Load at Startup"
- msgstr "Wczytywanie podczas uruchamiania"
- 
- #: ../app/plugin-manager.c:284
--msgid "File Name"
-+msgid "Filename"
- msgstr "Nazwa pliku"
- 
--#: ../app/preferences.c:106
-+#: ../app/preferences.c:100 ../app/preferences.c:143
-+msgid "any"
-+msgstr "dowolne"
-+
-+#: ../app/preferences.c:118
- msgid "User Interface"
- msgstr "Interfejs użytkownika"
- 
--#: ../app/preferences.c:107
-+#: ../app/preferences.c:119
- msgid "Diagram Defaults"
--msgstr "Domyślne ustawienia diagramu"
-+msgstr "Domyślne dla diagramu"
- 
--#: ../app/preferences.c:108
-+#: ../app/preferences.c:120
- msgid "View Defaults"
- msgstr "Domyślny widok"
- 
--#: ../app/preferences.c:124
-+#: ../app/preferences.c:121
-+msgid "Favorites"
-+msgstr "Ulubione"
-+
-+#: ../app/preferences.c:164
- msgid "Reset tools after create"
- msgstr "Zerowanie narzędzi po utworzeniu"
- 
--#: ../app/preferences.c:125
--msgid "Compress saved files"
--msgstr "Kompresja zapisywanych plików"
--
--#: ../app/preferences.c:126
-+#: ../app/preferences.c:167
- msgid "Number of undo levels:"
- msgstr "Liczba poziomów cofnięć:"
- 
--#: ../app/preferences.c:127
-+#: ../app/preferences.c:170
- msgid ""
- "Reverse dragging selects\n"
- "intersecting objects"
- msgstr ""
- "Odwrotne przeciÄ…ganie zaznacza\n"
--"przecinajÄ…cych siÄ™ obiekty"
-+"wszystkie zahaczone obiekty"
- 
--#: ../app/preferences.c:128
-+#: ../app/preferences.c:173
- msgid "Recent documents list size:"
- msgstr "Rozmiar listy ostatnio otw. dokumentów:"
- 
--#: ../app/preferences.c:129
-+#: ../app/preferences.c:176
- msgid "Use menu bar"
- msgstr "Używanie paska menu"
- 
--#: ../app/preferences.c:131
-+#: ../app/preferences.c:179
- msgid "Keep tool box on top of diagram windows"
- msgstr "Skrzynka narzędziowa nad oknami diagramu"
- 
--#: ../app/preferences.c:134
-+#: ../app/preferences.c:182
-+msgid "Length unit:"
-+msgstr "Jednostka długości:"
-+
-+#: ../app/preferences.c:185
-+#, fuzzy
-+msgid "Font size unit:"
-+msgstr "Jednostka dla czcionki"
-+
-+#: ../app/preferences.c:188
- msgid "New diagram:"
- msgstr "Nowy diagram:"
- 
--#: ../app/preferences.c:135
-+#: ../app/preferences.c:189
- msgid "Portrait"
- msgstr "Pionowo"
- 
--#: ../app/preferences.c:137
-+#: ../app/preferences.c:191
- msgid "Paper type:"
- msgstr "Typ papieru:"
- 
--#: ../app/preferences.c:140
-+#: ../app/preferences.c:193 ../objects/Database/table_dialog.c:1089
- msgid "Background Color:"
- msgstr "Kolor tła:"
- 
--#: ../app/preferences.c:143
-+#: ../app/preferences.c:195
-+msgid "Compress saved files"
-+msgstr "Kompresja zapisywanych plików"
-+
-+#: ../app/preferences.c:198
-+msgid "Connection Points:"
-+msgstr "Punkty połączenia:"
-+
-+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
-+msgid "Visible"
-+msgstr "Widoczne"
-+
-+#: ../app/preferences.c:200
-+msgid "Snap to object"
-+msgstr "Przyciąganie do obiektów"
-+
-+#: ../app/preferences.c:203
- msgid "New window:"
- msgstr "Nowe okno:"
- 
--#: ../app/preferences.c:144
-+#: ../app/preferences.c:204
- msgid "Width:"
- msgstr "Szerokość:"
- 
--#: ../app/preferences.c:145
-+#: ../app/preferences.c:205
- msgid "Height:"
- msgstr "Wysokość:"
- 
--#: ../app/preferences.c:146
-+#: ../app/preferences.c:206
- msgid "Magnify:"
- msgstr "Powiększenie:"
- 
--#: ../app/preferences.c:149
--msgid "Connection Points:"
--msgstr "Punkty połączenia:"
--
--#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
--#: ../app/preferences.c:150 ../app/preferences.c:154 ../app/preferences.c:160
--msgid "Visible"
--msgstr "Widoczne"
--
--#: ../app/preferences.c:153
-+#: ../app/preferences.c:209
- msgid "Page breaks:"
- msgstr "Podział stron:"
- 
--#: ../app/preferences.c:155 ../app/preferences.c:165
-+#: ../app/preferences.c:211 ../app/preferences.c:241
- msgid "Color:"
- msgstr "Kolor:"
- 
--#: ../app/preferences.c:156
-+#: ../app/preferences.c:212
- msgid "Solid lines"
- msgstr "Linie ciągłe"
- 
--#: ../app/preferences.c:161
-+#: ../app/preferences.c:215
-+msgid "Antialias:"
-+msgstr "Wygładzanie:"
-+
-+#: ../app/preferences.c:216
-+msgid "view antialised"
-+msgstr "zastosuj wygładzanie"
-+
-+#. Favored Filter
-+#. Translators: Menu item Verb/Channel/Export
-+#. Translators: Menu item Verb/Channel/Export/Export
-+#: ../app/preferences.c:220 ../objects/FS/function.c:701
-+#: ../objects/FS/function.c:703 ../plug-ins/libart/export_png.c:328
-+msgid "Export"
-+msgstr "Eksportowanie"
-+
-+#: ../app/preferences.c:222
-+msgid "Portable Network Graphics"
-+msgstr "Portable Network Graphics (PNG)"
-+
-+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:503
-+#: ../plug-ins/svg/svg-import.c:1205
-+msgid "Scalable Vector Graphics"
-+msgstr "Skalowalna grafika wektorowa (SVG)"
-+
-+#: ../app/preferences.c:226
-+msgid "PostScript"
-+msgstr "PostScript (PS)"
-+
-+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1464
-+#, fuzzy
-+msgid "Windows Metafile"
-+msgstr "Metapliki Windows (WMF)"
-+
-+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1473
-+#, fuzzy
-+msgid "Enhanced Metafile"
-+msgstr "Rozszerzone metapliki (EMF)"
-+
-+#: ../app/preferences.c:235
- msgid "Snap to"
- msgstr "PrzyciÄ…ganie do"
- 
--#: ../app/preferences.c:162
-+#: ../app/preferences.c:236
- msgid "Dynamic grid resizing"
- msgstr "Dynamiczna zmiana rozmiaru siatki"
- 
--#: ../app/preferences.c:163
-+#: ../app/preferences.c:237
- msgid "X Size:"
- msgstr "Rozmiar poziomy:"
- 
--#: ../app/preferences.c:164
-+#: ../app/preferences.c:238
- msgid "Y Size:"
- msgstr "Rozmiar pionowy:"
- 
--#: ../app/preferences.c:166
--msgid "Lines per major line"
--msgstr "Linii na główną linię"
-+#: ../app/preferences.c:239
-+#, fuzzy
-+msgid "Visual Spacing X:"
-+msgstr "Widzialne odstępy"
- 
--#: ../app/preferences.c:168
-+#: ../app/preferences.c:240
- #, fuzzy
--msgid "Hex Size:"
--msgstr "Rozmiar poziomy:"
-+msgid "Visual Spacing Y:"
-+msgstr "Widzialne odstępy"
- 
--#: ../app/preferences.c:184
--msgid "Diagram tree window:"
--msgstr "Okno drzewa diagramu"
-+#: ../app/preferences.c:242
-+msgid "Lines per major line"
-+msgstr "Linii na główną linię"
- 
--#: ../app/preferences.c:186
--msgid "Save hidden object types"
--msgstr "Zapis ukrytych typów obiektów"
-+#: ../app/preferences.c:244
-+msgid "Hex Size:"
-+msgstr "Wielkość sześciokąta:"
- 
--#: ../app/preferences.c:394 ../lib/prop_inttypes.c:158
-+#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
-+#: ../lib/prop_pixbuf.c:270
- msgid "Yes"
- msgstr "Tak"
- 
--#: ../app/preferences.c:394 ../app/preferences.c:405
--#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
-+#: ../app/preferences.c:481 ../app/preferences.c:492
-+#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
-+#: ../lib/prop_pixbuf.c:272 ../lib/prop_pixbuf.c:278
- msgid "No"
- msgstr "Nie"
- 
--#: ../app/preferences.c:507
-+#: ../app/preferences.c:595
- msgid "Preferences"
- msgstr "Preferencje"
- 
--#: ../app/properties.c:55
-+#: ../app/properties-dialog.c:60
- msgid "Object properties"
- msgstr "Właściwości obiektu"
- 
--#: ../app/properties.c:80
-+#: ../app/properties-dialog.c:85
- msgid "This object has no properties."
- msgstr "Obiekt nie posiada właściwości."
- 
--#: ../app/properties.c:217
-+#: ../app/properties-dialog.c:248
- msgid "Properties: "
- msgstr "Właściwości: "
- 
--#: ../app/properties.c:221
-+#: ../app/properties-dialog.c:252
- msgid "Object properties:"
- msgstr "Właściwości obiektu:"
- 
--#: ../app/render_eps.c:148
--msgid "Encapsulated Postscript (using Pango fonts)"
--msgstr "Encapsulated Postscript (używający czcionek Pango)"
--
--#: ../app/render_eps.c:157
--msgid "Encapsulated Postscript with preview (using Pango fonts)"
--msgstr "Encapsulated Postscript z podglądem (używający czcionek Pango)"
--
--#: ../app/render_eps.c:167
--msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
--msgstr "Encapsulated Postscript (używający czcionek postscriptowych Latin-1)"
--
--#: ../app/sheets.c:156
-+#: ../app/sheets.c:157
- #, c-format
- msgid ""
- "%s\n"
-@@ -1744,7 +1898,7 @@ msgstr ""
- "%s\n"
- "Arkusz systemowy"
- 
--#: ../app/sheets.c:158
-+#: ../app/sheets.c:159
- #, c-format
- msgid ""
- "%s\n"
-@@ -1753,7 +1907,7 @@ msgstr ""
- "%s\n"
- "Arkusz użytkownika"
- 
--#: ../app/sheets.c:273
-+#: ../app/sheets.c:277
- msgid ""
- "Can't get symbol 'custom_type' from any module.\n"
- "Editing shapes is disabled."
-@@ -1761,157 +1915,69 @@ msgstr ""
- "Nie można pobrać symbolu \"custom_type\" z żadnego modułu.\n"
- "Możliwość modyfikacji kształtów jest wyłączona."
- 
--#: ../app/sheets.c:381
-+#: ../app/sheets.c:412
- #, c-format
- msgid "Widget not found: %s"
--msgstr "Nie odnaleziono widgetu: %s"
-+msgstr "Nie odnaleziono widżetu: %s"
- 
--#: ../app/sheets.c:456
-+#: ../app/sheets.c:442
- msgid "SVG Shape"
- msgstr "Kształt SVG"
- 
--#: ../app/sheets.c:458
--#, fuzzy
-+#: ../app/sheets.c:444
- msgid "Programmed DiaObject"
--msgstr "Zaprogramowany obiekt"
-+msgstr "Zaprogramowany obiekt Dia"
-+
-+#: ../app/sheets_dialog.c:255
-+msgid "Select SVG Shape File"
-+msgstr "Wybór pliku kształtu SVG"
-+
-+#: ../app/sheets_dialog_callbacks.c:164
-+msgid "Copy ->"
-+msgstr "Skopiuj ->"
-+
-+#: ../app/sheets_dialog_callbacks.c:166
-+msgid "Copy All ->"
-+msgstr "Skopiuj wszystko ->"
-+
-+#: ../app/sheets_dialog_callbacks.c:168
-+msgid "Move ->"
-+msgstr "Przesuń ->"
- 
--#: ../app/sheets_dialog.c:84
--msgid "Sheets and Objects"
--msgstr "Arkusze i obiekty"
-+#: ../app/sheets_dialog_callbacks.c:170
-+msgid "Move All ->"
-+msgstr "Przesuń wszystko ->"
- 
--#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:178
-+#: ../app/sheets_dialog_callbacks.c:177
- msgid "<- Copy"
- msgstr "<- Skopiuj"
- 
--#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:180
-+#: ../app/sheets_dialog_callbacks.c:179
- msgid "<- Copy All"
- msgstr "<- Skopiuj wszystko"
- 
--#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:182
-+#: ../app/sheets_dialog_callbacks.c:181
- msgid "<- Move"
- msgstr "<- Przesuń"
- 
--#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:184
-+#: ../app/sheets_dialog_callbacks.c:183
- msgid "<- Move All"
- msgstr "<- Przesuń wszystko"
- 
--#: ../app/sheets_dialog.c:234
--msgid "Edit"
--msgstr "Edycja"
--
--#: ../app/sheets_dialog.c:267
--msgid "Revert"
--msgstr "Odwróć"
-+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
-+msgid "Line Break"
-+msgstr "Odstęp linii"
- 
--#: ../app/sheets_dialog.c:355
--msgid "New"
--msgstr "Dodaj"
-+#: ../app/sheets_dialog_callbacks.c:303
-+#, c-format
-+msgid ""
-+"%s\n"
-+"Shape"
-+msgstr ""
-+"%s\n"
-+"Kształt"
- 
--#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
--#: ../objects/Istar/actor.c:144 ../objects/Istar/actor.c:145
--#: ../objects/Istar/other.c:148 ../objects/Istar/other.c:149
--#: ../objects/KAOS/other.c:151 ../objects/KAOS/other.c:152
--#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
--#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
--msgid "Type"
--msgstr "Typ"
--
--#: ../app/sheets_dialog.c:378
--msgid "Browse..."
--msgstr "PrzeglÄ…daj..."
--
--#: ../app/sheets_dialog.c:387
--msgid "SVG Shape:"
--msgstr "Kształt SVG:"
--
--#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
--msgid "description:"
--msgstr "opis:"
--
--#: ../app/sheets_dialog.c:426
--msgid "Sheet name:"
--msgstr "Nazwa arkusza:"
--
--#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:290
--#: ../app/sheets_dialog_callbacks.c:1093
--msgid "Line Break"
--msgstr "Odstęp linii"
--
--#: ../app/sheets_dialog.c:569
--msgid "Edit Attributes"
--msgstr "Zmodyfikuj atrybuty"
--
--#: ../app/sheets_dialog.c:584
--#, fuzzy
--msgid "DiaObject"
--msgstr "Obiekt"
--
--#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
--msgid "Description:"
--msgstr "Opis:"
--
--#: ../app/sheets_dialog.c:619 ../objects/FS/flow-ortho.c:169
--#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:164
--#: ../objects/Jackson/phenomenon.c:144 ../objects/KAOS/metaandorrel.c:164
--#: ../objects/KAOS/metabinrel.c:171 ../objects/UML/class_dialog.c:975
--#: ../objects/UML/class_dialog.c:1928 ../objects/UML/class_dialog.c:2166
--#: ../objects/UML/class_dialog.c:2692
--msgid "Type:"
--msgstr "Typ:"
--
--#: ../app/sheets_dialog.c:657
--msgid "Sheet"
--msgstr "Arkusz"
--
--#: ../app/sheets_dialog.c:673 ../objects/ER/attribute.c:153
--#: ../objects/ER/entity.c:135 ../objects/ER/relationship.c:140
--#: ../objects/UML/association.c:238 ../objects/UML/association.c:1160
--#: ../objects/UML/class_dialog.c:964 ../objects/UML/class_dialog.c:1917
--#: ../objects/UML/class_dialog.c:2155 ../objects/UML/class_dialog.c:2681
--#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:131
--#: ../objects/UML/realizes.c:132
--msgid "Name:"
--msgstr "Nazwa:"
--
--#: ../app/sheets_dialog.c:810
--#, fuzzy
--msgid "DiaObject:"
--msgstr "Obiekt:"
--
--#: ../app/sheets_dialog.c:837
--msgid "Sheet:"
--msgstr "Arkusz:"
--
--#: ../app/sheets_dialog.c:921
--msgid "Select SVG Shape File"
--msgstr "Wybór pliku z kształtem SVG"
--
--#: ../app/sheets_dialog_callbacks.c:165
--msgid "Copy ->"
--msgstr "Skopiuj ->"
--
--#: ../app/sheets_dialog_callbacks.c:167
--msgid "Copy All ->"
--msgstr "Skopiuj wszystko ->"
--
--#: ../app/sheets_dialog_callbacks.c:169
--msgid "Move ->"
--msgstr "Przesuń ->"
--
--#: ../app/sheets_dialog_callbacks.c:171
--msgid "Move All ->"
--msgstr "Przesuń wszystko ->"
--
--#: ../app/sheets_dialog_callbacks.c:304
--#, c-format
--msgid ""
--"%s\n"
--"Shape"
--msgstr ""
--"%s\n"
--"Kształt"
--
--#: ../app/sheets_dialog_callbacks.c:307
-+#: ../app/sheets_dialog_callbacks.c:306
- #, c-format
- msgid ""
- "%s\n"
-@@ -1920,7 +1986,7 @@ msgstr ""
- "%s\n"
- "Obiekt"
- 
--#: ../app/sheets_dialog_callbacks.c:310
-+#: ../app/sheets_dialog_callbacks.c:309
- #, c-format
- msgid ""
- "%s\n"
-@@ -1929,246 +1995,272 @@ msgstr ""
- "%s\n"
- "Nieprzypisany typ"
- 
--#: ../app/sheets_dialog_callbacks.c:801
-+#: ../app/sheets_dialog_callbacks.c:771
-+#, fuzzy
-+msgid "Please select a .shape file"
-+msgstr "Wybór pliku kształtu SVG"
-+
-+#: ../app/sheets_dialog_callbacks.c:778
- #, c-format
- msgid "Filename must end with '%s': '%s'"
- msgstr "Nazwa pliku musi kończyć się na \"%s\": \"%s\""
- 
--#: ../app/sheets_dialog_callbacks.c:809
-+#: ../app/sheets_dialog_callbacks.c:786
- #, c-format
- msgid "Error examining %s: %s"
- msgstr "BÅ‚Ä…d przy sprawdzaniu %s: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:830
-+#: ../app/sheets_dialog_callbacks.c:817
-+msgid "Please export the diagram as a shape."
-+msgstr ""
-+
-+#: ../app/sheets_dialog_callbacks.c:820
- #, c-format
- msgid "Could not interpret shape file: '%s'"
- msgstr "Nie można zinterpretować kształtu: \"%s\""
- 
--#: ../app/sheets_dialog_callbacks.c:900
-+#: ../app/sheets_dialog_callbacks.c:888
- msgid "Sheet must have a Name"
- msgstr "Arkusz musi posiadać nazwę"
- 
--#: ../app/sheets_dialog_callbacks.c:1597 ../app/sheets_dialog_callbacks.c:1604
-+#: ../app/sheets_dialog_callbacks.c:1582 ../app/sheets_dialog_callbacks.c:1589
- #, c-format
- msgid "Couldn't open '%s': %s"
- msgstr "Nie można otworzyć \"%s\": %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1656
-+#: ../app/sheets_dialog_callbacks.c:1643
- #, c-format
- msgid "Couldn't open: '%s' for writing"
- msgstr "Nie można otworzyć: \"%s\" do zapisu."
- 
--#: ../app/sheets_dialog_callbacks.c:1666
-+#: ../app/sheets_dialog_callbacks.c:1653
- msgid "a user"
- msgstr "użytkownik"
- 
--#: ../app/sheets_dialog_callbacks.c:1679
-+#: ../app/sheets_dialog_callbacks.c:1666
- #, c-format
- msgid "File: %s"
- msgstr "Plik: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1682
-+#: ../app/sheets_dialog_callbacks.c:1669
- #, c-format
- msgid "Date: %s"
- msgstr "Data: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1686
-+#: ../app/sheets_dialog_callbacks.c:1673
- #, c-format
- msgid "For: %s"
- msgstr "Dla: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1703
-+#: ../app/sheets_dialog_callbacks.c:1690
- msgid "add shapes here"
- msgstr "dodaj tutaj kształty"
- 
--#: ../app/splash.c:56
--msgid "Loading ..."
--msgstr "Wczytywanie ..."
-+#: ../app/splash.c:50
-+msgid "Loading …"
-+msgstr "Wczytywanie..."
- 
--#: ../app/splash.c:74
-+#: ../app/splash.c:68
- #, c-format
- msgid "Dia v %s"
--msgstr "Dia wer. %s"
-+msgstr "Dia wersja %s"
- 
- #: ../dia.desktop.in.in.h:1
--#, fuzzy
-+msgid "Dia"
-+msgstr "Dia"
-+
-+#: ../dia.desktop.in.in.h:3
- msgid "Dia Diagram Editor"
--msgstr "Edytor diagramu"
-+msgstr "Edytor diagramów Dia"
- 
--#: ../dia.desktop.in.in.h:2
--#, fuzzy
-+#: ../dia.desktop.in.in.h:4
- msgid "Edit your Diagrams"
--msgstr "Wyeksportuj diagram"
-+msgstr "Edycja diagramów"
- 
--#: ../lib/arrows.c:44
-+#: ../lib/arrows.c:1891
- msgid "Lines"
- msgstr "Linie"
- 
--#: ../lib/arrows.c:45
-+#: ../lib/arrows.c:1892
- msgid "Hollow Triangle"
- msgstr "Pusty trójkąt"
- 
--#: ../lib/arrows.c:46
-+#: ../lib/arrows.c:1893
- msgid "Filled Triangle"
- msgstr "Wypełniony trójkąt"
- 
--#: ../lib/arrows.c:47
-+#: ../lib/arrows.c:1894
- msgid "Unfilled Triangle"
- msgstr "Niewypełniony trójkąt"
- 
--#: ../lib/arrows.c:48
-+#: ../lib/arrows.c:1895
- msgid "Hollow Diamond"
- msgstr "Wydrążony diament"
- 
--#: ../lib/arrows.c:49
-+#: ../lib/arrows.c:1896
- msgid "Filled Diamond"
- msgstr "Wypełniony diament"
- 
--#: ../lib/arrows.c:50
-+#: ../lib/arrows.c:1897
- msgid "Half Diamond"
- msgstr "Przepołowiony diament"
- 
--#: ../lib/arrows.c:51
-+#: ../lib/arrows.c:1898
- msgid "Half Head"
- msgstr "Połowa kąta"
- 
--#: ../lib/arrows.c:52
-+#: ../lib/arrows.c:1899
- msgid "Slashed Cross"
- msgstr "Przekreślony krzyżyk"
- 
--#: ../lib/arrows.c:53
-+#: ../lib/arrows.c:1900
- msgid "Filled Ellipse"
- msgstr "Wypełniona elipsa"
- 
--#: ../lib/arrows.c:54
-+#: ../lib/arrows.c:1901
- msgid "Hollow Ellipse"
- msgstr "Pusta elipsa"
- 
--#: ../lib/arrows.c:55
-+#: ../lib/arrows.c:1902
- msgid "Filled Dot"
- msgstr "Wypełniony punkt"
- 
--#: ../lib/arrows.c:56
-+#: ../lib/arrows.c:1903
- msgid "Dimension Origin"
- msgstr "Znacznik wymiaru"
- 
--#: ../lib/arrows.c:57
-+#: ../lib/arrows.c:1904
- msgid "Blanked Dot"
- msgstr "Niewypełniony punkt"
- 
--#: ../lib/arrows.c:58
-+#: ../lib/arrows.c:1905
- msgid "Double Hollow Triangle"
- msgstr "Podwójny pusty trójkąt"
- 
--#: ../lib/arrows.c:59
-+#: ../lib/arrows.c:1906
- msgid "Double Filled Triangle"
- msgstr "Podwójny wypełniony trójkąt"
- 
--#: ../lib/arrows.c:60
-+#: ../lib/arrows.c:1907
- msgid "Filled Dot and Triangle"
- msgstr "Wypełniony punkt i trójkąt"
- 
--#: ../lib/arrows.c:61
-+#: ../lib/arrows.c:1908
- msgid "Filled Box"
- msgstr "Wypełniony prostokąt"
- 
--#: ../lib/arrows.c:62
-+#: ../lib/arrows.c:1909
- msgid "Blanked Box"
- msgstr "Pusty prostokÄ…t"
- 
--#: ../lib/arrows.c:63
-+#: ../lib/arrows.c:1910
- msgid "Slashed"
- msgstr "Podwójny ukośnik"
- 
--#: ../lib/arrows.c:64
-+#: ../lib/arrows.c:1911
- msgid "Integral Symbol"
- msgstr "Symbol liczby całk."
- 
--#: ../lib/arrows.c:65
-+#: ../lib/arrows.c:1912
- msgid "Crow Foot"
- msgstr "Stopa kruka"
- 
--#: ../lib/arrows.c:66
-+#: ../lib/arrows.c:1913
- msgid "Cross"
- msgstr "Krzyżyk"
- 
--#: ../lib/arrows.c:67
-+#: ../lib/arrows.c:1914
- msgid "1-or-many"
- msgstr ""
- 
--#: ../lib/arrows.c:68
-+#: ../lib/arrows.c:1915
- msgid "0-or-many"
- msgstr ""
- 
--#: ../lib/arrows.c:69
-+#: ../lib/arrows.c:1916
- msgid "1-or-0"
- msgstr ""
- 
--#: ../lib/arrows.c:70
-+#: ../lib/arrows.c:1917
- msgid "1 exactly"
- msgstr ""
- 
--#: ../lib/arrows.c:71
-+#: ../lib/arrows.c:1918
- msgid "Filled Concave"
- msgstr "Wypełniona wklęsłość"
- 
--#: ../lib/arrows.c:72
-+#: ../lib/arrows.c:1919
- msgid "Blanked Concave"
- msgstr "Niewypełniona wklęsłość"
- 
--#: ../lib/arrows.c:73
-+#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
-+#: ../lib/properties.h:489 ../lib/properties.h:495
- msgid "Round"
--msgstr "OkrÄ…g"
-+msgstr "ZaokrÄ…glone"
- 
--#: ../lib/arrows.c:74
-+#: ../lib/arrows.c:1921
- msgid "Open Round"
--msgstr ""
-+msgstr "ZaokrÄ…glone otwarte"
- 
--#: ../lib/arrows.c:75
-+#: ../lib/arrows.c:1922
- msgid "Backslash"
--msgstr ""
-+msgstr "Ukośnik"
- 
--#: ../lib/arrows.c:76
-+#: ../lib/arrows.c:1923
- msgid "Infinite Line"
--msgstr ""
-+msgstr "Linia nieskończona"
- 
--#: ../lib/arrows.c:1892
-+#: ../lib/arrows.c:2051
- msgid "Arrow head of unknown type"
--msgstr ""
-+msgstr "Strzałka nieznanego typu"
- 
--#: ../lib/arrows.c:1900
--#, c-format
--msgid "Arrow head of type %s has too small dimensions, removing.\n"
--msgstr ""
-+#: ../lib/arrows.c:2059
-+#, fuzzy, c-format
-+msgid "Arrow head of type %s has too small dimensions; removing.\n"
-+msgstr "Strzałka typu %s jest zbyt mała, usuwam.\n"
- 
--#: ../lib/arrows.c:2021
--#, fuzzy
-+#: ../lib/arrows.c:2192
- msgid "unknown arrow"
--msgstr "Strzałka skierowana w dół"
-+msgstr "nieznana strzałka"
- 
--#: ../lib/bezier_conn.c:636
-+#: ../lib/bezier_conn.c:638
- msgid "Internal error: Setting corner type of endpoint of bezier"
- msgstr ""
- "Błąd wewnętrzny: Ustawianie typu narożnika końcowego punktu krzywej Beziera"
- 
- #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
- #: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
--#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:335
--#: ../plug-ins/svg/svg-import.c:204 ../plug-ins/vdx/vdx-import.c:140
-+#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-+#: ../plug-ins/svg/svg-import.c:331 ../plug-ins/vdx/vdx-import.c:145
- msgid "Can't find standard object"
- msgstr "Nie można znaleźć obiektu standardowego"
- 
--#: ../lib/dia_dirs.c:238
-+#: ../lib/dia_dirs.c:327
-+#, c-format
-+msgid "Too many \"..\"s in filename %s\n"
-+msgstr ""
-+
-+#. pathologic case - pixbuf not even supporting PNG?
-+#: ../lib/dia_image.c:295
- #, c-format
--msgid "%s<illegal characters>..."
-+msgid ""
-+"Unsupported file format for saving:\n"
-+"%s\n"
-+"%s"
- msgstr ""
- 
--#: ../lib/dia_dirs.c:269
-+#: ../lib/dia_image.c:298 ../plug-ins/pixbuf/pixbuf.c:93
- #, c-format
--msgid "Too many ..'s in filename %s\n"
-+msgid ""
-+"Could not save file:\n"
-+"%s\n"
-+"%s"
- msgstr ""
-+"Nie można zapisać pliku:\n"
-+"%s\n"
-+"%s"
- 
--#: ../lib/dia_xml.c:163
-+#: ../lib/dia_xml.c:197
- #, c-format
- msgid ""
- "The file %s has no encoding specification;\n"
-@@ -2177,127 +2269,164 @@ msgstr ""
- "Plik %s nie posiada zakodowanej specyfikacji;\n"
- "przypuszczalnie jest ona zakodowana w %s"
- 
--#: ../lib/dia_xml.c:565
-+#: ../lib/dia_xml.c:616
- msgid "Taking point value of non-point node."
- msgstr "Pobieranie wartości punktu dla węzła nie będącego punktem."
- 
--#: ../lib/dia_xml.c:576
-+#: ../lib/dia_xml.c:627
- #, c-format
- msgid "Incorrect x Point value \"%s\" %f; discarding it."
- msgstr "Niepoprawna wartość x Punktu \"%s\" %f; odrzucenie tej wartości."
- 
--#: ../lib/dia_xml.c:583
-+#: ../lib/dia_xml.c:634
- msgid "Error parsing point."
- msgstr "BÅ‚Ä…d przetwarzania punktu."
- 
- #. don't bother with useless warnings (see above)
--#: ../lib/dia_xml.c:591
-+#: ../lib/dia_xml.c:642
- #, c-format
- msgid "Incorrect y Point value \"%s\" %f; discarding it."
- msgstr "Niepoprawna wartość y Punktu \"%s\" %f; odrzucenie tej wartości."
- 
--#: ../lib/dia_xml.c:1063
--msgid ""
--"Your local character set is UTF-8. Because of issues with libxml1 and the "
--"support of files generated by previous versions of dia, you will encounter  "
--"problems. Please report to dia-list@gnome.org if you see this message."
--msgstr ""
--"Twoje lokalne ustawienia znaków są przestawione na UTF-8. Z powodu wydania "
--"libxml1 oraz obsługi plików generowanych przez poprzednie wersje Dia, "
--"napotkasz problemy. Proszę wyślij informacje na adres dia-list@gnome.org (w "
--"języku angielskim), jeśli ujrzysz ten komunikat."
-+#: ../lib/dia_xml.c:659
-+msgid "Taking bezpoint value of non-point node."
-+msgstr "Pobieranie wartości punktu Beziera dla węzła nie będącego punktem."
-+
-+#: ../lib/dia_xml.c:677
-+msgid "Error parsing bezpoint p1."
-+msgstr "BÅ‚Ä…d przetwarzania punktu Beziera p1."
-+
-+#: ../lib/dia_xml.c:691
-+msgid "Error parsing bezpoint p2."
-+msgstr "BÅ‚Ä…d przetwarzania punktu Beziera p2."
- 
--#: ../lib/diaarrowchooser.c:322
-+#: ../lib/dia_xml.c:705
-+msgid "Error parsing bezpoint p3."
-+msgstr "BÅ‚Ä…d przetwarzania punktu Beziera p3."
-+
-+#: ../lib/diaarrowchooser.c:381
- msgid "Arrow Properties"
- msgstr "Właściwości strzałki"
- 
--#: ../lib/diaarrowchooser.c:421 ../lib/dialinechooser.c:333
--msgid "Details..."
--msgstr "Szczegóły..."
-+#: ../lib/diaarrowselector.c:121
-+msgid "More arrows"
-+msgstr "Więcej strzałek"
-+
-+#: ../lib/diaarrowselector.c:138
-+msgid "Size: "
-+msgstr "Rozmiar: "
-+
-+#: ../lib/diacolorselector.c:205
-+msgid "Select color"
-+msgstr "Wybierz kolor"
- 
--#. This is the default text shown in the preview entry, though the user
--#. can set it. Remember that some fonts only have capital letters.
--#: ../lib/diagtkfontsel.c:74
--msgid "abcdefghijk ABCDEFGHIJK"
--msgstr "aąbcćdeęfg AĄBCĆDEĘFG"
-+#: ../lib/diacolorselector.c:287
-+msgid "More colors…"
-+msgstr "Więcej kolorów..."
- 
--#: ../lib/diagtkfontsel.c:209
--msgid "Font name"
--msgstr "Nazwa czcionki"
-+#: ../lib/diadynamicmenu.c:392
-+msgid "Reset menu"
-+msgstr "Resetuj menu"
-+
-+#: ../lib/diafontselector.c:159
-+msgid "Other fonts"
-+msgstr "Inne czcionki"
-+
-+#: ../lib/diafontselector.c:231
-+#, c-format
-+msgid "Couldn't find font family for %s\n"
-+msgstr "Nie można odnaleźć rodziny czcionek dla %s\n"
- 
--#: ../lib/diagtkfontsel.c:210
--msgid "The X string that represents this font."
--msgstr "Napis X reprezentujÄ…cy tÄ… czcionkÄ™."
-+#: ../lib/dialinechooser.c:309
-+msgid "Line Style Properties"
-+msgstr "Właściwości stylu linii"
- 
--#: ../lib/diagtkfontsel.c:216
--msgid "Preview text"
--msgstr "Napis podglÄ…du"
-+#: ../lib/dialinechooser.c:344
-+msgid "Details…"
-+msgstr "Szczegóły..."
- 
--#: ../lib/diagtkfontsel.c:217
--msgid "The text to display in order to demonstrate the selected font."
--msgstr "Tekst to wyświetlenia w celu zademonstrowania wybranej czcionki."
-+# FIXME
-+# lib/widgets.c: "Linia ciągła"
-+# objects/FS/function.c: "Stały"
-+#: ../lib/dialinestyleselector.c:124
-+#, fuzzy
-+msgid "line|Solid"
-+msgstr "Jednolita"
- 
--#: ../lib/diagtkfontsel.c:321
--msgid "_Family:"
--msgstr "_Rodzina:"
-+#: ../lib/dialinestyleselector.c:130
-+#, fuzzy
-+msgid "line|Dashed"
-+msgstr "Linia przerywana"
- 
--#: ../lib/diagtkfontsel.c:327
--msgid "_Style:"
--msgstr "_Styl:"
-+#: ../lib/dialinestyleselector.c:136
-+#, fuzzy
-+msgid "line|Dash-Dot"
-+msgstr "Linia-kropka"
- 
--#: ../lib/diagtkfontsel.c:333
--msgid "Si_ze:"
--msgstr "Ro_zmiar:"
-+#: ../lib/dialinestyleselector.c:142
-+#, fuzzy
-+msgid "line|Dash-Dot-Dot"
-+msgstr "Linia-kropka-kropka"
- 
--#. create the text entry widget
--#: ../lib/diagtkfontsel.c:462
--msgid "_Preview:"
--msgstr "_PodglÄ…d:"
-+#: ../lib/dialinestyleselector.c:148
-+#, fuzzy
-+msgid "line|Dotted"
-+msgstr "Linia kropkowana"
- 
--#: ../lib/diagtkfontsel.c:1252
--msgid "Font Selection"
--msgstr "Wybór czcionki"
-+#. fs->sizebox = GTK_HBOX(box);
-+#: ../lib/dialinestyleselector.c:166
-+msgid "Dash length: "
-+msgstr "Długość odcinka linii: "
- 
--#: ../lib/dialibartrenderer.c:295
--msgid "gdk_renderer: Unsupported fill mode specified!\n"
--msgstr "gdk_renderer: Podano nieobsługiwany tryb wypełniania!\n"
-+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
-+msgid "OK"
-+msgstr "OK"
- 
--#: ../lib/dialinechooser.c:297
--msgid "Line Style Properties"
--msgstr "Właściwości stylu linii"
-+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
-+msgid "Cancel"
-+msgstr "Anuluj"
- 
--#: ../lib/filter.c:126
-+#: ../lib/filter.c:177
- #, c-format
- msgid "Multiple export filters with unique name %s"
- msgstr "Wielokrotny eksport filtrów z unikalną nazwą %s"
- 
--#: ../lib/font.c:102
-+#: ../lib/font.c:85
- #, c-format
- msgid "Can't load font %s.\n"
- msgstr "Nie można wczytać czcionki %s.\n"
- 
--#: ../lib/message.c:80 ../lib/message.c:226
-+#: ../lib/group.c:617
-+#, fuzzy
-+msgid "Transformation"
-+msgstr "Informacja"
-+
-+#: ../lib/message.c:93 ../lib/message.c:282
- msgid "Warning"
- msgstr "Ostrzeżenie"
- 
--#: ../lib/message.c:106
-+#: ../lib/message.c:120
- msgid "There is one similar message."
- msgstr "Istnieje już jeden podobny komunikat."
- 
--#: ../lib/message.c:111
-+#: ../lib/message.c:125
- msgid "Show repeated messages"
- msgstr "Wyświetlanie powtórzonych komunikatów"
- 
--#: ../lib/message.c:170
-+#: ../lib/message.c:146
-+msgid "Don't show this message again"
-+msgstr "Nie pokazuj ponownie tej informacji"
-+
-+#: ../lib/message.c:204
- #, c-format
- msgid "There are %d similar messages."
- msgstr "Istnieje już %d podobnych komunikatów."
- 
--#: ../lib/message.c:215
-+#: ../lib/message.c:266
- msgid "Notice"
- msgstr "Uwaga"
- 
--#: ../lib/object_defaults.c:127
-+#: ../lib/object_defaults.c:128
- #, c-format
- msgid ""
- "Error loading defaults '%s'.\n"
-@@ -2306,43 +2435,39 @@ msgstr ""
- "Błąd przy odczycie wartości domyślnych '%s'.\n"
- "Plik nie jest plikiem Dia."
- 
--#: ../lib/plug-ins.c:120
-+#. base property stuff...
-+#: ../lib/orth_conn.h:92
-+#, fuzzy
-+msgid "Autoroute"
-+msgstr "Router IAD"
-+
-+#: ../lib/orth_conn.h:103
-+msgid "Autorouting"
-+msgstr ""
-+
-+#: ../lib/plug-ins.c:111
- msgid "???"
- msgstr "???"
- 
--#: ../lib/plug-ins.c:227
-+#: ../lib/plug-ins.c:186
- #, c-format
--msgid "Could not deduce correct path for `%s'"
--msgstr "Nie można wywnioskować poprawnej ścieżki dla \"%s\""
--
--#: ../lib/plug-ins.c:233
--#, c-format
--msgid ""
--"Could not load plugin '%s'\n"
--"%s"
-+msgid "Missing dependencies for '%s'?"
- msgstr ""
--"Nie można wczytać wtyczki \"%s\"\n"
--"%s"
--
--#: ../lib/plug-ins.c:246
--#, c-format
--msgid "Could not find plugin init function in `%s'"
--msgstr "Nie można odnaleźć funkcji inicjującej wtyczkę w \"%s\""
- 
--#: ../lib/plug-ins.c:248
-+#: ../lib/plug-ins.c:197
- msgid "Missing symbol 'dia_plugin_init'"
- msgstr "BrakujÄ…cy symbol \"dia_plugin_init\""
- 
--#: ../lib/plug-ins.c:256 ../lib/plug-ins.c:264
-+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
- msgid "dia_plugin_init() call failed"
- msgstr "wywołanie dia_pugin_init() zakończone niepowodzeniem"
- 
--#: ../lib/plug-ins.c:283
-+#: ../lib/plug-ins.c:232
- #, c-format
- msgid "%s Plugin could not be unloaded"
- msgstr "Nie można usunąć wtyczki %s"
- 
--#: ../lib/plug-ins.c:371
-+#: ../lib/plug-ins.c:303
- #, c-format
- msgid ""
- "Could not open `%s'\n"
-@@ -2351,322 +2476,786 @@ msgstr ""
- "Nie można otworzyć \"%s\"\n"
- "\"%s\""
- 
--#: ../lib/prop_text.c:466
-+#: ../lib/prop_dict.c:43
-+msgid "Author"
-+msgstr "Autor"
-+
-+#: ../lib/prop_dict.c:44
-+msgid "Identifier"
-+msgstr "Identyfikator"
-+
-+#: ../lib/prop_dict.c:45
-+msgid "Creation date"
-+msgstr "Data utworzenia"
-+
-+#: ../lib/prop_dict.c:46
-+msgid "Modification date"
-+msgstr "Data modyfikacji"
-+
-+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:878
-+msgid "URL"
-+msgstr "URL"
-+
-+#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
-+msgid "Key"
-+msgstr "Klucz"
-+
-+#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
-+#: ../objects/UML/umlparameter.c:47
-+msgid "Value"
-+msgstr "Wartość"
-+
-+#: ../lib/prop_inttypes.c:567
-+msgid "Property cast from int to enum out of range"
-+msgstr ""
-+
-+#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
-+#, c-format
-+msgid ""
-+"Failed to load image form diagram:\n"
-+"%s"
-+msgstr ""
-+
-+#: ../lib/prop_pixbuf.c:200
-+#, c-format
-+msgid ""
-+"Saving inline pixbuf failed:\n"
-+"%s"
-+msgstr ""
-+
-+#: ../lib/prop_pixbuf.c:296
-+msgid "Cant create image data from scratch!"
-+msgstr ""
-+
-+#: ../lib/prop_text.c:473
- #, c-format
- msgid "Group with %d objects"
- msgstr ""
- 
--#: ../lib/properties.c:64 ../lib/properties.h:469 ../lib/widgets.c:638
-+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:236
-+#: ../objects/UML/object.c:147
-+#, fuzzy
-+msgid "General"
-+msgstr "Generator prÄ…du zmiennego"
-+
-+#: ../lib/propdialogs.c:325
-+msgid "Meta"
-+msgstr ""
-+
-+#: ../lib/properties.c:67 ../lib/properties.h:476 ../lib/widgets.c:273
- msgid "Left"
- msgstr "Lewa"
- 
--#: ../lib/properties.c:65 ../lib/properties.h:470 ../lib/widgets.c:644
--#: ../objects/standard/textobj.c:133
-+#: ../lib/properties.c:68 ../lib/properties.h:477 ../lib/widgets.c:274
-+#: ../objects/standard/textobj.c:138
- msgid "Center"
- msgstr "Wyśrodkowanie"
- 
--#: ../lib/properties.c:66 ../lib/properties.h:471 ../lib/widgets.c:650
-+#: ../lib/properties.c:69 ../lib/properties.h:478 ../lib/widgets.c:275
- msgid "Right"
- msgstr "Prawa"
- 
--#: ../lib/properties.c:73 ../lib/properties.h:487 ../lib/properties.h:490
--#: ../objects/chronogram/chronoline.c:179
--#: ../objects/chronogram/chronoref.c:158
-+#: ../lib/properties.c:74 ../lib/properties.h:482
-+msgid "Never"
-+msgstr ""
-+
-+#: ../lib/properties.c:75 ../lib/properties.h:483
-+msgid "When Needed"
-+msgstr ""
-+
-+#: ../lib/properties.c:76 ../lib/properties.h:484
-+msgid "Always"
-+msgstr ""
-+
-+#: ../lib/properties.c:80 ../lib/properties.h:488
-+msgid "Miter"
-+msgstr ""
-+
-+#: ../lib/properties.c:82 ../lib/properties.h:490
-+msgid "Bevel"
-+msgstr ""
-+
-+#: ../lib/properties.c:86 ../lib/properties.h:494
-+msgid "Butt"
-+msgstr ""
-+
-+#: ../lib/properties.c:88 ../lib/properties.h:496
-+#, fuzzy
-+msgid "Projecting"
-+msgstr "Bez ochrony"
-+
-+#: ../lib/properties.c:95 ../lib/properties.h:517 ../lib/properties.h:520
-+#: ../objects/chronogram/chronoline.c:181
-+#: ../objects/chronogram/chronoref.c:160
- msgid "Line color"
- msgstr "Kolor linii"
- 
--#: ../lib/properties.c:74 ../lib/properties.h:493 ../lib/properties.h:496
-+#: ../lib/properties.c:96 ../lib/properties.h:523 ../lib/properties.h:526
- msgid "Line style"
- msgstr "Styl linii"
- 
--#: ../lib/properties.c:75 ../lib/properties.h:500 ../lib/properties.h:503
-+#: ../lib/properties.c:97 ../lib/properties.h:542 ../lib/properties.h:545
- msgid "Fill color"
- msgstr "Kolor wypełnienia"
- 
--#: ../lib/properties.c:76 ../lib/properties.h:506 ../lib/properties.h:509
-+#: ../lib/properties.c:98 ../lib/properties.h:548 ../lib/properties.h:551
- msgid "Draw background"
- msgstr "Rysowanie tła"
- 
--#: ../lib/properties.c:77 ../lib/properties.h:513
-+#: ../lib/properties.c:99 ../lib/properties.h:555
- msgid "Start arrow"
- msgstr "Początek strzałki"
- 
--#: ../lib/properties.c:78 ../lib/properties.h:516
-+#: ../lib/properties.c:100 ../lib/properties.h:558
- msgid "End arrow"
- msgstr "Koniec strzałki"
- 
--#: ../lib/properties.c:80 ../lib/properties.h:526
-+#: ../lib/properties.c:102 ../lib/properties.h:568
- msgid "Text alignment"
- msgstr "Wyrównanie tekstu"
- 
- #. all this just to make the defaults selectable ...
--#: ../lib/properties.c:81 ../lib/properties.h:531
--#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:165
--#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class.c:169
--#: ../objects/UML/class_dialog.c:394 ../objects/chronogram/chronoline.c:183
--#: ../objects/chronogram/chronoref.c:164
-+#: ../lib/properties.c:103 ../lib/properties.h:573
-+#: ../objects/Database/table_dialog.c:1045 ../objects/Database/reference.c:118
-+#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:177
-+#: ../objects/UML/class_dialog.c:455 ../objects/chronogram/chronoline.c:185
-+#: ../objects/chronogram/chronoref.c:166
- msgid "Font"
- msgstr "Czcionka"
- 
--#: ../lib/properties.c:82 ../lib/properties.h:537
--#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
--#: ../objects/GRAFCET/transition.c:144 ../objects/chronogram/chronoline.c:185
--#: ../objects/chronogram/chronoref.c:166
-+#: ../lib/properties.c:104 ../lib/properties.h:581
-+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
-+#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
-+#: ../objects/chronogram/chronoref.c:168
- msgid "Font size"
- msgstr "Rozmiar czcionki"
- 
--#: ../lib/properties.c:83 ../lib/properties.h:543
--#: ../objects/GRAFCET/step.c:169 ../objects/chronogram/chronoline.c:187
--#: ../objects/chronogram/chronoref.c:168
-+#: ../lib/properties.c:105 ../lib/properties.h:587
-+#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-+#: ../objects/chronogram/chronoref.c:170
- msgid "Text color"
- msgstr "Kolor tekstu"
- 
-+#: ../lib/properties.h:529 ../lib/properties.h:532
-+#, fuzzy
-+msgid "Line join"
-+msgstr "Szerokość linii"
-+
-+#: ../lib/properties.h:535 ../lib/properties.h:538
-+#, fuzzy
-+msgid "Line caps"
-+msgstr "Odstępy w linii"
-+
-+#: ../lib/properties.h:596
-+#, fuzzy
-+msgid "Text fitting"
-+msgstr "Wyrównanie tekstu"
-+
- #: ../lib/proplist.c:163
- #, c-format
--msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
-+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
- msgstr ""
- 
--#: ../lib/widgets.c:375
--#, fuzzy
--msgid "Other fonts"
--msgstr "Inne czcionki..."
--
--#: ../lib/widgets.c:445
-+#: ../lib/sheet.c:71 ../lib/sheet.c:86
- #, c-format
--msgid "Couldn't find font family for %s\n"
--msgstr "Nie można odnaleźć rodziny czcionek dla czcionki %s\n"
-+msgid ""
-+"DiaObject '%s' needed in sheet '%s' was not found.\n"
-+"It will not be available for use."
-+msgstr ""
- 
--# FIXME
--# lib/widgets.c: "Linia ciągła"
--# objects/FS/function.c: "Stały"
--#. Translators: Menu item Noun/Material/Solid
--#: ../lib/widgets.c:786 ../objects/FS/function.c:1074
--msgid "Solid"
--msgstr "Jednolita"
-+#: ../lib/sheet.c:316
-+#, c-format
-+msgid ""
-+"The system sheet '%s' appears to be more recent than your custom\n"
-+"version and has been loaded as '%s' for this session.\n"
-+"\n"
-+"Move new objects (if any) from '%s' into your custom sheet\n"
-+"or remove '%s', using the 'Sheets and Objects' dialog."
-+msgstr ""
- 
--#: ../lib/widgets.c:792
--msgid "Dashed"
--msgstr "Linia przerywana"
-+#: ../lib/sheet.c:375
-+#, c-format
-+msgid "%s: you should use object tags rather than shape tags now"
-+msgstr ""
- 
--#: ../lib/widgets.c:798
--msgid "Dash-Dot"
--msgstr "Linia-kropka"
-+#: ../lib/widgets.c:394
-+msgid "Select image file"
-+msgstr "Wybierz plik z obrazem"
- 
--#: ../lib/widgets.c:804
--msgid "Dash-Dot-Dot"
--msgstr "Linia-kropka-kropka"
-+#: ../lib/widgets.c:445
-+msgid "Browse"
-+msgstr "PrzeglÄ…daj"
- 
--#: ../lib/widgets.c:810
--msgid "Dotted"
--msgstr "Linia kropkowana"
-+#. Installer message if no GTK+ was found
-+#: ../installer/win32/gennsh.c:39
-+msgid ""
-+"GTK+ is not installed. Please use the full installer. It is available from "
-+"http://dia-installer.de."
-+msgstr ""
-+"GTK+ nie zostało zainstalowane. Proszę użyć pełnej wersji instalatora. Jest "
-+"on dostępny na stronie: http://dia-installer.de."
- 
--#. fs->sizebox = GTK_HBOX(box);
--#: ../lib/widgets.c:829
--msgid "Dash length: "
--msgstr "Długość odcinka linii:"
-+#. Installer message: Don't install over pre 0.95 versions
-+#: ../installer/win32/gennsh.c:42
-+msgid ""
-+"Please remove old Dia installations completely or install Dia to a different "
-+"location."
-+msgstr ""
-+"Proszę usunąć całkowicie poprzednią instalację Dia lub zainstalować Dia w "
-+"innym miejscu."
- 
--#: ../lib/widgets.c:959
--msgid "Select color"
--msgstr "Wybierz kolor"
-+#. Installer message:  License Page
-+#: ../installer/win32/gennsh.c:45
-+msgid "Next >"
-+msgstr "Dalej >"
- 
--#: ../lib/widgets.c:1025
--msgid "More colors..."
-+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-+#: ../installer/win32/gennsh.c:48
-+msgid ""
-+"$(^Name) is released under the GPL license. The license is provided here for "
-+"information purposes only. $_CLICK"
-+msgstr ""
-+"$(^Name) jest rozpowszechniane na licencji GPL. Licencja jest dostępna tutaj "
-+"jedynie w celach informacyjnych. $_CLICK"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:51
-+msgid "Dia Diagram Editor (required)"
-+msgstr "Edytor diagramów Dia (wymagane)"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:54
-+msgid "Translations"
-+msgstr "TÅ‚umaczenia"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:57
-+msgid "Optional translations of the Dia user interface"
-+msgstr "Opcjonalne tłumaczenia interfejsu użytkownika Dia"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:60
-+msgid "Core Dia files and dlls"
-+msgstr "Główne pliki Dia i biblioteki DLL"
-+
-+#. Installer message: Component name
-+#: ../installer/win32/gennsh.c:63
-+msgid "Python plug-in"
-+msgstr "Wtyczka Pythona"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:66
-+msgid ""
-+"Support for the Python Scripting Language 2.3. Do not select this if Python "
-+"is not installed."
- msgstr ""
-+"Wsparcie dla skryptów pisanych w Pythonie 2.3. Nie wybieraj tej opcji jeśli "
-+"Python nie jest zainstalowany."
- 
--#: ../lib/widgets.c:1149
--#, fuzzy
--msgid "More arrows"
--msgstr "Strzałka kropkowana"
-+#. Installer message: hyperlink text on finish page
-+#: ../installer/win32/gennsh.c:69
-+msgid "Visit the Dia for Windows Web Page"
-+msgstr "Odwiedź stronę \"Dia for Windows\""
- 
--#: ../lib/widgets.c:1162
--#, fuzzy
--msgid "Size: "
--msgstr "Ro_zmiar:"
-+#. Installer message: Dia uninstaller entry in Control Panel
-+#: ../installer/win32/gennsh.c:72
-+msgid "Dia (remove only)"
-+msgstr "Dia (tylko usuń)"
- 
--#: ../lib/widgets.c:1314
--msgid "Select image file"
--msgstr "Wybierz plik z obrazem"
-+#. Installer message: confirmation question. Keep $\r
-+#: ../installer/win32/gennsh.c:75
-+msgid ""
-+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-+"$\rNote: Any non-standard plugins that you may have installed will be "
-+"deleted.$\rDia user settings will not be affected."
-+msgstr ""
-+"Twój stary katalog z Dia zostanie za chwilę usunięty. Czy na pewno chcesz "
-+"kontynuować?$\r$\rUwaga: Wszelkie niestandardowe wtyczki, które możesz mieć "
-+"zainstalowane zostaną usunięte.$\rNie ma to jednak wpływu na ustawienia "
-+"użytkownika Dia."
- 
--#: ../lib/widgets.c:1348
--msgid "Browse"
--msgstr "PrzeglÄ…daj"
-+#. Installer message: confirmatin question. Keep $\r
-+#: ../installer/win32/gennsh.c:78
-+msgid ""
-+"The installation directory you specified already exists. Any contents$\rwill "
-+"be deleted. Would you like to continue?"
-+msgstr ""
-+"Wskazany katalog do instalacji już istnieje. Wszelka zawartość$\rzostanie "
-+"usunięta. Czy na pewno chcesz kontynuować?"
- 
--#: ../lib/widgets.c:1962
--#, fuzzy
--msgid "Reset menu"
--msgstr "Używanie paska menu"
-+#. Installer message: Uninstall Section Prompts. Keep $\r
-+#: ../installer/win32/gennsh.c:81
-+msgid ""
-+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-+"another user installed this application."
-+msgstr ""
-+"Program odinstalowujący nie znalazł wpisów w rejestrach dla Dia.$"
-+"\rPrawdopodobnie inny użytkownik zainstalował tę aplikację."
-+
-+#. Installer message: Uninstall error message
-+#: ../installer/win32/gennsh.c:84
-+msgid "You do not have permission to uninstall this application."
-+msgstr "Nie masz uprawnień do odinstalowania tej aplikacji."
-+
-+#. Installer message: Uninstallation warning. Keep $INSTDIR
-+#: ../installer/win32/gennsh.c:87
-+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-+msgstr ""
-+"$INSTDIR i wszystkie podkatalogi zostaną całkowicie usunięte. Kontynuować?"
-+
-+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-+#: ../installer/win32/gennsh.c:90
-+msgid ""
-+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+msgstr ""
-+"$PROFILE\\.dia i wszystkie podkatalogi zostaną całkowicie usunięte. "
-+"Kontynuować?"
- 
- #: ../objects/AADL/aadl.c:52
--#, fuzzy
- msgid "Architecture Analysis & Design Language diagram objects"
--msgstr "Obiekty diagramu UML"
-+msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:138
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:147
- msgid "Declaration"
--msgstr "Opis"
-+msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:349
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:358
- msgid "Add Access Provider"
--msgstr "Serwer plików"
-+msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:351
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:360
- msgid "Add Access Requirer"
--msgstr "Serwer plików"
-+msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:353
-+#: ../objects/AADL/aadlbox.c:362
- msgid "Add In Data Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:355
-+#: ../objects/AADL/aadlbox.c:364
- msgid "Add In Event Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:357
-+#: ../objects/AADL/aadlbox.c:366
- msgid "Add In Event Data Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:359
-+#: ../objects/AADL/aadlbox.c:368
- msgid "Add Out Data Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:361
-+#: ../objects/AADL/aadlbox.c:370
- msgid "Add Out Event Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:363
-+#: ../objects/AADL/aadlbox.c:372
- msgid "Add Out Event Data Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:365
-+#: ../objects/AADL/aadlbox.c:374
- msgid "Add In Out Data Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:367
-+#: ../objects/AADL/aadlbox.c:376
- msgid "Add In Out Event Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:369
-+#: ../objects/AADL/aadlbox.c:378
- msgid "Add In Out Event Data Port"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:371
-+#: ../objects/AADL/aadlbox.c:380
- msgid "Add Port Group"
- msgstr ""
- 
--#: ../objects/AADL/aadlbox.c:373
-+#: ../objects/AADL/aadlbox.c:382
- #, fuzzy
- msgid "Add Connection Point"
- msgstr "Dodaj punkt połączenia"
- 
--#: ../objects/AADL/aadlbox.c:377
-+#: ../objects/AADL/aadlbox.c:386
- #, fuzzy
- msgid "Delete Port"
- msgstr "Usuń narożnik"
- 
--#: ../objects/AADL/aadlbox.c:378
-+#: ../objects/AADL/aadlbox.c:387
- #, fuzzy
- msgid "Edit Port Declaration"
- msgstr "Przygotowanie"
- 
--#: ../objects/AADL/aadlbox.c:382
-+#: ../objects/AADL/aadlbox.c:391
- #, fuzzy
- msgid "Delete Connection Point"
- msgstr "Usuń punkt połączenia"
- 
--#: ../objects/ER/attribute.c:155
-+#: ../objects/Database/compound.c:198
-+msgid "Number of arms"
-+msgstr "Liczba ramion"
-+
-+#: ../objects/Database/compound.c:221
-+#, fuzzy
-+msgid "Flip arms vertically"
-+msgstr "Obróć ramiona w pionie"
-+
-+#: ../objects/Database/compound.c:223
-+#, fuzzy
-+msgid "Flip arms horizontally"
-+msgstr "Obróć ramiona w poziomie"
-+
-+#: ../objects/Database/compound.c:225
-+#, fuzzy
-+msgid "Center mount point vertically"
-+msgstr "Wyśrodkuj punkt mocowania w pionie"
-+
-+#: ../objects/Database/compound.c:227
-+#, fuzzy
-+msgid "Center mount point horizontally"
-+msgstr "Wyśrodkuj punkt mocowania w poziomie"
-+
-+#: ../objects/Database/compound.c:229
-+msgid "Center mount point"
-+msgstr "Główny punkt mocowania"
-+
-+#: ../objects/Database/compound.c:234
-+msgid "Compound"
-+msgstr "Złożenie"
-+
-+#: ../objects/Database/database.c:39
-+msgid "Entity/Relationship table diagram objects"
-+msgstr "Obiekty diagramów encji/zależności między tabelami"
-+
-+#: ../objects/Database/table.c:143 ../objects/Database/table.c:187
-+#: ../objects/Database/table.c:204 ../objects/UML/class.c:149
-+#: ../objects/UML/class.c:192 ../objects/UML/class_dialog.c:486
-+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
-+msgid "Comment"
-+msgstr "Komentarz"
-+
-+#: ../objects/Database/table.c:145
-+msgid "Primary key"
-+msgstr "Klucz główny (PK)"
-+
-+#: ../objects/Database/table.c:147
-+msgid "Nullable"
-+msgstr ""
-+
-+#: ../objects/Database/table.c:149
-+msgid "Unique"
-+msgstr "Unikatowa"
-+
-+#: ../objects/Database/table.c:151
-+#, fuzzy
-+msgid "Default value"
-+msgstr "Domyślna wartość"
-+
-+#: ../objects/Database/table.c:189
-+msgid "Visible comments"
-+msgstr "Widoczne komentarze"
-+
-+#: ../objects/Database/table.c:191 ../objects/UML/class.c:172
-+#, fuzzy
-+msgid "Comment tagging"
-+msgstr "Komentarz"
-+
-+#: ../objects/Database/table.c:193 ../objects/Database/table_dialog.c:985
-+msgid "Underline primary keys"
-+msgstr "Podkreśl klucze główne"
-+
-+#: ../objects/Database/table.c:195 ../objects/Database/table_dialog.c:990
-+msgid "Use bold font for primary keys"
-+msgstr "Użyj pogrubienia dla kluczy głównych"
-+
-+#. property rows
-+#: ../objects/Database/table.c:200 ../objects/SADT/arrow.c:137
-+#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:461
-+msgid "Normal"
-+msgstr "Zwykła"
-+
-+#: ../objects/Database/table.c:202
-+#, fuzzy
-+msgid "Table name"
-+msgstr "Nazwa tabeli:"
-+
-+#: ../objects/Database/table.c:207 ../objects/Database/table.c:209
-+#: ../objects/Database/table.c:211 ../objects/Database/reference.c:121
-+#: ../objects/UML/association.c:249 ../objects/UML/association.c:260
-+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-+#: ../objects/UML/association.c:266 ../objects/UML/association.c:268
-+#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
-+#: ../objects/UML/class.c:200 ../objects/UML/class.c:202
-+#: ../objects/UML/class.c:204 ../objects/UML/class.c:206
-+msgid " "
-+msgstr " "
-+
-+#: ../objects/Database/table.c:215 ../objects/UML/class.c:212
-+#: ../objects/UML/object.c:153
-+msgid "Attributes"
-+msgstr "Atrybuty"
-+
-+#: ../objects/Database/table.c:252 ../objects/UML/class.c:324
-+msgid "Show comments"
-+msgstr "Wyświetl komentarze"
-+
-+#. init data
-+#: ../objects/Database/table.c:257 ../objects/Database/table.c:364
-+#: ../sheets/Database.sheet.in.h:3
-+msgid "Table"
-+msgstr "Tabela"
-+
-+#. Attributes page:
-+#: ../objects/Database/table_dialog.c:609
-+#: ../objects/UML/class_attributes_dialog.c:455
-+msgid "_Attributes"
-+msgstr "_Atrybuty"
-+
-+#. the "new" button
-+#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
-+#: ../objects/SISSI/sissi_dialog.c:870
-+msgid "_New"
-+msgstr "_Nowy"
-+
-+#. the "delete" button
-+#: ../objects/Database/table_dialog.c:643
-+msgid "_Delete"
-+msgstr "_Usuń"
-+
-+#. the "Move up" button
-+#: ../objects/Database/table_dialog.c:650
-+msgid "Move up"
-+msgstr "Przenieś w górę"
-+
-+#. the "Move down" button
-+#: ../objects/Database/table_dialog.c:657
-+msgid "Move down"
-+msgstr "Przenieś w dół"
-+
-+#: ../objects/Database/table_dialog.c:666
-+#: ../objects/UML/class_attributes_dialog.c:507
-+msgid "Attribute data"
-+msgstr "Dane atrybutu"
-+
-+#: ../objects/Database/table_dialog.c:676
-+#: ../objects/Database/table_dialog.c:1055 ../objects/ER/attribute.c:155
-+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-+#: ../objects/UML/class_attributes_dialog.c:517
-+#: ../objects/UML/class_operations_dialog.c:777
-+#: ../objects/UML/class_operations_dialog.c:977
-+#: ../objects/UML/class_templates_dialog.c:436 ../objects/UML/dependency.c:134
-+#: ../objects/UML/generalization.c:131 ../objects/UML/realizes.c:131
-+msgid "Name:"
-+msgstr "Nazwa:"
-+
-+#: ../objects/Database/table_dialog.c:688 ../objects/FS/flow-ortho.c:169
-+#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:162
-+#: ../objects/Jackson/phenomenon.c:146 ../objects/KAOS/metaandorrel.c:166
-+#: ../objects/KAOS/metabinrel.c:173
-+#: ../objects/UML/class_attributes_dialog.c:528
-+#: ../objects/UML/class_operations_dialog.c:788
-+#: ../objects/UML/class_operations_dialog.c:988
-+#: ../objects/UML/class_templates_dialog.c:447
-+msgid "Type:"
-+msgstr "Typ:"
-+
-+#: ../objects/Database/table_dialog.c:699
-+#, fuzzy
-+msgid "Default:"
-+msgstr "Wart. domyślne: "
-+
-+#: ../objects/Database/table_dialog.c:711
-+#: ../objects/Database/table_dialog.c:955
-+#: ../objects/Database/table_dialog.c:1060
-+#: ../objects/UML/class_attributes_dialog.c:550
-+#: ../objects/UML/class_dialog.c:343
-+#: ../objects/UML/class_operations_dialog.c:848
-+#: ../objects/UML/class_operations_dialog.c:1010
-+msgid "Comment:"
-+msgstr "Komentarz:"
-+
-+#: ../objects/Database/table_dialog.c:730
-+msgid "_Primary key"
-+msgstr "Klucz _główny"
-+
-+#: ../objects/Database/table_dialog.c:737
-+msgid "N_ullable"
-+msgstr ""
-+
-+#: ../objects/Database/table_dialog.c:744
-+msgid "Uni_que"
-+msgstr "Uni_katowa"
-+
-+#: ../objects/Database/table_dialog.c:937
-+msgid "_Table"
-+msgstr "_Tabela"
-+
-+#: ../objects/Database/table_dialog.c:945
-+msgid "Table name:"
-+msgstr "Nazwa tabeli:"
-+
-+#. XXX create a handler and disable the 'show documentation tag' checkbox
-+#. if 'comment visible' is not active.
-+#: ../objects/Database/table_dialog.c:975
-+msgid "Comment visible"
-+msgstr "Pokaż komentarz"
-+
-+#: ../objects/Database/table_dialog.c:980 ../objects/UML/class_dialog.c:413
-+msgid "Show documentation tag"
-+msgstr "Pokaż tag dokumentacji"
-+
-+#. * Fonts and Colors selection *
-+#: ../objects/Database/table_dialog.c:1019 ../objects/UML/class_dialog.c:442
-+msgid "_Style"
-+msgstr "_Styl"
-+
-+#: ../objects/Database/table_dialog.c:1030
-+msgid "Border width:"
-+msgstr "Szerokość obramowania:"
-+
-+#. head line
-+#: ../objects/Database/table_dialog.c:1043 ../objects/UML/class_dialog.c:452
-+#: ../objects/UML/umlparameter.c:51
-+msgid "Kind"
-+msgstr "Rodzaj"
-+
-+#: ../objects/Database/table_dialog.c:1047 ../objects/UML/class_dialog.c:457
-+msgid "Size"
-+msgstr "Rozmiar"
-+
-+#: ../objects/Database/table_dialog.c:1050
-+msgid "Normal:"
-+msgstr ""
-+
-+#: ../objects/Database/table_dialog.c:1071
-+msgid "Text Color:"
-+msgstr "Kolor tekstu:"
-+
-+#: ../objects/Database/table_dialog.c:1080
-+msgid "Foreground Color:"
-+msgstr "Kolor pierwszoplanowy:"
-+
-+#. two chars at the beginning
-+#: ../objects/Database/table_dialog.c:1394
-+msgid "not null"
-+msgstr ""
-+
-+#: ../objects/Database/table_dialog.c:1395
-+msgid "null"
-+msgstr ""
-+
-+#: ../objects/Database/table_dialog.c:1396
-+msgid "unique"
-+msgstr "unikalność"
-+
-+#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:154
-+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:140
-+#: ../objects/standard/zigzagline.c:136
-+msgid "Corner radius"
-+msgstr "Promień narożnika"
-+
-+#: ../objects/Database/reference.c:112
-+#, fuzzy
-+msgid "Start description"
-+msgstr "PoczÄ…tek opisu"
-+
-+#: ../objects/Database/reference.c:114
-+#, fuzzy
-+msgid "End description"
-+msgstr "Koniec opisu"
-+
-+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:406
-+#: ../objects/FS/flow-ortho.c:632 ../objects/GRAFCET/vector.c:314
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:868
-+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:382
-+#: ../objects/UML/generalization.c:379 ../objects/UML/realizes.c:369
-+#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:385
-+msgid "Add segment"
-+msgstr "Dodaj segment"
-+
-+#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:407
-+#: ../objects/FS/flow-ortho.c:633 ../objects/GRAFCET/vector.c:315
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:869
-+#: ../objects/UML/component_feature.c:192 ../objects/UML/dependency.c:383
-+#: ../objects/UML/generalization.c:380 ../objects/UML/realizes.c:370
-+#: ../objects/UML/transition.c:174 ../objects/standard/zigzagline.c:386
-+msgid "Delete segment"
-+msgstr "Usuń segment"
-+
-+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
-+msgid "Reference"
-+msgstr "Referencje"
-+
-+#: ../objects/ER/attribute.c:157
- msgid "Key:"
- msgstr "Klucz:"
- 
--#: ../objects/ER/attribute.c:157
-+#: ../objects/ER/attribute.c:159
- msgid "Weak key:"
- msgstr "SÅ‚aby klucz:"
- 
--#: ../objects/ER/attribute.c:159
-+#: ../objects/ER/attribute.c:161
- msgid "Derived:"
- msgstr "Pochodny:"
- 
--#: ../objects/ER/attribute.c:161
-+#: ../objects/ER/attribute.c:163
- msgid "Multivalue:"
- msgstr "Wartość złożona:"
- 
--#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:1
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
- msgid "Attribute"
- msgstr "Atrybut"
- 
--#: ../objects/ER/entity.c:137
-+#: ../objects/ER/entity.c:139
- msgid "Weak:"
- msgstr "SÅ‚aby:"
- 
--#: ../objects/ER/entity.c:139
--#, fuzzy
-+#: ../objects/ER/entity.c:141
- msgid "Associative:"
--msgstr "Aktywny"
-+msgstr ""
- 
--#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:129
--#: ../sheets/ER.sheet.in.h:4
-+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:132
-+#: ../sheets/ER.sheet.in.h:3
- msgid "Entity"
--msgstr "Jednostka"
-+msgstr "Encja"
- 
- #: ../objects/ER/er.c:44
- msgid "Entity/Relationship diagram objects"
- msgstr "Obiekty diagramu jednostek i zależności"
- 
--#: ../objects/ER/participation.c:116
-+#: ../objects/ER/participation.c:118
- msgid "Total:"
- msgstr "Ogółem:"
- 
--#: ../objects/ER/participation.c:406 ../objects/FS/flow-ortho.c:639
--#: ../objects/GRAFCET/vector.c:312 ../objects/SADT/arrow.c:457
--#: ../objects/UML/association.c:769 ../objects/UML/component_feature.c:184
--#: ../objects/UML/dependency.c:374 ../objects/UML/generalization.c:370
--#: ../objects/UML/realizes.c:361 ../objects/UML/transition.c:161
--#: ../objects/standard/zigzagline.c:348
--msgid "Add segment"
--msgstr "Dodaj segment"
--
--#: ../objects/ER/participation.c:407 ../objects/FS/flow-ortho.c:640
--#: ../objects/GRAFCET/vector.c:313 ../objects/SADT/arrow.c:458
--#: ../objects/UML/association.c:770 ../objects/UML/component_feature.c:185
--#: ../objects/UML/dependency.c:375 ../objects/UML/generalization.c:371
--#: ../objects/UML/realizes.c:362 ../objects/UML/transition.c:162
--#: ../objects/standard/zigzagline.c:349
--msgid "Delete segment"
--msgstr "Usuń segment"
--
--#: ../objects/ER/relationship.c:142
-+#: ../objects/ER/relationship.c:144
- msgid "Left Cardinality:"
- msgstr "Lewa zależność:"
- 
--#: ../objects/ER/relationship.c:144
-+#: ../objects/ER/relationship.c:146
- msgid "Right Cardinality:"
- msgstr "Prawa zależność:"
- 
--#: ../objects/ER/relationship.c:146
-+#: ../objects/ER/relationship.c:148
- msgid "Rotate:"
- msgstr "Obrót:"
- 
--#: ../objects/ER/relationship.c:148
-+#: ../objects/ER/relationship.c:150
- msgid "Identifying:"
- msgstr "IdentyfikujÄ…ca:"
- 
--#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Zależność"
- 
- #. Translators: Menu item Noun/Energy
--#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:636
--#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:580
--#: ../objects/FS/function.c:1096
-+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:629
-+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:631
-+#: ../objects/FS/function.c:1101
- msgid "Energy"
- msgstr "Energia"
- 
- #. Translators: Menu item Noun/Material
--#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:637
--#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:581
--#: ../objects/FS/function.c:1072
-+#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:630
-+#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:632
-+#: ../objects/FS/function.c:1077
- msgid "Material"
- msgstr "Materia"
- 
-@@ -2674,10 +3263,10 @@ msgstr "Materia"
- #. Translators: Menu item Verb/Signal/Signal
- #. Translators: Menu item Noun/Signal
- #. Translators: Menu item Noun/Signal/Signal
--#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:638
--#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:582
--#: ../objects/FS/function.c:1034 ../objects/FS/function.c:1036
--#: ../objects/FS/function.c:1172 ../objects/FS/function.c:1174
-+#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:631
-+#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:633
-+#: ../objects/FS/function.c:1039 ../objects/FS/function.c:1041
-+#: ../objects/FS/function.c:1177 ../objects/FS/function.c:1179
- msgid "Signal"
- msgstr "Sygnał"
- 
-@@ -2685,1063 +3274,1067 @@ msgstr "Sygnał"
- msgid "Function structure diagram objects"
- msgstr "Obiekty diagramu struktury funkcji"
- 
--#: ../objects/FS/function.c:142
-+#: ../objects/FS/function.c:144
- msgid "Wish function"
- msgstr "Funkcja zaprzyjaźniona"
- 
--#: ../objects/FS/function.c:144
-+#: ../objects/FS/function.c:146
- msgid "User function"
- msgstr "Funkcja użytkownika"
- 
- #. Translators: Menu item Verb
--#: ../objects/FS/function.c:676
-+#: ../objects/FS/function.c:681
- msgid "Verb"
- msgstr "Czasownik"
- 
- #. Translators: Menu item Verb/Channel
- #. Translators: Menu item Verb/Channel/Channel
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
--#: ../objects/FS/function.c:678 ../objects/FS/function.c:680
--#: ../objects/FS/function.c:720
-+#: ../objects/FS/function.c:683 ../objects/FS/function.c:685
-+#: ../objects/FS/function.c:725
- msgid "Channel"
- msgstr "Kanał"
- 
- #. Translators: Menu item Verb/Channel/Import
- #. Translators: Menu item Verb/Channel/Import/Import
--#: ../objects/FS/function.c:682 ../objects/FS/function.c:684
-+#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
- msgid "Import"
- msgstr "Importowanie"
- 
- #. Translators: Menu item Verb/Channel/Import/Input
--#: ../objects/FS/function.c:686 ../objects/KAOS/metabinrel.c:163
-+#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
- msgid "Input"
- msgstr "Wejście"
- 
- #. Translators: Menu item Verb/Channel/Import/Receive
--#: ../objects/FS/function.c:688
-+#: ../objects/FS/function.c:693
- msgid "Receive"
- msgstr "Otrzymywanie"
- 
- #. Translators: Menu item Verb/Channel/Import/Allow
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
--#: ../objects/FS/function.c:690 ../objects/FS/function.c:962
-+#: ../objects/FS/function.c:695 ../objects/FS/function.c:967
- msgid "Allow"
- msgstr "Zezwalanie"
- 
- #. Translators: Menu item Verb/Channel/Import/Form Entrance
--#: ../objects/FS/function.c:692
-+#: ../objects/FS/function.c:697
- msgid "Form Entrance"
- msgstr "Dane wej. formularza"
- 
- #. Translators: Menu item Verb/Channel/Import/Capture
- #. Translators: Menu item Verb/Provision/Store/Capture
--#: ../objects/FS/function.c:694 ../objects/FS/function.c:928
-+#: ../objects/FS/function.c:699 ../objects/FS/function.c:933
- msgid "Capture"
- msgstr "Pobieranie"
- 
- #. Translators: Menu item Verb/Channel/Export/Discharge
--#: ../objects/FS/function.c:700
-+#: ../objects/FS/function.c:705
- msgid "Discharge"
- msgstr "Rozładowanie"
- 
- #. Translators: Menu item Verb/Channel/Export/Eject
--#: ../objects/FS/function.c:702
-+#: ../objects/FS/function.c:707
- msgid "Eject"
- msgstr "Wysuwanie"
- 
- #. Translators: Menu item Verb/Channel/Export/Dispose
--#: ../objects/FS/function.c:704
-+#: ../objects/FS/function.c:709
- msgid "Dispose"
- msgstr "Rozmieszczanie"
- 
- #. Translators: Menu item Verb/Channel/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
--#: ../objects/FS/function.c:708 ../objects/FS/function.c:710
--#: ../objects/FS/function.c:728
-+#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
-+#: ../objects/FS/function.c:733
- msgid "Transfer"
- msgstr "Transferowanie"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
--#: ../objects/FS/function.c:712 ../objects/FS/function.c:714
-+#: ../objects/FS/function.c:717 ../objects/FS/function.c:719
- msgid "Transport"
- msgstr "Transportowanie"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
--#: ../objects/FS/function.c:716
-+#: ../objects/FS/function.c:721
- msgid "Lift"
- msgstr "Podnoszenie"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
--#: ../objects/FS/function.c:718
-+#: ../objects/FS/function.c:723
- msgid "Move"
- msgstr "Przesuwanie"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
--#: ../objects/FS/function.c:722 ../objects/FS/function.c:724
-+#: ../objects/FS/function.c:727 ../objects/FS/function.c:729
- msgid "Transmit"
- msgstr "Transmitowanie"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
--#: ../objects/FS/function.c:726
-+#: ../objects/FS/function.c:731
- msgid "Conduct"
- msgstr "Przekazywanie"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
--#: ../objects/FS/function.c:730
-+#: ../objects/FS/function.c:735
- msgid "Convey"
- msgstr "Przewodzenie"
- 
- #. Translators: Menu item Verb/Channel/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
--#: ../objects/FS/function.c:732 ../objects/FS/function.c:734
--#: ../objects/FS/function.c:736
-+#: ../objects/FS/function.c:737 ../objects/FS/function.c:739
-+#: ../objects/FS/function.c:741
- msgid "Guide"
- msgstr "Prowadzenie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
--#: ../objects/FS/function.c:738
-+#: ../objects/FS/function.c:743
- msgid "Direct"
- msgstr "Kierowanie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
--#: ../objects/FS/function.c:740
-+#: ../objects/FS/function.c:745
- msgid "Straighten"
- msgstr "Poprawianie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
--#: ../objects/FS/function.c:742
-+#: ../objects/FS/function.c:747
- msgid "Steer"
- msgstr "Sterowanie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Translate
--#: ../objects/FS/function.c:744
-+#: ../objects/FS/function.c:749
- msgid "Translate"
- msgstr "Przesuwanie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
--#: ../objects/FS/function.c:746 ../objects/FS/function.c:748
-+#: ../objects/FS/function.c:751 ../objects/FS/function.c:753
- msgid "Rotate"
- msgstr "Obracanie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
--#: ../objects/FS/function.c:750
-+#: ../objects/FS/function.c:755
- msgid "Turn"
- msgstr "Odwracanie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
--#: ../objects/FS/function.c:752
-+#: ../objects/FS/function.c:757
- msgid "Spin"
- msgstr "Wirowanie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
--#: ../objects/FS/function.c:754 ../objects/FS/function.c:756
-+#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
- msgid "Allow DOF"
- msgstr "Zezwalanie DOF"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
--#: ../objects/FS/function.c:758
-+#: ../objects/FS/function.c:763
- msgid "Constrain"
- msgstr "Wymaganie"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
--#: ../objects/FS/function.c:760
-+#: ../objects/FS/function.c:765
- msgid "Unlock"
- msgstr "Odblokowanie"
- 
- #. Translators: Menu item Verb/Support
- #. Translators: Menu item Verb/Support/Support
--#: ../objects/FS/function.c:762 ../objects/FS/function.c:764
-+#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
- msgid "Support"
- msgstr "Wspieranie"
- 
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
--#: ../objects/FS/function.c:766 ../objects/FS/function.c:768
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
- msgstr "Zatrzymanie"
- 
- #. Translators: Menu item Verb/Support/Stop/Insulate
--#: ../objects/FS/function.c:770
-+#: ../objects/FS/function.c:775
- msgid "Insulate"
- msgstr "Izolowanie"
- 
- #. Translators: Menu item Verb/Support/Stop/Protect
--#: ../objects/FS/function.c:772
-+#: ../objects/FS/function.c:777
- msgid "Protect"
- msgstr "Chronienie"
- 
- #. Translators: Menu item Verb/Support/Stop/Prevent
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
--#: ../objects/FS/function.c:774 ../objects/FS/function.c:964
-+#: ../objects/FS/function.c:779 ../objects/FS/function.c:969
- msgid "Prevent"
- msgstr "Zapobieganie"
- 
- #. Translators: Menu item Verb/Support/Stop/Shield
--#: ../objects/FS/function.c:776
-+#: ../objects/FS/function.c:781
- msgid "Shield"
- msgstr "Osłanianie"
- 
- #. Translators: Menu item Verb/Support/Stop/Inhibit
--#: ../objects/FS/function.c:778
-+#: ../objects/FS/function.c:783
- msgid "Inhibit"
- msgstr "Powstrzymywanie"
- 
- #. Translators: Menu item Verb/Support/Stabilize
- #. Translators: Menu item Verb/Support/Stabilize/Stabilize
--#: ../objects/FS/function.c:780 ../objects/FS/function.c:782
-+#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
- msgid "Stabilize"
- msgstr "Stabilizowanie"
- 
- #. Translators: Menu item Verb/Support/Stabilize/Steady
--#: ../objects/FS/function.c:784
-+#: ../objects/FS/function.c:789
- msgid "Steady"
- msgstr "Podtrzymywanie"
- 
- #. Translators: Menu item Verb/Support/Secure
- #. Translators: Menu item Verb/Support/Secure/Secure
--#: ../objects/FS/function.c:786 ../objects/FS/function.c:788
-+#: ../objects/FS/function.c:791 ../objects/FS/function.c:793
- msgid "Secure"
- msgstr "Zabezpieczanie"
- 
- #. Translators: Menu item Verb/Support/Secure/Attach
- #. Translators: Menu item Verb/Connect/Couple/Attach
--#: ../objects/FS/function.c:790 ../objects/FS/function.c:822
-+#: ../objects/FS/function.c:795 ../objects/FS/function.c:827
- msgid "Attach"
- msgstr "Dołączanie"
- 
- #. Translators: Menu item Verb/Support/Secure/Mount
--#: ../objects/FS/function.c:792
-+#: ../objects/FS/function.c:797
- msgid "Mount"
- msgstr "Montowanie"
- 
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:794 ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
- msgstr "Zamykanie"
- 
- #. Translators: Menu item Verb/Support/Secure/Fasten
--#: ../objects/FS/function.c:796
-+#: ../objects/FS/function.c:801
- msgid "Fasten"
- msgstr "ZawiÄ…zywanie"
- 
- #. Translators: Menu item Verb/Support/Secure/Hold
--#: ../objects/FS/function.c:798
-+#: ../objects/FS/function.c:803
- msgid "Hold"
- msgstr "Trzymanie"
- 
- #. Translators: Menu item Verb/Support/Position
- #. Translators: Menu item Verb/Support/Position/Position
--#: ../objects/FS/function.c:800 ../objects/FS/function.c:802
-+#: ../objects/FS/function.c:805 ../objects/FS/function.c:807
- #: ../objects/Istar/actor.c:70
- msgid "Position"
- msgstr "Pozycjonowanie"
- 
- #. Translators: Menu item Verb/Support/Position/Orient
--#: ../objects/FS/function.c:804
-+#: ../objects/FS/function.c:809
- msgid "Orient"
- msgstr "Orientowanie"
- 
--#. Translators: Menu item Verb/Support/Position/Locate
--#. Translators: Menu item Verb/Signal/Sense/Locate
--#: ../objects/FS/function.c:808 ../objects/FS/function.c:1050
--msgid "Locate"
--msgstr "Lokowanie"
--
- #. Translators: Menu item Verb/Connect
- #. Translators: Menu item Verb/Connect/Connect
--#: ../objects/FS/function.c:810 ../objects/FS/function.c:812
-+#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
- msgid "Connect"
- msgstr "ZÅ‚Ä…czanie"
- 
- #. Translators: Menu item Verb/Connect/Couple
- #. Translators: Menu item Verb/Connect/Couple/Couple
--#: ../objects/FS/function.c:814 ../objects/FS/function.c:816
-+#: ../objects/FS/function.c:819 ../objects/FS/function.c:821
- msgid "Couple"
- msgstr "Sczepianie"
- 
- #. Translators: Menu item Verb/Connect/Couple/Join
--#: ../objects/FS/function.c:818
-+#: ../objects/FS/function.c:823
- msgid "Join"
- msgstr "Dołączanie"
- 
- #. Translators: Menu item Verb/Connect/Couple/Assemble
--#: ../objects/FS/function.c:820
-+#: ../objects/FS/function.c:825
- msgid "Assemble"
- msgstr "Gromadzenie"
- 
- #. Translators: Menu item Verb/Connect/Mix
- #. Translators: Menu item Verb/Connect/Mix/Mix
--#: ../objects/FS/function.c:824 ../objects/FS/function.c:826
-+#: ../objects/FS/function.c:829 ../objects/FS/function.c:831
- msgid "Mix"
- msgstr "Mieszanie"
- 
- #. Translators: Menu item Verb/Connect/Mix/Combine
--#: ../objects/FS/function.c:828
-+#: ../objects/FS/function.c:833
- msgid "Combine"
- msgstr "�ączenie"
- 
- #. Translators: Menu item Verb/Connect/Mix/Blend
--#: ../objects/FS/function.c:830
-+#: ../objects/FS/function.c:835
- msgid "Blend"
- msgstr "Wtapianie"
- 
- #. Translators: Menu item Verb/Connect/Mix/Add
--#: ../objects/FS/function.c:832
-+#: ../objects/FS/function.c:837
- msgid "Add"
- msgstr "Dodawanie"
- 
- #. Translators: Menu item Verb/Connect/Mix/Pack
--#: ../objects/FS/function.c:834
-+#: ../objects/FS/function.c:839
- msgid "Pack"
- msgstr "Pakowanie"
- 
- #. Translators: Menu item Verb/Connect/Mix/Coalesce
--#: ../objects/FS/function.c:836
-+#: ../objects/FS/function.c:841
- msgid "Coalesce"
- msgstr "Nawęglanie"
- 
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
--#: ../objects/FS/function.c:838 ../objects/FS/function.c:840
--#: ../sheets/UML.sheet.in.h:5
-+#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
- msgstr "Rozgałęzianie"
- 
- #. Translators: Menu item Verb/Branch/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
--#: ../objects/FS/function.c:842 ../objects/FS/function.c:844
--#: ../objects/FS/function.c:846
-+#: ../objects/FS/function.c:847 ../objects/FS/function.c:849
-+#: ../objects/FS/function.c:851
- msgid "Separate"
- msgstr "Rozdzielanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
--#: ../objects/FS/function.c:848
-+#: ../objects/FS/function.c:853
- msgid "Switch"
- msgstr "Przełączanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
--#: ../objects/FS/function.c:850
-+#: ../objects/FS/function.c:855
- msgid "Divide"
- msgstr "Dzielenie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Release
--#: ../objects/FS/function.c:852
-+#: ../objects/FS/function.c:857
- msgid "Release"
- msgstr "Zwalnianie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
--#: ../objects/FS/function.c:854
-+#: ../objects/FS/function.c:859
- msgid "Detach"
- msgstr "Odłączanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
--#: ../objects/FS/function.c:856
-+#: ../objects/FS/function.c:861
- msgid "Disconnect"
- msgstr "Rozłączanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
--#: ../objects/FS/function.c:862
-+#: ../objects/FS/function.c:867
- msgid "Cut"
- msgstr "Rozdzielanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
--#: ../objects/FS/function.c:864
-+#: ../objects/FS/function.c:869
- msgid "Polish"
- msgstr "Polerowanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
--#: ../objects/FS/function.c:866
-+#: ../objects/FS/function.c:871
- msgid "Sand"
- msgstr "Wygładzanie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
--#: ../objects/FS/function.c:868
-+#: ../objects/FS/function.c:873
- msgid "Drill"
- msgstr "Wiercenie"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
--#: ../objects/FS/function.c:870
-+#: ../objects/FS/function.c:875
- msgid "Lathe"
- msgstr "Toczenie"
- 
- #. Translators: Menu item Verb/Branch/Refine
- #. Translators: Menu item Verb/Branch/Refine/Refine
--#: ../objects/FS/function.c:872 ../objects/FS/function.c:874
-+#: ../objects/FS/function.c:877 ../objects/FS/function.c:879
- msgid "Refine"
- msgstr "Rafinowanie"
- 
- #. Translators: Menu item Verb/Branch/Refine/Purify
--#: ../objects/FS/function.c:876
-+#: ../objects/FS/function.c:881
- msgid "Purify"
- msgstr "Czyszczenie"
- 
- #. Translators: Menu item Verb/Branch/Refine/Strain
--#: ../objects/FS/function.c:878
-+#: ../objects/FS/function.c:883
- msgid "Strain"
- msgstr "Wyłapywanie"
- 
- #. Translators: Menu item Verb/Branch/Refine/Filter
--#: ../objects/FS/function.c:880
-+#: ../objects/FS/function.c:885
- msgid "Filter"
- msgstr "Filtrowanie"
- 
- #. Translators: Menu item Verb/Branch/Refine/Percolate
--#: ../objects/FS/function.c:882
-+#: ../objects/FS/function.c:887
- msgid "Percolate"
- msgstr "Rozpowszechnianie"
- 
- #. Translators: Menu item Verb/Branch/Refine/Clear
--#: ../objects/FS/function.c:884
-+#: ../objects/FS/function.c:889
- msgid "Clear"
- msgstr "Rozjaśnianie"
- 
- #. Translators: Menu item Verb/Branch/Distribute
- #. Translators: Menu item Verb/Branch/Distribute/Distribute
--#: ../objects/FS/function.c:886 ../objects/FS/function.c:888
-+#: ../objects/FS/function.c:891 ../objects/FS/function.c:893
- msgid "Distribute"
- msgstr "Rozdzielanie"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Diverge
--#: ../objects/FS/function.c:890
-+#: ../objects/FS/function.c:895
- msgid "Diverge"
- msgstr "Odchylanie"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Scatter
--#: ../objects/FS/function.c:892
-+#: ../objects/FS/function.c:897
- msgid "Scatter"
- msgstr "Rozrzucanie"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Disperse
--#: ../objects/FS/function.c:894
-+#: ../objects/FS/function.c:899
- msgid "Disperse"
- msgstr "Rozpraszanie"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Diffuse
- #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
--#: ../objects/FS/function.c:896 ../objects/FS/function.c:910
-+#: ../objects/FS/function.c:901 ../objects/FS/function.c:915
- msgid "Diffuse"
- msgstr "Wtapianie"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Empty
--#: ../objects/FS/function.c:898
-+#: ../objects/FS/function.c:903
- msgid "Empty"
- msgstr "Opróżnianie"
- 
- #. Translators: Menu item Verb/Branch/Dissipate
- #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
--#: ../objects/FS/function.c:900 ../objects/FS/function.c:902
-+#: ../objects/FS/function.c:905 ../objects/FS/function.c:907
- msgid "Dissipate"
- msgstr "Odprowadzanie"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Absorb
--#: ../objects/FS/function.c:904
-+#: ../objects/FS/function.c:909
- msgid "Absorb"
- msgstr "Absorbowanie"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Dampen
--#: ../objects/FS/function.c:906
-+#: ../objects/FS/function.c:911
- msgid "Dampen"
- msgstr "Zwilżanie"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Dispel
--#: ../objects/FS/function.c:908
-+#: ../objects/FS/function.c:913
- msgid "Dispel"
- msgstr "Rozpędzanie"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Resist
--#: ../objects/FS/function.c:912
-+#: ../objects/FS/function.c:917
- msgid "Resist"
- msgstr "Opieranie"
- 
- #. Translators: Menu item Verb/Provision
- #. Translators: Menu item Verb/Provision/Provision
--#: ../objects/FS/function.c:914 ../objects/FS/function.c:916
-+#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
- msgid "Provision"
- msgstr "Zaopatrywanie"
- 
- #. Translators: Menu item Verb/Provision/Store
- #. Translators: Menu item Verb/Provision/Store/Store
--#: ../objects/FS/function.c:918 ../objects/FS/function.c:920
-+#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
- msgid "Store"
- msgstr "Magazynowanie"
- 
- #. Translators: Menu item Verb/Provision/Store/Contain
--#: ../objects/FS/function.c:922
-+#: ../objects/FS/function.c:927
- msgid "Contain"
- msgstr "Zawieranie"
- 
- #. Translators: Menu item Verb/Provision/Store/Collect
--#: ../objects/FS/function.c:924
-+#: ../objects/FS/function.c:929
- msgid "Collect"
- msgstr "Zbieranie"
- 
- #. Translators: Menu item Verb/Provision/Store/Reserve
--#: ../objects/FS/function.c:926
-+#: ../objects/FS/function.c:931
- msgid "Reserve"
- msgstr "Rezerwowanie"
- 
- #. Translators: Menu item Verb/Provision/Supply
- #. Translators: Menu item Verb/Provision/Supply/Supply
--#: ../objects/FS/function.c:930 ../objects/FS/function.c:932
-+#: ../objects/FS/function.c:935 ../objects/FS/function.c:937
- msgid "Supply"
- msgstr "Zaopatrzanie"
- 
- #. Translators: Menu item Verb/Provision/Supply/Fill
--#: ../objects/FS/function.c:934
-+#: ../objects/FS/function.c:939
- msgid "Fill"
- msgstr "Wypełnianie"
- 
- #. Translators: Menu item Verb/Provision/Supply/Provide
--#: ../objects/FS/function.c:936
-+#: ../objects/FS/function.c:941
- msgid "Provide"
- msgstr "Dostarczanie"
- 
- #. Translators: Menu item Verb/Provision/Supply/Replenish
--#: ../objects/FS/function.c:938
-+#: ../objects/FS/function.c:943
- msgid "Replenish"
- msgstr "Uzupełnianie"
- 
- #. Translators: Menu item Verb/Provision/Supply/Expose
--#: ../objects/FS/function.c:940
-+#: ../objects/FS/function.c:945
- msgid "Expose"
- msgstr "Wystawianie"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:942 ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Wydobywanie"
- 
- #. Translators: Menu item Verb/Control Magnitude
- #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
--#: ../objects/FS/function.c:944 ../objects/FS/function.c:946
-+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
- msgid "Control Magnitude"
- msgstr "Rozmiar kontroli"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
--#: ../objects/FS/function.c:948 ../objects/FS/function.c:950
-+#: ../objects/FS/function.c:953 ../objects/FS/function.c:955
- msgid "Actuate"
- msgstr "Pobudzanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
--#: ../objects/FS/function.c:952
-+#: ../objects/FS/function.c:957
- msgid "Start"
- msgstr "Rozpoczynanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
--#: ../objects/FS/function.c:954
-+#: ../objects/FS/function.c:959
- msgid "Initiate"
- msgstr "Inicjowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
--#: ../objects/FS/function.c:956 ../objects/FS/function.c:958
-+#: ../objects/FS/function.c:961 ../objects/FS/function.c:963
- msgid "Regulate"
- msgstr "Regulowanie"
- 
-+#  Translators: Menu item Verb/Control Magnitude/Regulate/Control
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
- #. Translators: Menu item Noun/Signal/Control
--#: ../objects/FS/function.c:960 ../objects/FS/function.c:1178
--#: ../objects/UML/classicon.c:127
-+#: ../objects/FS/function.c:965 ../objects/FS/function.c:1183
-+#: ../objects/UML/classicon.c:130
- msgid "Control"
- msgstr "Kontrolowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
--#: ../objects/FS/function.c:966
-+#: ../objects/FS/function.c:971
- msgid "Enable"
- msgstr "Umożliwianie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
--#: ../objects/FS/function.c:968
-+#: ../objects/FS/function.c:973
- msgid "Disable"
- msgstr "Blokowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
--#: ../objects/FS/function.c:970
-+#: ../objects/FS/function.c:975
- msgid "Limit"
- msgstr "Limitowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
--#: ../objects/FS/function.c:972
-+#: ../objects/FS/function.c:977
- msgid "Interrupt"
- msgstr "Przerywanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change
- #. Translators: Menu item Verb/Control Magnitude/Change/Change
--#: ../objects/FS/function.c:974 ../objects/FS/function.c:976
-+#: ../objects/FS/function.c:979 ../objects/FS/function.c:981
- msgid "Change"
- msgstr "Zmienianie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Increase
--#: ../objects/FS/function.c:978
-+#: ../objects/FS/function.c:983
- msgid "Increase"
- msgstr "Powiększanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
--#: ../objects/FS/function.c:980
-+#: ../objects/FS/function.c:985
- msgid "Decrease"
- msgstr "Zmniejszanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
--#: ../objects/FS/function.c:982
-+#: ../objects/FS/function.c:987
- msgid "Amplify"
- msgstr "Wzmacnianie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
--#: ../objects/FS/function.c:984
-+#: ../objects/FS/function.c:989
- msgid "Reduce"
- msgstr "Redukowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
--#: ../objects/FS/function.c:988
-+#: ../objects/FS/function.c:993
- msgid "Normalize"
- msgstr "Normalizowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
--#: ../objects/FS/function.c:990
-+#: ../objects/FS/function.c:995
- msgid "Multiply"
- msgstr "Zwielokrotnianie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Scale
--#: ../objects/FS/function.c:992
-+#. FIXME: mark read-only
-+#: ../objects/FS/function.c:997 ../objects/Misc/measure.c:186
- msgid "Scale"
- msgstr "Skalowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
--#: ../objects/FS/function.c:994
-+#: ../objects/FS/function.c:999
- msgid "Rectify"
- msgstr "Naprawianie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
--#: ../objects/FS/function.c:996
-+#: ../objects/FS/function.c:1001
- msgid "Adjust"
- msgstr "Wyrównywanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form
- #. Translators: Menu item Verb/Control Magnitude/Form/Form
--#: ../objects/FS/function.c:998 ../objects/FS/function.c:1000
-+#: ../objects/FS/function.c:1003 ../objects/FS/function.c:1005
- msgid "Form"
- msgstr "Formowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Compact
--#: ../objects/FS/function.c:1002
-+#: ../objects/FS/function.c:1007
- msgid "Compact"
- msgstr "Zwieranie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Crush
--#: ../objects/FS/function.c:1004
-+#: ../objects/FS/function.c:1009
- msgid "Crush"
- msgstr "Kruszenie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Shape
--#: ../objects/FS/function.c:1006
-+#: ../objects/FS/function.c:1011
- msgid "Shape"
- msgstr "Kształtowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Compress
--#: ../objects/FS/function.c:1008
-+#: ../objects/FS/function.c:1013
- msgid "Compress"
- msgstr "Kompresowanie"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
--#: ../objects/FS/function.c:1010
-+#: ../objects/FS/function.c:1015
- msgid "Pierce"
- msgstr "Nacieranie"
- 
- #. Translators: Menu item Verb/Convert
- #. Translators: Menu item Verb/Convert/Convert
--#: ../objects/FS/function.c:1012 ../objects/FS/function.c:1014
-+#: ../objects/FS/function.c:1017 ../objects/FS/function.c:1019
- msgid "Convert"
- msgstr "Konwertowanie"
- 
- #. Translators: Menu item Verb/Convert/Transform
--#: ../objects/FS/function.c:1016
-+#: ../objects/FS/function.c:1021
- msgid "Transform"
- msgstr "Przemienianie"
- 
- #. Translators: Menu item Verb/Convert/Liquefy
--#: ../objects/FS/function.c:1018
-+#: ../objects/FS/function.c:1023
- msgid "Liquefy"
- msgstr "Skraplanie"
- 
- #. Translators: Menu item Verb/Convert/Solidify
--#: ../objects/FS/function.c:1020
-+#: ../objects/FS/function.c:1025
- msgid "Solidify"
- msgstr "Scalanie"
- 
- #. Translators: Menu item Verb/Convert/Evaporate
--#: ../objects/FS/function.c:1022
-+#: ../objects/FS/function.c:1027
- msgid "Evaporate"
- msgstr "Parowanie"
- 
- #. Translators: Menu item Verb/Convert/Sublimate
--#: ../objects/FS/function.c:1024
-+#: ../objects/FS/function.c:1029
- msgid "Sublimate"
- msgstr "Sublimowanie"
- 
- #. Translators: Menu item Verb/Convert/Condense
--#: ../objects/FS/function.c:1026
-+#: ../objects/FS/function.c:1031
- msgid "Condense"
- msgstr "Kondensowanie"
- 
- #. Translators: Menu item Verb/Convert/Integrate
--#: ../objects/FS/function.c:1028
-+#: ../objects/FS/function.c:1033
- msgid "Integrate"
- msgstr "�ączenie"
- 
- #. Translators: Menu item Verb/Convert/Differentiate
--#: ../objects/FS/function.c:1030
-+#: ../objects/FS/function.c:1035
- msgid "Differentiate"
- msgstr "Rozdzielanie"
- 
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1032 ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1037 ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
- msgstr "Przetwarzanie"
- 
- #. Translators: Menu item Verb/Signal/Sense
- #. Translators: Menu item Verb/Signal/Sense/Sense
--#: ../objects/FS/function.c:1038 ../objects/FS/function.c:1040
-+#: ../objects/FS/function.c:1043 ../objects/FS/function.c:1045
- msgid "Sense"
- msgstr "Odczuwanie"
- 
- #. Translators: Menu item Verb/Signal/Sense/Perceive
--#: ../objects/FS/function.c:1042
-+#: ../objects/FS/function.c:1047
- msgid "Perceive"
- msgstr "Postrzeganie"
- 
- #. Translators: Menu item Verb/Signal/Sense/Recognize
--#: ../objects/FS/function.c:1044
-+#: ../objects/FS/function.c:1049
- msgid "Recognize"
- msgstr "Rozpoznawanie"
- 
- #. Translators: Menu item Verb/Signal/Sense/Discern
--#: ../objects/FS/function.c:1046
-+#: ../objects/FS/function.c:1051
- msgid "Discern"
- msgstr "Rozróżnianie"
- 
- #. Translators: Menu item Verb/Signal/Sense/Check
--#: ../objects/FS/function.c:1048
-+#: ../objects/FS/function.c:1053
- msgid "Check"
- msgstr "Sprawdzanie"
- 
- #. Translators: Menu item Verb/Signal/Sense/Verify
--#: ../objects/FS/function.c:1052
-+#: ../objects/FS/function.c:1057
- msgid "Verify"
- msgstr "Weryfikowanie"
- 
- #. Translators: Menu item Verb/Signal/Indicate
- #. Translators: Menu item Verb/Signal/Indicate/Indicate
--#: ../objects/FS/function.c:1054 ../objects/FS/function.c:1056
-+#: ../objects/FS/function.c:1059 ../objects/FS/function.c:1061
- msgid "Indicate"
- msgstr "Wskazywanie"
- 
- #. Translators: Menu item Verb/Signal/Indicate/Mark
--#: ../objects/FS/function.c:1058
-+#: ../objects/FS/function.c:1063
- msgid "Mark"
- msgstr "Zaznaczanie"
- 
- #. Translators: Menu item Verb/Signal/Display
--#: ../objects/FS/function.c:1060 ../sheets/Flowchart.sheet.in.h:7
-+#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
- msgid "Display"
- msgstr "Wyświetlanie"
- 
- #. Translators: Menu item Verb/Signal/Measure
- #. Translators: Menu item Verb/Signal/Measure/Measure
--#: ../objects/FS/function.c:1062 ../objects/FS/function.c:1064
-+#: ../objects/FS/function.c:1067 ../objects/FS/function.c:1069
- msgid "Measure"
- msgstr "Mierzenie"
- 
- #. Translators: Menu item Verb/Signal/Measure/Calculate
--#: ../objects/FS/function.c:1066
-+#: ../objects/FS/function.c:1071
- msgid "Calculate"
- msgstr "Obliczanie"
- 
- #. Translators: Menu item Verb/Signal/Represent
--#: ../objects/FS/function.c:1068
-+#: ../objects/FS/function.c:1073
- msgid "Represent"
- msgstr "Reprezentowanie"
- 
- #. Translators: Menu item Noun
--#: ../objects/FS/function.c:1070
-+#: ../objects/FS/function.c:1075
- msgid "Noun"
- msgstr "Ciało stałe"
- 
-+# FIXME
-+# lib/widgets.c: "Linia ciągła"
-+# objects/FS/function.c: "Stały"
-+#. Translators: Menu item Noun/Material/Solid
-+#: ../objects/FS/function.c:1079
-+msgid "Solid"
-+msgstr "Jednolita"
-+
- #. Translators: Menu item Noun/Material/Liquid
--#: ../objects/FS/function.c:1076
-+#: ../objects/FS/function.c:1081
- msgid "Liquid"
- msgstr "Ciecz"
- 
- #. Translators: Menu item Noun/Material/Gas
--#: ../objects/FS/function.c:1078
-+#: ../objects/FS/function.c:1083
- msgid "Gas"
- msgstr "Gaz"
- 
- #. Translators: Menu item Noun/Material/Human
- #. Translators: Menu item Noun/Material/Human/Human
- #. Translators: Menu item Noun/Energy/Human
--#: ../objects/FS/function.c:1080 ../objects/FS/function.c:1082
--#: ../objects/FS/function.c:1166
-+#: ../objects/FS/function.c:1085 ../objects/FS/function.c:1087
-+#: ../objects/FS/function.c:1171
- msgid "Human"
- msgstr "Człowiek"
- 
- #. Translators: Menu item Noun/Material/Human/Hand
--#: ../objects/FS/function.c:1084
-+#: ../objects/FS/function.c:1089
- msgid "Hand"
- msgstr "Ręka"
- 
- #. Translators: Menu item Noun/Material/Human/Foot
--#: ../objects/FS/function.c:1086
-+#: ../objects/FS/function.c:1091
- msgid "Foot"
- msgstr "Stopa"
- 
- #. Translators: Menu item Noun/Material/Human/Head
--#: ../objects/FS/function.c:1088
-+#: ../objects/FS/function.c:1093
- msgid "Head"
- msgstr "GÅ‚owa"
- 
- #. Translators: Menu item Noun/Material/Human/Finger
--#: ../objects/FS/function.c:1090
-+#: ../objects/FS/function.c:1095
- msgid "Finger"
- msgstr "Palec"
- 
- #. Translators: Menu item Noun/Material/Human/Toe
--#: ../objects/FS/function.c:1092
-+#: ../objects/FS/function.c:1097
- msgid "Toe"
- msgstr "Palec u nogi"
- 
- #. Translators: Menu item Noun/Material/Biological
--#: ../objects/FS/function.c:1094
-+#: ../objects/FS/function.c:1099
- msgid "Biological"
- msgstr "Biologiczna"
- 
- #. Translators: Menu item Noun/Energy/Mechanical
--#: ../objects/FS/function.c:1098
-+#: ../objects/FS/function.c:1103
- msgid "Mechanical"
- msgstr "Mechaniczna"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
--#: ../objects/FS/function.c:1100
-+#: ../objects/FS/function.c:1105
- msgid "Mech. Energy"
- msgstr "Energia Mech."
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Translation
--#: ../objects/FS/function.c:1102
-+#: ../objects/FS/function.c:1107
- msgid "Translation"
- msgstr "Przemiana"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Force
--#: ../objects/FS/function.c:1104
-+#: ../objects/FS/function.c:1109
- msgid "Force"
- msgstr "Siła fizyczna"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Rotation
--#: ../objects/FS/function.c:1106
-+#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
- msgid "Rotation"
- msgstr "Obrót"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Torque
--#: ../objects/FS/function.c:1108
-+#: ../objects/FS/function.c:1113
- msgid "Torque"
- msgstr "Moment obrotowy"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
--#: ../objects/FS/function.c:1110
-+#: ../objects/FS/function.c:1115
- msgid "Random Motion"
- msgstr "Losowy Ruch"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Vibration
--#: ../objects/FS/function.c:1112
-+#: ../objects/FS/function.c:1117
- msgid "Vibration"
- msgstr "Wibracja"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
--#: ../objects/FS/function.c:1114
-+#: ../objects/FS/function.c:1119
- msgid "Rotational Energy"
- msgstr "Energia Obrotowa"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
--#: ../objects/FS/function.c:1116
-+#: ../objects/FS/function.c:1121
- msgid "Translational Energy"
- msgstr "Energia potencjalna"
- 
- #. Translators: Menu item Noun/Energy/Electricity
--#: ../objects/FS/function.c:1118
-+#: ../objects/FS/function.c:1123
- msgid "Electrical"
- msgstr "Elektryczny"
- 
- #. Translators: Menu item Noun/Energy/Electricity/Electricity
--#: ../objects/FS/function.c:1120
-+#: ../objects/FS/function.c:1125
- msgid "Electricity"
- msgstr "Elektryczność"
- 
- #. Translators: Menu item Noun/Energy/Electricity/Voltage
--#: ../objects/FS/function.c:1122
-+#: ../objects/FS/function.c:1127
- msgid "Voltage"
- msgstr "Napięcie"
- 
- #. Translators: Menu item Noun/Energy/Electricity/Current
--#: ../objects/FS/function.c:1124
-+#: ../objects/FS/function.c:1129
- msgid "Current"
- msgstr "Natężenie prądu"
- 
- #. Translators: Menu item Noun/Energy/Hydraulic
--#: ../objects/FS/function.c:1126
-+#: ../objects/FS/function.c:1131
- msgid "Hydraulic"
- msgstr "Hydrauliczny"
- 
- #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
--#: ../objects/FS/function.c:1128
-+#: ../objects/FS/function.c:1133
- msgid "Pressure"
- msgstr "Ciśnieniowy"
- 
- #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
--#: ../objects/FS/function.c:1130
-+#: ../objects/FS/function.c:1135
- msgid "Volumetric Flow"
- msgstr "Przepływ objętościowy"
- 
- #. Translators: Menu item Noun/Energy/Thermal
--#: ../objects/FS/function.c:1132
-+#: ../objects/FS/function.c:1137
- msgid "Thermal"
- msgstr "Cieplny"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Heat
--#: ../objects/FS/function.c:1134
-+#: ../objects/FS/function.c:1139
- msgid "Heat"
- msgstr "Ocieplanie"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Conduction
--#: ../objects/FS/function.c:1136
-+#: ../objects/FS/function.c:1141
- msgid "Conduction"
- msgstr "Przewodzenie"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Convection
--#: ../objects/FS/function.c:1138
-+#: ../objects/FS/function.c:1143
- msgid "Convection"
- msgstr "Konwekcja"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Radiation
- #. Translators: Menu item Noun/Energy/Radioactive/Radiation
--#: ../objects/FS/function.c:1140 ../objects/FS/function.c:1148
-+#: ../objects/FS/function.c:1145 ../objects/FS/function.c:1153
- msgid "Radiation"
- msgstr "Promieniowanie"
- 
- #. Translators: Menu item Noun/Energy/Pneumatic
--#: ../objects/FS/function.c:1142
-+#: ../objects/FS/function.c:1147
- msgid "Pneumatic"
- msgstr "Pneumatyczny"
- 
- #. Translators: Menu item Noun/Energy/Chemical
--#: ../objects/FS/function.c:1144
-+#: ../objects/FS/function.c:1149
- msgid "Chemical"
- msgstr "Chemiczny"
- 
- #. Translators: Menu item Noun/Energy/Radioactive
--#: ../objects/FS/function.c:1146
-+#: ../objects/FS/function.c:1151
- msgid "Radioactive"
- msgstr "Radioaktywny"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
--#: ../objects/FS/function.c:1150
-+#: ../objects/FS/function.c:1155
- msgid "Microwaves"
- msgstr "Mikrofalowy"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
--#: ../objects/FS/function.c:1152
-+#: ../objects/FS/function.c:1157
- msgid "Radio waves"
- msgstr "Fale radiowe"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
--#: ../objects/FS/function.c:1154
-+#: ../objects/FS/function.c:1159
- msgid "X-Rays"
- msgstr "Promieniowanie X"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
--#: ../objects/FS/function.c:1156
-+#: ../objects/FS/function.c:1161
- msgid "Gamma Rays"
- msgstr "Promieniowanie Gamma"
- 
- #. Translators: Menu item Noun/Energy/Acoustic Energy
--#: ../objects/FS/function.c:1158
-+#: ../objects/FS/function.c:1163
- msgid "Acoustic Energy"
- msgstr "Energia akustyczna"
- 
- #. Translators: Menu item Noun/Energy/Optical Energy
--#: ../objects/FS/function.c:1160
-+#: ../objects/FS/function.c:1165
- msgid "Optical Energy"
- msgstr "Energia świetlna"
- 
- #. Translators: Menu item Noun/Energy/Solar Energy
--#: ../objects/FS/function.c:1162
-+#: ../objects/FS/function.c:1167
- msgid "Solar Energy"
- msgstr "Energia słoneczna"
- 
- #. Translators: Menu item Noun/Energy/Magnetic Energy
--#: ../objects/FS/function.c:1164
-+#: ../objects/FS/function.c:1169
- msgid "Magnetic Energy"
- msgstr "Energia magnetyczna"
- 
- #. Translators: Menu item Noun/Energy/Human/Human Motion
--#: ../objects/FS/function.c:1168
-+#: ../objects/FS/function.c:1173
- msgid "Human Motion"
- msgstr "Ruch ludzkiego ciała"
- 
- #. Translators: Menu item Noun/Energy/Human/Human Force
--#: ../objects/FS/function.c:1170
-+#: ../objects/FS/function.c:1175
- msgid "Human Force"
- msgstr "Siła człowieka"
- 
- #. Translators: Menu item Noun/Signal/Status
--#: ../objects/FS/function.c:1176
-+#: ../objects/FS/function.c:1181
- msgid "Status"
- msgstr "Stan"
- 
--#: ../objects/FS/function.c:1180
-+#: ../objects/FS/function.c:1185
- msgid "User/Device Fn"
- msgstr "Funkcja użytkownika/urządzenia"
- 
--#: ../objects/FS/function.c:1181
-+#: ../objects/FS/function.c:1186
- msgid "Wish Fn"
- msgstr ""
- 
--#: ../objects/GRAFCET/action.c:135 ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Wywołanie makra"
- 
--#: ../objects/GRAFCET/action.c:135
-+#: ../objects/GRAFCET/action.c:137
- msgid "This action is a call to a macro-step"
- msgstr "Ta akcja jest odwołaniem do kroku makra"
- 
--#: ../objects/GRAFCET/condition.c:130
-+#: ../objects/GRAFCET/condition.c:132
- msgid "Condition"
- msgstr "Warunek"
- 
--#: ../objects/GRAFCET/condition.c:130
-+#: ../objects/GRAFCET/condition.c:132
- msgid "The boolean equation of the condition"
- msgstr "Równanie logiczne (Boole'a) warunku"
- 
--#: ../objects/GRAFCET/condition.c:132
-+#: ../objects/GRAFCET/condition.c:134
- msgid "The condition's font"
- msgstr "Czcionka warunku"
- 
--#: ../objects/GRAFCET/condition.c:134
-+#: ../objects/GRAFCET/condition.c:136
- msgid "The condition's font size"
- msgstr "Rozmiar czcionki warunku"
- 
--#: ../objects/GRAFCET/condition.c:137 ../objects/GRAFCET/transition.c:147
-+#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
- msgid "Color"
- msgstr "Kolor"
- 
--#: ../objects/GRAFCET/condition.c:137
-+#: ../objects/GRAFCET/condition.c:139
- msgid "The condition's color"
- msgstr "Kolor warunku"
- 
-@@ -3749,115 +4342,117 @@ msgstr "Kolor warunku"
- msgid "GRAFCET diagram objects"
- msgstr "Obiekty diagramu GRAFCET"
- 
--#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Zwykły krok"
- 
--#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "PoczÄ…tkowy krok"
- 
--#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Krok rozpoczęcia makra"
- 
--#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Krok zakończenia makra"
- 
--#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
-+#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
- msgid "Macro call step"
- msgstr "Krok wywołania makra"
- 
--#: ../objects/GRAFCET/step.c:151
-+#: ../objects/GRAFCET/step.c:153
- msgid "Subprogram call step"
- msgstr "Krok wywołania podprogramu"
- 
--#: ../objects/GRAFCET/step.c:158
-+#: ../objects/GRAFCET/step.c:160
- msgid "Step name"
- msgstr "Nazwa kroku"
- 
--#: ../objects/GRAFCET/step.c:158
-+#: ../objects/GRAFCET/step.c:160
- msgid "The name of the step"
- msgstr "Nazwa kroku"
- 
--#: ../objects/GRAFCET/step.c:161
-+#: ../objects/GRAFCET/step.c:163
- msgid "Step type"
- msgstr "Typ kroku"
- 
--#: ../objects/GRAFCET/step.c:161
-+#: ../objects/GRAFCET/step.c:163
- msgid "The kind of step"
- msgstr "Rodzaj kroku"
- 
--#: ../objects/GRAFCET/step.c:163
-+#: ../objects/GRAFCET/step.c:165
- msgid "Active"
- msgstr "Aktywny"
- 
--#: ../objects/GRAFCET/step.c:163
-+#: ../objects/GRAFCET/step.c:165
- msgid "Shows a red dot to figure the step's activity"
- msgstr "Wyświetla czerwoną kropkę, w celu przedstawienia zmiany kroku"
- 
--#: ../objects/GRAFCET/transition.c:140
-+#: ../objects/GRAFCET/transition.c:142
- msgid "Receptivity"
- msgstr "Wrażliwość"
- 
--#: ../objects/GRAFCET/transition.c:140
-+#: ../objects/GRAFCET/transition.c:142
- msgid "The boolean equation of the receptivity"
- msgstr "Równanie logiczne wrażliwości"
- 
--#: ../objects/GRAFCET/transition.c:142
-+#: ../objects/GRAFCET/transition.c:144
- msgid "The receptivity's font"
- msgstr "Czcionka wrażliwości"
- 
--#: ../objects/GRAFCET/transition.c:144
-+#: ../objects/GRAFCET/transition.c:146
- msgid "The receptivity's font size"
- msgstr "Rozmiar czcionki wrażliwości"
- 
--#: ../objects/GRAFCET/transition.c:147
-+#: ../objects/GRAFCET/transition.c:149
- msgid "The receptivity's color"
- msgstr "Kolor wrażliwości"
- 
--#: ../objects/GRAFCET/transition.c:148
-+#: ../objects/GRAFCET/transition.c:150
- msgid "North point"
- msgstr "Północ"
- 
--#: ../objects/GRAFCET/transition.c:149
-+#: ../objects/GRAFCET/transition.c:151
- msgid "South point"
- msgstr "Południe"
- 
--#: ../objects/GRAFCET/vector.c:129
-+#: ../objects/GRAFCET/vector.c:131
- msgid "Draw arrow heads on upward arcs:"
- msgstr "Rysowanie ostrzy strzałek na łukach skierowanych ku górze:"
- 
--#: ../objects/GRAFCET/vergent.c:122
-+#: ../objects/GRAFCET/vergent.c:124
- msgid "OR"
- msgstr "OR"
- 
--#: ../objects/GRAFCET/vergent.c:123
-+#: ../objects/GRAFCET/vergent.c:125
- msgid "AND"
- msgstr "AND"
- 
--#: ../objects/GRAFCET/vergent.c:134
-+#: ../objects/GRAFCET/vergent.c:136
- msgid "Vergent type:"
- msgstr "Typ przejścia:"
- 
--#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:469
--#: ../objects/Jackson/domain.c:531 ../objects/KAOS/goal.c:572
--#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:447
--#: ../objects/standard/line.c:219
-+#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
-+#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-+#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:454
-+#: ../objects/standard/line.c:226
- msgid "Add connection point"
- msgstr "Dodaj punkt połączenia"
- 
--#: ../objects/GRAFCET/vergent.c:406
--msgid "Delete  connection point"
-+#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
-+#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-+#: ../objects/KAOS/other.c:526 ../objects/SADT/box.c:455
-+#: ../objects/standard/line.c:227
-+msgid "Delete connection point"
- msgstr "Usuń punkt połączenia"
- 
--#: ../objects/GRAFCET/vergent.c:410
-+#: ../objects/GRAFCET/vergent.c:412
- msgid "GRAFCET OR/AND vergent"
- msgstr "Przejście OR/AND GRAFCET"
- 
--#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:152
--#, fuzzy
-+#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
- msgid "Unspecified"
- msgstr "Nie zdefiniowano"
- 
-@@ -3866,10 +4461,9 @@ msgstr "Nie zdefiniowano"
- msgid "Agent"
- msgstr "Dodaj segment"
- 
--#: ../objects/Istar/actor.c:71
--#, fuzzy
-+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:251
- msgid "Role"
--msgstr "Rola:"
-+msgstr "Rola"
- 
- #: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
- msgid "Softgoal"
-@@ -3880,8 +4474,8 @@ msgstr ""
- msgid "Goal"
- msgstr "Zwykła"
- 
--#: ../objects/Istar/goal.c:154 ../objects/Istar/goal.c:155
--#: ../objects/KAOS/goal.c:157 ../objects/KAOS/goal.c:158
-+#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-+#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
- #, fuzzy
- msgid "Goal Type"
- msgstr "Ten sam typ"
-@@ -3891,26 +4485,26 @@ msgstr "Ten sam typ"
- msgid "Istar diagram"
- msgstr "/UporzÄ…dkuj _diagramy"
- 
--#: ../objects/Istar/link.c:153
-+#: ../objects/Istar/link.c:151
- #, fuzzy
--msgid "Positive Contrib"
-+msgid "Positive contrib"
- msgstr "Pozycjonowanie"
- 
--#: ../objects/Istar/link.c:154
-+#: ../objects/Istar/link.c:152
- #, fuzzy
- msgid "Negative contrib"
- msgstr "Zanegowana zmienna wyjściowa"
- 
--#: ../objects/Istar/link.c:155 ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Zależność"
- 
--#: ../objects/Istar/link.c:156
-+#: ../objects/Istar/link.c:154
- #, fuzzy
- msgid "Decomposition"
- msgstr "Złożenie"
- 
--#: ../objects/Istar/link.c:157
-+#: ../objects/Istar/link.c:155
- msgid "Means-Ends"
- msgstr ""
- 
-@@ -3919,17 +4513,11 @@ msgstr ""
- msgid "Resource"
- msgstr "Redukowanie"
- 
--#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr ""
- 
--#: ../objects/Istar/other.c:470 ../objects/Jackson/domain.c:532
--#: ../objects/KAOS/goal.c:573 ../objects/KAOS/other.c:526
--#: ../objects/SADT/box.c:448 ../objects/standard/line.c:220
--msgid "Delete connection point"
--msgstr "Usuń punkt połączenia"
--
--#: ../objects/Istar/other.c:475
-+#: ../objects/Istar/other.c:477
- #, fuzzy
- msgid "i* other"
- msgstr "Router głosowy"
-@@ -3962,21 +4550,21 @@ msgstr "Åšrodek"
- msgid "Lexical"
- msgstr "Chemiczny"
- 
--#: ../objects/Jackson/domain.c:176 ../objects/Jackson/domain.c:177
-+#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
- #, fuzzy
- msgid "Domain Type"
- msgstr "Ten sam typ"
- 
--#: ../objects/Jackson/domain.c:181
-+#: ../objects/Jackson/domain.c:183
- msgid "Domain Kind"
- msgstr ""
- 
--#: ../objects/Jackson/domain.c:182
-+#: ../objects/Jackson/domain.c:184
- #, fuzzy
--msgid "Optional kind which appears in the lower right corner of the Domain"
-+msgid "Optional kind which appears in the lower-right corner of the Domain"
- msgstr "Identyfikator pojawiający się w prawym dolnym narożniku prostokąta"
- 
--#: ../objects/Jackson/domain.c:537
-+#: ../objects/Jackson/domain.c:539
- #, fuzzy
- msgid "Jackson domain"
- msgstr "Kobieta Mac"
-@@ -3986,17 +4574,20 @@ msgstr "Kobieta Mac"
- msgid "Jackson diagram"
- msgstr "Tworzy nowy diagram"
- 
--#: ../objects/Jackson/phenomenon.c:134
-+#: ../objects/Jackson/phenomenon.c:136
- #, fuzzy
- msgid "Shared"
- msgstr "Kształtowanie"
- 
--#: ../objects/Jackson/phenomenon.c:135 ../objects/KAOS/goal.c:81
-+#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
- #, fuzzy
- msgid "Requirement"
- msgstr "Reprezentowanie"
- 
--#: ../objects/Jackson/phenomenon.c:142 ../objects/UML/message.c:151
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule
-+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:150
-+#: ../objects/UML/message.c:152
- msgid "Message:"
- msgstr "Komunikat:"
- 
-@@ -4009,7 +4600,7 @@ msgstr ""
- msgid "Obstacle"
- msgstr "Abstrakcyjna"
- 
--#: ../objects/KAOS/goal.c:578
-+#: ../objects/KAOS/goal.c:580
- msgid "KAOS goal"
- msgstr ""
- 
-@@ -4018,69 +4609,69 @@ msgstr ""
- msgid "KAOS diagram"
- msgstr "_Nowy diagram"
- 
--#: ../objects/KAOS/metaandorrel.c:151
-+#: ../objects/KAOS/metaandorrel.c:153
- #, fuzzy
- msgid "AND Refinement"
- msgstr "Ogranicznik AND"
- 
--#: ../objects/KAOS/metaandorrel.c:152
-+#: ../objects/KAOS/metaandorrel.c:154
- msgid "Complete AND Refinement"
- msgstr ""
- 
--#: ../objects/KAOS/metaandorrel.c:153
-+#: ../objects/KAOS/metaandorrel.c:155
- #, fuzzy
- msgid "OR Refinement"
- msgstr "Rafinowanie"
- 
--#: ../objects/KAOS/metaandorrel.c:154
-+#: ../objects/KAOS/metaandorrel.c:156
- #, fuzzy
- msgid "Operationalization"
- msgstr "Dane operacji"
- 
--#: ../objects/KAOS/metaandorrel.c:161
--#, fuzzy
-+#: ../objects/KAOS/metaandorrel.c:163
- msgid "Text:"
--msgstr "Tekst"
-+msgstr "Tekst:"
- 
--#: ../objects/KAOS/metabinrel.c:155
-+#: ../objects/KAOS/metabinrel.c:157
- #, fuzzy
- msgid "Contributes"
- msgstr "Współautorzy:"
- 
--#: ../objects/KAOS/metabinrel.c:156
-+#: ../objects/KAOS/metabinrel.c:158
- #, fuzzy
- msgid "Obstructs"
- msgstr "Abstrakcyjna"
- 
--#: ../objects/KAOS/metabinrel.c:157
-+#: ../objects/KAOS/metabinrel.c:159
- #, fuzzy
- msgid "Conflicts"
- msgstr "Przekazywanie"
- 
--#: ../objects/KAOS/metabinrel.c:158
-+#: ../objects/KAOS/metabinrel.c:160
- #, fuzzy
- msgid "Responsibility"
- msgstr "Widoczność:"
- 
--#: ../objects/KAOS/metabinrel.c:159
-+#: ../objects/KAOS/metabinrel.c:161
- #, fuzzy
- msgid "Monitors"
- msgstr "Monitor"
- 
--#: ../objects/KAOS/metabinrel.c:160
-+#  Translators: Menu item Verb/Control Magnitude/Regulate/Control
-+#: ../objects/KAOS/metabinrel.c:162
- #, fuzzy
- msgid "Controls"
- msgstr "Kontrolowanie"
- 
--#: ../objects/KAOS/metabinrel.c:161
-+#: ../objects/KAOS/metabinrel.c:163
- msgid "CapableOf"
- msgstr ""
- 
--#: ../objects/KAOS/metabinrel.c:162
-+#: ../objects/KAOS/metabinrel.c:164
- msgid "Performs"
- msgstr ""
- 
--#: ../objects/KAOS/metabinrel.c:164
-+#: ../objects/KAOS/metabinrel.c:166
- #, fuzzy
- msgid "Output"
- msgstr "Wejście/wyjście"
-@@ -4090,61 +4681,131 @@ msgstr "Wejście/wyjście"
- msgid "KAOS other"
- msgstr "Router IAD"
- 
--#: ../objects/Misc/analog_clock.c:137
-+#: ../objects/Misc/analog_clock.c:139
- msgid "Arrow color"
- msgstr "Kolor wskazówki"
- 
--#: ../objects/Misc/analog_clock.c:139
-+#: ../objects/Misc/analog_clock.c:141
- msgid "Arrow line width"
- msgstr "Szerokość linii wskazówki"
- 
--#: ../objects/Misc/analog_clock.c:141
-+#: ../objects/Misc/analog_clock.c:143
- msgid "Seconds arrow color"
--msgstr "Drugi kolor wskazówki"
-+msgstr "Kolor wskazówki sekund"
- 
--#: ../objects/Misc/analog_clock.c:143
-+#: ../objects/Misc/analog_clock.c:145
- msgid "Seconds arrow line width"
--msgstr "Szerokość linii drugiej wskazówki"
-+msgstr "Szerokość linii wskazówki sekund"
- 
--#: ../objects/Misc/analog_clock.c:145
-+#: ../objects/Misc/analog_clock.c:147
- msgid "Show hours"
- msgstr "Wyświetlanie godzin"
- 
-+#: ../objects/Misc/diagram_as_object.c:112
-+#, fuzzy
-+msgid "Diagram file"
-+msgstr "Diagram Dia"
-+
-+#: ../objects/Misc/grid_object.c:140
-+msgid "Rows"
-+msgstr "Wiersze"
-+
-+#: ../objects/Misc/grid_object.c:142
-+msgid "Columns"
-+msgstr "Kolumny"
-+
-+#: ../objects/Misc/grid_object.c:144
-+#, fuzzy
-+msgid "Grid line color"
-+msgstr "Kolor linii siatki"
-+
-+#: ../objects/Misc/grid_object.c:146
-+#, fuzzy
-+msgid "Grid line width"
-+msgstr "Szerokość linii siatki"
-+
- #: ../objects/Misc/libmisc.c:42
- msgid "Miscellaneous objects"
- msgstr "Różne obiekty"
- 
--#. property rows
--#: ../objects/SADT/arrow.c:134 ../objects/UML/class.c:174
--#: ../objects/UML/class_dialog.c:400
--msgid "Normal"
--msgstr "Zwykła"
-+#: ../objects/Misc/measure.c:169
-+msgid "cm"
-+msgstr "cm"
- 
--#: ../objects/SADT/arrow.c:135
--msgid "Import resource (not shown upstairs)"
--msgstr "Importowanie zasobu (nie wyświetlane u góry)"
-+#: ../objects/Misc/measure.c:170
-+msgid "dm"
-+msgstr "dm"
- 
--#: ../objects/SADT/arrow.c:136
--msgid "Imply resource (not shown downstairs)"
--msgstr "Implikowanie zasobu (nie wyświetlane u dołu)"
-+#: ../objects/Misc/measure.c:171
-+msgid "ft"
-+msgstr "ft"
- 
--#: ../objects/SADT/arrow.c:137
--msgid "Dotted arrow"
--msgstr "Strzałka kropkowana"
-+#: ../objects/Misc/measure.c:172
-+msgid "in"
-+msgstr "in"
-+
-+#: ../objects/Misc/measure.c:173
-+msgid "m"
-+msgstr "m"
-+
-+#: ../objects/Misc/measure.c:174
-+msgid "mm"
-+msgstr "mm"
-+
-+#: ../objects/Misc/measure.c:175
-+msgid "pt"
-+msgstr "pt"
-+
-+#: ../objects/Misc/measure.c:176
-+msgid "pi"
-+msgstr "pi"
-+
-+#. PROP_FLAG_VISIBLE|
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
-+msgid "Measurement"
-+msgstr ""
-+
-+#: ../objects/Misc/measure.c:187
-+msgid "Unit"
-+msgstr "Jednostka"
-+
-+#: ../objects/Misc/measure.c:188
-+msgid "Precision"
-+msgstr "Precyzja"
-+
-+#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
-+msgid "Add Handle"
-+msgstr "Dodaj uchwyt"
-+
-+#: ../objects/Misc/tree.c:599 ../objects/network/bus.c:607
-+msgid "Delete Handle"
-+msgstr "Usuń uchwyt"
- 
- #: ../objects/SADT/arrow.c:138
-+msgid "Import resource (not shown upstairs)"
-+msgstr "Importowanie zasobu (nie wyświetlane u góry)"
-+
-+#: ../objects/SADT/arrow.c:139
-+msgid "Imply resource (not shown downstairs)"
-+msgstr "Implikowanie zasobu (nie wyświetlane u dołu)"
-+
-+#: ../objects/SADT/arrow.c:140
-+msgid "Dotted arrow"
-+msgstr "Strzałka kropkowana"
-+
-+#: ../objects/SADT/arrow.c:141
- msgid "disable arrow heads"
- msgstr "Bez ostrzy strzałek"
- 
--#: ../objects/SADT/arrow.c:144
-+#: ../objects/SADT/arrow.c:148
- msgid "Flow style:"
- msgstr "Rodzaj przepływu:"
- 
--#: ../objects/SADT/arrow.c:146
-+#: ../objects/SADT/arrow.c:150
- msgid "Automatically gray vertical flows:"
- msgstr "Automatyczne poszarzanie pionowych przepływów:"
- 
--#: ../objects/SADT/arrow.c:147
-+#: ../objects/SADT/arrow.c:151
- msgid ""
- "To improve the ease of reading, flows which begin and end vertically can be "
- "rendered gray"
-@@ -4152,25 +4813,26 @@ msgstr ""
- "Aby polepszyć możliwość odczytu, przepływy które rozpoczynają się i kończą "
- "poziomo mogą być wyszarzane"
- 
--#: ../objects/SADT/arrow.c:463
-+#: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
- msgstr "Strzałka SADT"
- 
--#: ../objects/SADT/box.c:137 ../objects/flowchart/box.c:152
--#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
--#: ../objects/flowchart/parallelogram.c:154
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:229
-+#: ../objects/flowchart/box.c:156 ../objects/flowchart/diamond.c:154
-+#: ../objects/flowchart/ellipse.c:153 ../objects/flowchart/parallelogram.c:158
- msgid "Text padding"
- msgstr "Wyrównanie tekstu"
- 
--#: ../objects/SADT/box.c:144
-+#: ../objects/SADT/box.c:149
- msgid "Activity/Data identifier"
- msgstr "Identyfikator aktywacji/danych"
- 
--#: ../objects/SADT/box.c:145
--msgid "The identifier which appears in the lower right corner of the Box"
-+#: ../objects/SADT/box.c:150
-+#, fuzzy
-+msgid "The identifier which appears in the lower-right corner of the Box"
- msgstr "Identyfikator pojawiający się w prawym dolnym narożniku prostokąta"
- 
--#: ../objects/SADT/box.c:453
-+#: ../objects/SADT/box.c:460
- msgid "SADT box"
- msgstr "ProstokÄ…t SADT"
- 
-@@ -4178,607 +4840,979 @@ msgstr "ProstokÄ…t SADT"
- msgid "SADT diagram objects"
- msgstr "Obiekty diagramu SADT"
- 
--#: ../objects/UML/actor.c:349 ../objects/UML/actor.c:351
--#: ../sheets/UML.sheet.in.h:2
--msgid "Actor"
--msgstr "Aktor"
--
--#: ../objects/UML/association.c:1173 ../objects/UML/class_dialog.c:2208
--msgid "Direction:"
--msgstr "Kierunek:"
--
--#: ../objects/UML/association.c:1190
--msgid "From A to B"
--msgstr "Od A do B"
-+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-+msgid "No Protection"
-+msgstr "Bez ochrony"
- 
--#: ../objects/UML/association.c:1197
--msgid "From B to A"
--msgstr "Od B do A"
-+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-+msgid "Restricted Diffusion"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1221 ../objects/UML/association.c:1229
--msgid "Side A"
--msgstr "Strona A"
-+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-+msgid "Special Country Confidential"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1223 ../objects/UML/association.c:1231
--msgid "Side B"
--msgstr "Strona B"
-+#: ../objects/SISSI/classification.h:41
-+msgid "Confidential"
-+msgstr "Poufne"
- 
--#: ../objects/UML/association.c:1237
--msgid "Role:"
--msgstr "Rola:"
-+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-+msgid "NATO Confidential"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1249
--msgid "Multiplicity:"
--msgstr "Wielokrotność"
-+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-+msgid "Personal Confidential"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1260 ../objects/UML/class_dialog.c:1019
--#: ../objects/UML/class_dialog.c:1952
--msgid "Visibility:"
--msgstr "Widoczność:"
-+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-+msgid "Medical Confidential"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1269 ../objects/UML/class_dialog.c:1028
--#: ../objects/UML/class_dialog.c:1961 ../objects/UML/uml.c:102
--msgid "Public"
--msgstr "Publiczna"
-+#: ../objects/SISSI/classification.h:45
-+#, fuzzy
-+msgid "Industry Confidential"
-+msgstr "Poufne"
- 
--#: ../objects/UML/association.c:1279 ../objects/UML/class_dialog.c:1036
--#: ../objects/UML/class_dialog.c:1969 ../objects/UML/uml.c:103
--msgid "Private"
--msgstr "Prywatna"
-+#: ../objects/SISSI/classification.h:46
-+msgid "Defense Confidential"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1289 ../objects/UML/class_dialog.c:1044
--#: ../objects/UML/class_dialog.c:1977 ../objects/UML/uml.c:104
--msgid "Protected"
--msgstr "Chroniona"
-+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-+msgid "Secret"
-+msgstr ""
- 
--#: ../objects/UML/association.c:1299 ../objects/UML/class_dialog.c:1052
--#: ../objects/UML/class_dialog.c:1985 ../objects/UML/uml.c:105
--msgid "Implementation"
--msgstr "Implementacja"
-+#: ../objects/SISSI/classification.h:48
-+msgid "Defense Secret"
-+msgstr ""
- 
--#. Show arrow:
--#: ../objects/UML/association.c:1318
--msgid "Show arrow"
--msgstr "Wyświetlanie strzałki"
-+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-+msgid "Secret special country"
-+msgstr ""
- 
--#. Aggregate
--#: ../objects/UML/association.c:1324
--msgid "Aggregate"
--msgstr "Agregat"
-+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-+msgid "NATO Secret"
-+msgstr ""
- 
--#. Composition
--#: ../objects/UML/association.c:1332
--msgid "Composition"
--msgstr "Złożenie"
-+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-+msgid "Very Secret"
-+msgstr ""
- 
--#: ../objects/UML/class.c:137 ../objects/UML/class.c:308
--#: ../objects/UML/class.c:1703 ../sheets/UML.sheet.in.h:6
--msgid "Class"
--msgstr "Klasa"
-+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-+msgid "NATO Very Secret"
-+msgstr ""
- 
--#: ../objects/UML/class.c:141 ../objects/UML/classicon.c:138
--#: ../objects/UML/component.c:124 ../objects/UML/large_package.c:129
--#: ../objects/UML/object.c:150 ../objects/UML/small_package.c:124
--#: ../objects/UML/umloperation.c:68
--msgid "Stereotype"
--msgstr "Stereotyp"
-+#: ../objects/SISSI/sissi.c:66
-+msgid "SISSI diagram"
-+msgstr "Diagram SISSI"
- 
--#: ../objects/UML/class.c:143 ../objects/UML/class.c:184
--#: ../objects/UML/class_dialog.c:425 ../objects/UML/umlattribute.c:43
--#: ../objects/UML/umloperation.c:66 ../objects/UML/umlparameter.c:49
--#: ../sheets/SDL.sheet.in.h:3
--msgid "Comment"
--msgstr "Komentarz"
-+#: ../objects/SISSI/sissi.c:923
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Not a regular file: %s"
-+msgstr ""
- 
--#: ../objects/UML/class.c:145 ../objects/UML/class.c:178
--#: ../objects/UML/class_dialog.c:324 ../objects/UML/class_dialog.c:410
--#: ../objects/UML/class_dialog.c:2016 ../objects/UML/uml.c:110
--msgid "Abstract"
--msgstr "Abstrakcyjna"
-+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Incorrect file type: %s"
-+msgstr ""
-+"BÅ‚Ä…d przy odczycie obiektu.\n"
-+"Nieprawidłowy typ pliku: %s"
- 
--#: ../objects/UML/class.c:147 ../objects/UML/class.c:1700
--msgid "Template"
--msgstr "Wzorzec"
-+#: ../objects/SISSI/sissi.c:940
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Not a Dia file: %s"
-+msgstr ""
-+"BÅ‚Ä…d przy odczycie obiektu.\n"
-+"To nie jest plik Dia: %s"
- 
--#: ../objects/UML/class.c:150 ../objects/UML/class_dialog.c:333
--msgid "Suppress Attributes"
--msgstr "Ukryte atrybuty"
-+#: ../objects/SISSI/sissi_dialog.c:48
-+msgid "Industrial Confidential"
-+msgstr ""
- 
--#: ../objects/UML/class.c:152
--msgid "Suppress Operations"
--msgstr "Ukryte operacje"
-+#: ../objects/SISSI/sissi_dialog.c:58
-+msgid "No integrity"
-+msgstr ""
- 
--#: ../objects/UML/class.c:154
--msgid "Visible Attributes"
--msgstr "Widoczne atrybuty"
-+#: ../objects/SISSI/sissi_dialog.c:59
-+msgid "Low integrity"
-+msgstr ""
- 
--#: ../objects/UML/class.c:156
--msgid "Visible Operations"
--msgstr "Widoczne operacje"
-+#: ../objects/SISSI/sissi_dialog.c:60
-+msgid "Average software integrity"
-+msgstr ""
- 
--#: ../objects/UML/class.c:158
--msgid "Visible Comments"
--msgstr "Widoczne komentarze"
-+#: ../objects/SISSI/sissi_dialog.c:61
-+msgid "High software integrity"
-+msgstr ""
- 
--#: ../objects/UML/class.c:160 ../objects/UML/class_dialog.c:349
--#, fuzzy
--msgid "Wrap Operations"
--msgstr "Operacje"
-+#: ../objects/SISSI/sissi_dialog.c:62
-+msgid "Average hardware integrity"
-+msgstr ""
- 
--#: ../objects/UML/class.c:162
--#, fuzzy
--msgid "Wrap after char"
--msgstr "Karta rozszerzeń PC"
-+#: ../objects/SISSI/sissi_dialog.c:63
-+msgid "High hardware integrity"
-+msgstr ""
- 
--#: ../objects/UML/class.c:164
--#, fuzzy
--msgid "Comment line length"
--msgstr "Widoczne komentarze"
-+#: ../objects/SISSI/sissi_dialog.c:68
-+msgid "Millisecond"
-+msgstr "Milisekunda"
- 
--#: ../objects/UML/class.c:166
--#, fuzzy
--msgid "Comment tagging"
--msgstr "Komentarz"
-+#: ../objects/SISSI/sissi_dialog.c:69
-+msgid "Second"
-+msgstr "Sekunda"
- 
--#: ../objects/UML/class.c:176 ../objects/UML/class_dialog.c:405
--msgid "Polymorphic"
--msgstr "Polimorficzna"
-+#: ../objects/SISSI/sissi_dialog.c:70
-+msgid "Minute"
-+msgstr "Minuta"
- 
--#: ../objects/UML/class.c:180
--#, fuzzy
--msgid "Classname"
--msgstr "Nazwa klasy:"
-+#: ../objects/SISSI/sissi_dialog.c:71
-+msgid "Hour"
-+msgstr "Godzina"
- 
--#: ../objects/UML/class.c:182
--#, fuzzy
--msgid "Abstract Classname"
--msgstr "Klasa abstrakcyjna"
-+#: ../objects/SISSI/sissi_dialog.c:72
-+msgid "Day"
-+msgstr "Dzień"
- 
--#: ../objects/UML/class.c:188 ../objects/UML/class.c:190
--#: ../objects/UML/class.c:192 ../objects/UML/class.c:194
--#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
--msgid " "
--msgstr ""
-+#: ../objects/SISSI/sissi_dialog.c:73
-+msgid "Week"
-+msgstr "Tydzień"
- 
--#: ../objects/UML/class.c:204 ../objects/UML/object.c:154
--msgid "Attributes"
--msgstr "Atrybuty"
-+#: ../objects/SISSI/sissi_dialog.c:78
-+msgid "SYSTEM"
-+msgstr "SYSTEM"
- 
--#: ../objects/UML/class.c:206
--msgid "Operations"
--msgstr "Operacje"
-+#: ../objects/SISSI/sissi_dialog.c:79
-+msgid "Internet access device"
-+msgstr "Internetowe urządzenie dostępowe"
- 
--#: ../objects/UML/class.c:209
--#, fuzzy
--msgid "Template Parameters"
--msgstr "Parametry"
-+#: ../objects/SISSI/sissi_dialog.c:80
-+msgid "Electronic messaging"
-+msgstr "Wiadomość elektroniczna"
- 
--#: ../objects/UML/class.c:303
--#, fuzzy
--msgid "Show Comments"
--msgstr "Wyświetlanie komentarzy"
-+#: ../objects/SISSI/sissi_dialog.c:81
-+msgid "Intranet"
-+msgstr "Intranet"
- 
--#. Class page:
--#: ../objects/UML/class_dialog.c:285
--#, fuzzy
--msgid "_Class"
--msgstr "Klasa"
-+#: ../objects/SISSI/sissi_dialog.c:82
-+msgid "Company directory"
-+msgstr "Katalog firmy"
- 
--#: ../objects/UML/class_dialog.c:293
--msgid "Class name:"
--msgstr "Nazwa klasy:"
-+#: ../objects/SISSI/sissi_dialog.c:83
-+msgid "External portal"
-+msgstr "Zewnętrzny portal"
- 
--#: ../objects/UML/class_dialog.c:301 ../objects/UML/class_dialog.c:1939
--#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
--#: ../objects/UML/realizes.c:134
--msgid "Stereotype:"
--msgstr "Szablon:"
-+#: ../objects/SISSI/sissi_dialog.c:88
-+msgid "ORGANISATION"
-+msgstr "ORGANIZACJA"
- 
--#: ../objects/UML/class_dialog.c:308 ../objects/UML/class_dialog.c:997
--#: ../objects/UML/class_dialog.c:2057 ../objects/UML/class_dialog.c:2188
--msgid "Comment:"
--msgstr "Komentarz:"
-+#: ../objects/SISSI/sissi_dialog.c:89
-+msgid "Higher-tier organisation"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:330
--msgid "Attributes visible"
--msgstr "Wyświetlanie części zawierającej arybuty"
-+#: ../objects/SISSI/sissi_dialog.c:90
-+msgid "Structure of the organisation"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:339
--msgid "Operations visible"
--msgstr "Wyświetlanie części zawierającej operacje"
-+#: ../objects/SISSI/sissi_dialog.c:91
-+msgid "Project or system organisation"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:342
--msgid "Suppress operations"
--msgstr "Ukryte operacje"
-+#: ../objects/SISSI/sissi_dialog.c:92
-+msgid "Subcontractors/Suppliers/Manufacturers"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:356
--msgid "Wrap after this length: "
-+#: ../objects/SISSI/sissi_dialog.c:97
-+msgid "SITE"
- msgstr ""
- 
--#: ../objects/UML/class_dialog.c:364
--msgid "Comments visible"
--msgstr "Widoczne komentarze"
-+#: ../objects/SISSI/sissi_dialog.c:98
-+msgid "Places"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:371
--msgid "Wrap comment after this length: "
-+#: ../objects/SISSI/sissi_dialog.c:99
-+msgid "External environment"
- msgstr ""
- 
--#: ../objects/UML/class_dialog.c:378
--msgid "Show documenation tag"
-+#: ../objects/SISSI/sissi_dialog.c:100
-+msgid "Premises"
- msgstr ""
- 
--#. head line
--#: ../objects/UML/class_dialog.c:391 ../objects/UML/umlparameter.c:51
--msgid "Kind"
--msgstr "Rodzaj"
-+#: ../objects/SISSI/sissi_dialog.c:101
-+msgid "Zone"
-+msgstr "Strefa"
- 
--#: ../objects/UML/class_dialog.c:396
--msgid "Size"
--msgstr "Rozmiar"
-+#: ../objects/SISSI/sissi_dialog.c:102
-+msgid "Essential Services"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:415
--msgid "Class Name"
--msgstr "Nazwa klasy"
-+#: ../objects/SISSI/sissi_dialog.c:103
-+msgid "Communication"
-+msgstr "Komunikacja"
- 
--#: ../objects/UML/class_dialog.c:420
--msgid "Abstract Class"
--msgstr "Klasa abstrakcyjna"
-+#: ../objects/SISSI/sissi_dialog.c:104
-+msgid "Power"
-+msgstr "Moc"
- 
--#. should probably be refactored too.
--#: ../objects/UML/class_dialog.c:437
--msgid "Text Color"
--msgstr "Kolor tekstu"
-+#: ../objects/SISSI/sissi_dialog.c:105
-+msgid "Cooling/Pollution"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:445
--msgid "Foreground Color"
--msgstr "Kolor pierwszoplanowy"
-+#: ../objects/SISSI/sissi_dialog.c:109
-+msgid "Thermal detection"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:453
--msgid "Background Color"
--msgstr "Kolor tła"
-+#: ../objects/SISSI/sissi_dialog.c:113
-+msgid "Fire detection"
-+msgstr "Wykrywanie ognia"
- 
--#. Attributes page:
--#: ../objects/UML/class_dialog.c:897
--msgid "_Attributes"
--msgstr "_Atrybuty"
-+#: ../objects/SISSI/sissi_dialog.c:117
-+msgid "Water detection"
-+msgstr "Wykrywanie wody"
- 
--#: ../objects/UML/class_dialog.c:925 ../objects/UML/class_dialog.c:1875
--#: ../objects/UML/class_dialog.c:2112 ../objects/UML/class_dialog.c:2642
--msgid "_New"
--msgstr "_Nowy"
-+#: ../objects/SISSI/sissi_dialog.c:121
-+msgid "Air detection"
-+msgstr "Wykrywanie powietrza"
- 
--#: ../objects/UML/class_dialog.c:931 ../objects/UML/class_dialog.c:1881
--#: ../objects/UML/class_dialog.c:2119 ../objects/UML/class_dialog.c:2648
--msgid "_Delete"
--msgstr "_Usuń"
-+#: ../objects/SISSI/sissi_dialog.c:125
-+msgid "Energy detection"
-+msgstr "Wykrywanie energii"
- 
--#: ../objects/UML/class_dialog.c:937 ../objects/UML/class_dialog.c:1887
--#: ../objects/UML/class_dialog.c:2126 ../objects/UML/class_dialog.c:2654
--msgid "Move up"
--msgstr "Przenieś w górę"
-+#: ../objects/SISSI/sissi_dialog.c:129
-+msgid "Intrusion detection"
-+msgstr "Wykrywanie wtargnięcia"
- 
--#: ../objects/UML/class_dialog.c:943 ../objects/UML/class_dialog.c:1893
--#: ../objects/UML/class_dialog.c:2133 ../objects/UML/class_dialog.c:2660
--msgid "Move down"
--msgstr "Przenieś w dół"
-+#: ../objects/SISSI/sissi_dialog.c:133
-+msgid "Thermal action"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:954
--msgid "Attribute data"
--msgstr "Dane atrybutu"
-+#: ../objects/SISSI/sissi_dialog.c:137
-+msgid "Fire action"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:986
--msgid "Value:"
--msgstr "Wartość:"
-+#: ../objects/SISSI/sissi_dialog.c:141
-+msgid "Water action"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:1073 ../objects/UML/class_dialog.c:2001
--msgid "Class scope"
--msgstr "Zasięg klasy"
-+#: ../objects/SISSI/sissi_dialog.c:145
-+msgid "Air action"
-+msgstr ""
- 
--#. Operations page:
--#: ../objects/UML/class_dialog.c:1847
--msgid "_Operations"
--msgstr "_Operacje"
-+#: ../objects/SISSI/sissi_dialog.c:149
-+msgid "Energy action"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:1905
--msgid "Operation data"
--msgstr "Dane operacji"
-+#: ../objects/SISSI/sissi_dialog.c:153
-+msgid "Intrusion action"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2007
--msgid "Inheritance type:"
--msgstr "Rodzaj dziedziczenia:"
-+#: ../objects/SISSI/sissi_dialog.c:158
-+msgid "Personal"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2024 ../objects/UML/uml.c:111
--msgid "Polymorphic (virtual)"
--msgstr "Polimorficzne (wirtualne)"
-+#: ../objects/SISSI/sissi_dialog.c:159
-+msgid "Decision maker"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2032 ../objects/UML/uml.c:112
--msgid "Leaf (final)"
--msgstr "Liściaste (końcowe)"
-+#: ../objects/SISSI/sissi_dialog.c:160
-+msgid "SSI Responsible"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2050
--msgid "Query"
--msgstr "Zapytanie"
-+#: ../objects/SISSI/sissi_dialog.c:161
-+msgid "Users"
-+msgstr "Użytkownicy"
- 
--#: ../objects/UML/class_dialog.c:2083
--msgid "Parameters:"
--msgstr "Parametry:"
-+#: ../objects/SISSI/sissi_dialog.c:162
-+msgid "Functional administrator"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2145
--msgid "Parameter data"
--msgstr "Dane parametru"
-+#: ../objects/SISSI/sissi_dialog.c:163
-+msgid "Technical administrator"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2177
--msgid "Def. value:"
--msgstr "Domyślna wartość"
-+#: ../objects/SISSI/sissi_dialog.c:164
-+msgid "SSI administrator"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2217 ../objects/UML/umlparameter.c:34
--msgid "Undefined"
--msgstr "Nie zdefiniowano"
-+#: ../objects/SISSI/sissi_dialog.c:165
-+msgid "Developer"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2225 ../objects/UML/umlparameter.c:35
--msgid "In"
--msgstr "Wejście"
-+#: ../objects/SISSI/sissi_dialog.c:166
-+msgid "Operator/Maintenance"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2234 ../objects/UML/umlparameter.c:36
--msgid "Out"
--msgstr "Wyjście"
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
-+msgid "Network"
-+msgstr "Sieć komputerowa"
- 
--#: ../objects/UML/class_dialog.c:2243 ../objects/UML/umlparameter.c:37
--msgid "In & Out"
--msgstr "Wejście i wyjście"
-+#: ../objects/SISSI/sissi_dialog.c:172
-+msgid "Medium and support"
-+msgstr ""
- 
--#. Templates page:
--#: ../objects/UML/class_dialog.c:2608
--msgid "_Templates"
--msgstr "_Szablony"
-+#: ../objects/SISSI/sissi_dialog.c:173
-+msgid "Passive or active relay"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2614 ../sheets/UML.sheet.in.h:29
--msgid "Template class"
--msgstr "Wzorzec klasy"
-+#: ../objects/SISSI/sissi_dialog.c:174
-+msgid "Communication interface"
-+msgstr ""
- 
--#: ../objects/UML/class_dialog.c:2671
--msgid "Formal parameter data"
--msgstr "Dane parametru formalnego"
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
-+msgid "Software"
-+msgstr "Oprogramowanie"
- 
--#: ../objects/UML/classicon.c:128
--msgid "Boundary"
--msgstr "Granica"
-+#: ../objects/SISSI/sissi_dialog.c:180
-+msgid "Operating System"
-+msgstr "System operacyjny"
- 
--#: ../objects/UML/classicon.c:140
--msgid "Is object"
--msgstr "Jest obiektem"
-+#: ../objects/SISSI/sissi_dialog.c:181
-+msgid "Service - maintenance or administration software"
-+msgstr ""
- 
--#: ../objects/UML/component_feature.c:145 ../sheets/UML.sheet.in.h:14
--msgid "Facet"
-+#: ../objects/SISSI/sissi_dialog.c:182
-+msgid "Packaged software or standard software"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:183
-+msgid "Business application"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:184
-+msgid "Standard business application"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:185
-+msgid "Specific business application"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:190
-+msgid "HARDWARE"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:191
-+msgid "Data processing equipment (active)"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:192
-+msgid "Mobile equipment"
-+msgstr "Sprzęty bezprzewodowe"
-+
-+#: ../objects/SISSI/sissi_dialog.c:193
-+msgid "Fixed equipment"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:194
-+msgid "Peripheral processing"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:195
-+msgid "Electronic medium"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:196
-+msgid "Other media"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:197
-+msgid "Data medium (passive)"
-+msgstr ""
-+
-+#. Class page:
-+#: ../objects/SISSI/sissi_dialog.c:301
-+msgid "_Menace"
-+msgstr ""
-+
-+#. ********* label of board *********
-+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-+msgid "Menace"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-+msgid "P Action"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-+msgid "P Detection"
-+msgstr ""
-+
-+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-+msgid "Vulnerability"
-+msgstr ""
-+
-+#. Other properties of page:
-+#: ../objects/SISSI/sissi_dialog.c:488
-+msgid "Other properties"
-+msgstr "Inne właściwości"
-+
-+#. ********* selection menu of entity ********
-+#. ********* Label of board *********
-+#: ../objects/SISSI/sissi_dialog.c:726
-+msgid "Label"
-+msgstr "Etykieta"
-+
-+#: ../objects/SISSI/sissi_dialog.c:728
-+msgid "value"
-+msgstr "wartość"
-+
-+#. Other properties of page
-+#: ../objects/SISSI/sissi_dialog.c:861
-+msgid "Documents"
-+msgstr "Dokumenty"
-+
-+#: ../objects/SISSI/sissi_dialog.c:876
-+msgid "Document title"
-+msgstr "Tytuł dokumentu"
-+
-+#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
-+#: ../sheets/UML.sheet.in.h:15
-+msgid "Actor"
-+msgstr "Aktor"
-+
-+#: ../objects/UML/association.c:223
-+msgid "From A to B"
-+msgstr "Od A do B"
-+
-+#: ../objects/UML/association.c:224
-+msgid "From B to A"
-+msgstr "Od B do A"
-+
-+#: ../objects/UML/association.c:229
-+msgid "Aggregation"
-+msgstr "Agregacja"
-+
-+#: ../objects/UML/association.c:230
-+msgid "Composition"
-+msgstr "Złożenie"
-+
-+#: ../objects/UML/association.c:240
-+msgid "Direction"
-+msgstr "Kierunek"
-+
-+#: ../objects/UML/association.c:242
-+msgid "Show direction"
-+msgstr "Pokaż kierunek"
-+
-+#: ../objects/UML/association.c:242
-+msgid "Show the small arrow denoting the reading direction"
-+msgstr "Pokaż małą strzałkę wskazującą kierunek związku"
-+
-+#: ../objects/UML/association.c:249
-+msgid "Side A"
-+msgstr "Strona A"
-+
-+#: ../objects/UML/association.c:253
-+msgid "Multiplicity"
-+msgstr "Krotność"
-+
-+#: ../objects/UML/association.c:255 ../objects/UML/umlattribute.c:45
-+#: ../objects/UML/umloperation.c:71
-+msgid "Visibility"
-+msgstr "Widoczność"
-+
-+#: ../objects/UML/association.c:257
-+msgid "Show arrow"
-+msgstr "Wyświetlanie strzałki"
-+
-+#: ../objects/UML/association.c:260
-+msgid "Side B"
-+msgstr "Strona B"
-+
-+#: ../objects/UML/association.c:271 ../objects/UML/object.c:162
-+#, fuzzy
-+msgid "Style"
-+msgstr "_Styl"
-+
-+#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
-+#: ../objects/UML/class.c:1827 ../sheets/UML.sheet.in.h:3
-+msgid "Class"
-+msgstr "Klasa"
-+
-+#. how it used to be before 0.96+SVN
-+#. one name, one type: but breaks forward-compatibiliy so kind of reverted
-+#: ../objects/UML/class.c:147 ../objects/UML/classicon.c:139
-+#: ../objects/UML/classicon.c:141 ../objects/UML/component.c:126
-+#: ../objects/UML/large_package.c:135 ../objects/UML/object.c:149
-+#: ../objects/UML/small_package.c:128 ../objects/UML/umloperation.c:68
-+msgid "Stereotype"
-+msgstr "Stereotyp"
-+
-+#: ../objects/UML/class.c:151 ../objects/UML/class.c:186
-+#: ../objects/UML/class_dialog.c:359 ../objects/UML/class_dialog.c:471
-+#: ../objects/UML/class_operations_dialog.c:832 ../objects/UML/uml.c:111
-+msgid "Abstract"
-+msgstr "Abstrakcyjna"
-+
-+#: ../objects/UML/class.c:153 ../objects/UML/class.c:1824
-+msgid "Template"
-+msgstr "Wzorzec"
-+
-+#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:368
-+msgid "Suppress Attributes"
-+msgstr "Ukryte atrybuty"
-+
-+#: ../objects/UML/class.c:158
-+msgid "Suppress Operations"
-+msgstr "Ukryte operacje"
-+
-+#: ../objects/UML/class.c:160
-+msgid "Visible Attributes"
-+msgstr "Widoczne atrybuty"
-+
-+#: ../objects/UML/class.c:162
-+msgid "Visible Operations"
-+msgstr "Widoczne operacje"
-+
-+#: ../objects/UML/class.c:164
-+msgid "Visible Comments"
-+msgstr "Widoczne komentarze"
-+
-+#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:384
-+msgid "Wrap Operations"
-+msgstr "Zawijaj operacje"
-+
-+#: ../objects/UML/class.c:168
-+msgid "Wrap after char"
-+msgstr "Zawijaj po"
-+
-+#: ../objects/UML/class.c:170
-+msgid "Comment line length"
-+msgstr "Długość wiersza komentarza"
-+
-+#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
-+#, fuzzy
-+msgid "Allow resizing"
-+msgstr "Pusty trójkąt"
-+
-+#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:466
-+msgid "Polymorphic"
-+msgstr "Polimorficzna"
-+
-+#: ../objects/UML/class.c:188 ../objects/UML/class_dialog.c:476
-+msgid "Class Name"
-+msgstr "Nazwa klasy"
-+
-+#: ../objects/UML/class.c:190
-+#, fuzzy
-+msgid "Abstract Class Name"
-+msgstr "Nazwa klasy abstrakcyjnej"
-+
-+#: ../objects/UML/class.c:214
-+msgid "Operations"
-+msgstr "Operacje"
-+
-+#: ../objects/UML/class.c:217
-+msgid "Template Parameters"
-+msgstr "Parametry szablonu"
-+
-+#: ../objects/UML/class_attributes_dialog.c:539
-+msgid "Value:"
-+msgstr "Wartość:"
-+
-+#: ../objects/UML/class_attributes_dialog.c:572
-+#: ../objects/UML/class_operations_dialog.c:811
-+msgid "Visibility:"
-+msgstr "Widoczność:"
-+
-+#: ../objects/UML/class_attributes_dialog.c:577
-+#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
-+msgid "Public"
-+msgstr "Publiczna"
-+
-+#: ../objects/UML/class_attributes_dialog.c:578
-+#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
-+msgid "Private"
-+msgstr "Prywatna"
-+
-+#: ../objects/UML/class_attributes_dialog.c:579
-+#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
-+msgid "Protected"
-+msgstr "Chroniona"
-+
-+#: ../objects/UML/class_attributes_dialog.c:580
-+#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
-+msgid "Implementation"
-+msgstr "Implementacja"
-+
-+#. end: Inheritance type
-+#: ../objects/UML/class_attributes_dialog.c:592
-+#: ../objects/UML/class_operations_dialog.c:840
-+msgid "Class scope"
-+msgstr "Zasięg klasy"
-+
-+#. Class page:
-+#: ../objects/UML/class_dialog.c:320
-+msgid "_Class"
-+msgstr "_Klasa"
-+
-+#: ../objects/UML/class_dialog.c:328
-+msgid "Class name:"
-+msgstr "Nazwa klasy:"
-+
-+#: ../objects/UML/class_dialog.c:336
-+#: ../objects/UML/class_operations_dialog.c:799
-+#: ../objects/UML/dependency.c:136 ../objects/UML/generalization.c:133
-+#: ../objects/UML/realizes.c:133
-+msgid "Stereotype:"
-+msgstr "Stereotyp:"
-+
-+#: ../objects/UML/class_dialog.c:365
-+msgid "Attributes visible"
-+msgstr "Wyświetlanie części zawierającej arybuty"
-+
-+#: ../objects/UML/class_dialog.c:374
-+msgid "Operations visible"
-+msgstr "Wyświetlanie części zawierającej operacje"
-+
-+#: ../objects/UML/class_dialog.c:377
-+msgid "Suppress operations"
-+msgstr "Ukryte operacje"
-+
-+#: ../objects/UML/class_dialog.c:391
-+msgid "Wrap after this length: "
-+msgstr "Zawijaj po tej długości: "
-+
-+#: ../objects/UML/class_dialog.c:399
-+msgid "Comments visible"
-+msgstr "Widoczne komentarze"
-+
-+#: ../objects/UML/class_dialog.c:406
-+msgid "Wrap comment after this length: "
-+msgstr "Zawijaj komentarze po: "
-+
-+#: ../objects/UML/class_dialog.c:481
-+msgid "Abstract Class"
-+msgstr "Klasa abstrakcyjna"
-+
-+#. should probably be refactored too.
-+#: ../objects/UML/class_dialog.c:498
-+msgid "Line Width"
-+msgstr "Szerokość linii"
-+
-+#: ../objects/UML/class_dialog.c:507
-+msgid "Text Color"
-+msgstr "Kolor tekstu"
-+
-+#: ../objects/UML/class_dialog.c:516
-+msgid "Foreground Color"
-+msgstr "Kolor pierwszoplanowy"
-+
-+#: ../objects/UML/class_dialog.c:525
-+msgid "Background Color"
-+msgstr "Kolor tła"
-+
-+#. end: Visibility
-+#: ../objects/UML/class_operations_dialog.c:827
-+msgid "Inheritance type:"
-+msgstr "Rodzaj dziedziczenia:"
-+
-+#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
-+msgid "Polymorphic (virtual)"
-+msgstr "Polimorficzne (wirtualne)"
-+
-+#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
-+msgid "Leaf (final)"
-+msgstr "Liściaste (końcowe)"
-+
-+#: ../objects/UML/class_operations_dialog.c:844
-+msgid "Query"
-+msgstr "Zapytanie"
-+
-+#: ../objects/UML/class_operations_dialog.c:888
-+msgid "Parameters:"
-+msgstr "Parametry:"
-+
-+#: ../objects/UML/class_operations_dialog.c:966
-+msgid "Parameter data"
-+msgstr "Dane parametru"
-+
-+#: ../objects/UML/class_operations_dialog.c:999
-+msgid "Def. value:"
-+msgstr "Domyślna wartość"
-+
-+#: ../objects/UML/class_operations_dialog.c:1030
-+msgid "Direction:"
-+msgstr "Kierunek:"
-+
-+#: ../objects/UML/class_operations_dialog.c:1035
-+#: ../objects/UML/umlparameter.c:34
-+msgid "Undefined"
-+msgstr "Nie zdefiniowano"
-+
-+#: ../objects/UML/class_operations_dialog.c:1036
-+#: ../objects/UML/umlparameter.c:35
-+msgid "In"
-+msgstr "Wejście"
-+
-+#: ../objects/UML/class_operations_dialog.c:1037
-+#: ../objects/UML/umlparameter.c:36
-+msgid "Out"
-+msgstr "Wyjście"
-+
-+#: ../objects/UML/class_operations_dialog.c:1038
-+#: ../objects/UML/umlparameter.c:37
-+msgid "In & Out"
-+msgstr "Wejście i wyjście"
-+
-+#. Operations page:
-+#: ../objects/UML/class_operations_dialog.c:1069
-+msgid "_Operations"
-+msgstr "_Operacje"
-+
-+#: ../objects/UML/class_operations_dialog.c:1124
-+msgid "Operation data"
-+msgstr "Dane operacji"
-+
-+#. Templates page:
-+#: ../objects/UML/class_templates_dialog.c:368
-+msgid "_Templates"
-+msgstr "_Szablony"
-+
-+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
-+msgid "Template class"
-+msgstr "Wzorzec klasy"
-+
-+#: ../objects/UML/class_templates_dialog.c:426
-+msgid "Formal parameter data"
-+msgstr "Dane parametru formalnego"
-+
-+#: ../objects/UML/classicon.c:131
-+msgid "Boundary"
-+msgstr "Granica"
-+
-+#: ../objects/UML/classicon.c:144
-+msgid "Is object"
-+msgstr "Jest obiektem"
-+
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
-+msgid "Facet"
- msgstr "Aspekt"
- 
--#: ../objects/UML/component_feature.c:146 ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr "Pojemnik"
- 
--#: ../objects/UML/component_feature.c:147 ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr "Źródło zdarzenia"
- 
--#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr "Zbiornik zdarzeń"
- 
--#: ../objects/UML/constraint.c:125
-+#: ../objects/UML/constraint.c:127
- msgid "Constraint:"
- msgstr "Wymóg:"
- 
--#: ../objects/UML/dependency.c:139
-+#: ../objects/UML/dependency.c:138
- msgid "Show arrow:"
- msgstr "Wyświetlanie strzałki:"
- 
--#: ../objects/UML/implements.c:129
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-+#: ../objects/UML/implements.c:128 ../objects/UML/implements.c:130
- msgid "Interface:"
- msgstr "Interfejs:"
- 
--#: ../objects/UML/lifeline.c:144
-+#: ../objects/UML/lifeline.c:165
- msgid "Draw focus of control:"
- msgstr "Wyświetlanie skupienia sterowania:"
- 
--#: ../objects/UML/lifeline.c:146
-+#: ../objects/UML/lifeline.c:167
- msgid "Draw destruction mark:"
- msgstr "Wyświetlanie znacznika usunięcia:"
- 
--#: ../objects/UML/lifeline.c:417
-+#: ../objects/UML/lifeline.c:535
- msgid "Add connection points"
- msgstr "Dodaj punkty połączenia"
- 
--#: ../objects/UML/lifeline.c:418
-+#: ../objects/UML/lifeline.c:536
- msgid "Remove connection points"
- msgstr "Usuń punkty połączenia"
- 
--#: ../objects/UML/lifeline.c:422
-+#: ../objects/UML/lifeline.c:537
-+msgid "Increase connection points distance"
-+msgstr "Zwiększ odległość między punktami połączeń"
-+
-+#: ../objects/UML/lifeline.c:538
-+msgid "Decrease connection points distance"
-+msgstr "Zmniejsz odległość między punktami połączeń"
-+
-+#: ../objects/UML/lifeline.c:539
-+msgid "Set default connection points distance"
-+msgstr "Ustaw domyślną odległość między punktami połączeń"
-+
-+#: ../objects/UML/lifeline.c:543
- msgid "UML Lifeline"
- msgstr "Linia życia UML"
- 
--#: ../objects/UML/message.c:135
-+#: ../objects/UML/message.c:137
- msgid "Call"
- msgstr "Wywołuje"
- 
--#: ../objects/UML/message.c:136
-+#: ../objects/UML/message.c:138
- msgid "Create"
- msgstr "Tworzy"
- 
--#: ../objects/UML/message.c:137
-+#: ../objects/UML/message.c:139
- msgid "Destroy"
- msgstr "Niszczy"
- 
--#: ../objects/UML/message.c:138
-+#: ../objects/UML/message.c:140
- msgid "Simple"
- msgstr "Prosty"
- 
--#: ../objects/UML/message.c:139
-+#: ../objects/UML/message.c:141
- msgid "Return"
- msgstr "Zwraca"
- 
--#: ../objects/UML/message.c:140
-+#: ../objects/UML/message.c:142
- msgid "Send"
- msgstr "Wysyła"
- 
--#: ../objects/UML/message.c:141
-+#: ../objects/UML/message.c:143
- msgid "Recursive"
- msgstr "Rekurencyjny"
- 
--#: ../objects/UML/message.c:153
-+#: ../objects/UML/message.c:154
- msgid "Message type:"
- msgstr "Rodzaj komunikatu:"
- 
--#: ../objects/UML/object.c:152
-+#: ../objects/UML/object.c:151
- msgid "Explicit state"
- msgstr "Sprecyzowany stan"
- 
--#: ../objects/UML/object.c:157
-+#: ../objects/UML/object.c:156
- msgid "Active object"
- msgstr "Aktywny obiekt"
- 
--#: ../objects/UML/object.c:159
-+#: ../objects/UML/object.c:158
- msgid "Show attributes"
- msgstr "Wyświetlanie atrybutów"
- 
--#: ../objects/UML/object.c:161
-+#: ../objects/UML/object.c:160
- msgid "Multiple instance"
- msgstr "Wielokrotna instancja"
- 
--#: ../objects/UML/state.c:153
--#, fuzzy
-+#: ../objects/UML/state.c:151
- msgid "Entry action"
--msgstr "Wydobywanie"
-+msgstr "Akcja wejściowa"
- 
--#: ../objects/UML/state.c:154
--#, fuzzy
-+# CHECK Translation (Akcja czynna?)
-+#: ../objects/UML/state.c:152
- msgid "Do action"
--msgstr "Obrót"
-+msgstr "Akcja"
- 
--#: ../objects/UML/state.c:155
--#, fuzzy
-+#: ../objects/UML/state.c:153
- msgid "Exit action"
--msgstr "Wydobywanie"
-+msgstr "Akcja wyjściowa"
- 
- #. Would like to create a state_term instead, but making the connections
- #. * is a pain
--#: ../objects/UML/state.c:470
-+#: ../objects/UML/state.c:493
-+#, fuzzy
- msgid ""
- "This diagram uses the State object for initial/final states.\n"
--"That option will go away in future versions.\n"
--"Please use the Initial/Final State object instead\n"
-+"This option will go away in future versions.\n"
-+"Please use the Initial/Final State object instead.\n"
- msgstr ""
- "Ten diagram używa obiektów stanu do stanów początkowych/końcowych.\n"
- "Ta opcja zostanie usunięta w przyszłych wersjach.\n"
- "Zamiast niej należy używać obiektu stan początkowy/końcowy.\n"
- 
--#: ../objects/UML/state_term.c:120
-+#: ../objects/UML/state_term.c:127
- msgid "Is final"
- msgstr "Jest końcowy"
- 
--#: ../objects/UML/transition.c:132
--#, fuzzy
-+#: ../objects/UML/transition.c:142
- msgid "Trigger"
--msgstr "Palec"
-+msgstr "Wyzwalacz"
- 
--#: ../objects/UML/transition.c:133
-+#: ../objects/UML/transition.c:143
- msgid "The event that causes this transition to be taken"
--msgstr ""
-+msgstr "Zdarzenie wywołujące to przejście"
- 
--#: ../objects/UML/transition.c:134
--#, fuzzy
-+#: ../objects/UML/transition.c:144
- msgid "Action"
--msgstr "Aktor"
-+msgstr "Akcja"
- 
--#: ../objects/UML/transition.c:135
-+#: ../objects/UML/transition.c:145
- msgid "Action to perform when this transition is taken"
--msgstr ""
-+msgstr "Akcja jaką należy wykonać w czasie przejścia"
- 
--#: ../objects/UML/transition.c:136 ../sheets/cisconetwork.sheet.in.h:43
--#, fuzzy
-+#: ../objects/UML/transition.c:146 ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
--msgstr "Siatka"
-+msgstr "Warunek"
- 
--#: ../objects/UML/transition.c:137
-+#: ../objects/UML/transition.c:147
- msgid "Condition for taking this transition when the event is fired"
--msgstr ""
-+msgstr "Warunek jaki musi zostać spełniony, aby nastąpiło przejście"
- 
--#: ../objects/UML/uml.c:66
--#, fuzzy
-+#: ../objects/UML/uml.c:67
- msgid "Unified Modelling Language diagram objects UML 1.3"
--msgstr "Obiekty diagramu UML"
--
--#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
--#, fuzzy
--msgid "Value"
--msgstr "Wartość:"
--
--#: ../objects/UML/umlattribute.c:45 ../objects/UML/umloperation.c:71
--#, fuzzy
--msgid "Visibility"
--msgstr "Widoczność:"
-+msgstr "Obiekty diagramów Ujednoliconego Języka Modelowania UML 1.3"
- 
-+# CHECK Translation (Abstrakcyjna, Abstrakcyjny?)
- #: ../objects/UML/umlattribute.c:47
--#, fuzzy
- msgid "Abstract (?)"
--msgstr "Abstrakcyjna"
-+msgstr "Abstrakcja (?)"
- 
- #: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
--#, fuzzy
- msgid "Class scope (static)"
--msgstr "Zasięg klasy"
-+msgstr "Zasięg klasy (statyczny)"
- 
- #: ../objects/UML/umloperation.c:73
--#, fuzzy
- msgid "Inheritance type"
--msgstr "Rodzaj dziedziczenia:"
-+msgstr "Rodzaj dziedziczenia"
- 
- #: ../objects/UML/umloperation.c:75
- msgid "Query (const)"
--msgstr ""
-+msgstr "Zapytanie (const)"
- 
--#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:162
-+#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
- msgid "Parameters"
- msgstr "Parametry"
- 
--#: ../objects/UML/usecase.c:132
--msgid "Text outside"
--msgstr "Napis na zewnÄ…trz:"
--
--#: ../objects/UML/usecase.c:134
-+#: ../objects/UML/usecase.c:133
- msgid "Collaboration"
- msgstr "Współpraca"
- 
--#: ../objects/bondgraph/bondgraph.c:39
--msgid "Bond graph objects"
--msgstr "Zwiąż obiekty graficzne"
-+#: ../objects/UML/usecase.c:135
-+msgid "Text outside"
-+msgstr "Napis na zewnÄ…trz"
- 
- #: ../objects/chronogram/chronogram.c:40
- msgid "Chronogram diagram objects"
- msgstr "Obiekty diagramu czasowego"
- 
--#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Dane"
- 
--#: ../objects/chronogram/chronoline.c:150
-+#: ../objects/chronogram/chronoline.c:152
- msgid "Data name"
--msgstr "Nazwa danej"
-+msgstr "Nazwa danych"
- 
--#: ../objects/chronogram/chronoline.c:152
-+#: ../objects/chronogram/chronoline.c:154
- msgid "Events"
- msgstr "Zdarzenia"
- 
--#: ../objects/chronogram/chronoline.c:155
-+#: ../objects/chronogram/chronoline.c:157
- msgid "Event specification"
- msgstr "Określenie zdarzenia"
- 
--#: ../objects/chronogram/chronoline.c:156
-+#: ../objects/chronogram/chronoline.c:158
-+#, fuzzy
- msgid ""
--"@ time    set the pointer at an absolute time.\n"
--"( duration  sets the signal up, then wait 'duration'.\n"
--") duration  sets the signal down, then wait 'duration'.\n"
--"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
--"example : @ 1.0 (2.0)1.0(2.0)\n"
-+"@ time    set the pointer to an absolute time.\n"
-+"( duration  set the signal up, then wait 'duration'.\n"
-+") duration  set the signal down, then wait 'duration'.\n"
-+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
-+"Example: @ 1.0 (2.0)1.0(2.0)\n"
- msgstr ""
- "@ czas    ustawia wskaźnik w czasie bezwzględnym.\n"
- "( czas trwania  ustawia sygnał na podniesiony i oczekuje przez podany czas.\n"
-@@ -4787,312 +5821,387 @@ msgstr ""
- "czas.\n"
- "przykład : @ 1.0 (2.0)1.0(2.0)\n"
- 
--#: ../objects/chronogram/chronoline.c:164
--#: ../objects/chronogram/chronoref.c:146
-+#: ../objects/chronogram/chronoline.c:166
-+#: ../objects/chronogram/chronoref.c:148
- msgid "Start time"
- msgstr "Czas rozpoczęcia"
- 
--#: ../objects/chronogram/chronoline.c:166
--#: ../objects/chronogram/chronoref.c:148
-+#: ../objects/chronogram/chronoline.c:168
-+#: ../objects/chronogram/chronoref.c:150
- msgid "End time"
- msgstr "Czas zakończenia"
- 
--#: ../objects/chronogram/chronoline.c:168
-+#: ../objects/chronogram/chronoline.c:170
- msgid "Rise time"
- msgstr "Czas narastania"
- 
--#: ../objects/chronogram/chronoline.c:170
-+#: ../objects/chronogram/chronoline.c:172
- msgid "Fall time"
- msgstr "Czas opadania"
- 
--#: ../objects/chronogram/chronoline.c:171
-+#: ../objects/chronogram/chronoline.c:173
- msgid "Multi-bit data"
- msgstr "Wielobitowe dane"
- 
--#: ../objects/chronogram/chronoline.c:173
--#: ../objects/chronogram/chronoref.c:156
-+#: ../objects/chronogram/chronoline.c:175
-+#: ../objects/chronogram/chronoref.c:158
- msgid "Aspect"
- msgstr "WyglÄ…d"
- 
--#: ../objects/chronogram/chronoline.c:175
-+#: ../objects/chronogram/chronoline.c:177
- msgid "Data color"
- msgstr "Kolor danej"
- 
--#: ../objects/chronogram/chronoline.c:177
-+#: ../objects/chronogram/chronoline.c:179
- msgid "Data line width"
- msgstr "Szerokość linii danej"
- 
--#: ../objects/chronogram/chronoref.c:144
-+#: ../objects/chronogram/chronoref.c:146
- msgid "Time data"
- msgstr "czas danej"
- 
--#: ../objects/chronogram/chronoref.c:150
-+#: ../objects/chronogram/chronoref.c:152
- msgid "Major time step"
- msgstr "Duży krok czasowy"
- 
--#: ../objects/chronogram/chronoref.c:152
-+#: ../objects/chronogram/chronoref.c:154
- msgid "Minor time step"
- msgstr "Mały krok czasowy"
- 
--#: ../objects/chronogram/chronoref.c:162
-+#: ../objects/chronogram/chronoref.c:164
- msgid "Minor step line width"
- msgstr "Szerokość linii małego kroku czasowego"
- 
--#: ../objects/custom/custom.c:117
-+#: ../objects/custom/custom.c:140
- msgid "Custom"
--msgstr "Dowolny"
-+msgstr "Niestandardowe"
- 
--#: ../objects/custom/custom.c:117
-+#: ../objects/custom/custom.c:140
- msgid "Custom XML shapes loader"
--msgstr "Odczyt dowolnych kształtów w XML-u"
-+msgstr "Wczytywanie niestandardowych kształtów (XML)"
- 
--#: ../objects/custom/custom_object.c:178 ../objects/custom/custom_object.c:203
-+#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:243
- msgid "Flip horizontal"
- msgstr "Obróć poziomo"
- 
--#: ../objects/custom/custom_object.c:180 ../objects/custom/custom_object.c:205
-+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:245
- msgid "Flip vertical"
- msgstr "Obróć pionowo"
- 
--#: ../objects/custom/custom_object.c:1439
-+#: ../objects/custom/custom_object.c:215 ../objects/custom/custom_object.c:248
-+msgid "Scale of the subshapes"
-+msgstr ""
-+
-+#: ../objects/custom/custom_object.c:1764
- msgid "Flip Horizontal"
- msgstr "Obróć poziomo"
- 
--#: ../objects/custom/custom_object.c:1440
-+#: ../objects/custom/custom_object.c:1765
- msgid "Flip Vertical"
- msgstr "Obróć pionowo"
- 
--#: ../objects/custom/custom_object.c:1477
-+#: ../objects/custom/custom_object.c:1802
-+#: ../objects/custom_lines/custom_linetypes.c:281
- #, c-format
- msgid "Cannot open icon file %s for object type '%s'."
- msgstr "Nie można otworzyć pliku ikony %s dla rodzaju obiektu \"%s\"."
- 
--#: ../objects/custom/shape_info.c:129
-+#: ../objects/custom_lines/custom_lines.c:160
-+msgid "CustomLines"
-+msgstr "Niestandardowe krzywe"
-+
-+#: ../objects/custom_lines/custom_lines.c:160
-+msgid "Custom XML lines loader"
-+msgstr "Wczytywanie niestandardowych krzywych (XML)"
-+
-+#: ../objects/custom_lines/custom_linetypes.c:244
-+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
-+msgstr ""
-+
-+#: ../objects/custom_lines/custom_linetypes.c:269
-+#, c-format
-+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-+msgstr ""
-+
-+#: ../objects/custom/shape_info.c:165
- #, c-format
- msgid ""
- "The file '%s' has invalid path data.\n"
- "svg:path data must start with moveto."
- msgstr ""
- 
--#: ../objects/flowchart/box.c:150 ../objects/standard/box.c:150
--#: ../objects/standard/polyline.c:134 ../objects/standard/zigzagline.c:130
--msgid "Corner radius"
--msgstr "Promień narożnika"
--
- #: ../objects/flowchart/flowchart.c:37
- msgid "Flowchart objects"
- msgstr "Obiekty diagramu przepływu"
- 
--#: ../objects/flowchart/parallelogram.c:152
-+#: ../objects/flowchart/parallelogram.c:156
- msgid "Shear angle"
- msgstr "KÄ…t ostry"
- 
--#: ../objects/network/basestation.c:135
--#, fuzzy
-+#: ../objects/network/basestation.c:137
- msgid "Sectors"
--msgstr "Aktor"
-+msgstr "Sektory"
- 
--#: ../objects/network/basestation.c:396 ../objects/network/basestation.c:398
--#, fuzzy
-+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
- msgid "Base Station"
--msgstr "Ułożenie"
--
--#: ../objects/network/bus.c:611
--msgid "Add Handle"
--msgstr "Dodaj uchwyt"
--
--#: ../objects/network/bus.c:612
--msgid "Delete Handle"
--msgstr "Usuń uchwyt"
-+msgstr "Stacja bazowa"
- 
- #: ../objects/network/network.c:43
- msgid "Network diagram objects"
- msgstr "Obiekty schematu sieci"
- 
--#: ../objects/network/radiocell.c:119
-+#: ../objects/network/radiocell.c:121
- msgid "Radius"
--msgstr ""
-+msgstr "Promień"
- 
--#: ../objects/network/wanlink.c:117
--#, fuzzy
-+#: ../objects/network/wanlink.c:120
- msgid "Width"
--msgstr "Szerokość:"
-+msgstr "Szerokość"
- 
--#: ../objects/standard/arc.c:140
-+#: ../objects/standard/arc.c:145
- msgid "Curve distance"
- msgstr "Odległość krzywej"
- 
--#: ../objects/standard/bezier.c:137 ../objects/standard/line.c:141
--#: ../objects/standard/polyline.c:135
--#, fuzzy
-+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
-+#: ../objects/standard/polyline.c:141
- msgid "Line gaps"
--msgstr "Linie"
-+msgstr "Odstępy w linii"
- 
--#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
--#: ../objects/standard/polyline.c:137
-+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
-+#: ../objects/standard/polyline.c:143
- msgid "Absolute start gap"
--msgstr ""
-+msgstr "Odstęp od początku"
- 
--#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
--#: ../objects/standard/polyline.c:139
-+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
-+#: ../objects/standard/polyline.c:145
- msgid "Absolute end gap"
--msgstr ""
-+msgstr "Odstęp od końca"
- 
--#: ../objects/standard/bezier.c:698 ../objects/standard/beziergon.c:482
-+#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
- msgid "Add Segment"
- msgstr "Dodaj segment"
- 
--#: ../objects/standard/bezier.c:699 ../objects/standard/beziergon.c:483
-+#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
- msgid "Delete Segment"
- msgstr "Usuń segment"
- 
--#: ../objects/standard/bezier.c:701 ../objects/standard/beziergon.c:485
-+#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
- msgid "Symmetric control"
- msgstr "Kontrola symetryczna"
- 
--#: ../objects/standard/bezier.c:703 ../objects/standard/beziergon.c:487
-+#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
- msgid "Smooth control"
- msgstr "PÅ‚ynna kontrola"
- 
--#: ../objects/standard/bezier.c:705 ../objects/standard/beziergon.c:489
-+#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
- msgid "Cusp control"
- msgstr "Kontrola niezależna"
- 
--#: ../objects/standard/box.c:137 ../objects/standard/ellipse.c:131
--#, fuzzy
-+#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
- msgid "Free"
--msgstr "Siła fizyczna"
-+msgstr "Brak"
- 
--#: ../objects/standard/box.c:138 ../objects/standard/ellipse.c:132
--#, fuzzy
-+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
- msgid "Fixed"
--msgstr "Plik"
-+msgstr "Usztywnione"
- 
--#: ../objects/standard/box.c:139 ../objects/standard/box.c:694
--#, fuzzy
-+#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
- msgid "Square"
--msgstr "Zabezpieczanie"
-+msgstr "Kwadrat"
- 
--#: ../objects/standard/box.c:152 ../objects/standard/ellipse.c:144
--#, fuzzy
-+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
- msgid "Aspect ratio"
--msgstr "Zachowane proporcje"
-+msgstr "Zachowanie proporcji"
- 
--#: ../objects/standard/box.c:690 ../objects/standard/ellipse.c:668
--#, fuzzy
-+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
- msgid "Free aspect"
--msgstr "Zachowane proporcje"
-+msgstr "Brak utrzymania proporcji"
- 
--#: ../objects/standard/box.c:692 ../objects/standard/ellipse.c:670
-+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
- msgid "Fixed aspect"
--msgstr ""
-+msgstr "Usztywnione proporcje"
- 
--#: ../objects/standard/ellipse.c:133 ../objects/standard/ellipse.c:672
--#, fuzzy
-+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
- msgid "Circle"
--msgstr "Nacieranie"
-+msgstr "OkrÄ…g"
- 
--#: ../objects/standard/image.c:132
-+#: ../objects/standard/image.c:144
- msgid "Image file"
- msgstr "Plik z obrazem"
- 
--#: ../objects/standard/image.c:134
-+#: ../objects/standard/image.c:146
-+#, fuzzy
-+msgid "Inline data"
-+msgstr "czas danej"
-+
-+#: ../objects/standard/image.c:146
-+msgid "Store image data in diagram"
-+msgstr ""
-+
-+#: ../objects/standard/image.c:148
-+msgid "Pixbuf"
-+msgstr ""
-+
-+#: ../objects/standard/image.c:148
-+#, fuzzy
-+msgid "The Pixbuf reference"
-+msgstr "Preferencje"
-+
-+#: ../objects/standard/image.c:150
- msgid "Draw border"
--msgstr "Rysowanie krawędzi"
-+msgstr "Rysowanie obramowania"
- 
--#: ../objects/standard/image.c:136
-+#: ../objects/standard/image.c:152
- msgid "Keep aspect ratio"
- msgstr "Zachowane proporcje"
- 
-+#: ../objects/standard/image.c:671
-+msgid "Inconsistent pixbuf during image save."
-+msgstr ""
-+
- #. Found file in same dir as diagram.
- #. Found file in current dir.
--#: ../objects/standard/image.c:679 ../objects/standard/image.c:690
--#, c-format
-+#: ../objects/standard/image.c:768 ../objects/standard/image.c:779
-+#, fuzzy, c-format
- msgid ""
--"The image file '%s' was not found in that directory.\n"
--"Using the file '%s' instead\n"
-+"The image file '%s' was not found in the specified directory.\n"
-+"Using the file '%s' instead.\n"
- msgstr ""
- "Nie odnaleziono w katalogu pliku z obrazem \"%s\".\n"
- "Zostanie wykorzystany \"%s\".\n"
- 
- #. Didn't find file in current dir.
--#: ../objects/standard/image.c:696 ../objects/standard/image.c:718
-+#: ../objects/standard/image.c:785 ../objects/standard/image.c:807
- #, c-format
- msgid "The image file '%s' was not found.\n"
- msgstr "Nie odnaleziono pliku z obrazem \"%s\".\n"
- 
--#: ../objects/standard/line.c:132
-+#: ../objects/standard/line.c:136
- msgid "Arrows"
- msgstr "Strzałki"
- 
--#: ../objects/standard/line.c:137
-+#: ../objects/standard/line.c:141
- msgid "Start point"
- msgstr "Punkt poczÄ…tkowy"
- 
--#: ../objects/standard/line.c:139
-+#: ../objects/standard/line.c:143
- msgid "End point"
- msgstr "Punkt końcowy"
- 
--#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:577
-+#: ../objects/standard/outline.c:204
-+msgid "Text content"
-+msgstr "Tekst"
-+
-+#: ../objects/standard/outline.c:206
-+msgid "Angle to rotate the outline"
-+msgstr "Kąt o jaki obrócić obrys"
-+
-+#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
- msgid "Add Corner"
- msgstr "Dodaj narożnik"
- 
--#: ../objects/standard/polygon.c:461 ../objects/standard/polyline.c:578
-+#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
- msgid "Delete Corner"
- msgstr "Usuń narożnik"
- 
--#: ../objects/standard/standard.c:45
-+#: ../objects/standard/standard.c:46
- msgid "Standard objects"
- msgstr "Obiekty standardowe"
- 
--#: ../objects/standard/textobj.c:134
--#, fuzzy
-+#: ../objects/standard/textobj.c:139
- msgid "First Line"
--msgstr "Linie siatki"
-+msgstr "Pierwszy wiersz"
- 
--#: ../objects/standard/textobj.c:141
--#, fuzzy
-+#: ../objects/standard/textobj.c:146
- msgid "Vertical text alignment"
--msgstr "Wyrównanie tekstu"
-+msgstr "Wyrównanie tekstu w pionie"
-+
-+#: ../plug-ins/cairo/diacairo-interactive.c:377
-+#: ../plug-ins/cairo/diacairo-interactive.c:378
-+msgid "Zoom pointer"
-+msgstr ""
-+
-+#: ../plug-ins/cairo/diacairo-interactive.c:384
-+#: ../plug-ins/cairo/diacairo-interactive.c:385
-+msgid "Visible rect pointer"
-+msgstr ""
-+
-+#: ../plug-ins/cairo/diacairo-renderer.c:834
-+#: ../plug-ins/cairo/diacairo-renderer.c:869 ../plug-ins/cgm/cgm.c:1125
-+#: ../plug-ins/libart/dialibartrenderer.c:1325
-+#: ../plug-ins/metapost/render_metapost.c:1110
-+#: ../plug-ins/postscript/diapsrenderer.c:719
-+#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:891
-+msgid "Not enough memory for image drawing."
-+msgstr ""
-+
-+#: ../plug-ins/cairo/diacairo.c:133
-+#, c-format
-+msgid ""
-+"Can't convert output filename '%s' to locale encoding.\n"
-+"Please choose a different name to save with Cairo.\n"
-+msgstr ""
-+
-+#: ../plug-ins/cairo/diacairo.c:305 ../plug-ins/cairo/diacairo.c:321
-+#, fuzzy, c-format
-+msgid "Can't write %d bytes to %s"
-+msgstr "Nie można znaleźć obiektu standardowego"
-+
-+#: ../plug-ins/cairo/diacairo.c:334
-+msgid "Clipboard copy failed"
-+msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1086
-+#: ../plug-ins/cairo/diacairo.c:359 ../plug-ins/postscript/postscript.c:39
-+#: ../plug-ins/wmf/wmf.cpp:1488
-+msgid "Nothing to print"
-+msgstr "Nie ma czego drukować"
-+
-+#: ../plug-ins/cairo/diacairo.c:374
- msgid "Cairo PostScript"
- msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1097
-+#: ../plug-ins/cairo/diacairo.c:385
- msgid "Cairo Portable Document Format"
- msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1108
-+#: ../plug-ins/cairo/diacairo.c:397
- #, fuzzy
- msgid "Cairo Scalable Vector Graphics"
- msgstr "Scalable Vector Graphics"
- 
--#: ../plug-ins/cairo/diacairo.c:1118
-+#: ../plug-ins/cairo/diacairo.c:409
-+msgid "CairoScript"
-+msgstr "CairoScript"
-+
-+#: ../plug-ins/cairo/diacairo.c:420
- msgid "Cairo PNG"
- msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1126
-+#: ../plug-ins/cairo/diacairo.c:428
- msgid "Cairo PNG (with alpha)"
- msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1136
--msgid "Cairo WMF"
-+#: ../plug-ins/cairo/diacairo.c:438
-+msgid "Cairo EMF"
- msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1145
--msgid "Cairo old WMF"
-+#: ../plug-ins/cairo/diacairo.c:448
-+msgid "Cairo WMF"
- msgstr ""
- 
--#: ../plug-ins/cairo/diacairo.c:1154
--msgid "Cairo Clipboard"
--msgstr ""
-+#: ../plug-ins/cairo/diacairo.c:472
-+msgid "Copy _Diagram"
-+msgstr "Skopiuj _diagram"
-+
-+#: ../plug-ins/cairo/diacairo.c:481
-+msgid "Print (GTK) …"
-+msgstr "Wydrukuj (GTK)..."
- 
--#: ../plug-ins/cairo/diacairo.c:1203
--msgid "Cairo based Rendering"
-+#: ../plug-ins/cairo/diacairo.c:528
-+msgid "Cairo-based Rendering"
- msgstr ""
- 
--#: ../plug-ins/cgm/cgm.c:1103
-+#: ../plug-ins/cgm/cgm.c:1118
- msgid ""
- "Image row length larger than maximum cell array.\n"
- "Image not exported to CGM."
-@@ -5100,250 +6209,329 @@ msgstr ""
- "Długość wiersza obrazu przekracza maksymalny rozmiar tablicy komórek.\n"
- "Obraz nie został wyeksportowany do formatu CGM."
- 
--#: ../plug-ins/cgm/cgm.c:1358
-+#: ../plug-ins/cgm/cgm.c:1378
- msgid "Computer Graphics Metafile"
- msgstr "Computer Graphics Metafile"
- 
--#: ../plug-ins/cgm/cgm.c:1383
-+#: ../plug-ins/cgm/cgm.c:1403
- msgid "Computer Graphics Metafile export filter"
- msgstr "Filtr eksportu CGM (Computer Graphics Metafile)"
- 
--#: ../plug-ins/dxf/dxf-export.c:527 ../plug-ins/dxf/dxf-import.c:1389
--msgid "Drawing Interchange File"
--msgstr "PLIK DIF (Drawing Interchange File)"
-+#: ../plug-ins/drs/dia-render-script-import.c:225
-+msgid "Broken file?"
-+msgstr "Uszkodzony plik?"
- 
--#: ../plug-ins/dxf/dxf-import.c:481 ../plug-ins/dxf/dxf-import.c:498
--msgid "Bad vertex bulge\n"
--msgstr "Zła wypukłość wierzchołka\n"
-+#: ../plug-ins/drs/dia-render-script.c:156
-+#: ../plug-ins/drs/dia-render-script.c:161
-+msgid "DiaRenderScript"
-+msgstr "DiaRenderScript"
- 
--#: ../plug-ins/dxf/dxf-import.c:1051
--#, c-format
--msgid "Scale: %f\n"
--msgstr "Skala: %f\n"
-+#: ../plug-ins/drs/dia-render-script.c:185
-+msgid "DiaRenderScript filter"
-+msgstr ""
-+
-+#: ../plug-ins/dxf/dxf-export.c:653 ../plug-ins/dxf/dxf-import.c:1390
-+msgid "Drawing Interchange File"
-+msgstr "PLIK DIF (Drawing Interchange File)"
- 
--#: ../plug-ins/dxf/dxf-import.c:1316
-+#: ../plug-ins/dxf/dxf-import.c:1300
- #, fuzzy, c-format
- msgid "read_dxf_codes failed on '%s'\n"
- msgstr "Wywołanie read_dxf_codes zakończone niepowodzeniem\n"
- 
--#: ../plug-ins/dxf/dxf-import.c:1324
-+#: ../plug-ins/dxf/dxf-import.c:1307
- #, c-format
- msgid "Binary DXF from '%s' not supported\n"
- msgstr ""
- 
--#: ../plug-ins/dxf/dxf-import.c:1355
--#, c-format
--msgid "Unknown dxf code %d\n"
--msgstr "Nieznany kod dxf %d\n"
--
- #: ../plug-ins/dxf/dxf.c:50
- msgid "Drawing Interchange File import and export filters"
- msgstr "Filtry importu i eksportu plików DIF (Drawing Interchange File)"
- 
--#: ../plug-ins/gprint/diagnomeprint.c:81
--#, c-format
--msgid ""
--"GNOME Print Backend\n"
--" '%s'\n"
--" not available"
-+#: ../plug-ins/hpgl/hpgl.c:751
-+msgid "HP Graphics Language"
-+msgstr "HP Graphics Language"
-+
-+#: ../plug-ins/hpgl/hpgl.c:776
-+msgid "HP Graphics Language export filter"
-+msgstr "Filtr eksportu HP Graphics Language"
-+
-+#: ../plug-ins/layout/layout.cpp:211
-+msgid "Please select edges and nodes to layout."
- msgstr ""
- 
--#: ../plug-ins/gprint/diagnomeprint.c:112
--msgid "GNOME PostScript"
-+#: ../plug-ins/layout/layout.cpp:219
-+#, fuzzy
-+msgid "Graph creation failed"
-+msgstr "Utworzenie \"%s\" nie powiodło się"
-+
-+#: ../plug-ins/layout/layout.cpp:245
-+msgid "No such module."
- msgstr ""
- 
--#: ../plug-ins/gprint/diagnomeprint.c:121
--msgid "GNOME Portable Document Format"
-+#: ../plug-ins/layout/layout.cpp:246
-+msgid "Out of memory."
- msgstr ""
- 
--#: ../plug-ins/gprint/diagnomeprint.c:131
--#, fuzzy
--msgid "GNOME Scalable Vector Graphic"
--msgstr "Scalable Vector Graphics"
-+#: ../plug-ins/layout/layout.cpp:247
-+msgid "Not a tree."
-+msgstr ""
- 
--#: ../plug-ins/gprint/diagnomeprint.c:164
--msgid "GNOME Print based Rendering"
-+#: ../plug-ins/layout/layout.cpp:248
-+msgid "Not a forest."
- msgstr ""
- 
--#: ../plug-ins/hpgl/hpgl.c:749
--msgid "HP Graphics Language"
--msgstr "Język graficzny HP"
-+#: ../plug-ins/layout/layout.cpp:249
-+msgid "Failed algorithm."
-+msgstr ""
- 
--#: ../plug-ins/hpgl/hpgl.c:774
--msgid "HP Graphics Language export filter"
--msgstr "Filtr eksportu HP Graphics Language"
-+#: ../plug-ins/layout/layout.cpp:250
-+#, fuzzy
-+msgid "Failed precondition."
-+msgstr "Klimatyzacja"
- 
--#: ../plug-ins/metapost/metapost.c:46
--msgid "TeX Metapost export filter"
--msgstr "Filtr eksportu TeX Metapost"
-+#: ../plug-ins/layout/layout.cpp:251
-+#, fuzzy
-+msgid "OGDF crashed."
-+msgstr "Linia przerywana"
- 
--#: ../plug-ins/metapost/render_metapost.c:1214
--msgid "TeX Metapost macros"
--msgstr "Makra TeX Metapost"
-+#: ../plug-ins/layout/layout.cpp:252
-+#, fuzzy
-+msgid "Unknown reason"
-+msgstr "nieznana strzałka"
- 
--#: ../plug-ins/pixbuf/pixbuf.c:91
-+#: ../plug-ins/layout/layout.cpp:254
- #, c-format
- msgid ""
--"Could not save file:\n"
--"%s\n"
-+"Layout '%s' failed.\n"
- "%s"
- msgstr ""
--"Nie można zapisać pliku:\n"
--"%s\n"
--"%s"
--
--#: ../plug-ins/pixbuf/pixbuf.c:197
--msgid "gdk-pixbuf based bitmap export/import"
--msgstr "Eksport/import bitmapy bazujÄ…cej na gdk-pixbuf"
- 
--#: ../plug-ins/pgf/pgf.c:26
--#, fuzzy
--msgid "LaTeX PGF export filter"
--msgstr "Filtr eksportu TeX Pstricks"
-+#: ../plug-ins/layout/layout.cpp:365
-+msgid "OGDF Layout Algorithms"
-+msgstr ""
- 
--#: ../plug-ins/pgf/render_pgf.c:1047
--#: ../plug-ins/pstricks/render_pstricks.c:731
--msgid "Not valid UTF8"
-+#: ../plug-ins/libart/dialibart.c:59
-+msgid "Libart-based rendering"
- msgstr ""
- 
--#: ../plug-ins/pgf/render_pgf.c:1212
--#, fuzzy
--msgid "LaTeX PGF macros"
--msgstr "Makra TeX Pstricks"
-+#: ../plug-ins/libart/export_png.c:167
-+msgid "Could not create PNG write structure"
-+msgstr "Nie można utworzyć struktury zapisu PNG"
- 
--#: ../plug-ins/pstricks/pstricks.c:26
--msgid "TeX Pstricks export filter"
--msgstr "Filtr eksportu TeX Pstricks"
-+#: ../plug-ins/libart/export_png.c:176
-+msgid "Could not create PNG header info structure"
-+msgstr "Nie można utworzyć struktury informacyjnej nagłówka PNG"
- 
--#: ../plug-ins/pstricks/render_pstricks.c:985
--msgid "TeX PSTricks macros"
--msgstr "Makra TeX Pstricks"
-+#: ../plug-ins/libart/export_png.c:184
-+msgid "Error occurred while writing PNG"
-+msgstr "Podczas zapisu pliku PNG wystąpił błąd"
- 
--#: ../plug-ins/python/pydia-render.c:718
--#, fuzzy, c-format
--msgid "Couldn't open '%s' for writing.\n"
--msgstr "Nie można otworzyć: \"%s\" do zapisu.\n"
-+#. Create a dialog
-+#: ../plug-ins/libart/export_png.c:327
-+msgid "PNG Export Options"
-+msgstr "Opcje eksportu pliku PNG"
- 
--#: ../plug-ins/python/python.c:96
--msgid "Python scripting support"
--msgstr "Obsługa skryptów Pythona"
-+#: ../plug-ins/libart/export_png.c:333
-+msgid "Image width:"
-+msgstr "Szerokość obrazu:"
- 
--#: ../plug-ins/shape/shape-export.c:475
--msgid "Can't export png without libart!"
--msgstr "Nie można eksportować obrazu PNG bez biblioteki libart!"
-+#: ../plug-ins/libart/export_png.c:336
-+msgid "Image height:"
-+msgstr "Wysokość obrazu:"
- 
--#: ../plug-ins/shape/shape-export.c:500
-+#: ../plug-ins/libart/export_png.c:382
- #, fuzzy
--msgid "Dia Shape File"
--msgstr "plik kształtów Dia"
-+msgid "PNG (antialiased)"
-+msgstr "PNG (wygładzone - antyaliasing)"
- 
--#: ../plug-ins/shape/shape.c:36
--msgid "dia shape export filter"
--msgstr "Filtr eksportu kształtów Dia"
--
--#: ../plug-ins/svg/render_svg.c:291 ../plug-ins/svg/svg-import.c:676
--msgid "Scalable Vector Graphics"
--msgstr "Scalable Vector Graphics"
-+#: ../plug-ins/libart/dialibartrenderer.c:304
-+msgid "gdk_renderer: Unsupported fill mode specified!\n"
-+msgstr "gdk_renderer: Podano nieobsługiwany tryb wypełniania!\n"
- 
--#: ../plug-ins/svg/svg-import.c:195
--msgid ""
--"Invalid path data.\n"
--"svg:path data must start with moveto."
-+#: ../plug-ins/libart/dialibartrenderer.c:1476
-+msgid "Renderer transformation"
- msgstr ""
- 
--#: ../plug-ins/svg/svg-import.c:637
--msgid "Expected SVG Namespace not found in file"
-+#: ../plug-ins/libart/dialibartrenderer.c:1477
-+msgid "Transform pointer"
- msgstr ""
- 
--#: ../plug-ins/svg/svg-import.c:657
--#, c-format
--msgid "root element was '%s' -- expecting 'svg'."
--msgstr "głównym elementem jest \"%s\" -- spodziewano się \"svg\"."
-+#: ../plug-ins/metapost/metapost.c:46
-+msgid "TeX Metapost export filter"
-+msgstr "Filtr eksportu TeX Metapost"
- 
--#: ../plug-ins/svg/svg.c:50
--msgid "Scalable Vector Graphics import and export filters"
--msgstr "Filtr eksportu i importu Scalable Vector Graphics"
-+#: ../plug-ins/metapost/render_metapost.c:1265
-+msgid "TeX Metapost macros"
-+msgstr "Makra TeX Metapost"
- 
--#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
--#, fuzzy, c-format
--msgid "Couldn't read file %s"
--msgstr "Nie można odczytać koloru: %s\n"
-+#: ../plug-ins/pgf/pgf.c:26
-+msgid "LaTeX PGF export filter"
-+msgstr "Filtr eksportu LaTeX PGF"
- 
--#: ../plug-ins/vdx/vdx-export.c:1904
--msgid "Visio XML format"
-+#: ../plug-ins/pgf/render_pgf.c:1112
-+#: ../plug-ins/pstricks/render_pstricks.c:733
-+msgid "Not valid UTF-8"
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:219 ../plug-ins/xfig/xfig-import.c:1034
--#, c-format
--msgid "Couldn't read color: %s\n"
--msgstr "Nie można odczytać koloru: %s\n"
-+#: ../plug-ins/pgf/render_pgf.c:1263
-+msgid "LaTeX PGF macros"
-+msgstr "Makra LaTeX PGF"
- 
--#: ../plug-ins/vdx/vdx-import.c:507
--#, fuzzy, c-format
--msgid "Couldn't find shape %d\n"
--msgstr "Nie można odnaleźć katalogu pomocy"
-+#: ../plug-ins/pixbuf/pixbuf.c:199
-+#, fuzzy
-+msgid "gdk-pixbuf-based bitmap export/import"
-+msgstr "Eksport/import bitmapy bazujÄ…cej na gdk-pixbuf"
- 
--#: ../plug-ins/vdx/vdx-import.c:851
--msgid "MoveTo after start of polyline\n"
--msgstr ""
-+#: ../plug-ins/postscript/paginate_psprint.c:273
-+msgid "Select Printer"
-+msgstr "Wybór drukarki"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:285
-+#: ../sheets/ciscocomputer.sheet.in.h:37
-+msgid "Printer"
-+msgstr "Drukarka"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
-+msgid "File"
-+msgstr "Plik"
- 
--#: ../plug-ins/vdx/vdx-import.c:864
-+#: ../plug-ins/postscript/paginate_psprint.c:464
- #, fuzzy, c-format
--msgid "Unexpected polyline object: %s\n"
--msgstr "Nie można wczytać informacji o łamanej: %s\n"
-+msgid "Could not run command '%s': %s"
-+msgstr "Nie można wykonać polecenia \"%s\""
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:467
-+#, fuzzy, c-format
-+msgid "Could not open '%s' for writing: %s"
-+msgstr "Nie można otworzyć \"%s\" do zapisu"
- 
--#: ../plug-ins/vdx/vdx-import.c:956
-+#: ../plug-ins/postscript/paginate_psprint.c:489
- #, c-format
--msgid "Unexpected Ellipse object: %s\n"
-+msgid "Printing error: command '%s' returned %d\n"
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:964
--msgid "Unexpected Ellipse additional objects\n"
-+#: ../plug-ins/postscript/paginate_psprint.c:500
-+#, c-format
-+msgid "Printing error: command '%s' caused sigpipe."
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:974
-+#: ../plug-ins/postscript/render_eps.c:150
- #, fuzzy
--msgid "Can't rotate ellipse\n"
--msgstr "Nie można wczytać informacji o elipsie: %s\n"
-+msgid "Encapsulated PostScript (using Pango fonts)"
-+msgstr "Encapsulated Postscript (używający czcionek Pango)"
- 
--#: ../plug-ins/vdx/vdx-import.c:1287
--msgid "MoveTo not at start of Bezier\n"
--msgstr ""
-+#: ../plug-ins/postscript/render_eps.c:159
-+msgid "Encapsulated Postscript with preview (using Pango fonts)"
-+msgstr "Encapsulated Postscript z podglądem (używający czcionek Pango)"
- 
--#: ../plug-ins/vdx/vdx-import.c:1374
--#, c-format
--msgid "Unexpected Bezier object: %s\n"
-+#: ../plug-ins/postscript/render_eps.c:169
-+#, fuzzy
-+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
-+msgstr "Encapsulated Postscript (używający czcionek postscriptowych Latin-1)"
-+
-+#: ../plug-ins/postscript/postscript.c:47
-+msgid "Print (PS)"
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:1595
--#, c-format
--msgid "Unexpected NURBSTo object: %s\n"
-+#: ../plug-ins/postscript/postscript.c:71
-+#, fuzzy
-+msgid "PostScript Rendering"
-+msgstr "PostScript (PS)"
-+
-+#: ../plug-ins/pstricks/pstricks.c:26
-+#, fuzzy
-+msgid "TeX PSTricks export filter"
-+msgstr "Filtr eksportu TeX Pstricks"
-+
-+#: ../plug-ins/pstricks/render_pstricks.c:990
-+msgid "TeX PSTricks macros"
-+msgstr "Makra TeX Pstricks"
-+
-+#: ../plug-ins/python/pydia-render.c:933
-+#, fuzzy, c-format
-+msgid "Couldn't open '%s' for writing.\n"
-+msgstr "Nie można otworzyć: \"%s\" do zapisu.\n"
-+
-+#: ../plug-ins/python/python.c:96
-+msgid "Python scripting support"
-+msgstr "Obsługa skryptów Pythona"
-+
-+#: ../plug-ins/shape/shape-export.c:480
-+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:1603
--msgid "Unexpected NURBSTo additional objects\n"
-+#: ../plug-ins/shape/shape-export.c:494
-+#, fuzzy
-+msgid "Can't export PNG icon without export plugin!"
-+msgstr "Nie można eksportować obrazu PNG bez biblioteki libart!"
-+
-+#: ../plug-ins/shape/shape-export.c:518
-+msgid "Dia Shape File"
-+msgstr "Plik kształtów Dia"
-+
-+#: ../plug-ins/shape/shape.c:36
-+#, fuzzy
-+msgid "Dia shape export filter"
-+msgstr "Filtr eksportu kształtów Dia"
-+
-+#: ../plug-ins/svg/svg-import.c:322
-+msgid ""
-+"Invalid path data.\n"
-+"svg:path data must start with moveto."
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:1620
--msgid "Invalid NURBS formula"
-+#: ../plug-ins/svg/svg-import.c:1120
-+msgid "Expected SVG Namespace not found in file"
- msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:1742
--#, fuzzy, c-format
--msgid "Couldn't write file %s"
-+#: ../plug-ins/svg/svg-import.c:1140
-+#, c-format
-+msgid "root element was '%s' -- expecting 'svg'."
-+msgstr "głównym elementem jest \"%s\" -- spodziewano się \"svg\"."
-+
-+#: ../plug-ins/svg/svg.c:50
-+msgid "Scalable Vector Graphics import and export filters"
-+msgstr "Filtr eksportu i importu Scalable Vector Graphics"
-+
-+#: ../plug-ins/vdx/vdx-export.c:1863
-+msgid "Visio XML format"
-+msgstr "Format Visio XML"
-+
-+#: ../plug-ins/vdx/vdx-import.c:223 ../plug-ins/xfig/xfig-import.c:1049
-+#, c-format
-+msgid "Couldn't read color: %s\n"
- msgstr "Nie można odczytać koloru: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1826 ../plug-ins/vdx/vdx-import.c:1839
-+#: ../plug-ins/vdx/vdx-import.c:536
- #, fuzzy, c-format
--msgid "Couldn't handle foreign object type %s"
--msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
-+msgid "Couldn't find shape %d\n"
-+msgstr "Nie można odnaleźć katalogu pomocy"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1011
-+#, c-format
-+msgid "Unexpected Ellipse object: %s\n"
-+msgstr ""
-+
-+#: ../plug-ins/vdx/vdx-import.c:1025
-+#, fuzzy
-+msgid "Can't rotate ellipse\n"
-+msgstr "Nie można wczytać informacji o elipsie: %s\n"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1356
-+msgid "MoveTo not at start of Bezier\n"
-+msgstr ""
- 
--#: ../plug-ins/vdx/vdx-import.c:1867
-+#: ../plug-ins/vdx/vdx-import.c:1706
-+msgid "Invalid NURBS formula"
-+msgstr ""
-+
-+#: ../plug-ins/vdx/vdx-import.c:1964
- #, fuzzy, c-format
--msgid "Couldn't make object dir %s"
-+msgid "Couldn't handle foreign object type %s"
- msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:2723
-+#: ../plug-ins/vdx/vdx-import.c:2971
- #, fuzzy
- msgid "Visio XML File Format"
- msgstr "Format pliku XFig"
-@@ -5353,7 +6541,7 @@ msgstr "Format pliku XFig"
- msgid "Can't decode object %s"
- msgstr "Nie można wczytać czcionki %s.\n"
- 
--#: ../plug-ins/vdx/vdx-xml.c:5125
-+#: ../plug-ins/vdx/vdx-xml.c:5187
- #, fuzzy, c-format
- msgid "Can't write object %u"
- msgstr "Nie można znaleźć obiektu standardowego"
-@@ -5363,343 +6551,371 @@ msgstr "Nie można znaleźć obiektu standardowego"
- msgid "Visio XML Format import and export filter"
- msgstr "Filtry importu i eksportu Fig Format"
- 
--#: ../plug-ins/wmf/wmf.cpp:1186
-+#: ../plug-ins/wmf/wmf.cpp:309
-+#, fuzzy, c-format
-+msgid ""
-+"Couldn't write file %s\n"
-+"%s"
-+msgstr "Nie można odczytać koloru: %s\n"
-+
-+#: ../plug-ins/wmf/wmf.cpp:558
-+#, c-format
-+msgid ""
-+"Cannot render unknown font:\n"
-+"%s"
-+msgstr ""
-+
-+#: ../plug-ins/wmf/wmf.cpp:1365
- #, c-format
- msgid "Couldn't open: '%s' for writing.\n"
- msgstr "Nie można otworzyć: \"%s\" do zapisu.\n"
- 
--#: ../plug-ins/wmf/wmf.cpp:1270
--msgid "Windows Meta File"
--msgstr "Plik WMF (Windows Meta File)"
--
--#: ../plug-ins/wmf/wmf.cpp:1279
--#, fuzzy
--msgid "Enhanced Meta File"
--msgstr "Plik WMF (Windows Meta File)"
-+#: ../plug-ins/wmf/wmf.cpp:1496
-+msgid "Print (GDI) ..."
-+msgstr "Wydruk (GDI)..."
- 
--#: ../plug-ins/wmf/wmf.cpp:1295
-+#: ../plug-ins/wmf/wmf.cpp:1512
- msgid "WMF export filter"
- msgstr "Filtr eksportu dla WMF"
- 
--#: ../plug-ins/wpg/wpg.c:1188
-+#: ../plug-ins/wpg/wpg.c:1194
- #, c-format
- msgid "File: %s type/version unsupported.\n"
- msgstr "Plik: %s nieobsługiwany typ/wersja.\n"
- 
--#: ../plug-ins/wpg/wpg.c:1319 ../plug-ins/wpg/wpg.c:1326
-+#: ../plug-ins/wpg/wpg.c:1325 ../plug-ins/wpg/wpg.c:1332
- msgid "WPG"
- msgstr "WPG"
- 
--#: ../plug-ins/wpg/wpg.c:1354
-+#: ../plug-ins/wpg/wpg.c:1360
- msgid "WordPerfect Graphics export filter"
- msgstr "Filtr eksportu WordPerfect Graphics"
- 
--#: ../plug-ins/xfig/xfig-export.c:459
-+#: ../plug-ins/xfig/xfig-export.c:464
- #, c-format
--msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-+msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
- msgstr ""
- 
--#: ../plug-ins/xfig/xfig-export.c:481
-+#: ../plug-ins/xfig/xfig-export.c:487
- msgid "No more user-definable colors - using black"
- msgstr "Brak kolorów zdefiniowanych przez użytkownika - użyto czarnego"
- 
--#: ../plug-ins/xfig/xfig-export.c:1186
--msgid "XFig format"
-+#: ../plug-ins/xfig/xfig-export.c:1211
-+#, fuzzy
-+msgid "Xfig format"
- msgstr "Format pliku XFig"
- 
--#: ../plug-ins/xfig/xfig-import.c:109
-+#: ../plug-ins/xfig/xfig-import.c:111
- #, c-format
--msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-+msgid "Color index %d too high; only 512 colors allowed. Using black instead."
- msgstr ""
- 
--#: ../plug-ins/xfig/xfig-import.c:136
-+#: ../plug-ins/xfig/xfig-import.c:141
- msgid "Patterns are not supported by Dia"
- msgstr "Wypełnienia (patterny) nie są obsługiwane przez Dia"
- 
--#: ../plug-ins/xfig/xfig-import.c:164
--msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-+#: ../plug-ins/xfig/xfig-import.c:169
-+#, fuzzy
-+msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
- msgstr ""
- "Potrójnie kropkowane linie nie są obsługiwane przez Dia, użyto podwójnie "
- "kropkowanych"
- 
--#: ../plug-ins/xfig/xfig-import.c:168
-+#: ../plug-ins/xfig/xfig-import.c:173
- #, c-format
- msgid "Line style %d should not appear\n"
- msgstr "Styl linii %d nie powinien się pojawiać\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:236
-+#: ../plug-ins/xfig/xfig-import.c:241
- #, c-format
- msgid "Error while reading %dth of %d points: %s\n"
- msgstr "Błąd podczas odczytu %d. z %d punktów: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:264
-+#: ../plug-ins/xfig/xfig-import.c:269
- msgid "Error while reading arrowhead\n"
- msgstr "Błąd podczas zakańczania strzałki\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:286
-+#: ../plug-ins/xfig/xfig-import.c:291
- #, c-format
- msgid "Unknown arrow type %d\n"
- msgstr "Nieznany typ strzałki %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:377
-+#: ../plug-ins/xfig/xfig-import.c:382
- #, c-format
- msgid "Depth %d of of range, only 0-%d allowed.\n"
- msgstr ""
- 
--#: ../plug-ins/xfig/xfig-import.c:424
-+#: ../plug-ins/xfig/xfig-import.c:429
- #, c-format
- msgid "Couldn't read ellipse info: %s\n"
- msgstr "Nie można wczytać informacji o elipsie: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:492
-+#: ../plug-ins/xfig/xfig-import.c:497
- #, c-format
- msgid "Couldn't read polyline info: %s\n"
- msgstr "Nie można wczytać informacji o łamanej: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:507
-+#: ../plug-ins/xfig/xfig-import.c:512
- #, c-format
- msgid "Couldn't read flipped bit: %s\n"
- msgstr "Nie można odczytać przekłamanego bitu: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:525
--msgid "Negative corner radius, negating"
-+#: ../plug-ins/xfig/xfig-import.c:530
-+#, fuzzy
-+msgid "Negative corner radius; negating"
- msgstr "Ujemny kÄ…t, zmiana znaku"
- 
--#: ../plug-ins/xfig/xfig-import.c:568 ../plug-ins/xfig/xfig-import.c:881
-+#: ../plug-ins/xfig/xfig-import.c:573
- #, c-format
- msgid "Unknown polyline subtype: %d\n"
- msgstr "Nieznany podtyp Å‚amanej: %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:718 ../plug-ins/xfig/xfig-import.c:750
-+#: ../plug-ins/xfig/xfig-import.c:723 ../plug-ins/xfig/xfig-import.c:755
- #, c-format
- msgid "Couldn't read spline info: %s\n"
- msgstr "Nie można odczytać informacji o krzywej sklejanej: %s\n"
- 
- #. Open approximated spline
- #. Closed approximated spline
--#: ../plug-ins/xfig/xfig-import.c:737 ../plug-ins/xfig/xfig-import.c:755
-+#: ../plug-ins/xfig/xfig-import.c:742 ../plug-ins/xfig/xfig-import.c:760
- msgid "Cannot convert approximated spline yet."
- msgstr "Nie można jeszcze konwertować krzywych sklejanych."
- 
--#: ../plug-ins/xfig/xfig-import.c:793
-+#: ../plug-ins/xfig/xfig-import.c:798
- #, c-format
- msgid "Unknown spline subtype: %d\n"
- msgstr "Nieznany podtyp krzywej sklejanej: %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:856
-+#: ../plug-ins/xfig/xfig-import.c:863
- #, c-format
- msgid "Couldn't read arc info: %s\n"
- msgstr "Nie można przeczytać informacji o łuku: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:945
-+#. set new fill property on arc?
-+#: ../plug-ins/xfig/xfig-import.c:892
-+msgid "Filled arc treated as unfilled"
-+msgstr ""
-+
-+#: ../plug-ins/xfig/xfig-import.c:896
-+#, c-format
-+msgid "Unknown polyline arc: %d\n"
-+msgstr "Nieznany Å‚uk w krzywej: %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:960
- #, c-format
- msgid "Couldn't read text info: %s\n"
- msgstr "Nie można przeczytać informacji tekstowej: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1007
--#, c-format
--msgid "Couldn't identify FIG object: %s\n"
-+#: ../plug-ins/xfig/xfig-import.c:1022
-+#, fuzzy, c-format
-+msgid "Couldn't identify Fig object: %s\n"
- msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1015
-+#: ../plug-ins/xfig/xfig-import.c:1030
- msgid "Compound end outside compound\n"
- msgstr "Domknięcie na zewnątrz obszaru domykanego\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1039
-+#: ../plug-ins/xfig/xfig-import.c:1054
- #, c-format
- msgid "Color number %d out of range 0..%d.  Discarding color.\n"
- msgstr ""
- 
--#: ../plug-ins/xfig/xfig-import.c:1085
-+#: ../plug-ins/xfig/xfig-import.c:1101
- #, c-format
- msgid "Couldn't read group extend: %s\n"
- msgstr "Nie można odczytać rozszerzenia grupy: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1096
-+#: ../plug-ins/xfig/xfig-import.c:1112
- #, c-format
- msgid "Unknown object type %d\n"
- msgstr "Nieznany typ obiektu %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1120
-+#: ../plug-ins/xfig/xfig-import.c:1136
- #, c-format
- msgid "`%s' is not one of `%s' or `%s'\n"
- msgstr "\"%s\" nie jest jednym z \"%s\" lub \"%s\"\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1130
-+#: ../plug-ins/xfig/xfig-import.c:1146
- #, c-format
- msgid "Error reading paper size: %s\n"
- msgstr "BÅ‚Ä…d przy odczycie rozmiaru papieru: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1141
-+#: ../plug-ins/xfig/xfig-import.c:1157
- #, c-format
- msgid "Unknown paper size `%s', using default\n"
- msgstr "Nieznany rozmiar papieru \"%s\". Wykorzystano domyślny.\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1153
-+#: ../plug-ins/xfig/xfig-import.c:1169
- #, c-format
- msgid "Error reading paper orientation: %s\n"
- msgstr "Błąd przy odczycie ułożenia dokumentu: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1163
-+#: ../plug-ins/xfig/xfig-import.c:1179
- #, c-format
- msgid "Error reading justification: %s\n"
- msgstr "Błąd przy odczycie wyrównania: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1173
-+#: ../plug-ins/xfig/xfig-import.c:1189
- #, c-format
- msgid "Error reading units: %s\n"
- msgstr "BÅ‚Ä…d przy odczycie jednostek: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1189
-+#: ../plug-ins/xfig/xfig-import.c:1205
- #, c-format
- msgid "Error reading magnification: %s\n"
- msgstr "Błąd wczytywania powiększenia: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1202
-+#: ../plug-ins/xfig/xfig-import.c:1218
- #, c-format
- msgid "Error reading multipage indicator: %s\n"
- msgstr "Błąd podczas wczytywania wskaźnika wielostronnicowego: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1213
-+#: ../plug-ins/xfig/xfig-import.c:1229
- #, c-format
- msgid "Error reading transparent color: %s\n"
- msgstr "Błąd przy odczycie koloru przezroczystości: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1222 ../plug-ins/xfig/xfig-import.c:1278
--#: ../plug-ins/xfig/xfig-import.c:1296
--#, c-format
--msgid "Error reading FIG file: %s\n"
-+#: ../plug-ins/xfig/xfig-import.c:1238 ../plug-ins/xfig/xfig-import.c:1296
-+#: ../plug-ins/xfig/xfig-import.c:1314
-+#, fuzzy, c-format
-+msgid "Error reading Fig file: %s\n"
- msgstr "BÅ‚Ä…d przy odczycie pliku FIG: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1224 ../plug-ins/xfig/xfig-import.c:1280
--msgid "Premature end of FIG file\n"
-+#: ../plug-ins/xfig/xfig-import.c:1240 ../plug-ins/xfig/xfig-import.c:1298
-+#, fuzzy
-+msgid "Premature end of Fig file\n"
- msgstr "Przedwczesny koniec pliku FIG\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1233
-+#: ../plug-ins/xfig/xfig-import.c:1249
- #, c-format
- msgid "Error reading resolution: %s\n"
- msgstr "Błąd przy odczycie rozdzielczości: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1265
-+#: ../plug-ins/xfig/xfig-import.c:1283
- #, c-format
- msgid "Doesn't look like a Fig file: %s\n"
- msgstr "Plik %s nie wyglÄ…da na plik Fig\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1271
--#, c-format
--msgid "This is a FIG version %d.%d file, I may not understand it\n"
-+#: ../plug-ins/xfig/xfig-import.c:1289
-+#, fuzzy, c-format
-+msgid "This is a Fig version %d.%d file. It may not be importable.\n"
- msgstr "To jest plik FIG w wersji %d.%d, nie można go odczytać.\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1319
--msgid "XFig File Format"
-+#: ../plug-ins/xfig/xfig-import.c:1337
-+#, fuzzy
-+msgid "Xfig File Format"
- msgstr "Format pliku XFig"
- 
- #: ../plug-ins/xfig/xfig.c:51
- msgid "Fig Format import and export filter"
- msgstr "Filtry importu i eksportu Fig Format"
- 
--#: ../plug-ins/xslt/xslt.c:102
-+#: ../plug-ins/xslt/xslt.c:110
- #, c-format
- msgid "Error while parsing %s\n"
- msgstr "BÅ‚Ä…d podczas przetwarzania %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:111
-+#: ../plug-ins/xslt/xslt.c:119
- #, c-format
- msgid "Error while parsing stylesheet %s\n"
- msgstr "Błąd podczas przetwarzania arkusza stylów %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:118
-+#: ../plug-ins/xslt/xslt.c:126
- #, c-format
- msgid "Error while applying stylesheet %s\n"
- msgstr "Błąd podczas próby zastosowania arkusza stylów: %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:127
-+#: ../plug-ins/xslt/xslt.c:135
- #, c-format
- msgid "Error while parsing stylesheet: %s\n"
- msgstr "Błąd podczas przetwarzania arkusza stylów: %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:136
-+#: ../plug-ins/xslt/xslt.c:144
- #, c-format
- msgid "Error while applying stylesheet: %s\n"
- msgstr "Błąd podczas próby zastosowania arkusza stylów: %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:322
-+#: ../plug-ins/xslt/xslt.c:152
-+#, c-format
-+msgid "Error while saving result: %s\n"
-+msgstr "BÅ‚Ä…d podczas zapisywania wyniku: %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:336
- msgid "XSL Transformation filter"
- msgstr "Filtr Przekształcania XSL"
- 
--#: ../plug-ins/xslt/xslt.c:346
--msgid "No valid configuration files found for the XSLT plugin, not loading."
-+#: ../plug-ins/xslt/xslt.c:363
-+#, fuzzy
-+msgid "No valid configuration files found for the XSLT plugin; not loading."
- msgstr ""
- "Nie znaleziono poprawnych plików konfiguracyjnych dla wtyczki XSLT. Nie "
- "została ona wczytana."
- 
--#: ../plug-ins/xslt/xsltdialog.c:96
-+#: ../plug-ins/xslt/xsltdialog.c:99
- msgid "Export through XSLT"
- msgstr "Eksportowanie z wykorzystaniem XSLT"
- 
--#: ../plug-ins/xslt/xsltdialog.c:111
-+#: ../plug-ins/xslt/xsltdialog.c:114
- msgid "From:"
- msgstr "Z:"
- 
--#: ../plug-ins/xslt/xsltdialog.c:146
-+#: ../plug-ins/xslt/xsltdialog.c:149
- msgid "To:"
- msgstr "Do:"
- 
- #: ../sheets/AADL.sheet.in.h:1
- msgid "AADL"
--msgstr ""
-+msgstr "AADL"
- 
- #: ../sheets/AADL.sheet.in.h:2
--#, fuzzy
- msgid "AADL Shapes"
--msgstr "Kształtowanie"
-+msgstr "Kształty AADL"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
- msgstr ""
- 
--#: ../sheets/AADL.sheet.in.h:5
--#, fuzzy
--msgid "Device"
--msgstr "Dzielenie"
--
- #: ../sheets/AADL.sheet.in.h:6
--msgid "Memory"
-+msgid "Processor"
- msgstr ""
- 
- #: ../sheets/AADL.sheet.in.h:7
--#, fuzzy
--msgid "Package"
--msgstr "Pakowanie"
-+msgid "Memory"
-+msgstr ""
-+
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr ""
- 
- #: ../sheets/AADL.sheet.in.h:9
--#, fuzzy
--msgid "Processor"
--msgstr "Przetwarzanie"
-+msgid "System"
-+msgstr ""
- 
- #: ../sheets/AADL.sheet.in.h:10
--#, fuzzy
- msgid "Subprogram"
--msgstr "Krok wywołania podprogramu"
-+msgstr ""
- 
- #: ../sheets/AADL.sheet.in.h:11
--#, fuzzy
--msgid "System"
--msgstr "Sybase"
-+msgid "Thread Group"
-+msgstr ""
- 
- #: ../sheets/AADL.sheet.in.h:12
--#, fuzzy
--msgid "Thread"
--msgstr "Kształtowanie"
-+msgid "Device"
-+msgstr ""
- 
- #: ../sheets/AADL.sheet.in.h:13
--msgid "Thread Group"
-+msgid "Package"
- msgstr ""
- 
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Mieszane"
-+
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
-+#: ../sheets/Assorted.sheet.in.h:6
- msgid ""
- "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
- "Geometric Shapes"
-@@ -5707,598 +6923,573 @@ msgstr ""
- "Mieszana kolekcja wielokątów, krzywych Beziera i innych kształtów "
- "geometrycznych"
- 
--#. Please talk to me before making any changes to this sheet
--#: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Mieszane"
--
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "Szewron"
-+msgid "Right angle triangle"
-+msgstr "Trójkąt prostokątny"
- 
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Zakrzywiona ośmioramienna gwiazda"
-+#, fuzzy
-+msgid "Isosceles triangle"
-+msgstr "Podwójny wypełniony trójkąt"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Zakrzywiona czteroramienna gwiazda"
-+msgid "Perfect square, height equals width"
-+msgstr "Idealny kwadrat, wysokość równa szerokości"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Diament"
-+msgid "Perfect circle"
-+msgstr "Idealny okrÄ…g"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Strzałka skierowana w dół"
-+msgid "Quarter circle"
-+msgstr "Ćwierć okręgu"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "Ośmioramienna gwiazda"
-+msgid "Diamond"
-+msgstr "Diament"
- 
- #: ../sheets/Assorted.sheet.in.h:13
- #, fuzzy
--msgid "Five point star"
--msgstr "Siedmioramienna gwiazda"
-+msgid "Pentagon. Five-point shape"
-+msgstr "Pięciokąt. Kształt z pięcioma krawędziami"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Czteroramienna gwiazda"
-+#, fuzzy
-+msgid "Hexagon. Six-point shape"
-+msgstr "Sześciokąt. Kształt z sześcioma krawędziami"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Serce"
-+#, fuzzy
-+msgid "Heptagon. Seven-point shape"
-+msgstr "Siedmiokąt. Kształt z siedmioma krawędziami"
- 
- #: ../sheets/Assorted.sheet.in.h:16
--msgid "Heptagon. Seven sided shape"
--msgstr "Siedmiokąt. Kształt z siedmioma krawędziami"
-+#, fuzzy
-+msgid "Octogon. Eight-point shape"
-+msgstr "Ośmiokąt. Kształt z ośmioma krawędziami"
- 
- #: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Sześciokąt. Kształt z sześcioma krawędziami"
--
--#: ../sheets/Assorted.sheet.in.h:18
- msgid "Horizontal parallelogram"
- msgstr "Poziomo ułożony równoległobok"
- 
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Pionowo ułożony równoległobok"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Podwójny wypełniony trójkąt"
-+msgid "Trapezoid"
-+msgstr "Trapezoid"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Strzałka skierowana w lewo"
-+#, fuzzy
-+msgid "Four-point star"
-+msgstr "Czteroramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Strzałka lewo-prawo"
-+#, fuzzy
-+msgid "Curved four-point star"
-+msgstr "Zakrzywiona czteroramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Strzałka lewo-prawo-góra"
-+#, fuzzy
-+msgid "Five-point star"
-+msgstr "Pięcioramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Strzałka lewo-góra"
-+#, fuzzy
-+msgid "Six-point star"
-+msgstr "Sześcioramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Krzyż Maltański"
-+#, fuzzy
-+msgid "Seven-point star"
-+msgstr "Siedmioramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "Wcięta strzałka skierowana w lewo"
-+#, fuzzy
-+msgid "Eight-point star"
-+msgstr "Ośmioramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "Wcięta strzałka skierowana w prawo"
-+#, fuzzy
-+msgid "Sharp eight-point star"
-+msgstr "Ostra ośmioramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "Ośmiokąt. Kształt z ośmioma krawędziami"
-+#, fuzzy
-+msgid "Curved eight-point star"
-+msgstr "Zakrzywiona ośmioramienna gwiazda"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "Pięcioboczna pełna strzałka"
-+msgid "Swiss cross"
-+msgstr "Krzyż szwajcarski"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Pięciokąt. Kształt z pięcioma krawędziami"
-+msgid "Maltese cross"
-+msgstr "Krzyż Maltański"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Idealny okrÄ…g"
-+msgid "Down arrow"
-+msgstr "Strzałka skierowana w dół"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Idealny kwadrat, wysokość równa szerokości"
-+msgid "Up arrow"
-+msgstr "Strzałka skierowana w górę"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Koniec strzałki"
-+msgid "Left arrow"
-+msgstr "Strzałka skierowana w lewo"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "Ćwierć okręgu"
-+msgid "Right arrow"
-+msgstr "Strzałka skierowana w prawo"
- 
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "Ćwierć księżyca"
-+msgid "Notched left arrow"
-+msgstr "Wcięta strzałka skierowana w lewo"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Trójkąt prostokątny"
-+msgid "Notched right arrow"
-+msgstr "Wcięta strzałka skierowana w prawo"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Strzałka skierowana w prawo"
-+msgid "Left-up arrow"
-+msgstr "Strzałka lewo-góra"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Siedmioramienna gwiazda"
-+#, fuzzy
-+msgid "Turn-up arrow"
-+msgstr "Strzałka lewo-góra"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Ostra ośmioramienna gwiazda"
-+msgid "Left-right arrow"
-+msgstr "Strzałka lewo-prawo"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Sześcioramienna gwiazda"
-+msgid "Up-down arrow"
-+msgstr "Strzałka góra-dół"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Słońce"
-+msgid "Quad arrow"
-+msgstr "Koniec strzałki"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Krzyż szwajcarski"
-+msgid "Left-right-up arrow"
-+msgstr "Strzałka lewo-prawo-góra"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Trapezoid"
-+msgid "Up-down-left arrow"
-+msgstr "Strzałka góra-dół-lewo"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--#, fuzzy
--msgid "Turn-up arrow"
--msgstr "Strzałka lewo-góra"
-+msgid "Pentagon block arrow"
-+msgstr "Pięcioboczna pełna strzałka"
- 
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "Strzałka skierowana w górę"
-+msgid "Chevron"
-+msgstr "Szewron"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Strzałka góra-dół"
-+msgid "Heart"
-+msgstr "Serce"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Strzałka góra-dół-lewo"
-+msgid "Sun"
-+msgstr "Słońce"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "Pionowo ułożony równoległobok"
--
--#: ../sheets/BPMN.sheet.in.h:1
--#, fuzzy
--msgid "Activity Looping"
--msgstr "Aktywność"
-+msgid "Quarter moon"
-+msgstr "Ćwierć księżyca"
- 
-+#. For: anthonym
- #: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
-+msgid "BPMN"
-+msgstr ""
-+
-+#: ../sheets/BPMN.sheet.in.h:3
-+msgid "Business Process Modeling Notation"
- msgstr ""
- 
--#. For: anthonym
- #: ../sheets/BPMN.sheet.in.h:4
--msgid "BPMN"
-+msgid "Start Event"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:5
--msgid "Business Process Modeling Notation"
-+msgid "Start Event — Message"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
--msgstr ""
-+#, fuzzy
-+msgid "Start Event — Timer"
-+msgstr "Czas rozpoczęcia"
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
-+msgid "Start Event — Rule"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:8
- #, fuzzy
--msgid "Compensation Task"
--msgstr "Złożenie"
-+msgid "Start Event — Link"
-+msgstr "Zbiornik zdarzeń"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--#, fuzzy
--msgid "Complex"
--msgstr "Sczepianie"
-+msgid "Start Event — Multiple"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:10
--#, fuzzy
--msgid "Data Object"
--msgstr "Obiekt"
-+msgid "Intermediate Event"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:11
--#, fuzzy
--msgid "End Event"
--msgstr "Punkt końcowy"
-+msgid "Intermediate Event — Message"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
-+msgid "Intermediate Event — Timer"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:13
--#, fuzzy
--msgid "End Event - Compensation"
--msgstr "Określenie zdarzenia"
-+msgid "Intermediate Event — Error"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
-+msgid "Intermediate Event — Cancel"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:15
--#, fuzzy
--msgid "End Event - Link"
--msgstr "Zbiornik zdarzeń"
-+msgid "Intermediate Event — Compensation"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
-+msgid "Intermediate Event — Rule"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
-+msgid "Intermediate Event — Link"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
-+msgid "Intermediate Event — Multiple"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
-+msgid "End Event"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
-+msgid "End Event — Message"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:21
--#, fuzzy
--msgid "Gateway"
--msgstr "Brama MAS"
-+msgid "End Event — Error"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:22
--#, fuzzy
--msgid "Group"
--msgstr "_Grupuj"
-+msgid "End Event — Cancel"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
-+msgid "End Event — Compensation"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr ""
-+#, fuzzy
-+msgid "End Event — Link"
-+msgstr "Zbiornik zdarzeń"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
-+msgid "End Event — Multiple"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
-+msgid "End Event — Terminate"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
-+msgid "Gateway"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
-+msgid "Exclusive (XOR) Data Based"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
-+msgid "Exclusive (XOR) Event Based"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
-+msgid "Inclusive (OR)"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
-+msgid "Complex"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr ""
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
-+msgid "Parallel (AND)"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
--msgstr ""
-+#, fuzzy
-+msgid "Activity Looping"
-+msgstr "Aktywność"
- 
- #: ../sheets/BPMN.sheet.in.h:35
--#, fuzzy
- msgid "Multiple Instance Task"
--msgstr "Wielokrotna instancja"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
-+msgid "Compensation Task"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:37
--#, fuzzy
--msgid "Start Event"
--msgstr "Punkt poczÄ…tkowy"
-+msgid "Collapsed Sub-Process"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:38
--#, fuzzy
--msgid "Start Event - Link"
--msgstr "Zbiornik zdarzeń"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:39
--#, fuzzy
--msgid "Start Event - Message"
--msgstr "Wysyłanie wiadomości (informacji)"
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
-+msgid "Ad-Hoc Collapsed Sub-Process"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
-+msgid "Compensation Collapsed Sub-Process"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:42
--#, fuzzy
--msgid "Start Event - Timer"
--msgstr "Czas rozpoczęcia"
-+msgid "Group"
-+msgstr ""
-+
-+#: ../sheets/BPMN.sheet.in.h:43
-+msgid "Transaction"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:44
--#, fuzzy
--msgid "Text Annotation"
--msgstr "Ułożenie"
-+msgid "Data Object"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:45
--#, fuzzy
--msgid "Transaction"
--msgstr "Przemiana"
--
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
-+msgid "Text Annotation"
- msgstr ""
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--#, fuzzy
--msgid "Air Cooler"
--msgstr "Dodaj narożnik"
-+msgid "ChemEng"
-+msgstr "Inżynieria chemiczna"
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
--msgstr ""
-+msgid "Collection for chemical engineering"
-+msgstr "Kolekcja obiektów dla inżynierii chemicznej"
- 
- #: ../sheets/ChemEng.sheet.in.h:4
--#, fuzzy
--msgid "Axial Flow Fan"
--msgstr "Zezwalanie DOF"
-+msgid "Fan or Stirrer"
-+msgstr "Wiatraczek lub Mieszadło"
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--#, fuzzy
--msgid "Basic Filter"
--msgstr "Filtrowanie"
-+msgid "Spraying Device"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
-+msgid "Pneumatic Line"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--#, fuzzy
--msgid "Centrifuge"
--msgstr "Zapora sieciowa Centri"
-+msgid "Pneumatic Line, vertical"
-+msgstr ""
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--#, fuzzy
--msgid "ChemEng"
--msgstr "Zmienianie"
-+msgid "Simple Heat Exchanger"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
-+msgid "Simple Heat Exchanger, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
-+msgid "Water Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:12
--#, fuzzy
--msgid "Compressor or Turbine"
--msgstr "Kompresja zapisywanych plików"
-+msgid "Water Cooler, vertical"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--#, fuzzy
--msgid "Covered tank"
--msgstr "Konwertowanie"
-+msgid "Fixed-Sheet Exchanger"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
-+msgid "Floating-Head or U-Tube Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:15
--#, fuzzy
--msgid "Double-Pipe Exchanger"
--msgstr "Podwójny wypełniony trójkąt"
-+msgid "Kettle Reboiler"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
--msgstr ""
-+msgid "Air Cooler"
-+msgstr "Wentylator"
- 
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
-+msgid "Forced-Flow Air Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
-+msgid "Induced-Flow Air Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
-+msgid "Plate Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
-+msgid "Double-Pipe Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
-+msgid "Heating/Cooling Coil"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
-+msgid "Heating/Cooling Coil, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
-+msgid "Simple Furnace"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
-+msgid "Simple Vessel"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
-+msgid "Knock-out Drum (with demister pad)"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
-+msgid "Tray Column, simple"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
-+msgid "Tray Column, detailed"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:28
--#, fuzzy
--msgid "Measurement"
--msgstr "Mierzenie"
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--#, fuzzy
--msgid "Mixer"
--msgstr "Mieszanie"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
--msgstr ""
-+msgid "Autoclave"
-+msgstr "Autoklaw"
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
-+msgid "Open Tank"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:32
--#, fuzzy
--msgid "Pneumatic Line"
--msgstr "Pneumatyczny"
-+msgid "Clarifier or Settling Tank"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
-+msgid "Sealed Tank"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
-+msgid "Covered tank"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Reactor or Absorption Vessel, simple"
-+msgid "Tank with Fixed Roof"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reciprocating Compressor or Pump"
-+msgid "Tank with Floating Roof"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--#, fuzzy
--msgid "Regulable Valve"
--msgstr "Regulowanie"
-+msgid "Storage Sphere"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--#, fuzzy
--msgid "Regulable Valve, vertical"
--msgstr "Przekaźnik (pionowy)"
-+msgid "Gas Holder, basic"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Sealed Tank"
-+msgid "Centrifugal Pump or Fan"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--#, fuzzy
--msgid "Simple Furnace"
--msgstr "Pojedyncza drukarka"
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Heat Exchanger"
-+msgid "Reciprocating Compressor or Pump"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger, vertical"
-+msgid "Axial Flow Fan"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:43
--#, fuzzy
--msgid "Simple Vessel"
--msgstr "Pojedynczy modem"
-+msgid "Compressor or Turbine"
-+msgstr "Kompresor lub turbina"
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Spray Drier"
-+msgid "Ejector or Injector"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spraying Device"
--msgstr ""
-+msgid "AC Generator"
-+msgstr "Generator prÄ…du zmiennego"
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--#, fuzzy
--msgid "Storage Sphere"
--msgstr "Router zasobów"
-+msgid "Valve"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Tank with Fixed Roof"
-+msgid "Valve, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Floating Roof"
-+msgid "Regulable Valve"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tray Column, detailed"
-+msgid "Regulable Valve, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, simple"
-+msgid "Basic Filter"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--#, fuzzy
--msgid "Valve"
--msgstr "Wartość:"
-+msgid "Mixer"
-+msgstr "Mikser"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--#, fuzzy
--msgid "Valve, vertical"
--msgstr "Obróć pionowo"
-+msgid "Cyclone and hydrocyclone"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--#, fuzzy
--msgid "Water Cooler"
--msgstr "Poziom wody"
-+msgid "Spray Drier"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--#, fuzzy
--msgid "Water Cooler, vertical"
--msgstr "Poziom wody"
-+msgid "Centrifuge"
-+msgstr "Wirówka"
-+
-+#: ../sheets/ChemEng.sheet.in.h:55
-+msgid "Pressure Relief Valve"
-+msgstr ""
- 
- #: ../sheets/Circuit.sheet.in.h:1
- msgid "Circuit"
-@@ -6309,306 +7500,317 @@ msgid "Components for circuit diagrams"
- msgstr "Komponenty do budowy diagramów obwodu"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "Punkt uziemienia"
-+msgid "Vertically aligned resistor"
-+msgstr "Pionowo ułożony rezystor"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Poziomo ułożona zworka"
-+msgid "Horizontally aligned inductor"
-+msgstr "Poziomo ułożona cewka"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "Poziomo ułożona dioda LED"
-+msgid "Vertically aligned inductor"
-+msgstr "Pionowo ułożona cewka"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Poziomo ułożony kondensator"
-+msgid "Horizontally aligned resistor"
-+msgstr "Poziomo ułożony rezystor"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Poziomo ułożona dioda"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Pionowo ułożony rezystor (symbol europejski)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Poziomo ułożony bezpiecznik"
-+msgid "Horizontally aligned inductor (European)"
-+msgstr "Poziomo ułożona cewka (symbol europejski)"
- 
- #: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Poziomo ułożona cewka"
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Pionowo ułożona cewka (symbol Europejski)"
- 
- #: ../sheets/Circuit.sheet.in.h:10
--msgid "Horizontally aligned inductor (European)"
--msgstr "Poziomo ułożona cewka (symbol europejski)"
-+msgid "Horizontally aligned resistor (European)"
-+msgstr "Poziomo ułożony rezystor (symbol Europejski)"
- 
- #: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Poziomo ułożone źródło zasilania"
-+msgid "Horizontally aligned capacitor"
-+msgstr "Poziomo ułożony kondensator"
- 
- #: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Poziomo ułożony rezystor"
--
--#: ../sheets/Circuit.sheet.in.h:13
--msgid "Horizontally aligned resistor (European)"
--msgstr "Poziomo ułożony rezystor (symbol Europejski)"
--
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Poziomo ułożona dioda Zenera"
-+msgid "Vertically aligned capacitor"
-+msgstr "Pionowo ułożony kondensator"
- 
-+#.
-+#.
- #: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Żarówka"
--
--#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Mikrofon"
--
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "Tranzystor NMOS"
-+msgid "NPN bipolar transistor"
-+msgstr "Bipolarny tranzystor npn"
- 
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:20
--msgid "NPN bipolar transistor"
-+#: ../sheets/Circuit.sheet.in.h:18
-+msgid "PNP bipolar transistor"
- msgstr "Bipolarny tranzystor npn"
- 
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Poziomo ułożona dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:20
-+msgid "Vertically aligned diode"
-+msgstr "Pionowo ułożona dioda"
-+
- #: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Wzmacniacz operacyjny"
-+msgid "Horizontally aligned zener diode"
-+msgstr "Poziomo ułożona dioda Zenera"
- 
- #: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "Tranzystor PMOS"
-+msgid "Vertically aligned zener diode"
-+msgstr "Pionowo ułożona dioda Zenera"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Punkt uziemienia"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Wzmacniacz operacyjny"
- 
--#.
--#.
- #: ../sheets/Circuit.sheet.in.h:25
--msgid "PNP bipolar transistor"
--msgstr "Bipolarny tranzystor npn"
-+msgid "Horizontally aligned fuse"
-+msgstr "Poziomo ułożony bezpiecznik"
- 
--#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Głośnik"
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "Pionowo ułożony bezpiecznik"
- 
- #: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "Pionowo ułożona dioda LED"
-+#, fuzzy
-+msgid "Horizontally aligned power source"
-+msgstr "Poziomo ułożone źródło zasilania"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "Pionowo ułożony kondensator"
-+#, fuzzy
-+msgid "Vertically aligned power source"
-+msgstr "Pionowo ułożone źródło zasilania"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "Pionowo ułożona dioda"
-+msgid "Lamp"
-+msgstr "Żarówka"
- 
--#: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "Pionowo ułożony bezpiecznik"
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Głośnik"
- 
--#: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "Pionowo ułożona cewka"
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Mikrofon"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "Pionowo ułożona cewka (symbol Europejski)"
-+msgid "Horizontally aligned LED"
-+msgstr "Poziomo ułożona dioda LED"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "Pionowo ułożone źródło zasilania"
-+msgid "Vertically aligned LED"
-+msgstr "Pionowo ułożona dioda LED"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "Pionowo ułożony rezystor"
-+msgid "NMOS transistor"
-+msgstr "Tranzystor NMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "Pionowo ułożony rezystor (symbol europejski)"
-+msgid "PMOS transistor"
-+msgstr "Tranzystor PMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "Pionowo ułożona dioda Zenera"
-+msgid "Horizontal jumper"
-+msgstr "Poziomo ułożona zworka"
-+
-+#: ../sheets/Circuit.sheet.in.h:37
-+#, fuzzy
-+msgid "Horizontal xtal"
-+msgstr "Pozioma podpora"
-+
-+#: ../sheets/Circuit.sheet.in.h:38
-+#, fuzzy
-+msgid "Vertical xtal"
-+msgstr "Pionowa podpora"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "Kontakt drabinkowy (normalnie zamknięty) typu \"Jeżeli nie\""
-+msgid "Ladder"
-+msgstr "Układy drabinkowe"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "Kontakt drabinkowy (normalnie otwarty) typu \"Jeżeli\""
-+msgid "Components for LADDER circuits"
-+msgstr "Komponenty do budowy obwodów drabinkowych"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "Zmienna wyjściowa \"jump\""
-+msgid "'if' (normally open) ladder contact"
-+msgstr "Kontakt drabinkowy (normalnie otwarty) typu \"Jeżeli\""
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "Zmienna wyjściowa \"reset\""
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "Kontakt drabinkowy (normalnie zamknięty) typu \"Jeżeli nie\""
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "Zmienna wyjściowa \"output\""
-+msgid "Simple output variable"
-+msgstr "Pojedyncza zmienna wyjściowa"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Komponenty do budowy obwodów drabinkowych"
-+msgid "Negative output variable"
-+msgstr "Zanegowana zmienna wyjściowa"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Układy drabinkowe"
-+msgid "'set' output variable"
-+msgstr "Zmienna wyjściowa \"output\""
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "Zanegowana zmienna wyjściowa"
-+msgid "'reset' output variable"
-+msgstr "Zmienna wyjściowa \"reset\""
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Energooszczędna zmienna wyjściowa \"reset\""
-+msgid "'jump' output variable"
-+msgstr "Zmienna wyjściowa \"jump\""
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Energooszczędna zmienna wyjściowa \"set\""
-+msgid "Receptivity output variable"
-+msgstr "Zmienna wyjściowa wrażliwości"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Energooszczędna ujemna zmienna wyjściowa"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Energooszczędna prosta zmienna wyjściowa"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Energooszczędna ujemna zmienna wyjściowa"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "Zmienna wyjściowa wrażliwości"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Energooszczędna zmienna wyjściowa \"set\""
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Pojedyncza zmienna wyjściowa"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Energooszczędna zmienna wyjściowa \"reset\""
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr ""
-+msgid "Cybernetics"
-+msgstr "Cybernetyka"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
--msgstr ""
-+msgid "Elements of cybernetic circuits"
-+msgstr "Komponenty do budowy obwodów cybernetycznych"
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
--msgstr ""
-+#, fuzzy
-+msgid "Sensor — left"
-+msgstr "WiÄ…zka czujnika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
-+msgid "Sensor — right"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
--msgstr ""
-+#, fuzzy
-+msgid "Sensor — bottom"
-+msgstr "WiÄ…zka czujnika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
-+msgid "Sensor — top"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
-+msgid "Sum, subtracting left input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--#, fuzzy
--msgid "Elements of cybernetic circuits"
--msgstr "Komponenty do budowy obwodu elektrycznego"
-+msgid "Sum, subtracting right input"
-+msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
-+msgid "Sum, subtracting bottom input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
-+msgid "Sum, subtracting top input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
-+msgid "Integrator — input left"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
-+msgid "Integrator — input right"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:13
--msgid "Integrator - input left"
-+msgid "Integrator — input bottom"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:14
--msgid "Integrator - input right"
-+msgid "Integrator — input top"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:15
--msgid "Integrator - input top"
-+msgid "Sum"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
-+msgid "Product"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:17
--#, fuzzy
--msgid "Product"
--msgstr "Przekazywanie"
-+msgid "High pass filter"
-+msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
-+msgid "Low pass filter"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
-+msgid "Sine characteristic or input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
-+msgid "Sigmoid characteristic"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
-+msgid "Saturation characteristic"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
-+msgid "Relay characteristic (sigma)"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
-+msgid "Half wave rectifier or ramp input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
-+msgid "Full wave rectifier (absolute value)"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
-+msgid "Constant positive shift on the y-axis"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--#, fuzzy
--msgid "Sum"
--msgstr "Słońce"
-+msgid "Constant negative shift on the y-axis"
-+msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
-+msgid "Constant factor greater 1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
-+msgid "Constant factor between 0 and 1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
-+msgid "Constant factor between 0 and -1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
-+msgid "Constant factor below -1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
-@@ -6616,418 +7818,413 @@ msgid "Template for custom characteristics"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:32
--#, fuzzy
- msgid "Time delay"
--msgstr "czas danej"
-+msgstr ""
- 
--#: ../sheets/ER.sheet.in.h:2
-+#: ../sheets/Database.sheet.in.h:1
-+msgid "Database"
-+msgstr "Baza danych"
-+
-+#: ../sheets/Database.sheet.in.h:2
-+msgid "Editor for Database Table Relation Diagrams"
-+msgstr "Edytor diagramów tabel baz danych"
-+
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr ""
-+
-+#: ../sheets/ER.sheet.in.h:1
- msgid "ER"
- msgstr "ER"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
--msgstr "Edytor Diagramów Związków Encji (ERD)"
--
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Udział"
-+msgstr "Edytor diagramów związków encji (ERD)"
- 
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr "SÅ‚aba encja"
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Udział"
-+
- #: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Obwód elektryczny"
-+
-+#: ../sheets/Electric.sheet.in.h:2
- msgid "Components for electric circuits"
- msgstr "Komponenty do budowy obwodu elektrycznego"
- 
--#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "Punkt połączenia"
--
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Obwód elektryczny"
-+msgid "Normally open contact (horizontal)"
-+msgstr "Styk normalnie rozwarty (poziomy)"
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
--msgstr "Żarówka lub wskaźnik optyczny (poziomy)"
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Styk normalnie zwarty (poziomy)"
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
--msgstr "Żarówka lub wskaźnik optyczny (pionowy)"
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Przełącznik normalnie rozwarty (poziomy)"
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
--msgstr "Styk normalnie zwarty (poziomy)"
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Przełącznik normalnie załączony (poziomy)"
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
--msgstr "Styk normalnie zwarty (pionowy)"
-+msgid "Normally open contact (vertical)"
-+msgstr "Styk normalnie rozwarty (pionowy)"
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
--msgstr "Przełącznik normalnie załączony (poziomy)"
-+msgid "Normally closed contact (vertical)"
-+msgstr "Styk normalnie zwarty (pionowy)"
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
--msgstr "Przełącznik normalnie załączony (pionowy)"
-+msgid "Normally open position switch (vertical)"
-+msgstr "Przełącznik normalnie rozwarty (pionowy)"
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
--msgstr "Styk normalnie rozwarty (poziomy)"
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Przełącznik normalnie załączony (pionowy)"
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
--msgstr "Styk normalnie rozwarty (pionowy)"
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "Część sterująca przekaźnika (pozioma)"
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
--msgstr "Przełącznik normalnie rozwarty (poziomy)"
-+msgid "Relay (horizontal)"
-+msgstr "Przekaźnik (poziomy)"
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
--msgstr "Przełącznik normalnie rozwarty (pionowy)"
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Żarówka lub wskaźnik optyczny (poziomy)"
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
--msgstr "Przekaźnik (poziomy)"
-+msgid "The command organ of a relay (vertical)"
-+msgstr "Część sterująca przekaźnika (pionowa)"
- 
- #: ../sheets/Electric.sheet.in.h:15
- msgid "Relay (vertical)"
- msgstr "Przekaźnik (pionowy)"
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
--msgstr "Część sterująca przekaźnika (pozioma)"
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Żarówka lub wskaźnik optyczny (pionowy)"
- 
--#: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr "Część sterująca przekaźnika (pionowa)"
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "Punkt połączenia"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Obiekty diagramu struktury funkcji"
--
--#: ../sheets/FS.sheet.in.h:2
- msgid "FS"
- msgstr "FS"
- 
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Obiekty diagramu struktury funkcji"
-+
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr "Przepływ"
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Funkcja"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr "Ortogonalny przepływ wieloliniowy"
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Funkcja"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Zestawienie"
-+msgid "Objects to draw flowcharts"
-+msgstr "Obiekty służące do tworzenia diagramów przepływu"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "�ącznik"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Proces/Operacja pomocnicza"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--#, fuzzy
--msgid "Data source"
--msgstr "Kolor danej"
-+msgid "Input/Output"
-+msgstr "Wejście/wyjście"
- 
--#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Decyzja"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Opóźnienie"
-+msgid "Connector"
-+msgstr "�ącznik"
- 
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Dokument"
-+msgid "Transaction file"
-+msgstr "Plik transakcji"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:10
--msgid "Flowchart"
--msgstr "Diagram przepływu"
-+msgid "Off page connector"
-+msgstr "Odłączony łącznik"
- 
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Wejście/wyjście"
-+msgid "Document"
-+msgstr "Dokument"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Wewnętrzny zasób dyskowy"
-+msgid "Manual operation"
-+msgstr "Operacja ręczna"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Dysk magnetyczny"
-+msgid "Preparation"
-+msgstr "Przygotowanie"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Bęben magnetyczny"
-+msgid "Manual input"
-+msgstr "Wejście ręczne"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Taśma magnetyczna"
-+msgid "Predefined process"
-+msgstr "Wstępnie zdefiniowany proces"
- 
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Wejście ręczne"
-+msgid "Terminal Interrupt"
-+msgstr "Przerywanie terminala"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Operacja ręczna"
-+msgid "Magnetic disk"
-+msgstr "Dysk magnetyczny"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "ZÅ‚Ä…czanie"
-+msgid "Magnetic drum"
-+msgstr "Bęben magnetyczny"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Obiekty służące do tworzenia diagramów przepływu"
-+msgid "Magnetic tape"
-+msgstr "Taśma magnetyczna"
-+
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Wewnętrzny zasób dyskowy"
- 
--#. XXX
- #: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Odłączony łącznik"
--
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "Odłączony nośnik danych"
-+msgid "Merge"
-+msgstr "ZÅ‚Ä…czanie"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Lub"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Wstępnie zdefiniowany proces"
-+msgid "Delay"
-+msgstr "Opóźnienie"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Przygotowanie"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Proces/Operacja pomocnicza"
-+msgid "Summing junction"
-+msgstr "Węzeł sumacyjny"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Karta perforowana (dziurkowana)"
-+msgid "Collate"
-+msgstr "Zestawienie"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Taśma perforowana (dziurkowana)"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Sortowanie"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Węzeł sumacyjny"
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Lub"
- 
--#: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "Przerywanie terminala"
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Karta perforowana (dziurkowana)"
- 
--#: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Plik transakcji"
-+#: ../sheets/Flowchart.sheet.in.h:31
-+msgid "Punched tape"
-+msgstr "Taśma perforowana (dziurkowana)"
- 
--#: ../sheets/Flowchart.sheet.in.h:34
-+#: ../sheets/Flowchart.sheet.in.h:32
- msgid "Transmittal tape"
- msgstr "Taśma transmisyjna"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
--msgid "Alternate external entity"
--msgstr ""
--
--#: ../sheets/Gane_and_Sarson.sheet.in.h:2
--#, fuzzy
--msgid "Data store"
--msgstr "Kolor danej"
--
--#: ../sheets/Gane_and_Sarson.sheet.in.h:3
--#, fuzzy
--msgid "External entity"
--msgstr "SÅ‚aba encja"
--
--#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
--#: ../sheets/Gane_and_Sarson.sheet.in.h:5
--msgid "Gane and Sarson"
--msgstr ""
-+#: ../sheets/Flowchart.sheet.in.h:33
-+msgid "Offline storage"
-+msgstr "Odłączony nośnik danych"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:6
--msgid "Gane and Sarson DFD"
--msgstr ""
-+#: ../sheets/Flowchart.sheet.in.h:34
-+msgid "Data source"
-+msgstr "Źródło danych"
- 
- #: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr "Ogranicznik AND"
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
- 
- #: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Obiekty do rysowania wykresów GRAFCET"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Krok wywołania makra podprogramu"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:9
- msgid "Action to associate to a step"
- msgstr "Akcja przyporzÄ…dkowana do kroku"
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
--msgid "Arc (upward)"
--msgstr "�uk (wypukły)"
--
--#: ../sheets/GRAFCET.sheet.in.h:4
-+#: ../sheets/GRAFCET.sheet.in.h:10
- msgid "Condition (of an action)"
- msgstr "Warunek (akcji)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr "Krok wywołania makra podprogramu"
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "Przemiana"
- 
--#: ../sheets/GRAFCET.sheet.in.h:11
-+#: ../sheets/GRAFCET.sheet.in.h:12
- msgid "OR vergent"
- msgstr "Ogranicznik OR"
- 
--#: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Obiekty do rysowania wykresów GRAFCET"
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "Ogranicznik AND"
- 
--#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
--msgid "Transition"
--msgstr "Przemiana"
-+#: ../sheets/GRAFCET.sheet.in.h:14
-+msgid "Arc (upward)"
-+msgstr "�uk (wypukły)"
- 
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+msgid "Gane and Sarson"
- msgstr ""
- 
--#: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+msgid "Gane and Sarson DFD"
- msgstr ""
- 
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
-+msgid "Alternate external entity"
-+msgstr ""
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-+msgid "Data store"
-+msgstr ""
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+msgid "External entity"
-+msgstr ""
-+
-+#. use dc:title instead?
-+#: ../sheets/IsometricMap.sheet.in.h:2
-+msgid "Map, Isometric"
- msgstr ""
- 
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
-+msgid "Isometric Directional Map Shapes"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
-+msgid "Road Section"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
-+msgid "Long Straight Road Section"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:7
--#, fuzzy
--msgid "Block 7"
--msgstr "Odblokowanie"
-+msgid "Crossroads"
-+msgstr "Skrzyżowanie"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
-+msgid "T-Junction"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
-+msgid "Elevated Road"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
--#, fuzzy
- msgid "Corner 1"
--msgstr "Courier"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:11
--#, fuzzy
- msgid "Corner 2"
--msgstr "Courier"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--#, fuzzy
--msgid "Crossroads"
--msgstr "Krzyżyk"
-+msgid "River"
-+msgstr "Rzeka"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
-+msgid "Roof 1"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--#, fuzzy
--msgid "Factory"
--msgstr "Aspekt"
-+msgid "Block 1, 2:4"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
-+msgid "Block 2, 2:8"
-+msgstr ""
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
- msgstr ""
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
-+msgid "Block 4, 4:8"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
-+msgid "Block 5, 3:3"
-+msgstr ""
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
- msgstr ""
- 
--#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
-+msgid "Block 7"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
--msgstr ""
-+msgid "Factory"
-+msgstr "Fabryka"
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--#, fuzzy
--msgid "River"
--msgstr "Odwróć"
-+msgid "Car 1, Front View"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--#, fuzzy
--msgid "Road Section"
--msgstr "Obrót"
-+msgid "Car 2, Rear View"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--#, fuzzy
--msgid "Roof1"
--msgstr "Wirnik"
-+msgid "Train 1, angled downward"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:25
--#, fuzzy
--msgid "T-Junction"
--msgstr "Funkcja"
-+msgid "Train 2, angled upward"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:26
--msgid "Train 1, angled downward"
-+msgid "Tree 1"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:27
--msgid "Train 2, angled upward"
-+msgid "Footbridge, Pedestrian Bridge"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:28
--msgid "Tree 1"
-+msgid "One Way Road Sign"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
-+msgid "RE-i*"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr ""
-+msgid "Objects to design i* diagrams"
-+msgstr "Obiekty do projektowania diagramów i*"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
-+msgid "An i* softgoal"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:4
-@@ -7035,24 +8232,23 @@ msgid "An i* goal"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
-+msgid "An i* resource"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
-+msgid "An i* task"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:7
--#, fuzzy
--msgid "An i* position"
--msgstr "Złożenie"
-+msgid "An i* unspecified actor"
-+msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
-+msgid "An i* agent"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
-+msgid "An i* position"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:10
-@@ -7060,2986 +8256,2625 @@ msgid "An i* role"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
-+msgid "An i* unspecified link"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
-+msgid "An i* positive contribution"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
-+msgid "An i* negative contribution"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
-+msgid "An i* dependency link"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:15
--#, fuzzy
--msgid "Objects to design i* diagrams"
--msgstr "Obiekty do projektowania diagramów SADT"
-+msgid "An i* decomposition link"
-+msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
-+msgid "An i* means-ends link"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
-+msgid "RE-Jackson"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:2
--msgid "A Jackson given domain"
--msgstr ""
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Obiekty do projektowania diagramów Jacksona"
- 
- #: ../sheets/Jackson.sheet.in.h:3
--msgid "A Jackson machine domain"
-+msgid "A Jackson given domain"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:4
--msgid "A Jackson requirement"
-+msgid "A Jackson designed domain"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
-+msgid "A Jackson machine domain"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:6
--msgid "A Jackson shared phenomenon"
-+msgid "A Jackson requirement"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:7
--#, fuzzy
--msgid "Objects to design Jackson diagrams"
--msgstr "Obiekty do projektowania diagramów SADT"
-+msgid "A Jackson shared phenomenon"
-+msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
-+msgid "A Jackson requirement phenomenon"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
-+msgid "RE-KAOS"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr ""
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Obiekty do projektowania diagramów KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--#, fuzzy
--msgid "A KAOS agent"
--msgstr "Dodaj segment"
-+msgid "A KAOS softgoal"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
-+msgid "A KAOS goal"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
-+msgid "A KAOS requirement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
-+msgid "A KAOS assumption"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
-+msgid "A KAOS obstacle"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
-+msgid "A KAOS AND refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
-+msgid "A KAOS complete AND refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
-+msgid "A KAOS OR refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
-+msgid "A KAOS complete OR refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
-+msgid "A KAOS operationalization"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
-+msgid "A KAOS contribution"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
-+msgid "A KAOS obstruction"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:15
--msgid "A KAOS obstruction"
-+msgid "A KAOS binary conflict"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:16
--#, fuzzy
--msgid "A KAOS operation"
--msgstr "Operacje"
-+msgid "A KAOS agent"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
-+msgid "A KAOS responsibility"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
-+msgid "A KAOS monitor link"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
-+msgid "A KAOS control link"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
-+msgid "A KAOS capable-of"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
-+msgid "A KAOS performs"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
-+msgid "A KAOS operation"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:23
--#, fuzzy
--msgid "Objects to design KAOS diagrams"
--msgstr "Obiekty do projektowania diagramów SADT"
-+msgid "A KAOS input"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
-+msgid "A KAOS output"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:1
-+msgid "Lights"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:2
-+msgid "Objects to design simple lighting plots"
-+msgstr "Obiekty do projektowania prostych planów oświetlenia"
-+
-+#: ../sheets/Lights.sheet.in.h:3
-+msgid "PAR"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:4
-+msgid "PAR on the floor"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:5
-+msgid "ACL"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:6
-+msgid "Pebble Convex lantern"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:7
-+msgid "Fresnel lantern"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:8
-+msgid "Striplight"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:9
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:10
-+msgid "Blinders"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:11
-+msgid "Black light"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:13
-+msgid "Moving head"
-+msgstr ""
-+
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Skaner"
-+
-+#: ../sheets/Lights.sheet.in.h:15
-+msgid "Structure"
- msgstr ""
- 
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "Bramka NOR"
-+msgid "Logic"
-+msgstr "Logika cyfrowa"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Logika Boole'a"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr "Złącze krzyżakowe"
-+msgid "OR gate"
-+msgstr "Bramka OR"
- 
- #: ../sheets/Logic.sheet.in.h:4
--msgid "Inverter"
--msgstr "Inwerter"
-+msgid "AND gate"
-+msgstr "Bramka AND"
- 
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Logika cyfrowa"
-+msgid "XOR gate"
-+msgstr "Bramka XOR"
- 
- #: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Pojedynczy bufor"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Inwerter"
-+
-+#: ../sheets/Logic.sheet.in.h:8
- msgid "NAND gate"
- msgstr "Bramka NAND"
- 
--#: ../sheets/Logic.sheet.in.h:7
-+#: ../sheets/Logic.sheet.in.h:9
- msgid "NOR gate"
- msgstr "Bramka NOR"
- 
--#: ../sheets/Logic.sheet.in.h:8
-+#: ../sheets/Logic.sheet.in.h:10
- msgid "NOT"
- msgstr "NOT"
- 
--#: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "Bramka OR"
--
--#: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Pojedynczy bufor"
--
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "Bramka XOR"
-+#, fuzzy
-+msgid "Cross-connector"
-+msgstr "Złącze krzyżakowe"
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Demultiplekser"
-+msgid "MSE"
-+msgstr "MSE"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Duży węzeł rozszerzenia"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "Komponenty wyposażenia ruchomego wozu wsparcia armii amerykańskiej"
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr "Środek węzła"
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "Multiplekser"
-+msgid "Large extension node"
-+msgstr "Duży węzeł rozszerzenia"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr "Środek węzła"
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Mały węzeł rozszerzenia"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Terminal komunikacji z satelitÄ… taktycznym"
- 
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplekser"
-+
- #: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr "Komponenty wyposażenia ruchomego wozu wsparcia armii amerykańskiej"
-+msgid "Demultiplexer"
-+msgstr "Demultiplekser"
- 
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Folder"
-+#: ../sheets/Misc.sheet.in.h:1
-+#, fuzzy
-+msgid "Miscellaneous"
-+msgstr "Różne kształty"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Różne kształty"
- 
--#: ../sheets/Misc.sheet.in.h:5
--msgid "New-style group object, for testing"
--msgstr ""
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Drzewo"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Folder"
- 
- #: ../sheets/Misc.sheet.in.h:6
-+#, fuzzy
-+msgid "expansible node"
-+msgstr "rozwijalny węzeł"
-+
-+#: ../sheets/Misc.sheet.in.h:7
-+#, fuzzy
-+msgid "expanded node"
-+msgstr "rozwinięty węzeł"
-+
-+#: ../sheets/Misc.sheet.in.h:8
- msgid "Traditional clock"
- msgstr "Tradycyjny zegar"
- 
-+#: ../sheets/Misc.sheet.in.h:9
-+msgid "Measure distance"
-+msgstr "Miara odległości"
-+
-+#: ../sheets/Misc.sheet.in.h:10
-+msgid "Resizable grid"
-+msgstr ""
-+
-+#: ../sheets/Misc.sheet.in.h:11
-+msgid "New-style group object, for testing"
-+msgstr ""
-+
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "Rozdzielnica 2/2"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pneumatyka/Hydraulika"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "Rozdzielnica 3/2"
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Komponenty do budowy obwodów pneumatycznych i hydraulicznych"
- 
- #: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "Rozdzielnica 4/2"
-+msgid "Double-effect jack"
-+msgstr "Wtyczka podwójna typu \"jack\""
- 
- #: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "Rozdzielnica 5/2"
-+msgid "Normally-in simple-effect jack"
-+msgstr "Męska wtyczka pojedyncza typu \"jack\""
- 
- #: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Otwór nawiewu powietrza"
-+msgid "Normally-out simple-effect jack"
-+msgstr "Żeńska wtyczka pojedyncza typu \"jack\""
- 
- #: ../sheets/Pneumatic.sheet.in.h:6
--msgid "Components for pneumatic and hydraulic circuits"
--msgstr "Komponenty do budowy obwodów pneumatycznych i hydraulicznych"
-+msgid "Generic pressure source"
-+msgstr "Źródło generacji ciśnienia"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Źródło ciśnienia hydraulicznego"
- 
- #: ../sheets/Pneumatic.sheet.in.h:8
--msgid "Double-effect jack"
--msgstr "Wtyczka podwójna typu \"jack\""
-+msgid "Pneumatic pressure source"
-+msgstr "Źródło ciśnienia pneumatycznego"
- 
- #: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Polecenie elektryczne (podwójna cewka)"
-+msgid "Air exhaust orifice"
-+msgstr "Otwór nawiewu powietrza"
- 
- #: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Polecenie elektryczne (pojedyncza cewka)"
-+msgid "2/2 distributor"
-+msgstr "Rozdzielnica 2/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:11
--msgid "Generic pressure source"
--msgstr "Źródło generacji ciśnienia"
-+msgid "3/2 distributor"
-+msgstr "Rozdzielnica 3/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:12
--msgid "Hydraulic pressure source"
--msgstr "Źródło ciśnienia hydraulicznego"
-+msgid "4/2 distributor"
-+msgstr "Rozdzielnica 4/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "Pośrednie polecenie sterownika hydraulicznego"
-+msgid "5/2 distributor"
-+msgstr "Rozdzielnica 5/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "Pośrednie polecenie sterownika pneumatycznego"
-+msgid "Muscular command"
-+msgstr "Polecenie fizyczne"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Polecenie mechaniczne sprężyny"
-+msgid "Push-button command"
-+msgstr "Polecenie naciśnięcia przycisku"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
- msgstr "Polecenie mechaniczne popychacza"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Polecenie fizyczne"
-+msgid "Mechanical command by spring"
-+msgstr "Polecenie mechaniczne sprężyny"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Męska wtyczka pojedyncza typu \"jack\""
-+msgid "Electric command (single coil)"
-+msgstr "Polecenie elektryczne (pojedyncza cewka)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Żeńska wtyczka pojedyncza typu \"jack\""
-+msgid "Electric command (double coil)"
-+msgstr "Polecenie elektryczne (podwójna cewka)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Źródło ciśnienia pneumatycznego"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Pośrednie polecenie sterownika hydraulicznego"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Pneumatyka/Hydraulika"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Polecenie naciśnięcia przycisku"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Pośrednie polecenie sterownika pneumatycznego"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Skrzynka aktywności/danych"
-+msgid "SADT/IDEF0"
-+msgstr "SADT/IDEF0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Strzałka przepływu aktywności/danych"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Obiekty do projektowania diagramów SADT"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Etykieta przepływu"
-+msgid "Activity/data flow arrow"
-+msgstr "Strzałka przepływu aktywności/danych"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Obiekty do projektowania diagramów SADT"
-+msgid "Activity/data box"
-+msgstr "Skrzynka aktywności/danych"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT/IDEF0"
-+msgid "Flow label"
-+msgstr "Etykieta przepływu"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Akcja w trakcie wykonywania"
-+msgid "SDL"
-+msgstr "SDL"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Język specyfikacji i opisu (SDL)"
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
- msgstr "Odwołanie do typu blokowego"
- 
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Odwołanie do typu usługi"
-+
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Wywołanie funkcji"
-+msgid "Process type reference"
-+msgstr "Odwołanie do typu procesu"
- 
--#: ../sheets/SDL.sheet.in.h:6
--msgid "Function header"
--msgstr "Nagłówek funkcji"
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Stan"
- 
- #: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "Zwykła notatka tekstowa"
-+msgid "Function header"
-+msgstr "Nagłówek funkcji"
- 
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "�ącznik wejścia/wyjścia"
-+msgid "Send message"
-+msgstr "Wysyłanie wiadomości (informacji)"
- 
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Powrót z procedury"
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Otrzymywanie wiadomości (informacji)"
- 
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Odwołanie do typu procesu"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Wywołanie funkcji"
- 
- #: ../sheets/SDL.sheet.in.h:12
--msgid "Receive message"
--msgstr "Otrzymywanie wiadomości (informacji)"
-+msgid "Action being executed"
-+msgstr "Akcja w trakcie wykonywania"
- 
- #: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
--
--#: ../sheets/SDL.sheet.in.h:14
- msgid "Save state"
- msgstr "Zapisywanie stanu"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Wysyłanie wiadomości (informacji)"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Odwołanie do typu usługi"
-+msgid "In/Out connector"
-+msgstr "�ącznik wejścia/wyjścia"
- 
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "Język specyfikacji i opisu (SDL)"
-+msgid "Procedure return"
-+msgstr "Powrót z procedury"
- 
--#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "Stan"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Zwykła notatka tekstowa"
- 
--#: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Aktywność"
-+#: ../sheets/SISSI.sheet.in.h:1
-+msgid "Objects to design sissi diagrams"
-+msgstr "Obiekty do projektowania diagramów zabezpieczeń (SISSI)"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "Agregacja, jedna klasa jest częścią innej"
-+#: ../sheets/SISSI.sheet.in.h:2
-+msgid "Workstation"
-+msgstr "Stacja robocza"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "Asocjacja, dwie klasy sÄ… powiÄ…zane"
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Relacyjna baza danych"
- 
--#: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr "Ikona stereotypowej klasy"
-+#: ../sheets/SISSI.sheet.in.h:4
-+msgid "Server"
-+msgstr "Serwer"
- 
--#: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr "Komponent"
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Laptop"
- 
--#: ../sheets/UML.sheet.in.h:9
--msgid "Constraint, place a constraint on something"
--msgstr "Ograniczenie, ustawienie na czymÅ› ograniczenia"
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "PDA"
- 
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "Edytor diagramów statycznych struktur UML-a"
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Macierz dyskowa"
- 
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Rozwidlenie/unia"
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Router"
- 
--#: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Generalizacja, dziedziczenie klasy"
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Chmura sieciowa"
- 
--#: ../sheets/UML.sheet.in.h:17
--msgid "Implements, class implements a specific interface"
--msgstr "Implementacja, klasa implementuje określony interfejs"
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefon"
- 
--#: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr "Początkowy/końcowy krok"
-+#: ../sheets/SISSI.sheet.in.h:11
-+msgid "Cell phone"
-+msgstr "Telefon komórkowy"
- 
--#: ../sheets/UML.sheet.in.h:19
--msgid "Large package"
--msgstr "Duży pakiet"
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Koncentrator"
- 
--#: ../sheets/UML.sheet.in.h:20
--msgid "Lifeline"
--msgstr "Linia życia"
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
- 
--#: ../sheets/UML.sheet.in.h:21
--msgid "Message"
--msgstr "Komunikat"
-+#: ../sheets/SISSI.sheet.in.h:14
-+msgid "Cipher machine"
-+msgstr "Maszyna szyfrujÄ…ca"
- 
--#: ../sheets/UML.sheet.in.h:22
--msgid "Node"
--msgstr "Węzeł"
-+#: ../sheets/SISSI.sheet.in.h:15
-+msgid "Magnetic storage"
-+msgstr "Nośnik magnetyczny"
- 
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "Uwaga"
-+#: ../sheets/SISSI.sheet.in.h:16
-+msgid "Paper storage"
-+msgstr "Nośnik papierowy"
- 
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Obiekt"
-+#: ../sheets/SISSI.sheet.in.h:17
-+msgid "Person"
-+msgstr "Osoba"
- 
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "Realizacja, implementuje określony interfejs"
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
-+msgid "File cabinet"
-+msgstr "Archiwum"
- 
--#: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Mały pakiet"
-+#: ../sheets/SISSI.sheet.in.h:19
-+msgid "Safe"
-+msgstr "Sejf"
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
-+msgstr "Kopia zapasowa"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr "Przypadek użycia"
-+#: ../sheets/SISSI.sheet.in.h:22
-+msgid "Log analysis"
-+msgstr ""
- 
--#: ../sheets/chronogram.sheet.in.h:1
--msgid "Chronogram"
--msgstr "Przebiegi czasowe"
-+#: ../sheets/SISSI.sheet.in.h:23
-+msgid "Information system"
-+msgstr "System informacyjny"
- 
--#: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr "Linia danych"
-+#: ../sheets/SISSI.sheet.in.h:24
-+msgid "Information"
-+msgstr "Informacja"
- 
--#: ../sheets/chronogram.sheet.in.h:3
--msgid "Objects to design chronogram charts"
--msgstr "Obiekty do projektowania przebiegów czasowych"
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Pomieszczenie"
- 
--#: ../sheets/chronogram.sheet.in.h:4
--msgid "Time scale"
--msgstr "Skala czasu"
-+#: ../sheets/SISSI.sheet.in.h:26
-+msgid "Faraday cage"
-+msgstr "Klatka Faradaya"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--#, fuzzy
--msgid "BBS"
--msgstr "BBSM"
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "Strefa bezpieczeństwa"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
--msgid "Cisco - Computer"
--msgstr "Cisco - komputer"
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "Cisco CA"
-+#: ../sheets/SISSI.sheet.in.h:29
-+msgid "Gate"
-+msgstr "Bramka"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "CiscoSecurity"
-+#: ../sheets/SISSI.sheet.in.h:30
-+msgid "Video camera"
-+msgstr "Kamera wideo"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr "Stacja robocza CiscoWorks"
-+#: ../sheets/SISSI.sheet.in.h:31
-+msgid "Glass-break sensor"
-+msgstr "Czujnik stłuczenia szkła"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Kształty komputerów autorstwa Cisco"
-+#: ../sheets/SISSI.sheet.in.h:32
-+msgid "Sensor beam"
-+msgstr "WiÄ…zka czujnika"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Kondensator"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Dyskietka"
-+#: ../sheets/SISSI.sheet.in.h:34
-+msgid "Power transducer"
-+msgstr "Przetwornik mocy"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:9
--#, fuzzy
--msgid "EtherClient"
--msgstr "Ethernetowa szyna danych"
-+#: ../sheets/SISSI.sheet.in.h:35
-+msgid "Current transducer"
-+msgstr "Przetwornik prÄ…du"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:10
--#, fuzzy
--msgid "FC Storage"
--msgstr "Pamięć masowa FC"
-+#: ../sheets/SISSI.sheet.in.h:36
-+msgid "Enthalpy transducer"
-+msgstr "Przetwornika entalpii"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Serwer plików"
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Czujnik dymu"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:12
--msgid "Front End Processor"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:38
-+msgid "Moisture sensor"
-+msgstr "Czujnik wilgoci"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP Mini"
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Czujnik światła"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
--msgstr "Handheld"
-+#: ../sheets/SISSI.sheet.in.h:40
-+msgid "Movement detector"
-+msgstr "Czujnik ruchu"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Host"
-+#: ../sheets/SISSI.sheet.in.h:41
-+msgid "Video movement detector"
-+msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "IBM Mini (AS400)"
-+#: ../sheets/SISSI.sheet.in.h:42
-+msgid "Level detector"
-+msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "IBM obudowa Tower"
-+#: ../sheets/SISSI.sheet.in.h:43
-+msgid "Pressure transducer"
-+msgstr "Przetwornik ciśnienia"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "IBM mainframe"
-+#: ../sheets/SISSI.sheet.in.h:44
-+msgid "Air quality detector"
-+msgstr "Detektor jakości powietrza"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:19
--#, fuzzy
--msgid "IBM mainframe with FEP"
--msgstr "IBM mainframe"
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Czujnik napięcia"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
-+#: ../sheets/SISSI.sheet.in.h:46
-+msgid "Vehicle detector"
- msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Laptop"
-+#: ../sheets/SISSI.sheet.in.h:47
-+msgid "Vibration sensor"
-+msgstr "Czujnik wibracji"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Macintosh"
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Kod cyfrowy"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "MicroWebserver"
-+#: ../sheets/SISSI.sheet.in.h:49
-+msgid "Moisture extractor"
-+msgstr "Ekstraktor wilgoci"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Mini VAX"
-+#: ../sheets/SISSI.sheet.in.h:50
-+msgid "Air filter"
-+msgstr "Filtr powietrza"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Modem"
-+#: ../sheets/SISSI.sheet.in.h:51
-+msgid "Badge reader/keyboard"
-+msgstr "Czytnik kart/klawiatura"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Monitor"
-+#: ../sheets/SISSI.sheet.in.h:52
-+msgid "Badge reader"
-+msgstr "Czytnik kart"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:27
--#, fuzzy
--msgid "Newton"
--msgstr "Dodaj"
--
--#: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:29
--#, fuzzy
--msgid "PC Adapter Card"
--msgstr "Karta rozszerzeń PC"
-+#: ../sheets/SISSI.sheet.in.h:53
-+msgid "Biometric reader"
-+msgstr "Czytnik biometryczny"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:30
--#, fuzzy
--msgid "PC Card"
--msgstr "Mężczyzna PC"
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "Pompa"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:31
--#, fuzzy
--msgid "PC Router Card"
--msgstr "Karta routera PC"
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:32
--#, fuzzy
--msgid "PC Software"
--msgstr "IP Softphone"
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr "Drzwi obrotowe"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "Wideo PC"
-+#: ../sheets/SISSI.sheet.in.h:57
-+msgid "Axial Ventilator"
-+msgstr "Wentylator osiowy"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
-+#: ../sheets/SISSI.sheet.in.h:58
-+msgid "Centrifugal Ventilator"
- msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "PDA"
--
--#: ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr "Relacyjna baza danych"
-+#: ../sheets/SISSI.sheet.in.h:59
-+msgid "Ventilator"
-+msgstr "Wentylator"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "Stacja robocza SUN"
-+#: ../sheets/SISSI.sheet.in.h:60
-+msgid "Extinguisher"
-+msgstr "Gaśnica"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Skaner"
-+#: ../sheets/SISSI.sheet.in.h:62
-+#, fuzzy
-+msgid "Air conditioner"
-+msgstr "Klimatyzacja"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Serwer z routerem PC"
-+#: ../sheets/SISSI.sheet.in.h:63
-+msgid "Alarm center"
-+msgstr "Centrum alarmowe"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:41
--#, fuzzy
--msgid "Software-Based Router on File Server"
--msgstr "Serwer oparty na oprogramowaniu"
-+#: ../sheets/UML.sheet.in.h:1
-+msgid "UML"
-+msgstr "UML"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Macierz dyskowa"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Edytor diagramów statycznych struktur UML-a"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Superkomputer"
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Uwaga"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr ""
-+#: ../sheets/UML.sheet.in.h:7
-+msgid "Realizes, implements a specific interface"
-+msgstr "Realizacja, implementuje określony interfejs"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:45
--#, fuzzy
--msgid "Tape array"
--msgstr "Macierz dyskowa"
-+#: ../sheets/UML.sheet.in.h:8
-+msgid "Generalization, class inheritance"
-+msgstr "Generalizacja, dziedziczenie klasy"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:46
--msgid "Terminal"
--msgstr "Terminal"
-+#: ../sheets/UML.sheet.in.h:9
-+msgid "Association, two classes are associated"
-+msgstr "Asocjacja, dwie klasy sÄ… powiÄ…zane"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:47
--msgid "WWW server"
--msgstr "Serwer WWW"
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Agregacja, jedna klasa jest częścią innej"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:48
--msgid "Web browser"
--msgstr "PrzeglÄ…darka WWW"
-+#: ../sheets/UML.sheet.in.h:11
-+msgid "Implements, class implements a specific interface"
-+msgstr "Implementacja, klasa implementuje określony interfejs"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:49
--msgid "Web cluster"
--msgstr "Klaster webowy"
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Ograniczenie, ustawienie na czymÅ› ograniczenia"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:50
--msgid "Wireless"
--msgstr ""
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Mały pakiet"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr "ZarzÄ…dca grupy roboczej"
-+#: ../sheets/UML.sheet.in.h:14
-+msgid "Large package"
-+msgstr "Duży pakiet"
- 
--#: ../sheets/ciscohub.sheet.in.h:1
--#, fuzzy
--msgid "100BaseT Hub"
--msgstr "Koncentrator 100BaseT"
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Przypadek użycia"
- 
--#: ../sheets/ciscohub.sheet.in.h:2
--#, fuzzy
--msgid "7500ARS (7513) Router"
--msgstr "7500ARS (7513"
-+#: ../sheets/UML.sheet.in.h:17
-+msgid "Lifeline"
-+msgstr "Linia życia"
- 
--#: ../sheets/ciscohub.sheet.in.h:3
--#, fuzzy
--msgid "7505 Router"
--msgstr "Router"
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Obiekt"
- 
--#: ../sheets/ciscohub.sheet.in.h:4
--#, fuzzy
--msgid "7507 Router"
--msgstr "Router"
-+#: ../sheets/UML.sheet.in.h:19
-+msgid "Message"
-+msgstr "Komunikat"
- 
--#: ../sheets/ciscohub.sheet.in.h:5
--#, fuzzy
--msgid "ASIC Processor"
--msgstr "Procesor ASIC"
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Komponent"
- 
--#: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+#: ../sheets/UML.sheet.in.h:25
-+msgid "Node"
-+msgstr "Węzeł"
- 
--#: ../sheets/ciscohub.sheet.in.h:7
--#, fuzzy
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "Swith ethernetowy ATM fast gigabit"
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "Ikona stereotypowej klasy"
- 
--#: ../sheets/ciscohub.sheet.in.h:8
-+#: ../sheets/UML.sheet.in.h:27
- #, fuzzy
--msgid "ATM Switch"
--msgstr "Przełącznica ATM"
-+msgid "Initial/End state"
-+msgstr "Początkowy/końcowy krok"
- 
--#: ../sheets/ciscohub.sheet.in.h:9
--#, fuzzy
--msgid "ATM Tag Switch Router"
--msgstr "Symbol przełącznicy ATM"
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Aktywność"
- 
--#: ../sheets/ciscohub.sheet.in.h:10
-+#: ../sheets/UML.sheet.in.h:31
- #, fuzzy
--msgid "Access Gateway"
--msgstr "Bramka dostępu Catalyst"
-+msgid "Fork/Union"
-+msgstr "Rozwidlenie/unia"
- 
--#: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+#: ../sheets/chronogram.sheet.in.h:1
-+msgid "Chronogram"
-+msgstr "Przebiegi czasowe"
- 
--#: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Router szerokopasmowy"
-+#: ../sheets/chronogram.sheet.in.h:2
-+msgid "Objects to design chronogram charts"
-+msgstr "Obiekty do projektowania przebiegów czasowych"
- 
--#: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr ""
-+#: ../sheets/chronogram.sheet.in.h:3
-+msgid "Time scale"
-+msgstr "Skala czasu"
- 
--#: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr ""
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Linia danych"
- 
--#: ../sheets/ciscohub.sheet.in.h:15
-+#: ../sheets/ciscocomputer.sheet.in.h:1
- #, fuzzy
--msgid "Cisco - Switch"
--msgstr "Cisco - różne"
-+msgid "Cisco — Computer"
-+msgstr "Cisco - komputer"
- 
--#: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Kształty komputerów autorstwa Cisco"
- 
--#: ../sheets/ciscohub.sheet.in.h:17
--#, fuzzy
--msgid "Cisco Hub"
--msgstr "Cisco - koncentrator"
-+#: ../sheets/ciscocomputer.sheet.in.h:3
-+msgid "PC"
-+msgstr "PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:18
--#, fuzzy
--msgid "Content Router"
--msgstr "Router usługi zawartości"
-+#: ../sheets/ciscocomputer.sheet.in.h:4
-+msgid "Macintosh"
-+msgstr "Macintosh"
- 
--#: ../sheets/ciscohub.sheet.in.h:19
--#, fuzzy
--msgid "Content Service Module"
--msgstr "Router usługi zawartości"
-+#: ../sheets/ciscocomputer.sheet.in.h:5
-+msgid "Terminal"
-+msgstr "Terminal"
- 
--#: ../sheets/ciscohub.sheet.in.h:20
--#, fuzzy
--msgid "Content Service Switch 1100"
--msgstr "Przełącznica usług zawartości 1100"
-+#: ../sheets/ciscocomputer.sheet.in.h:6
-+msgid "SUN workstation"
-+msgstr "Stacja robocza SUN"
- 
--#: ../sheets/ciscohub.sheet.in.h:21
--#, fuzzy
--msgid "Content Switch"
--msgstr "Przełącznica zawartości"
-+#: ../sheets/ciscocomputer.sheet.in.h:7
-+msgid "CiscoWorks workstation"
-+msgstr "Stacja robocza CiscoWorks"
- 
--#: ../sheets/ciscohub.sheet.in.h:22
-+#: ../sheets/ciscocomputer.sheet.in.h:8
- #, fuzzy
--msgid "Data Center Switch"
--msgstr "Szerokość linii danej"
-+msgid "PC Router Card"
-+msgstr "Karta routera PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr ""
-+#: ../sheets/ciscocomputer.sheet.in.h:9
-+msgid "PC Software"
-+msgstr "Oprogramowanie PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:24
--#, fuzzy
--msgid "Data Switch Processor"
--msgstr "Procesor przełącznicy routingu"
-+#: ../sheets/ciscocomputer.sheet.in.h:10
-+msgid "PC with Router-Based Software"
-+msgstr "PC z oprogramowaniem routera"
- 
--#: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr ""
-+#: ../sheets/ciscocomputer.sheet.in.h:11
-+msgid "Workgroup director"
-+msgstr "ZarzÄ…dca grupy roboczej"
- 
--#: ../sheets/ciscohub.sheet.in.h:26
--#, fuzzy
--msgid "Edge Label Switch Router"
--msgstr "Serwer z routerem PC"
--
--#: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
--msgstr ""
-+#: ../sheets/ciscocomputer.sheet.in.h:12
-+msgid "CiscoSecurity"
-+msgstr "CiscoSecurity"
- 
--#: ../sheets/ciscohub.sheet.in.h:28
--#, fuzzy
--msgid "Generic Processor"
--msgstr "Zwykły procesor"
-+#: ../sheets/ciscocomputer.sheet.in.h:13
-+msgid "Cisco CA"
-+msgstr "Cisco CA"
- 
--#: ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "Koncentrator"
-+#: ../sheets/ciscocomputer.sheet.in.h:14
-+msgid "WWW server"
-+msgstr "Serwer WWW"
- 
--#: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr ""
-+#: ../sheets/ciscocomputer.sheet.in.h:15
-+msgid "Web browser"
-+msgstr "PrzeglÄ…darka WWW"
- 
--#: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "Switch ISDN"
-+#: ../sheets/ciscocomputer.sheet.in.h:16
-+msgid "File Server"
-+msgstr "Serwer plików"
- 
--#: ../sheets/ciscohub.sheet.in.h:32
-+#: ../sheets/ciscocomputer.sheet.in.h:17
- #, fuzzy
--msgid "LAN2LAN Switch"
--msgstr "Przełączanie"
-+msgid "Software-Based Router on File Server"
-+msgstr "Serwer oparty na oprogramowaniu"
- 
--#: ../sheets/ciscohub.sheet.in.h:33
--#, fuzzy
--msgid "Label Switch Router"
-+#: ../sheets/ciscocomputer.sheet.in.h:18
-+msgid "Server with PC Router"
- msgstr "Serwer z routerem PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:34
--#, fuzzy
--msgid "Layer 2 Remote Switch"
--msgstr "Switch warstwy 3"
-+#: ../sheets/ciscocomputer.sheet.in.h:19
-+msgid "IBM Tower"
-+msgstr "IBM obudowa Tower"
- 
--#: ../sheets/ciscohub.sheet.in.h:35
--#, fuzzy
--msgid "MGX 8220"
--msgstr "Switch MGX 8220"
-+#: ../sheets/ciscocomputer.sheet.in.h:20
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM Mini (AS400)"
- 
--#: ../sheets/ciscohub.sheet.in.h:36
--#, fuzzy
--msgid "MGX 8240"
--msgstr "Switch MGX 8240"
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr ""
- 
--#: ../sheets/ciscohub.sheet.in.h:37
--#, fuzzy
--msgid "MGX 8260"
--msgstr "Switch MGX 8260"
-+#: ../sheets/ciscocomputer.sheet.in.h:22
-+msgid "IBM mainframe"
-+msgstr "IBM mainframe"
- 
--#: ../sheets/ciscohub.sheet.in.h:38
--#, fuzzy
--msgid "Multi-Fabric Server Switch"
--msgstr "Switch wielowarstwowy"
-+#: ../sheets/ciscocomputer.sheet.in.h:23
-+msgid "IBM mainframe with FEP"
-+msgstr "IBM mainframe z FEP"
- 
--#: ../sheets/ciscohub.sheet.in.h:39
--#, fuzzy
--msgid "MultiSwitch Device"
--msgstr "UrzÄ…dzenie MultiSwitch"
-+#: ../sheets/ciscocomputer.sheet.in.h:24
-+msgid "HP Mini"
-+msgstr "HP Mini"
- 
--#: ../sheets/ciscohub.sheet.in.h:40
--#, fuzzy
--msgid "Multilayer Remote Switch"
--msgstr "Switch wielowarstwowy"
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Superkomputer"
- 
--#: ../sheets/ciscohub.sheet.in.h:41
-+#: ../sheets/ciscocomputer.sheet.in.h:26
-+msgid "Web cluster"
-+msgstr "Klaster webowy"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:27
-+msgid "Mini VAX"
-+msgstr "Mini VAX"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:28
- #, fuzzy
--msgid "Multilayer Switch"
--msgstr "Switch wielowarstwowy"
-+msgid "PC Card"
-+msgstr "Mężczyzna PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:42
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tablet"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:31
- #, fuzzy
--msgid "Multilayer Switch with Silicon"
--msgstr "Switch wielowarstwowy"
-+msgid "EtherClient"
-+msgstr "Ethernetowa szyna danych"
- 
--#: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
-+#: ../sheets/ciscocomputer.sheet.in.h:32
-+msgid "Handheld"
-+msgstr "Handheld"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:33
-+msgid "Wireless"
- msgstr ""
- 
--#: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr "Router NetFlow"
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Newton"
- 
--#: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr ""
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Monitor"
- 
--#: ../sheets/ciscohub.sheet.in.h:46
--#, fuzzy
--msgid "NetSonar"
--msgstr "Sieć komputerowa"
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "Wideo PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:47
--#, fuzzy
--msgid "Optical Services Router"
--msgstr "Router usług optycznych"
-+#: ../sheets/ciscocomputer.sheet.in.h:41
-+msgid "BBS"
-+msgstr "BBS"
- 
--#: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
--msgstr "PXF"
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "MicroWebserver"
- 
--#: ../sheets/ciscohub.sheet.in.h:49
-+#: ../sheets/ciscocomputer.sheet.in.h:44
-+msgid "Diskette"
-+msgstr "Dyskietka"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:45
-+msgid "Host"
-+msgstr "Host"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:46
- #, fuzzy
--msgid "Programmable Switch"
--msgstr "Switch programowalny"
-+msgid "Tape array"
-+msgstr "Macierz dyskowa"
- 
--#: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr "RateMUX"
-+#: ../sheets/ciscocomputer.sheet.in.h:47
-+msgid "Disk subsystem"
-+msgstr ""
- 
--#: ../sheets/ciscohub.sheet.in.h:51
-+#: ../sheets/ciscocomputer.sheet.in.h:48
-+msgid "JBOD"
-+msgstr "JBOD"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:50
- #, fuzzy
--msgid "Route Switch Processor"
--msgstr "Procesor przełącznicy routingu"
-+msgid "FC Storage"
-+msgstr "Pamięć masowa FC"
- 
--#: ../sheets/ciscohub.sheet.in.h:52
-+#: ../sheets/ciscocomputer.sheet.in.h:51
- #, fuzzy
--msgid "Route Switch Processor with Si"
--msgstr "Procesor przełącznicy routingu"
-+msgid "PC Adapter Card"
-+msgstr "Karta rozszerzeń PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "Router"
-+#: ../sheets/ciscohub.sheet.in.h:1
-+#, fuzzy
-+msgid "Cisco — Switch"
-+msgstr "Cisco - przełącznica"
- 
--#: ../sheets/ciscohub.sheet.in.h:54
-+#: ../sheets/ciscohub.sheet.in.h:2
- #, fuzzy
- msgid "Router and switch shapes by Cisco"
- msgstr "Kształty koncentratorów i switchy autorstwa Cisco"
- 
--#: ../sheets/ciscohub.sheet.in.h:55
-+#: ../sheets/ciscohub.sheet.in.h:4
- #, fuzzy
- msgid "Router subdued"
- msgstr "Symbol routera"
- 
--#: ../sheets/ciscohub.sheet.in.h:56
--#, fuzzy
--msgid "Router with Firewall"
--msgstr "Router z zaporÄ… sieciowÄ…"
--
--#: ../sheets/ciscohub.sheet.in.h:57
-+#: ../sheets/ciscohub.sheet.in.h:5
- #, fuzzy
- msgid "Router with Silicon Switch"
- msgstr "Router z krzemowym switchem"
- 
--#: ../sheets/ciscohub.sheet.in.h:58
--#, fuzzy
--msgid "Server Switch"
--msgstr "Serwer z routerem PC"
--
--#: ../sheets/ciscohub.sheet.in.h:59
--#, fuzzy
--msgid "Small Hub"
--msgstr "Mały koncentrator"
--
--#: ../sheets/ciscohub.sheet.in.h:60
--#, fuzzy
--msgid "Storage Router"
--msgstr "Router zasobów"
--
--#: ../sheets/ciscohub.sheet.in.h:61
--#, fuzzy
--msgid "Switch Processor"
--msgstr "Procesor przełącznicy routingu"
--
--#: ../sheets/ciscohub.sheet.in.h:62
--#, fuzzy
--msgid "Universal Gateway"
--msgstr "Uniwersalna brama"
-+#: ../sheets/ciscohub.sheet.in.h:6
-+msgid "NetFlow router"
-+msgstr "Router NetFlow"
- 
--#: ../sheets/ciscohub.sheet.in.h:63
--#, fuzzy
--msgid "Virtual Layer Switch"
--msgstr "Switch wielowarstwowy"
-+#: ../sheets/ciscohub.sheet.in.h:7
-+msgid "Broadband router"
-+msgstr "Router szerokopasmowy"
- 
--#: ../sheets/ciscohub.sheet.in.h:64
-+#: ../sheets/ciscohub.sheet.in.h:8
- msgid "Wavelength router"
- msgstr "Router długości fali"
- 
--#: ../sheets/ciscohub.sheet.in.h:65
-+#: ../sheets/ciscohub.sheet.in.h:9
- #, fuzzy
- msgid "Wireless router"
- msgstr "Router firewall"
- 
--#: ../sheets/ciscohub.sheet.in.h:66
--#, fuzzy
--msgid "Workgroup 5000"
--msgstr "Switch grupy roboczej"
-+#: ../sheets/ciscohub.sheet.in.h:10
-+msgid "7507 Router"
-+msgstr "Router 7507"
- 
--#: ../sheets/ciscohub.sheet.in.h:67
--#, fuzzy
--msgid "Workgroup 5002"
--msgstr "Switch grupy roboczej"
-+#: ../sheets/ciscohub.sheet.in.h:11
-+msgid "7505 Router"
-+msgstr "Router 7505"
- 
--#: ../sheets/ciscohub.sheet.in.h:68
--#, fuzzy
--msgid "Workgroup 5500"
--msgstr "Switch grupy roboczej"
-+#: ../sheets/ciscohub.sheet.in.h:12
-+msgid "7500ARS (7513) Router"
-+msgstr "Router 7500ARS (7513)"
- 
--#: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
-+#: ../sheets/ciscohub.sheet.in.h:13
-+msgid "Edge Label Switch Router with NetFlow"
- msgstr ""
- 
--#: ../sheets/ciscohub.sheet.in.h:70
-+#: ../sheets/ciscohub.sheet.in.h:14
- #, fuzzy
--msgid "Workgroup Switch Voice-Enabled"
--msgstr "Switch grupy roboczej"
-+msgid "Edge Label Switch Router"
-+msgstr "Serwer z routerem PC"
- 
--#: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
--msgstr "Switch grupy roboczej"
-+#: ../sheets/ciscohub.sheet.in.h:15
-+#, fuzzy
-+msgid "Router with Firewall"
-+msgstr "Router z zaporÄ… sieciowÄ…"
- 
--#: ../sheets/ciscohub.sheet.in.h:72
-+#: ../sheets/ciscohub.sheet.in.h:16
- #, fuzzy
--msgid "Workgroup switch Subdued"
--msgstr "Switch grupy roboczej"
-+msgid "Optical Services Router"
-+msgstr "Router usług optycznych"
- 
--#: ../sheets/ciscohub.sheet.in.h:73
-+#: ../sheets/ciscohub.sheet.in.h:17
- #, fuzzy
--msgid "iSCSI switch"
--msgstr "Switch ISDN"
-+msgid "Content Router"
-+msgstr "Router usługi zawartości"
- 
--#: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
- msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr ""
-+#: ../sheets/ciscohub.sheet.in.h:19
-+#, fuzzy
-+msgid "Storage Router"
-+msgstr "Router zasobów"
- 
--#: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Filia biura"
-+#: ../sheets/ciscohub.sheet.in.h:20
-+msgid "NetSonar"
-+msgstr "NetSonar"
- 
--#: ../sheets/ciscomisc.sheet.in.h:4
-+#: ../sheets/ciscohub.sheet.in.h:22
-+msgid "Hub subdued"
-+msgstr ""
-+
-+#: ../sheets/ciscohub.sheet.in.h:23
- #, fuzzy
--msgid "Branch office blue"
--msgstr "Filia biura"
-+msgid "Cisco Hub"
-+msgstr "Cisco - koncentrator"
- 
--#: ../sheets/ciscomisc.sheet.in.h:5
-+#: ../sheets/ciscohub.sheet.in.h:24
- #, fuzzy
--msgid "Branch office subdued"
--msgstr "Filia biura"
-+msgid "Small Hub"
-+msgstr "Mały koncentrator"
- 
--#: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr "Samochód"
-+#: ../sheets/ciscohub.sheet.in.h:25
-+msgid "100BaseT Hub"
-+msgstr "Koncentrator 100BaseT"
- 
--#: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Cisco - różne"
-+#: ../sheets/ciscohub.sheet.in.h:26
-+msgid "Workgroup switch"
-+msgstr "Switch grupy roboczej"
- 
--#: ../sheets/ciscomisc.sheet.in.h:8
-+#: ../sheets/ciscohub.sheet.in.h:27
- #, fuzzy
--msgid "CiscoWorks Man"
--msgstr "Stacja robocza CiscoWorks"
--
--#: ../sheets/ciscomisc.sheet.in.h:9
--msgid "File cabinet"
--msgstr ""
-+msgid "Workgroup switch Subdued"
-+msgstr "Switch grupy roboczej"
- 
--#: ../sheets/ciscomisc.sheet.in.h:10
-+#: ../sheets/ciscohub.sheet.in.h:28
- #, fuzzy
--msgid "Generic Building"
--msgstr "Zwykły budynek"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Switch grupy roboczej"
- 
--#: ../sheets/ciscomisc.sheet.in.h:11
--#, fuzzy
--msgid "Generic Building blue"
--msgstr "Zwykły budynek"
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
- 
--#: ../sheets/ciscomisc.sheet.in.h:12
-+#: ../sheets/ciscohub.sheet.in.h:30
- #, fuzzy
--msgid "Generic Building subdued"
--msgstr "Zwykły budynek"
-+msgid "ATM Tag Switch Router"
-+msgstr "Symbol przełącznicy ATM"
- 
--#: ../sheets/ciscomisc.sheet.in.h:13
-+#: ../sheets/ciscohub.sheet.in.h:31
- #, fuzzy
--msgid "Government Building"
--msgstr "Budynek rzÄ…dowy"
-+msgid "Switch Processor"
-+msgstr "Procesor przełącznicy routingu"
- 
--#: ../sheets/ciscomisc.sheet.in.h:14
-+#: ../sheets/ciscohub.sheet.in.h:32
- #, fuzzy
--msgid "Headphones"
--msgstr "Telefon"
--
--#: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr ""
-+msgid "Route Switch Processor"
-+msgstr "Procesor przełącznicy routingu"
- 
--#: ../sheets/ciscomisc.sheet.in.h:16
-+#: ../sheets/ciscohub.sheet.in.h:33
- #, fuzzy
--msgid "House"
--msgstr "Host"
--
--#: ../sheets/ciscomisc.sheet.in.h:17
--msgid "House blue"
--msgstr ""
--
--#: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Klucz"
-+msgid "Route Switch Processor with Si"
-+msgstr "Procesor przełącznicy routingu"
- 
--#: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
--msgstr ""
-+#: ../sheets/ciscohub.sheet.in.h:34
-+msgid "PXF"
-+msgstr "PXF"
- 
--#: ../sheets/ciscomisc.sheet.in.h:21
--msgid "MDU"
--msgstr "MDU"
-+#: ../sheets/ciscohub.sheet.in.h:35
-+msgid "ASIC Processor"
-+msgstr "Procesor ASIC"
- 
--#: ../sheets/ciscomisc.sheet.in.h:22
-+#: ../sheets/ciscohub.sheet.in.h:36
- #, fuzzy
--msgid "Mac Woman"
--msgstr "Kobieta Mac"
-+msgid "Generic Processor"
-+msgstr "Zwykły procesor"
- 
--#: ../sheets/ciscomisc.sheet.in.h:23
-+#: ../sheets/ciscohub.sheet.in.h:37
- #, fuzzy
--msgid "Man"
--msgstr "Powiększenie"
--
--#: ../sheets/ciscomisc.sheet.in.h:24
--msgid "Man blue"
--msgstr ""
-+msgid "Data Center Switch"
-+msgstr "Szerokość linii danej"
- 
--#: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
-+#: ../sheets/ciscohub.sheet.in.h:38
-+msgid "Data Center Switch Reversed"
- msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:26
-+#: ../sheets/ciscohub.sheet.in.h:39
- #, fuzzy
--msgid "Man red"
--msgstr "Kształtowanie"
-+msgid "Data Switch Processor"
-+msgstr "Procesor przełącznicy routingu"
- 
--#: ../sheets/ciscomisc.sheet.in.h:27
-+#: ../sheets/ciscohub.sheet.in.h:40
- #, fuzzy
--msgid "Medium Building"
--msgstr "Zwykły budynek"
--
--#: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr ""
--
--#: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr ""
--
--#: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Różne kształty autorstwa Cisco"
-+msgid "Content Switch"
-+msgstr "Przełącznica zawartości"
- 
--#: ../sheets/ciscomisc.sheet.in.h:32
-+#: ../sheets/ciscohub.sheet.in.h:41
- #, fuzzy
--msgid "PC Man"
--msgstr "Mężczyzna PC"
-+msgid "Content Service Module"
-+msgstr "Router usługi zawartości"
- 
--#: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
--msgstr ""
-+#: ../sheets/ciscohub.sheet.in.h:42
-+msgid "CSM-S"
-+msgstr "CSM-S"
- 
--#: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
--msgstr "Biegnący człowiek"
-+#: ../sheets/ciscohub.sheet.in.h:43
-+msgid "Access Gateway"
-+msgstr "Bramka dostępowa"
- 
--#: ../sheets/ciscomisc.sheet.in.h:35
--#, fuzzy
--msgid "Running man subdued"
--msgstr "Biegnący człowiek"
-+#: ../sheets/ciscohub.sheet.in.h:44
-+msgid "ATM Switch"
-+msgstr "Przełącznica ATM"
- 
--#: ../sheets/ciscomisc.sheet.in.h:36
--#, fuzzy
--msgid "Running woman"
--msgstr "Biegnący człowiek"
-+#: ../sheets/ciscohub.sheet.in.h:45
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
- 
--#: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Satelita"
-+#: ../sheets/ciscohub.sheet.in.h:46
-+msgid "Cisco 1000"
-+msgstr "Cisco 1000"
- 
--#: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
--msgstr ""
-+#: ../sheets/ciscohub.sheet.in.h:47
-+msgid "ISDN switch"
-+msgstr "Przełącznica ISDN"
- 
--#: ../sheets/ciscomisc.sheet.in.h:39
-+#: ../sheets/ciscohub.sheet.in.h:48
- #, fuzzy
--msgid "Sitting Woman"
--msgstr "SiedzÄ…ca kobieta"
-+msgid "Label Switch Router"
-+msgstr "Serwer z routerem PC"
- 
--#: ../sheets/ciscomisc.sheet.in.h:40
-+#: ../sheets/ciscohub.sheet.in.h:49
- #, fuzzy
--msgid "Sitting Woman right"
--msgstr "SiedzÄ…ca kobieta"
-+msgid "MultiSwitch Device"
-+msgstr "UrzÄ…dzenie MultiSwitch"
- 
--#: ../sheets/ciscomisc.sheet.in.h:41
-+#: ../sheets/ciscohub.sheet.in.h:50
- #, fuzzy
--msgid "Small Business"
--msgstr "Mały biznes"
-+msgid "LAN2LAN Switch"
-+msgstr "Przełączanie"
- 
--#: ../sheets/ciscomisc.sheet.in.h:43
-+#: ../sheets/ciscohub.sheet.in.h:51
- #, fuzzy
--msgid "Standing Man"
--msgstr "Stojący człowiek"
-+msgid "Multilayer Switch"
-+msgstr "Switch wielowarstwowy"
- 
--#: ../sheets/ciscomisc.sheet.in.h:44
-+#: ../sheets/ciscohub.sheet.in.h:52
- #, fuzzy
--msgid "Standing woman"
--msgstr "Stojący człowiek"
--
--#: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
--msgstr ""
--
--#: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr ""
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Switch wielowarstwowy"
- 
--#: ../sheets/ciscomisc.sheet.in.h:47
--msgid "Telecommuter house subdued"
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
- msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:48
--msgid "Truck"
--msgstr "Ciężarówka"
--
--#: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Uniwersytet"
--
--#: ../sheets/ciscomisc.sheet.in.h:50
-+#: ../sheets/ciscohub.sheet.in.h:54
- #, fuzzy
--msgid "Video Camera"
--msgstr "Kamera wideo"
-+msgid "Programmable Switch"
-+msgstr "Switch programowalny"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscohub.sheet.in.h:55
- #, fuzzy
--msgid "Video Camera right"
--msgstr "Kamera wideo"
-+msgid "Content Service Switch 1100"
-+msgstr "Przełącznica usług zawartości 1100"
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
-+#: ../sheets/ciscohub.sheet.in.h:56
- #, fuzzy
--msgid "Woman"
--msgstr "Mężczyzna/kobieta"
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "Swith ethernetowy ATM fast gigabit"
- 
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr ""
-+#: ../sheets/ciscohub.sheet.in.h:57
-+msgid "RateMUX"
-+msgstr "RateMUX"
- 
--#: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr ""
-+#: ../sheets/ciscohub.sheet.in.h:58
-+#, fuzzy
-+msgid "Workgroup 5500"
-+msgstr "Switch grupy roboczej"
- 
--#: ../sheets/ciscomisc.sheet.in.h:55
-+#: ../sheets/ciscohub.sheet.in.h:59
- #, fuzzy
--msgid "Woman red"
--msgstr "Ten sam typ"
-+msgid "Workgroup 5000"
-+msgstr "Switch grupy roboczej"
- 
--#: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr "10700"
-+#: ../sheets/ciscohub.sheet.in.h:60
-+#, fuzzy
-+msgid "Workgroup 5002"
-+msgstr "Switch grupy roboczej"
- 
--#: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr "15200"
-+#: ../sheets/ciscohub.sheet.in.h:61
-+msgid "NetRanger"
-+msgstr "NetRanger"
- 
--#: ../sheets/cisconetwork.sheet.in.h:3
--#, fuzzy
--msgid "15800"
--msgstr "15200"
-+#: ../sheets/ciscohub.sheet.in.h:62
-+msgid "MGX 8220"
-+msgstr "MGX 8220"
- 
--#: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr "Kontroler klastra 3174 (desktop)"
-+#: ../sheets/ciscohub.sheet.in.h:63
-+msgid "MGX 8240"
-+msgstr "MGX 8240"
- 
--#: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
--msgstr "Kontroler klastra (dolny) 3X74"
-+#: ../sheets/ciscohub.sheet.in.h:64
-+msgid "MGX 8260"
-+msgstr "MGX 8260"
- 
--#: ../sheets/cisconetwork.sheet.in.h:6
-+#: ../sheets/ciscohub.sheet.in.h:65
- #, fuzzy
--msgid "Access Server"
--msgstr "Serwer plików"
-+msgid "Universal Gateway"
-+msgstr "Uniwersalna brama"
- 
--#: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
--msgstr "Punkt dostępowy"
-+#: ../sheets/ciscohub.sheet.in.h:66
-+#, fuzzy
-+msgid "iSCSI switch"
-+msgstr "Switch ISDN"
- 
--#: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
-+#: ../sheets/ciscohub.sheet.in.h:67
-+msgid "Workgroup Fibre Channel intelligent switch"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
--
--#: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "Nośnik BBFW"
--
--#: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
-+#: ../sheets/ciscohub.sheet.in.h:68
-+msgid "Director-class Fibre Channel intelligent switch"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Mostek"
--
--#: ../sheets/cisconetwork.sheet.in.h:13
-+#: ../sheets/ciscohub.sheet.in.h:69
- #, fuzzy
--msgid "CDDI/FDDI Concentrator"
--msgstr "Koncentrator VPN"
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Switch wielowarstwowy"
- 
--#: ../sheets/cisconetwork.sheet.in.h:14
-+#: ../sheets/ciscohub.sheet.in.h:70
- #, fuzzy
--msgid "CDM Content Distribution Manager"
--msgstr "Menedżer dystrybucji zawartości CDM"
--
--#: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr "CSU/DSU"
-+msgid "Server Switch"
-+msgstr "Serwer z routerem PC"
- 
--#: ../sheets/cisconetwork.sheet.in.h:16
-+#: ../sheets/ciscohub.sheet.in.h:71
- #, fuzzy
--msgid "Cable Modem"
--msgstr "Modem kablowy"
-+msgid "Multilayer Remote Switch"
-+msgstr "Switch wielowarstwowy"
- 
--#: ../sheets/cisconetwork.sheet.in.h:17
-+#: ../sheets/ciscohub.sheet.in.h:72
- #, fuzzy
--msgid "Catalyst Access Gateway"
--msgstr "Bramka dostępu Catalyst"
-+msgid "Layer 2 Remote Switch"
-+msgstr "Switch warstwy 3"
- 
--#: ../sheets/cisconetwork.sheet.in.h:18
-+#: ../sheets/ciscohub.sheet.in.h:73
- #, fuzzy
--msgid "Centri Firewall"
--msgstr "Zapora sieciowa Centri"
-+msgid "Virtual Layer Switch"
-+msgstr "Switch wielowarstwowy"
- 
--#: ../sheets/cisconetwork.sheet.in.h:19
-+#: ../sheets/ciscomisc.sheet.in.h:1
- #, fuzzy
--msgid "Channelized Pipe"
--msgstr "Kanał"
--
--#: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Cisco - sieć komputerowa"
-+msgid "Cisco — Miscellaneous"
-+msgstr "Cisco - różne"
- 
--#: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Chmura"
-+#: ../sheets/ciscomisc.sheet.in.h:2
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Różne kształty autorstwa Cisco"
- 
--#: ../sheets/cisconetwork.sheet.in.h:22
--#, fuzzy
--msgid "Cloud Dark"
--msgstr "Chmura"
-+#: ../sheets/ciscomisc.sheet.in.h:3
-+msgid "Government Building"
-+msgstr "Budynek rzÄ…dowy"
- 
--#: ../sheets/cisconetwork.sheet.in.h:23
--#, fuzzy
--msgid "Cloud Gold"
--msgstr "Chmura"
-+#: ../sheets/ciscomisc.sheet.in.h:4
-+msgid "University"
-+msgstr "Uniwersytet"
- 
--#: ../sheets/cisconetwork.sheet.in.h:24
-+#: ../sheets/ciscomisc.sheet.in.h:5
- #, fuzzy
--msgid "Cloud White"
--msgstr "Chmura"
-+msgid "Small Business"
-+msgstr "Mały biznes"
- 
--#: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
-+#: ../sheets/ciscomisc.sheet.in.h:6
-+msgid "Home office"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:26
--#, fuzzy
--msgid "Content Engine (Cache Director)"
--msgstr "Mechanizm zawartości (zarządca pamięci podręcznej)"
-+#: ../sheets/ciscomisc.sheet.in.h:7
-+msgid "Branch office"
-+msgstr "Filia biura"
- 
--#: ../sheets/cisconetwork.sheet.in.h:27
-+#: ../sheets/ciscomisc.sheet.in.h:8
- #, fuzzy
--msgid "Content Transformation Engine (CTE)"
--msgstr "Mechanizm przekształcania zawartości (CTE)"
--
--#: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr "DSLAM"
-+msgid "Branch office subdued"
-+msgstr "Filia biura"
- 
--#: ../sheets/cisconetwork.sheet.in.h:29
-+#: ../sheets/ciscomisc.sheet.in.h:9
- #, fuzzy
--msgid "DWDM Filter"
--msgstr "Filtr DWDM"
-+msgid "Branch office blue"
-+msgstr "Filia biura"
- 
--#: ../sheets/cisconetwork.sheet.in.h:30
-+#: ../sheets/ciscomisc.sheet.in.h:10
- #, fuzzy
--msgid "Detector"
--msgstr "Aktor"
-+msgid "Generic Building"
-+msgstr "Zwykły budynek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:31
-+#: ../sheets/ciscomisc.sheet.in.h:11
- #, fuzzy
--msgid "Digital Cross-Connect"
--msgstr "Złącze krzyżakowe"
--
--#: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr "Serwer katalogowy"
-+msgid "Generic Building subdued"
-+msgstr "Zwykły budynek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:33
-+#: ../sheets/ciscomisc.sheet.in.h:12
- #, fuzzy
--msgid "Distributed Director"
--msgstr "ZarzÄ…dca dystrybucji"
-+msgid "Generic Building blue"
-+msgstr "Zwykły budynek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:34
-+#: ../sheets/ciscomisc.sheet.in.h:13
- #, fuzzy
--msgid "Dual Mode AccessPoint"
--msgstr "Punkt dostępowy"
-+msgid "Medium Building"
-+msgstr "Zwykły budynek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:35
--#, fuzzy
--msgid "FDDI Ring"
--msgstr "Pierścień FDDI"
-+#: ../sheets/ciscomisc.sheet.in.h:14
-+msgid "Medium Building subdued"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:36
--#, fuzzy
--msgid "File Engine"
--msgstr "Wypełniona elipsa"
-+#: ../sheets/ciscomisc.sheet.in.h:15
-+msgid "Medium Building blue"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
--msgstr "Zapora sieciowa"
--
--#: ../sheets/cisconetwork.sheet.in.h:38
--#, fuzzy
--msgid "Firewall Service Module"
--msgstr "Router firewall"
--
--#: ../sheets/cisconetwork.sheet.in.h:39
--#, fuzzy
--msgid "Firewall horizontal"
--msgstr "Obróć poziomo"
-+#: ../sheets/ciscomisc.sheet.in.h:16
-+msgid "House"
-+msgstr "Dom"
- 
--#: ../sheets/cisconetwork.sheet.in.h:40
--#, fuzzy
--msgid "Firewall subdued"
--msgstr "Router firewall"
-+#: ../sheets/ciscomisc.sheet.in.h:17
-+msgid "House blue"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
-+#: ../sheets/ciscomisc.sheet.in.h:18
-+msgid "Telecommuter house"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:42
--#, fuzzy
--msgid "Generic Gateway"
--msgstr "Zwykła brama"
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:44
--#, fuzzy
--msgid "IOS Firewall"
--msgstr "Zapora sieciowa IOS"
-+#: ../sheets/ciscomisc.sheet.in.h:20
-+msgid "MDU"
-+msgstr "MDU"
- 
--#: ../sheets/cisconetwork.sheet.in.h:45
--#, fuzzy
--msgid "IOS SLB"
--msgstr "IP DSL"
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
-+#: ../sheets/ciscomisc.sheet.in.h:22
-+msgid "Man red"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:47
--#, fuzzy
--msgid "IP DSL Switch"
--msgstr "Switch ISDN"
-+#: ../sheets/ciscomisc.sheet.in.h:23
-+msgid "Man gold"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
-+#: ../sheets/ciscomisc.sheet.in.h:24
-+msgid "Man blue"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:49
-+#: ../sheets/ciscomisc.sheet.in.h:25
- #, fuzzy
--msgid "IP Transport Concentrator"
--msgstr "Koncentrator VPN"
-+msgid "Standing Man"
-+msgstr "Stojący człowiek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
--msgstr "Serwer rozgłoszeniowy IPTV"
-+#: ../sheets/ciscomisc.sheet.in.h:26
-+#, fuzzy
-+msgid "Standing woman"
-+msgstr "Stojący człowiek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
--msgstr "Menedżer zawartości IPTV"
-+#: ../sheets/ciscomisc.sheet.in.h:27
-+#, fuzzy
-+msgid "Woman"
-+msgstr "Mężczyzna/kobieta"
- 
--#: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr "LAN to LAN"
-+#: ../sheets/ciscomisc.sheet.in.h:28
-+msgid "Woman red"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
-+#: ../sheets/ciscomisc.sheet.in.h:29
-+msgid "Woman gold"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "ZarzÄ…dca lokalny"
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:55
-+#: ../sheets/ciscomisc.sheet.in.h:31
-+msgid "Running man"
-+msgstr "Biegnący człowiek"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:32
- #, fuzzy
--msgid "Location server"
--msgstr "Serwer komunikacyjny"
-+msgid "Running man subdued"
-+msgstr "Biegnący człowiek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
-+#: ../sheets/ciscomisc.sheet.in.h:33
-+msgid "Telecommuter"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:57
-+#: ../sheets/ciscomisc.sheet.in.h:34
- #, fuzzy
--msgid "MAS Gateway"
--msgstr "Brama MAS"
-+msgid "Running woman"
-+msgstr "Biegnący człowiek"
- 
--#: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
-+#: ../sheets/ciscomisc.sheet.in.h:35
-+#, fuzzy
-+msgid "CiscoWorks Man"
-+msgstr "Stacja robocza CiscoWorks"
- 
--#: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME 1100"
-+#: ../sheets/ciscomisc.sheet.in.h:36
-+msgid "PC Man left"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
-+#: ../sheets/ciscomisc.sheet.in.h:37
-+#, fuzzy
-+msgid "PC Man"
-+msgstr "Mężczyzna PC"
- 
--#: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
-+#: ../sheets/ciscomisc.sheet.in.h:38
-+#, fuzzy
-+msgid "Sitting Woman"
-+msgstr "SiedzÄ…ca kobieta"
- 
--#: ../sheets/cisconetwork.sheet.in.h:62
-+#: ../sheets/ciscomisc.sheet.in.h:39
- #, fuzzy
--msgid "NAT"
--msgstr "ATA"
-+msgid "Sitting Woman right"
-+msgstr "SiedzÄ…ca kobieta"
- 
--#: ../sheets/cisconetwork.sheet.in.h:63
-+#: ../sheets/ciscomisc.sheet.in.h:40
- #, fuzzy
--msgid "Network Management"
--msgstr "ZarzÄ…dzanie sieciÄ…"
-+msgid "Mac Woman"
-+msgstr "Kobieta Mac"
- 
--#: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Kształty sieciowe autorstwa Cisco"
-+#: ../sheets/ciscomisc.sheet.in.h:41
-+msgid "Androgynous Person"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
-+#: ../sheets/ciscomisc.sheet.in.h:44
-+msgid "Lock and Key"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
-+#: ../sheets/ciscomisc.sheet.in.h:45
-+msgid "Satellite dish"
- msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:67
--#, fuzzy
--msgid "Optical Amplifier"
--msgstr "Wzmacniacz optyczny"
-+#: ../sheets/ciscomisc.sheet.in.h:46
-+msgid "Satellite"
-+msgstr "Satelita"
- 
--#: ../sheets/cisconetwork.sheet.in.h:68
--#, fuzzy
--msgid "Optical Cross-Connect"
--msgstr "Złącze krzyżakowe"
-+#: ../sheets/ciscomisc.sheet.in.h:47
-+msgid "Antenna"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:69
--#, fuzzy
--msgid "Optical Fiber"
--msgstr "Energia świetlna"
-+#: ../sheets/ciscomisc.sheet.in.h:49
-+msgid "Car"
-+msgstr "Samochód"
- 
--#: ../sheets/cisconetwork.sheet.in.h:70
--#, fuzzy
--msgid "Optical Transport"
--msgstr "Transportowanie"
-+#: ../sheets/ciscomisc.sheet.in.h:50
-+msgid "Truck"
-+msgstr "Ciężarówka"
- 
--#: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
-+#: ../sheets/ciscomisc.sheet.in.h:51
-+msgid "Video Camera"
-+msgstr "Kamera wideo"
- 
--#: ../sheets/cisconetwork.sheet.in.h:72
-+#: ../sheets/ciscomisc.sheet.in.h:52
- #, fuzzy
--msgid "PIX Firewall"
--msgstr "Zapora sieciowa PIX"
-+msgid "Video Camera right"
-+msgstr "Kamera wideo"
- 
--#: ../sheets/cisconetwork.sheet.in.h:73
-+#: ../sheets/ciscomisc.sheet.in.h:54
-+msgid "Headphones"
-+msgstr "SÅ‚uchawki"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:1
- #, fuzzy
--msgid "PIX Firewall Left"
--msgstr "Zapora sieciowa PIX"
-+msgid "Cisco — Network"
-+msgstr "Cisco - sieć komputerowa"
- 
--#: ../sheets/cisconetwork.sheet.in.h:74
-+#: ../sheets/cisconetwork.sheet.in.h:2
-+msgid "Network shapes by Cisco"
-+msgstr "Kształty sieciowe autorstwa Cisco"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:3
-+msgid "Network Management"
-+msgstr "ZarzÄ…dzanie sieciÄ…"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:4
-+msgid "Detector"
-+msgstr "Detektor"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:5
- #, fuzzy
- msgid "Protocol Translator"
- msgstr "Tłumacz protokołów"
- 
--#: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
-+#: ../sheets/cisconetwork.sheet.in.h:6
-+msgid "IP"
-+msgstr "IP"
- 
--#: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr "Powielacz"
-+#: ../sheets/cisconetwork.sheet.in.h:7
-+msgid "IP Old-style"
-+msgstr ""
- 
--#: ../sheets/cisconetwork.sheet.in.h:77
--#, fuzzy
--msgid "SSL Terminator"
--msgstr "Terminal"
-+#: ../sheets/cisconetwork.sheet.in.h:8
-+msgid "NAT"
-+msgstr "NAT"
- 
--#: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr ""
-+#: ../sheets/cisconetwork.sheet.in.h:9
-+msgid "VIP"
-+msgstr "VIP"
- 
--#: ../sheets/cisconetwork.sheet.in.h:79
-+#: ../sheets/cisconetwork.sheet.in.h:10
- #, fuzzy
--msgid "Security appliance"
--msgstr "Aplikacja kliencka Sybase"
-+msgid "Terminal Server"
-+msgstr "Przerywanie terminala"
- 
--#: ../sheets/cisconetwork.sheet.in.h:80
--#, fuzzy
--msgid "Service Control"
--msgstr "Kontrola symetryczna"
--
--#: ../sheets/cisconetwork.sheet.in.h:81
-+#: ../sheets/cisconetwork.sheet.in.h:11
- #, fuzzy
--msgid "Storage Solution Engine"
--msgstr "Router zasobów"
-+msgid "Access Server"
-+msgstr "Serwer plików"
- 
--#: ../sheets/cisconetwork.sheet.in.h:82
-+#: ../sheets/cisconetwork.sheet.in.h:12
- msgid "System controller"
- msgstr "Kontroler systemu"
- 
--#: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "TV"
--
--#: ../sheets/cisconetwork.sheet.in.h:84
--#, fuzzy
--msgid "Terminal Server"
--msgstr "Przerywanie terminala"
--
--#: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "TokenRing"
--
--#: ../sheets/cisconetwork.sheet.in.h:86
--#, fuzzy
--msgid "TransPath"
--msgstr "Przesuwanie"
--
--#: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "UPS"
--
--#: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
--msgid "VN2900"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:90
--msgid "VN5900"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:92
--#, fuzzy
--msgid "VPN Concentrator"
--msgstr "Koncentrator VPN"
--
--#: ../sheets/cisconetwork.sheet.in.h:93
--#, fuzzy
--msgid "VPN Gateway"
--msgstr "Brama VPN"
--
--#: ../sheets/cisconetwork.sheet.in.h:94
--#, fuzzy
--msgid "WAN"
--msgstr "AND"
--
--#: ../sheets/cisconetwork.sheet.in.h:95
--#, fuzzy
--msgid "WDM"
--msgstr "ADM"
--
--#: ../sheets/cisconetwork.sheet.in.h:96
--#, fuzzy
--msgid "WLAN controller"
--msgstr "Kontroler systemu"
--
--#: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:98
--#, fuzzy
--msgid "Wireless Bridge"
--msgstr "Bezprzewodowy mostek"
--
--#: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr ""
-+#: ../sheets/cisconetwork.sheet.in.h:13
-+msgid "Directory Server"
-+msgstr "Serwer katalogowy"
- 
--#: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
--msgstr ""
-+#: ../sheets/cisconetwork.sheet.in.h:14
-+msgid "Firewall"
-+msgstr "Zapora sieciowa"
- 
--#: ../sheets/cisconetwork.sheet.in.h:101
-+#: ../sheets/cisconetwork.sheet.in.h:15
- #, fuzzy
--msgid "Wireless Transport"
--msgstr "Transport bezprzewodowy"
--
--#: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
-+msgid "Firewall subdued"
-+msgstr "Router firewall"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:2
-+#: ../sheets/cisconetwork.sheet.in.h:16
- #, fuzzy
--msgid "6705"
--msgstr "6701"
--
--#: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
--
--#: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
--
--#: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
--msgstr "Menedżer wywoływania"
-+msgid "Firewall horizontal"
-+msgstr "Obróć poziomo"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:8
-+#: ../sheets/cisconetwork.sheet.in.h:17
- #, fuzzy
--msgid "Cellular Phone"
--msgstr "Telefon komórkowy"
-+msgid "Firewall Service Module"
-+msgstr "Router firewall"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:9
-+#: ../sheets/cisconetwork.sheet.in.h:18
- #, fuzzy
--msgid "Cisco - Telephony"
--msgstr "Cisco - sieć komputerowa"
--
--#: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr "Przełącznica klasy 4/5"
-+msgid "IOS Firewall"
-+msgstr "Zapora sieciowa IOS"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:11
-+#: ../sheets/cisconetwork.sheet.in.h:19
- #, fuzzy
--msgid "End Office"
--msgstr "Czas zakończenia"
--
--#: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
--msgstr "Faks"
--
--#: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
--msgstr "Zwykła przełącznica programowa"
--
--#: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
--
--#: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
--msgstr "HootPhone"
--
--#: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "Router IAD"
--
--#: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
-+msgid "PIX Firewall"
-+msgstr "Zapora sieciowa PIX"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:20
-+#: ../sheets/cisconetwork.sheet.in.h:20
- #, fuzzy
--msgid "IP Phone"
--msgstr "Telefon IP"
-+msgid "PIX Firewall Left"
-+msgstr "Zapora sieciowa PIX"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "IP Softphone"
-+#: ../sheets/cisconetwork.sheet.in.h:21
-+msgid "Centri Firewall"
-+msgstr "Zapora sieciowa Centri"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:22
-+#: ../sheets/cisconetwork.sheet.in.h:23
- #, fuzzy
--msgid "IP Telephony Router"
--msgstr "Router telefonii IP"
--
--#: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
--
--#: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr ""
-+msgid "Security appliance"
-+msgstr "Aplikacja kliencka Sybase"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:25
--#, fuzzy
--msgid "MCU"
--msgstr "MUX"
-+#: ../sheets/cisconetwork.sheet.in.h:24
-+msgid "VPN Concentrator"
-+msgstr "Koncentrator VPN"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr ""
-+#: ../sheets/cisconetwork.sheet.in.h:25
-+msgid "VPN Gateway"
-+msgstr "Bramka VPN"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
--msgstr "Serwer MoH (muzyka na oczekiwaniu)"
-+#: ../sheets/cisconetwork.sheet.in.h:26
-+msgid "LAN to LAN"
-+msgstr "LAN to LAN"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:28
-+#: ../sheets/cisconetwork.sheet.in.h:27
- #, fuzzy
--msgid "Mobile Access IP Phone"
--msgstr "Telefon komórkowy"
-+msgid "SSL Terminator"
-+msgstr "Terminal"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:29
-+#: ../sheets/cisconetwork.sheet.in.h:28
- #, fuzzy
--msgid "Mobile Access Router"
--msgstr "Router głosowy"
--
--#: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "PBX"
-+msgid "IP DSL Switch"
-+msgstr "Switch ISDN"
- 
--#: ../sheets/ciscotelephony.sheet.in.h:32
--#, fuzzy
--msgid "PBX Switch"
--msgstr "Switch PBX"
--
--#: ../sheets/ciscotelephony.sheet.in.h:33
--#, fuzzy
--msgid "Pager"
--msgstr "Separatory stron"
--
--#: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Telefon"
--
--#: ../sheets/ciscotelephony.sheet.in.h:35
--#, fuzzy
--msgid "Phone 2"
--msgstr "Telefon"
--
--#: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:37
--#, fuzzy
--msgid "Phone Ethernet"
--msgstr "Ethernetowa szyna danych"
--
--#: ../sheets/ciscotelephony.sheet.in.h:38
--#, fuzzy
--msgid "Phone Feature"
--msgstr "Telefon/faks"
--
--#: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr "Telefon/faks"
--
--#: ../sheets/ciscotelephony.sheet.in.h:40
--#, fuzzy
--msgid "Radio Tower"
--msgstr "Wieża radiowa"
--
--#: ../sheets/ciscotelephony.sheet.in.h:41
--#, fuzzy
--msgid "SC2200 (Signalling Controller)"
--msgstr "SC2200 (kontroler sygnałowy)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:42
--msgid "SC2200/VSC3000 host"
--msgstr "Host SC2200/VSC3000"
--
--#: ../sheets/ciscotelephony.sheet.in.h:43
--#, fuzzy
--msgid "SIP Proxy Server"
--msgstr "Serwer pośredniczący SIP"
--
--#: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
--msgstr "STP"
--
--#: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr "Softphone"
--
--#: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr "Router TDM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:48
--#, fuzzy
--msgid "Telephony shapes by Cisco"
--msgstr "Kształty sieciowe autorstwa Cisco"
--
--#: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr "Wieża"
--
--#: ../sheets/ciscotelephony.sheet.in.h:50
--msgid "Unity Express"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
--msgstr "Wirtualny kontroler switchy (VSC 3000)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:53
--#, fuzzy
--msgid "Voice-Enabled ATM Switch"
--msgstr "Przełącznica głosowa ATM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:54
--#, fuzzy
--msgid "Voice-Enabled Access Server"
--msgstr "Serwer komunikacji głosowej"
--
--#: ../sheets/ciscotelephony.sheet.in.h:55
--#, fuzzy
--msgid "Voice-Enabled Router"
--msgstr "Router głosowy"
--
--#: ../sheets/ciscotelephony.sheet.in.h:56
--msgid "uMG series"
--msgstr ""
--
--#: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr "Napowietrzacz bÄ…belkowy"
--
--#: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr "Zabezpieczenie przed odpływem"
--
--#: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Zbiornik"
--
--#: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Nieruchoma pionowa podpora"
--
--#: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Inżynieria lądowa"
--
--#: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Komponenty inżynierii lądowej"
--
--#: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Pojemnik"
--
--#: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Zbiornik końcowego osadzania"
--
--#: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Konwerter częstotliwości"
--
--#: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Butla z gazem"
--
--#: ../sheets/civil.sheet.in.h:11
--msgid "Horizontal limiting line"
--msgstr "Pozioma linia ograniczajÄ…ca"
--
--#: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Pozioma podpora"
--
--#: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Pionowo ułożona strzałka"
--
--#: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Poziomo ułożona sprężarka (kompresor)"
--
--#: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Poziomo ułożona pompa"
--
--#: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Poziomo ułożony zawór"
--
--#: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Silnik"
--
--#: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Zbiornik wstępnej klaryfikacji"
--
--#: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Linia odniesienia"
--
--#: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Wirnik"
--
--#: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Ziemia"
--
--#: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "Pionowa linia ograniczajÄ…ca"
--
--#: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "Pionowa podpora"
--
--#: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "Pionowo ułożona strzałka"
--
--#: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "Pionowo ułożona sprężarka"
--
--#: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "Pionowo ułożony wirnik"
--
--#: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "Pionowo ułożona pompa"
--
--#: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "Pionowo ułożony zawór"
--
--#: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "Poziom wody"
--
--#: ../sheets/jigsaw.sheet.in.h:1
--msgid "Jigsaw"
--msgstr "Puzzle"
--
--#: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Puzzle - część_iiii"
--
--#: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Puzzle - część_iioo"
--
--#: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Puzzle - część_iioi"
--
--#: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Puzzle - część_iioo"
--
--#: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Puzzle - część_ioii"
--
--#: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Puzzle - część_ioio"
--
--#: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Puzzle - część_iooi"
--
--#: ../sheets/jigsaw.sheet.in.h:9
--msgid "Jigsaw - part_iooo"
--msgstr "Puzzle - część_iooo"
--
--#: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Puzzle - część_oiii"
--
--#: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Puzzle - część_oiio"
--
--#: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Puzzle - część_oioi"
--
--#: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Puzzle - część_oioo"
--
--#: ../sheets/jigsaw.sheet.in.h:14
--msgid "Jigsaw - part_ooii"
--msgstr "Puzzle - część_ooii"
--
--#: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Puzzle - część_ooio"
--
--#: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Puzzle - część_oooi"
--
--#: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Puzzle - część_oooo"
--
--#: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Elementy puzzli"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr ""
--
--#: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "Dyskietka 3 1/2 cala"
--
--#: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "Symbol przełącznicy ATM"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "Antena do transmisji bezprzewodowej"
--
--#: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "Komputer w obudowie typu Bigtower"
--
--#: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Komputer"
--
--#: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "Komputer w obudowie typu Desktop"
--
--#: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Tablica cyfrowa"
--
--#: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Ethernetowa szyna danych"
--
--#: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Zewnętrzny napęd DAT"
--
--#: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Router firewall"
--
--#: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "Laptop"
--
--#: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "Komputer w obudowie typu Miditower"
--
--#: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "Komputer w obudowie typu Minitower"
-+#: ../sheets/cisconetwork.sheet.in.h:29
-+msgid "DSLAM"
-+msgstr "DSLAM"
- 
--#: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Telefon komórkowy"
-+#: ../sheets/cisconetwork.sheet.in.h:30
-+msgid "Cable Modem"
-+msgstr "Modem kablowy"
- 
--#: ../sheets/network.sheet.in.h:16
--msgid "Mobile telephony base station"
-+#: ../sheets/cisconetwork.sheet.in.h:31
-+msgid "Wireless Connectivity"
- msgstr ""
- 
--#: ../sheets/network.sheet.in.h:17
-+#: ../sheets/cisconetwork.sheet.in.h:32
- #, fuzzy
--msgid "Mobile telephony cell"
--msgstr "Telefon komórkowy"
-+msgid "Wireless Transport"
-+msgstr "Transport bezprzewodowy"
- 
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Modularny system przełączania"
-+#: ../sheets/cisconetwork.sheet.in.h:33
-+msgid "AccessPoint"
-+msgstr "Punkt dostępowy"
- 
--#: ../sheets/network.sheet.in.h:20
--msgid "Network"
--msgstr "Sieć komputerowa"
-+#: ../sheets/cisconetwork.sheet.in.h:34
-+#, fuzzy
-+msgid "Wireless Bridge"
-+msgstr "Bezprzewodowy mostek"
- 
--#: ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Chmura sieciowa"
-+#: ../sheets/cisconetwork.sheet.in.h:35
-+#, fuzzy
-+msgid "Dual Mode AccessPoint"
-+msgstr "Punkt dostępowy"
- 
--#: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Obiekty do projektowania diagramów sieci komputerowych"
-+#: ../sheets/cisconetwork.sheet.in.h:36
-+msgid "Wi-Fi Tag"
-+msgstr ""
- 
--#: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Ploter"
-+#: ../sheets/cisconetwork.sheet.in.h:37
-+msgid "Wireless Location Appliance"
-+msgstr ""
- 
--#: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "Wtyczka ścienna typu RJ45"
-+#: ../sheets/cisconetwork.sheet.in.h:38
-+#, fuzzy
-+msgid "Location server"
-+msgstr "Serwer komunikacyjny"
- 
--#: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Symbol routera"
-+#: ../sheets/cisconetwork.sheet.in.h:39
-+msgid "Lightweight AP"
-+msgstr ""
- 
--#: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Pojedynczy modem"
-+#: ../sheets/cisconetwork.sheet.in.h:40
-+msgid "WLAN controller"
-+msgstr "Kontroler WLAN"
- 
--#: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Pojedyncza drukarka"
-+#: ../sheets/cisconetwork.sheet.in.h:41
-+msgid "BBFW"
-+msgstr "BBFW"
- 
--#: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Głośnik z wbudowanym wzmacniaczem"
-+#: ../sheets/cisconetwork.sheet.in.h:42
-+msgid "BBFW media"
-+msgstr "Nośnik BBFW"
- 
--#: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Głośnik bez wzmacniacza"
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+#, fuzzy
-+msgid "Channelized Pipe"
-+msgstr "Kanał"
- 
--#: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Koncentrator lub przełącznik"
-+#: ../sheets/cisconetwork.sheet.in.h:44
-+msgid "Concatenated Payload"
-+msgstr ""
- 
--#: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Zasób magazynowy, pamięć masowa (np. twardy dysk)"
-+#: ../sheets/cisconetwork.sheet.in.h:45
-+#, fuzzy
-+msgid "Optical Cross-Connect"
-+msgstr "Złącze krzyżakowe"
- 
--#: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Symbol przełącznika (switch)"
-+#: ../sheets/cisconetwork.sheet.in.h:46
-+#, fuzzy
-+msgid "Optical Transport"
-+msgstr "Transportowanie"
- 
--#: ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Telefon"
-+#: ../sheets/cisconetwork.sheet.in.h:47
-+#, fuzzy
-+msgid "Optical Fiber"
-+msgstr "Energia świetlna"
- 
--#: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "Stacja robocza UNIX"
-+#: ../sheets/cisconetwork.sheet.in.h:48
-+#, fuzzy
-+msgid "Optical Amplifier"
-+msgstr "Wzmacniacz optyczny"
- 
--#: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "Połączenie z siecią WAN"
-+#: ../sheets/cisconetwork.sheet.in.h:49
-+#, fuzzy
-+msgid "Digital Cross-Connect"
-+msgstr "Złącze krzyżakowe"
- 
--#: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "�ącze WAN"
-+#: ../sheets/cisconetwork.sheet.in.h:50
-+#, fuzzy
-+msgid "IP Transport Concentrator"
-+msgstr "Koncentrator VPN"
- 
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Wtyczka ścienna dla systemu okablowania scEAD"
-+#: ../sheets/cisconetwork.sheet.in.h:51
-+msgid "DWDM Filter"
-+msgstr "Filtr DWDM"
- 
--#: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Monitor stacji roboczej"
-+#: ../sheets/cisconetwork.sheet.in.h:52
-+msgid "WDM"
-+msgstr "WDM"
- 
--#: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "Dysk ZIP"
-+#: ../sheets/cisconetwork.sheet.in.h:53
-+msgid "15200"
-+msgstr "15200"
- 
--#: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr "Agent replikacji lub menedżer przesyłania logów"
-+#: ../sheets/cisconetwork.sheet.in.h:54
-+msgid "15800"
-+msgstr "15800"
- 
--#: ../sheets/sybase.sheet.in.h:2
--msgid "Objects to design Sybase replication domain diagrams with"
--msgstr "Obiekty do projektowania diagramów domenowych replikacji Sybase"
-+#: ../sheets/cisconetwork.sheet.in.h:55
-+msgid "ONS15104"
-+msgstr "ONS15104"
- 
--#: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Menedżer usług replikacji"
-+#: ../sheets/cisconetwork.sheet.in.h:56
-+msgid "10700"
-+msgstr "10700"
- 
--#: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Stałe urządzenie pamięci dyskowej"
-+#: ../sheets/cisconetwork.sheet.in.h:57
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
- 
--#: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+#: ../sheets/cisconetwork.sheet.in.h:58
-+msgid "ONS15540"
-+msgstr "ONS15540"
- 
--#: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Aplikacja kliencka Sybase"
-+#: ../sheets/cisconetwork.sheet.in.h:59
-+msgid "Automatic Protection Switching"
-+msgstr ""
- 
--#: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Serwer danych Sybase"
-+#: ../sheets/cisconetwork.sheet.in.h:60
-+msgid "RPS"
-+msgstr "RPS"
- 
--#: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Serwer replikacji Sybase"
-+#: ../sheets/cisconetwork.sheet.in.h:61
-+msgid "UPS"
-+msgstr "UPS"
- 
--#~ msgid "Dia"
--#~ msgstr "Dia"
-+#: ../sheets/cisconetwork.sheet.in.h:62
-+msgid "LongReach CPE"
-+msgstr ""
- 
--#, fuzzy
--#~ msgid "Copyright (C) 1998-2005 The Free Software Foundation and the authors"
--#~ msgstr "Copyright (C) 1998-2002 The Free Software Foundation i autorzy Dia"
-+#: ../sheets/cisconetwork.sheet.in.h:63
-+msgid "3X74 (floor) cluster controller"
-+msgstr "Kontroler klastra (dolny) 3X74"
- 
--#, fuzzy
--#~ msgid ""
--#~ "Dia is a program for drawing structured diagrams.\n"
--#~ "Please visit http://www.gnome.org/projects/dia for more information."
--#~ msgstr ""
--#~ "Dia jest programem służącym do rysowania diagramów strukturalnych.\n"
--#~ "Odwiedź http://www.lysator.liu.se/~alla/dia aby uzyskać więcej informacji."
-+#: ../sheets/cisconetwork.sheet.in.h:64
-+msgid "3174 (desktop) cluster controller"
-+msgstr "Kontroler klastra 3174 (desktop)"
- 
--#~ msgid "About Dia"
--#~ msgstr "Informacje o programie Dia"
-+#: ../sheets/cisconetwork.sheet.in.h:65
-+msgid "CSU/DSU"
-+msgstr "CSU/DSU"
- 
--#~ msgid "Dia v %s by Alexander Larsson"
--#~ msgstr "Dia, wersja %s. Autor: Alexander Larsson"
-+#: ../sheets/cisconetwork.sheet.in.h:66
-+msgid "WAN"
-+msgstr "WAN"
- 
--#~ msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
--#~ msgstr "Opiekunowie: Lars Clausen i Cyrille Chepelov"
-+#: ../sheets/cisconetwork.sheet.in.h:67
-+msgid "Cloud"
-+msgstr "Chmura"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:68
- #, fuzzy
--#~ msgid "Please visit http://www.gnome.org/projects/dia for more information"
--#~ msgstr ""
--#~ "Odwiedź http://www.lysator.liu.se/~alla/dia aby uzyskać więcej informacji"
--
--#~ msgid "Contributors:"
--#~ msgstr "Współautorzy:"
--
--#~ msgid "Diagram tree"
--#~ msgstr "Drzewo diagramu"
--
--#~ msgid "Modify object(s)"
--#~ msgstr "Modyfikacja"
--
--#~ msgid "Failed to save file '%s'.\n"
--#~ msgstr "Zapisywanie pliku \"%s\" nie powiodło się.\n"
-+msgid "Cloud Gold"
-+msgstr "Chmura"
- 
--#~ msgid "/File/_New"
--#~ msgstr "/Plik/_Nowy"
-+#: ../sheets/cisconetwork.sheet.in.h:69
-+#, fuzzy
-+msgid "Cloud White"
-+msgstr "Chmura"
- 
--#~ msgid "/File/_Open..."
--#~ msgstr "/Plik/_Otwórz..."
-+#: ../sheets/cisconetwork.sheet.in.h:70
-+#, fuzzy
-+msgid "Cloud Dark"
-+msgstr "Chmura"
- 
--#~ msgid "/File/---"
--#~ msgstr "/Plik/---"
-+#: ../sheets/cisconetwork.sheet.in.h:71
-+#, fuzzy
-+msgid "Distributed Director"
-+msgstr "ZarzÄ…dca dystrybucji"
- 
--#~ msgid "/File/_Diagram tree"
--#~ msgstr "/Plik/_Drzewo diagramu"
-+#: ../sheets/cisconetwork.sheet.in.h:72
-+msgid "LocalDirector"
-+msgstr "ZarzÄ…dca lokalny"
- 
--#~ msgid "/File/Sheets and Objects..."
--#~ msgstr "/Plik/Arkusze i obiekty..."
-+#: ../sheets/cisconetwork.sheet.in.h:73
-+msgid "IOS SLB"
-+msgstr "IOS SLB"
- 
--#~ msgid "/File/_Preferences..."
--#~ msgstr "/Plik/_Preferencje..."
-+#: ../sheets/cisconetwork.sheet.in.h:74
-+msgid "MUX"
-+msgstr "MUX"
- 
--#~ msgid "/File/P_lugins..."
--#~ msgstr "/Plik/_Wtyczki..."
-+#: ../sheets/cisconetwork.sheet.in.h:75
-+msgid "General Appliance"
-+msgstr ""
- 
--#~ msgid "/File/_Quit"
--#~ msgstr "/Plik/Za_kończ"
-+#. compatibility
-+#. <alias name="Cisco - PAD"/>
-+#: ../sheets/cisconetwork.sheet.in.h:78
-+msgid "PAD"
-+msgstr "PAD"
- 
--#~ msgid "/_Help"
--#~ msgstr "/Pomo_c"
-+#: ../sheets/cisconetwork.sheet.in.h:79
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "Koncentrator CDDI/FDDI"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:80
- #, fuzzy
--#~ msgid "/Help/_Contents"
--#~ msgstr "/Pomoc/_Informacje o..."
--
--#~ msgid "/Help/---"
--#~ msgstr "/Pomoc/---"
--
--#~ msgid "/Help/_About..."
--#~ msgstr "/Pomoc/_Informacje o..."
--
--#~ msgid "/File/_Save"
--#~ msgstr "/Plik/_Zapisz"
-+msgid "FDDI Ring"
-+msgstr "Pierścień FDDI"
- 
--#~ msgid "/File/Save _As..."
--#~ msgstr "/Plik/Z_apisz jako..."
-+#: ../sheets/cisconetwork.sheet.in.h:81
-+msgid "TokenRing"
-+msgstr "TokenRing"
- 
--#~ msgid "/File/_Export..."
--#~ msgstr "/Plik/Wy_eksportuj..."
-+#: ../sheets/cisconetwork.sheet.in.h:82
-+msgid "MAU"
-+msgstr "MAU"
- 
--#~ msgid "/File/Page Set_up..."
--#~ msgstr "/Plik/Ustawienia _strony..."
-+#: ../sheets/cisconetwork.sheet.in.h:83
-+msgid "Repeater"
-+msgstr "Powielacz"
- 
--#~ msgid "/File/_Print Diagram..."
--#~ msgstr "/Plik/Wy_drukuj diagram..."
-+#: ../sheets/cisconetwork.sheet.in.h:84
-+msgid "Bridge"
-+msgstr "Mostek"
- 
--#~ msgid "/File/_Close"
--#~ msgstr "/Plik/Za_mknij"
-+#: ../sheets/cisconetwork.sheet.in.h:85
-+msgid "Breakout box"
-+msgstr ""
- 
--#~ msgid "/_Edit"
--#~ msgstr "/_Edycja"
-+#: ../sheets/cisconetwork.sheet.in.h:86
-+msgid "STB (set top box)"
-+msgstr ""
- 
--#~ msgid "/Edit/_Undo"
--#~ msgstr "/Edycja/Cof_nij"
-+#: ../sheets/cisconetwork.sheet.in.h:87
-+msgid "TV"
-+msgstr "TV"
- 
--#~ msgid "/Edit/_Redo"
--#~ msgstr "/Edycja/P_onów"
-+#: ../sheets/cisconetwork.sheet.in.h:88
-+msgid "IPTV broadcast server"
-+msgstr "Serwer rozgłoszeniowy IPTV"
- 
--#~ msgid "/Edit/---"
--#~ msgstr "/Edycja/---"
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "IPTV content manager"
-+msgstr "Menedżer zawartości IPTV"
- 
--#~ msgid "/Edit/_Copy"
--#~ msgstr "/Edycja/S_kopiuj"
-+#: ../sheets/cisconetwork.sheet.in.h:90
-+msgid "VN2900"
-+msgstr "VN2900"
- 
--#~ msgid "/Edit/C_ut"
--#~ msgstr "/Edycja/_Wytnij"
-+#: ../sheets/cisconetwork.sheet.in.h:91
-+msgid "VN5902"
-+msgstr "VN5902"
- 
--#~ msgid "/Edit/_Paste"
--#~ msgstr "/Edycja/W_klej"
-+#: ../sheets/cisconetwork.sheet.in.h:92
-+msgid "VN5900"
-+msgstr "VN5900"
- 
--#~ msgid "/Edit/_Delete"
--#~ msgstr "/Edycja/_Usuń"
-+#: ../sheets/cisconetwork.sheet.in.h:93
-+msgid "Catalyst Access Gateway"
-+msgstr "Bramka dostępowa Catalyst"
- 
--#~ msgid "/Edit/Copy Text"
--#~ msgstr "/Edycja/Skopiuj tekst"
-+#: ../sheets/cisconetwork.sheet.in.h:94
-+#, fuzzy
-+msgid "Generic Gateway"
-+msgstr "Zwykła brama"
- 
--#~ msgid "/Edit/Cut Text"
--#~ msgstr "/Edycja/Wytnij tekst"
-+#: ../sheets/cisconetwork.sheet.in.h:95
-+msgid "TransPath"
-+msgstr "TransPath"
- 
--#~ msgid "/Edit/Paste _Text"
--#~ msgstr "/Edycja/Wklej _tekst"
-+#: ../sheets/cisconetwork.sheet.in.h:96
-+msgid "uBR910 Cable DSU"
-+msgstr ""
- 
--#~ msgid "/Diagram/_Properties..."
--#~ msgstr "/Diagram/_Właściwości..."
-+#: ../sheets/cisconetwork.sheet.in.h:97
-+#, fuzzy
-+msgid "Storage Solution Engine"
-+msgstr "Router zasobów"
- 
--#~ msgid "/Diagram/_Layers..."
--#~ msgstr "/Diagram/W_arstwy..."
-+#: ../sheets/cisconetwork.sheet.in.h:98
-+#, fuzzy
-+msgid "Content Engine (Cache Director)"
-+msgstr "Mechanizm zawartości (zarządca pamięci podręcznej)"
- 
--#~ msgid "/View/Zoom _In"
--#~ msgstr "/Widok/Po_większ"
-+#: ../sheets/cisconetwork.sheet.in.h:99
-+#, fuzzy
-+msgid "CDM Content Distribution Manager"
-+msgstr "Menedżer dystrybucji zawartości CDM"
- 
--#~ msgid "/View/Zoom _Out"
--#~ msgstr "/Widok/Po_mniejsz"
-+#: ../sheets/cisconetwork.sheet.in.h:100
-+#, fuzzy
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "Mechanizm przekształcania zawartości (CTE)"
- 
--#~ msgid "/View/_Zoom"
--#~ msgstr "/Widok/_Powiększenie"
-+#: ../sheets/cisconetwork.sheet.in.h:101
-+msgid "ME 1100"
-+msgstr "ME 1100"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:102
- #, fuzzy
--#~ msgid "/View/Zoom/1600%"
--#~ msgstr "/Widok/Powiększenie/100%"
-+msgid "MAS Gateway"
-+msgstr "Brama MAS"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:103
- #, fuzzy
--#~ msgid "/View/Zoom/800%"
--#~ msgstr "/Widok/Powiększenie/400%"
-+msgid "File Engine"
-+msgstr "Wypełniona elipsa"
- 
--#~ msgid "/View/Zoom/400%"
--#~ msgstr "/Widok/Powiększenie/400%"
-+#: ../sheets/cisconetwork.sheet.in.h:104
-+#, fuzzy
-+msgid "Service Control"
-+msgstr "Kontrola symetryczna"
- 
--#~ msgid "/View/Zoom/283%"
--#~ msgstr "/Widok/Powiększenie/283%"
-+#: ../sheets/ciscotelephony.sheet.in.h:1
-+#, fuzzy
-+msgid "Cisco — Telephony"
-+msgstr "Cisco - sieć komputerowa"
- 
--#~ msgid "/View/Zoom/200%"
--#~ msgstr "/Widok/Powiększenie/200%"
-+#: ../sheets/ciscotelephony.sheet.in.h:2
-+#, fuzzy
-+msgid "Telephony shapes by Cisco"
-+msgstr "Kształty sieciowe autorstwa Cisco"
- 
--#~ msgid "/View/Zoom/141%"
--#~ msgstr "/Widok/Powiększenie/141%"
-+#: ../sheets/ciscotelephony.sheet.in.h:3
-+msgid "Phone"
-+msgstr "Telefon"
- 
--#~ msgid "/View/Zoom/100%"
--#~ msgstr "/Widok/Powiększenie/100%"
-+#: ../sheets/ciscotelephony.sheet.in.h:4
-+msgid "Phone 2"
-+msgstr "Telefon 2"
- 
--#~ msgid "/View/Zoom/85%"
--#~ msgstr "/Widok/Powiększenie/85%"
-+#: ../sheets/ciscotelephony.sheet.in.h:5
-+msgid "Phone Ethernet"
-+msgstr "Telefon ethernetowy"
- 
--#~ msgid "/View/Zoom/70.7%"
--#~ msgstr "/Widok/Powiększenie/70.7%"
-+#: ../sheets/ciscotelephony.sheet.in.h:6
-+msgid "Phone Appliance"
-+msgstr ""
- 
--#~ msgid "/View/Zoom/50%"
--#~ msgstr "/Widok/Powiększenie/50%"
-+#: ../sheets/ciscotelephony.sheet.in.h:7
-+msgid "Phone Feature"
-+msgstr ""
- 
--#~ msgid "/View/Zoom/35.4%"
--#~ msgstr "/Widok/Powiększenie/35.4%"
-+#: ../sheets/ciscotelephony.sheet.in.h:8
-+msgid "Phone/Fax"
-+msgstr "Telefon/faks"
- 
--#~ msgid "/View/Zoom/25%"
--#~ msgstr "/Widok/Powiększenie/25%"
-+#: ../sheets/ciscotelephony.sheet.in.h:9
-+msgid "HootPhone"
-+msgstr "HootPhone"
- 
--#~ msgid "/View/---"
--#~ msgstr "/Widok/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:10
-+msgid "IP Phone"
-+msgstr "Telefon IP"
- 
--#~ msgid "/View/_AntiAliased"
--#~ msgstr "/Widok/_Wygładzanie"
-+#: ../sheets/ciscotelephony.sheet.in.h:11
-+msgid "IP Softphone"
-+msgstr "IP Softphone"
- 
--#~ msgid "/View/Show _Grid"
--#~ msgstr "/Widok/Wyświetlanie siatki"
-+#: ../sheets/ciscotelephony.sheet.in.h:12
-+msgid "Softphone"
-+msgstr "Softphone"
- 
--#~ msgid "/View/_Snap To Grid"
--#~ msgstr "/Widok/PrzyciÄ…ganie do siatki"
-+#: ../sheets/ciscotelephony.sheet.in.h:13
-+msgid "Cellular Phone"
-+msgstr "Telefon komórkowy"
- 
--#~ msgid "/View/Show _Rulers"
--#~ msgstr "/Widok/Wyświetlanie podziałki"
-+#: ../sheets/ciscotelephony.sheet.in.h:14
-+#, fuzzy
-+msgid "Mobile Access IP Phone"
-+msgstr "Telefon komórkowy"
- 
--#~ msgid "/View/Show _Connection Points"
--#~ msgstr "/Widok/Wyświetlanie punktów połączenia"
-+#: ../sheets/ciscotelephony.sheet.in.h:15
-+msgid "Pager"
-+msgstr "Pager"
- 
--#~ msgid "/View/New _View"
--#~ msgstr "/Widok/Nowy widok"
-+#: ../sheets/ciscotelephony.sheet.in.h:16
-+msgid "Fax"
-+msgstr "Faks"
- 
--#~ msgid "/View/Show _All"
--#~ msgstr "/Widok/Wyświetlaj wszystko"
-+#: ../sheets/ciscotelephony.sheet.in.h:17
-+msgid "Turret"
-+msgstr "Wieża"
- 
--#~ msgid "/View/Re_draw"
--#~ msgstr "/Widok/Ponowne przerysowanie"
-+#: ../sheets/ciscotelephony.sheet.in.h:18
-+msgid "Octel"
-+msgstr ""
- 
--#~ msgid "/_Objects"
--#~ msgstr "/_Obiekty"
-+#: ../sheets/ciscotelephony.sheet.in.h:19
-+msgid "Radio Tower"
-+msgstr "Wieża radiowa"
- 
--#~ msgid "/Objects/Send to _Back"
--#~ msgstr "/Obiekty/Przesuń na sam spód"
-+#: ../sheets/ciscotelephony.sheet.in.h:20
-+msgid "PBX"
-+msgstr "PBX"
- 
--#~ msgid "/Objects/Bring to _Front"
--#~ msgstr "/Obiekty/Przesuń na sam wierzch"
-+#: ../sheets/ciscotelephony.sheet.in.h:21
-+msgid "PBX Switch"
-+msgstr "Switch PBX"
- 
--#~ msgid "/Objects/Send Backwards"
--#~ msgstr "/Obiekty/Przesuń w tył"
-+#: ../sheets/ciscotelephony.sheet.in.h:22
-+msgid "Class 4/5 switch"
-+msgstr "Przełącznica klasy 4/5"
- 
--#~ msgid "/Objects/Bring Forwards"
--#~ msgstr "/Obiekty/Przesuń w przód"
-+#: ../sheets/ciscotelephony.sheet.in.h:23
-+msgid "SONET MUX"
-+msgstr ""
- 
--#~ msgid "/Objects/---"
--#~ msgstr "/Obiekty/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:24
-+msgid "ADM"
-+msgstr "ADM"
- 
--#~ msgid "/Objects/_Group"
--#~ msgstr "/Obiekty/Grupuj"
-+#: ../sheets/ciscotelephony.sheet.in.h:25
-+msgid "ITP"
-+msgstr "ITP"
- 
--#~ msgid "/Objects/_Ungroup"
--#~ msgstr "/Obiekty/Rozdziel"
-+#: ../sheets/ciscotelephony.sheet.in.h:26
-+msgid "ATA"
-+msgstr "ATA"
- 
--#~ msgid "/Objects/Align"
--#~ msgstr "/Obiekty/Wyrównanie"
-+#: ../sheets/ciscotelephony.sheet.in.h:27
-+#, fuzzy
-+msgid "SIP Proxy Server"
-+msgstr "Serwer pośredniczący SIP"
- 
--#~ msgid "/Objects/Align/Left"
--#~ msgstr "/Obiekty/Wyrównanie/Do lewej"
-+#: ../sheets/ciscotelephony.sheet.in.h:28
-+msgid "Gatekeeper"
-+msgstr ""
- 
--#~ msgid "/Objects/Align/Center"
--#~ msgstr "/Obiekty/Wyrównanie/Wyśrodkowanie"
-+#: ../sheets/ciscotelephony.sheet.in.h:29
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr ""
- 
--#~ msgid "/Objects/Align/Right"
--#~ msgstr "/Obiekty/Wyrównanie/Do prawej"
-+#: ../sheets/ciscotelephony.sheet.in.h:30
-+msgid "End Office"
-+msgstr ""
- 
--#~ msgid "/Objects/Align/---"
--#~ msgstr "/Obiekty/Wyrównanie/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:31
-+#, fuzzy
-+msgid "Voice-Enabled Access Server"
-+msgstr "Serwer komunikacji głosowej"
- 
--#~ msgid "/Objects/Align/Top"
--#~ msgstr "/Obiekty/Wyrównanie/Do góry"
-+#: ../sheets/ciscotelephony.sheet.in.h:32
-+#, fuzzy
-+msgid "Voice-Enabled Router"
-+msgstr "Router głosowy"
- 
--#~ msgid "/Objects/Align/Middle"
--#~ msgstr "/Obiekty/Wyrównanie/Do środka"
-+#: ../sheets/ciscotelephony.sheet.in.h:33
-+#, fuzzy
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Przełącznica głosowa ATM"
- 
--#~ msgid "/Objects/Align/Bottom"
--#~ msgstr "/Obiekty/Wyrównanie/Do dołu"
-+#: ../sheets/ciscotelephony.sheet.in.h:34
-+msgid "CallManager"
-+msgstr "Menedżer wywoływania"
- 
-+#: ../sheets/ciscotelephony.sheet.in.h:35
- #, fuzzy
--#~ msgid "/Objects/Align/Adjacent"
--#~ msgstr "/Obiekty/Wyrównanie pionowe/Przylegnięcie"
-+msgid "IP Telephony Router"
-+msgstr "Router telefonii IP"
- 
-+#: ../sheets/ciscotelephony.sheet.in.h:36
- #, fuzzy
--#~ msgid "/Objects/Align/Stacked"
--#~ msgstr "/Obiekty/Wyrównanie pionowe"
--
--#~ msgid "/Objects/_Properties..."
--#~ msgstr "/Obiekty/_Właściwości..."
-+msgid "Mobile Access Router"
-+msgstr "Router głosowy"
- 
--#~ msgid "/Select/All"
--#~ msgstr "/Zaznaczenie/Wszystko"
-+#: ../sheets/ciscotelephony.sheet.in.h:37
-+msgid "H.323"
-+msgstr "H.323"
- 
--#~ msgid "/Select/None"
--#~ msgstr "/Zaznaczenie/Brak"
-+#: ../sheets/ciscotelephony.sheet.in.h:38
-+msgid "STP"
-+msgstr "STP"
- 
--#~ msgid "/Select/Invert"
--#~ msgstr "/Zaznaczenie/Odwróć"
-+#: ../sheets/ciscotelephony.sheet.in.h:39
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
- 
--#~ msgid "/Select/---"
--#~ msgstr "/Zaznaczenie/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:40
-+msgid "Generic softswitch"
-+msgstr "Zwykła przełącznica programowa"
- 
--#~ msgid "/Select/Transitive"
--#~ msgstr "/Zaznaczenie/Przechodnie"
-+#: ../sheets/ciscotelephony.sheet.in.h:41
-+msgid "SC2200/VSC3000 host"
-+msgstr "Host SC2200/VSC3000"
- 
--#~ msgid "/Select/Connected"
--#~ msgstr "/Zaznaczenie/Połączone"
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Wirtualny kontroler switchy (VSC 3000)"
- 
--#~ msgid "/Select/Replace"
--#~ msgstr "/Zaznaczenie/ZastÄ…p"
-+#: ../sheets/ciscotelephony.sheet.in.h:43
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "SC2200 (kontroler sygnałowy)"
- 
--#~ msgid "/Select/Union"
--#~ msgstr "/Zaznaczenie/Zsumuj"
-+#: ../sheets/ciscotelephony.sheet.in.h:44
-+msgid "MoH server (Music on Hold)"
-+msgstr "Serwer MoH (muzyka na oczekiwaniu)"
- 
--#, fuzzy
--#~ msgid "/Select/Intersection"
--#~ msgstr "/Zaznaczenie/Przetnij"
-+#: ../sheets/ciscotelephony.sheet.in.h:45
-+msgid "TDM router"
-+msgstr "Router TDM"
- 
--#~ msgid "/Select/Remove"
--#~ msgstr "/Zaznaczenie/Usuń"
-+#: ../sheets/ciscotelephony.sheet.in.h:46
-+msgid "6701"
-+msgstr "6701"
- 
--#, fuzzy
--#~ msgid "/Select/Inverse"
--#~ msgstr "/Zaznaczenie/Odwróć"
-+#: ../sheets/ciscotelephony.sheet.in.h:47
-+msgid "6705"
-+msgstr "6705"
- 
--#~ msgid "/_Tools"
--#~ msgstr "/_Narzędzia"
-+#: ../sheets/ciscotelephony.sheet.in.h:48
-+msgid "6732"
-+msgstr "6732"
- 
--#~ msgid "/Tools/Modify"
--#~ msgstr "/Narzędzia/Modyfikacja"
-+#: ../sheets/ciscotelephony.sheet.in.h:49
-+msgid "IAD router"
-+msgstr "Router IAD"
- 
--#~ msgid "/Tools/Magnify"
--#~ msgstr "/Narzędzia/Powiększenie"
-+#: ../sheets/ciscotelephony.sheet.in.h:50
-+msgid "ICS"
-+msgstr "ICS"
- 
--#~ msgid "/Tools/Scroll"
--#~ msgstr "/Narzędzia/Przewijanie"
-+#: ../sheets/ciscotelephony.sheet.in.h:51
-+msgid "ICM"
-+msgstr "ICM"
- 
--#~ msgid "/Tools/Text"
--#~ msgstr "/Narzędzia/Tekst"
-+#: ../sheets/ciscotelephony.sheet.in.h:52
-+msgid "IntelliSwitch Stack"
-+msgstr ""
- 
--#~ msgid "/Tools/Box"
--#~ msgstr "/Narzędzia/Prostokąt"
-+#: ../sheets/ciscotelephony.sheet.in.h:53
-+msgid "Unity server"
-+msgstr ""
- 
--#~ msgid "/Tools/Ellipse"
--#~ msgstr "/Narzędzia/Elipsa"
-+#: ../sheets/ciscotelephony.sheet.in.h:54
-+msgid "Unity Express"
-+msgstr ""
- 
--#~ msgid "/Tools/Polygon"
--#~ msgstr "/Narzędzia/Wielokąt"
-+#: ../sheets/ciscotelephony.sheet.in.h:55
-+msgid "MCU"
-+msgstr "MCU"
- 
--#~ msgid "/Tools/Beziergon"
--#~ msgstr "/Narzędzia/Krzywa Beziera"
-+#: ../sheets/ciscotelephony.sheet.in.h:56
-+msgid "uMG series"
-+msgstr ""
- 
--#~ msgid "/Tools/---"
--#~ msgstr "/Narzędzia/---"
-+#: ../sheets/civil.sheet.in.h:1
-+msgid "Civil"
-+msgstr "Inżynieria lądowa"
- 
--#~ msgid "/Tools/Line"
--#~ msgstr "/Narzędzia/Linia"
-+#: ../sheets/civil.sheet.in.h:2
-+msgid "Civil Engineering Components"
-+msgstr "Komponenty inżynierii lądowej"
- 
--#~ msgid "/Tools/Arc"
--#~ msgstr "/Narzędzia/�uk"
-+#: ../sheets/civil.sheet.in.h:3
-+msgid "Vertical rest"
-+msgstr "Pionowa podpora"
- 
--#~ msgid "/Tools/Zigzagline"
--#~ msgstr "/Narzędzia/Linia prostopadle łamana"
-+#: ../sheets/civil.sheet.in.h:4
-+msgid "Horizontal rest"
-+msgstr "Pozioma podpora"
- 
--#~ msgid "/Tools/Polyline"
--#~ msgstr "/Narzędzia/Linia łamana"
-+#: ../sheets/civil.sheet.in.h:5
-+msgid "Bivalent vertical rest"
-+msgstr "Nieruchoma pionowa podpora"
- 
--#~ msgid "/Tools/Bezierline"
--#~ msgstr "/Narzędzia/Krzywa Beziera"
-+#: ../sheets/civil.sheet.in.h:6
-+msgid "Reference line"
-+msgstr "Linia odniesienia"
- 
--#~ msgid "/Tools/Image"
--#~ msgstr "/Narzędzia/Obraz"
-+#: ../sheets/civil.sheet.in.h:7
-+msgid "Water level"
-+msgstr "Poziom wody"
- 
--#~ msgid "/_Input Methods"
--#~ msgstr "/Metody wejśc_iowe"
-+#: ../sheets/civil.sheet.in.h:8
-+msgid "Soil"
-+msgstr "Ziemia"
- 
--#~ msgid "Diagram Menu"
--#~ msgstr "Menu diagramu"
-+#: ../sheets/civil.sheet.in.h:9
-+msgid "Horizontally aligned arrow"
-+msgstr "Pionowo ułożona strzałka"
- 
--#~ msgid ""
--#~ "Can't find menu entry '%s'!\n"
--#~ "This is probably a i18n problem (try LANG=C)."
--#~ msgstr ""
--#~ "Nie można znaleźć wpisu menu \"%s\"\n"
--#~ "To jest prawdopodobnie problem z i18n (spróbuj ustawić zmienną LANG=C)."
-+#: ../sheets/civil.sheet.in.h:10
-+msgid "Vertically aligned arrow"
-+msgstr "Pionowo ułożona strzałka"
- 
--#~ msgid "<Toolbox>/File/Plugins..."
--#~ msgstr "<Toolbox>/Plik/Wtyczki..."
-+#: ../sheets/civil.sheet.in.h:11
-+msgid "Horizontal limiting line"
-+msgstr "Pozioma linia ograniczajÄ…ca"
- 
--#~ msgid "<Toolbox>/File/Quit"
--#~ msgstr "<Toolbox>/Plik/Zakończ"
-+#: ../sheets/civil.sheet.in.h:12
-+msgid "Vertical limiting line"
-+msgstr "Pionowa linia ograniczajÄ…ca"
- 
--#, fuzzy
--#~ msgid "Macro Cell"
--#~ msgstr "Wywołanie makra"
-+#: ../sheets/civil.sheet.in.h:13
-+msgid "Horizontally aligned pump"
-+msgstr "Poziomo ułożona pompa"
- 
--#, fuzzy
--#~ msgid "Micro Cell"
--#~ msgstr "Wywołanie makra"
-+#: ../sheets/civil.sheet.in.h:14
-+msgid "Vertically aligned pump"
-+msgstr "Pionowo ułożona pompa"
- 
--#, fuzzy
--#~ msgid "Cell Type:"
--#~ msgstr "Typ:"
-+#: ../sheets/civil.sheet.in.h:15
-+msgid "Horizontally aligned compressor"
-+msgstr "Poziomo ułożona sprężarka (kompresor)"
- 
--#~ msgid "EML"
--#~ msgstr "EML"
-+#: ../sheets/civil.sheet.in.h:16
-+msgid "Vertically aligned compressor"
-+msgstr "Pionowo ułożona sprężarka"
- 
--#~ msgid "Editor for EML Static Structure Diagrams."
--#~ msgstr "Edytor Diagramów Struktur Statycznych EML"
-+#: ../sheets/civil.sheet.in.h:17
-+msgid "Vertically aligned valve"
-+msgstr "Pionowo ułożony zawór"
- 
--#~ msgid "Instantiation. One process create others"
--#~ msgstr "Instanizacja. Jeden proces tworzy inne"
-+#: ../sheets/civil.sheet.in.h:18
-+msgid "Horizontally aligned valve"
-+msgstr "Poziomo ułożony zawór"
- 
--#~ msgid "Interaction between processes."
--#~ msgstr "Interakcja (zależność) między procesami."
-+#: ../sheets/civil.sheet.in.h:19
-+msgid "Backflow preventer"
-+msgstr "Zabezpieczenie przed odpływem"
- 
--#~ msgid "3/3 distributor"
--#~ msgstr "Rozdzielnica 3/3"
-+#: ../sheets/civil.sheet.in.h:20
-+msgid "Motor"
-+msgstr "Silnik"
- 
--#~ msgid "5/3 distributor"
--#~ msgstr "Rozdzielnica 5/3"
-+#: ../sheets/civil.sheet.in.h:21
-+msgid "Gas bottle"
-+msgstr "Butla z gazem"
- 
--#~ msgid "Fill colour"
--#~ msgstr "Kolor wypełnienia"
-+#: ../sheets/civil.sheet.in.h:22
-+msgid "Frequency converter"
-+msgstr "Konwerter częstotliwości"
- 
--#~ msgid "Line colour"
--#~ msgstr "Kolor linii"
-+#: ../sheets/civil.sheet.in.h:23
-+msgid "Vertically aligned propeller"
-+msgstr "Pionowo ułożony wirnik"
- 
--#~ msgid "Text colour"
--#~ msgstr "Kolor tekstu"
-+#: ../sheets/civil.sheet.in.h:24
-+msgid "Aerator with bubbles"
-+msgstr "Napowietrzacz bÄ…belkowy"
- 
--#, fuzzy
--#~ msgid "Implmentation"
--#~ msgstr "Implementacja"
-+#: ../sheets/civil.sheet.in.h:25
-+msgid "Rotor"
-+msgstr "Wirnik"
- 
--#~ msgid "Workstation"
--#~ msgstr "Stacja robocza"
-+#: ../sheets/civil.sheet.in.h:26
-+msgid "Final-settling basin"
-+msgstr "Zbiornik końcowego osadzania"
- 
--#~ msgid "Cisco hub"
--#~ msgstr "Koncentrator Cisco"
-+#: ../sheets/civil.sheet.in.h:27
-+msgid "Preliminary clarification tank"
-+msgstr "Zbiornik wstępnej klaryfikacji"
- 
--#~ msgid "Content switch module"
--#~ msgstr "Moduł przełącznicy zawartości"
-+#: ../sheets/civil.sheet.in.h:28
-+msgid "Basin"
-+msgstr "Zbiornik"
- 
--#~ msgid "Voice switch"
--#~ msgstr "Przełącznica głosowa"
-+#: ../sheets/civil.sheet.in.h:29
-+msgid "Container"
-+msgstr "Pojemnik"
- 
--#~ msgid "Voice switch 2"
--#~ msgstr "Przełącznica głosowa 2"
-+#: ../sheets/jigsaw.sheet.in.h:1
-+msgid "Jigsaw"
-+msgstr "Puzzle"
- 
--#~ msgid "Dot-Dot"
--#~ msgstr "Kropka-kropka"
-+#: ../sheets/jigsaw.sheet.in.h:2
-+msgid "Pieces of a jigsaw"
-+msgstr "Elementy puzzli"
- 
--#~ msgid "6705 Integrated access device"
--#~ msgstr "Zintegrowane urządzenie dostępowe 6705"
-+#: ../sheets/jigsaw.sheet.in.h:3
-+#, fuzzy
-+msgid "Jigsaw — part_oioi"
-+msgstr "Puzzle - część_oioi"
- 
--#~ msgid "6732 Multiservice access platform"
--#~ msgstr "Platforma dostępu wielousługowego 6732"
-+#: ../sheets/jigsaw.sheet.in.h:4
-+#, fuzzy
-+msgid "Jigsaw — part_ioio"
-+msgstr "Puzzle - część_ioio"
- 
--#~ msgid "CDDI-FDDI"
--#~ msgstr "CDDI-FDDI"
-+#: ../sheets/jigsaw.sheet.in.h:5
-+#, fuzzy
-+msgid "Jigsaw — part_iiii"
-+msgstr "Puzzle - część_iiii"
- 
--#~ msgid "DPT"
--#~ msgstr "DPT"
-+#: ../sheets/jigsaw.sheet.in.h:6
-+#, fuzzy
-+msgid "Jigsaw — part_oooo"
-+msgstr "Puzzle - część_oooo"
- 
--#~ msgid "IPTC"
--#~ msgstr "IPTC"
-+#: ../sheets/jigsaw.sheet.in.h:7
-+#, fuzzy
-+msgid "Jigsaw — part_oooi"
-+msgstr "Puzzle - część_oooi"
- 
--#~ msgid "NetRanger intrusion detection system"
--#~ msgstr "System wykrywania włamań NetRanger"
-+#: ../sheets/jigsaw.sheet.in.h:8
-+#, fuzzy
-+msgid "Jigsaw — part_iooo"
-+msgstr "Puzzle - część_iooo"
- 
--#~ msgid "NetSonar security scanner"
--#~ msgstr "Skaner zabezpieczeń NetSonar"
-+#: ../sheets/jigsaw.sheet.in.h:9
-+#, fuzzy
-+msgid "Jigsaw — part_oioo"
-+msgstr "Puzzle - część_oioo"
- 
--#~ msgid "ONS15500 DWDM platform"
--#~ msgstr "Platforma DWDM ONS15500"
-+#: ../sheets/jigsaw.sheet.in.h:10
-+#, fuzzy
-+msgid "Jigsaw — part_ooio"
-+msgstr "Puzzle - część_ooio"
- 
--#~ msgid "PAD X.28"
--#~ msgstr "PAD X.28"
-+#: ../sheets/jigsaw.sheet.in.h:11
-+#, fuzzy
-+msgid "Jigsaw — part_iioo"
-+msgstr "Puzzle - część_iioo"
- 
--#~ msgid "7505"
--#~ msgstr "7505"
-+#: ../sheets/jigsaw.sheet.in.h:12
-+#, fuzzy
-+msgid "Jigsaw — part_oiio"
-+msgstr "Puzzle - część_oiio"
- 
--#~ msgid "ATM router"
--#~ msgstr "Router ATM"
-+#: ../sheets/jigsaw.sheet.in.h:13
-+#, fuzzy
-+msgid "Jigsaw — part_ooii"
-+msgstr "Puzzle - część_ooii"
- 
--#~ msgid "Cisco - Router"
--#~ msgstr "Cisco - router"
-+#: ../sheets/jigsaw.sheet.in.h:14
-+#, fuzzy
-+msgid "Jigsaw — part_iooi"
-+msgstr "Puzzle - część_iooi"
- 
--#~ msgid "Gigabit switch router (ATM tag)"
--#~ msgstr "Router przełączający Gigabit (znacznik ATM)"
-+#: ../sheets/jigsaw.sheet.in.h:15
-+#, fuzzy
-+msgid "Jigsaw — part_oiii"
-+msgstr "Puzzle - część_oiii"
- 
--#~ msgid "Router in building"
--#~ msgstr "Router w budynku"
-+#: ../sheets/jigsaw.sheet.in.h:16
-+#, fuzzy
-+msgid "Jigsaw — part_ioii"
-+msgstr "Puzzle - część_ioii"
- 
--#~ msgid "Router shapes by Cisco"
--#~ msgstr "Kształty routerów autorstwa Cisco"
-+#: ../sheets/jigsaw.sheet.in.h:17
-+#, fuzzy
-+msgid "Jigsaw — part_iioi"
-+msgstr "Puzzle - część_iioi"
- 
--#~ msgid "Workgroup 5000 multilayer switch"
--#~ msgstr "Switch wielowarstwowy Workgroup 5000"
-+#: ../sheets/jigsaw.sheet.in.h:18
-+#, fuzzy
-+msgid "Jigsaw — part_iiio"
-+msgstr "Puzzle - część_iioo"
- 
--#~ msgid "Workgroup 5002 multilayer switch"
--#~ msgstr "Switch wielowarstwowy Workgroup 5002"
-+#: ../sheets/network.sheet.in.h:2
-+msgid "Objects to design network diagrams with"
-+msgstr "Obiekty do projektowania diagramów sieci komputerowych"
- 
--#~ msgid "Workgroup 5500 multilayer switch"
--#~ msgstr "Switch wielowarstwowy Workgroup 5500"
-+#: ../sheets/network.sheet.in.h:3
-+msgid "Computer"
-+msgstr "Komputer"
- 
--#~ msgid "uBR910"
--#~ msgstr "uBR910"
-+#: ../sheets/network.sheet.in.h:5
-+msgid "Storage"
-+msgstr "Zasób magazynowy, pamięć masowa (np. twardy dysk)"
- 
--#~ msgid "Export to file format and exit.  Supported formats are: %s"
--#~ msgstr ""
--#~ "Eksportuje plik do podanego formatu i kończy. Obsługiwane formaty: %s"
-+#: ../sheets/network.sheet.in.h:6
-+msgid "Ethernet bus"
-+msgstr "Ethernetowa szyna danych"
- 
--#~ msgid "FORMAT"
--#~ msgstr "FORMAT"
-+#: ../sheets/network.sheet.in.h:7
-+msgid "Simple printer"
-+msgstr "Pojedyncza drukarka"
- 
--#~ msgid "Close"
--#~ msgstr "Zamknij"
-+#: ../sheets/network.sheet.in.h:8
-+msgid "WAN connection"
-+msgstr "Połączenie z siecią WAN"
- 
--#~ msgid "/Help/_Manual"
--#~ msgstr "/Pomoc/_Podręcznik"
-+#: ../sheets/network.sheet.in.h:9
-+msgid "WAN link"
-+msgstr "�ącze WAN"
- 
--#~ msgid "Error occured while printing"
--#~ msgstr "Podczas drukowania wystąpił błąd"
-+#: ../sheets/network.sheet.in.h:10
-+msgid "Stackable hub or switch"
-+msgstr "Koncentrator lub przełącznik"
- 
--#~ msgid "Could not open `%s' for writing"
--#~ msgstr "Nie można otworzyć \"%s\" do zapisu"
-+#: ../sheets/network.sheet.in.h:11
-+msgid "Modular switching system"
-+msgstr "Modularny system przełączania"
- 
--#~ msgid "Can't open history file for writing."
--#~ msgstr "Nie można otworzyć pliku historii do zapisu."
-+#: ../sheets/network.sheet.in.h:12
-+msgid "24 Port Patch Panel"
-+msgstr ""
- 
--#~ msgid "Diagram editor"
--#~ msgstr "Edytor diagramów"
-+#: ../sheets/network.sheet.in.h:13
-+msgid "RJ45 wall-plug"
-+msgstr "Wtyczka ścienna typu RJ45"
- 
--#~ msgid "Select font"
--#~ msgstr "Wybierz czcionkÄ™"
-+#: ../sheets/network.sheet.in.h:14
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Wtyczka ścienna dla systemu okablowania scEAD"
- 
--#~ msgid "Helvetica"
--#~ msgstr "Helvetica"
-+#: ../sheets/network.sheet.in.h:15
-+msgid "Simple modem"
-+msgstr "Pojedynczy modem"
- 
--#~ msgid "GdkPixbuf bitmap"
--#~ msgstr "bitmapa GdkPixbuf"
-+#: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antena do transmisji bezprzewodowej"
- 
--#~ msgid "Unexpected SVG path element"
--#~ msgstr "Nieoczekiwany element ścieżki SVG"
-+#: ../sheets/network.sheet.in.h:17
-+msgid "Mobile telephony base station"
-+msgstr ""
- 
--#~ msgid "Courier"
--#~ msgstr "Courier"
-+#: ../sheets/network.sheet.in.h:19
-+#, fuzzy
-+msgid "Mobile telephony cell"
-+msgstr "Telefon komórkowy"
- 
--#~ msgid "Could not find SVG namespace."
--#~ msgstr "Nie można odnaleźć przestrzeni nazw SVG."
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Symbol routera"
- 
--#~ msgid "%s error: can specify only one of -f or -o."
--#~ msgstr "Błąd %s: można wybrać tylko jedną z opcji -r lub -o."
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Symbol przełącznika (switch)"
- 
--#~ msgid "No object menu"
--#~ msgstr "Brak menu obiektu"
-+#: ../sheets/network.sheet.in.h:22
-+msgid "ATM switch symbol"
-+msgstr "Symbol przełącznicy ATM"
- 
--#~ msgid "Show diagram tree"
--#~ msgstr "Wyświetla drzewo diagramu"
-+#: ../sheets/network.sheet.in.h:23
-+msgid "Firewall router"
-+msgstr "Router firewall"
- 
--#~ msgid "Modify sheets and their objects"
--#~ msgstr "Modyfikuje arkusze oraz ich obiekty"
-+#: ../sheets/network.sheet.in.h:24
-+msgid "Workstation monitor"
-+msgstr "Monitor stacji roboczej"
- 
--#~ msgid "_Print Diagram..."
--#~ msgstr "Wy_drukuj diagram..."
-+#: ../sheets/network.sheet.in.h:25
-+msgid "UNIX workstation"
-+msgstr "Stacja robocza UNIX"
- 
--#~ msgid "Zoom _In"
--#~ msgstr "Po_większ"
-+#: ../sheets/network.sheet.in.h:26
-+msgid "Desktop PC"
-+msgstr "Komputer w obudowie typu Desktop"
- 
--#~ msgid "Zoom in 50%"
--#~ msgstr "Powiększ o 50%"
-+#: ../sheets/network.sheet.in.h:27
-+msgid "Laptop PC"
-+msgstr "Laptop"
- 
--#~ msgid "Zoom _Out"
--#~ msgstr "Po_mniejsz"
-+#: ../sheets/network.sheet.in.h:28
-+msgid "Bigtower PC"
-+msgstr "Komputer w obudowie typu Bigtower"
- 
--#~ msgid "Zoom out 50%"
--#~ msgstr "Pomniejsz o 50%"
-+#: ../sheets/network.sheet.in.h:29
-+msgid "Miditower PC"
-+msgstr "Komputer w obudowie typu Miditower"
- 
--#~ msgid "Show _All"
--#~ msgstr "_Wyświetl wszystko"
-+#: ../sheets/network.sheet.in.h:30
-+msgid "Minitower PC"
-+msgstr "Komputer w obudowie typu Minitower"
- 
--#~ msgid "Redraw"
--#~ msgstr "Przerysuj"
-+#: ../sheets/network.sheet.in.h:31
-+msgid "Speaker with integrated amplifier"
-+msgstr "Głośnik z wbudowanym wzmacniaczem"
- 
--#~ msgid "Equal Distance"
--#~ msgstr "Jednakowa odległość"
-+#: ../sheets/network.sheet.in.h:32
-+msgid "Speaker without amplifier"
-+msgstr "Głośnik bez wzmacniacza"
- 
--#~ msgid "Align _Horizontal"
--#~ msgstr "Wyrównanie po_ziome"
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "Dyskietka 3 1/2 cala"
- 
--#~ msgid "Align _Vertical"
--#~ msgstr "Wyrównanie pio_nowe"
-+#: ../sheets/network.sheet.in.h:34
-+msgid "ZIP disk"
-+msgstr "Dysk ZIP"
- 
--#~ msgid "/View/Diagram Properties..."
--#~ msgstr "/Widok/Właściwości diagramu..."
-+#: ../sheets/network.sheet.in.h:35
-+msgid "External DAT drive"
-+msgstr "Zewnętrzny napęd DAT"
- 
--#~ msgid "/Objects/Align Horizontal/---"
--#~ msgstr "/Obiekty/Wyrównanie poziome/---"
-+#: ../sheets/network.sheet.in.h:36
-+msgid "Mobile phone"
-+msgstr "Telefon komórkowy"
- 
--#~ msgid "/Objects/Align Horizontal/Equal Distance"
--#~ msgstr "/Obiekty/Wyrównanie poziome/Jednakowa odległość"
-+#: ../sheets/network.sheet.in.h:38
-+msgid "Plotter"
-+msgstr "Ploter"
- 
--#~ msgid "/Objects/Align Horizontal/Adjacent"
--#~ msgstr "/Obiekty/Wyrównanie poziome/Przylegnięcie"
-+#: ../sheets/network.sheet.in.h:39
-+msgid "Digitizing board"
-+msgstr "Tablica cyfrowa"
- 
--#~ msgid "/Objects/Align Vertical/---"
--#~ msgstr "/Obiekty/Wyrównanie pionowe/---"
-+#: ../sheets/sybase.sheet.in.h:1
-+msgid "Sybase"
-+msgstr "Sybase"
- 
--#~ msgid "/Objects/Align Vertical/Equal Distance"
--#~ msgstr "/Obiekty/Wyrównanie pionowe/Jednakowa odległość"
-+#: ../sheets/sybase.sheet.in.h:2
-+msgid "Objects to design Sybase replication domain diagrams with"
-+msgstr "Obiekty do projektowania diagramów domenowych replikacji Sybase"
- 
--#~ msgid "/_Dialogs"
--#~ msgstr "/Okna _dialogowe"
-+#: ../sheets/sybase.sheet.in.h:3
-+msgid "Sybase dataserver"
-+msgstr "Serwer danych Sybase"
- 
--#~ msgid "This Dia version is compiled without libart/text support."
--#~ msgstr ""
--#~ "To jest wersja Dia skompilowana bez obsługi napisów z biblioteki libart."
-+#: ../sheets/sybase.sheet.in.h:4
-+msgid "Sybase replication server"
-+msgstr "Serwer replikacji Sybase"
- 
--#~ msgid "Length: "
--#~ msgstr "Długość:"
-+#: ../sheets/sybase.sheet.in.h:5
-+msgid "Log transfer manager or rep agent"
-+msgstr "Agent replikacji lub menedżer przesyłania logów"
- 
--#~ msgid "Width: "
--#~ msgstr "Szerokość:"
-+#: ../sheets/sybase.sheet.in.h:6
-+msgid "Stable storage device"
-+msgstr "Stałe urządzenie pamięci dyskowej"
- 
--#~ msgid "Delete"
--#~ msgstr "Usuń"
-+#: ../sheets/sybase.sheet.in.h:7
-+msgid "Sybase client application"
-+msgstr "Aplikacja kliencka Sybase"
- 
--#~ msgid "Relay"
--#~ msgstr "Przekaźnik"
-+#: ../sheets/sybase.sheet.in.h:8
-+msgid "Replication server manager"
-+msgstr "Menedżer usług replikacji"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0005-Updated-German-translation.patch b/graphics/dia/patches/0005-Updated-German-translation.patch
deleted file mode 100644
index 8f23fe24ce..0000000000
--- a/graphics/dia/patches/0005-Updated-German-translation.patch
+++ /dev/null
@@ -1,9224 +0,0 @@
-From 0e41082f846ddfc8b2cf5a73dc8008989a949bcf Mon Sep 17 00:00:00 2001
-From: Christian Kirbach <Christian.Kirbach@googlemail.com>
-Date: Mon, 11 Jun 2012 22:27:00 +0200
-Subject: [PATCH 05/24] Updated German translation
-
----
- po/de.po | 5438 +++++++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 2858 insertions(+), 2580 deletions(-)
-
-diff --git a/po/de.po b/po/de.po
-index da18fd7..4af671e 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -11,15 +11,14 @@
- # Jens Seidel <jseidel@cvs.gnome.org>, 2006.
- # Hans Breuer <hans@breuer.org>, 2007, 2009.
- # Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
--# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2010, 2011.
-+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2010, 2011, 2012.
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: dia-0-97\n"
--"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
--"product=dia&keywords=I18N+L10N&component=general\n"
--"POT-Creation-Date: 2011-05-29 08:48+0000\n"
--"PO-Revision-Date: 2011-05-29 21:28+0200\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dia&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2012-05-20 16:14+0000\n"
-+"PO-Revision-Date: 2012-06-11 22:26+0100\n"
- "Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
- "Language-Team: Deutsch <gnome-de@gnome.org>\n"
- "MIME-Version: 1.0\n"
-@@ -116,12 +115,8 @@ msgid "WxH"
- msgstr "BxH"
- 
- #: ../app/app_procs.c:726
--msgid ""
--"Show only specified layers (e.g. when exporting). Can be either the layer "
--"name or a range of layer numbers (X-Y)"
--msgstr ""
--"Nur angegebene Ebenen anzeigen (z.B. für den Export). Dies kann entweder der "
--"Ebenenname oder ein Bereich von Ebenennummern (X-Y) sein."
-+msgid "Show only specified layers (e.g. when exporting). Can be either the layer name or a range of layer numbers (X-Y)"
-+msgstr "Nur angegebene Ebenen anzeigen (z.B. für den Export). Dies kann entweder der Ebenenname oder ein Bereich von Ebenennummern (X-Y) sein."
- 
- #: ../app/app_procs.c:727
- msgid "LAYER,LAYER,..."
-@@ -147,7 +142,8 @@ msgstr "Fehlermeldungen an stderr schicken, statt Dialoge anzuzeigen"
- msgid "Directory containing input files"
- msgstr "Ordner, der Eingabedateien enthält"
- 
--#: ../app/app_procs.c:737 ../app/app_procs.c:739
-+#: ../app/app_procs.c:737
-+#: ../app/app_procs.c:739
- msgid "DIRECTORY"
- msgstr "ORDNER"
- 
-@@ -202,20 +198,13 @@ msgid "Dia version %s\n"
- msgstr "Dia-Version %s\n"
- 
- #: ../app/app_procs.c:921
--msgid ""
--"Couldn't find standard objects when looking for object-libs; exiting...\n"
--msgstr ""
--"Standardobjekte wurden bei der Suche nach Objektbibliotheken nicht gefunden. "
--"Abbruch...\n"
-+msgid "Couldn't find standard objects when looking for object-libs; exiting...\n"
-+msgstr "Standardobjekte wurden bei der Suche nach Objektbibliotheken nicht gefunden. Abbruch...\n"
- 
- #: ../app/app_procs.c:923
- #, c-format
--msgid ""
--"Couldn't find standard objects when looking for object-libs in '%s'; "
--"exiting...\n"
--msgstr ""
--"Standardobjekte wurden bei der Suche nach Objektbibliotheken  in »%s« nicht "
--"gefunden. Abbruch …\n"
-+msgid "Couldn't find standard objects when looking for object-libs in '%s'; exiting...\n"
-+msgstr "Standardobjekte wurden bei der Suche nach Objektbibliotheken  in »%s« nicht gefunden. Abbruch …\n"
- 
- #: ../app/app_procs.c:990
- msgid "Diagram1.dia"
-@@ -240,9 +229,7 @@ msgid "Quitting without saving modified diagrams"
- msgstr "Beenden und Änderungen verwerfen"
- 
- #: ../app/app_procs.c:1106
--msgid ""
--"Modified diagrams exist. Are you sure you want to quit Dia without saving "
--"them?"
-+msgid "Modified diagrams exist. Are you sure you want to quit Dia without saving them?"
- msgstr ""
- "Es sind noch nicht gespeicherte Diagramme vorhanden.\n"
- "Wollen Sie Dia beenden, ohne diese zu speichern?"
-@@ -251,18 +238,14 @@ msgstr ""
- msgid "Quit Dia"
- msgstr "Dia beenden"
- 
--#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
-+#: ../app/app_procs.c:1179
-+#: ../app/app_procs.c:1186
- msgid "Could not create per-user Dia config directory"
- msgstr "Der Benutzer-Konfigurationsordner konnte nicht erstellt werden"
- 
- #: ../app/app_procs.c:1189
--msgid ""
--"Could not create per-user Dia config directory. Please make sure that the "
--"environment variable HOME points to an existing directory."
--msgstr ""
--"Es konnte kein Ordner für den aktuellen Benutzer angelegt werden. Bitte "
--"stellen Sie sicher, dass die HOME-Variable auf einen existierenden Ordner "
--"zeigt."
-+msgid "Could not create per-user Dia config directory. Please make sure that the environment variable HOME points to an existing directory."
-+msgstr "Es konnte kein Ordner für den aktuellen Benutzer angelegt werden. Bitte stellen Sie sicher, dass die HOME-Variable auf einen existierenden Ordner zeigt."
- 
- #: ../app/app_procs.c:1212
- msgid "Objects and filters internal to dia"
-@@ -322,11 +305,13 @@ msgstr ""
- "Es existieren automatisch gespeicherte Dateien.\n"
- "Bitte wählen Sie diejenige aus, die Sie wiederherstellen möchten."
- 
--#: ../app/color_area.c:317 ../app/color_area.c:360
-+#: ../app/color_area.c:317
-+#: ../app/color_area.c:360
- msgid "Select foreground color"
- msgstr "Wählen Sie eine Vordergrundfarbe"
- 
--#: ../app/color_area.c:318 ../app/color_area.c:361
-+#: ../app/color_area.c:318
-+#: ../app/color_area.c:361
- msgid "Select background color"
- msgstr "Wählen Sie eine Hintergrundfarbe"
- 
-@@ -339,15 +324,16 @@ msgstr "Kein Plugin zum Drucken gefunden!"
- msgid "Diagram%d.dia"
- msgstr "Diagramm%d.dia"
- 
--#: ../app/commands.c:343
-+#: ../app/commands.c:344
- msgid "No existing object to paste.\n"
- msgstr "Kein existierendes Objekt zum Einfügen.\n"
- 
--#: ../app/commands.c:646 ../app/commands.c:684
-+#: ../app/commands.c:653
-+#: ../app/commands.c:691
- msgid "Could not find help directory"
- msgstr "Hilfeordner konnte nicht gefunden werden"
- 
--#: ../app/commands.c:653
-+#: ../app/commands.c:660
- #, c-format
- msgid ""
- "Could not open help directory:\n"
-@@ -356,7 +342,7 @@ msgstr ""
- "Hilfeordner konnte nicht geöffnet werden:\n"
- "%s"
- 
--#: ../app/commands.c:720
-+#: ../app/commands.c:727
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
- msgstr ""
- "Karsten Weiss <knweiss@gmx.de>\n"
-@@ -371,7 +357,7 @@ msgstr ""
- "Hans Breuer <hans@breuer.org>\n"
- "Mario Blättermann <mariobl@gnome.org>"
- 
--#: ../app/commands.c:722
-+#: ../app/commands.c:729
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -398,11 +384,10 @@ msgstr ""
- "Details finden Sie in der GNU General Public License.\n"
- "\n"
- "Sie sollten eine Kopie der GNU General Public License zusammen mit Dia\n"
--"erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, "
--"Inc.,\n"
-+"erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc.,\n"
- "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- 
--#: ../app/commands.c:745
-+#: ../app/commands.c:752
- msgid "A program for drawing structured diagrams."
- msgstr "Eine Anwendung zum Zeichnen von strukturierten Diagrammen."
- 
-@@ -418,22 +403,16 @@ msgstr "Sie sind dabei ein Diagramm mit %d Seiten zu exportieren."
- 
- #: ../app/confirm.c:73
- #, c-format
--msgid ""
--"You are about to export a diagram which may require %s of memory.(%d pages)."
--msgstr ""
--"Sie sind dabei ein Diagramm zu exportieren, dass evtl. %s Speicher braucht (%"
--"d Seiten)."
-+msgid "You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgstr "Sie sind dabei ein Diagramm zu exportieren, dass evtl. %s Speicher braucht (%d Seiten)."
- 
- #: ../app/confirm.c:81
- msgid ""
--"You can adjust the size of the diagram by changing the 'Scaling' in the "
--"'Page Setup' dialog.\n"
--"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
--"the intended bounds."
-+"You can adjust the size of the diagram by changing the 'Scaling' in the 'Page Setup' dialog.\n"
-+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into the intended bounds."
- msgstr ""
- "Die Diagrammgröße lässt sich unter Datei/Seiteneinstellungen anpassen.\n"
--"Alternativ können Sie auch die Diagrammgröße automatisch an die gewünschte "
--"Seitenzahl koppeln."
-+"Alternativ können Sie auch die Diagrammgröße automatisch an die gewünschte Seitenzahl koppeln."
- 
- #: ../app/confirm.c:85
- msgid "Confirm Diagram Size"
-@@ -444,7 +423,8 @@ msgstr "Bestätigung der Diagrammgröße"
- msgid "'%s' creation failed"
- msgstr "'%s' Erzeugung gescheitert"
- 
--#: ../app/defaults.c:43 ../app/defaults.c:150
-+#: ../app/defaults.c:43
-+#: ../app/defaults.c:150
- msgid "Object defaults"
- msgstr "Objekt-Voreinstellungen"
- 
-@@ -481,7 +461,8 @@ msgid "Visible spacing"
- msgstr "Sichtbarer Abstand"
- 
- #. Hexes!
--#: ../app/dia-props.c:177 ../app/preferences.c:242
-+#: ../app/dia-props.c:177
-+#: ../app/preferences.c:242
- msgid "Hex grid"
- msgstr "Sechseckgitter"
- 
-@@ -493,11 +474,13 @@ msgstr "Größe des Sechseckgitters"
- msgid "Grid"
- msgstr "Gitter"
- 
--#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
-+#: ../app/dia-props.c:209
-+#: ../lib/diagramdata.c:112
- msgid "Background"
- msgstr "Hintergrund"
- 
--#: ../app/dia-props.c:220 ../app/preferences.c:122
-+#: ../app/dia-props.c:220
-+#: ../app/preferences.c:122
- msgid "Grid Lines"
- msgstr "Gitterlinien"
- 
-@@ -540,7 +523,9 @@ msgstr "Y-Position des Kind-Widgets"
- msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
- msgstr "Dateiname »%s« konnte nicht in UTF-8 konvertiert werden: %s\n"
- 
--#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
-+#: ../app/diagram.c:225
-+#: ../lib/message.c:90
-+#: ../lib/message.c:293
- msgid "Error"
- msgstr "Fehler"
- 
-@@ -549,12 +534,8 @@ msgid "Trying to group with no selected objects."
- msgstr "Gruppierung ohne ausgewählte Objekte wird versucht."
- 
- #: ../app/diagram.c:1219
--msgid ""
--"You cannot group objects that belong to different groups or have different "
--"parents"
--msgstr ""
--"Sie können keine Objekte gruppieren, die zu verschiedenen Gruppen gehören "
--"oder verschiedene Eltern-Objekte haben."
-+msgid "You cannot group objects that belong to different groups or have different parents"
-+msgstr "Sie können keine Objekte gruppieren, die zu verschiedenen Gruppen gehören oder verschiedene Eltern-Objekte haben."
- 
- #: ../app/diagram_tree_menu.c:47
- msgid "/_Sort objects"
-@@ -624,7 +605,8 @@ msgstr "/Diagramme sortieren/Vorgabe/nach _Namen"
- msgid "/Sort diagrams/Default/as _inserted"
- msgstr "/Diagramme sortieren/Vorgabe/wie _eingefügt"
- 
--#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
-+#: ../app/diagram_tree_menu.c:84
-+#: ../app/diagram_tree_menu.c:95
- msgid "/_Locate"
- msgstr "/_Auffinden"
- 
-@@ -636,7 +618,8 @@ msgstr "/_Eigenschaften"
- msgid "/_Hide this type"
- msgstr "/Diesen Typ _verbergen"
- 
--#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
-+#: ../app/diagram_tree_window.c:80
-+#: ../app/preferences.c:123
- msgid "Diagram Tree"
- msgstr "Diagrammbaum"
- 
-@@ -693,11 +676,13 @@ msgstr "von"
- msgid "%0.3gcm x %0.3gcm"
- msgstr "%0.3gcm x %0.3gcm"
- 
--#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
-+#: ../app/diapagelayout.c:845
-+#: ../app/pagesetup.c:76
- msgid "Page Setup"
- msgstr "Seiteneinstellungen"
- 
--#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
-+#: ../app/disp_callbacks.c:95
-+#: ../app/properties-dialog.c:157
- msgid ""
- "This object doesn't support Undo/Redo.\n"
- "Undo information erased."
-@@ -713,7 +698,7 @@ msgstr "Eigenschaften …"
- msgid "Selection"
- msgstr "Auswahl"
- 
--#: ../app/disp_callbacks.c:1074
-+#: ../app/disp_callbacks.c:1075
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -788,12 +773,18 @@ msgid "Save"
- msgstr "Speichern"
- 
- #. *** board of value **************
--#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
--#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
--#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
--#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
--#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
--#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-+#: ../app/exit_dialog.c:123
-+#: ../app/plugin-manager.c:262
-+#: ../objects/Database/table.c:138
-+#: ../objects/Database/table.c:181
-+#: ../objects/SISSI/sissi_dialog.c:734
-+#: ../objects/UML/association.c:234
-+#: ../objects/UML/class.c:144
-+#: ../objects/UML/large_package.c:139
-+#: ../objects/UML/umlattribute.c:37
-+#: ../objects/UML/umlformalparameter.c:35
-+#: ../objects/UML/umloperation.c:62
-+#: ../objects/UML/umlparameter.c:43
- msgid "Name"
- msgstr "Name"
- 
-@@ -813,12 +804,16 @@ msgstr "Nichts auswählen"
- msgid "Nothing selected for saving.  Would you like to try again?"
- msgstr "Nichts zum Speichern ausgewählt. Noch einmal versuchen?"
- 
--#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
--#: ../app/filedlg.c:746 ../lib/widgets.c:1488
-+#: ../app/filedlg.c:144
-+#: ../app/filedlg.c:152
-+#: ../app/filedlg.c:168
-+#: ../app/filedlg.c:746
-+#: ../lib/widgets.c:1488
- msgid "Supported Formats"
- msgstr "Unterstützte Formate"
- 
--#: ../app/filedlg.c:192 ../app/filedlg.c:604
-+#: ../app/filedlg.c:192
-+#: ../app/filedlg.c:604
- msgid "By extension"
- msgstr "Nach Erweiterung"
- 
-@@ -830,15 +825,19 @@ msgstr "Diagramm öffnen"
- msgid "Open Options"
- msgstr "Optionen zum Öffnen"
- 
--#: ../app/filedlg.c:317 ../app/filedlg.c:728
-+#: ../app/filedlg.c:317
-+#: ../app/filedlg.c:728
- msgid "Determine file type:"
- msgstr "Dateityp bestimmen:"
- 
--#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
-+#: ../app/filedlg.c:337
-+#: ../app/filedlg.c:741
-+#: ../lib/widgets.c:1493
- msgid "All Files"
- msgstr "Alle Dateien"
- 
--#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
-+#: ../app/filedlg.c:370
-+#: ../plug-ins/postscript/paginate_psprint.c:408
- msgid ""
- "Some characters in the filename are neither UTF-8\n"
- "nor your local encoding.\n"
-@@ -848,12 +847,14 @@ msgstr ""
- "noch entsprechend Ihren Lokalisierungseinstellungen kodiert.\n"
- "Daher funktionieren einige Dinge nicht."
- 
--#: ../app/filedlg.c:380 ../app/filedlg.c:651
-+#: ../app/filedlg.c:380
-+#: ../app/filedlg.c:651
- #: ../plug-ins/postscript/paginate_psprint.c:422
- msgid "File already exists"
- msgstr "Die Datei existiert bereits"
- 
--#: ../app/filedlg.c:382 ../app/filedlg.c:653
-+#: ../app/filedlg.c:382
-+#: ../app/filedlg.c:653
- #: ../plug-ins/postscript/paginate_psprint.c:418
- #, c-format
- msgid ""
-@@ -873,14 +874,10 @@ msgstr "Diagramm speichern"
- msgid "Compress diagram files"
- msgstr "Diagrammdateien komprimieren"
- 
--#: ../app/filedlg.c:457 ../app/filedlg.c:462
--msgid ""
--"Compression reduces file size to less than 1/10th size and speeds up loading "
--"and saving.  Some text programs cannot manipulate compressed files."
--msgstr ""
--"Kompression reduziert die Dateigröße auf weniger als 1/10 und beschleunigt "
--"das Laden und Speichern. Einige Texteditoren können komprimierte Dateien "
--"nicht bearbeiten."
-+#: ../app/filedlg.c:457
-+#: ../app/filedlg.c:462
-+msgid "Compression reduces file size to less than 1/10th size and speeds up loading and saving.  Some text programs cannot manipulate compressed files."
-+msgstr "Kompression reduziert die Dateigröße auf weniger als 1/10 und beschleunigt das Laden und Speichern. Einige Texteditoren können komprimierte Dateien nicht bearbeiten."
- 
- #: ../app/filedlg.c:677
- #, c-format
-@@ -919,22 +916,23 @@ msgstr "Nur _vollständige Wörter berücksichtigen"
- msgid "Match _all properties (not just object name)"
- msgstr "_Ausgedehnte Suche (nicht nur Objektnamen)"
- 
--#: ../app/find-and-replace.c:510
-+#: ../app/find-and-replace.c:513
- msgid "Find"
- msgstr "Suchen"
- 
--#: ../app/find-and-replace.c:542 ../app/menus.c:267
-+#: ../app/find-and-replace.c:545
-+#: ../app/menus.c:267
- msgid "Replace"
- msgstr "Ersetzen"
- 
--#: ../app/find-and-replace.c:545
-+#: ../app/find-and-replace.c:548
- msgid "Replace _All"
- msgstr "_Alles ersetzen"
- 
- #. not adding the button in the list above to modify it's text;
- #. * the default "Find and Replace" is just too long for my taste ;)
- #.
--#: ../app/find-and-replace.c:550
-+#: ../app/find-and-replace.c:553
- msgid "_Replace"
- msgstr "_Ersetzen"
- 
-@@ -955,7 +953,9 @@ msgstr ""
- "Drücken Sie <Esc> um dieses Werkzeug zu beenden"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
--#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
-+#: ../app/interface.c:165
-+#: ../app/menus.c:229
-+#: ../objects/FS/function.c:988
- msgid "Magnify"
- msgstr "Vergrößern"
- 
-@@ -965,64 +965,88 @@ msgstr "Diagramminhalt verschieben"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule
--#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
--#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
--#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
--#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
--#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
--#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
--#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
--#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
--#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
--#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
-+#: ../app/interface.c:177
-+#: ../app/menus.c:232
-+#: ../lib/properties.c:80
-+#: ../lib/properties.h:530
-+#: ../objects/AADL/aadlbox.c:153
-+#: ../objects/Jackson/requirement.c:144
-+#: ../objects/UML/activity.c:129
-+#: ../objects/UML/actor.c:126
-+#: ../objects/UML/classicon.c:149
-+#: ../objects/UML/component.c:130
-+#: ../objects/UML/component_feature.c:161
-+#: ../objects/UML/node.c:130
-+#: ../objects/UML/node.c:132
-+#: ../objects/UML/note.c:124
-+#: ../objects/UML/object.c:151
-+#: ../objects/UML/small_package.c:135
-+#: ../objects/UML/state.c:154
-+#: ../objects/UML/usecase.c:142
-+#: ../objects/custom/custom_object.c:236
-+#: ../objects/network/basestation.c:135
-+#: ../objects/network/radiocell.c:127
- msgid "Text"
- msgstr "Text"
- 
--#: ../app/interface.c:183 ../app/menus.c:233
-+#: ../app/interface.c:183
-+#: ../app/menus.c:233
- msgid "Box"
- msgstr "Rechteck"
- 
--#: ../app/interface.c:189 ../app/menus.c:234
-+#: ../app/interface.c:189
-+#: ../app/menus.c:234
- msgid "Ellipse"
- msgstr "Ellipse"
- 
--#: ../app/interface.c:195 ../app/menus.c:235
-+#: ../app/interface.c:195
-+#: ../app/menus.c:235
- msgid "Polygon"
- msgstr "Vieleck"
- 
--#: ../app/interface.c:201 ../app/menus.c:236
-+#: ../app/interface.c:201
-+#: ../app/menus.c:236
- msgid "Beziergon"
- msgstr "Beziergon"
- 
--#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
-+#: ../app/interface.c:207
-+#: ../app/menus.c:238
-+#: ../objects/standard/line.c:229
- msgid "Line"
- msgstr "Linie"
- 
--#: ../app/interface.c:213 ../app/menus.c:239
-+#: ../app/interface.c:213
-+#: ../app/menus.c:239
- msgid "Arc"
- msgstr "Bogen"
- 
--#: ../app/interface.c:219 ../app/menus.c:240
-+#: ../app/interface.c:219
-+#: ../app/menus.c:240
- msgid "Zigzagline"
- msgstr "Zickzacklinie"
- 
--#: ../app/interface.c:225 ../app/menus.c:241
-+#: ../app/interface.c:225
-+#: ../app/menus.c:241
- msgid "Polyline"
- msgstr "Linienzug"
- 
--#: ../app/interface.c:231 ../app/menus.c:242
-+#: ../app/interface.c:231
-+#: ../app/menus.c:242
- msgid "Bezierline"
- msgstr "Bezierlinie"
- 
--#: ../app/interface.c:237 ../app/menus.c:245
-+#: ../app/interface.c:237
-+#: ../app/menus.c:245
- msgid "Image"
- msgstr "Bild"
- 
--#: ../app/interface.c:244 ../app/menus.c:243
-+#: ../app/interface.c:244
-+#: ../app/menus.c:243
- msgid "Outline"
- msgstr "Kontur"
- 
--#: ../app/interface.c:621 ../app/interface.c:857
-+#: ../app/interface.c:621
-+#: ../app/interface.c:857
- msgid "Pops up the Navigation window."
- msgstr "Das Navigationsfenster öffnen"
- 
-@@ -1051,54 +1075,33 @@ msgstr "Kein Objektbogen mit dem Namen »%s«"
- msgid "Other sheets"
- msgstr "Andere Objektbögen"
- 
--#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:10
-+#: ../app/interface.c:1436
-+#: ../sheets/Flowchart.sheet.in.h:1
- msgid "Flowchart"
- msgstr "Flussdiagramm"
- 
- #: ../app/interface.c:1496
--msgid ""
--"Foreground & background colors for new objects.  The small black and white "
--"squares reset colors.  The small arrows swap colors.  Double click to change "
--"colors."
--msgstr ""
--"Vordergrund- und Hintergrundfarbe für neue Objekte.  Die kleinen schwarzen "
--"und weißen Quadrate setzen die Farben zurück, die kleinen Pfeile vertauschen "
--"sie.  Doppelklicken Sie, um die Farbe zu wechseln."
-+msgid "Foreground & background colors for new objects.  The small black and white squares reset colors.  The small arrows swap colors.  Double click to change colors."
-+msgstr "Vordergrund- und Hintergrundfarbe für neue Objekte.  Die kleinen schwarzen und weißen Quadrate setzen die Farben zurück, die kleinen Pfeile vertauschen sie.  Doppelklicken Sie, um die Farbe zu wechseln."
- 
- #: ../app/interface.c:1511
--msgid ""
--"Line widths.  Click on a line to set the default line width for new "
--"objects.  Double-click to set the line width more precisely."
--msgstr ""
--"Linienbreiten. Klicken Sie eine Linie an, um die voreingestellte "
--"Linienbreite für neue Objekte festzulegen. Doppelklicken Sie sie, um die "
--"Linienbreite präziser festzulegen."
-+msgid "Line widths.  Click on a line to set the default line width for new objects.  Double-click to set the line width more precisely."
-+msgstr "Linienbreiten. Klicken Sie eine Linie an, um die voreingestellte Linienbreite für neue Objekte festzulegen. Doppelklicken Sie sie, um die Linienbreite präziser festzulegen."
- 
- #: ../app/interface.c:1554
--msgid ""
--"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
--"arrow parameters with Details..."
--msgstr ""
--"Pfeilstil am Anfang neuer Linien. Klicken Sie hier, um einen Pfeil zu wählen "
--"oder die Pfeilparameter mit Hilfe von »Details …« festzulegen."
-+msgid "Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
-+msgstr "Pfeilstil am Anfang neuer Linien. Klicken Sie hier, um einen Pfeil zu wählen oder die Pfeilparameter mit Hilfe von »Details …« festzulegen."
- 
- #: ../app/interface.c:1559
--msgid ""
--"Line style for new lines.  Click to pick a line style, or set line style "
--"parameters with Details..."
--msgstr ""
--"Linienstil für neue Linien. Klicken Sie hier, um einen Pfeil zu wählen oder "
--"die Linienstile mit Hilfe von »Details …« festzulegen."
-+msgid "Line style for new lines.  Click to pick a line style, or set line style parameters with Details..."
-+msgstr "Linienstil für neue Linien. Klicken Sie hier, um einen Pfeil zu wählen oder die Linienstile mit Hilfe von »Details …« festzulegen."
- 
- #: ../app/interface.c:1575
--msgid ""
--"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
--"parameters with Details..."
--msgstr ""
--"Pfeilstil am Ende neuer Linien. Klicken Sie hier, um einen Pfeil zu wählen "
--"oder die Pfeilparameter mit Hilfe von »Details …« festzulegen."
-+msgid "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
-+msgstr "Pfeilstil am Ende neuer Linien. Klicken Sie hier, um einen Pfeil zu wählen oder die Pfeilparameter mit Hilfe von »Details …« festzulegen."
- 
--#: ../app/interface.c:1635 ../app/interface.c:1762
-+#: ../app/interface.c:1635
-+#: ../app/interface.c:1762
- msgid "Diagram Editor"
- msgstr "Diagrammeditor"
- 
-@@ -1130,7 +1133,8 @@ msgstr "Ebenen"
- msgid "Diagram:"
- msgstr "Diagramm:"
- 
--#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
-+#: ../app/layer_dialog.c:514
-+#: ../app/layer_dialog.c:1225
- #, c-format
- msgid "New layer %d"
- msgstr "Neue Ebene %d"
-@@ -1151,7 +1155,9 @@ msgstr "Ebene hinzufügen"
- msgid "Layer name:"
- msgstr "Name der Ebene:"
- 
--#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
-+#: ../app/linewidth_area.c:246
-+#: ../lib/properties.h:491
-+#: ../lib/properties.h:494
- #: ../objects/chronogram/chronoline.c:183
- #: ../objects/chronogram/chronoref.c:162
- msgid "Line width"
-@@ -1161,7 +1167,7 @@ msgstr "Linienbreite"
- msgid "Line width:"
- msgstr "Linienbreite:"
- 
--#: ../app/load_save.c:296
-+#: ../app/load_save.c:301
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
-@@ -1169,7 +1175,7 @@ msgstr ""
- "Fehler beim Laden des Diagramms.\n"
- "Verknüpftes Objekt wurde nicht im Dokument gefunden."
- 
--#: ../app/load_save.c:300
-+#: ../app/load_save.c:305
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1178,7 +1184,7 @@ msgstr ""
- "Fehler beim Laden des Diagramms.\n"
- "Verbindungs-Handle %d existiert nicht in »%s«."
- 
--#: ../app/load_save.c:328
-+#: ../app/load_save.c:333
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1187,23 +1193,26 @@ msgstr ""
- "Fehler beim Laden des Diagramms.\n"
- "Verbindungspunkt %d existiert nicht für »%s«."
- 
--#: ../app/load_save.c:368
-+#: ../app/load_save.c:373
- #, c-format
- msgid "Can't find parent %s of %s object\n"
- msgstr "Elternobjekt %s von %s konnte nicht gefunden werden\n"
- 
--#: ../app/load_save.c:417
-+#: ../app/load_save.c:422
- msgid "You must specify a file, not a directory.\n"
- msgstr "Sie müssen eine Datei und keinen Ordner angeben.\n"
- 
--#: ../app/load_save.c:424 ../plug-ins/dxf/dxf-import.c:1309
--#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
-+#: ../app/load_save.c:429
-+#: ../plug-ins/dxf/dxf-import.c:1309
-+#: ../plug-ins/wpg/wpg.c:1177
-+#: ../plug-ins/xfig/xfig-import.c:1270
- #: ../plug-ins/xslt/xslt.c:91
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "»%s« konnte nicht zum Lesen geöffnet werden.\n"
- 
--#: ../app/load_save.c:442 ../app/load_save.c:448
-+#: ../app/load_save.c:447
-+#: ../app/load_save.c:453
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1212,7 +1221,7 @@ msgstr ""
- "Fehler beim Laden des Diagramms %s.\n"
- "Unbekannter Dateityp."
- 
--#: ../app/load_save.c:456
-+#: ../app/load_save.c:461
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1221,7 +1230,7 @@ msgstr ""
- "Fehler beim Laden des Diagramms %s.\n"
- "Keine Dia-Datei."
- 
--#: ../app/load_save.c:673
-+#: ../app/load_save.c:678
- #, c-format
- msgid ""
- "Error loading diagram:\n"
-@@ -1232,43 +1241,51 @@ msgstr ""
- "%s.\n"
- "Eine gültige Dia-Datei definiert mindestens eine Ebene."
- 
--#: ../app/load_save.c:996
-+#: ../app/load_save.c:1001
- #, c-format
- msgid "Not allowed to write to output file %s\n"
- msgstr "Keine Schreiberlaubnis für Ausgabedatei »%s«\n"
- 
--#: ../app/load_save.c:1028
-+#: ../app/load_save.c:1033
- #, c-format
- msgid "Not allowed to write temporary files in %s\n"
- msgstr "Keine Schreiberlaubnis für temporäre Dateien in »%s«\n"
- 
--#: ../app/load_save.c:1050 ../plug-ins/cairo/diacairo.c:121
--#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
--#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
-+#: ../app/load_save.c:1055
-+#: ../plug-ins/cairo/diacairo.c:121
-+#: ../plug-ins/cgm/cgm.c:1154
-+#: ../plug-ins/drs/dia-render-script.c:121
-+#: ../plug-ins/dxf/dxf-export.c:547
-+#: ../plug-ins/hpgl/hpgl.c:710
- #: ../plug-ins/libart/export_png.c:159
- #: ../plug-ins/metapost/render_metapost.c:1177
--#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
-+#: ../plug-ins/pgf/render_pgf.c:1208
-+#: ../plug-ins/postscript/render_eps.c:105
- #: ../plug-ins/pstricks/render_pstricks.c:916
--#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
--#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
--#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
-+#: ../plug-ins/shape/shape-export.c:137
-+#: ../plug-ins/svg/render_svg.c:199
-+#: ../plug-ins/vdx/vdx-export.c:1850
-+#: ../plug-ins/wpg/wpg.c:1072
-+#: ../plug-ins/xfig/xfig-export.c:1153
-+#: ../plug-ins/xslt/xslt.c:99
- #, c-format
- msgid "Can't open output file %s: %s\n"
- msgstr "Die Ausgabedatei »%s« konnte nicht geöffnet werden: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:1061
-+#: ../app/load_save.c:1066
- #, c-format
- msgid "Internal error %d writing file %s\n"
- msgstr "Interner Fehler %d beim Schreiben von »%s«\n"
- 
--#: ../app/load_save.c:1072
-+#: ../app/load_save.c:1077
- #, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
- msgstr "Die Ausgabedatei »%s« konnte nicht zu »%s« umbenannt werden: %s\n"
- 
--#: ../app/load_save.c:1163 ../app/load_save.c:1168
-+#: ../app/load_save.c:1168
-+#: ../app/load_save.c:1173
- msgid "Dia Diagram File"
- msgstr "Dia-Diagrammdatei"
- 
-@@ -1320,7 +1337,8 @@ msgstr "_Diagrammeigenschaften"
- msgid "Page Set_up..."
- msgstr "Seite einric_hten …"
- 
--#: ../app/menus.c:123 ../app/sheets_dialog.c:236
-+#: ../app/menus.c:123
-+#: ../app/sheets_dialog.c:236
- msgid "_Edit"
- msgstr "_Bearbeiten"
- 
-@@ -1378,11 +1396,13 @@ msgstr "_Zoom"
- msgid "1600%"
- msgstr "1600%"
- 
--#: ../app/menus.c:154 ../app/menus.c:573
-+#: ../app/menus.c:154
-+#: ../app/menus.c:573
- msgid "800%"
- msgstr "800%"
- 
--#: ../app/menus.c:155 ../app/menus.c:574
-+#: ../app/menus.c:155
-+#: ../app/menus.c:574
- msgid "400%"
- msgstr "400%"
- 
-@@ -1472,11 +1492,13 @@ msgid "_Unparent Children"
- msgstr "Elternelement des Kindes _trennen"
- 
- #. Translators: Menu item Verb/Support/Position/Align
--#: ../app/menus.c:188 ../objects/FS/function.c:808
-+#: ../app/menus.c:188
-+#: ../objects/FS/function.c:808
- msgid "Align"
- msgstr "Ausrichten"
- 
--#: ../app/menus.c:193 ../objects/standard/textobj.c:137
-+#: ../app/menus.c:193
-+#: ../objects/standard/textobj.c:137
- msgid "Top"
- msgstr "Oben"
- 
-@@ -1484,7 +1506,8 @@ msgstr "Oben"
- msgid "Middle"
- msgstr "Mitte"
- 
--#: ../app/menus.c:195 ../objects/standard/textobj.c:136
-+#: ../app/menus.c:195
-+#: ../objects/standard/textobj.c:136
- msgid "Bottom"
- msgstr "Unten"
- 
-@@ -1512,8 +1535,11 @@ msgstr "Aus_wahl"
- msgid "All"
- msgstr "Alle"
- 
--#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
--#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
-+#: ../app/menus.c:206
-+#: ../lib/arrows.c:1898
-+#: ../objects/Jackson/domain.c:96
-+#: ../objects/UML/association.c:221
-+#: ../objects/UML/association.c:227
- msgid "None"
- msgstr "Keine"
- 
-@@ -1605,8 +1631,11 @@ msgstr "Ãœberschneidung"
- #. Translators: Menu item Verb/Channel/Export/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
--#: ../app/menus.c:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
--#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
-+#: ../app/menus.c:270
-+#: ../app/sheets_dialog.c:785
-+#: ../objects/FS/function.c:708
-+#: ../objects/FS/function.c:860
-+#: ../objects/FS/function.c:862
- msgid "Remove"
- msgstr "Entfernen"
- 
-@@ -1671,7 +1700,8 @@ msgstr "Plugins"
- msgid "Loaded"
- msgstr "Geladen"
- 
--#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-+#: ../app/plugin-manager.c:268
-+#: ../objects/SISSI/sissi_dialog.c:730
- #: ../objects/SISSI/sissi_dialog.c:882
- msgid "Description"
- msgstr "Beschreibung"
-@@ -1684,7 +1714,8 @@ msgstr "Automatisch beim Starten laden"
- msgid "File Name"
- msgstr "Dateiname"
- 
--#: ../app/preferences.c:99 ../app/preferences.c:144
-+#: ../app/preferences.c:99
-+#: ../app/preferences.c:144
- msgid "any"
- msgstr "beliebig"
- 
-@@ -1753,7 +1784,8 @@ msgstr "Hochformat"
- msgid "Paper type:"
- msgstr "Papiertyp:"
- 
--#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1078
-+#: ../app/preferences.c:194
-+#: ../objects/Database/table_dialog.c:1078
- msgid "Background Color:"
- msgstr "Hintergrundfarbe:"
- 
-@@ -1766,7 +1798,9 @@ msgid "Connection Points:"
- msgstr "Verbindungspunkte:"
- 
- #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
--#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
-+#: ../app/preferences.c:200
-+#: ../app/preferences.c:211
-+#: ../app/preferences.c:235
- msgid "Visible"
- msgstr "Sichtbar"
- 
-@@ -1794,7 +1828,8 @@ msgstr "Vergrößerung:"
- msgid "Page breaks:"
- msgstr "Seitenumbrüche:"
- 
--#: ../app/preferences.c:212 ../app/preferences.c:240
-+#: ../app/preferences.c:212
-+#: ../app/preferences.c:240
- msgid "Color:"
- msgstr "Farbe:"
- 
-@@ -1813,8 +1848,10 @@ msgstr "mit Kantenglättung anzeigen"
- #. Favored Filter
- #. Translators: Menu item Verb/Channel/Export
- #. Translators: Menu item Verb/Channel/Export/Export
--#: ../app/preferences.c:221 ../objects/FS/function.c:698
--#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
-+#: ../app/preferences.c:221
-+#: ../objects/FS/function.c:698
-+#: ../objects/FS/function.c:700
-+#: ../plug-ins/libart/export_png.c:328
- msgid "Export"
- msgstr "Exportieren"
- 
-@@ -1822,7 +1859,8 @@ msgstr "Exportieren"
- msgid "Portable Network Graphics"
- msgstr "Portable Network Graphics"
- 
--#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:515
-+#: ../app/preferences.c:225
-+#: ../plug-ins/svg/render_svg.c:521
- #: ../plug-ins/svg/svg-import.c:884
- msgid "Scalable Vector Graphics"
- msgstr "Skalierbare Vektorgrafik (SVG)"
-@@ -1876,12 +1914,15 @@ msgstr "Diagrammbaum-Fenster:"
- msgid "Save hidden object types"
- msgstr "Verborgene Objekttypen speichern"
- 
--#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
-+#: ../app/preferences.c:485
-+#: ../lib/prop_inttypes.c:158
- msgid "Yes"
- msgstr "Ja"
- 
--#: ../app/preferences.c:485 ../app/preferences.c:496
--#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
-+#: ../app/preferences.c:485
-+#: ../app/preferences.c:496
-+#: ../lib/prop_inttypes.c:160
-+#: ../lib/prop_inttypes.c:186
- msgid "No"
- msgstr "Nein"
- 
-@@ -1948,19 +1989,23 @@ msgstr "Programmiertes Dia-Objekt"
- msgid "Sheets and Objects"
- msgstr "Objektbögen"
- 
--#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
-+#: ../app/sheets_dialog.c:110
-+#: ../app/sheets_dialog_callbacks.c:180
- msgid "<- Copy"
- msgstr "<- Kopieren"
- 
--#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
-+#: ../app/sheets_dialog.c:120
-+#: ../app/sheets_dialog_callbacks.c:182
- msgid "<- Copy All"
- msgstr "<- Alle Kopieren"
- 
--#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
-+#: ../app/sheets_dialog.c:127
-+#: ../app/sheets_dialog_callbacks.c:184
- msgid "<- Move"
- msgstr "<- Verschieben"
- 
--#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
-+#: ../app/sheets_dialog.c:137
-+#: ../app/sheets_dialog_callbacks.c:186
- msgid "<- Move All"
- msgstr "<- Alle Verschieben"
- 
-@@ -1976,13 +2021,20 @@ msgstr "Invertieren"
- msgid "New"
- msgstr "Neu"
- 
--#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
--#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
--#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
--#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
--#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
--#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
--#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-+#: ../app/sheets_dialog.c:363
-+#: ../app/sheets_dialog.c:795
-+#: ../objects/Database/table.c:140
-+#: ../objects/Istar/actor.c:146
-+#: ../objects/Istar/actor.c:147
-+#: ../objects/Istar/other.c:150
-+#: ../objects/Istar/other.c:151
-+#: ../objects/KAOS/other.c:153
-+#: ../objects/KAOS/other.c:154
-+#: ../objects/UML/association.c:240
-+#: ../objects/UML/umlattribute.c:39
-+#: ../objects/UML/umlformalparameter.c:37
-+#: ../objects/UML/umloperation.c:64
-+#: ../objects/UML/umlparameter.c:45
- msgid "Type"
- msgstr "Typ"
- 
-@@ -1994,7 +2046,8 @@ msgstr "Auswählen …"
- msgid "SVG Shape:"
- msgstr "SVG-Form:"
- 
--#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
-+#: ../app/sheets_dialog.c:414
-+#: ../app/sheets_dialog.c:477
- msgid "description:"
- msgstr "Beschreibung:"
- 
-@@ -2002,7 +2055,8 @@ msgstr "Beschreibung:"
- msgid "Sheet name:"
- msgstr "Name des Objektbogens:"
- 
--#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
-+#: ../app/sheets_dialog.c:447
-+#: ../app/sheets_dialog_callbacks.c:292
- #: ../app/sheets_dialog_callbacks.c:1109
- msgid "Line Break"
- msgstr "Zeilenumbruch"
-@@ -2015,16 +2069,23 @@ msgstr "Attribute bearbeiten"
- msgid "DiaObject"
- msgstr "Dia-Objekt"
- 
--#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
-+#: ../app/sheets_dialog.c:600
-+#: ../app/sheets_dialog.c:693
- msgid "Description:"
- msgstr "Beschreibung:"
- 
--#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:695
--#: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
--#: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
--#: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
--#: ../objects/UML/class_dialog.c:1159 ../objects/UML/class_dialog.c:2025
--#: ../objects/UML/class_dialog.c:2261 ../objects/UML/class_dialog.c:2864
-+#: ../app/sheets_dialog.c:619
-+#: ../objects/Database/table_dialog.c:695
-+#: ../objects/FS/flow-ortho.c:169
-+#: ../objects/FS/flow.c:146
-+#: ../objects/Istar/link.c:162
-+#: ../objects/Jackson/phenomenon.c:146
-+#: ../objects/KAOS/metaandorrel.c:166
-+#: ../objects/KAOS/metabinrel.c:173
-+#: ../objects/UML/class_dialog.c:1159
-+#: ../objects/UML/class_dialog.c:2025
-+#: ../objects/UML/class_dialog.c:2261
-+#: ../objects/UML/class_dialog.c:2864
- msgid "Type:"
- msgstr "Typ:"
- 
-@@ -2032,12 +2093,18 @@ msgstr "Typ:"
- msgid "Sheet"
- msgstr "Objektbogen"
- 
--#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
--#: ../objects/Database/table_dialog.c:1046 ../objects/ER/attribute.c:155
--#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
--#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
--#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
--#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-+#: ../app/sheets_dialog.c:673
-+#: ../objects/Database/table_dialog.c:683
-+#: ../objects/Database/table_dialog.c:1046
-+#: ../objects/ER/attribute.c:155
-+#: ../objects/ER/entity.c:137
-+#: ../objects/ER/relationship.c:142
-+#: ../objects/UML/class_dialog.c:1148
-+#: ../objects/UML/class_dialog.c:2014
-+#: ../objects/UML/class_dialog.c:2250
-+#: ../objects/UML/class_dialog.c:2853
-+#: ../objects/UML/dependency.c:137
-+#: ../objects/UML/generalization.c:133
- #: ../objects/UML/realizes.c:134
- msgid "Name:"
- msgstr "Name:"
-@@ -2120,7 +2187,8 @@ msgstr "Formdatei »%s« konnte nicht verarbeitet werden"
- msgid "Sheet must have a Name"
- msgstr "Der Objektbogen muss einen Namen haben"
- 
--#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
-+#: ../app/sheets_dialog_callbacks.c:1621
-+#: ../app/sheets_dialog_callbacks.c:1628
- #, c-format
- msgid "Couldn't open '%s': %s"
- msgstr "»%s« konnte nicht geöffnet werden: %s"
-@@ -2319,10 +2387,17 @@ msgstr "Unbekannter Pfeil"
- msgid "Internal error: Setting corner type of endpoint of bezier"
- msgstr "Interner Fehler: Setzen der Eckentyp der Endpunkte der Bezierkurve"
- 
--#: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
--#: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
--#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
--#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
-+#: ../lib/create.c:50
-+#: ../lib/create.c:100
-+#: ../lib/create.c:127
-+#: ../lib/create.c:161
-+#: ../lib/create.c:197
-+#: ../lib/create.c:224
-+#: ../lib/create.c:260
-+#: ../lib/create.c:295
-+#: ../lib/create.c:338
-+#: ../plug-ins/svg/svg-import.c:267
-+#: ../plug-ins/vdx/vdx-import.c:145
- msgid "Can't find standard object"
- msgstr "Das Standardobjekt konnte nicht gefunden werden"
- 
-@@ -2396,7 +2471,8 @@ msgstr "Details …"
- msgid "Ok"
- msgstr "Ok"
- 
--#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
-+#: ../lib/dialogs.c:52
-+#: ../plug-ins/postscript/paginate_psprint.c:322
- msgid "Cancel"
- msgstr "Abbrechen"
- 
-@@ -2410,7 +2486,8 @@ msgstr "Mehrere gleichnamige Exportfilter namens %s"
- msgid "Can't load font %s.\n"
- msgstr "Schrift %s konnte nicht geladen werden.\n"
- 
--#: ../lib/message.c:92 ../lib/message.c:278
-+#: ../lib/message.c:92
-+#: ../lib/message.c:278
- msgid "Warning"
- msgstr "Warnung"
- 
-@@ -2461,7 +2538,8 @@ msgstr "Fehlende Abhängigkeiten für »%s«?"
- msgid "Missing symbol 'dia_plugin_init'"
- msgstr "Symbol »dia_plugin_init« fehlt"
- 
--#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
-+#: ../lib/plug-ins.c:205
-+#: ../lib/plug-ins.c:213
- msgid "dia_plugin_init() call failed"
- msgstr "Aufruf von »dia_plugin_init()« fehlgeschlagen"
- 
-@@ -2495,7 +2573,8 @@ msgstr "Erstellungsdatum"
- msgid "Modification date"
- msgstr "Änderungsdatum"
- 
--#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
-+#: ../lib/prop_dict.c:47
-+#: ../objects/SISSI/sissi_dialog.c:880
- msgid "URL"
- msgstr "URL"
- 
-@@ -2508,68 +2587,95 @@ msgstr "Wert ausserhalb der Grenzen nach Umwandlung von in nach enum"
- msgid "Group with %d objects"
- msgstr "Gruppe mit %d Objekten"
- 
--#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
-+#: ../lib/properties.c:65
-+#: ../lib/properties.h:477
-+#: ../lib/widgets.c:724
- msgid "Left"
- msgstr "Links"
- 
--#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
-+#: ../lib/properties.c:66
-+#: ../lib/properties.h:478
-+#: ../lib/widgets.c:730
- #: ../objects/standard/textobj.c:138
- msgid "Center"
- msgstr "Mitte"
- 
--#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
-+#: ../lib/properties.c:67
-+#: ../lib/properties.h:479
-+#: ../lib/widgets.c:736
- msgid "Right"
- msgstr "Rechts"
- 
--#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
-+#: ../lib/properties.c:74
-+#: ../lib/properties.h:497
-+#: ../lib/properties.h:500
- #: ../objects/chronogram/chronoline.c:181
- #: ../objects/chronogram/chronoref.c:160
- msgid "Line color"
- msgstr "Rahmenfarbe"
- 
--#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
-+#: ../lib/properties.c:75
-+#: ../lib/properties.h:503
-+#: ../lib/properties.h:506
- msgid "Line style"
- msgstr "Linienstil"
- 
--#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
-+#: ../lib/properties.c:76
-+#: ../lib/properties.h:510
-+#: ../lib/properties.h:513
- msgid "Fill color"
- msgstr "Füllfarbe"
- 
--#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
-+#: ../lib/properties.c:77
-+#: ../lib/properties.h:516
-+#: ../lib/properties.h:519
- msgid "Draw background"
- msgstr "Hintergrund zeichnen"
- 
--#: ../lib/properties.c:78 ../lib/properties.h:523
-+#: ../lib/properties.c:78
-+#: ../lib/properties.h:523
- msgid "Start arrow"
- msgstr "Startpfeil"
- 
--#: ../lib/properties.c:79 ../lib/properties.h:526
-+#: ../lib/properties.c:79
-+#: ../lib/properties.h:526
- msgid "End arrow"
- msgstr "Endpfeil"
- 
--#: ../lib/properties.c:81 ../lib/properties.h:536
-+#: ../lib/properties.c:81
-+#: ../lib/properties.h:536
- msgid "Text alignment"
- msgstr "Textanordnung"
- 
- #. all this just to make the defaults selectable ...
--#: ../lib/properties.c:82 ../lib/properties.h:541
--#: ../objects/Database/table_dialog.c:1036 ../objects/Database/reference.c:117
--#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
--#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
--#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
-+#: ../lib/properties.c:82
-+#: ../lib/properties.h:541
-+#: ../objects/Database/table_dialog.c:1036
-+#: ../objects/Database/reference.c:117
-+#: ../objects/GRAFCET/condition.c:134
-+#: ../objects/GRAFCET/step.c:167
-+#: ../objects/GRAFCET/transition.c:144
-+#: ../objects/UML/class.c:174
-+#: ../objects/UML/class_dialog.c:564
-+#: ../objects/chronogram/chronoline.c:185
- #: ../objects/chronogram/chronoref.c:166
- msgid "Font"
- msgstr "Schrift"
- 
--#: ../lib/properties.c:83 ../lib/properties.h:549
--#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
--#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
-+#: ../lib/properties.c:83
-+#: ../lib/properties.h:549
-+#: ../objects/GRAFCET/condition.c:136
-+#: ../objects/GRAFCET/step.c:169
-+#: ../objects/GRAFCET/transition.c:146
-+#: ../objects/chronogram/chronoline.c:187
- #: ../objects/chronogram/chronoref.c:168
- msgid "Font size"
- msgstr "Schriftgröße"
- 
--#: ../lib/properties.c:84 ../lib/properties.h:555
--#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-+#: ../lib/properties.c:84
-+#: ../lib/properties.h:555
-+#: ../objects/GRAFCET/step.c:171
-+#: ../objects/chronogram/chronoline.c:189
- #: ../objects/chronogram/chronoref.c:170
- msgid "Text color"
- msgstr "Schriftfarbe"
-@@ -2579,7 +2685,8 @@ msgstr "Schriftfarbe"
- msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
- msgstr "Kein Attribut »%s« (%p) oder keine Daten (%p) in diesem Attribut"
- 
--#: ../lib/sheet.c:69 ../lib/sheet.c:84
-+#: ../lib/sheet.c:69
-+#: ../lib/sheet.c:84
- #, c-format
- msgid ""
- "DiaObject '%s' needed in sheet '%s' was not found.\n"
-@@ -2597,12 +2704,10 @@ msgid ""
- "Move new objects (if any) from '%s' into your custom sheet\n"
- "or remove '%s', using the 'Sheets and Objects' dialog."
- msgstr ""
--"Der System-Objektbogen »%s« scheint neuer zu sein als Ihre "
--"benutzerdefinierte\n"
-+"Der System-Objektbogen »%s« scheint neuer zu sein als Ihre benutzerdefinierte\n"
- "Version und wurde als »%s« für diese Sitzung geladen.\n"
- "\n"
--"Verschieben Sie neue Objekte (falls nötig) von »%s« in Ihren "
--"benutzerdefinierten\n"
-+"Verschieben Sie neue Objekte (falls nötig) von »%s« in Ihren benutzerdefinierten\n"
- "Objektbogen oder löschen Sie »%s« im Dialog »Objektbögen und Objekte«."
- 
- #: ../lib/sheet.c:371
-@@ -2620,7 +2725,8 @@ msgid "Couldn't find font family for %s\n"
- msgstr "Schriftfamilie von %s konnte nicht gefunden\n"
- 
- #. Translators: Menu item Noun/Material/Solid
--#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
-+#: ../lib/widgets.c:896
-+#: ../objects/FS/function.c:1076
- msgid "Solid"
- msgstr "Durchgezogen"
- 
-@@ -2669,27 +2775,19 @@ msgstr "Bilddatei auswählen"
- msgid "Browse"
- msgstr "Auswählen"
- 
--#: ../lib/widgets.c:2076
-+#: ../lib/widgets.c:2087
- msgid "Reset menu"
- msgstr "Menü zurücksetzen"
- 
- #. Installer message if no GTK+ was found
- #: ../installer/win32/gennsh.c:39
--msgid ""
--"GTK+ is not installed. Please use the full installer. It is available from "
--"http://dia-installer.de."
--msgstr ""
--"GTK+ ist nicht installiert. Bitte benutzen Sie das vollständige "
--"Installationspaket von http://dia-installer.de."
-+msgid "GTK+ is not installed. Please use the full installer. It is available from http://dia-installer.de."
-+msgstr "GTK+ ist nicht installiert. Bitte benutzen Sie das vollständige Installationspaket von http://dia-installer.de."
- 
- #. Installer message: Don't install over pre 0.95 versions
- #: ../installer/win32/gennsh.c:42
--msgid ""
--"Please remove old Dia installations completely or install Dia to a different "
--"location."
--msgstr ""
--"Bitte entfernen Sie alte Dia-Installationen vollständig oder installieren "
--"Sie Dia an einem anderen Ort."
-+msgid "Please remove old Dia installations completely or install Dia to a different location."
-+msgstr "Bitte entfernen Sie alte Dia-Installationen vollständig oder installieren Sie Dia an einem anderen Ort."
- 
- #. Installer message:  License Page
- #: ../installer/win32/gennsh.c:45
-@@ -2698,12 +2796,8 @@ msgstr "Weiter >"
- 
- #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
- #: ../installer/win32/gennsh.c:48
--msgid ""
--"$(^Name) is released under the GPL license. The license is provided here for "
--"information purposes only. $_CLICK"
--msgstr ""
--"$(^Name) wird unter der GPL-Lizenz veröffentlicht. Die Lizenz wir hier nur "
--"zu Informationszwecken angezeigt. $_CLICK"
-+msgid "$(^Name) is released under the GPL license. The license is provided here for information purposes only. $_CLICK"
-+msgstr "$(^Name) wird unter der GPL-Lizenz veröffentlicht. Die Lizenz wir hier nur zu Informationszwecken angezeigt. $_CLICK"
- 
- #. Installer message: Components page
- #: ../installer/win32/gennsh.c:51
-@@ -2732,12 +2826,8 @@ msgstr "Python-Plugin"
- 
- #. Installer message: Component description
- #: ../installer/win32/gennsh.c:66
--msgid ""
--"Support for the Python Scripting Language 2.3. Do not select this if Python "
--"is not installed."
--msgstr ""
--"Unterstützung für die Python-Skriptsprache Version 2.3. Nicht auswählen, "
--"wenn Python nicht installiert ist."
-+msgid "Support for the Python Scripting Language 2.3. Do not select this if Python is not installed."
-+msgstr "Unterstützung für die Python-Skriptsprache Version 2.3. Nicht auswählen, wenn Python nicht installiert ist."
- 
- #. Installer message: hyperlink text on finish page
- #: ../installer/win32/gennsh.c:69
-@@ -2751,32 +2841,18 @@ msgstr "Dia (nur entfernen)"
- 
- #. Installer message: confirmation question. Keep $\r
- #: ../installer/win32/gennsh.c:75
--msgid ""
--"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
--"$\rNote: Any non-standard plugins that you may have installed will be "
--"deleted.$\rDia user settings will not be affected."
--msgstr ""
--"Ihr alter Dia-Ordner wird gelöscht werden. Wirklich fortsetzen?$\r$"
--"\rAchtung: Alle von Ihnen installierten Nicht-Standard-Plugins werden "
--"gelöscht.$\rDie Dia-Benutzereinstellungen sind davon nicht betroffen."
-+msgid "Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."
-+msgstr "Ihr alter Dia-Ordner wird gelöscht werden. Wirklich fortsetzen?$\r$\rAchtung: Alle von Ihnen installierten Nicht-Standard-Plugins werden gelöscht.$\rDie Dia-Benutzereinstellungen sind davon nicht betroffen."
- 
- #. Installer message: confirmatin question. Keep $\r
- #: ../installer/win32/gennsh.c:78
--msgid ""
--"The installation directory you specified already exists. Any contents$\rwill "
--"be deleted. Would you like to continue?"
--msgstr ""
--"Der von Ihnen angegebene Installationsordner existiert bereits. Jeglicher "
--"Inhalt$\rwird entfernt. Wollen Sie wirklich fortsetzen?"
-+msgid "The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
-+msgstr "Der von Ihnen angegebene Installationsordner existiert bereits. Jeglicher Inhalt$\rwird entfernt. Wollen Sie wirklich fortsetzen?"
- 
- #. Installer message: Uninstall Section Prompts. Keep $\r
- #: ../installer/win32/gennsh.c:81
--msgid ""
--"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
--"another user installed this application."
--msgstr ""
--"Bei der Deinstallation konnten keine Registrierungseinträge für Dia gefunden "
--"werden.$\rIt Es scheint, dass ein anderer Benutzer Dia installiert hat."
-+msgid "The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."
-+msgstr "Bei der Deinstallation konnten keine Registrierungseinträge für Dia gefunden werden.$\rIt Es scheint, dass ein anderer Benutzer Dia installiert hat."
- 
- #. Installer message: Uninstall error message
- #: ../installer/win32/gennsh.c:84
-@@ -2790,8 +2866,7 @@ msgstr "$INSTDIR und alle Unterordner werden entfernt. Fortsetzen?"
- 
- #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
- #: ../installer/win32/gennsh.c:90
--msgid ""
--"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+msgid "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
- msgstr "$PROFILE\\.dia und alle Unterordner werden entfernt. Fortsetzen?"
- 
- #: ../objects/AADL/aadl.c:52
-@@ -2898,11 +2973,16 @@ msgstr "Kompositum"
- msgid "Entity/Relationship table diagram objects"
- msgstr "Entität/Beziehungsdiagramm-Tabellenobjekte"
- 
--#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
--#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
--#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
--#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
--#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
-+#: ../objects/Database/table.c:142
-+#: ../objects/Database/table.c:183
-+#: ../objects/Database/table.c:200
-+#: ../objects/UML/class.c:148
-+#: ../objects/UML/class.c:189
-+#: ../objects/UML/class_dialog.c:595
-+#: ../objects/UML/umlattribute.c:43
-+#: ../objects/UML/umloperation.c:66
-+#: ../objects/UML/umlparameter.c:49
-+#: ../sheets/SDL.sheet.in.h:18
- msgid "Comment"
- msgstr "Kommentar"
- 
-@@ -2922,21 +3002,26 @@ msgstr "Eindeutig"
- msgid "Visible comments"
- msgstr "Sichtbare Kommentare"
- 
--#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
-+#: ../objects/Database/table.c:187
-+#: ../objects/UML/class.c:171
- msgid "Comment tagging"
- msgstr "Kommentarkennzeichnung"
- 
--#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
-+#: ../objects/Database/table.c:189
-+#: ../objects/Database/table_dialog.c:976
- msgid "Underline primary keys"
- msgstr "Primärschlüssel unterstreichen"
- 
--#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:981
-+#: ../objects/Database/table.c:191
-+#: ../objects/Database/table_dialog.c:981
- msgid "Use bold font for primary keys"
- msgstr "Fettschrift für Primärschlüssel verwenden"
- 
- #. property rows
--#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
--#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
-+#: ../objects/Database/table.c:196
-+#: ../objects/SADT/arrow.c:137
-+#: ../objects/UML/class.c:179
-+#: ../objects/UML/class_dialog.c:570
- msgid "Normal"
- msgstr "Normal"
- 
-@@ -2944,18 +3029,27 @@ msgstr "Normal"
- msgid "Tablename"
- msgstr "Tabellenname"
- 
--#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
--#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
--#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
--#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
--#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
--#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
--#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
--#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
-+#: ../objects/Database/table.c:203
-+#: ../objects/Database/table.c:205
-+#: ../objects/Database/table.c:207
-+#: ../objects/Database/reference.c:120
-+#: ../objects/UML/association.c:245
-+#: ../objects/UML/association.c:256
-+#: ../objects/UML/association.c:258
-+#: ../objects/UML/association.c:260
-+#: ../objects/UML/association.c:262
-+#: ../objects/UML/association.c:264
-+#: ../objects/UML/class.c:193
-+#: ../objects/UML/class.c:195
-+#: ../objects/UML/class.c:197
-+#: ../objects/UML/class.c:199
-+#: ../objects/UML/class.c:201
-+#: ../objects/UML/class.c:203
- msgid " "
- msgstr " "
- 
--#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
-+#: ../objects/Database/table.c:211
-+#: ../objects/UML/class.c:209
- #: ../objects/UML/object.c:157
- msgid "Attributes"
- msgstr "Attribute"
-@@ -2965,18 +3059,21 @@ msgid "Show comments"
- msgstr "Kommentare anzeigen"
- 
- #. init data
--#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
--#: ../sheets/Database.sheet.in.h:5
-+#: ../objects/Database/table.c:253
-+#: ../objects/Database/table.c:356
-+#: ../sheets/Database.sheet.in.h:3
- msgid "Table"
- msgstr "Tabelle"
- 
- #. Attributes page:
--#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1081
-+#: ../objects/Database/table_dialog.c:611
-+#: ../objects/UML/class_dialog.c:1081
- msgid "_Attributes"
- msgstr "_Attribute"
- 
- #. the "new" button
--#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
-+#: ../objects/Database/table_dialog.c:639
-+#: ../objects/SISSI/sissi_dialog.c:739
- #: ../objects/SISSI/sissi_dialog.c:871
- msgid "_New"
- msgstr "_Neu"
-@@ -2996,14 +3093,17 @@ msgstr "Raufschieben"
- msgid "Move down"
- msgstr "Runterschieben"
- 
--#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1138
-+#: ../objects/Database/table_dialog.c:673
-+#: ../objects/UML/class_dialog.c:1138
- msgid "Attribute data"
- msgstr "Attributdaten"
- 
- #: ../objects/Database/table_dialog.c:707
- #: ../objects/Database/table_dialog.c:946
--#: ../objects/Database/table_dialog.c:1051 ../objects/UML/class_dialog.c:452
--#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
-+#: ../objects/Database/table_dialog.c:1051
-+#: ../objects/UML/class_dialog.c:452
-+#: ../objects/UML/class_dialog.c:1181
-+#: ../objects/UML/class_dialog.c:2111
- #: ../objects/UML/class_dialog.c:2283
- msgid "Comment:"
- msgstr "Kommentar:"
-@@ -3034,12 +3134,14 @@ msgstr "Tabellenname:"
- msgid "Comment visible"
- msgstr "Kommentare sichtbar"
- 
--#: ../objects/Database/table_dialog.c:971 ../objects/UML/class_dialog.c:522
-+#: ../objects/Database/table_dialog.c:971
-+#: ../objects/UML/class_dialog.c:522
- msgid "Show documentation tag"
- msgstr "Dokumentationsauszeichnung anzeigen"
- 
- #. * Fonts and Colors selection *
--#: ../objects/Database/table_dialog.c:1010 ../objects/UML/class_dialog.c:551
-+#: ../objects/Database/table_dialog.c:1010
-+#: ../objects/UML/class_dialog.c:551
- msgid "_Style"
- msgstr "_Stil:"
- 
-@@ -3048,12 +3150,14 @@ msgid "Border width:"
- msgstr "Randbreite:"
- 
- #. head line
--#: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
-+#: ../objects/Database/table_dialog.c:1034
-+#: ../objects/UML/class_dialog.c:561
- #: ../objects/UML/umlparameter.c:51
- msgid "Kind"
- msgstr "Art"
- 
--#: ../objects/Database/table_dialog.c:1038 ../objects/UML/class_dialog.c:566
-+#: ../objects/Database/table_dialog.c:1038
-+#: ../objects/UML/class_dialog.c:566
- msgid "Size"
- msgstr "Größe"
- 
-@@ -3082,8 +3186,10 @@ msgstr "Null"
- msgid "unique"
- msgstr "eindeutig"
- 
--#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
--#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
-+#: ../objects/Database/reference.c:108
-+#: ../objects/flowchart/box.c:152
-+#: ../objects/standard/box.c:152
-+#: ../objects/standard/polyline.c:136
- #: ../objects/standard/zigzagline.c:132
- msgid "Corner radius"
- msgstr "Eckenradius"
-@@ -3096,27 +3202,42 @@ msgstr "Beginn der Beschreibung"
- msgid "End description"
- msgstr "Ende der Beschreibung"
- 
--#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
--#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
--#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
--#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
--#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
--#: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
--#: ../objects/standard/beziergon.c:495 ../objects/standard/zigzagline.c:380
-+#: ../objects/Database/reference.c:144
-+#: ../objects/ER/participation.c:408
-+#: ../objects/FS/flow-ortho.c:626
-+#: ../objects/GRAFCET/vector.c:314
-+#: ../objects/SADT/arrow.c:464
-+#: ../objects/UML/association.c:854
-+#: ../objects/UML/component_feature.c:190
-+#: ../objects/UML/dependency.c:376
-+#: ../objects/UML/generalization.c:372
-+#: ../objects/UML/realizes.c:363
-+#: ../objects/UML/transition.c:172
-+#: ../objects/standard/bezier.c:731
-+#: ../objects/standard/beziergon.c:495
-+#: ../objects/standard/zigzagline.c:380
- msgid "Add segment"
- msgstr "Segment hinzufügen"
- 
--#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
--#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
--#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
--#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
--#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
--#: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
--#: ../objects/standard/beziergon.c:496 ../objects/standard/zigzagline.c:381
-+#: ../objects/Database/reference.c:145
-+#: ../objects/ER/participation.c:409
-+#: ../objects/FS/flow-ortho.c:627
-+#: ../objects/GRAFCET/vector.c:315
-+#: ../objects/SADT/arrow.c:465
-+#: ../objects/UML/association.c:855
-+#: ../objects/UML/component_feature.c:191
-+#: ../objects/UML/dependency.c:377
-+#: ../objects/UML/generalization.c:373
-+#: ../objects/UML/realizes.c:364
-+#: ../objects/UML/transition.c:173
-+#: ../objects/standard/bezier.c:732
-+#: ../objects/standard/beziergon.c:496
-+#: ../objects/standard/zigzagline.c:381
- msgid "Delete segment"
- msgstr "Segment löschen"
- 
--#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
-+#: ../objects/Database/reference.c:151
-+#: ../sheets/Database.sheet.in.h:4
- msgid "Reference"
- msgstr "Referenz"
- 
-@@ -3136,7 +3257,8 @@ msgstr "Abgeleitet:"
- msgid "Multivalue:"
- msgstr "Mehrwertig:"
- 
--#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
-+#: ../objects/ER/attribute.c:436
-+#: ../sheets/ER.sheet.in.h:6
- msgid "Attribute"
- msgstr "Attribut"
- 
-@@ -3148,8 +3270,9 @@ msgstr "Schwach:"
- msgid "Associative:"
- msgstr "Assoziativ:"
- 
--#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
--#: ../sheets/ER.sheet.in.h:4
-+#: ../objects/ER/entity.c:415
-+#: ../objects/UML/classicon.c:131
-+#: ../sheets/ER.sheet.in.h:3
- msgid "Entity"
- msgstr "Entität"
- 
-@@ -3177,20 +3300,25 @@ msgstr "Rotieren:"
- msgid "Identifying:"
- msgstr "Identifizierung:"
- 
--#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459
-+#: ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Beziehung (Relation)"
- 
- #. Translators: Menu item Noun/Energy
--#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
--#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
-+#: ../objects/FS/flow-ortho.c:160
-+#: ../objects/FS/flow-ortho.c:623
-+#: ../objects/FS/flow.c:137
-+#: ../objects/FS/flow.c:625
- #: ../objects/FS/function.c:1098
- msgid "Energy"
- msgstr "Energie"
- 
- #. Translators: Menu item Noun/Material
--#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
--#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
-+#: ../objects/FS/flow-ortho.c:161
-+#: ../objects/FS/flow-ortho.c:624
-+#: ../objects/FS/flow.c:138
-+#: ../objects/FS/flow.c:626
- #: ../objects/FS/function.c:1074
- msgid "Material"
- msgstr "Material"
-@@ -3199,10 +3327,14 @@ msgstr "Material"
- #. Translators: Menu item Verb/Signal/Signal
- #. Translators: Menu item Noun/Signal
- #. Translators: Menu item Noun/Signal/Signal
--#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
--#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
--#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
--#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
-+#: ../objects/FS/flow-ortho.c:162
-+#: ../objects/FS/flow-ortho.c:625
-+#: ../objects/FS/flow.c:139
-+#: ../objects/FS/flow.c:627
-+#: ../objects/FS/function.c:1036
-+#: ../objects/FS/function.c:1038
-+#: ../objects/FS/function.c:1174
-+#: ../objects/FS/function.c:1176
- msgid "Signal"
- msgstr "Signal"
- 
-@@ -3226,19 +3358,22 @@ msgstr "Verb"
- #. Translators: Menu item Verb/Channel
- #. Translators: Menu item Verb/Channel/Channel
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
--#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
-+#: ../objects/FS/function.c:680
-+#: ../objects/FS/function.c:682
- #: ../objects/FS/function.c:722
- msgid "Channel"
- msgstr "Kanal"
- 
- #. Translators: Menu item Verb/Channel/Import
- #. Translators: Menu item Verb/Channel/Import/Import
--#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
-+#: ../objects/FS/function.c:684
-+#: ../objects/FS/function.c:686
- msgid "Import"
- msgstr "Importieren"
- 
- #. Translators: Menu item Verb/Channel/Import/Input
--#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
-+#: ../objects/FS/function.c:688
-+#: ../objects/KAOS/metabinrel.c:165
- msgid "Input"
- msgstr "Eingabe"
- 
-@@ -3249,7 +3384,8 @@ msgstr "Empfangen"
- 
- #. Translators: Menu item Verb/Channel/Import/Allow
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
--#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
-+#: ../objects/FS/function.c:692
-+#: ../objects/FS/function.c:964
- msgid "Allow"
- msgstr "Erlauben"
- 
-@@ -3261,7 +3397,8 @@ msgstr "Zugang modellieren"
- 
- #. Translators: Menu item Verb/Channel/Import/Capture
- #. Translators: Menu item Verb/Provision/Store/Capture
--#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
-+#: ../objects/FS/function.c:696
-+#: ../objects/FS/function.c:930
- msgid "Capture"
- msgstr "Einfangen"
- 
-@@ -3285,14 +3422,16 @@ msgstr "Verwerten"
- #. Translators: Menu item Verb/Channel/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
--#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
-+#: ../objects/FS/function.c:710
-+#: ../objects/FS/function.c:712
- #: ../objects/FS/function.c:730
- msgid "Transfer"
- msgstr "Ãœbertragung"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
--#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
-+#: ../objects/FS/function.c:714
-+#: ../objects/FS/function.c:716
- msgid "Transport"
- msgstr "Transport"
- 
-@@ -3309,7 +3448,8 @@ msgstr "Bewegen"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
--#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
-+#: ../objects/FS/function.c:724
-+#: ../objects/FS/function.c:726
- msgid "Transmit"
- msgstr "Ãœbertragen"
- 
-@@ -3328,7 +3468,8 @@ msgstr "Befördern"
- #. Translators: Menu item Verb/Channel/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
--#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
-+#: ../objects/FS/function.c:734
-+#: ../objects/FS/function.c:736
- #: ../objects/FS/function.c:738
- msgid "Guide"
- msgstr "Leiten"
-@@ -3356,7 +3497,8 @@ msgstr "Ãœbersetzen"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
--#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
-+#: ../objects/FS/function.c:748
-+#: ../objects/FS/function.c:750
- msgid "Rotate"
- msgstr "Rotieren"
- 
-@@ -3372,7 +3514,8 @@ msgstr "Drehen"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
--#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
-+#: ../objects/FS/function.c:756
-+#: ../objects/FS/function.c:758
- msgid "Allow DOF"
- msgstr "DOF zulassen"
- 
-@@ -3389,14 +3532,16 @@ msgstr "Entriegeln"
- 
- #. Translators: Menu item Verb/Support
- #. Translators: Menu item Verb/Support/Support
--#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
-+#: ../objects/FS/function.c:764
-+#: ../objects/FS/function.c:766
- msgid "Support"
- msgstr "Unterstützung"
- 
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
--#: ../objects/FS/function.c:768 ../objects/FS/function.c:770
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../objects/FS/function.c:768
-+#: ../objects/FS/function.c:770
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
- msgstr "Stoppen"
- 
-@@ -3412,7 +3557,8 @@ msgstr "Schützen"
- 
- #. Translators: Menu item Verb/Support/Stop/Prevent
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
--#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
-+#: ../objects/FS/function.c:776
-+#: ../objects/FS/function.c:966
- msgid "Prevent"
- msgstr "Vorbeugen"
- 
-@@ -3428,7 +3574,8 @@ msgstr "Verhindern"
- 
- #. Translators: Menu item Verb/Support/Stabilize
- #. Translators: Menu item Verb/Support/Stabilize/Stabilize
--#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
-+#: ../objects/FS/function.c:782
-+#: ../objects/FS/function.c:784
- msgid "Stabilize"
- msgstr "Stabilisieren"
- 
-@@ -3439,13 +3586,15 @@ msgstr "Stetig"
- 
- #. Translators: Menu item Verb/Support/Secure
- #. Translators: Menu item Verb/Support/Secure/Secure
--#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
-+#: ../objects/FS/function.c:788
-+#: ../objects/FS/function.c:790
- msgid "Secure"
- msgstr "Sichern"
- 
- #. Translators: Menu item Verb/Support/Secure/Attach
- #. Translators: Menu item Verb/Connect/Couple/Attach
--#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
-+#: ../objects/FS/function.c:792
-+#: ../objects/FS/function.c:824
- msgid "Attach"
- msgstr "Anhängen"
- 
-@@ -3458,7 +3607,8 @@ msgstr "Montieren"
- # CHECK Translation
- # Sperren?
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:796
-+#: ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
- msgstr "Verriegeln"
- 
-@@ -3474,7 +3624,8 @@ msgstr "Halten"
- 
- #. Translators: Menu item Verb/Support/Position
- #. Translators: Menu item Verb/Support/Position/Position
--#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
-+#: ../objects/FS/function.c:802
-+#: ../objects/FS/function.c:804
- #: ../objects/Istar/actor.c:70
- msgid "Position"
- msgstr "Position"
-@@ -3486,19 +3637,22 @@ msgstr "Ausrichtung"
- 
- #. Translators: Menu item Verb/Support/Position/Locate
- #. Translators: Menu item Verb/Signal/Sense/Locate
--#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
-+#: ../objects/FS/function.c:810
-+#: ../objects/FS/function.c:1052
- msgid "Locate"
- msgstr "Auffinden"
- 
- #. Translators: Menu item Verb/Connect
- #. Translators: Menu item Verb/Connect/Connect
--#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
-+#: ../objects/FS/function.c:812
-+#: ../objects/FS/function.c:814
- msgid "Connect"
- msgstr "Verbinden"
- 
- #. Translators: Menu item Verb/Connect/Couple
- #. Translators: Menu item Verb/Connect/Couple/Couple
--#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
-+#: ../objects/FS/function.c:816
-+#: ../objects/FS/function.c:818
- msgid "Couple"
- msgstr "Koppeln"
- 
-@@ -3515,7 +3669,8 @@ msgstr "Zusammenbauen"
- # CHECK Translation
- #. Translators: Menu item Verb/Connect/Mix
- #. Translators: Menu item Verb/Connect/Mix/Mix
--#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
-+#: ../objects/FS/function.c:826
-+#: ../objects/FS/function.c:828
- msgid "Mix"
- msgstr "Mischen"
- 
-@@ -3547,15 +3702,17 @@ msgstr "Zusammenfügen"
- 
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
--#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
--#: ../sheets/UML.sheet.in.h:5
-+#: ../objects/FS/function.c:840
-+#: ../objects/FS/function.c:842
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
- msgstr "Verzweigung"
- 
- #. Translators: Menu item Verb/Branch/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
--#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
-+#: ../objects/FS/function.c:844
-+#: ../objects/FS/function.c:846
- #: ../objects/FS/function.c:848
- msgid "Separate"
- msgstr "Trennen"
-@@ -3612,7 +3769,8 @@ msgstr "Drechseln"
- 
- #. Translators: Menu item Verb/Branch/Refine
- #. Translators: Menu item Verb/Branch/Refine/Refine
--#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
-+#: ../objects/FS/function.c:874
-+#: ../objects/FS/function.c:876
- msgid "Refine"
- msgstr "Verfeinern"
- 
-@@ -3643,7 +3801,8 @@ msgstr "Löschen"
- 
- #. Translators: Menu item Verb/Branch/Distribute
- #. Translators: Menu item Verb/Branch/Distribute/Distribute
--#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
-+#: ../objects/FS/function.c:888
-+#: ../objects/FS/function.c:890
- msgid "Distribute"
- msgstr "Verteilen"
- 
-@@ -3665,7 +3824,8 @@ msgstr "Zerstäuben"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Diffuse
- #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
--#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
-+#: ../objects/FS/function.c:898
-+#: ../objects/FS/function.c:912
- msgid "Diffuse"
- msgstr "Diffundieren"
- 
-@@ -3677,7 +3837,8 @@ msgstr "Leer"
- # CHECK Translation
- #. Translators: Menu item Verb/Branch/Dissipate
- #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
--#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
-+#: ../objects/FS/function.c:902
-+#: ../objects/FS/function.c:904
- msgid "Dissipate"
- msgstr "Zerstreuen"
- 
-@@ -3706,13 +3867,15 @@ msgstr "Widerstehen"
- # CHECK Translation
- #. Translators: Menu item Verb/Provision
- #. Translators: Menu item Verb/Provision/Provision
--#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
-+#: ../objects/FS/function.c:916
-+#: ../objects/FS/function.c:918
- msgid "Provision"
- msgstr "Beschaffung"
- 
- #. Translators: Menu item Verb/Provision/Store
- #. Translators: Menu item Verb/Provision/Store/Store
--#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
-+#: ../objects/FS/function.c:920
-+#: ../objects/FS/function.c:922
- msgid "Store"
- msgstr "Lagern"
- 
-@@ -3733,7 +3896,8 @@ msgstr "Reservieren"
- 
- #. Translators: Menu item Verb/Provision/Supply
- #. Translators: Menu item Verb/Provision/Supply/Supply
--#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
-+#: ../objects/FS/function.c:932
-+#: ../objects/FS/function.c:934
- msgid "Supply"
- msgstr "Versorgen"
- 
-@@ -3759,19 +3923,22 @@ msgid "Expose"
- msgstr "Bloßlegen"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:944
-+#: ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Extrahieren"
- 
- #. Translators: Menu item Verb/Control Magnitude
- #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
--#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
-+#: ../objects/FS/function.c:946
-+#: ../objects/FS/function.c:948
- msgid "Control Magnitude"
- msgstr "Steuerungsgrößenordnung"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
--#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
-+#: ../objects/FS/function.c:950
-+#: ../objects/FS/function.c:952
- msgid "Actuate"
- msgstr "Auslösen"
- 
-@@ -3787,14 +3954,16 @@ msgstr "Initialisieren"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
--#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
-+#: ../objects/FS/function.c:958
-+#: ../objects/FS/function.c:960
- msgid "Regulate"
- msgstr "Regulieren"
- 
- #  Translators: Menu item Verb/Control Magnitude/Regulate/Control
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
- #. Translators: Menu item Noun/Signal/Control
--#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
-+#: ../objects/FS/function.c:962
-+#: ../objects/FS/function.c:1180
- #: ../objects/UML/classicon.c:129
- msgid "Control"
- msgstr "Steuerung"
-@@ -3821,7 +3990,8 @@ msgstr "Unterbrechen"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change
- #. Translators: Menu item Verb/Control Magnitude/Change/Change
--#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
-+#: ../objects/FS/function.c:976
-+#: ../objects/FS/function.c:978
- msgid "Change"
- msgstr "Ändern"
- 
-@@ -3857,7 +4027,8 @@ msgstr "Vervielfachen"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Scale
- #. FIXME: mark read-only
--#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:186
-+#: ../objects/FS/function.c:994
-+#: ../objects/Misc/measure.c:186
- msgid "Scale"
- msgstr "Skalieren"
- 
-@@ -3873,7 +4044,8 @@ msgstr "Einstellen"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form
- #. Translators: Menu item Verb/Control Magnitude/Form/Form
--#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
-+#: ../objects/FS/function.c:1000
-+#: ../objects/FS/function.c:1002
- msgid "Form"
- msgstr "Gestalten"
- 
-@@ -3905,7 +4077,8 @@ msgstr "Durchbohren"
- 
- #. Translators: Menu item Verb/Convert
- #. Translators: Menu item Verb/Convert/Convert
--#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
-+#: ../objects/FS/function.c:1014
-+#: ../objects/FS/function.c:1016
- msgid "Convert"
- msgstr "Konvertieren"
- 
-@@ -3950,14 +4123,16 @@ msgid "Differentiate"
- msgstr "Differenzieren"
- 
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1034
-+#: ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
- msgstr "Vorgang"
- 
- #. Translators: Menu item Verb/Signal/Sense
- #. Translators: Menu item Verb/Signal/Sense/Sense
--#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
-+#: ../objects/FS/function.c:1040
-+#: ../objects/FS/function.c:1042
- msgid "Sense"
- msgstr "Wahrnehmen"
- 
-@@ -3989,7 +4164,8 @@ msgstr "Verifizieren"
- 
- #. Translators: Menu item Verb/Signal/Indicate
- #. Translators: Menu item Verb/Signal/Indicate/Indicate
--#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
-+#: ../objects/FS/function.c:1056
-+#: ../objects/FS/function.c:1058
- msgid "Indicate"
- msgstr "Indizieren"
- 
-@@ -3999,13 +4175,15 @@ msgid "Mark"
- msgstr "Markieren"
- 
- #. Translators: Menu item Verb/Signal/Display
--#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
-+#: ../objects/FS/function.c:1062
-+#: ../sheets/Flowchart.sheet.in.h:7
- msgid "Display"
- msgstr "Anzeigen"
- 
- #. Translators: Menu item Verb/Signal/Measure
- #. Translators: Menu item Verb/Signal/Measure/Measure
--#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
-+#: ../objects/FS/function.c:1064
-+#: ../objects/FS/function.c:1066
- msgid "Measure"
- msgstr "Messen"
- 
-@@ -4037,7 +4215,8 @@ msgstr "Gas"
- #. Translators: Menu item Noun/Material/Human
- #. Translators: Menu item Noun/Material/Human/Human
- #. Translators: Menu item Noun/Energy/Human
--#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
-+#: ../objects/FS/function.c:1082
-+#: ../objects/FS/function.c:1084
- #: ../objects/FS/function.c:1168
- msgid "Human"
- msgstr "Mensch"
-@@ -4093,7 +4272,8 @@ msgid "Force"
- msgstr "Kraft"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Rotation
--#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
-+#: ../objects/FS/function.c:1108
-+#: ../objects/standard/outline.c:206
- msgid "Rotation"
- msgstr "Drehung"
- 
-@@ -4181,7 +4361,8 @@ msgstr "Konvektion"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Radiation
- #. Translators: Menu item Noun/Energy/Radioactive/Radiation
--#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
-+#: ../objects/FS/function.c:1142
-+#: ../objects/FS/function.c:1150
- msgid "Radiation"
- msgstr "Strahlung"
- 
-@@ -4264,7 +4445,8 @@ msgstr "Benutzer/Gerätfkt."
- msgid "Wish Fn"
- msgstr "Wunschfkt."
- 
--#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137
-+#: ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Makroaufruf"
- 
-@@ -4289,7 +4471,8 @@ msgstr "Die Schrift der Voraussetzung"
- msgid "The condition's font size"
- msgstr "Die Schriftgröße der Voraussetzung"
- 
--#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
-+#: ../objects/GRAFCET/condition.c:139
-+#: ../objects/GRAFCET/transition.c:149
- msgid "Color"
- msgstr "Farbe"
- 
-@@ -4301,23 +4484,28 @@ msgstr "Die Farbe der Voraussetzung"
- msgid "GRAFCET diagram objects"
- msgstr "GRAFCET Diagrammobjekte"
- 
--#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148
-+#: ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Regulärer Schritt"
- 
--#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149
-+#: ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "Initialisierungsschritt"
- 
--#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150
-+#: ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Makroeintragsschritt"
- 
--#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151
-+#: ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Makrobeendungsschritt"
- 
--#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
-+#: ../objects/GRAFCET/step.c:152
-+#: ../sheets/GRAFCET.sheet.in.h:7
- msgid "Macro call step"
- msgstr "Makroaufrufsschritt"
- 
-@@ -4393,16 +4581,22 @@ msgstr "UND"
- msgid "Vergent type:"
- msgstr "Randtyp:"
- 
--#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
--#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
--#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
-+#: ../objects/GRAFCET/vergent.c:407
-+#: ../objects/Istar/other.c:471
-+#: ../objects/Jackson/domain.c:533
-+#: ../objects/KAOS/goal.c:574
-+#: ../objects/KAOS/other.c:527
-+#: ../objects/SADT/box.c:454
- #: ../objects/standard/line.c:223
- msgid "Add connection point"
- msgstr "Verbindungspunkt hinzufügen"
- 
--#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
--#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
--#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
-+#: ../objects/GRAFCET/vergent.c:408
-+#: ../objects/Istar/other.c:472
-+#: ../objects/Jackson/domain.c:534
-+#: ../objects/KAOS/goal.c:575
-+#: ../objects/KAOS/other.c:528
-+#: ../objects/SADT/box.c:455
- #: ../objects/standard/line.c:224
- msgid "Delete connection point"
- msgstr "Verbindungspunkt entfernen"
-@@ -4411,28 +4605,35 @@ msgstr "Verbindungspunkt entfernen"
- msgid "GRAFCET OR/AND vergent"
- msgstr "GRAFCET oder/und Rand"
- 
--#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
-+#: ../objects/Istar/actor.c:68
-+#: ../objects/Istar/link.c:150
- msgid "Unspecified"
- msgstr "Nicht spezifiziert"
- 
--#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
-+#: ../objects/Istar/actor.c:69
-+#: ../objects/KAOS/other.c:75
- msgid "Agent"
- msgstr "Agent"
- 
--#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
-+#: ../objects/Istar/actor.c:71
-+#: ../objects/UML/association.c:247
- msgid "Role"
- msgstr "Rolle"
- 
--#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
-+#: ../objects/Istar/goal.c:76
-+#: ../objects/KAOS/goal.c:79
- msgid "Softgoal"
- msgstr "Weiches Ziel"
- 
--#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
-+#: ../objects/Istar/goal.c:77
-+#: ../objects/KAOS/goal.c:80
- msgid "Goal"
- msgstr "Ziel"
- 
--#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
--#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
-+#: ../objects/Istar/goal.c:156
-+#: ../objects/Istar/goal.c:157
-+#: ../objects/KAOS/goal.c:159
-+#: ../objects/KAOS/goal.c:160
- msgid "Goal Type"
- msgstr "Zieltyp"
- 
-@@ -4448,7 +4649,8 @@ msgstr "Positiver Beitrag"
- msgid "Negative contrib"
- msgstr "Negativer Beitrag"
- 
--#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153
-+#: ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Abhängigkeit"
- 
-@@ -4458,13 +4660,14 @@ msgstr "Zerlegung"
- 
- #: ../objects/Istar/link.c:155
- msgid "Means-Ends"
--msgstr ""
-+msgstr "Mittel-Zweck"
- 
- #: ../objects/Istar/other.c:73
- msgid "Resource"
- msgstr "Ressource"
- 
--#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74
-+#: ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr "Aufgabe"
- 
-@@ -4496,7 +4699,8 @@ msgstr "Fügsam"
- msgid "Lexical"
- msgstr "Lexikalisch"
- 
--#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
-+#: ../objects/Jackson/domain.c:178
-+#: ../objects/Jackson/domain.c:179
- msgid "Domain Type"
- msgstr "Bereichstyp"
- 
-@@ -4521,13 +4725,15 @@ msgstr "Jackson Diagramm"
- msgid "Shared"
- msgstr "Geteilt"
- 
--#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
-+#: ../objects/Jackson/phenomenon.c:137
-+#: ../objects/KAOS/goal.c:81
- msgid "Requirement"
- msgstr "Anforderung"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule
--#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
-+#: ../objects/Jackson/phenomenon.c:144
-+#: ../objects/UML/message.c:153
- #: ../objects/UML/message.c:155
- msgid "Message:"
- msgstr "Nachricht:"
-@@ -4682,7 +4888,8 @@ msgid "pi"
- msgstr "pi"
- 
- #. PROP_FLAG_VISIBLE|
--#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
-+#: ../objects/Misc/measure.c:185
-+#: ../sheets/ChemEng.sheet.in.h:8
- msgid "Measurement"
- msgstr "Messung"
- 
-@@ -4694,11 +4901,13 @@ msgstr "Einheit"
- msgid "Precision"
- msgstr "Präzision"
- 
--#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
-+#: ../objects/Misc/tree.c:605
-+#: ../objects/network/bus.c:613
- msgid "Add Handle"
- msgstr "Anfasser hinzufügen"
- 
--#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
-+#: ../objects/Misc/tree.c:606
-+#: ../objects/network/bus.c:614
- msgid "Delete Handle"
- msgstr "Anfasser löschen"
- 
-@@ -4727,20 +4936,19 @@ msgid "Automatically gray vertical flows:"
- msgstr "Vertikale Flüsse automatisch ausgrauen:"
- 
- #: ../objects/SADT/arrow.c:151
--msgid ""
--"To improve the ease of reading, flows which begin and end vertically can be "
--"rendered gray"
--msgstr ""
--"Um die Lesbarkeit zu verbessern, können Ströme die vertikal beginnen und "
--"enden grau dargestellt werden"
-+msgid "To improve the ease of reading, flows which begin and end vertically can be rendered gray"
-+msgstr "Um die Lesbarkeit zu verbessern, können Ströme die vertikal beginnen und enden grau dargestellt werden"
- 
- #: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
- msgstr "SADT Pfeil"
- 
--#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
--#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
--#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
-+#: ../objects/SADT/box.c:140
-+#: ../objects/custom/custom_object.c:226
-+#: ../objects/flowchart/box.c:154
-+#: ../objects/flowchart/diamond.c:152
-+#: ../objects/flowchart/ellipse.c:151
-+#: ../objects/flowchart/parallelogram.c:156
- msgid "Text padding"
- msgstr "Textabstand"
- 
-@@ -4761,15 +4969,18 @@ msgstr "SADT Box"
- msgid "SADT diagram objects"
- msgstr "SADT Diagrammobjekte"
- 
--#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-+#: ../objects/SISSI/classification.h:38
-+#: ../objects/SISSI/sissi_dialog.c:42
- msgid "No Protection"
- msgstr "Kein Schutz"
- 
--#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-+#: ../objects/SISSI/classification.h:39
-+#: ../objects/SISSI/sissi_dialog.c:43
- msgid "Restricted Diffusion"
- msgstr "Eingeschränkte Streuung"
- 
--#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-+#: ../objects/SISSI/classification.h:40
-+#: ../objects/SISSI/sissi_dialog.c:44
- msgid "Special Country Confidential"
- msgstr "Landesspezifisch vertraulich"
- 
-@@ -4777,15 +4988,18 @@ msgstr "Landesspezifisch vertraulich"
- msgid "Confidential"
- msgstr "Vertraulich"
- 
--#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-+#: ../objects/SISSI/classification.h:42
-+#: ../objects/SISSI/sissi_dialog.c:45
- msgid "NATO Confidential"
- msgstr "NATO-vertraulich"
- 
--#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-+#: ../objects/SISSI/classification.h:43
-+#: ../objects/SISSI/sissi_dialog.c:46
- msgid "Personal Confidential"
- msgstr "Persönlich vertraulich"
- 
--#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-+#: ../objects/SISSI/classification.h:44
-+#: ../objects/SISSI/sissi_dialog.c:47
- msgid "Medical Confidential"
- msgstr "Medizinisch vertraulich"
- 
-@@ -4797,7 +5011,8 @@ msgstr "Industriegeheimnis"
- msgid "Defense Confidential"
- msgstr "Verteidigungsgeheimnis"
- 
--#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-+#: ../objects/SISSI/classification.h:47
-+#: ../objects/SISSI/sissi_dialog.c:49
- msgid "Secret"
- msgstr "Geheim"
- 
-@@ -4805,19 +5020,23 @@ msgstr "Geheim"
- msgid "Defense Secret"
- msgstr "Verteidigungsgeheimnis"
- 
--#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-+#: ../objects/SISSI/classification.h:49
-+#: ../objects/SISSI/sissi_dialog.c:50
- msgid "Secret special country"
- msgstr "Landesspezifisches Geheimnis"
- 
--#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-+#: ../objects/SISSI/classification.h:50
-+#: ../objects/SISSI/sissi_dialog.c:51
- msgid "NATO Secret"
- msgstr "NATO-geheim"
- 
--#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-+#: ../objects/SISSI/classification.h:51
-+#: ../objects/SISSI/sissi_dialog.c:52
- msgid "Very Secret"
- msgstr "Streng geheim"
- 
--#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-+#: ../objects/SISSI/classification.h:52
-+#: ../objects/SISSI/sissi_dialog.c:53
- msgid "NATO Very Secret"
- msgstr "NATO streng geheim"
- 
-@@ -4834,7 +5053,8 @@ msgstr ""
- "Fehler beim Laden des Objekts.\n"
- "KeineDatei: %s."
- 
--#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-+#: ../objects/SISSI/sissi.c:928
-+#: ../objects/SISSI/sissi.c:932
- #, c-format
- msgid ""
- "Error loading object.\n"
-@@ -5043,7 +5263,7 @@ msgstr "Entscheidungsträger"
- 
- #: ../objects/SISSI/sissi_dialog.c:160
- msgid "SSI Responsible"
--msgstr ""
-+msgstr "SSI-Verantwortlicher"
- 
- # CHECK Translation
- #: ../objects/SISSI/sissi_dialog.c:161
-@@ -5071,7 +5291,8 @@ msgstr "Entwickler"
- msgid "Operator / Maintenance"
- msgstr "Bediener / Wartung"
- 
--#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
-+#: ../objects/SISSI/sissi_dialog.c:171
-+#: ../sheets/network.sheet.in.h:1
- msgid "Network"
- msgstr "Netzwerk"
- 
-@@ -5087,7 +5308,8 @@ msgstr "Passive oder aktive Weiterleitung"
- msgid "Communication interface"
- msgstr "Kommunikationsschnittstelle"
- 
--#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
-+#: ../objects/SISSI/sissi_dialog.c:179
-+#: ../sheets/SISSI.sheet.in.h:21
- msgid "Software"
- msgstr "Software"
- 
-@@ -5153,19 +5375,23 @@ msgid "_Menace"
- msgstr "_Bedrohung"
- 
- #. ********* label of board *********
--#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-+#: ../objects/SISSI/sissi_dialog.c:317
-+#: ../objects/SISSI/sissi_dialog.c:326
- msgid "Menace"
- msgstr "Bedrohung"
- 
--#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-+#: ../objects/SISSI/sissi_dialog.c:319
-+#: ../objects/SISSI/sissi_dialog.c:328
- msgid "P Action"
- msgstr "P-Aktion"
- 
--#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-+#: ../objects/SISSI/sissi_dialog.c:321
-+#: ../objects/SISSI/sissi_dialog.c:330
- msgid "P Detection"
- msgstr "P-Erkennung"
- 
--#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-+#: ../objects/SISSI/sissi_dialog.c:323
-+#: ../objects/SISSI/sissi_dialog.c:332
- msgid "Vulnerability"
- msgstr "Verwundbarkeit"
- 
-@@ -5193,8 +5419,9 @@ msgstr "Dokumente"
- msgid "Document title"
- msgstr "Dokumententitel"
- 
--#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
--#: ../sheets/UML.sheet.in.h:2
-+#: ../objects/UML/actor.c:357
-+#: ../objects/UML/actor.c:359
-+#: ../sheets/UML.sheet.in.h:15
- msgid "Actor"
- msgstr "Akteur"
- 
-@@ -5234,7 +5461,8 @@ msgstr "Seite A"
- msgid "Multiplicity"
- msgstr "Multiplizität"
- 
--#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
-+#: ../objects/UML/association.c:251
-+#: ../objects/UML/umlattribute.c:45
- #: ../objects/UML/umloperation.c:71
- msgid "Visibility"
- msgstr "Sichtbarkeit"
-@@ -5247,31 +5475,42 @@ msgstr "Pfeil anzeigen"
- msgid "Side B"
- msgstr "Seite B"
- 
--#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
--#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
-+#: ../objects/UML/class.c:142
-+#: ../objects/UML/class.c:325
-+#: ../objects/UML/class.c:1773
-+#: ../sheets/UML.sheet.in.h:3
- msgid "Class"
- msgstr "Klasse"
- 
- #. how it used to be before 0.96+SVN
- #. one name, one type: but breaks forward-compatibiliy so kind of reverted
--#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
--#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
--#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
--#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
-+#: ../objects/UML/class.c:146
-+#: ../objects/UML/classicon.c:140
-+#: ../objects/UML/classicon.c:142
-+#: ../objects/UML/component.c:126
-+#: ../objects/UML/large_package.c:137
-+#: ../objects/UML/object.c:153
-+#: ../objects/UML/small_package.c:131
-+#: ../objects/UML/umloperation.c:68
- msgid "Stereotype"
- msgstr "Stereotyp"
- 
--#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
--#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
--#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
-+#: ../objects/UML/class.c:150
-+#: ../objects/UML/class.c:183
-+#: ../objects/UML/class_dialog.c:468
-+#: ../objects/UML/class_dialog.c:580
-+#: ../objects/UML/class_dialog.c:2087
-+#: ../objects/UML/uml.c:110
- msgid "Abstract"
- msgstr "Abstrakt"
- 
--#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
-+#: ../objects/UML/class.c:152
-+#: ../objects/UML/class.c:1770
- msgid "Template"
- msgstr "Vorlage"
- 
--#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
-+#: ../objects/UML/class.c:155
-+#: ../objects/UML/class_dialog.c:477
- msgid "Suppress Attributes"
- msgstr "Attribute unterdrücken"
- 
-@@ -5291,7 +5530,8 @@ msgstr "Sichtbare Operationen"
- msgid "Visible Comments"
- msgstr "Sichtbare Kommentare"
- 
--#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
-+#: ../objects/UML/class.c:165
-+#: ../objects/UML/class_dialog.c:493
- msgid "Wrap Operations"
- msgstr "Operationen umbrechen"
- 
-@@ -5303,7 +5543,8 @@ msgstr "Umbruch nach Zeichen"
- msgid "Comment line length"
- msgstr "Kommentarumbruch"
- 
--#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
-+#: ../objects/UML/class.c:181
-+#: ../objects/UML/class_dialog.c:575
- msgid "Polymorphic"
- msgstr "Polymorph"
- 
-@@ -5336,8 +5577,10 @@ msgstr "_Klasse"
- msgid "Class name:"
- msgstr "Klassenname:"
- 
--#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
--#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
-+#: ../objects/UML/class_dialog.c:445
-+#: ../objects/UML/class_dialog.c:2036
-+#: ../objects/UML/dependency.c:139
-+#: ../objects/UML/generalization.c:135
- #: ../objects/UML/realizes.c:136
- msgid "Stereotype:"
- msgstr "Stereotyp:"
-@@ -5395,35 +5638,41 @@ msgstr "Hintergrundfarbe"
- msgid "Value:"
- msgstr "Wert:"
- 
--#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
-+#: ../objects/UML/class_dialog.c:1203
-+#: ../objects/UML/class_dialog.c:2048
- msgid "Visibility:"
- msgstr "Sichtbarkeit:"
- 
- # CHECK: I wouldn't use "Öffentlich" because "public" is a C++ keyword
--#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
-+#: ../objects/UML/class_dialog.c:1212
-+#: ../objects/UML/class_dialog.c:2057
- #: ../objects/UML/uml.c:102
- msgid "Public"
- msgstr "Public"
- 
- # CHECK: I wouldn't use "Privat" because "private" is a C++ keyword
--#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
-+#: ../objects/UML/class_dialog.c:1215
-+#: ../objects/UML/class_dialog.c:2060
- #: ../objects/UML/uml.c:103
- msgid "Private"
- msgstr "Private"
- 
- # CHECK: I wouldn't use "Geschützt" because "protected" is a C++ keyword
--#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
-+#: ../objects/UML/class_dialog.c:1218
-+#: ../objects/UML/class_dialog.c:2063
- #: ../objects/UML/uml.c:104
- msgid "Protected"
- msgstr "Protected"
- 
--#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
-+#: ../objects/UML/class_dialog.c:1221
-+#: ../objects/UML/class_dialog.c:2066
- #: ../objects/UML/uml.c:105
- msgid "Implementation"
- msgstr "Implementierung"
- 
- #. end: Inheritance type
--#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
-+#: ../objects/UML/class_dialog.c:1237
-+#: ../objects/UML/class_dialog.c:2103
- msgid "Class scope"
- msgstr "Klassen-Gültigkeitsbereich"
- 
-@@ -5433,11 +5682,13 @@ msgstr "Klassen-Gültigkeitsbereich"
- msgid "Inheritance type:"
- msgstr "Typ der Vererbung:"
- 
--#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
-+#: ../objects/UML/class_dialog.c:2090
-+#: ../objects/UML/uml.c:111
- msgid "Polymorphic (virtual)"
- msgstr "Polymorph (virtuell)"
- 
--#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
-+#: ../objects/UML/class_dialog.c:2093
-+#: ../objects/UML/uml.c:112
- msgid "Leaf (final)"
- msgstr "Blatt (abschließend)"
- 
-@@ -5461,19 +5712,23 @@ msgstr "Vorgabewert:"
- msgid "Direction:"
- msgstr "Richtung:"
- 
--#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
-+#: ../objects/UML/class_dialog.c:2315
-+#: ../objects/UML/umlparameter.c:34
- msgid "Undefined"
- msgstr "Undefiniert"
- 
--#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
-+#: ../objects/UML/class_dialog.c:2318
-+#: ../objects/UML/umlparameter.c:35
- msgid "In"
- msgstr "Rein"
- 
--#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
-+#: ../objects/UML/class_dialog.c:2321
-+#: ../objects/UML/umlparameter.c:36
- msgid "Out"
- msgstr "Raus"
- 
--#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
-+#: ../objects/UML/class_dialog.c:2324
-+#: ../objects/UML/umlparameter.c:37
- msgid "In & Out"
- msgstr "Rein & Raus"
- 
-@@ -5491,7 +5746,8 @@ msgstr "Operationsdaten"
- msgid "_Templates"
- msgstr "_Vorlagen"
- 
--#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
-+#: ../objects/UML/class_dialog.c:2786
-+#: ../sheets/UML.sheet.in.h:4
- msgid "Template class"
- msgstr "Vorlageklasse"
- 
-@@ -5507,20 +5763,24 @@ msgstr "Grenze"
- msgid "Is object"
- msgstr "Ist Objekt"
- 
--#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
-+#: ../objects/UML/component_feature.c:150
-+#: ../sheets/UML.sheet.in.h:21
- msgid "Facet"
- msgstr "Facette"
- 
- # CHECK - Receptacle => Steckdose?
--#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151
-+#: ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr "Buchse"
- 
--#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152
-+#: ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr "Ereignisquelle"
- 
--#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153
-+#: ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr "Ereignissenke"
- 
-@@ -5534,7 +5794,8 @@ msgstr "Pfeil anzeigen:"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
--#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
-+#: ../objects/UML/implements.c:131
-+#: ../objects/UML/implements.c:133
- msgid "Interface:"
- msgstr "Schnittstelle:"
- 
-@@ -5662,7 +5923,8 @@ msgstr "Aktion"
- msgid "Action to perform when this transition is taken"
- msgstr "Auszuführende Aktion beim Zustandsübergang"
- 
--#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
-+#: ../objects/UML/transition.c:145
-+#: ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
- msgstr "Bedingung"
- 
-@@ -5674,7 +5936,8 @@ msgstr "Bedingung für den Zustandsübergang, wenn das Ereignis ausgelöst wurde
- msgid "Unified Modelling Language diagram objects UML 1.3"
- msgstr "'Unified Modelling Language' Diagrammobjekte (UML 1.3)"
- 
--#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-+#: ../objects/UML/umlattribute.c:41
-+#: ../objects/UML/umlparameter.c:47
- msgid "Value"
- msgstr "Wert"
- 
-@@ -5682,7 +5945,8 @@ msgstr "Wert"
- msgid "Abstract (?)"
- msgstr "Abstrakt (?)"
- 
--#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
-+#: ../objects/UML/umlattribute.c:49
-+#: ../objects/UML/umloperation.c:77
- msgid "Class scope (static)"
- msgstr "Klassen-Gültigkeitsbereich (static)"
- 
-@@ -5694,7 +5958,8 @@ msgstr "Typ der Vererbung:"
- msgid "Query (const)"
- msgstr "Abfrage (const)"
- 
--#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
-+#: ../objects/UML/umloperation.c:79
-+#: ../objects/chronogram/chronoline.c:164
- msgid "Parameters"
- msgstr "Parameter"
- 
-@@ -5710,7 +5975,8 @@ msgstr "Zusammenarbeit"
- msgid "Chronogram diagram objects"
- msgstr "Chronogramm Diagrammobjekte"
- 
--#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150
-+#: ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Daten"
- 
-@@ -5737,8 +6003,7 @@ msgstr ""
- "@ Zeit    Den Zeiger auf eine absolute Zeit setzen.\n"
- "( Dauer   Das Signal setzen, dann für »Dauer« warten.\n"
- ") Dauer   Das Signal herabnehmen, dann für »Dauer« warten.\n"
--"u Dauer   Das Signal in den Zustand »unbekannt« setzen, dann für »Dauer« "
--"warten.\n"
-+"u Dauer   Das Signal in den Zustand »unbekannt« setzen, dann für »Dauer« warten.\n"
- "Beispiel: @ 1.0 (2.0)1.0(2.0)\n"
- 
- #: ../objects/chronogram/chronoline.c:166
-@@ -5800,17 +6065,20 @@ msgstr "Benutzerspezifisch"
- msgid "Custom XML shapes loader"
- msgstr "Lader für benutzerspezifische XML Formen"
- 
--#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
-+#: ../objects/custom/custom_object.c:207
-+#: ../objects/custom/custom_object.c:239
- #: ../objects/custom/custom_object.c:1782
- msgid "Flip horizontal"
- msgstr "Horizontal spiegeln"
- 
--#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
-+#: ../objects/custom/custom_object.c:209
-+#: ../objects/custom/custom_object.c:241
- #: ../objects/custom/custom_object.c:1783
- msgid "Flip vertical"
- msgstr "Vertikal spiegeln"
- 
--#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
-+#: ../objects/custom/custom_object.c:212
-+#: ../objects/custom/custom_object.c:244
- msgid "Scale of the subshapes"
- msgstr "Maßstab der Unterformen"
- 
-@@ -5858,7 +6126,8 @@ msgstr "Scherenwinkel"
- msgid "Sectors"
- msgstr "Sektoren"
- 
--#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
-+#: ../objects/network/basestation.c:401
-+#: ../objects/network/basestation.c:403
- msgid "Base Station"
- msgstr "Basisstation"
- 
-@@ -5874,62 +6143,75 @@ msgstr "Radius"
- msgid "Width"
- msgstr "Breite"
- 
--#: ../objects/standard/arc.c:143
-+#: ../objects/standard/arc.c:141
- msgid "Curve distance"
- msgstr "Kurvendistanz"
- 
--#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
-+#: ../objects/standard/bezier.c:139
-+#: ../objects/standard/line.c:143
- #: ../objects/standard/polyline.c:137
- msgid "Line gaps"
- msgstr "Linienabstände"
- 
--#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
-+#: ../objects/standard/bezier.c:141
-+#: ../objects/standard/line.c:145
- #: ../objects/standard/polyline.c:139
- msgid "Absolute start gap"
- msgstr "Absoluter Startabstand"
- 
--#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
-+#: ../objects/standard/bezier.c:143
-+#: ../objects/standard/line.c:147
- #: ../objects/standard/polyline.c:141
- msgid "Absolute end gap"
- msgstr "Absoluter Endabstand"
- 
--#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
-+#: ../objects/standard/bezier.c:734
-+#: ../objects/standard/beziergon.c:498
- msgid "Symmetric control"
- msgstr "Symmetriekontrolle"
- 
--#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
-+#: ../objects/standard/bezier.c:736
-+#: ../objects/standard/beziergon.c:500
- msgid "Smooth control"
- msgstr "Glättekontrolle"
- 
--#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
-+#: ../objects/standard/bezier.c:738
-+#: ../objects/standard/beziergon.c:502
- msgid "Cusp control"
- msgstr "Scheitelpunktkontrolle"
- 
--#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
-+#: ../objects/standard/box.c:139
-+#: ../objects/standard/ellipse.c:133
- msgid "Free"
- msgstr "Frei"
- 
--#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
-+#: ../objects/standard/box.c:140
-+#: ../objects/standard/ellipse.c:134
- msgid "Fixed"
- msgstr "Fest"
- 
--#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
-+#: ../objects/standard/box.c:141
-+#: ../objects/standard/box.c:699
- msgid "Square"
- msgstr "Quadrat"
- 
--#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
-+#: ../objects/standard/box.c:154
-+#: ../objects/standard/ellipse.c:146
- msgid "Aspect ratio"
- msgstr "Seitenverhältnis"
- 
--#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
-+#: ../objects/standard/box.c:695
-+#: ../objects/standard/ellipse.c:673
- msgid "Free aspect"
- msgstr "Freies Seitenverhältnis"
- 
--#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
-+#: ../objects/standard/box.c:697
-+#: ../objects/standard/ellipse.c:675
- msgid "Fixed aspect"
- msgstr "Festes Seitenverhältnis"
- 
--#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
-+#: ../objects/standard/ellipse.c:135
-+#: ../objects/standard/ellipse.c:677
- msgid "Circle"
- msgstr "Kreis"
- 
-@@ -5947,7 +6229,8 @@ msgstr "Seitenverhältnis beibehalten"
- 
- #. Found file in same dir as diagram.
- #. Found file in current dir.
--#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
-+#: ../objects/standard/image.c:697
-+#: ../objects/standard/image.c:708
- #, c-format
- msgid ""
- "The image file '%s' was not found in that directory.\n"
-@@ -5957,7 +6240,8 @@ msgstr ""
- "Stattdessen wird die Datei »%s« verwendet\n"
- 
- #. Didn't find file in current dir.
--#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
-+#: ../objects/standard/image.c:714
-+#: ../objects/standard/image.c:736
- #, c-format
- msgid "The image file '%s' was not found.\n"
- msgstr "Die Bilddatei »%s« konnte nicht gefunden werden.\n"
-@@ -5982,11 +6266,13 @@ msgstr "Textinhalt"
- msgid "Angle to rotate the outline"
- msgstr "Drehwinkel der Kontur"
- 
--#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
-+#: ../objects/standard/polygon.c:462
-+#: ../objects/standard/polyline.c:616
- msgid "Add Corner"
- msgstr "Eckpunkt hinzufügen"
- 
--#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
-+#: ../objects/standard/polygon.c:463
-+#: ../objects/standard/polyline.c:617
- msgid "Delete Corner"
- msgstr "Eckpunkt löschen"
- 
-@@ -6018,11 +6304,11 @@ msgid ""
- "Can't convert output filename '%s' to locale encoding.\n"
- "Please choose a different name to save with cairo.\n"
- msgstr ""
--"Name der Ausgabedatei »%s« konnte nicht in lokale Zeichenkodierung "
--"umgewandelt werden.\n"
-+"Name der Ausgabedatei »%s« konnte nicht in lokale Zeichenkodierung umgewandelt werden.\n"
- "Bitte wählen Sie einen anderen Namen, um mit Cairo zu speichern.\n"
- 
--#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
-+#: ../plug-ins/cairo/diacairo.c:256
-+#: ../plug-ins/cairo/diacairo.c:272
- #, c-format
- msgid "Can't write %d bytes to %s"
- msgstr "Es konnten nicht %d Bytes in %s geschrieben werden."
-@@ -6031,7 +6317,8 @@ msgstr "Es konnten nicht %d Bytes in %s geschrieben werden."
- msgid "Clipboard copy failed"
- msgstr "Kopieren in die Zwischenablage ist fehlgeschlagen"
- 
--#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
-+#: ../plug-ins/cairo/diacairo.c:311
-+#: ../plug-ins/postscript/postscript.c:39
- #: ../plug-ins/wmf/wmf.cpp:1381
- msgid "Nothing to print"
- msgstr "Nichts zu drucken"
-@@ -6104,7 +6391,8 @@ msgstr "DiaRenderScript"
- msgid "DiaRenderScript filter"
- msgstr "DiaRenderScript-Filter"
- 
--#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
-+#: ../plug-ins/dxf/dxf-export.c:598
-+#: ../plug-ins/dxf/dxf-import.c:1402
- msgid "Drawing Interchange File"
- msgstr "DXF-Datei"
- 
-@@ -6217,11 +6505,12 @@ msgid "Select Printer"
- msgstr "Drucker auswählen"
- 
- #: ../plug-ins/postscript/paginate_psprint.c:285
--#: ../sheets/ciscocomputer.sheet.in.h:36
-+#: ../sheets/ciscocomputer.sheet.in.h:37
- msgid "Printer"
- msgstr "Drucker"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
-+#: ../plug-ins/postscript/paginate_psprint.c:299
-+#: ../sheets/Misc.sheet.in.h:5
- msgid "File"
- msgstr "Datei"
- 
-@@ -6255,8 +6544,7 @@ msgstr "Gekapseltes PostScript (unter Verwendung von Pango-Schriften)"
- 
- #: ../plug-ins/postscript/render_eps.c:159
- msgid "Encapsulated Postscript with preview (using Pango fonts)"
--msgstr ""
--"Gekapseltes PostScript mit Vorschau (unter Verwendung von Pango-Schriften)"
-+msgstr "Gekapseltes PostScript mit Vorschau (unter Verwendung von Pango-Schriften)"
- 
- #: ../plug-ins/postscript/render_eps.c:169
- msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-@@ -6289,9 +6577,7 @@ msgstr "Python-Makro-Unterstützung"
- 
- #: ../plug-ins/shape/shape-export.c:474
- msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
--msgstr ""
--"Form-Dateien müssen die Endung .shape haben oder können von Dia nicht "
--"geladen werden"
-+msgstr "Form-Dateien müssen die Endung .shape haben oder können von Dia nicht geladen werden"
- 
- #: ../plug-ins/shape/shape-export.c:488
- msgid "Can't export png icon without export plug-in!"
-@@ -6326,7 +6612,8 @@ msgstr "Wurzelelement ist »%s« - »svg« erwartet."
- msgid "Scalable Vector Graphics import and export filters"
- msgstr "Import- und Exportfilter für Skalierbare Vektorgrafik (SVG)"
- 
--#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
-+#: ../plug-ins/vdx/vdx-export.c:1376
-+#: ../plug-ins/vdx/vdx-export.c:1385
- #, c-format
- msgid "Couldn't read file %s"
- msgstr "Datei konnte nicht gelesen werden: %s"
-@@ -6335,7 +6622,8 @@ msgstr "Datei konnte nicht gelesen werden: %s"
- msgid "Visio XML format"
- msgstr "Visio XML-Format"
- 
--#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
-+#: ../plug-ins/vdx/vdx-import.c:227
-+#: ../plug-ins/xfig/xfig-import.c:1046
- #, c-format
- msgid "Couldn't read color: %s\n"
- msgstr "Farbe konnte nicht gelesen werden: %s\n"
-@@ -6367,7 +6655,8 @@ msgstr "Ungültige NURBS-Formel"
- msgid "Couldn't write file %s"
- msgstr "Datei konnte nicht geschrieben werden: %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:2069 ../plug-ins/vdx/vdx-import.c:2082
-+#: ../plug-ins/vdx/vdx-import.c:2069
-+#: ../plug-ins/vdx/vdx-import.c:2082
- #, c-format
- msgid "Couldn't handle foreign object type %s"
- msgstr "Fremd-Objekt konnte nicht behandelt werden: %s"
-@@ -6430,7 +6719,8 @@ msgstr "WMF-Exportfilter"
- msgid "File: %s type/version unsupported.\n"
- msgstr "Datei: %s Typ/Version nicht unterstützt.\n"
- 
--#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
-+#: ../plug-ins/wpg/wpg.c:1321
-+#: ../plug-ins/wpg/wpg.c:1328
- msgid "WPG"
- msgstr "WPG"
- 
-@@ -6441,15 +6731,11 @@ msgstr "WordPerfect Grafik-Exportfilter"
- #: ../plug-ins/xfig/xfig-export.c:463
- #, c-format
- msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
--msgstr ""
--"Das FIG-Format bietet kein Äquivalent zum Pfeilstils %s, einfacher Pfeil "
--"wird verwendet.\n"
-+msgstr "Das FIG-Format bietet kein Äquivalent zum Pfeilstils %s, einfacher Pfeil wird verwendet.\n"
- 
- #: ../plug-ins/xfig/xfig-export.c:486
- msgid "No more user-definable colors - using black"
--msgstr ""
--"Es sind keine benutzerdefinierbaren Farben mehr vorhanden - es wird schwarz "
--"verwendet"
-+msgstr "Es sind keine benutzerdefinierbaren Farben mehr vorhanden - es wird schwarz verwendet"
- 
- #: ../plug-ins/xfig/xfig-export.c:1207
- msgid "XFig format"
-@@ -6458,9 +6744,7 @@ msgstr "XFig Format"
- #: ../plug-ins/xfig/xfig-import.c:111
- #, c-format
- msgid "Color index %d too high, only 512 colors allowed. Using black instead."
--msgstr ""
--"Farbindex %d ist zu groß, nur 512 Farben sind erlaubt. Stattdessen wird "
--"Schwarz verwendet."
-+msgstr "Farbindex %d ist zu groß, nur 512 Farben sind erlaubt. Stattdessen wird Schwarz verwendet."
- 
- #: ../plug-ins/xfig/xfig-import.c:138
- msgid "Patterns are not supported by Dia"
-@@ -6468,9 +6752,7 @@ msgstr "Schablonen sind noch nicht implementiert"
- 
- #: ../plug-ins/xfig/xfig-import.c:166
- msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
--msgstr ""
--"Dreifach gepunktete Linien werden von Dia nicht unterstützt, es werden "
--"doppelt gepunktete Linien verwendet"
-+msgstr "Dreifach gepunktete Linien werden von Dia nicht unterstützt, es werden doppelt gepunktete Linien verwendet"
- 
- #: ../plug-ins/xfig/xfig-import.c:170
- #, c-format
-@@ -6520,14 +6802,16 @@ msgstr "Negativer Eckenradius; wird invertiert"
- msgid "Unknown polyline subtype: %d\n"
- msgstr "Unbekannter Mehrfachlinien-Untertyp: %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
-+#: ../plug-ins/xfig/xfig-import.c:720
-+#: ../plug-ins/xfig/xfig-import.c:752
- #, c-format
- msgid "Couldn't read spline info: %s\n"
- msgstr "Mehrfachlinien-Informationen konnte nicht gelesen werden: %s\n"
- 
- #. Open approximated spline
- #. Closed approximated spline
--#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
-+#: ../plug-ins/xfig/xfig-import.c:739
-+#: ../plug-ins/xfig/xfig-import.c:757
- msgid "Cannot convert approximated spline yet."
- msgstr "Annäherungs-Mehrfachkurven können noch nicht konvertiert werden."
- 
-@@ -6568,8 +6852,7 @@ msgstr "Verbund endete außerhalb des Verbundes\n"
- #: ../plug-ins/xfig/xfig-import.c:1051
- #, c-format
- msgid "Color number %d out of range 0..%d.  Discarding color.\n"
--msgstr ""
--"Farbnummer %d ist außerhalb des Bereichs 0..%d. Farbe wird verworfen.\n"
-+msgstr "Farbnummer %d ist außerhalb des Bereichs 0..%d. Farbe wird verworfen.\n"
- 
- #: ../plug-ins/xfig/xfig-import.c:1097
- #, c-format
-@@ -6626,13 +6909,15 @@ msgstr "Fehler beim Lesen des Mehrfachseiten-Indikators: %s\n"
- msgid "Error reading transparent color: %s\n"
- msgstr "Fehler beim Lesen der transparenten Farbe: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
-+#: ../plug-ins/xfig/xfig-import.c:1234
-+#: ../plug-ins/xfig/xfig-import.c:1290
- #: ../plug-ins/xfig/xfig-import.c:1308
- #, c-format
- msgid "Error reading FIG file: %s\n"
- msgstr "Fehler beim Lesen der FIG-Datei: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
-+#: ../plug-ins/xfig/xfig-import.c:1236
-+#: ../plug-ins/xfig/xfig-import.c:1292
- msgid "Premature end of FIG file\n"
- msgstr "Vorzeitiges Ende der FIG-Datei\n"
- 
-@@ -6649,9 +6934,7 @@ msgstr "Sieht nicht nach einer FIG-Datei aus: %s\n"
- #: ../plug-ins/xfig/xfig-import.c:1283
- #, c-format
- msgid "This is a FIG version %d.%d file, I may not understand it\n"
--msgstr ""
--"Dies ist eine FIG-Datei Version %d.%d, es kann sein, dass sie nicht lesbar "
--"ist\n"
-+msgstr "Dies ist eine FIG-Datei Version %d.%d, es kann sein, dass sie nicht lesbar ist\n"
- 
- #: ../plug-ins/xfig/xfig-import.c:1331
- msgid "XFig File Format"
-@@ -6697,9 +6980,7 @@ msgstr "XSL-Transformationsfilter"
- 
- #: ../plug-ins/xslt/xslt.c:362
- msgid "No valid configuration files found for the XSLT plugin, not loading."
--msgstr ""
--"Für das XSLT-Plugin konnten keine gültigen Konfigurationsdateien gefunden "
--"werden. Daher wird es nicht geladen."
-+msgstr "Für das XSLT-Plugin konnten keine gültigen Konfigurationsdateien gefunden werden. Daher wird es nicht geladen."
- 
- #: ../plug-ins/xslt/xsltdialog.c:97
- msgid "Export through XSLT"
-@@ -6721,607 +7002,603 @@ msgstr "AADL"
- msgid "AADL Shapes"
- msgstr "AADL-Formen"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
--msgstr "Bus"
--
--#: ../sheets/AADL.sheet.in.h:5
--msgid "Device"
--msgstr "Gerät"
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
-+msgstr "Faden"
- 
- #: ../sheets/AADL.sheet.in.h:6
-+msgid "Processor"
-+msgstr "Prozessor"
-+
-+#: ../sheets/AADL.sheet.in.h:7
- msgid "Memory"
- msgstr "Speicher"
- 
--#: ../sheets/AADL.sheet.in.h:7
--msgid "Package"
--msgstr "Paket"
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Bus"
- 
- #: ../sheets/AADL.sheet.in.h:9
--msgid "Processor"
--msgstr "Prozessor"
-+msgid "System"
-+msgstr "Sytem"
- 
- #: ../sheets/AADL.sheet.in.h:10
- msgid "Subprogram"
- msgstr "Unterprogrammaufrufsschritt"
- 
- #: ../sheets/AADL.sheet.in.h:11
--msgid "System"
--msgstr "Sytem"
-+msgid "Thread Group"
-+msgstr "Faden Gruppe"
- 
- #: ../sheets/AADL.sheet.in.h:12
--msgid "Thread"
--msgstr "Faden"
-+msgid "Device"
-+msgstr "Gerät"
- 
- #: ../sheets/AADL.sheet.in.h:13
--msgid "Thread Group"
--msgstr "Faden Gruppe"
-+msgid "Package"
-+msgstr "Paket"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Vermischtes"
- 
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
--msgid ""
--"An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
--"Geometric Shapes"
--msgstr ""
--"Eine unsortierte Sammlung von Polygonen, Beziergonen und anderen "
--"geometrischen Formen"
--
--#. Please talk to me before making any changes to this sheet
- #: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Vermischtes"
-+msgid "An Assorted Collection of Polygons, Beziergons and other Miscellaneous Geometric Shapes"
-+msgstr "Eine unsortierte Sammlung von Polygonen, Beziergonen und anderen geometrischen Formen"
- 
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "Sparre"
-+msgid "Right angle triangle"
-+msgstr "Rechtwinkliges Dreieck"
- 
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Gekurvter Stern mit acht Zacken"
-+msgid "Isoceles triangle"
-+msgstr "Gleichschenkliges Dreieck"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Gekurvter Stern mit vier Zacken"
-+msgid "Perfect square, height equals width"
-+msgstr "Perfektes Quadrat, Höhe gleich Breite"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Diamant"
-+msgid "Perfect circle"
-+msgstr "Perfekter Kreis"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Pfeil nach unten"
-+msgid "Quarter circle"
-+msgstr "Viertelkreis"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "Stern mit acht Zacken"
-+msgid "Diamond"
-+msgstr "Diamant"
- 
- #: ../sheets/Assorted.sheet.in.h:13
--msgid "Five point star"
--msgstr "Stern mit fünf Zacken"
-+msgid "Pentagon. Five sided shape"
-+msgstr "Pentagon. Fünfseitige Form"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Stern mit vier Zacken"
-+msgid "Hexagon. Six sided shape"
-+msgstr "Hexagon. Sechsseitige Form"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Herz"
--
--#: ../sheets/Assorted.sheet.in.h:16
- msgid "Heptagon. Seven sided shape"
- msgstr "Heptagon. Siebenseitige Form"
- 
--#: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Hexagon. Sechsseitige Form"
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Oktogon. Achtseitige Form"
- 
--#: ../sheets/Assorted.sheet.in.h:18
-+#: ../sheets/Assorted.sheet.in.h:17
- msgid "Horizontal parallelogram"
- msgstr "Horizontales Parallelogramm"
- 
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Vertikales Parallelogramm"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Gleichschenkliges Dreieck"
-+msgid "Trapezoid"
-+msgstr "Trapezoid"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Pfeil nach links"
-+msgid "Four point star"
-+msgstr "Stern mit vier Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Pfeil nach links und rechts"
-+msgid "Curved four point star"
-+msgstr "Gekurvter Stern mit vier Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Pfeil nach links, rechts und oben"
-+msgid "Five point star"
-+msgstr "Stern mit fünf Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Pfeil nach links und oben"
-+msgid "Six point star"
-+msgstr "Stern mit sechs Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Malteserkreuz"
-+msgid "Seven point star"
-+msgstr "Stern mit sieben Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "Eingekerbter Pfeil nach links"
-+msgid "Eight point star"
-+msgstr "Stern mit acht Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "Eingekerbter Pfeil nach rechts"
-+msgid "Sharp eight point star"
-+msgstr "Scharfer Stern mit acht Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "Oktogon. Achtseitige Form"
-+msgid "Curved eight point star"
-+msgstr "Gekurvter Stern mit acht Zacken"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "Fünfseitiger Blockpfeil"
-+msgid "Swiss cross"
-+msgstr "Schweizer Kreuz"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Pentagon. Fünfseitige Form"
-+msgid "Maltese cross"
-+msgstr "Malteserkreuz"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Perfekter Kreis"
-+msgid "Down arrow"
-+msgstr "Pfeil nach unten"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Perfektes Quadrat, Höhe gleich Breite"
-+msgid "Up arrow"
-+msgstr "Pfeil nach oben"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Pfeil in alle vier Richtungen"
-+msgid "Left arrow"
-+msgstr "Pfeil nach links"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "Viertelkreis"
-+msgid "Right arrow"
-+msgstr "Pfeil nach rechts"
- 
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "Viertelmond"
-+msgid "Notched left arrow"
-+msgstr "Eingekerbter Pfeil nach links"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Rechtwinkliges Dreieck"
-+msgid "Notched right arrow"
-+msgstr "Eingekerbter Pfeil nach rechts"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Pfeil nach rechts"
-+msgid "Left-up arrow"
-+msgstr "Pfeil nach links und oben"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Stern mit sieben Zacken"
-+msgid "Turn-up arrow"
-+msgstr "Pfeil von links nach oben"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Scharfer Stern mit acht Zacken"
-+msgid "Left-right arrow"
-+msgstr "Pfeil nach links und rechts"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Stern mit sechs Zacken"
-+msgid "Up-down arrow"
-+msgstr "Pfeil nach oben und unten"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Sonne"
-+msgid "Quad arrow"
-+msgstr "Pfeil in alle vier Richtungen"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Schweizer Kreuz"
-+msgid "Left-right-up arrow"
-+msgstr "Pfeil nach links, rechts und oben"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Trapezoid"
-+msgid "Up-down-left arrow"
-+msgstr "Pfeil nach oben, unten und links"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--msgid "Turn-up arrow"
--msgstr "Pfeil von links nach oben"
-+msgid "Pentagon block arrow"
-+msgstr "Fünfseitiger Blockpfeil"
- 
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "Pfeil nach oben"
-+msgid "Chevron"
-+msgstr "Sparre"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Pfeil nach oben und unten"
-+msgid "Heart"
-+msgstr "Herz"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Pfeil nach oben, unten und links"
-+msgid "Sun"
-+msgstr "Sonne"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "Vertikales Parallelogramm"
--
--#: ../sheets/BPMN.sheet.in.h:1
--msgid "Activity Looping"
--msgstr "Aktivität endlos wiederholen"
--
--#: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
--msgstr "Spontan eingeklappter Unterprozess"
-+msgid "Quarter moon"
-+msgstr "Viertelmond"
- 
- #. For: anthonym
--#: ../sheets/BPMN.sheet.in.h:4
-+#: ../sheets/BPMN.sheet.in.h:2
- msgid "BPMN"
- msgstr "BPMN"
- 
--#: ../sheets/BPMN.sheet.in.h:5
-+#: ../sheets/BPMN.sheet.in.h:3
- msgid "Business Process Modeling Notation"
- msgstr "Geschäftsprozess-Modellierungssprache"
- 
-+#: ../sheets/BPMN.sheet.in.h:4
-+msgid "Start Event"
-+msgstr "Anfangsereignis"
-+
-+#: ../sheets/BPMN.sheet.in.h:5
-+msgid "Start Event - Message"
-+msgstr "Anfangsereignis - Nachricht"
-+
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
--msgstr "Eingeklappter Unterprozess"
-+msgid "Start Event - Timer"
-+msgstr "Anfangsereignis - Zeituhr"
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
--msgstr ""
-+msgid "Start Event - Rule"
-+msgstr "Anfangsereignis - Regel"
- 
- #: ../sheets/BPMN.sheet.in.h:8
--msgid "Compensation Task"
--msgstr "Kompensationsaufgabe"
-+msgid "Start Event - Link"
-+msgstr "Anfangsereignis - Verweis"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--msgid "Complex"
--msgstr "Komplex"
-+msgid "Start Event - Multiple"
-+msgstr "Anfangsereignis - Mehrfach"
- 
- #: ../sheets/BPMN.sheet.in.h:10
--msgid "Data Object"
--msgstr "Datenobjekt"
-+msgid "Intermediate Event"
-+msgstr "Zwischenzeitliches Ereignis"
- 
- #: ../sheets/BPMN.sheet.in.h:11
--msgid "End Event"
--msgstr "Endereignis"
-+msgid "Intermediate Event - Message"
-+msgstr "Zwischenzeitliches Ereignis - Nachricht"
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
--msgstr "Endereignis - Abbruch"
-+msgid "Intermediate Event - Timer"
-+msgstr "Zwischenzeitliches Ereignis - Zeituhr"
- 
- #: ../sheets/BPMN.sheet.in.h:13
--msgid "End Event - Compensation"
--msgstr "Endereignis - Ausgleich"
-+msgid "Intermediate Event - Error"
-+msgstr "Zwischenzeitliches Ereignis - Fehler"
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
--msgstr "Endereignis - Fehler"
-+msgid "Intermediate Event - Cancel"
-+msgstr "Zwischenzeitliches Ereignis - Abbruch"
- 
- #: ../sheets/BPMN.sheet.in.h:15
--msgid "End Event - Link"
--msgstr "Endereignis - Verweis"
-+msgid "Intermediate Event - Compensation"
-+msgstr "Zwischenzeitliches Ereignis - Ausgleich"
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
--msgstr "Endereignis - Nachricht"
-+msgid "Intermediate Event - Rule"
-+msgstr "Zwischenzeitliches Ereignis - Regel"
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
--msgstr "Endereignis - Mehrfach"
-+msgid "Intermediate Event - Link"
-+msgstr "Zwischenzeitliches Ereignis - Verweis"
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
--msgstr "Endereignis - Beenden"
-+msgid "Intermediate Event - Multiple"
-+msgstr "Zwischenzeitliches Ereignis - Mehrfach"
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
--msgstr "Exklusiv (XOR) datenbasiert"
-+msgid "End Event"
-+msgstr "Endereignis"
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
--msgstr "Exklusiv (XOR) ereignisbasiert"
-+msgid "End Event - Message"
-+msgstr "Endereignis - Nachricht"
- 
- #: ../sheets/BPMN.sheet.in.h:21
--msgid "Gateway"
--msgstr "Gateway"
-+msgid "End Event - Error"
-+msgstr "Endereignis - Fehler"
- 
- #: ../sheets/BPMN.sheet.in.h:22
--msgid "Group"
--msgstr "Gruppe"
-+msgid "End Event - Cancel"
-+msgstr "Endereignis - Abbruch"
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
--msgstr "Inklusiv (OR)"
-+msgid "End Event - Compensation"
-+msgstr "Endereignis - Ausgleich"
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr "Zwischenzeitliches Ereignis"
-+msgid "End Event - Link"
-+msgstr "Endereignis - Verweis"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
--msgstr "Zwischenzeitliches Ereignis - Abbruch"
-+msgid "End Event - Multiple"
-+msgstr "Endereignis - Mehrfach"
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
--msgstr "Zwischenzeitliches Ereignis - Ausgleich"
-+msgid "End Event - Terminate"
-+msgstr "Endereignis - Beenden"
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
--msgstr "Zwischenzeitliches Ereignis - Fehler"
-+msgid "Gateway"
-+msgstr "Gateway"
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
--msgstr "Zwischenzeitliches Ereignis - Verweis"
-+msgid "Exclusive (XOR) Data Based"
-+msgstr "Exklusiv (XOR) datenbasiert"
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
--msgstr "Zwischenzeitliches Ereignis - Nachricht"
-+msgid "Exclusive (XOR) Event Based"
-+msgstr "Exklusiv (XOR) ereignisbasiert"
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
--msgstr "Zwischenzeitliches Ereignis - Mehrfach"
-+msgid "Inclusive (OR)"
-+msgstr "Inklusiv (OR)"
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
--msgstr "Zwischenzeitliches Ereignis - Regel"
-+msgid "Complex"
-+msgstr "Komplex"
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr "Zwischenzeitliches Ereignis - Zeituhr"
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
--msgstr "Eingeklappter Unterprozess wird endlos wiederholt"
-+msgid "Parallel (AND)"
-+msgstr "Parallel (AND)"
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
--msgstr "Eingeklappter Unterprozess mit mehreren Instanzen"
-+msgid "Activity Looping"
-+msgstr "Aktivität endlos wiederholen"
- 
- #: ../sheets/BPMN.sheet.in.h:35
- msgid "Multiple Instance Task"
- msgstr "Aufgabe mit mehreren Instanzen"
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
--msgstr "Parallel (AND)"
-+msgid "Compensation Task"
-+msgstr "Kompensationsaufgabe"
- 
- #: ../sheets/BPMN.sheet.in.h:37
--msgid "Start Event"
--msgstr "Anfangsereignis"
-+msgid "Collapsed Sub-Process"
-+msgstr "Eingeklappter Unterprozess"
- 
- #: ../sheets/BPMN.sheet.in.h:38
--msgid "Start Event - Link"
--msgstr "Anfangsereignis - Verweis"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr "Eingeklappter Unterprozess wird endlos wiederholt"
- 
- #: ../sheets/BPMN.sheet.in.h:39
--msgid "Start Event - Message"
--msgstr "Anfangsereignis - Nachricht"
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr "Eingeklappter Unterprozess mit mehreren Instanzen"
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
--msgstr "Anfangsereignis - Mehrfach"
-+msgid "Ad-Hoc Collapsed Sub-Process"
-+msgstr "Spontan eingeklappter Unterprozess"
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
--msgstr "Anfangsereignis - Regel"
-+msgid "Compensation Collapsed Sub-Process"
-+msgstr "Eingeklappter Kompensationsunterprozess"
- 
- #: ../sheets/BPMN.sheet.in.h:42
--msgid "Start Event - Timer"
--msgstr "Anfangsereignis - Zeituhr"
--
--#: ../sheets/BPMN.sheet.in.h:44
--msgid "Text Annotation"
--msgstr "Textanmerkung"
-+msgid "Group"
-+msgstr "Gruppe"
- 
--#: ../sheets/BPMN.sheet.in.h:45
-+#: ../sheets/BPMN.sheet.in.h:43
- msgid "Transaction"
- msgstr "Transaktion"
- 
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
--msgstr "Wechselstromgenerator"
-+#: ../sheets/BPMN.sheet.in.h:44
-+msgid "Data Object"
-+msgstr "Datenobjekt"
-+
-+#: ../sheets/BPMN.sheet.in.h:45
-+msgid "Text Annotation"
-+msgstr "Textanmerkung"
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--msgid "Air Cooler"
--msgstr "Luftkühler"
-+msgid "ChemEng"
-+msgstr "Chemietechnik"
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
--msgstr "Dampfkessel"
-+msgid "Collection for chemical engineering"
-+msgstr "Sammlung für chemische Verfahrenstechnik"
- 
- #: ../sheets/ChemEng.sheet.in.h:4
--msgid "Axial Flow Fan"
--msgstr "Axiallüfter"
-+msgid "Fan or Stirrer"
-+msgstr "Lüfter oder Rührer"
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--msgid "Basic Filter"
--msgstr "Einfacher Filter"
-+msgid "Spraying Device"
-+msgstr "Sprühgerät"
- 
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
--msgstr "Kreiselpumpe/-lüfter"
-+msgid "Pneumatic Line"
-+msgstr "Druckluftleitung"
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--msgid "Centrifuge"
--msgstr "Zentrifuge"
-+msgid "Pneumatic Line, vertical"
-+msgstr "Druckluftleitung, vertikal"
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--msgid "ChemEng"
--msgstr "Chemietechnik"
-+msgid "Simple Heat Exchanger"
-+msgstr "Einfacher Wärmetauscher"
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
--msgstr "Absetzbecken oder Abscheider"
-+msgid "Simple Heat Exchanger, vertical"
-+msgstr "Einfacher Wärmetauscher, vertikal"
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
--msgstr "Sammlung für chemische Verfahrenstechnik"
-+msgid "Water Cooler"
-+msgstr "Wasserkühler"
- 
- #: ../sheets/ChemEng.sheet.in.h:12
--msgid "Compressor or Turbine"
--msgstr "Kompressor oder Turbine"
-+msgid "Water Cooler, vertical"
-+msgstr "Wasserkühler (vertikal)"
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--msgid "Covered tank"
--msgstr "Abgedeckter Tank"
-+msgid "Fixed-Sheet Exchanger"
-+msgstr "Rohrbündel-Wärmetauscher"
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
--msgstr "Fliehkraftabscheider"
-+msgid "Floating-Head or U-Tube Exchanger"
-+msgstr "Gerad- oder U-Rohr-Wärmetauscher"
- 
- #: ../sheets/ChemEng.sheet.in.h:15
--msgid "Double-Pipe Exchanger"
--msgstr "Doppelrohr-Wärmetauscher"
-+msgid "Kettle Reboiler"
-+msgstr "Kesselverdampfer"
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
--msgstr "Düse"
-+msgid "Air Cooler"
-+msgstr "Luftkühler"
- 
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
--msgstr "Lüfter oder Rührer"
-+msgid "Forced-Flow Air Cooler"
-+msgstr "Luftkühler (forcierter Luftstrom)"
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
--msgstr "Rohrbündel-Wärmetauscher"
-+msgid "Induced-Flow Air Cooler"
-+msgstr "Luftkühler (induzierter oder natürlicher Luftstrom)"
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
--msgstr "Gerad- oder U-Rohr-Wärmetauscher"
-+msgid "Plate Exchanger"
-+msgstr "Plattentauscher"
- 
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
--msgstr "Flüssigkeits-Kontaktbehälter, einfach"
-+msgid "Double-Pipe Exchanger"
-+msgstr "Doppelrohr-Wärmetauscher"
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
--msgstr "Luftkühler (forcierter Luftstrom)"
-+msgid "Heating/Cooling Coil"
-+msgstr "Heiz-/Kühlspirale"
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
--msgstr "Gasbehälter, einfach"
-+msgid "Heating/Cooling Coil, vertical"
-+msgstr "Heiz-/Kühlspirale, vertikal"
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
--msgstr "Heiz-/Kühlspirale"
-+msgid "Simple Furnace"
-+msgstr "Einfacher Ofen"
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
--msgstr "Heiz-/Kühlspirale, vertikal"
-+msgid "Simple Vessel"
-+msgstr "Einfaches Gefäß"
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
--msgstr "Luftkühler (induzierter oder natürlicher Luftstrom)"
-+msgid "Knock-out Drum (with demister pad)"
-+msgstr "Knock-Out-Behälter (mit Filtermatte)"
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
--msgstr "Kesselverdampfer"
-+msgid "Tray Column, simple"
-+msgstr "Kolonne (einfach)"
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
--msgstr "Knock-Out-Behälter (mit Filtermatte)"
-+msgid "Tray Column, detailed"
-+msgstr "Kolonne (detailliert)"
-+
-+#: ../sheets/ChemEng.sheet.in.h:28
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr "Flüssigkeits-Kontaktbehälter, einfach"
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--msgid "Mixer"
--msgstr "Mixer"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr "Reaktor oder Auffanggefäß, einfach"
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
--msgstr "Offener Tank"
-+msgid "Autoclave"
-+msgstr "Dampfkessel"
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
--msgstr "Plattentauscher"
-+msgid "Open Tank"
-+msgstr "Offener Tank"
- 
- #: ../sheets/ChemEng.sheet.in.h:32
--msgid "Pneumatic Line"
--msgstr "Druckluftleitung"
-+msgid "Clarifier or Settling Tank"
-+msgstr "Absetzbecken oder Abscheider"
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
--msgstr "Druckluftleitung, vertikal"
-+msgid "Sealed Tank"
-+msgstr "Geschlossener Tank"
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
--msgstr "Druck-Kreiselpumpe oder -kompressor "
-+msgid "Covered tank"
-+msgstr "Abgedeckter Tank"
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Pressure Relief Valve"
--msgstr "Ãœberdruckventil"
-+msgid "Tank with Fixed Roof"
-+msgstr "Tank mit feststehendem Dach"
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reactor or Absorption Vessel, simple"
--msgstr "Reaktor oder Auffanggefäß, einfach"
-+msgid "Tank with Floating Roof"
-+msgstr "Tank mit Schwimmdach"
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--msgid "Reciprocating Compressor or Pump"
--msgstr "Kolbenkompressor oder -pumpe"
-+msgid "Storage Sphere"
-+msgstr "Kugeltank"
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--msgid "Regulable Valve"
--msgstr "Regelbares Ventil"
-+msgid "Gas Holder, basic"
-+msgstr "Gasbehälter, einfach"
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Regulable Valve, vertical"
--msgstr "Regelbares Ventil (vertikal)"
-+msgid "Centrifugal Pump or Fan"
-+msgstr "Kreiselpumpe/-lüfter"
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--msgid "Sealed Tank"
--msgstr "Geschlossener Tank"
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr "Druck-Kreiselpumpe oder -kompressor "
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Furnace"
--msgstr "Einfacher Ofen"
-+msgid "Reciprocating Compressor or Pump"
-+msgstr "Kolbenkompressor oder -pumpe"
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger"
--msgstr "Einfacher Wärmetauscher"
-+msgid "Axial Flow Fan"
-+msgstr "Axiallüfter"
- 
- #: ../sheets/ChemEng.sheet.in.h:43
--msgid "Simple Heat Exchanger, vertical"
--msgstr "Einfacher Wärmetauscher, vertikal"
-+msgid "Compressor or Turbine"
-+msgstr "Kompressor oder Turbine"
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Simple Vessel"
--msgstr "Einfaches Gefäß"
-+msgid "Ejector or Injector"
-+msgstr "Düse"
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spray Drier"
--msgstr "Sprühtrockner"
-+msgid "AC Generator"
-+msgstr "Wechselstromgenerator"
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--msgid "Spraying Device"
--msgstr "Sprühgerät"
-+msgid "Valve"
-+msgstr "Ventil"
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Storage Sphere"
--msgstr "Kugeltank"
-+msgid "Valve, vertical"
-+msgstr "Ventil (vertikal)"
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Fixed Roof"
--msgstr "Tank mit feststehendem Dach"
-+msgid "Regulable Valve"
-+msgstr "Regelbares Ventil"
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tank with Floating Roof"
--msgstr "Tank mit Schwimmdach"
-+msgid "Regulable Valve, vertical"
-+msgstr "Regelbares Ventil (vertikal)"
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, detailed"
--msgstr "Kolonne (detailliert)"
-+msgid "Basic Filter"
-+msgstr "Einfacher Filter"
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--msgid "Tray Column, simple"
--msgstr "Kolonne (einfach)"
-+msgid "Mixer"
-+msgstr "Mixer"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--msgid "Valve"
--msgstr "Ventil"
-+msgid "Cyclone and hydrocyclone"
-+msgstr "Fliehkraftabscheider"
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--msgid "Valve, vertical"
--msgstr "Ventil (vertikal)"
-+msgid "Spray Drier"
-+msgstr "Sprühtrockner"
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--msgid "Water Cooler"
--msgstr "Wasserkühler"
-+msgid "Centrifuge"
-+msgstr "Zentrifuge"
- 
- #: ../sheets/ChemEng.sheet.in.h:55
--msgid "Water Cooler, vertical"
--msgstr "Wasserkühler (vertikal)"
-+msgid "Pressure Relief Valve"
-+msgstr "Ãœberdruckventil"
- 
- #: ../sheets/Circuit.sheet.in.h:1
- msgid "Circuit"
-@@ -7332,305 +7609,307 @@ msgid "Components for circuit diagrams"
- msgstr "Komponenten für Schaltkreisdiagramme"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "Massepunkt"
-+msgid "Vertically aligned resistor"
-+msgstr "Vertikal ausgerichteter Widerstand"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Horizontaler Jumper"
-+msgid "Horizontally aligned inductor"
-+msgstr "Horizontal ausgerichtete Drosselspule"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "Horizontal ausgerichtete LED"
-+msgid "Vertically aligned inductor"
-+msgstr "Vertikal ausgerichtete Drosselspule"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Horizontal ausgerichteter Kondensator"
-+msgid "Horizontally aligned resistor"
-+msgstr "Horizontal ausgerichteter Widerstand"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Horizontal ausgerichtete Diode"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Vertikal ausgerichteter Widerstand (europäisch)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Horizontal ausgerichtete Sicherung"
--
--#: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Horizontal ausgerichtete Drosselspule"
--
--#: ../sheets/Circuit.sheet.in.h:10
- msgid "Horizontally aligned inductor (European)"
- msgstr "Horizontal ausgerichtete Drosselspule (europäisch)"
- 
--#: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Horizontal ausgerichtete Stromquelle"
--
--#: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Horizontal ausgerichteter Widerstand"
-+#: ../sheets/Circuit.sheet.in.h:9
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Vertikal ausgerichtete Drosselspule (europäisch)"
- 
--#: ../sheets/Circuit.sheet.in.h:13
-+#: ../sheets/Circuit.sheet.in.h:10
- msgid "Horizontally aligned resistor (European)"
- msgstr "Horizontal ausgerichteter Widerstand (europäisch)"
- 
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Horizontal ausgerichtete Zener-Diode"
--
--#: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Lampe"
--
--#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Mikrofon"
-+#: ../sheets/Circuit.sheet.in.h:11
-+msgid "Horizontally aligned capacitor"
-+msgstr "Horizontal ausgerichteter Kondensator"
- 
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "NMOS-Transistor"
-+#: ../sheets/Circuit.sheet.in.h:12
-+msgid "Vertically aligned capacitor"
-+msgstr "Vertikal ausgerichteter Kondensator"
- 
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:20
-+#: ../sheets/Circuit.sheet.in.h:15
- msgid "NPN bipolar transistor"
- msgstr "Bipolarer NPN-Transistor"
- 
--#: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Operationsverstärker"
--
--#: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "PMOS-Transistor"
--
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:25
-+#: ../sheets/Circuit.sheet.in.h:18
- msgid "PNP bipolar transistor"
- msgstr "Bipolarer PNP-Transistor"
- 
--#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Lautsprecher"
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Horizontal ausgerichtete Diode"
- 
--#: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "Vertikal ausgerichtete LED"
-+#: ../sheets/Circuit.sheet.in.h:20
-+msgid "Vertically aligned diode"
-+msgstr "Vertikal ausgerichtete Diode"
-+
-+#: ../sheets/Circuit.sheet.in.h:21
-+msgid "Horizontally aligned zener diode"
-+msgstr "Horizontal ausgerichtete Zener-Diode"
-+
-+#: ../sheets/Circuit.sheet.in.h:22
-+msgid "Vertically aligned zener diode"
-+msgstr "Vertikal ausgerichtete Zener-Diode"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Massepunkt"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Operationsverstärker"
-+
-+#: ../sheets/Circuit.sheet.in.h:25
-+msgid "Horizontally aligned fuse"
-+msgstr "Horizontal ausgerichtete Sicherung"
-+
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "Vertikal ausgerichtete Sicherung"
-+
-+#: ../sheets/Circuit.sheet.in.h:27
-+msgid "Horizontally aligned powersource"
-+msgstr "Horizontal ausgerichtete Stromquelle"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "Vertikal ausgerichteter Kondensator"
-+msgid "Vertically aligned powersource"
-+msgstr "Vertikal ausgerichtete Stromquelle"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "Vertikal ausgerichtete Diode"
-+msgid "Lamp"
-+msgstr "Lampe"
- 
- #: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "Vertikal ausgerichtete Sicherung"
-+#: ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Lautsprecher"
- 
- #: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "Vertikal ausgerichtete Drosselspule"
-+#: ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Mikrofon"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "Vertikal ausgerichtete Drosselspule (europäisch)"
-+msgid "Horizontally aligned LED"
-+msgstr "Horizontal ausgerichtete LED"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "Vertikal ausgerichtete Stromquelle"
-+msgid "Vertically aligned LED"
-+msgstr "Vertikal ausgerichtete LED"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "Vertikal ausgerichteter Widerstand"
-+msgid "NMOS transistor"
-+msgstr "NMOS-Transistor"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "Vertikal ausgerichteter Widerstand (europäisch)"
-+msgid "PMOS transistor"
-+msgstr "PMOS-Transistor"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "Vertikal ausgerichtete Zener-Diode"
-+msgid "Horizontal jumper"
-+msgstr "Horizontaler Jumper"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "(Im Ausgangszustand geschlossener) »wenn nicht«-Leiterkontakt"
-+msgid "Ladder"
-+msgstr "Leiter"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "(Im Ausgangszustand offener) »wenn«-Leiterkontakt"
-+msgid "Components for LADDER circuits"
-+msgstr "Komponenten für Leiter-Schaltkreise"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "»Sprung«-Ausgabevariable"
-+msgid "'if' (normally open) ladder contact"
-+msgstr "(Im Ausgangszustand offener) »wenn«-Leiterkontakt"
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "»Zurücksetzen«-Ausgabevariable"
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "(Im Ausgangszustand geschlossener) »wenn nicht«-Leiterkontakt"
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "»Setzen«-Ausgabevariable"
-+msgid "Simple output variable"
-+msgstr "Einfache Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Komponenten für Leiter-Schaltkreise"
-+msgid "Negative output variable"
-+msgstr "Negative Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Leiter"
-+msgid "'set' output variable"
-+msgstr "»Setzen«-Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "Negative Ausgabevariable"
-+msgid "'reset' output variable"
-+msgstr "»Zurücksetzen«-Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Energiesparende »Zurücksetzen«-Ausgabevariable"
-+msgid "'jump' output variable"
-+msgstr "»Sprung«-Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Energiesparende »Setzen«-Ausgabevariable"
-+msgid "Receptivity output variable"
-+msgstr "»Aufnahmefähigkeit«-Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Energiesparende, negative Ausgabevariable"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Energiesparende, einfache Ausgabevariable"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Energiesparende, negative Ausgabevariable"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "»Aufnahmefähigkeit«-Ausgabevariable"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Energiesparende »Setzen«-Ausgabevariable"
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Einfache Ausgabevariable"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Energiesparende »Zurücksetzen«-Ausgabevariable"
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr "Konstanter Faktor unter -1"
-+msgid "Cybernetics"
-+msgstr "Kybernetik"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
--msgstr "Konstanter Faktor zwischen 0 und -1"
-+msgid "Elements of cybernetic circuits"
-+msgstr "Komponenten für kybernetische Schaltkreise"
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
--msgstr "Konstanter Faktor zwischen 0 und 1"
-+msgid "Sensor - left"
-+msgstr "Sensor - links"
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
--msgstr "Konstanter Faktor über 1"
-+msgid "Sensor - right"
-+msgstr "Sensor - rechts"
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
--msgstr "Konstante negative Verschiebung auf der Y-Achse"
-+msgid "Sensor - bottom"
-+msgstr "Sensor - unten"
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
--msgstr "Konstante positive Verschiebung auf der Y-Achse"
-+msgid "Sensor - top"
-+msgstr "Sensor - oben"
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
--msgstr "Kybernetik"
-+msgid "Sum, subtracting left input"
-+msgstr "Summe, Abziehen des linken Eingangs"
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--msgid "Elements of cybernetic circuits"
--msgstr "Komponenten für kybernetische Schaltkreise"
-+msgid "Sum, subtracting right input"
-+msgstr "Summe, Abziehen des rechten Eingangs"
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
--msgstr "Vollwellen-Gleichrichter (Absolutwert)"
-+msgid "Sum, subtracting bottom input"
-+msgstr "Summe, Abziehen des unteren Eingangs"
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
--msgstr "Halbwellen-Gleichrichter oder Rampeneingang"
-+msgid "Sum, subtracting top input"
-+msgstr "Summe, Abziehen des oberen Eingangs"
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
--msgstr "Hochpass-Filter"
--
--#: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
--msgstr "Integrierer - Eingang unten"
--
--#: ../sheets/Cybernetics.sheet.in.h:13
- msgid "Integrator - input left"
- msgstr "Integrierer - Eingang links"
- 
--#: ../sheets/Cybernetics.sheet.in.h:14
-+#: ../sheets/Cybernetics.sheet.in.h:12
- msgid "Integrator - input right"
- msgstr "Integrierer - Eingang rechts"
- 
--#: ../sheets/Cybernetics.sheet.in.h:15
-+#: ../sheets/Cybernetics.sheet.in.h:13
-+msgid "Integrator - input bottom"
-+msgstr "Integrierer - Eingang unten"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:14
- msgid "Integrator - input top"
- msgstr "Integrierer - Eingang oben"
- 
--#: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
--msgstr "Tiefpass-Filter"
-+#: ../sheets/Cybernetics.sheet.in.h:15
-+msgid "Sum"
-+msgstr "Summe"
- 
- # CHECK Translation
--#: ../sheets/Cybernetics.sheet.in.h:17
-+#: ../sheets/Cybernetics.sheet.in.h:16
- msgid "Product"
- msgstr "Produkt"
- 
-+#: ../sheets/Cybernetics.sheet.in.h:17
-+msgid "High pass filter"
-+msgstr "Hochpass-Filter"
-+
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
--msgstr "Relais-Charakteristik (Sigma)"
-+msgid "Low pass filter"
-+msgstr "Tiefpass-Filter"
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
--msgstr "Sättigungscharakteristik"
-+msgid "Sine characteristic or input"
-+msgstr "Sinus-Charakteristik oder Eingang"
- 
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
--msgstr "Sensor - unten"
-+msgid "Sigmoid characteristic"
-+msgstr "S-förmige Charakteristik"
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
--msgstr "Sensor - links"
-+msgid "Saturation characteristic"
-+msgstr "Sättigungscharakteristik"
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
--msgstr "Sensor - rechts"
-+msgid "Relay characteristic (sigma)"
-+msgstr "Relais-Charakteristik (Sigma)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
--msgstr "Sensor - oben"
-+msgid "Half wave rectifier or ramp input"
-+msgstr "Halbwellen-Gleichrichter oder Rampeneingang"
- 
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
--msgstr "S-förmige Charakteristik"
-+msgid "Full wave rectifier (absolute value)"
-+msgstr "Vollwellen-Gleichrichter (Absolutwert)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
--msgstr "Sinus-Charakteristik oder Eingang"
-+msgid "Constant positive shift on the y-axis"
-+msgstr "Konstante positive Verschiebung auf der Y-Achse"
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--msgid "Sum"
--msgstr "Summe"
-+msgid "Constant negative shift on the y-axis"
-+msgstr "Konstante negative Verschiebung auf der Y-Achse"
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
--msgstr "Summe, Abziehen des unteren Eingangs"
-+msgid "Constant factor greater 1"
-+msgstr "Konstanter Faktor über 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
--msgstr "Summe, Abziehen des linken Eingangs"
-+msgid "Constant factor between 0 and 1"
-+msgstr "Konstanter Faktor zwischen 0 und 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
--msgstr "Summe, Abziehen des rechten Eingangs"
-+msgid "Constant factor between 0 and -1"
-+msgstr "Konstanter Faktor zwischen 0 und -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
--msgstr "Summe, Abziehen des oberen Eingangs"
-+msgid "Constant factor below -1"
-+msgstr "Konstanter Faktor unter -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
- msgid "Template for custom characteristics"
-@@ -7641,332 +7920,328 @@ msgid "Time delay"
- msgstr "Zeitverzögerung"
- 
- #: ../sheets/Database.sheet.in.h:1
--msgid "Attribute compound"
--msgstr "Attribut-Kompositum"
--
--#: ../sheets/Database.sheet.in.h:2
- msgid "Database"
- msgstr "Datenbank"
- 
--#: ../sheets/Database.sheet.in.h:3
-+#: ../sheets/Database.sheet.in.h:2
- msgid "Editor for Database Table Relation Diagrams"
- msgstr "Editor für Datenbank-Tabellen-Beziehungsdiagramme"
- 
--#: ../sheets/ER.sheet.in.h:2
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr "Attribut-Kompositum"
-+
-+#: ../sheets/ER.sheet.in.h:1
- msgid "ER"
- msgstr "ER"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
- msgstr "Editor für Entität/Beziehungsdiagramme"
- 
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Beteiligung"
--
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr "Schwache Entität"
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Beteiligung"
-+
- #: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Elektrisch"
-+
-+#: ../sheets/Electric.sheet.in.h:2
- msgid "Components for electric circuits"
- msgstr "Komponenten für elektrische Schaltkreise"
- 
--#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "Verbindungspunkt"
--
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Elektrisch"
-+msgid "Normally open contact (horizontal)"
-+msgstr "Im Ausgangszustand offener Kontakt (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
--msgstr "Lampe oder Indikatorleuchte (horizontal)"
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Im Ausgangszustand geschlossener Kontakt (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
--msgstr "Lampe oder Indikatorleuchte (vertikal)"
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Im Ausgangszustand offener Schalter (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
--msgstr "Im Ausgangszustand geschlossener Kontakt (horizontal)"
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Im Ausgangszustand geschlossender Schalter (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
--msgstr "Im Ausgangszustand geschlossener Kontakt (vertikal)"
-+msgid "Normally open contact (vertical)"
-+msgstr "Im Ausgangszustand offener Kontakt (vertikal)"
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
--msgstr "Im Ausgangszustand geschlossender Schalter (horizontal)"
-+msgid "Normally closed contact (vertical)"
-+msgstr "Im Ausgangszustand geschlossener Kontakt (vertikal)"
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
--msgstr "Im Ausgangszustand geschlossender Schalter (vertikal)"
-+msgid "Normally open position switch (vertical)"
-+msgstr "Im Ausgangszustand offener Schalter (vertikal)"
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
--msgstr "Im Ausgangszustand offener Kontakt (horizontal)"
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Im Ausgangszustand geschlossender Schalter (vertikal)"
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
--msgstr "Im Ausgangszustand offener Kontakt (vertikal)"
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "Der steuernde Teil eines Relais (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
--msgstr "Im Ausgangszustand offener Schalter (horizontal)"
-+msgid "Relay (horizontal)"
-+msgstr "Relais (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
--msgstr "Im Ausgangszustand offener Schalter (vertikal)"
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Lampe oder Indikatorleuchte (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
--msgstr "Relais (horizontal)"
-+msgid "The command organ of a relay (vertical)"
-+msgstr "Der steuernde Teil eines Relais (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:15
- msgid "Relay (vertical)"
- msgstr "Relais (vertikal)"
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
--msgstr "Der steuernde Teil eines Relais (horizontal)"
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Lampe oder Indikatorleuchte (vertikal)"
- 
- #: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr "Der steuernde Teil eines Relais (horizontal)"
-+#: ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "Verbindungspunkt"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Editor für Funktionsstrukturdiagramme"
--
--#: ../sheets/FS.sheet.in.h:2
- msgid "FS"
- msgstr "FS"
- 
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Editor für Funktionsstrukturdiagramme"
-+
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr "Fluss"
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Funktion"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr "Orthogonaler, mehrliniger Fluss"
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Funktion"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Vereinigung"
-+msgid "Objects to draw flowcharts"
-+msgstr "Objekte zum Zeichnen von Flussdiagrammen"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "Verbinder"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Prozess-/Hilfsoperation"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--msgid "Data source"
--msgstr "Datenquelle"
-+msgid "Input/Output"
-+msgstr "Eingabe/Ausgabe"
- 
--#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5
-+#: ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Entscheidung"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Verzögerung"
-+msgid "Connector"
-+msgstr "Verbinder"
- 
--# CHECK Translation
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Dokument"
-+msgid "Transaction file"
-+msgstr "Transaktionsdatei"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:10
-+msgid "Off page connector"
-+msgstr "Verbindung zu anderer Seite"
- 
-+# CHECK Translation
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Eingabe/Ausgabe"
-+msgid "Document"
-+msgstr "Dokument"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Interner Speicher"
-+msgid "Manual operation"
-+msgstr "Manuelle Operation"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Magnetische Platte"
-+msgid "Preparation"
-+msgstr "Vorbereitung"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Magnetische Trommel"
-+msgid "Manual input"
-+msgstr "Manuelle Eingabe"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Magnetband"
-+msgid "Predefined process"
-+msgstr "Vordefinierter Prozess"
- 
-+# CHECK
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Manuelle Eingabe"
-+msgid "Terminal Interrupt"
-+msgstr "Terminal-Unterbrechung"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Manuelle Operation"
-+msgid "Magnetic disk"
-+msgstr "Magnetische Platte"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "Zusammenfassen"
-+msgid "Magnetic drum"
-+msgstr "Magnetische Trommel"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Objekte zum Zeichnen von Flussdiagrammen"
-+msgid "Magnetic tape"
-+msgstr "Magnetband"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Verbindung zu anderer Seite"
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Interner Speicher"
- 
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "Offline-Speicher"
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Zusammenfassen"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Oder"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Vordefinierter Prozess"
-+msgid "Delay"
-+msgstr "Verzögerung"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Vorbereitung"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Prozess-/Hilfsoperation"
-+msgid "Summing junction"
-+msgstr "Zusammenfassende Verbindung"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Lochkarte"
-+msgid "Collate"
-+msgstr "Vereinigung"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Lochstreifen"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Sortierung"
- 
--#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Oder"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Lochkarte"
-+
- #: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Zusammenfassende Verbindung"
-+msgid "Punched tape"
-+msgstr "Lochstreifen"
- 
--# CHECK
- #: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "Terminal-Unterbrechung"
-+msgid "Transmittal tape"
-+msgstr "Ãœbertragungsband"
- 
- #: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Transaktionsdatei"
-+msgid "Offline storage"
-+msgstr "Offline-Speicher"
- 
- #: ../sheets/Flowchart.sheet.in.h:34
--msgid "Transmittal tape"
--msgstr "Ãœbertragungsband"
-+msgid "Data source"
-+msgstr "Datenquelle"
- 
- #: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr "UND-Verzweigung"
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
- 
- #: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Objekte zum Entwerfen von GRAFCET-Diagrammen"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Schritt, der ein Subprogramm in einem Makro aufruft"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:9
- msgid "Action to associate to a step"
- msgstr "Mit einem Schritt zu verbindende Aktion"
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
--msgid "Arc (upward)"
--msgstr "Bogen (aufwärts)"
--
--#: ../sheets/GRAFCET.sheet.in.h:4
-+#: ../sheets/GRAFCET.sheet.in.h:10
- msgid "Condition (of an action)"
- msgstr "Bedingung (einer Aktion)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr "Schritt, der ein Subprogramm in einem Makro aufruft"
--
- #: ../sheets/GRAFCET.sheet.in.h:11
--msgid "OR vergent"
--msgstr "ODER-Verzweigung"
-+#: ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "Ãœbergang"
- 
- #: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Objekte zum Entwerfen von GRAFCET-Diagrammen"
-+msgid "OR vergent"
-+msgstr "ODER-Verzweigung"
- 
--#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
--msgid "Transition"
--msgstr "Ãœbergang"
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "UND-Verzweigung"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
--msgid "Alternate external entity"
--msgstr "Externe Entität wechseln"
-+#: ../sheets/GRAFCET.sheet.in.h:14
-+msgid "Arc (upward)"
-+msgstr "Bogen (aufwärts)"
- 
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
- #: ../sheets/Gane_and_Sarson.sheet.in.h:2
--msgid "Data store"
--msgstr "Datenspeicher"
--
--#: ../sheets/Gane_and_Sarson.sheet.in.h:3
--msgid "External entity"
--msgstr "Externe Entität"
--
--#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
--#: ../sheets/Gane_and_Sarson.sheet.in.h:5
- msgid "Gane and Sarson"
- msgstr "Gane and Sarson"
- 
- # Ein Datenflussdiagramm
--#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
- msgid "Gane and Sarson DFD"
- msgstr "Gane and Sarson DFD"
- 
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
--msgstr "Block 1, 2:4"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
-+msgid "Alternate external entity"
-+msgstr "Externe Entität wechseln"
- 
--#: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
--msgstr "Block 2, 2:8"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-+msgid "Data store"
-+msgstr "Datenspeicher"
- 
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
--msgstr "Block 3, 4:4"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+msgid "External entity"
-+msgstr "Externe Entität"
-+
-+#. use dc:title instead?
-+#: ../sheets/IsometricMap.sheet.in.h:2
-+msgid "Map, Isometric"
-+msgstr "Karte, isometrisch"
- 
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
--msgstr "Block 4, 4:8"
-+msgid "Isometric Directional Map Shapes"
-+msgstr "Isometrische, gerichtete Kartenformen"
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
--msgstr "Block 5, 3:3"
-+msgid "Road Section"
-+msgstr "Straßenabschnitt"
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
--msgstr "Block 6, 4:6"
-+msgid "Long Straight Road Section"
-+msgstr "Langer, gerader Straßenabschnitt"
- 
--# CHECK Translation
- #: ../sheets/IsometricMap.sheet.in.h:7
--msgid "Block 7"
--msgstr "Block 7"
-+msgid "Crossroads"
-+msgstr "Straßenkreuzung"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
--msgstr "Auto 1, Frontansicht"
-+msgid "T-Junction"
-+msgstr "Dreierkreuzung"
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
--msgstr "Auto 2, Rückansicht"
-+msgid "Elevated Road"
-+msgstr "Erhöhte Straße"
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
- msgid "Corner 1"
-@@ -7977,1476 +8252,1499 @@ msgid "Corner 2"
- msgstr "Ecke 2"
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--msgid "Crossroads"
--msgstr "Straßenkreuzung"
-+msgid "River"
-+msgstr "Fluss"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
--msgstr "Erhöhte Straße"
-+msgid "Roof1"
-+msgstr "Dach 1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--msgid "Factory"
--msgstr "Fabrik"
-+msgid "Block 1, 2:4"
-+msgstr "Block 1, 2:4"
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
--msgstr "Fußgängerbrücke"
-+msgid "Block 2, 2:8"
-+msgstr "Block 2, 2:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
-+msgstr "Block 3, 4:4"
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
--msgstr "Isometrische, gerichtete Kartenformen"
-+msgid "Block 4, 4:8"
-+msgstr "Block 4, 4:8"
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
--msgstr "Langer, gerader Straßenabschnitt"
-+msgid "Block 5, 3:3"
-+msgstr "Block 5, 3:3"
- 
--#. use dc:title instead?
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
-+msgstr "Block 6, 4:6"
-+
-+# CHECK Translation
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
--msgstr "Karte, isometrisch"
-+msgid "Block 7"
-+msgstr "Block 7"
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
--msgstr "Einbahnstraßenschild"
-+msgid "Factory"
-+msgstr "Fabrik"
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--msgid "River"
--msgstr "Fluss"
-+msgid "Car 1, Front View"
-+msgstr "Auto 1, Frontansicht"
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--msgid "Road Section"
--msgstr "Straßenabschnitt"
-+msgid "Car 2, Rear View"
-+msgstr "Auto 2, Rückansicht"
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--msgid "Roof1"
--msgstr "Dach 1"
--
--#: ../sheets/IsometricMap.sheet.in.h:25
--msgid "T-Junction"
--msgstr "Dreierkreuzung"
--
--#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Train 1, angled downward"
- msgstr "Zug 1, nach unten abgewinkelt"
- 
--#: ../sheets/IsometricMap.sheet.in.h:27
-+#: ../sheets/IsometricMap.sheet.in.h:25
- msgid "Train 2, angled upward"
- msgstr "Zug 1, nach oben abgewinkelt"
- 
--#: ../sheets/IsometricMap.sheet.in.h:28
-+#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Tree 1"
- msgstr "Baum 1"
- 
-+#: ../sheets/IsometricMap.sheet.in.h:27
-+msgid "Footbridge, Pedestrian Bridge"
-+msgstr "Fußgängerbrücke"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:28
-+msgid "One Way Road Sign"
-+msgstr "Einbahnstraßenschild"
-+
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
--msgstr "Ein i*-Agent"
-+msgid "RE-i*"
-+msgstr "RE-i*"
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr "An i*-Zerlegungslink"
-+msgid "Objects to design i* diagrams"
-+msgstr "Objekte zum Entwerfen von i*-Diagrammen"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
--msgstr "Ein i*-Abhängigkeitslink"
-+msgid "An i* softgoal"
-+msgstr "Ein i*-Softziel"
- 
- #: ../sheets/Istar.sheet.in.h:4
- msgid "An i* goal"
- msgstr "Ein i*-Ziel"
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
--msgstr "Ein i* »bedeutet Ende«-Link"
-+msgid "An i* resource"
-+msgstr "Eine i*-Ressource"
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
--msgstr "Ein i* negativer Beitrag"
-+msgid "An i* task"
-+msgstr "Eine i*-Aufgabe"
- 
- #: ../sheets/Istar.sheet.in.h:7
--msgid "An i* position"
--msgstr "Eine i*-Position"
-+msgid "An i* unspecified actor"
-+msgstr "Ein nicht angegebener i*-Akteur"
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
--msgstr "Ein i* positiver Beitrag"
-+msgid "An i* agent"
-+msgstr "Ein i*-Agent"
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
--msgstr "Eine i*-Ressource"
-+msgid "An i* position"
-+msgstr "Eine i*-Position"
- 
- #: ../sheets/Istar.sheet.in.h:10
- msgid "An i* role"
- msgstr "Eine i*-Rolle"
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
--msgstr "Ein i*-Softziel"
-+msgid "An i* unspecified link"
-+msgstr "Ein i* nicht spezifizierter Link"
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
--msgstr "Eine i*-Aufgabe"
-+msgid "An i* positive contribution"
-+msgstr "Ein i* positiver Beitrag"
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
--msgstr "Ein nicht angegebener i*-Akteur"
-+msgid "An i* negative contribution"
-+msgstr "Ein i* negativer Beitrag"
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
--msgstr "Ein i* nicht spezifizierter Link"
-+msgid "An i* dependency link"
-+msgstr "Ein i*-Abhängigkeitslink"
- 
- #: ../sheets/Istar.sheet.in.h:15
--msgid "Objects to design i* diagrams"
--msgstr "Objekte zum Entwerfen von i*-Diagrammen"
-+msgid "An i* decomposition link"
-+msgstr "An i*-Zerlegungslink"
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
--msgstr "RE-i*"
-+msgid "An i* means-ends link"
-+msgstr "Ein i* »bedeutet Ende«-Link"
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
--msgstr "Ein Jackson entworfener Bereich"
-+msgid "RE-Jackson"
-+msgstr "RE-Jackson"
- 
- #: ../sheets/Jackson.sheet.in.h:2
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Objekte zum Entwerfen von Jackson-Diagrammen"
-+
-+#: ../sheets/Jackson.sheet.in.h:3
- msgid "A Jackson given domain"
- msgstr "Ein durch Jackson gegebener Bereich"
- 
--#: ../sheets/Jackson.sheet.in.h:3
-+#: ../sheets/Jackson.sheet.in.h:4
-+msgid "A Jackson designed domain"
-+msgstr "Ein Jackson entworfener Bereich"
-+
-+#: ../sheets/Jackson.sheet.in.h:5
- msgid "A Jackson machine domain"
- msgstr "Ein Jackson-Maschine-Bereich"
- 
--#: ../sheets/Jackson.sheet.in.h:4
-+#: ../sheets/Jackson.sheet.in.h:6
- msgid "A Jackson requirement"
- msgstr "Eine Jackson-Voraussetzung"
- 
--#: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
--msgstr "Ein Jackson-Voraussetzungsphänomen"
--
- # FIXME
--#: ../sheets/Jackson.sheet.in.h:6
-+#: ../sheets/Jackson.sheet.in.h:7
- msgid "A Jackson shared phenomenon"
- msgstr "Ein Jackson shared Phänomen"
- 
--#: ../sheets/Jackson.sheet.in.h:7
--msgid "Objects to design Jackson diagrams"
--msgstr "Objekte zum Entwerfen von Jackson-Diagrammen"
--
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
--msgstr "RE-Jackson"
-+msgid "A Jackson requirement phenomenon"
-+msgstr "Ein Jackson-Voraussetzungsphänomen"
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
--msgstr "Eine KAOS AND-Verfeinerung"
-+msgid "RE-KAOS"
-+msgstr "RE-KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr "Eine KAOS OR-Verfeinerung"
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Objekte zum Entwerfen von KAOS-Diagrammen"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--msgid "A KAOS agent"
--msgstr "Ein KAOS-Agent"
-+msgid "A KAOS softgoal"
-+msgstr "Ein KAOS-Softziel"
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
--msgstr "Eine KAOS-Annahme"
-+msgid "A KAOS goal"
-+msgstr "Ein KAOS-Ziel"
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
--msgstr "Ein binärer KAOS-Konflikt"
-+msgid "A KAOS requirement"
-+msgstr "Eine KAOS-Voraussetzung"
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
--msgstr "Ein KAOS »fähig zu«"
-+msgid "A KAOS assumption"
-+msgstr "Eine KAOS-Annahme"
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
--msgstr "Eine KAOS-vollständige AND-Verfeinerung"
-+msgid "A KAOS obstacle"
-+msgstr "Ein KAOS-Hindernis"
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
--msgstr "Eine KAOS-vollständige OR-Verfeinerung"
-+msgid "A KAOS AND refinement"
-+msgstr "Eine KAOS AND-Verfeinerung"
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
--msgstr "Ein KAOS-Beitrag"
-+msgid "A KAOS complete AND refinement"
-+msgstr "Eine KAOS-vollständige AND-Verfeinerung"
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
--msgstr "Ein KAOS-Kontrolllink"
-+msgid "A KAOS OR refinement"
-+msgstr "Eine KAOS OR-Verfeinerung"
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
--msgstr "Ein KAOS-Ziel"
-+msgid "A KAOS complete OR refinement"
-+msgstr "Eine KAOS-vollständige OR-Verfeinerung"
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
--msgstr "Eine KAOS-Eingabe"
-+msgid "A KAOS operationalization"
-+msgstr "Eine KAOS-Operationalisierung"
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
--msgstr "Ein KAOS-Beobachtungslink"
-+msgid "A KAOS contribution"
-+msgstr "Ein KAOS-Beitrag"
- 
- #: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
--msgstr "Ein KAOS-Hindernis"
--
--#: ../sheets/KAOS.sheet.in.h:15
- msgid "A KAOS obstruction"
- msgstr "Eine KAOS-Behinderung"
- 
-+#: ../sheets/KAOS.sheet.in.h:15
-+msgid "A KAOS binary conflict"
-+msgstr "Ein binärer KAOS-Konflikt"
-+
- #: ../sheets/KAOS.sheet.in.h:16
--msgid "A KAOS operation"
--msgstr "Eine KAOS-Operation"
-+msgid "A KAOS agent"
-+msgstr "Ein KAOS-Agent"
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
--msgstr ""
-+msgid "A KAOS responsibility"
-+msgstr "Eine KAOS-Verantwortbarkeit"
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
--msgstr "Eine KAOS-Ausgabe"
-+msgid "A KAOS monitor link"
-+msgstr "Ein KAOS-Beobachtungslink"
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
--msgstr "Eine KAOS-Ausführung"
-+msgid "A KAOS control link"
-+msgstr "Ein KAOS-Kontrolllink"
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
--msgstr "Eine KAOS-Voraussetzung"
-+msgid "A KAOS capable-of"
-+msgstr "Ein KAOS »fähig zu«"
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
--msgstr "Eine KAOS-Verantwortbarkeit"
-+msgid "A KAOS performs"
-+msgstr "Eine KAOS-Ausführung"
- 
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
--msgstr "Ein KAOS-Softziel"
-+msgid "A KAOS operation"
-+msgstr "Eine KAOS-Operation"
- 
- #: ../sheets/KAOS.sheet.in.h:23
--msgid "Objects to design KAOS diagrams"
--msgstr "Objekte zum Entwerfen von KAOS-Diagrammen"
-+msgid "A KAOS input"
-+msgstr "Eine KAOS-Eingabe"
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
--msgstr "RE-KAOS"
-+msgid "A KAOS output"
-+msgstr "Eine KAOS-Ausgabe"
- 
- #: ../sheets/Lights.sheet.in.h:1
--msgid "ACL"
--msgstr "ACL"
-+msgid "Lights"
-+msgstr "Leuchten"
- 
- #: ../sheets/Lights.sheet.in.h:2
--msgid "Black light"
--msgstr "Schwarzlicht"
-+msgid "Objects to design simple lighting plots"
-+msgstr "Objekte zum Entwerfen einfacher Beleuchtungen"
- 
- #: ../sheets/Lights.sheet.in.h:3
--msgid "Blinders"
--msgstr "Blenden"
-+msgid "PAR"
-+msgstr "PAR"
- 
- #: ../sheets/Lights.sheet.in.h:4
--msgid "Ellipsoidal Reflector Spotlight"
--msgstr "Scheinwerfer mit elliptischem Reflektor"
-+msgid "PAR on the floor"
-+msgstr "Standscheinwerfer"
- 
- #: ../sheets/Lights.sheet.in.h:5
--msgid "Fresel lantern"
--msgstr "Scheinwerfer mit Fresnellinse"
-+msgid "ACL"
-+msgstr "ACL"
- 
-+# http://www.theatrecrafts.com/lx_lanterns.html
-+# aber keine Ahnung wie dt. Ãœbersetzung lautet
-+# → http://www.ebzlighting.ch/products/buehnenscheinwerfer/spl_mini.php
- #: ../sheets/Lights.sheet.in.h:6
--msgid "Lights"
--msgstr "Leuchten"
-+msgid "Pebble Convex lantern"
-+msgstr "PC-Scheinwerfer"
- 
--# Sollte das vielleicht eine Rundumleuchte sein?
- #: ../sheets/Lights.sheet.in.h:7
--msgid "Moving head"
--msgstr "Bewegter Kopf"
-+msgid "Fresel lantern"
-+msgstr "Scheinwerfer mit Fresnellinse"
- 
- #: ../sheets/Lights.sheet.in.h:8
--msgid "Objects to design simple lighting plots"
--msgstr "Objekte zum Entwerfen einfacher Beleuchtungen"
-+msgid "Striplight"
-+msgstr "Streifenbeleuchtung"
- 
- #: ../sheets/Lights.sheet.in.h:9
--msgid "PAR"
--msgstr "PAR"
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr "Scheinwerfer mit elliptischem Reflektor"
- 
- #: ../sheets/Lights.sheet.in.h:10
--msgid "PAR on the floor"
--msgstr "Standscheinwerfer"
-+msgid "Blinders"
-+msgstr "Blenden"
- 
--# http://www.theatrecrafts.com/lx_lanterns.html
--# aber keine Ahnung wie dt. Ãœbersetzung lautet
--# → http://www.ebzlighting.ch/products/buehnenscheinwerfer/spl_mini.php
- #: ../sheets/Lights.sheet.in.h:11
--msgid "Pebble Convex lantern"
--msgstr "PC-Scheinwerfer"
-+msgid "Black light"
-+msgstr "Schwarzlicht"
- 
--#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Scanner"
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr "Stroboskoplicht"
- 
-+# Sollte das vielleicht eine Rundumleuchte sein?
- #: ../sheets/Lights.sheet.in.h:13
--msgid "Striplight"
--msgstr "Streifenbeleuchtung"
-+msgid "Moving head"
-+msgstr "Bewegter Kopf"
- 
- #: ../sheets/Lights.sheet.in.h:14
--msgid "Stroboscope light"
--msgstr "Stroboskoplicht"
-+#: ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Scanner"
- 
- #: ../sheets/Lights.sheet.in.h:15
- msgid "Structure"
- msgstr "Struktur"
- 
-+# CHECK Translation
-+# Sperren?
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "UND-Gatter"
-+msgid "Logic"
-+msgstr "Logik"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Boolesche Logik"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr "Kreuzverbinder"
-+msgid "OR gate"
-+msgstr "ODER-Gatter"
- 
--#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
--msgid "Inverter"
--msgstr "Inverter"
-+#: ../sheets/Logic.sheet.in.h:4
-+msgid "AND gate"
-+msgstr "UND-Gatter"
- 
--# CHECK Translation
--# Sperren?
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Logik"
-+msgid "XOR gate"
-+msgstr "XODER-Gatter"
- 
- #: ../sheets/Logic.sheet.in.h:6
--msgid "NAND gate"
--msgstr "NAND-Gatter"
-+msgid "Simple buffer"
-+msgstr "Einfacher Puffer"
- 
- #: ../sheets/Logic.sheet.in.h:7
--msgid "NOR gate"
--msgstr "NODER-Gatter"
-+#: ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Inverter"
- 
- #: ../sheets/Logic.sheet.in.h:8
--msgid "NOT"
--msgstr "NICHT"
-+msgid "NAND gate"
-+msgstr "NAND-Gatter"
- 
- #: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "ODER-Gatter"
-+msgid "NOR gate"
-+msgstr "NODER-Gatter"
- 
- #: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Einfacher Puffer"
-+msgid "NOT"
-+msgstr "NICHT"
- 
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "XODER-Gatter"
-+msgid "Crossconnector"
-+msgstr "Kreuzverbinder"
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Demultiplexer"
-+msgid "MSE"
-+msgstr "MSE"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Großer Erweiterungsknoten"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "U.S. Armee 'Mobile Subscriber Equipment'-Komponenten"
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr "Knotenzentrum"
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "Multiplexer"
-+msgid "Large extension node"
-+msgstr "Großer Erweiterungsknoten"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr "Knotenzentrum"
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Kleiner Erweiterungsknoten"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Kommunikationsterminal eines taktischen Satelliten"
- 
--#: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr "U.S. Armee 'Mobile Subscriber Equipment'-Komponenten"
--
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Ordner"
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplexer"
- 
--#: ../sheets/Misc.sheet.in.h:3
--msgid "Measure distance"
--msgstr "Messabstand"
-+#: ../sheets/MSE.sheet.in.h:8
-+msgid "Demultiplexer"
-+msgstr "Demultiplexer"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:1
- msgid "Misc"
- msgstr "Diverse"
- 
--#: ../sheets/Misc.sheet.in.h:5
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Diverse Formen"
- 
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Baum"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Ordner"
-+
- #: ../sheets/Misc.sheet.in.h:6
--msgid "New-style group object, for testing"
--msgstr "Gruppenobjekt neuen Stils, zum Testen"
-+msgid "expensible node"
-+msgstr "Aufklappbarer Knoten"
- 
- #: ../sheets/Misc.sheet.in.h:7
--msgid "Resizable grid"
--msgstr "Anpassbares Gitter"
-+msgid "expended node"
-+msgstr "Aufgeklappter Knoten"
- 
- #: ../sheets/Misc.sheet.in.h:8
- msgid "Traditional clock"
- msgstr "Klassische Uhr"
- 
- #: ../sheets/Misc.sheet.in.h:9
--msgid "Tree"
--msgstr "Baum"
-+msgid "Measure distance"
-+msgstr "Messabstand"
- 
- #: ../sheets/Misc.sheet.in.h:10
--msgid "expended node"
--msgstr "Aufgeklappter Knoten"
-+msgid "Resizable grid"
-+msgstr "Anpassbares Gitter"
- 
- #: ../sheets/Misc.sheet.in.h:11
--msgid "expensible node"
--msgstr "Aufklappbarer Knoten"
-+msgid "New-style group object, for testing"
-+msgstr "Gruppenobjekt neuen Stils, zum Testen"
- 
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "2:2-Verteiler"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pneumatik/Hydraulik"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "3:2-Verteiler"
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Komponenten für pneumatische und hydraulische Schaltkreise"
- 
- #: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "4:2-Verteiler"
-+msgid "Double-effect jack"
-+msgstr "Zweiwegzylinder"
- 
- #: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "5:2-Verteiler"
-+msgid "Normally-in simple-effect jack"
-+msgstr "Im Ausgangszustand einlassender Einwegzylinder"
- 
- #: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Luftauslassdüse"
-+msgid "Normally-out simple-effect jack"
-+msgstr "Im Ausgangszustand auslassender Einwegzylinder"
- 
- #: ../sheets/Pneumatic.sheet.in.h:6
--msgid "Components for pneumatic and hydraulic circuits"
--msgstr "Komponenten für pneumatische und hydraulische Schaltkreise"
-+msgid "Generic pressure source"
-+msgstr "Generische Druckquelle"
- 
--#: ../sheets/Pneumatic.sheet.in.h:8
--msgid "Double-effect jack"
--msgstr "Zweiwegzylinder"
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Hydraulische Druckquelle"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:8
-+msgid "Pneumatic pressure source"
-+msgstr "Pneumatische Druckquelle"
- 
- #: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Elektrische Steuerung (doppelte Spule)"
-+msgid "Air exhaust orifice"
-+msgstr "Luftauslassdüse"
- 
- #: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Elektrische Steuerung (einfache Spule)"
-+msgid "2/2 distributor"
-+msgstr "2:2-Verteiler"
- 
- #: ../sheets/Pneumatic.sheet.in.h:11
--msgid "Generic pressure source"
--msgstr "Generische Druckquelle"
-+msgid "3/2 distributor"
-+msgstr "3:2-Verteiler"
- 
- #: ../sheets/Pneumatic.sheet.in.h:12
--msgid "Hydraulic pressure source"
--msgstr "Hydraulische Druckquelle"
-+msgid "4/2 distributor"
-+msgstr "4:2-Verteiler"
- 
- #: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "Indirekte Steuerung über hydraulischen Treiber"
-+msgid "5/2 distributor"
-+msgstr "5:2-Verteiler"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "Indirekte Steuerung über einen pneumatischen Treiber"
-+msgid "Muscular command"
-+msgstr "Muskelkraftsteuerung"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Mechanische Steuerung über eine Feder"
-+msgid "Push-button command"
-+msgstr "Druckknopf-Steuerung"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
- msgstr "Mechanische Steuerung über Ventilstößel"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Muskelkraftsteuerung"
-+msgid "Mechanical command by spring"
-+msgstr "Mechanische Steuerung über eine Feder"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Im Ausgangszustand einlassender Einwegzylinder"
-+msgid "Electric command (single coil)"
-+msgstr "Elektrische Steuerung (einfache Spule)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Im Ausgangszustand auslassender Einwegzylinder"
-+msgid "Electric command (double coil)"
-+msgstr "Elektrische Steuerung (doppelte Spule)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Pneumatische Druckquelle"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Indirekte Steuerung über hydraulischen Treiber"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Pneumatik/Hydraulik"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Druckknopf-Steuerung"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Indirekte Steuerung über einen pneumatischen Treiber"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Aktivitäts-/Datenkasten"
-+msgid "SADT/IDEF0"
-+msgstr "SADT/IDEF0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Aktivitäts-/Datenflusspfeil"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Objekte zum Entwerfen von SADT-Diagrammen"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Flussbeschriftung"
-+msgid "Activity/data flow arrow"
-+msgstr "Aktivitäts-/Datenflusspfeil"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Objekte zum Entwerfen von SADT-Diagrammen"
-+msgid "Activity/data box"
-+msgstr "Aktivitäts-/Datenkasten"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT/IDEF0"
-+msgid "Flow label"
-+msgstr "Flussbeschriftung"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Aktion die ausgeführt wird"
-+msgid "SDL"
-+msgstr "SDL"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Spezifikations- und Beschreibungssprache"
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
- msgstr "Referenz vom Typ Block"
- 
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Referenz vom Typ Dienst"
-+
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Funktionsaufruf"
-+msgid "Process type reference"
-+msgstr "Referenz vom Typ Prozess"
- 
--# CHECK - Header?
- #: ../sheets/SDL.sheet.in.h:6
--msgid "Function header"
--msgstr "Funktionskopfteil"
-+#: ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Zustand"
- 
-+# CHECK - Header?
- #: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "Generische Textanmerkung"
-+msgid "Function header"
-+msgstr "Funktionskopfteil"
- 
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "Rein/Raus-Verbindung"
--
--# CHECK - Return => Rückgabewert?
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Prozedurrückkehr"
--
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Referenz vom Typ Prozess"
-+msgid "Send message"
-+msgstr "Nachricht verschicken"
- 
--#: ../sheets/SDL.sheet.in.h:12
-+#: ../sheets/SDL.sheet.in.h:9
- msgid "Receive message"
- msgstr "Nachricht empfangen"
- 
--#: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Funktionsaufruf"
-+
-+#: ../sheets/SDL.sheet.in.h:12
-+msgid "Action being executed"
-+msgstr "Aktion die ausgeführt wird"
- 
- # CHECK - Speicherzustand?
--#: ../sheets/SDL.sheet.in.h:14
-+#: ../sheets/SDL.sheet.in.h:13
- msgid "Save state"
- msgstr "Zustand speichern"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Nachricht verschicken"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Referenz vom Typ Dienst"
-+msgid "In/Out connector"
-+msgstr "Rein/Raus-Verbindung"
- 
-+# CHECK - Return => Rückgabewert?
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "Spezifikations- und Beschreibungssprache"
-+msgid "Procedure return"
-+msgstr "Prozedurrückkehr"
- 
--#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "Zustand"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Generische Textanmerkung"
- 
- #: ../sheets/SISSI.sheet.in.h:1
--msgid "Air filter"
--msgstr "Luftfilter"
-+msgid "Objects to design sissi diagrams"
-+msgstr "Objekte zum Entwerfen von sissi-Diagrammen"
- 
- #: ../sheets/SISSI.sheet.in.h:2
--msgid "Air quality detector"
--msgstr "Luftgütemesser"
-+msgid "Workstation"
-+msgstr "Workstation"
- 
- #: ../sheets/SISSI.sheet.in.h:3
--msgid "Airconditioner"
--msgstr "Klimaanlage"
-+#: ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Relationale Datenbank"
- 
-+# CHECK Translation
- #: ../sheets/SISSI.sheet.in.h:4
--msgid "Alarm center"
--msgstr "Alarmanlage"
-+msgid "Server"
-+msgstr "Server"
- 
- #: ../sheets/SISSI.sheet.in.h:5
--msgid "Axial Ventilator"
--msgstr "Axialer Ventilator"
-+#: ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Laptop"
- 
- #: ../sheets/SISSI.sheet.in.h:6
--msgid "Backup"
--msgstr "Backup"
-+#: ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "PDA"
- 
- #: ../sheets/SISSI.sheet.in.h:7
--msgid "Badge reader"
--msgstr "Ausweisleser"
-+#: ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Speicherarray"
- 
- #: ../sheets/SISSI.sheet.in.h:8
--msgid "Badge reader/keyboard"
--msgstr "Ausweisleser/Tastatur"
-+#: ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Router"
- 
- #: ../sheets/SISSI.sheet.in.h:9
--msgid "Biometric reader"
--msgstr "Biometrisches Lesegerät"
-+#: ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Netzwerkwolke"
- 
- #: ../sheets/SISSI.sheet.in.h:10
--msgid "Cell phone"
--msgstr "Mobiltelefon"
-+#: ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefon"
- 
- #: ../sheets/SISSI.sheet.in.h:11
--msgid "Centrifugal Ventilator"
--msgstr "Zentrifugaler Ventilator"
-+msgid "Cell phone"
-+msgstr "Mobiltelefon"
- 
- #: ../sheets/SISSI.sheet.in.h:12
--msgid "Cipher machine"
--msgstr "Chiffriermaschine"
-+#: ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Hub"
- 
- #: ../sheets/SISSI.sheet.in.h:13
--msgid "Circulation pump"
--msgstr "Umwälzpumpe"
-+#: ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
- 
- #: ../sheets/SISSI.sheet.in.h:14
--msgid "Condensator"
--msgstr "Kondensator"
-+msgid "Cipher machine"
-+msgstr "Chiffriermaschine"
- 
- #: ../sheets/SISSI.sheet.in.h:15
--msgid "Current transducer"
--msgstr "Aktueller Signalgeber"
-+msgid "Magnetic storage"
-+msgstr "Magnetspeicher"
- 
- #: ../sheets/SISSI.sheet.in.h:16
--msgid "Digital code"
--msgstr "Digitaler Code"
-+msgid "Paper storage"
-+msgstr "Papierspeicher"
- 
-+# CHECK Translation
- #: ../sheets/SISSI.sheet.in.h:17
--msgid "Enthalpy transducer"
--msgstr "Enthalpiewandler"
-+msgid "Person"
-+msgstr "Person"
- 
- #: ../sheets/SISSI.sheet.in.h:18
--msgid "Extinguisher"
--msgstr "Feuerlöscher"
--
--#: ../sheets/SISSI.sheet.in.h:19
--msgid "Faraday cage"
--msgstr "Faradayscher Käfig"
--
--#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-+#: ../sheets/ciscomisc.sheet.in.h:48
- msgid "File cabinet"
- msgstr "Aktenschrank"
- 
--#: ../sheets/SISSI.sheet.in.h:21
--msgid "Gate"
--msgstr "Tor"
-+#: ../sheets/SISSI.sheet.in.h:19
-+msgid "Safe"
-+msgstr "Geldspeicher"
-+
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
-+msgstr "Backup"
- 
- #: ../sheets/SISSI.sheet.in.h:22
--msgid "Geographic site"
--msgstr "Geographischer Ort"
-+msgid "Log analysis"
-+msgstr "Protokollanalyse"
- 
- #: ../sheets/SISSI.sheet.in.h:23
--msgid "Glass-break sensor"
--msgstr "Glasbruchsensor"
--
--#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "Hub"
-+msgid "Information system"
-+msgstr "Informationssystem"
- 
--#: ../sheets/SISSI.sheet.in.h:25
-+#: ../sheets/SISSI.sheet.in.h:24
- msgid "Information"
- msgstr "Information"
- 
--#: ../sheets/SISSI.sheet.in.h:26
--msgid "Information system"
--msgstr "Informationssystem"
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Raum"
- 
--#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Laptop"
-+#: ../sheets/SISSI.sheet.in.h:26
-+msgid "Faraday cage"
-+msgstr "Faradayscher Käfig"
-+
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "Sicherheitsbereich"
-+
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr "Geographischer Ort"
- 
- #: ../sheets/SISSI.sheet.in.h:29
--msgid "Level detector"
--msgstr "Füllstandsdetektor"
-+msgid "Gate"
-+msgstr "Tor"
- 
- #: ../sheets/SISSI.sheet.in.h:30
--msgid "Light detector"
--msgstr "Lichtdetektor"
-+msgid "Video camera"
-+msgstr "Video-Kamera"
- 
- #: ../sheets/SISSI.sheet.in.h:31
--msgid "Log analysis"
--msgstr "Protokollanalyse"
-+msgid "Glass-break sensor"
-+msgstr "Glasbruchsensor"
- 
- #: ../sheets/SISSI.sheet.in.h:32
--msgid "Magnetic storage"
--msgstr "Magnetspeicher"
-+msgid "Sensor beam"
-+msgstr "Sensorstrahl"
- 
--#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Modem"
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Kondensator"
- 
-+# CHECK Translation
- #: ../sheets/SISSI.sheet.in.h:34
--msgid "Moisture extractor"
--msgstr "Entfeuchter"
-+msgid "Power transducer"
-+msgstr "Energiewandler"
- 
- #: ../sheets/SISSI.sheet.in.h:35
--msgid "Moisture sensor"
--msgstr "Feuchtigkeitssensor"
-+msgid "Current transducer"
-+msgstr "Aktueller Signalgeber"
- 
- #: ../sheets/SISSI.sheet.in.h:36
--msgid "Movement detector"
--msgstr "Bewegungsmelder"
-+msgid "Enthalpy transducer"
-+msgstr "Enthalpiewandler"
- 
--#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Netzwerkwolke"
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Rauchmelder"
- 
- #: ../sheets/SISSI.sheet.in.h:38
--msgid "Objects to design sissi diagrams"
--msgstr "Objekte zum Entwerfen von sissi-Diagrammen"
-+msgid "Moisture sensor"
-+msgstr "Feuchtigkeitssensor"
- 
--#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "PDA"
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Lichtdetektor"
- 
- #: ../sheets/SISSI.sheet.in.h:40
--msgid "Paper storage"
--msgstr "Papierspeicher"
-+msgid "Movement detector"
-+msgstr "Bewegungsmelder"
- 
--# CHECK Translation
- #: ../sheets/SISSI.sheet.in.h:41
--msgid "Person"
--msgstr "Person"
-+msgid "Video movement detector"
-+msgstr "Video-Bewegungssensor"
- 
--# CHECK Translation
- #: ../sheets/SISSI.sheet.in.h:42
--msgid "Power transducer"
--msgstr "Energiewandler"
-+msgid "Level detector"
-+msgstr "Füllstandsdetektor"
- 
- #: ../sheets/SISSI.sheet.in.h:43
- msgid "Pressure transducer"
- msgstr "Druckwandler"
- 
- #: ../sheets/SISSI.sheet.in.h:44
--msgid "Pump"
--msgstr "Pumpe"
-+msgid "Air quality detector"
-+msgstr "Luftgütemesser"
- 
--#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr "Relationale Datenbank"
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Spannungsdetektor"
- 
- #: ../sheets/SISSI.sheet.in.h:46
--msgid "Revolving door"
--msgstr "Drehtür"
-+msgid "Vehicle detector"
-+msgstr "Fahrzeugdetektor"
- 
- #: ../sheets/SISSI.sheet.in.h:47
--msgid "Room"
--msgstr "Raum"
-+msgid "Vibration sensor"
-+msgstr "Vibrationssensor"
- 
--#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "Router"
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Digitaler Code"
- 
- #: ../sheets/SISSI.sheet.in.h:49
--msgid "Safe"
--msgstr "Geldspeicher"
-+msgid "Moisture extractor"
-+msgstr "Entfeuchter"
- 
- #: ../sheets/SISSI.sheet.in.h:50
--msgid "Security area"
--msgstr "Sicherheitsbereich"
-+msgid "Air filter"
-+msgstr "Luftfilter"
- 
- #: ../sheets/SISSI.sheet.in.h:51
--msgid "Sensor beam"
--msgstr "Sensorstrahl"
-+msgid "Badge reader/keyboard"
-+msgstr "Ausweisleser/Tastatur"
- 
--# CHECK Translation
- #: ../sheets/SISSI.sheet.in.h:52
--msgid "Server"
--msgstr "Server"
-+msgid "Badge reader"
-+msgstr "Ausweisleser"
- 
- #: ../sheets/SISSI.sheet.in.h:53
--msgid "Smoke detector"
--msgstr "Rauchmelder"
-+msgid "Biometric reader"
-+msgstr "Biometrisches Lesegerät"
- 
--#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Speicherarray"
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "Pumpe"
- 
--#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Telefon"
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr "Umwälzpumpe"
-+
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr "Drehtür"
- 
- #: ../sheets/SISSI.sheet.in.h:57
--msgid "Vehicle detector"
--msgstr "Fahrzeugdetektor"
-+msgid "Axial Ventilator"
-+msgstr "Axialer Ventilator"
- 
- #: ../sheets/SISSI.sheet.in.h:58
--msgid "Ventilator"
--msgstr "Ventilator"
-+msgid "Centrifugal Ventilator"
-+msgstr "Zentrifugaler Ventilator"
- 
- #: ../sheets/SISSI.sheet.in.h:59
--msgid "Vibration sensor"
--msgstr "Vibrationssensor"
-+msgid "Ventilator"
-+msgstr "Ventilator"
- 
- #: ../sheets/SISSI.sheet.in.h:60
--msgid "Video camera"
--msgstr "Video-Kamera"
--
--#: ../sheets/SISSI.sheet.in.h:61
--msgid "Video movement detector"
--msgstr "Video-Bewegungssensor"
-+msgid "Extinguisher"
-+msgstr "Feuerlöscher"
- 
- #: ../sheets/SISSI.sheet.in.h:62
--msgid "Voltage detector"
--msgstr "Spannungsdetektor"
-+msgid "Airconditioner"
-+msgstr "Klimaanlage"
- 
- #: ../sheets/SISSI.sheet.in.h:63
--msgid "Workstation"
--msgstr "Workstation"
-+msgid "Alarm center"
-+msgstr "Alarmanlage"
- 
- #: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Aktivität"
-+msgid "UML"
-+msgstr "UML"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "Aggregation, eine Klasse ist Teil einer anderen"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Editor für statische UML-Strukturdiagramme"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "Assoziation, zwei Klassen werden miteinander assoziiert"
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Anmerkung"
- 
- #: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr "Klassenstereotypsymbol"
-+msgid "Realizes, implements a specific interface"
-+msgstr "Realisierung, implementiert eine spezielle Schnittstelle"
- 
- #: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr "Komponente"
-+msgid "Generalization, class inheritance"
-+msgstr "Verallgemeinerung, Klassenvererbung"
- 
- #: ../sheets/UML.sheet.in.h:9
--msgid "Constraint, place a constraint on something"
--msgstr "Einschränkung, etwas mit einer Einschränkung belegen"
--
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "Editor für statische UML-Strukturdiagramme"
--
--# CHECK
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Abzweigung/Vereinigung"
-+msgid "Association, two classes are associated"
-+msgstr "Assoziation, zwei Klassen werden miteinander assoziiert"
- 
--#: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Verallgemeinerung, Klassenvererbung"
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Aggregation, eine Klasse ist Teil einer anderen"
- 
--#: ../sheets/UML.sheet.in.h:17
-+#: ../sheets/UML.sheet.in.h:11
- msgid "Implements, class implements a specific interface"
- msgstr "Implementierung, Klasse implementiert eine Schnittstelle"
- 
--#: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr "Anfangs-/Endzustand"
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Einschränkung, etwas mit einer Einschränkung belegen"
- 
--#: ../sheets/UML.sheet.in.h:19
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Kleines Paket"
-+
-+#: ../sheets/UML.sheet.in.h:14
- msgid "Large package"
- msgstr "Großes Paket"
- 
--#: ../sheets/UML.sheet.in.h:20
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Anwendungsfall"
-+
-+#: ../sheets/UML.sheet.in.h:17
- msgid "Lifeline"
- msgstr "Lebenslinie"
- 
--#: ../sheets/UML.sheet.in.h:21
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Objekt"
-+
-+#: ../sheets/UML.sheet.in.h:19
- msgid "Message"
- msgstr "Nachricht"
- 
--#: ../sheets/UML.sheet.in.h:22
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Komponente"
-+
-+#: ../sheets/UML.sheet.in.h:25
- msgid "Node"
- msgstr "Knoten"
- 
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "Anmerkung"
--
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Objekt"
--
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "Realisierung, implementiert eine spezielle Schnittstelle"
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "Klassenstereotypsymbol"
- 
- #: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Kleines Paket"
-+msgid "Initial/end state"
-+msgstr "Anfangs-/Endzustand"
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Aktivität"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr "Anwendungsfall"
-+# CHECK
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Abzweigung/Vereinigung"
- 
- #: ../sheets/chronogram.sheet.in.h:1
- msgid "Chronogram"
- msgstr "Chronogramm"
- 
- #: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr "Datenlinie"
--
--#: ../sheets/chronogram.sheet.in.h:3
- msgid "Objects to design chronogram charts"
- msgstr "Objekte zum Entwerfen von Chronogrammen"
- 
--#: ../sheets/chronogram.sheet.in.h:4
-+#: ../sheets/chronogram.sheet.in.h:3
- msgid "Time scale"
- msgstr "Zeitskala"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--msgid "BBS"
--msgstr "BBS"
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Datenlinie"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
-+#: ../sheets/ciscocomputer.sheet.in.h:1
- msgid "Cisco - Computer"
- msgstr "Cisco - Computer"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Computerformen von Cisco"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "Cisco CA"
-+msgid "PC"
-+msgstr "PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "CiscoSecurity"
-+msgid "Macintosh"
-+msgstr "Macintosh"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr "CiscoWorks-Workstation"
-+msgid "Terminal"
-+msgstr "Terminal"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Computerformen von Cisco"
-+msgid "SUN workstation"
-+msgstr "SUN-Workstation"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr "Platten-Untersystem"
-+msgid "CiscoWorks workstation"
-+msgstr "CiscoWorks-Workstation"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Diskette"
-+msgid "PC Router Card"
-+msgstr "PC-Router-Karte"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:9
--msgid "EtherClient"
--msgstr "EtherClient"
-+msgid "PC Software"
-+msgstr "PC-Software"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:10
--msgid "FC Storage"
--msgstr "FC-Speicher"
-+msgid "PC with Router-Based Software"
-+msgstr "PC mit Router-basierter Software"
- 
-+# CHECK
- #: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Datei-Server"
-+msgid "Workgroup director"
-+msgstr "Arbeitsgruppenleiter"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:12
--msgid "Front End Processor"
--msgstr "Frontend-Prozessor"
-+msgid "CiscoSecurity"
-+msgstr "CiscoSecurity"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP-Mini"
-+msgid "Cisco CA"
-+msgstr "Cisco CA"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
--msgstr "Handheld"
-+msgid "WWW server"
-+msgstr "WWW-Server"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Host"
-+msgid "Web browser"
-+msgstr "Webbrowser"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "IBM-Mini (AS400)"
-+msgid "File Server"
-+msgstr "Datei-Server"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "IBM-Tower"
-+msgid "Software-Based Router on File Server"
-+msgstr "Software-basierender Router am Datei-Server"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "IBM-Mainframe"
-+msgid "Server with PC Router"
-+msgstr "Server mit PC-Router"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:19
--msgid "IBM mainframe with FEP"
--msgstr "IBM-Mainframe mit FEP"
-+msgid "IBM Tower"
-+msgstr "IBM-Tower"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
--msgstr "JBOD"
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM-Mini (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr "Frontend-Prozessor"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Macintosh"
-+msgid "IBM mainframe"
-+msgstr "IBM-Mainframe"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "MicroWebserver"
-+msgid "IBM mainframe with FEP"
-+msgstr "IBM-Mainframe mit FEP"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Mini-VAX"
-+msgid "HP Mini"
-+msgstr "HP-Mini"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Monitor"
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Supercomputer"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:26
-+msgid "Web cluster"
-+msgstr "Web-Cluster"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:27
--msgid "Newton"
--msgstr "Newton"
-+msgid "Mini VAX"
-+msgstr "Mini-VAX"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:29
--msgid "PC Adapter Card"
--msgstr "PC-Adapterkarte"
--
--#: ../sheets/ciscocomputer.sheet.in.h:30
- msgid "PC Card"
- msgstr "PC-Karte"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tablett"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:31
--msgid "PC Router Card"
--msgstr "PC-Router-Karte"
-+msgid "EtherClient"
-+msgstr "EtherClient"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:32
--msgid "PC Software"
--msgstr "PC-Software"
-+msgid "Handheld"
-+msgstr "Handheld"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "PC-Video"
-+msgid "Wireless"
-+msgstr "Drahtlos"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
--msgstr "PC mit Router-basierter Software"
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Newton"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "SUN-Workstation"
-+#: ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Monitor"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Server mit PC-Router"
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "PC-Video"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:41
--msgid "Software-Based Router on File Server"
--msgstr "Software-basierender Router am Datei-Server"
-+msgid "BBS"
-+msgstr "BBS"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Supercomputer"
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "MicroWebserver"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr "Tablett"
-+msgid "Diskette"
-+msgstr "Diskette"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:45
--msgid "Tape array"
--msgstr "Bandarray"
-+msgid "Host"
-+msgstr "Host"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:46
--msgid "Terminal"
--msgstr "Terminal"
-+msgid "Tape array"
-+msgstr "Bandarray"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:47
--msgid "WWW server"
--msgstr "WWW-Server"
-+msgid "Disk subsystem"
-+msgstr "Platten-Untersystem"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:48
--msgid "Web browser"
--msgstr "Webbrowser"
--
--#: ../sheets/ciscocomputer.sheet.in.h:49
--msgid "Web cluster"
--msgstr "Web-Cluster"
-+msgid "JBOD"
-+msgstr "JBOD"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:50
--msgid "Wireless"
--msgstr "Drahtlos"
-+msgid "FC Storage"
-+msgstr "FC-Speicher"
- 
--# CHECK
- #: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr "Arbeitsgruppenleiter"
-+msgid "PC Adapter Card"
-+msgstr "PC-Adapterkarte"
- 
- #: ../sheets/ciscohub.sheet.in.h:1
--msgid "100BaseT Hub"
--msgstr "100BaseT-Hub"
-+msgid "Cisco - Switch"
-+msgstr "Cisco - Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:2
--msgid "7500ARS (7513) Router"
--msgstr "7500ARS (7513) Router"
--
--#: ../sheets/ciscohub.sheet.in.h:3
--msgid "7505 Router"
--msgstr "7505 Router"
-+msgid "Router and switch shapes by Cisco"
-+msgstr "Router- und Switch-Formen von Cisco"
- 
- #: ../sheets/ciscohub.sheet.in.h:4
--msgid "7507 Router"
--msgstr "7507 Router"
-+msgid "Router subdued"
-+msgstr "Router (inaktiv)"
- 
- #: ../sheets/ciscohub.sheet.in.h:5
--msgid "ASIC Processor"
--msgstr "ASIC-Prozessor"
-+msgid "Router with Silicon Switch"
-+msgstr "Router mit Silizium-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+msgid "NetFlow router"
-+msgstr "NetFlow-Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:7
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "ATM-Fast-Gigabit-Etherswitch"
-+msgid "Broadband router"
-+msgstr "Breitband-Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:8
--msgid "ATM Switch"
--msgstr "ATM-Switch"
-+msgid "Wavelength router"
-+msgstr "Wavelength-Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:9
--msgid "ATM Tag Switch Router"
--msgstr "ATM-Tag Switch-Router"
-+msgid "Wireless router"
-+msgstr "Wireless-Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:10
--msgid "Access Gateway"
--msgstr "Access-Gateway"
-+msgid "7507 Router"
-+msgstr "7507 Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+msgid "7505 Router"
-+msgstr "7505 Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Breitband-Router"
-+msgid "7500ARS (7513) Router"
-+msgstr "7500ARS (7513) Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr "CSM-S"
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr "Edge Label Switch Router with NetFlow"
- 
- #: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr "Routing-System eines Netzbetreibers"
-+msgid "Edge Label Switch Router"
-+msgstr "Edge Label Switch Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:15
--msgid "Cisco - Switch"
--msgstr "Cisco - Switch"
-+msgid "Router with Firewall"
-+msgstr "Router mit Firewall"
- 
- #: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+msgid "Optical Services Router"
-+msgstr "Router für optische Dienste"
- 
- #: ../sheets/ciscohub.sheet.in.h:17
--msgid "Cisco Hub"
--msgstr "Cisco Hub"
--
--#: ../sheets/ciscohub.sheet.in.h:18
- msgid "Content Router"
- msgstr "Inhalts-Router"
- 
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Routing-System eines Netzbetreibers"
-+
- #: ../sheets/ciscohub.sheet.in.h:19
--msgid "Content Service Module"
--msgstr "Inhaltsdienst-Modul"
-+msgid "Storage Router"
-+msgstr "Speicher-Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:20
--msgid "Content Service Switch 1100"
--msgstr "Content-Service-Switch 1100"
--
--#: ../sheets/ciscohub.sheet.in.h:21
--msgid "Content Switch"
--msgstr "Content Switch"
-+msgid "NetSonar"
-+msgstr "NetSonar"
- 
- #: ../sheets/ciscohub.sheet.in.h:22
--msgid "Data Center Switch"
--msgstr "Daten-Center Switch"
-+msgid "Hub subdued"
-+msgstr "Hub (inaktiv)"
- 
- #: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr "Daten-Center Switch invertiert"
-+msgid "Cisco Hub"
-+msgstr "Cisco Hub"
- 
- #: ../sheets/ciscohub.sheet.in.h:24
--msgid "Data Switch Processor"
--msgstr "Daten-Switch-Prozessor"
-+msgid "Small Hub"
-+msgstr "Kleiner Hub"
- 
--# A fault-tolerant Fibre Channel switch that typically has a high port count and may serve as a central switch to other fabrics.
- #: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr ""
-+msgid "100BaseT Hub"
-+msgstr "100BaseT-Hub"
- 
- #: ../sheets/ciscohub.sheet.in.h:26
--msgid "Edge Label Switch Router"
--msgstr "Edge Label Switch Router"
-+msgid "Workgroup switch"
-+msgstr "Arbeitsgruppen-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
--msgstr "Edge Label Switch Router with NetFlow"
-+msgid "Workgroup switch Subdued"
-+msgstr "Arbeitsgruppen-Switch (inaktiv)"
- 
- #: ../sheets/ciscohub.sheet.in.h:28
--msgid "Generic Processor"
--msgstr "Generischer Prozessor"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Arbeitsgruppen-Switch sprachaktiviert"
-+
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
- 
- #: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr "Hub (inaktiv)"
-+msgid "ATM Tag Switch Router"
-+msgstr "ATM-Tag Switch-Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "ISDN-Switch"
-+msgid "Switch Processor"
-+msgstr "Switch-Prozessor"
- 
- #: ../sheets/ciscohub.sheet.in.h:32
--msgid "LAN2LAN Switch"
--msgstr "LAN2LAN Switch"
-+msgid "Route Switch Processor"
-+msgstr "Route-Switch-Prozessor"
- 
- #: ../sheets/ciscohub.sheet.in.h:33
--msgid "Label Switch Router"
--msgstr "Label Switch Router"
-+msgid "Route Switch Processor with Si"
-+msgstr "Route-Switch-Prozessor mit Si"
- 
- #: ../sheets/ciscohub.sheet.in.h:34
--msgid "Layer 2 Remote Switch"
--msgstr "Entfernter Switch der Ebene 2"
-+msgid "PXF"
-+msgstr "PXF"
- 
- #: ../sheets/ciscohub.sheet.in.h:35
--msgid "MGX 8220"
--msgstr "MGX 8200"
-+msgid "ASIC Processor"
-+msgstr "ASIC-Prozessor"
- 
- #: ../sheets/ciscohub.sheet.in.h:36
--msgid "MGX 8240"
--msgstr "MGX 8240"
-+msgid "Generic Processor"
-+msgstr "Generischer Prozessor"
- 
- #: ../sheets/ciscohub.sheet.in.h:37
--msgid "MGX 8260"
--msgstr "MGX 8260"
-+msgid "Data Center Switch"
-+msgstr "Daten-Center Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:38
--msgid "Multi-Fabric Server Switch"
--msgstr "Multi-Fabric Server Switch"
-+msgid "Data Center Switch Reversed"
-+msgstr "Daten-Center Switch invertiert"
- 
- #: ../sheets/ciscohub.sheet.in.h:39
--msgid "MultiSwitch Device"
--msgstr "MultiSwitch-Gerät"
-+msgid "Data Switch Processor"
-+msgstr "Daten-Switch-Prozessor"
- 
- #: ../sheets/ciscohub.sheet.in.h:40
--msgid "Multilayer Remote Switch"
--msgstr "Multilayer Remote-Switch"
-+msgid "Content Switch"
-+msgstr "Content Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:41
--msgid "Multilayer Switch"
--msgstr "Multilayer-Switch"
-+msgid "Content Service Module"
-+msgstr "Inhaltsdienst-Modul"
- 
- #: ../sheets/ciscohub.sheet.in.h:42
--msgid "Multilayer Switch with Silicon"
--msgstr "Multilayer-Switch mit Silizium"
-+msgid "CSM-S"
-+msgstr "CSM-S"
- 
- #: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
--msgstr "Multilayer-Switch mit Silizium (inaktiv)"
-+msgid "Access Gateway"
-+msgstr "Access-Gateway"
- 
- #: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr "NetFlow-Router"
-+msgid "ATM Switch"
-+msgstr "ATM-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr "NetRanger"
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
- 
- #: ../sheets/ciscohub.sheet.in.h:46
--msgid "NetSonar"
--msgstr "NetSonar"
-+msgid "Cisco 1000"
-+msgstr "Cisco 1000"
- 
- #: ../sheets/ciscohub.sheet.in.h:47
--msgid "Optical Services Router"
--msgstr "Router für optische Dienste"
-+msgid "ISDN switch"
-+msgstr "ISDN-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
--msgstr "PXF"
-+msgid "Label Switch Router"
-+msgstr "Label Switch Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:49
--msgid "Programmable Switch"
--msgstr "Programmierbarer Switch"
-+msgid "MultiSwitch Device"
-+msgstr "MultiSwitch-Gerät"
- 
- #: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr "RateMUX"
-+msgid "LAN2LAN Switch"
-+msgstr "LAN2LAN Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:51
--msgid "Route Switch Processor"
--msgstr "Route-Switch-Prozessor"
-+msgid "Multilayer Switch"
-+msgstr "Multilayer-Switch"
-+
-+#: ../sheets/ciscohub.sheet.in.h:52
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Multilayer-Switch mit Silizium"
- 
--#: ../sheets/ciscohub.sheet.in.h:52
--msgid "Route Switch Processor with Si"
--msgstr "Route-Switch-Prozessor mit Si"
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
-+msgstr "Multilayer-Switch mit Silizium (inaktiv)"
- 
- #: ../sheets/ciscohub.sheet.in.h:54
--msgid "Router and switch shapes by Cisco"
--msgstr "Router- und Switch-Formen von Cisco"
-+msgid "Programmable Switch"
-+msgstr "Programmierbarer Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:55
--msgid "Router subdued"
--msgstr "Router (inaktiv)"
-+msgid "Content Service Switch 1100"
-+msgstr "Content-Service-Switch 1100"
- 
- #: ../sheets/ciscohub.sheet.in.h:56
--msgid "Router with Firewall"
--msgstr "Router mit Firewall"
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "ATM-Fast-Gigabit-Etherswitch"
- 
- #: ../sheets/ciscohub.sheet.in.h:57
--msgid "Router with Silicon Switch"
--msgstr "Router mit Silizium-Switch"
-+msgid "RateMUX"
-+msgstr "RateMUX"
- 
- #: ../sheets/ciscohub.sheet.in.h:58
--msgid "Server Switch"
--msgstr "Server-Switch"
-+msgid "Workgroup 5500"
-+msgstr "Workgroup 5500"
- 
- #: ../sheets/ciscohub.sheet.in.h:59
--msgid "Small Hub"
--msgstr "Kleiner Hub"
-+msgid "Workgroup 5000"
-+msgstr "Workgroup 5000"
- 
- #: ../sheets/ciscohub.sheet.in.h:60
--msgid "Storage Router"
--msgstr "Speicher-Router"
-+msgid "Workgroup 5002"
-+msgstr "Workgroup 5002"
- 
- #: ../sheets/ciscohub.sheet.in.h:61
--msgid "Switch Processor"
--msgstr "Switch-Prozessor"
-+msgid "NetRanger"
-+msgstr "NetRanger"
- 
- #: ../sheets/ciscohub.sheet.in.h:62
--msgid "Universal Gateway"
--msgstr "Universelles Gateway"
-+msgid "MGX 8220"
-+msgstr "MGX 8200"
- 
- #: ../sheets/ciscohub.sheet.in.h:63
--msgid "Virtual Layer Switch"
--msgstr "Virtueller Layer-Switch"
-+msgid "MGX 8240"
-+msgstr "MGX 8240"
- 
- #: ../sheets/ciscohub.sheet.in.h:64
--msgid "Wavelength router"
--msgstr "Wavelength-Router"
-+msgid "MGX 8260"
-+msgstr "MGX 8260"
- 
- #: ../sheets/ciscohub.sheet.in.h:65
--msgid "Wireless router"
--msgstr "Wireless-Router"
-+msgid "Universal Gateway"
-+msgstr "Universelles Gateway"
- 
- #: ../sheets/ciscohub.sheet.in.h:66
--msgid "Workgroup 5000"
--msgstr "Workgroup 5000"
-+msgid "iSCSI switch"
-+msgstr "iSCSI-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:67
--msgid "Workgroup 5002"
--msgstr "Workgroup 5002"
-+msgid "Workgroup Fibre Channel intelligent switch"
-+msgstr "Intelligenter Lichtwellenleiter-Switch für Arbeitsgruppen"
- 
-+# A fault-tolerant Fibre Channel switch that typically has a high port count and may serve as a central switch to other fabrics.
- #: ../sheets/ciscohub.sheet.in.h:68
--msgid "Workgroup 5500"
--msgstr "Workgroup 5500"
-+msgid "Director-class Fibre Channel intelligent switch"
-+msgstr "Intelligenter Fibre-Channel-Switch der Director-Klasse"
- 
- #: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
--msgstr "Intelligenter Lichtwellenleiter-Switch für Arbeitsgruppen"
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Multi-Fabric Server Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:70
--msgid "Workgroup Switch Voice-Enabled"
--msgstr "Arbeitsgruppen-Switch sprachaktiviert"
-+msgid "Server Switch"
-+msgstr "Server-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
--msgstr "Arbeitsgruppen-Switch"
-+msgid "Multilayer Remote Switch"
-+msgstr "Multilayer Remote-Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:72
--msgid "Workgroup switch Subdued"
--msgstr "Arbeitsgruppen-Switch (inaktiv)"
-+msgid "Layer 2 Remote Switch"
-+msgstr "Entfernter Switch der Ebene 2"
- 
- #: ../sheets/ciscohub.sheet.in.h:73
--msgid "iSCSI switch"
--msgstr "iSCSI-Switch"
-+msgid "Virtual Layer Switch"
-+msgstr "Virtueller Layer-Switch"
- 
- #: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
--msgstr "Stilisierte Person"
-+msgid "Cisco - Misc"
-+msgstr "Cisco - Versch."
- 
- #: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr "Antenne"
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Diverse Formen von Cisco"
- 
- #: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Zweigbüro"
-+msgid "Government Building"
-+msgstr "Regierungsgebäude"
- 
- #: ../sheets/ciscomisc.sheet.in.h:4
--msgid "Branch office blue"
--msgstr "Zweigbüro blau"
-+msgid "University"
-+msgstr "Universität"
- 
- #: ../sheets/ciscomisc.sheet.in.h:5
--msgid "Branch office subdued"
--msgstr "Zweigbüro (inaktiv)"
-+msgid "Small Business"
-+msgstr "Kleinbetrieb"
- 
--# Also wenn es um Cisco-Netzwerke geht, scheint mir das Auto fehl am Platz.
--# CHECK
- #: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr "Auto"
-+msgid "Home office"
-+msgstr "Home-Office"
- 
- #: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Cisco - Versch."
-+msgid "Branch office"
-+msgstr "Zweigbüro"
- 
- #: ../sheets/ciscomisc.sheet.in.h:8
--msgid "CiscoWorks Man"
--msgstr "CiscoWorks Man"
-+msgid "Branch office subdued"
-+msgstr "Zweigbüro (inaktiv)"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:9
-+msgid "Branch office blue"
-+msgstr "Zweigbüro blau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:10
- msgid "Generic Building"
- msgstr "Generisches Gebäude"
- 
- #: ../sheets/ciscomisc.sheet.in.h:11
--msgid "Generic Building blue"
--msgstr "Generisches Gebäude blau"
--
--#: ../sheets/ciscomisc.sheet.in.h:12
- msgid "Generic Building subdued"
- msgstr "Generisches Gebäude (inaktiv)"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:12
-+msgid "Generic Building blue"
-+msgstr "Generisches Gebäude blau"
-+
- #: ../sheets/ciscomisc.sheet.in.h:13
--msgid "Government Building"
--msgstr "Regierungsgebäude"
-+msgid "Medium Building"
-+msgstr "Mittleres Gebäude"
- 
- #: ../sheets/ciscomisc.sheet.in.h:14
--msgid "Headphones"
--msgstr "Telefone"
-+msgid "Medium Building subdued"
-+msgstr "Mittleres Gebäude (inaktiv)"
- 
- #: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr "Home-Office"
-+msgid "Medium Building blue"
-+msgstr "Mittleres Gebäude blau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:16
- msgid "House"
-@@ -9457,1135 +9755,1133 @@ msgid "House blue"
- msgstr "Haus blau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Schlüssel"
-+msgid "Telecommuter house"
-+msgstr "Telecommuter-Haus"
- 
--#: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
--msgstr "Schloss und Schlüssel"
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr "Telecommuter-Haus (inaktiv)"
- 
--#: ../sheets/ciscomisc.sheet.in.h:21
-+#: ../sheets/ciscomisc.sheet.in.h:20
- msgid "MDU"
- msgstr "MDU"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr "Mann"
-+
- #: ../sheets/ciscomisc.sheet.in.h:22
--msgid "Mac Woman"
--msgstr "Mac-Woman"
-+msgid "Man red"
-+msgstr "Mann rot"
- 
- #: ../sheets/ciscomisc.sheet.in.h:23
--msgid "Man"
--msgstr "Mann"
-+msgid "Man gold"
-+msgstr "Mann gold"
- 
- #: ../sheets/ciscomisc.sheet.in.h:24
- msgid "Man blue"
- msgstr "Mann blau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
--msgstr "Mann gold"
-+msgid "Standing Man"
-+msgstr "Stehender Mann"
- 
- #: ../sheets/ciscomisc.sheet.in.h:26
--msgid "Man red"
--msgstr "Mann rot"
-+msgid "Standing woman"
-+msgstr "Stehende Frau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:27
--msgid "Medium Building"
--msgstr "Mittleres Gebäude"
-+msgid "Woman"
-+msgstr "Frau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr "Mittleres Gebäude blau"
-+msgid "Woman red"
-+msgstr "Frau rot"
- 
- #: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr "Mittleres Gebäude (inaktiv)"
-+msgid "Woman gold"
-+msgstr "Frau gold"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Frau blau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Diverse Formen von Cisco"
-+msgid "Running man"
-+msgstr "Laufender Mann"
- 
- #: ../sheets/ciscomisc.sheet.in.h:32
--msgid "PC Man"
--msgstr "PC-Mann"
-+msgid "Running man subdued"
-+msgstr "Laufender Mann (inaktiv)"
- 
- #: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
--msgstr "PC-Mann links"
-+msgid "Telecommuter"
-+msgstr "Telecommuter"
- 
- #: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
--msgstr "Laufender Mann"
-+msgid "Running woman"
-+msgstr "Laufende Frau"
- 
- #: ../sheets/ciscomisc.sheet.in.h:35
--msgid "Running man subdued"
--msgstr "Laufender Mann (inaktiv)"
-+msgid "CiscoWorks Man"
-+msgstr "CiscoWorks Man"
- 
- #: ../sheets/ciscomisc.sheet.in.h:36
--msgid "Running woman"
--msgstr "Laufende Frau"
-+msgid "PC Man left"
-+msgstr "PC-Mann links"
- 
- #: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Satellit"
-+msgid "PC Man"
-+msgstr "PC-Mann"
- 
- #: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
--msgstr "Satellitenantenne"
--
--#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman"
- msgstr "Sitzende Frau"
- 
--#: ../sheets/ciscomisc.sheet.in.h:40
-+#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman right"
- msgstr "Sitzende Frau rechts"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:40
-+msgid "Mac Woman"
-+msgstr "Mac-Woman"
-+
- #: ../sheets/ciscomisc.sheet.in.h:41
--msgid "Small Business"
--msgstr "Kleinbetrieb"
-+msgid "Androgynous Person"
-+msgstr "Stilisierte Person"
- 
- #: ../sheets/ciscomisc.sheet.in.h:43
--msgid "Standing Man"
--msgstr "Stehender Mann"
-+msgid "Key"
-+msgstr "Schlüssel"
- 
- #: ../sheets/ciscomisc.sheet.in.h:44
--msgid "Standing woman"
--msgstr "Stehende Frau"
-+msgid "Lock and Key"
-+msgstr "Schloss und Schlüssel"
- 
- #: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
--msgstr "Telecommuter"
-+msgid "Satellite dish"
-+msgstr "Satellitenantenne"
- 
- #: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr "Telecommuter-Haus"
-+msgid "Satellite"
-+msgstr "Satellit"
- 
- #: ../sheets/ciscomisc.sheet.in.h:47
--msgid "Telecommuter house subdued"
--msgstr "Telecommuter-Haus (inaktiv)"
-+msgid "Antenna"
-+msgstr "Antenne"
-+
-+# Also wenn es um Cisco-Netzwerke geht, scheint mir das Auto fehl am Platz.
-+# CHECK
-+#: ../sheets/ciscomisc.sheet.in.h:49
-+msgid "Car"
-+msgstr "Auto"
- 
--#: ../sheets/ciscomisc.sheet.in.h:48
-+#: ../sheets/ciscomisc.sheet.in.h:50
- msgid "Truck"
- msgstr "Lastwagen"
- 
--#: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Universität"
--
--#: ../sheets/ciscomisc.sheet.in.h:50
-+#: ../sheets/ciscomisc.sheet.in.h:51
- msgid "Video Camera"
- msgstr "Video-Kamera"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscomisc.sheet.in.h:52
- msgid "Video Camera right"
- msgstr "Video-Kamera rechts"
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
--msgid "Woman"
--msgstr "Frau"
--
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr "Frau blau"
--
- #: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr "Frau gold"
--
--#: ../sheets/ciscomisc.sheet.in.h:55
--msgid "Woman red"
--msgstr "Frau rot"
-+msgid "Headphones"
-+msgstr "Telefone"
- 
- #: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr "10700"
-+msgid "Cisco - Network"
-+msgstr "Cisco - Netzwerk"
- 
- #: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr "15200"
-+msgid "Network shapes by Cisco"
-+msgstr "Netzwerkformen von Cisco"
- 
- #: ../sheets/cisconetwork.sheet.in.h:3
--msgid "15800"
--msgstr "15800"
-+msgid "Network Management"
-+msgstr "Netzwerkverwaltung"
- 
- #: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr "3173 (Desktop-)Cluster-Controller"
-+msgid "Detector"
-+msgstr "Detektor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
--msgstr "3X74 (Boden-)Cluster-Controller"
-+msgid "Protocol Translator"
-+msgstr "Protokollübersetzer"
- 
- #: ../sheets/cisconetwork.sheet.in.h:6
--msgid "Access Server"
--msgstr "Access-Server"
-+msgid "IP"
-+msgstr "IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
--msgstr "AccessPoint"
-+msgid "IP Old-style"
-+msgstr "IP alter Stil"
- 
- #: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
--msgstr "Automatische Schutzschaltung"
-+msgid "NAT"
-+msgstr "NAT"
- 
- #: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
-+msgid "VIP"
-+msgstr "VIP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "BBFW-Media"
-+msgid "Terminal Server"
-+msgstr "Terminal-Server"
- 
- #: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
--msgstr "Breakout-Box"
-+msgid "Access Server"
-+msgstr "Access-Server"
- 
- #: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Netzwerkbrücke"
-+msgid "System controller"
-+msgstr "System-Controller"
- 
- #: ../sheets/cisconetwork.sheet.in.h:13
--msgid "CDDI/FDDI Concentrator"
--msgstr "CDDI/FDDI-Konzentrator"
-+msgid "Directory Server"
-+msgstr "Verzeichnis-Server"
- 
- #: ../sheets/cisconetwork.sheet.in.h:14
--msgid "CDM Content Distribution Manager"
--msgstr "CDM Content-Distribution-Manager"
-+msgid "Firewall"
-+msgstr "Firewall"
- 
- #: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr "CSU/DSU"
-+msgid "Firewall subdued"
-+msgstr "Firewall (inaktiv)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:16
--msgid "Cable Modem"
--msgstr "Kabelmodem"
-+msgid "Firewall horizontal"
-+msgstr "Firewall horizontal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:17
--msgid "Catalyst Access Gateway"
--msgstr "Catalyst-Access-Gateway"
-+msgid "Firewall Service Module"
-+msgstr "Firewall-Dienst-Modul"
- 
- #: ../sheets/cisconetwork.sheet.in.h:18
--msgid "Centri Firewall"
--msgstr "Centri-Firewall"
-+msgid "IOS Firewall"
-+msgstr "IOS-Firewall"
- 
- #: ../sheets/cisconetwork.sheet.in.h:19
--msgid "Channelized Pipe"
--msgstr "Kanalisierte Weiterleitung"
-+msgid "PIX Firewall"
-+msgstr "PIX-Firewall"
- 
- #: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Cisco - Netzwerk"
-+msgid "PIX Firewall Left"
-+msgstr "PIX-Firewall links"
- 
- #: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Wolke"
--
--#: ../sheets/cisconetwork.sheet.in.h:22
--msgid "Cloud Dark"
--msgstr "Wolke dunkel"
-+msgid "Centri Firewall"
-+msgstr "Centri-Firewall"
- 
- #: ../sheets/cisconetwork.sheet.in.h:23
--msgid "Cloud Gold"
--msgstr "Wolke gold"
-+msgid "Security appliance"
-+msgstr "Sicherheitsgerät"
- 
- #: ../sheets/cisconetwork.sheet.in.h:24
--msgid "Cloud White"
--msgstr "Wolke weiß"
-+msgid "VPN Concentrator"
-+msgstr "VPN-Konzentrator"
- 
- #: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
--msgstr "Concatenated Payload"
-+msgid "VPN Gateway"
-+msgstr "VPN-Gateway"
- 
--# CHECK
- #: ../sheets/cisconetwork.sheet.in.h:26
--msgid "Content Engine (Cache Director)"
--msgstr "Inhalts-Engine (Cache-Leiter)"
-+msgid "LAN to LAN"
-+msgstr "LAN-zu-LAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:27
--msgid "Content Transformation Engine (CTE)"
--msgstr "Inhaltsumwandlungs-Engine (CTE)"
-+msgid "SSL Terminator"
-+msgstr "SSL-Terminal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr "DSLAM"
-+msgid "IP DSL Switch"
-+msgstr "IP DSL-Switch"
- 
- #: ../sheets/cisconetwork.sheet.in.h:29
--msgid "DWDM Filter"
--msgstr "DWDM-Filter"
-+msgid "DSLAM"
-+msgstr "DSLAM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:30
--msgid "Detector"
--msgstr "Detektor"
-+msgid "Cable Modem"
-+msgstr "Kabelmodem"
- 
- #: ../sheets/cisconetwork.sheet.in.h:31
--msgid "Digital Cross-Connect"
--msgstr "Digitaler Kreuzverbinder"
-+msgid "Wireless Connectivity"
-+msgstr "Kabellose Anschlussmöglichkeit"
- 
- #: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr "Verzeichnis-Server"
-+msgid "Wireless Transport"
-+msgstr "Drahtlose Ãœbertragung"
- 
- #: ../sheets/cisconetwork.sheet.in.h:33
--msgid "Distributed Director"
--msgstr "Richtungsverteiler"
-+msgid "AccessPoint"
-+msgstr "AccessPoint"
- 
- #: ../sheets/cisconetwork.sheet.in.h:34
--msgid "Dual Mode AccessPoint"
--msgstr "Dual-Mode-Zugangspunkt"
-+msgid "Wireless Bridge"
-+msgstr "Drahtlose Brücke"
- 
- #: ../sheets/cisconetwork.sheet.in.h:35
--msgid "FDDI Ring"
--msgstr "FDDI-Ring"
-+msgid "Dual Mode AccessPoint"
-+msgstr "Dual-Mode-Zugangspunkt"
- 
- #: ../sheets/cisconetwork.sheet.in.h:36
--msgid "File Engine"
--msgstr "Datei-Engine"
-+msgid "Wi-Fi Tag"
-+msgstr "Wi-Fi Tag"
- 
-+# The Cisco Wireless Location Appliance is the industry’s first location solution that simultaneously tracks thousands of devices from directly within the WLAN infrastructure
- #: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
--msgstr "Firewall"
-+msgid "Wireless Location Appliance"
-+msgstr "Wireless Location Appliance"
- 
- #: ../sheets/cisconetwork.sheet.in.h:38
--msgid "Firewall Service Module"
--msgstr "Firewall-Dienst-Modul"
-+msgid "Location server"
-+msgstr "Vorort-Server"
- 
- #: ../sheets/cisconetwork.sheet.in.h:39
--msgid "Firewall horizontal"
--msgstr "Firewall horizontal"
-+msgid "Lightweight AP"
-+msgstr "Leichtgewichtiger AP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:40
--msgid "Firewall subdued"
--msgstr "Firewall (inaktiv)"
-+msgid "WLAN controller"
-+msgstr "WLAN-Controller"
- 
- #: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
--msgstr "Allgemeines Gerät"
-+msgid "BBFW"
-+msgstr "BBFW"
- 
- #: ../sheets/cisconetwork.sheet.in.h:42
--msgid "Generic Gateway"
--msgstr "Allgemeines Gateway"
-+msgid "BBFW media"
-+msgstr "BBFW-Media"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
-+msgstr "Kanalisierte Weiterleitung"
- 
- #: ../sheets/cisconetwork.sheet.in.h:44
--msgid "IOS Firewall"
--msgstr "IOS-Firewall"
-+msgid "Concatenated Payload"
-+msgstr "Concatenated Payload"
- 
- #: ../sheets/cisconetwork.sheet.in.h:45
--msgid "IOS SLB"
--msgstr "IOS SLB"
-+msgid "Optical Cross-Connect"
-+msgstr "Optische Kreuzverbindung"
- 
- #: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
-+msgid "Optical Transport"
-+msgstr "Optische Ãœbertragung"
- 
- #: ../sheets/cisconetwork.sheet.in.h:47
--msgid "IP DSL Switch"
--msgstr "IP DSL-Switch"
-+msgid "Optical Fiber"
-+msgstr "Optische Faser"
- 
- #: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
--msgstr "IP alter Stil"
-+msgid "Optical Amplifier"
-+msgstr "Optischer Verstärker"
- 
- #: ../sheets/cisconetwork.sheet.in.h:49
--msgid "IP Transport Concentrator"
--msgstr "IP-Ãœbertragungs-Konzentrator"
-+msgid "Digital Cross-Connect"
-+msgstr "Digitaler Kreuzverbinder"
- 
- #: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
--msgstr "IPTV-Ausstrahlungs-Server"
-+msgid "IP Transport Concentrator"
-+msgstr "IP-Ãœbertragungs-Konzentrator"
- 
- #: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
--msgstr "IPTV-Inhalts-Manager"
-+msgid "DWDM Filter"
-+msgstr "DWDM-Filter"
- 
- #: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr "LAN-zu-LAN"
-+msgid "WDM"
-+msgstr "WDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
--msgstr "Leichtgewichtiger AP"
-+msgid "15200"
-+msgstr "15200"
- 
- #: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "LocalDirector"
-+msgid "15800"
-+msgstr "15800"
- 
- #: ../sheets/cisconetwork.sheet.in.h:55
--msgid "Location server"
--msgstr "Vorort-Server"
-+msgid "ONS15104"
-+msgstr "ONS15104"
- 
- #: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
--msgstr "LongReach-CPE"
-+msgid "10700"
-+msgstr "10700"
- 
- #: ../sheets/cisconetwork.sheet.in.h:57
--msgid "MAS Gateway"
--msgstr "MAS-Gateway"
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
- 
- #: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
-+msgid "ONS15540"
-+msgstr "ONS15540"
- 
- #: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME-1100"
-+msgid "Automatic Protection Switching"
-+msgstr "Automatische Schutzschaltung"
- 
- #: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
-+msgid "RPS"
-+msgstr "RPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
-+msgid "UPS"
-+msgstr "UPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:62
--msgid "NAT"
--msgstr "NAT"
-+msgid "LongReach CPE"
-+msgstr "LongReach-CPE"
- 
- #: ../sheets/cisconetwork.sheet.in.h:63
--msgid "Network Management"
--msgstr "Netzwerkverwaltung"
-+msgid "3X74 (floor) cluster controller"
-+msgstr "3X74 (Boden-)Cluster-Controller"
- 
- #: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Netzwerkformen von Cisco"
-+msgid "3174 (desktop) cluster controller"
-+msgstr "3173 (Desktop-)Cluster-Controller"
- 
- #: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
--msgstr "ONS15104"
-+msgid "CSU/DSU"
-+msgstr "CSU/DSU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
--msgstr "ONS15540"
-+msgid "WAN"
-+msgstr "WAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:67
--msgid "Optical Amplifier"
--msgstr "Optischer Verstärker"
-+msgid "Cloud"
-+msgstr "Wolke"
- 
- #: ../sheets/cisconetwork.sheet.in.h:68
--msgid "Optical Cross-Connect"
--msgstr "Optische Kreuzverbindung"
-+msgid "Cloud Gold"
-+msgstr "Wolke gold"
- 
- #: ../sheets/cisconetwork.sheet.in.h:69
--msgid "Optical Fiber"
--msgstr "Optische Faser"
-+msgid "Cloud White"
-+msgstr "Wolke weiß"
- 
- #: ../sheets/cisconetwork.sheet.in.h:70
--msgid "Optical Transport"
--msgstr "Optische Ãœbertragung"
-+msgid "Cloud Dark"
-+msgstr "Wolke dunkel"
- 
- #: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
-+msgid "Distributed Director"
-+msgstr "Richtungsverteiler"
- 
- #: ../sheets/cisconetwork.sheet.in.h:72
--msgid "PIX Firewall"
--msgstr "PIX-Firewall"
-+msgid "LocalDirector"
-+msgstr "LocalDirector"
- 
- #: ../sheets/cisconetwork.sheet.in.h:73
--msgid "PIX Firewall Left"
--msgstr "PIX-Firewall links"
-+msgid "IOS SLB"
-+msgstr "IOS SLB"
- 
- #: ../sheets/cisconetwork.sheet.in.h:74
--msgid "Protocol Translator"
--msgstr "Protokollübersetzer"
-+msgid "MUX"
-+msgstr "MUX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
-+msgid "General Appliance"
-+msgstr "Allgemeines Gerät"
- 
- #: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr "Repeater"
-+msgid "PAD"
-+msgstr "PAD"
- 
- #: ../sheets/cisconetwork.sheet.in.h:77
--msgid "SSL Terminator"
--msgstr "SSL-Terminal"
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "CDDI/FDDI-Konzentrator"
- 
- #: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr "STB (Set-Top-Box)"
-+msgid "FDDI Ring"
-+msgstr "FDDI-Ring"
- 
- #: ../sheets/cisconetwork.sheet.in.h:79
--msgid "Security appliance"
--msgstr "Sicherheitsgerät"
-+msgid "TokenRing"
-+msgstr "TokenRing"
- 
- #: ../sheets/cisconetwork.sheet.in.h:80
--msgid "Service Control"
--msgstr "Dienstkontrolle"
-+msgid "MAU"
-+msgstr "MAU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:81
--msgid "Storage Solution Engine"
--msgstr "Engine für Speicherlösung"
-+msgid "Repeater"
-+msgstr "Repeater"
- 
- #: ../sheets/cisconetwork.sheet.in.h:82
--msgid "System controller"
--msgstr "System-Controller"
-+msgid "Bridge"
-+msgstr "Netzwerkbrücke"
- 
- #: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "Fernseher"
-+msgid "Breakout box"
-+msgstr "Breakout-Box"
- 
- #: ../sheets/cisconetwork.sheet.in.h:84
--msgid "Terminal Server"
--msgstr "Terminal-Server"
-+msgid "STB (set top box)"
-+msgstr "STB (Set-Top-Box)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "TokenRing"
-+msgid "TV"
-+msgstr "Fernseher"
- 
- #: ../sheets/cisconetwork.sheet.in.h:86
--msgid "TransPath"
--msgstr "TransPath"
-+msgid "IPTV broadcast server"
-+msgstr "IPTV-Ausstrahlungs-Server"
- 
- #: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "UPS"
-+msgid "IPTV content manager"
-+msgstr "IPTV-Inhalts-Manager"
- 
- #: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
- msgid "VN2900"
- msgstr "VN2900"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "VN5902"
-+
- #: ../sheets/cisconetwork.sheet.in.h:90
- msgid "VN5900"
- msgstr "VN5900"
- 
- #: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr "VN5902"
-+msgid "Catalyst Access Gateway"
-+msgstr "Catalyst-Access-Gateway"
- 
- #: ../sheets/cisconetwork.sheet.in.h:92
--msgid "VPN Concentrator"
--msgstr "VPN-Konzentrator"
-+msgid "Generic Gateway"
-+msgstr "Allgemeines Gateway"
- 
- #: ../sheets/cisconetwork.sheet.in.h:93
--msgid "VPN Gateway"
--msgstr "VPN-Gateway"
-+msgid "TransPath"
-+msgstr "TransPath"
- 
- #: ../sheets/cisconetwork.sheet.in.h:94
--msgid "WAN"
--msgstr "WAN"
-+msgid "uBR910 Cable DSU"
-+msgstr "uBR910 Kabel-DSU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:95
--msgid "WDM"
--msgstr "WDM"
-+msgid "Storage Solution Engine"
-+msgstr "Engine für Speicherlösung"
- 
-+# CHECK
- #: ../sheets/cisconetwork.sheet.in.h:96
--msgid "WLAN controller"
--msgstr "WLAN-Controller"
-+msgid "Content Engine (Cache Director)"
-+msgstr "Inhalts-Engine (Cache-Leiter)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
--msgstr "Wi-Fi Tag"
-+msgid "CDM Content Distribution Manager"
-+msgstr "CDM Content-Distribution-Manager"
- 
- #: ../sheets/cisconetwork.sheet.in.h:98
--msgid "Wireless Bridge"
--msgstr "Drahtlose Brücke"
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "Inhaltsumwandlungs-Engine (CTE)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr "Kabellose Anschlussmöglichkeit"
-+msgid "ME 1100"
-+msgstr "ME-1100"
- 
--# The Cisco Wireless Location Appliance is the industry’s first location solution that simultaneously tracks thousands of devices from directly within the WLAN infrastructure
- #: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
--msgstr ""
-+msgid "MAS Gateway"
-+msgstr "MAS-Gateway"
- 
- #: ../sheets/cisconetwork.sheet.in.h:101
--msgid "Wireless Transport"
--msgstr "Drahtlose Ãœbertragung"
-+msgid "File Engine"
-+msgstr "Datei-Engine"
- 
- #: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr "uBR910 Kabel-DSU"
-+msgid "Service Control"
-+msgstr "Dienstkontrolle"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
-+msgid "Cisco - Telephony"
-+msgstr "Cisco - Telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:2
--msgid "6705"
--msgstr "6705"
-+msgid "Telephony shapes by Cisco"
-+msgstr "Telefonformen von Cisco"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr "6732"
-+msgid "Phone"
-+msgstr "Telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
-+msgid "Phone 2"
-+msgstr "Telefon 2"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
-+msgid "Phone Ethernet"
-+msgstr "Telefon-Ethernet"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
-+msgid "Phone Appliance"
-+msgstr "Telefongerät"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
--msgstr "CallManager"
-+msgid "Phone Feature"
-+msgstr "Telefoneigenschaft"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:8
--msgid "Cellular Phone"
--msgstr "Mobiltelefon"
-+msgid "Phone/Fax"
-+msgstr "Telefon/Fax"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:9
--msgid "Cisco - Telephony"
--msgstr "Cisco - Telefon"
-+msgid "HootPhone"
-+msgstr "HootPhone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr "Switch der Klasse 4/5"
-+msgid "IP Phone"
-+msgstr "IP-Telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:11
--msgid "End Office"
--msgstr "End-Office"
-+msgid "IP Softphone"
-+msgstr "IP-SoftPhone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
--msgstr "Fax"
-+msgid "Softphone"
-+msgstr "Softphone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
--msgstr "Gatekeeper"
-+msgid "Cellular Phone"
-+msgstr "Mobiltelefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
--msgstr "Generischer Soft-Switch"
-+msgid "Mobile Access IP Phone"
-+msgstr "Mobiltelefon mit IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
-+msgid "Pager"
-+msgstr "Pager"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
--msgstr "HootPhone"
-+msgid "Fax"
-+msgstr "Fax"
- 
-+# CHECK
- #: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "IAD-Router"
-+msgid "Turret"
-+msgstr "Drehkreuz"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
-+msgid "Octel"
-+msgstr "Octel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
-+msgid "Radio Tower"
-+msgstr "Radioturm"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:20
--msgid "IP Phone"
--msgstr "IP-Telefon"
-+msgid "PBX"
-+msgstr "PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "IP-SoftPhone"
-+msgid "PBX Switch"
-+msgstr "PBX-Switch"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:22
--msgid "IP Telephony Router"
--msgstr "IP-Telefonie-Router"
-+msgid "Class 4/5 switch"
-+msgstr "Switch der Klasse 4/5"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
-+msgid "SONET MUX"
-+msgstr "SONET MUX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr "IntelliSwitch-Stapel"
-+msgid "ADM"
-+msgstr "ADM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:25
--msgid "MCU"
--msgstr "MCU"
-+msgid "ITP"
-+msgstr "ITP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr "MGX 8000 Series Voice Gateway"
-+msgid "ATA"
-+msgstr "ATA"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
--msgstr "MoH-Server (Music-on-Hold)"
-+msgid "SIP Proxy Server"
-+msgstr "SIP-Proxy-Server"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:28
--msgid "Mobile Access IP Phone"
--msgstr "Mobiltelefon mit IP"
-+msgid "Gatekeeper"
-+msgstr "Gatekeeper"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:29
--msgid "Mobile Access Router"
--msgstr "Router für Mobileinsatz"
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr "MGX 8000 Series Voice Gateway"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr "Octel"
-+msgid "End Office"
-+msgstr "End-Office"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "PBX"
-+msgid "Voice-Enabled Access Server"
-+msgstr "Sprachaktivierter Access Server"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:32
--msgid "PBX Switch"
--msgstr "PBX-Switch"
-+msgid "Voice-Enabled Router"
-+msgstr "Sprachaktivierter Router"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:33
--msgid "Pager"
--msgstr "Pager"
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Sprachaktivierter ATM-Switch"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Telefon"
-+msgid "CallManager"
-+msgstr "CallManager"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:35
--msgid "Phone 2"
--msgstr "Telefon 2"
-+msgid "IP Telephony Router"
-+msgstr "IP-Telefonie-Router"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr "Telefongerät"
-+msgid "Mobile Access Router"
-+msgstr "Router für Mobileinsatz"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:37
--msgid "Phone Ethernet"
--msgstr "Telefon-Ethernet"
-+msgid "H.323"
-+msgstr "H.323"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:38
--msgid "Phone Feature"
--msgstr "Telefoneigenschaft"
-+msgid "STP"
-+msgstr "STP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr "Telefon/Fax"
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:40
--msgid "Radio Tower"
--msgstr "Radioturm"
-+msgid "Generic softswitch"
-+msgstr "Generischer Soft-Switch"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:41
--msgid "SC2200 (Signalling Controller)"
--msgstr "SC2200 (Signalregler)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:42
- msgid "SC2200/VSC3000 host"
- msgstr "SC2200/VSC3000-Host"
- 
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Virtual-Switch-Controller (VSC 3000)"
-+
- #: ../sheets/ciscotelephony.sheet.in.h:43
--msgid "SIP Proxy Server"
--msgstr "SIP-Proxy-Server"
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "SC2200 (Signalregler)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
--msgstr "SONET MUX"
-+msgid "MoH server (Music on Hold)"
-+msgstr "MoH-Server (Music-on-Hold)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
--msgstr "STP"
-+msgid "TDM router"
-+msgstr "TDM-Router"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr "Softphone"
-+msgid "6701"
-+msgstr "6701"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr "TDM-Router"
-+msgid "6705"
-+msgstr "6705"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:48
--msgid "Telephony shapes by Cisco"
--msgstr "Telefonformen von Cisco"
-+msgid "6732"
-+msgstr "6732"
- 
--# CHECK
- #: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr "Drehkreuz"
-+msgid "IAD router"
-+msgstr "IAD-Router"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:50
--msgid "Unity Express"
--msgstr "Unity Express"
-+msgid "ICS"
-+msgstr "ICS"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr "Unity-Server"
-+msgid "ICM"
-+msgstr "ICM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
--msgstr "Virtual-Switch-Controller (VSC 3000)"
-+msgid "IntelliSwitch Stack"
-+msgstr "IntelliSwitch-Stapel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:53
--msgid "Voice-Enabled ATM Switch"
--msgstr "Sprachaktivierter ATM-Switch"
-+msgid "Unity server"
-+msgstr "Unity-Server"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:54
--msgid "Voice-Enabled Access Server"
--msgstr "Sprachaktivierter Access Server"
-+msgid "Unity Express"
-+msgstr "Unity Express"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:55
--msgid "Voice-Enabled Router"
--msgstr "Sprachaktivierter Router"
-+msgid "MCU"
-+msgstr "MCU"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:56
- msgid "uMG series"
- msgstr "uMG-Serien"
- 
- #: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr "Tellerbelüfter mit Blasen"
-+msgid "Civil"
-+msgstr "Bauwesen"
- 
- #: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr "Rückflussklappe"
-+msgid "Civil Engineering Components"
-+msgstr "Komponenten aus dem Bauwesen"
- 
- #: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Becken"
-+msgid "Vertical rest"
-+msgstr "Vertikale Auflage"
- 
- #: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Zweiwertige vertikale Auflage"
-+msgid "Horizontal rest"
-+msgstr "Horizontale Auflage"
- 
- #: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Bauwesen"
-+msgid "Bivalent vertical rest"
-+msgstr "Zweiwertige vertikale Auflage"
- 
- #: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Komponenten aus dem Bauwesen"
-+msgid "Reference line"
-+msgstr "Bezugslinie"
- 
- #: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Behälter"
-+msgid "Water level"
-+msgstr "Wasserspiegel"
- 
- #: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Becken zur endgültigen Entsorgung"
-+msgid "Soil"
-+msgstr "Erdreich"
- 
- #: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Frequenzwandler"
-+msgid "Horizontally aligned arrow"
-+msgstr "Horizontaler ausgerichteter Pfeil"
- 
- #: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Gasflasche"
-+msgid "Vertically aligned arrow"
-+msgstr "Vertikal ausgerichteter Pfeil"
- 
- #: ../sheets/civil.sheet.in.h:11
- msgid "Horizontal limiting line"
- msgstr "Horizontale Begrenzungslinie"
- 
- #: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Horizontale Auflage"
-+msgid "Vertical limiting line"
-+msgstr "Vertikale Begrenzungslinie"
- 
- #: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Horizontaler ausgerichteter Pfeil"
-+msgid "Horizontally aligned pump"
-+msgstr "Eine horizontal ausgerichtete Pumpe"
- 
- #: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Ein horizontal ausgerichteter Kompressor"
-+msgid "Vertically aligned pump"
-+msgstr "Vertikal ausgerichtete Pumpe"
- 
- #: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Eine horizontal ausgerichtete Pumpe"
-+msgid "Horizontally aligned compressor"
-+msgstr "Ein horizontal ausgerichteter Kompressor"
- 
- #: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Horizontal ausgerichtetes Ventil"
-+msgid "Vertically aligned compressor"
-+msgstr "Vertikal ausgerichteter Kompressor"
- 
- #: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Motor"
-+msgid "Vertically aligned valve"
-+msgstr "Vertikal ausgerichtetes Ventil"
- 
- #: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Vorklärbecken"
-+msgid "Horizontally aligned valve"
-+msgstr "Horizontal ausgerichtetes Ventil"
- 
- #: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Bezugslinie"
-+msgid "Backflow preventer"
-+msgstr "Rückflussklappe"
- 
- #: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Rotor"
-+msgid "Motor"
-+msgstr "Motor"
- 
- #: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Erdreich"
-+msgid "Gas bottle"
-+msgstr "Gasflasche"
- 
- #: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "Vertikale Begrenzungslinie"
-+msgid "Frequency converter"
-+msgstr "Frequenzwandler"
- 
- #: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "Vertikale Auflage"
-+msgid "Vertically aligned propeller"
-+msgstr "Vertikal ausgerichteter Propeller"
- 
- #: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "Vertikal ausgerichteter Pfeil"
-+msgid "Aerator with bubbles"
-+msgstr "Tellerbelüfter mit Blasen"
- 
- #: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "Vertikal ausgerichteter Kompressor"
-+msgid "Rotor"
-+msgstr "Rotor"
- 
- #: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "Vertikal ausgerichteter Propeller"
-+msgid "Final-settling basin"
-+msgstr "Becken zur endgültigen Entsorgung"
- 
- #: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "Vertikal ausgerichtete Pumpe"
-+msgid "Preliminary clarification tank"
-+msgstr "Vorklärbecken"
- 
- #: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "Vertikal ausgerichtetes Ventil"
-+msgid "Basin"
-+msgstr "Becken"
- 
- #: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "Wasserspiegel"
-+msgid "Container"
-+msgstr "Behälter"
- 
- #: ../sheets/jigsaw.sheet.in.h:1
- msgid "Jigsaw"
- msgstr "Puzzle"
- 
- #: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Puzzle - Teil_iiii"
-+msgid "Pieces of a jigsaw"
-+msgstr "Puzzleteile"
- 
- #: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Puzzle - Teil_iiio"
-+msgid "Jigsaw - part_oioi"
-+msgstr "Puzzle - Teil_oioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Puzzle - Teil_iioi"
-+msgid "Jigsaw - part_ioio"
-+msgstr "Puzzle - Teil_ioio"
- 
- #: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Puzzle - Teil_iioo"
-+msgid "Jigsaw - part_iiii"
-+msgstr "Puzzle - Teil_iiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Puzzle - Teil_ioii"
-+msgid "Jigsaw - part_oooo"
-+msgstr "Puzzle - Teil_oooo"
- 
- #: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Puzzle - Teil_ioio"
-+msgid "Jigsaw - part_oooi"
-+msgstr "Puzzle - Teil_oooi"
- 
- #: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Puzzle - Teil_iooi"
--
--#: ../sheets/jigsaw.sheet.in.h:9
- msgid "Jigsaw - part_iooo"
- msgstr "Puzzle - Teil_iooo"
- 
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Puzzle - Teil_oioo"
-+
- #: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Puzzle - Teil_oiii"
-+msgid "Jigsaw - part_ooio"
-+msgstr "Puzzle - Teil_ooio"
- 
- #: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Puzzle - Teil_oiio"
-+msgid "Jigsaw - part_iioo"
-+msgstr "Puzzle - Teil_iioo"
- 
- #: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Puzzle - Teil_oioi"
-+msgid "Jigsaw - part_oiio"
-+msgstr "Puzzle - Teil_oiio"
- 
- #: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Puzzle - Teil_oioo"
--
--#: ../sheets/jigsaw.sheet.in.h:14
- msgid "Jigsaw - part_ooii"
- msgstr "Puzzle - Teil_ooii"
- 
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Puzzle - Teil_iooi"
-+
- #: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Puzzle - Teil_ooio"
-+msgid "Jigsaw - part_oiii"
-+msgstr "Puzzle - Teil_oiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Puzzle - Teil_oooi"
-+msgid "Jigsaw - part_ioii"
-+msgstr "Puzzle - Teil_ioii"
- 
- #: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Puzzle - Teil_oooo"
-+msgid "Jigsaw - part_iioi"
-+msgstr "Puzzle - Teil_iioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Puzzleteile"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr "Patchleiste mit 24 Anschlüssen"
-+msgid "Jigsaw - part_iiio"
-+msgstr "Puzzle - Teil_iiio"
- 
- #: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "3 1/2 Zoll-Diskette"
-+msgid "Objects to design network diagrams with"
-+msgstr "Objekte zum Entwerfern von Netzwerkdiagrammen"
- 
- #: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "ATM-Switch-Symbol"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "Antenne zur drahtlosen Ãœbertragung"
-+msgid "Computer"
-+msgstr "Computer"
- 
- #: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "Bigtower-PC"
-+msgid "Storage"
-+msgstr "Speicher"
- 
- #: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Computer"
-+msgid "Ethernet bus"
-+msgstr "Ethernet-Bus"
- 
- #: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "Desktop-PC"
-+msgid "Simple printer"
-+msgstr "Einfacher Drucker"
- 
- #: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Digitalisierbrett"
-+msgid "WAN connection"
-+msgstr "WAN-Anschluss"
- 
- #: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Ethernet-Bus"
-+msgid "WAN link"
-+msgstr "WAN-Verbindung"
- 
- #: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Externes DAT-Laufwerk"
-+msgid "Stackable hub or switch"
-+msgstr "Stapelbarer Hub oder Switch"
- 
- #: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Firewall-Router"
-+msgid "Modular switching system"
-+msgstr "Modulares Switch-System"
- 
- #: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "Laptop"
-+msgid "24 Port Patch Panel"
-+msgstr "Patchleiste mit 24 Anschlüssen"
- 
- #: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "Miditower-PC"
-+msgid "RJ45 wall-plug"
-+msgstr "RJ45-Steckdose"
- 
- #: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "Minitower-PC"
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Steckdose für das Verkabelungssystem scEAD"
- 
- #: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Mobiltelefon"
-+msgid "Simple modem"
-+msgstr "Einfaches Modem"
- 
- #: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antenne zur drahtlosen Ãœbertragung"
-+
-+#: ../sheets/network.sheet.in.h:17
- msgid "Mobile telephony base station"
- msgstr "Mobilfunk-Basisstation"
- 
--#: ../sheets/network.sheet.in.h:17
-+#: ../sheets/network.sheet.in.h:19
- msgid "Mobile telephony cell"
- msgstr "Mobilfunkzelle"
- 
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Modulares Switch-System"
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Router-Symbol"
-+
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Switch-Symbol"
- 
- #: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Objekte zum Entwerfern von Netzwerkdiagrammen"
-+msgid "ATM switch symbol"
-+msgstr "ATM-Switch-Symbol"
- 
- #: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Plotter"
-+msgid "Firewall router"
-+msgstr "Firewall-Router"
- 
- #: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "RJ45-Steckdose"
-+msgid "Workstation monitor"
-+msgstr "Workstation-Monitor"
- 
- #: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Router-Symbol"
-+msgid "UNIX workstation"
-+msgstr "UNIX-Workstation"
- 
- #: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Einfaches Modem"
-+msgid "Desktop PC"
-+msgstr "Desktop-PC"
- 
- #: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Einfacher Drucker"
-+msgid "Laptop PC"
-+msgstr "Laptop"
- 
- #: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Lautsprecher mit eingebautem Verstärker"
-+msgid "Bigtower PC"
-+msgstr "Bigtower-PC"
- 
- #: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Lautsprecher ohne Verstärker"
-+msgid "Miditower PC"
-+msgstr "Miditower-PC"
- 
- #: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Stapelbarer Hub oder Switch"
-+msgid "Minitower PC"
-+msgstr "Minitower-PC"
- 
- #: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Speicher"
-+msgid "Speaker with integrated amplifier"
-+msgstr "Lautsprecher mit eingebautem Verstärker"
- 
- #: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Switch-Symbol"
-+msgid "Speaker without amplifier"
-+msgstr "Lautsprecher ohne Verstärker"
-+
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "3 1/2 Zoll-Diskette"
- 
- #: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "UNIX-Workstation"
-+msgid "ZIP disk"
-+msgstr "ZIP-Diskette"
- 
- #: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "WAN-Anschluss"
-+msgid "External DAT drive"
-+msgstr "Externes DAT-Laufwerk"
- 
- #: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "WAN-Verbindung"
--
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Steckdose für das Verkabelungssystem scEAD"
-+msgid "Mobile phone"
-+msgstr "Mobiltelefon"
- 
- #: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Workstation-Monitor"
-+msgid "Plotter"
-+msgstr "Plotter"
- 
- #: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "ZIP-Diskette"
-+msgid "Digitizing board"
-+msgstr "Digitalisierbrett"
- 
- #: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr "Protokolltransfermanager oder Replikationsagent"
-+msgid "Sybase"
-+msgstr "Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:2
- msgid "Objects to design Sybase replication domain diagrams with"
- msgstr "Objekte zum Entwerfen von Sybase-Replikationsbereichsdiagrammen mit"
- 
- #: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Replikations-Server-Manager"
-+msgid "Sybase dataserver"
-+msgstr "Sybase-Datenserver"
- 
- #: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Stabiles Speichersystem"
-+msgid "Sybase replication server"
-+msgstr "Sybase-Replikations-Server"
- 
- #: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+msgid "Log transfer manager or rep agent"
-+msgstr "Protokolltransfermanager oder Replikationsagent"
- 
- #: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Sybase-Client-Anwendung"
-+msgid "Stable storage device"
-+msgstr "Stabiles Speichersystem"
- 
- #: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Sybase-Datenserver"
-+msgid "Sybase client application"
-+msgstr "Sybase-Client-Anwendung"
- 
- #: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Sybase-Replikations-Server"
-+msgid "Replication server manager"
-+msgstr "Replikations-Server-Manager"
- 
- #~ msgid "Diagram"
- #~ msgstr "Diagramm"
-@@ -10599,58 +10895,40 @@ msgstr "Sybase-Replikations-Server"
- # CHECK
- #~ msgid "Children"
- #~ msgstr "Kinder"
--
- #~ msgid "Object(s)"
- #~ msgstr "Objekt(e)"
--
- #~ msgid "Select"
- #~ msgstr "Auswählen"
--
- #~ msgid "Properties"
- #~ msgstr "Eigenschaften"
--
- #~ msgid "Create a new diagram"
- #~ msgstr "Ein neues Diagramm erstellen"
--
- #~ msgid "Open a diagram file"
- #~ msgstr "Eine Diagrammdateien öffnen"
--
- #~ msgid "_Diagram tree"
- #~ msgstr "_Diagrammbaum"
--
- #~ msgid "Save the diagram"
- #~ msgstr "Das Diagramm speichern"
--
- #~ msgid "Save the diagram with a new name"
- #~ msgstr "Das Diagramm unter neuem Namen speichern"
--
- #~ msgid "Export the diagram"
- #~ msgstr "Das Diagramm exportieren"
--
- #~ msgid "Print the diagram"
- #~ msgstr "Das Diagramm drucken"
--
- #~ msgid "Copy selection"
- #~ msgstr "Auswahl kopieren"
--
- #~ msgid "Cut selection"
- #~ msgstr "Auswahl ausschneiden"
--
- #~ msgid "Paste selection"
- #~ msgstr "Auswahl einfügen"
--
- #~ msgid "Zoom in"
- #~ msgstr "Vergrößern"
--
- #~ msgid "Zoom out"
- #~ msgstr "Verkleinern"
--
- #~ msgid "Zoom fit"
- #~ msgstr "Größe einpassen"
--
- #~ msgid "Please select a .shape file"
- #~ msgstr "Bitte wählen Sie eine .shape-Datei"
--
- #, fuzzy
- #~ msgid "Miter"
- #~ msgstr "Mixer"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0006-Bug-676830-Misc-Grid-don-t-crash-on-copy-resize.patch b/graphics/dia/patches/0006-Bug-676830-Misc-Grid-don-t-crash-on-copy-resize.patch
deleted file mode 100644
index 482c8a7b59..0000000000
--- a/graphics/dia/patches/0006-Bug-676830-Misc-Grid-don-t-crash-on-copy-resize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b9b279e8bd77e0fb27176d64baa75563054ac5e1 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sat, 23 Jun 2012 15:21:58 +0200
-Subject: [PATCH 06/24] Bug 676830 : Misc - Grid : don't crash on copy, resize
-
-Row index was iterated with the columns range.
----
- objects/Misc/grid_object.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
-index bf6537a..05d1b16 100644
---- a/objects/Misc/grid_object.c
-+++ b/objects/Misc/grid_object.c
-@@ -479,7 +479,7 @@ grid_object_reallocate_cells (Grid_Object* grid_object)
- 
-   /* implicit: if (new_cols < old_cols) */
-   for (i = new_cols; i < old_cols; ++i)
--    for (j = 0; j < old_cols && j < new_cols; ++j) /* don't double-delete */
-+    for (j = 0; j < old_rows && j < new_rows; ++j) /* don't double-delete */
-     {
-       int cell = grid_cell(i, j, old_rows, old_cols);
-       object_remove_connections_to(&grid_object->cells[cell]);
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0007-grid-object-avoid-crash-on-shrink.patch b/graphics/dia/patches/0007-grid-object-avoid-crash-on-shrink.patch
deleted file mode 100644
index 59fe831dda..0000000000
--- a/graphics/dia/patches/0007-grid-object-avoid-crash-on-shrink.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ae8bcaa703197d090c0c746c54289ddcc6bbbbb1 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Thu, 7 Oct 2010 13:21:16 +0200
-Subject: [PATCH 07/24] grid-object: avoid crash on shrink
-
-Fix some confusion about rows/columns using the wrong limits.
-Resizing object::connections was too early.
-(cherry picked from commit cddd958b71a4075751ab76ac3530ced3c33972ea)
----
- objects/Misc/grid_object.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
-index 05d1b16..11dca8b 100644
---- a/objects/Misc/grid_object.c
-+++ b/objects/Misc/grid_object.c
-@@ -460,12 +460,6 @@ grid_object_reallocate_cells (Grid_Object* grid_object)
-   if (old_rows == new_rows && old_cols == new_cols)
-     return;  /* no reallocation necessary */
- 
--  /* obj->connections doesn't own the pointers, so just realloc; values
--   * will be updated later */
--  obj->num_connections = GRID_OBJECT_BASE_CONNECTION_POINTS + new_rows*new_cols;
--  obj->connections = (ConnectionPoint **) g_realloc(obj->connections,
--      		obj->num_connections * sizeof(ConnectionPoint *));
--
-   /* If either new dimension is smaller, some connpoints will have to
-    * be disconnected before reallocating */
- 
-@@ -485,6 +479,13 @@ grid_object_reallocate_cells (Grid_Object* grid_object)
-       object_remove_connections_to(&grid_object->cells[cell]);
-     }
- 
-+  /* must be done after disconnecting */
-+  /* obj->connections doesn't own the pointers, so just realloc; values
-+   * will be updated later */
-+  obj->num_connections = GRID_OBJECT_BASE_CONNECTION_POINTS + new_rows*new_cols;
-+  obj->connections = (ConnectionPoint **) g_realloc(obj->connections,
-+      		obj->num_connections * sizeof(ConnectionPoint *));
-+
-   /* Can't use realloc; if grid has different dims, memory lays out
-    * differently.  Must copy by hand. */
- 
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0008-Updated-Brazilian-Portuguese-Translation.patch b/graphics/dia/patches/0008-Updated-Brazilian-Portuguese-Translation.patch
deleted file mode 100644
index 0a6d347e3d..0000000000
--- a/graphics/dia/patches/0008-Updated-Brazilian-Portuguese-Translation.patch
+++ /dev/null
@@ -1,10616 +0,0 @@
-From 2c58a8574fea4617495544ca49b46f23470a727b Mon Sep 17 00:00:00 2001
-From: Rafael Ferreira <rafael.f.f1@gmail.com>
-Date: Fri, 28 Dec 2012 01:04:23 -0200
-Subject: [PATCH 08/24] Updated Brazilian Portuguese Translation
-
----
- po/pt_BR.po | 5985 +++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 3159 insertions(+), 2826 deletions(-)
-
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index a812dd7..238957b 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -7,99 +7,112 @@
- # Afonso Celso Medina <afmedina@uol.com.br>, 2004, 2005.
- # Igor Pires Soares <igor@projetofedora.org>, 2008.
- # Og Maciel <ogmaciel@gnome.org>, 2009.
-+# Isis Binder <isis.binder@gmail.com>, 2009.
-+# Rodolfo RG <rodolforg@gmail.com>, 2011.
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: Dia\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-01-17 10:37-0500\n"
--"PO-Revision-Date: 2009-01-17 10:37-0500\n"
--"Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
--"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-+"product=dia&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2012-06-23 13:56+0000\n"
-+"PO-Revision-Date: 2012-12-27 08:05-0300\n"
-+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-+"Language-Team: Português (Brasil) <gnome-pt_br-list@gnome.org>\n"
-+"Language: pt_BR\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=2; plural=(n > 1);\n"
--"X-Poedit-Language: Portuguese\n"
--"X-Poedit-Country: BRAZIL\n"
-+"X-Generator: Virtaal 0.4.0\n"
- 
- #. This is not an errror
--#: ../app/app_procs.c:202
-+#: ../app/app_procs.c:209
- #, c-format
- msgid "Warning: invalid layer range %lu - %lu\n"
- msgstr "Aviso: intervalo de camada inválido %lu - %lu\n"
- 
--#: ../app/app_procs.c:214
-+#: ../app/app_procs.c:221
- #, c-format
- msgid "Warning: Layer %lu (%s) selected more than once.\n"
- msgstr "Aviso: A camada %lu (%s) foi selecionada mais de uma vez.\n"
- 
--#: ../app/app_procs.c:240
-+#: ../app/app_procs.c:247
- #, c-format
- msgid "Warning: Layer %d (%s) selected more than once.\n"
- msgstr "Aviso: A camada %d (%s) foi selecionada mais de uma vez.\n"
- 
--#: ../app/app_procs.c:249
-+#: ../app/app_procs.c:256
- #, c-format
- msgid "Warning: There is no layer named %s\n"
- msgstr "Aviso: Não existe nenhuma camada denominada %s\n"
- 
--#: ../app/app_procs.c:331
-+#: ../app/app_procs.c:338
- #, c-format
- msgid "%s error: don't know how to export into %s\n"
- msgstr "erro %s: não é possível exportar para %s\n"
- 
--#: ../app/app_procs.c:340
-+#: ../app/app_procs.c:347
- #, c-format
- msgid "%s error: input and output file name is identical: %s"
- msgstr "erro %s: os nomes dos arquivos de entrada e saída são idênticos: %s"
- 
--#: ../app/app_procs.c:348
-+#: ../app/app_procs.c:355
- #, c-format
- msgid "%s error: need valid input file %s\n"
- msgstr "erro %s: é necessário um arquivo de entrada válido %s\n"
- 
- #. if (!quiet)
--#: ../app/app_procs.c:373
-+#: ../app/app_procs.c:383
- #, c-format
- msgid "%s --> %s\n"
- msgstr "%s --> %s\n"
- 
--#: ../app/app_procs.c:544
-+#: ../app/app_procs.c:558
- #, c-format
- msgid "Can't find output format/filter %s\n"
--msgstr "Não foi possível localizar o formato de filtro %s\n"
-+msgstr "Não foi possível localizar o formato/filtro de saída %s\n"
-+
-+#: ../app/app_procs.c:628
-+#, c-format
-+msgid "Input-directory '%s' must exist!\n"
-+msgstr "O diretório de entrada \"%s\" deve existir!\n"
-+
-+#: ../app/app_procs.c:645
-+#, c-format
-+msgid "Output-directory '%s' must exist!\n"
-+msgstr "O diretório de saída \"%s\" deve existir!\n"
- 
- #. Translators:  The argument is a list of options, not to be translated
--#: ../app/app_procs.c:620
-+#: ../app/app_procs.c:702
- #, c-format
- msgid "Select the filter/format out of: %s"
--msgstr "Selecione o filtro/formato fora de: %s"
-+msgstr "Selecione o filtro/formato dentre: %s"
- 
- #. &export_file_name
--#: ../app/app_procs.c:638
-+#: ../app/app_procs.c:720
- msgid "Export loaded file and exit"
- msgstr "Exportar o arquivo carregado e sair"
- 
--#: ../app/app_procs.c:638
-+#: ../app/app_procs.c:720
- msgid "OUTPUT"
- msgstr "SA�DA"
- 
- #. &export_file_format
- #. &export_format_string
--#: ../app/app_procs.c:640
-+#: ../app/app_procs.c:722
- msgid "TYPE"
- msgstr "TIPO"
- 
--#: ../app/app_procs.c:642
-+#: ../app/app_procs.c:724
- msgid "Export graphics size"
- msgstr "Tamanho do gráfico exportado"
- 
--#: ../app/app_procs.c:642
-+#: ../app/app_procs.c:724
- msgid "WxH"
- msgstr "LxA"
- 
--#: ../app/app_procs.c:644
-+#: ../app/app_procs.c:726
- msgid ""
- "Show only specified layers (e.g. when exporting). Can be either the layer "
- "name or a range of layer numbers (X-Y)"
-@@ -107,70 +120,105 @@ msgstr ""
- "Mostrar apenas camadas especificadas (p. ex. ao exportar). Pode ser tanto o "
- "nome da camada quanto o intervalo dos números da camadas (X-Y)"
- 
--#: ../app/app_procs.c:645
-+#: ../app/app_procs.c:727
- msgid "LAYER,LAYER,..."
- msgstr "CAMADA,CAMADA,..."
- 
--#: ../app/app_procs.c:647
-+#: ../app/app_procs.c:729
- msgid "Don't show the splash screen"
- msgstr "Não mostrar a tela de abertura"
- 
--#: ../app/app_procs.c:649
-+#: ../app/app_procs.c:731
- msgid "Don't create empty diagram"
- msgstr "Não criar um diagrama vazio"
- 
--#: ../app/app_procs.c:651
-+#: ../app/app_procs.c:733
-+msgid "Start integrated user interface (diagrams in tabs)"
-+msgstr "Iniciar interface de usuário integrada (diagramas em abas)"
-+
-+#: ../app/app_procs.c:735
- msgid "Send error messages to stderr instead of showing dialogs."
--msgstr "Envia mensagens de erro pra stderr ao contrário de mostrar diálogos."
-+msgstr "Envia mensagens de erro pra stderr em vez de mostrar diálogos."
-+
-+#: ../app/app_procs.c:737
-+msgid "Directory containing input files"
-+msgstr "Diretório contendo arquivos de entrada"
- 
--#: ../app/app_procs.c:653
-+#: ../app/app_procs.c:737 ../app/app_procs.c:739
-+msgid "DIRECTORY"
-+msgstr "DIRETÓRIO"
-+
-+#: ../app/app_procs.c:739
-+msgid "Directory containing output files"
-+msgstr "Diretório contendo arquivos de saída"
-+
-+#: ../app/app_procs.c:741
- msgid "Display credits list and exit"
--msgstr "Mostra a lista de créditos e sair"
-+msgstr "Mostra a lista de créditos e sai"
- 
--#: ../app/app_procs.c:655
-+#: ../app/app_procs.c:743
- msgid "Generate verbose output"
- msgstr "Gera saída detalhada"
- 
--#: ../app/app_procs.c:657
-+#: ../app/app_procs.c:745
- msgid "Display version and exit"
- msgstr "Mostra a versão e sai"
- 
--#: ../app/app_procs.c:709
-+#: ../app/app_procs.c:768
-+msgid "[FILE...]"
-+msgstr "[ARQUIVO...]"
-+
-+#: ../app/app_procs.c:780
-+#, c-format
-+msgid "Invalid option?"
-+msgstr "Opção inválida?"
-+
-+#: ../app/app_procs.c:803
-+#, c-format
-+msgid "Filename conversion failed: %s\n"
-+msgstr "Conversão do nome de arquivo falhou: %s\n"
-+
-+#: ../app/app_procs.c:816
-+#, c-format
-+msgid "Missing input: %s\n"
-+msgstr "Falta entrada: %s\n"
-+
-+#: ../app/app_procs.c:841
- msgid "Can't connect to session manager!\n"
- msgstr "Não foi possível conectar ao gerenciador de sessão!\n"
- 
- #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
--#: ../app/app_procs.c:749
-+#: ../app/app_procs.c:881
- #, c-format
- msgid "Dia version %s, compiled %s %s\n"
--msgstr "Versão %s do Dia, compilado %s %s\n"
-+msgstr "Dia versão %s, compilado %s %s\n"
- 
--#: ../app/app_procs.c:751
-+#: ../app/app_procs.c:883
- #, c-format
- msgid "Dia version %s\n"
--msgstr "Versão %s do Dia\n"
-+msgstr "Dia versão %s\n"
- 
--#: ../app/app_procs.c:787
-+#: ../app/app_procs.c:921
- msgid ""
- "Couldn't find standard objects when looking for object-libs; exiting...\n"
- msgstr ""
- "Não foi possível localizar objetos padrão ao procurar por object-libs, "
- "saindo...\n"
- 
--#: ../app/app_procs.c:789
-+#: ../app/app_procs.c:923
- #, c-format
- msgid ""
- "Couldn't find standard objects when looking for object-libs in '%s'; "
- "exiting...\n"
- msgstr ""
--"Não foi possível localizar objetos padrão ao procurar object-libs em \"%s\"; "
--"saindo...\n"
-+"Não foi possível localizar objetos padrão ao procurar por object-libs em \"%s"
-+"\"; saindo...\n"
- 
--#: ../app/app_procs.c:848
-+#: ../app/app_procs.c:990
- msgid "Diagram1.dia"
- msgstr "Diagrama1.dia"
- 
--#: ../app/app_procs.c:891
-+#: ../app/app_procs.c:1025
- msgid ""
- "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
- "describing how you can cause this message to appear.\n"
-@@ -178,16 +226,16 @@ msgstr ""
- "Isso não deveria acontecer. Por favor, crie um relatório de erro em\n"
- "bugzilla.gnome.org descrevendo a situação que gerou esta mensagem.\n"
- 
--#: ../app/app_procs.c:906
-+#: ../app/app_procs.c:1040
- msgid "Exiting Dia"
- msgstr "Saindo do Dia"
- 
- #. no standard buttons
--#: ../app/app_procs.c:958
-+#: ../app/app_procs.c:1104
- msgid "Quitting without saving modified diagrams"
- msgstr "Saindo sem salvar diagramas modificados"
- 
--#: ../app/app_procs.c:960
-+#: ../app/app_procs.c:1106
- msgid ""
- "Modified diagrams exist. Are you sure you want to quit Dia without saving "
- "them?"
-@@ -195,15 +243,15 @@ msgstr ""
- "Existem diagramas modificados. Você tem certeza de que deseja sair do Dia "
- "sem salvá-los?"
- 
--#: ../app/app_procs.c:964
-+#: ../app/app_procs.c:1110
- msgid "Quit Dia"
- msgstr "Sair do Dia"
- 
--#: ../app/app_procs.c:1033 ../app/app_procs.c:1040
-+#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
- msgid "Could not create per-user Dia config directory"
- msgstr "Não foi possível criar o diretório de configuração pessoal do Dia"
- 
--#: ../app/app_procs.c:1043
-+#: ../app/app_procs.c:1189
- msgid ""
- "Could not create per-user Dia config directory. Please make sure that the "
- "environment variable HOME points to an existing directory."
-@@ -212,29 +260,20 @@ msgstr ""
- "favor, certifique-se de que a variável de ambiente HOME aponta para um "
- "diretório existente."
- 
--#: ../app/app_procs.c:1066
-+#: ../app/app_procs.c:1212
- msgid "Objects and filters internal to dia"
- msgstr "Objetos e filtros internos do Dia"
- 
--#: ../app/app_procs.c:1098
--msgid "[FILE...]"
--msgstr "[ARQUIVO...]"
--
--#: ../app/app_procs.c:1119
--#, c-format
--msgid "'%s' not found!\n"
--msgstr "\"%s\" não encontrado!\n"
--
--#: ../app/app_procs.c:1163
-+#: ../app/app_procs.c:1268
- #, c-format
- msgid ""
- "The original author of Dia was:\n"
- "\n"
- msgstr ""
--"O autor original do Dia foi:\n"
-+"O autor original do Dia é:\n"
- "\n"
- 
--#: ../app/app_procs.c:1168
-+#: ../app/app_procs.c:1273
- #, c-format
- msgid ""
- "\n"
-@@ -245,7 +284,7 @@ msgstr ""
- "Os mantenedores atuais do Dia são:\n"
- "\n"
- 
--#: ../app/app_procs.c:1173
-+#: ../app/app_procs.c:1278
- #, c-format
- msgid ""
- "\n"
-@@ -256,7 +295,7 @@ msgstr ""
- "Os outros autores são:\n"
- "\n"
- 
--#: ../app/app_procs.c:1178
-+#: ../app/app_procs.c:1283
- #, c-format
- msgid ""
- "\n"
-@@ -285,26 +324,26 @@ msgstr "Selecionar cor do primeiro plano"
- 
- #: ../app/color_area.c:318 ../app/color_area.c:361
- msgid "Select background color"
--msgstr "Selecionar cor de fundo"
-+msgstr "Selecionar cor de segundo plano"
- 
--#: ../app/commands.c:126
-+#: ../app/commands.c:130
- msgid "No print plug-in found!"
--msgstr "Nenhum plug-in de impressão localizado!"
-+msgstr "Nenhum plug-in de impressão foi localizado!"
- 
--#: ../app/commands.c:154
-+#: ../app/commands.c:150
- #, c-format
- msgid "Diagram%d.dia"
- msgstr "Diagrama%d.dia"
- 
--#: ../app/commands.c:347
-+#: ../app/commands.c:344
- msgid "No existing object to paste.\n"
- msgstr "Não existe objeto para colar.\n"
- 
--#: ../app/commands.c:651 ../app/commands.c:689
-+#: ../app/commands.c:653 ../app/commands.c:691
- msgid "Could not find help directory"
- msgstr "Não foi possível localizar o diretório de ajuda"
- 
--#: ../app/commands.c:658
-+#: ../app/commands.c:660
- #, c-format
- msgid ""
- "Could not open help directory:\n"
-@@ -313,7 +352,7 @@ msgstr ""
- "Não foi possível abrir o diretório de ajuda:\n"
- "%s"
- 
--#: ../app/commands.c:725
-+#: ../app/commands.c:727
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
- msgstr ""
- "Francisco Petrúcio Cavalcante Junior <fpcj@impa.br>\n"
-@@ -321,9 +360,11 @@ msgstr ""
- "Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
- "Everson Santos Araujo <nobios@por.com.br>\n"
- "Afonso Celso Medina <afmedina@uol.com.br>\n"
--"Igor Pires Soares <igor@projetofedora.org>"
-+"Igor Pires Soares <igor@projetofedora.org>\n"
-+"Isis Binder <isis.binder@gmail.com>\n"
-+"Rodolfo Ribeiro Gomes <rodolforg@gmail.com>"
- 
--#: ../app/commands.c:727
-+#: ../app/commands.c:729
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -353,16 +394,50 @@ msgstr ""
- "junto com este programa; se não, escreva para a Free Software\n"
- "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- 
--#: ../app/commands.c:750
-+#: ../app/commands.c:752
- msgid "A program for drawing structured diagrams."
- msgstr "Um programa para desenhar diagramas estruturados."
- 
-+#: ../app/confirm.c:69
-+#, c-format
-+msgid "You are about to print a diagram with %d pages."
-+msgstr "Você está prestes a imprimir um diagrama com %d páginas."
-+
-+#: ../app/confirm.c:71
-+#, c-format
-+msgid "You are about to export a diagram with %d pages."
-+msgstr "Você está prestes a exportar um diagrama com %d páginas."
-+
-+#: ../app/confirm.c:73
-+#, c-format
-+msgid ""
-+"You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgstr ""
-+"Você está prestes a exportar um diagrama que pode necessitar de %s de "
-+"memória (%d páginas)."
-+
-+#: ../app/confirm.c:81
-+msgid ""
-+"You can adjust the size of the diagram by changing the 'Scaling' in the "
-+"'Page Setup' dialog.\n"
-+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-+"the intended bounds."
-+msgstr ""
-+"Você pode ajustar o tamanho do diagrama alterando a \"Tamanho\" no diálogo "
-+"\"Configurar página\".\n"
-+"Alternativamente, use \"Selecionar tudo\" e \"Melhor ajuste\" para mover "
-+"objetos/alças para dentro dos limites pretendidos."
-+
-+#: ../app/confirm.c:85
-+msgid "Confirm Diagram Size"
-+msgstr "Confirmar o tamanho do diagrama"
-+
- #: ../app/create_object.c:71
- #, c-format
- msgid "'%s' creation failed"
- msgstr "Falha ao criar \"%s\""
- 
--#: ../app/defaults.c:43 ../app/defaults.c:145
-+#: ../app/defaults.c:43 ../app/defaults.c:150
- msgid "Object defaults"
- msgstr "Padrões do objeto"
- 
-@@ -370,7 +445,7 @@ msgstr "Padrões do objeto"
- msgid "This object has no defaults."
- msgstr "Este objeto não tem valores padrão."
- 
--#: ../app/defaults.c:110
-+#: ../app/defaults.c:115
- msgid "Defaults: "
- msgstr "Padrões: "
- 
-@@ -399,9 +474,9 @@ msgid "Visible spacing"
- msgstr "Espaçamento visível"
- 
- #. Hexes!
--#: ../app/dia-props.c:177 ../app/preferences.c:246
-+#: ../app/dia-props.c:177 ../app/preferences.c:242
- msgid "Hex grid"
--msgstr "Grade Hexagonal"
-+msgstr "Grade hexagonal"
- 
- #: ../app/dia-props.c:185
- msgid "Hex grid size"
-@@ -411,11 +486,11 @@ msgstr "Tamanho da grade hexagonal"
- msgid "Grid"
- msgstr "Grade"
- 
--#: ../app/dia-props.c:209 ../lib/diagramdata.c:113
-+#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
- msgid "Background"
--msgstr "Segundo Plano"
-+msgstr "Segundo plano"
- 
--#: ../app/dia-props.c:220 ../app/preferences.c:123
-+#: ../app/dia-props.c:220 ../app/preferences.c:122
- msgid "Grid Lines"
- msgstr "Linhas de grade"
- 
-@@ -458,30 +533,21 @@ msgstr "Posição Y do componente filho"
- msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
- msgstr "Não foi possível converter o nome de arquivo \"%s\" para UTF-8: %s\n"
- 
--#: ../app/diagram.c:225 ../lib/message.c:88 ../lib/message.c:291
-+#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
- msgid "Error"
- msgstr "Erro"
- 
--#: ../app/diagram.c:274
--msgid ""
--"You have loaded a non-Dia file.  The file has become an element in a new "
--"diagram, and if you save it, it will be saved as a Dia diagram."
--msgstr ""
--"Você carregou um arquivo que não é do Dia. O arquivo tornou-se um elemento "
--"em um novo diagrama e se você salvá-lo, ele será salvo como um diagrama do "
--"Dia."
--
--#: ../app/diagram.c:1178
-+#: ../app/diagram.c:1209
- msgid "Trying to group with no selected objects."
--msgstr "Tentando agrupar com nenhum objeto selecionado."
-+msgstr "Tentando agrupar sem qualquer objeto estar selecionado."
- 
--#: ../app/diagram.c:1188
-+#: ../app/diagram.c:1219
- msgid ""
- "You cannot group objects that belong to different groups or have different "
- "parents"
- msgstr ""
- "Você não pode agrupar objetos que pertençam a diferentes grupos ou que "
--"tenham pais diferentes."
-+"tenham pais diferentes"
- 
- #: ../app/diagram_tree_menu.c:47
- msgid "/_Sort objects"
-@@ -563,7 +629,7 @@ msgstr "/_Propriedades"
- msgid "/_Hide this type"
- msgstr "/_Ocultar este tipo"
- 
--#: ../app/diagram_tree_window.c:80 ../app/preferences.c:124
-+#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
- msgid "Diagram Tree"
- msgstr "�rvore de diagramas"
- 
-@@ -584,11 +650,11 @@ msgstr "Margens"
- 
- #: ../app/diapagelayout.c:236
- msgid "Top:"
--msgstr "Topo:"
-+msgstr "Superior:"
- 
- #: ../app/diapagelayout.c:249
- msgid "Bottom:"
--msgstr "Fundo:"
-+msgstr "Inferior:"
- 
- #: ../app/diapagelayout.c:262
- msgid "Left:"
-@@ -624,7 +690,7 @@ msgstr "%0.3gcm x %0.3gcm"
- msgid "Page Setup"
- msgstr "Configurar página"
- 
--#: ../app/disp_callbacks.c:85 ../app/properties-dialog.c:152
-+#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
- msgid ""
- "This object doesn't support Undo/Redo.\n"
- "Undo information erased."
-@@ -632,11 +698,15 @@ msgstr ""
- "Este objeto não suporta Desfazer/Refazer.\n"
- "Informação para desfazer removida."
- 
--#: ../app/disp_callbacks.c:120
-+#: ../app/disp_callbacks.c:130
- msgid "Properties..."
- msgstr "Propriedades..."
- 
--#: ../app/disp_callbacks.c:938
-+#: ../app/disp_callbacks.c:248
-+msgid "Selection"
-+msgstr "Seleção"
-+
-+#: ../app/disp_callbacks.c:1075
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -660,33 +730,34 @@ msgid "Selected '%s'"
- msgstr "Selecionado \"%s\""
- 
- #. we really should not come here but instead disable the menu command earlier
--#: ../app/display.c:1040
-+#: ../app/display.c:1121
- msgid "No anti-aliased renderer found"
--msgstr "Nenhum renderizador \"anti-aliased\" localizado"
-+msgstr "Nenhum renderizador com suavização foi localizado"
- 
--#: ../app/display.c:1185
-+#: ../app/display.c:1259
- msgid "<unnamed>"
- msgstr "<semnome>"
- 
- #. no standard buttons
--#: ../app/display.c:1191
-+#: ../app/display.c:1265
- msgid "Closing diagram without saving"
- msgstr "Fechando diagrama sem salvar"
- 
--#: ../app/display.c:1193
-+#: ../app/display.c:1267
- #, c-format
- msgid ""
- "The diagram '%s'\n"
- "has not been saved. Save changes now?"
- msgstr ""
--"O diagrama \"%s\" não foi salvo.\n"
-+"O diagrama \"%s\"\n"
-+"não foi salvo.\n"
- "Salvar as alterações agora?"
- 
--#: ../app/display.c:1195
-+#: ../app/display.c:1269
- msgid "Close Diagram"
- msgstr "Fechar diagrama"
- 
--#: ../app/display.c:1200
-+#: ../app/display.c:1274
- msgid "_Discard Changes"
- msgstr "_Descartar alterações"
- 
-@@ -706,50 +777,46 @@ msgstr "Salvar selecionados"
- msgid "The following are not saved:"
- msgstr "Os seguintes itens não estão salvos:"
- 
--#: ../app/exit_dialog.c:114
-+#: ../app/exit_dialog.c:113
- msgid "Save"
- msgstr "Salvar"
- 
--#: ../app/exit_dialog.c:115
--msgid "active"
--msgstr "ativo"
--
- #. *** board of value **************
--#: ../app/exit_dialog.c:124 ../app/plugin-manager.c:262
-+#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
- #: ../objects/Database/table.c:138 ../objects/Database/table.c:181
--#: ../objects/SISSI/sissi_dialog.c:619 ../objects/UML/association.c:236
-+#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
- #: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
- #: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
- #: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
- msgid "Name"
- msgstr "Nome"
- 
--#: ../app/exit_dialog.c:130
-+#: ../app/exit_dialog.c:129
- msgid "Path"
- msgstr "Caminho"
- 
--#: ../app/exit_dialog.c:143
-+#: ../app/exit_dialog.c:142
- msgid "Select All"
- msgstr "Selecionar tudo"
- 
--#: ../app/exit_dialog.c:151
-+#: ../app/exit_dialog.c:150
- msgid "Select None"
--msgstr "Não selecionar"
-+msgstr "Selecionar nenhum"
- 
--#: ../app/exit_dialog.c:229
-+#: ../app/exit_dialog.c:236
- msgid "Nothing selected for saving.  Would you like to try again?"
--msgstr "Nada selecionado para salvar. Você gostaria de tentar novamente?"
-+msgstr "Nada está selecionado para salvar. Você gostaria de tentar novamente?"
- 
--#: ../app/filedlg.c:143 ../app/filedlg.c:151 ../app/filedlg.c:167
--#: ../app/filedlg.c:745 ../lib/widgets.c:1488
-+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-+#: ../app/filedlg.c:746 ../lib/widgets.c:1488
- msgid "Supported Formats"
- msgstr "Formatos suportados"
- 
--#: ../app/filedlg.c:191 ../app/filedlg.c:605
-+#: ../app/filedlg.c:192 ../app/filedlg.c:604
- msgid "By extension"
- msgstr "Por extensão"
- 
--#: ../app/filedlg.c:280
-+#: ../app/filedlg.c:281
- msgid "Open Diagram"
- msgstr "Abrir diagrama"
- 
-@@ -757,15 +824,15 @@ msgstr "Abrir diagrama"
- msgid "Open Options"
- msgstr "Opções de abertura"
- 
--#: ../app/filedlg.c:317 ../app/filedlg.c:727
-+#: ../app/filedlg.c:317 ../app/filedlg.c:728
- msgid "Determine file type:"
- msgstr "Determinar o tipo de arquivo:"
- 
--#: ../app/filedlg.c:337 ../app/filedlg.c:740 ../lib/widgets.c:1493
-+#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
- msgid "All Files"
- msgstr "Todos os arquivos"
- 
--#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:409
-+#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
- msgid ""
- "Some characters in the filename are neither UTF-8\n"
- "nor your local encoding.\n"
-@@ -775,13 +842,13 @@ msgstr ""
- "estão na sua codificação local.\n"
- "Algumas partes apresentarão defeito."
- 
--#: ../app/filedlg.c:380 ../app/filedlg.c:652
--#: ../plug-ins/postscript/paginate_psprint.c:424
-+#: ../app/filedlg.c:380 ../app/filedlg.c:651
-+#: ../plug-ins/postscript/paginate_psprint.c:422
- msgid "File already exists"
- msgstr "O arquivo já existe"
- 
--#: ../app/filedlg.c:382 ../app/filedlg.c:654
--#: ../plug-ins/postscript/paginate_psprint.c:416
-+#: ../app/filedlg.c:382 ../app/filedlg.c:653
-+#: ../plug-ins/postscript/paginate_psprint.c:418
- #, c-format
- msgid ""
- "The file '%s' already exists.\n"
-@@ -796,20 +863,20 @@ msgstr "Salvar diagrama"
- 
- #. Need better way to make it a reasonable size.  Isn't there some
- #. standard look for them (or is that just Gnome?)
--#: ../app/filedlg.c:448
-+#: ../app/filedlg.c:447
- msgid "Compress diagram files"
- msgstr "Compactar os arquivos de diagramas"
- 
--#: ../app/filedlg.c:458 ../app/filedlg.c:463
-+#: ../app/filedlg.c:457 ../app/filedlg.c:462
- msgid ""
- "Compression reduces file size to less than 1/10th size and speeds up loading "
- "and saving.  Some text programs cannot manipulate compressed files."
- msgstr ""
--"A compactação reduz em cerca de 1/10 o tamanho do arquivo e aumenta a "
-+"A compactação reduz para cerca de 1/10 do tamanho do arquivo e aumenta a "
- "velocidade de leitura e gravação. Alguns programas de texto não podem "
- "manipular arquivos comprimidos."
- 
--#: ../app/filedlg.c:678
-+#: ../app/filedlg.c:677
- #, c-format
- msgid ""
- "Could not determine which export filter\n"
-@@ -818,54 +885,54 @@ msgstr ""
- "Não foi possível determinar qual filtro de\n"
- "exportação utilizar para salvar \"%s\""
- 
--#: ../app/filedlg.c:702
-+#: ../app/filedlg.c:704
- msgid "Export Diagram"
- msgstr "Exportar diagrama"
- 
--#: ../app/filedlg.c:719
-+#: ../app/filedlg.c:720
- msgid "Export Options"
- msgstr "Opções de exportação"
- 
--#: ../app/find-and-replace.c:453
-+#: ../app/find-and-replace.c:454
- msgid "_Search for:"
- msgstr "_Pesquisar por:"
- 
--#: ../app/find-and-replace.c:466
-+#: ../app/find-and-replace.c:467
- msgid "Replace _with:"
- msgstr "Substituir _por:"
- 
--#: ../app/find-and-replace.c:476
-+#: ../app/find-and-replace.c:477
- msgid "_Match case"
--msgstr "Caso de _correspondência"
-+msgstr "Conferir _maiusculização"
- 
--#: ../app/find-and-replace.c:480
-+#: ../app/find-and-replace.c:481
- msgid "Match _entire word only"
- msgstr "Pesquisar somente por palavras i_nteiras"
- 
--#: ../app/find-and-replace.c:484
-+#: ../app/find-and-replace.c:485
- msgid "Match _all properties (not just object name)"
--msgstr "Pesquisar por _todas propriedades (não somente o nome do objeto)"
-+msgstr "Pesquisar por _todas propriedades (não somente por nome de objeto)"
- 
--#: ../app/find-and-replace.c:509
-+#: ../app/find-and-replace.c:513
- msgid "Find"
- msgstr "Localizar"
- 
--#: ../app/find-and-replace.c:541 ../app/menus.c:258
-+#: ../app/find-and-replace.c:545 ../app/menus.c:267
- msgid "Replace"
- msgstr "Substituir"
- 
--#: ../app/find-and-replace.c:544
-+#: ../app/find-and-replace.c:548
- msgid "Replace _All"
- msgstr "Substituir _tudo"
- 
- #. not adding the button in the list above to modify it's text;
- #. * the default "Find and Replace" is just too long for my taste ;)
- #.
--#: ../app/find-and-replace.c:549
-+#: ../app/find-and-replace.c:553
- msgid "_Replace"
- msgstr "_Substituir"
- 
--#: ../app/interface.c:152
-+#: ../app/interface.c:153
- msgid ""
- "Modify object(s)\n"
- "Use <Space> to toggle between this and other tools"
-@@ -873,7 +940,7 @@ msgstr ""
- "Modificar objeto(s)\n"
- "Use <Espaço> para alternar entre esta e outras ferramentas"
- 
--#: ../app/interface.c:158
-+#: ../app/interface.c:159
- msgid ""
- "Text edit(s)\n"
- "Use <Esc> to leave this tool"
-@@ -882,18 +949,18 @@ msgstr ""
- "Use <Esc> para deixar esta ferramenta"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
--#: ../app/interface.c:164 ../app/menus.c:220 ../objects/FS/function.c:988
-+#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
- msgid "Magnify"
- msgstr "Aproximar"
- 
--#: ../app/interface.c:170
-+#: ../app/interface.c:171
- msgid "Scroll around the diagram"
- msgstr "Muda o enquadramento do diagrama na janela"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule
--#: ../app/interface.c:176 ../app/menus.c:223 ../lib/properties.c:79
--#: ../lib/properties.h:529 ../objects/AADL/aadlbox.c:156
-+#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
-+#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
- #: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
- #: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
- #: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
-@@ -905,88 +972,84 @@ msgstr "Muda o enquadramento do diagrama na janela"
- msgid "Text"
- msgstr "Texto"
- 
--#: ../app/interface.c:182 ../app/menus.c:224
-+#: ../app/interface.c:183 ../app/menus.c:233
- msgid "Box"
- msgstr "Caixa"
- 
--#: ../app/interface.c:188 ../app/menus.c:225
-+#: ../app/interface.c:189 ../app/menus.c:234
- msgid "Ellipse"
- msgstr "Elipse"
- 
--#: ../app/interface.c:194 ../app/menus.c:226
-+#: ../app/interface.c:195 ../app/menus.c:235
- msgid "Polygon"
- msgstr "Polígono"
- 
--#: ../app/interface.c:200 ../app/menus.c:227
-+#: ../app/interface.c:201 ../app/menus.c:236
- msgid "Beziergon"
- msgstr "Curva de Bézier fechada"
- 
--#: ../app/interface.c:206 ../app/menus.c:229 ../objects/standard/line.c:229
-+#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
- msgid "Line"
- msgstr "Linha"
- 
--#: ../app/interface.c:212 ../app/menus.c:230
-+#: ../app/interface.c:213 ../app/menus.c:239
- msgid "Arc"
- msgstr "Arco"
- 
--#: ../app/interface.c:218 ../app/menus.c:231
-+#: ../app/interface.c:219 ../app/menus.c:240
- msgid "Zigzagline"
- msgstr "Linha em zigue-zague"
- 
--#: ../app/interface.c:224 ../app/menus.c:232
-+#: ../app/interface.c:225 ../app/menus.c:241
- msgid "Polyline"
- msgstr "Polilinha"
- 
--#: ../app/interface.c:230 ../app/menus.c:233
-+#: ../app/interface.c:231 ../app/menus.c:242
- msgid "Bezierline"
- msgstr "Curva de Bézier"
- 
--#: ../app/interface.c:236 ../app/menus.c:236
-+#: ../app/interface.c:237 ../app/menus.c:245
- msgid "Image"
- msgstr "Imagem"
- 
--#: ../app/interface.c:242 ../app/menus.c:234
-+#: ../app/interface.c:244 ../app/menus.c:243
- msgid "Outline"
- msgstr "Contorno"
- 
--#: ../app/interface.c:616 ../app/interface.c:852
-+#: ../app/interface.c:621 ../app/interface.c:857
- msgid "Pops up the Navigation window."
- msgstr "Abre uma janela de navegação."
- 
--#: ../app/interface.c:814
-+#: ../app/interface.c:819
- msgid "Diagram menu."
- msgstr "Menu do diagrama."
- 
--#: ../app/interface.c:918
-+#: ../app/interface.c:922
- msgid "Zoom"
- msgstr "Zoom"
- 
--#: ../app/interface.c:933
-+#: ../app/interface.c:937
- msgid "Toggles snap-to-grid for this window."
--msgstr "Alterna entre alinhar na grade ou não para esta janela."
-+msgstr "Alterna entre alinhar à grade ou não para esta janela."
- 
--#: ../app/interface.c:944
-+#: ../app/interface.c:948
- msgid "Toggles object snapping for this window."
- msgstr "Alterna entre alinhar aos objetos ou não para esta janela."
- 
--#: ../app/interface.c:1007
--msgid "NULL tooldata in tool_select_update"
--msgstr "Dados de ferramenta NULOS em tool_select_update"
--
--#: ../app/interface.c:1334
-+#: ../app/interface.c:1338
- #, c-format
- msgid "No sheet named %s"
- msgstr "Não há nenhuma folha denominada %s"
- 
--#: ../app/interface.c:1372
-+#: ../app/interface.c:1376
- msgid "Other sheets"
- msgstr "Outras folhas"
- 
--#: ../app/interface.c:1432 ../sheets/Flowchart.sheet.in.h:10
-+#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:1
- msgid "Flowchart"
- msgstr "Fluxograma"
- 
--#: ../app/interface.c:1492
-+#: ../app/interface.c:1496
- msgid ""
- "Foreground & background colors for new objects.  The small black and white "
- "squares reset colors.  The small arrows swap colors.  Double click to change "
-@@ -996,16 +1059,16 @@ msgstr ""
- "preto e branco restauram as cores. As setas pequenas trocam as cores. Clique "
- "duplo para mudar as cores."
- 
--#: ../app/interface.c:1507
-+#: ../app/interface.c:1511
- msgid ""
- "Line widths.  Click on a line to set the default line width for new "
- "objects.  Double-click to set the line width more precisely."
- msgstr ""
- "Larguras de linha. Clique em uma linha para definir a largura de linha "
--"padrão para novos objetos. Clique duplo para definir a largura de linha mais "
--"precisamente."
-+"padrão para novos objetos. Clique duplo para definir a largura de linha de "
-+"formar mais precisa."
- 
--#: ../app/interface.c:1550
-+#: ../app/interface.c:1554
- msgid ""
- "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
- "arrow parameters with Details..."
-@@ -1013,7 +1076,7 @@ msgstr ""
- "Estilo de seta no início de novas linhas. Clique para escolher um seta, ou "
- "defina os parâmetros de estilo de seta através da opção Detalhes..."
- 
--#: ../app/interface.c:1555
-+#: ../app/interface.c:1559
- msgid ""
- "Line style for new lines.  Click to pick a line style, or set line style "
- "parameters with Details..."
-@@ -1021,7 +1084,7 @@ msgstr ""
- "Estilo de linha para novas linhas. Clique para escolher um estilo de linha "
- "ou defina os parâmetros de estilo de linha através da opção Detalhes..."
- 
--#: ../app/interface.c:1571
-+#: ../app/interface.c:1575
- msgid ""
- "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
- "parameters with Details..."
-@@ -1029,7 +1092,7 @@ msgstr ""
- "Estilo de seta no final de novas linhas. Clique para escolher um seta ou "
- "defina os parâmetros através da opção Detalhes..."
- 
--#: ../app/interface.c:1631 ../app/interface.c:1760
-+#: ../app/interface.c:1635 ../app/interface.c:1762
- msgid "Diagram Editor"
- msgstr "Editor de diagramas"
- 
-@@ -1049,36 +1112,40 @@ msgstr "Baixar camada"
- msgid "Delete Layer"
- msgstr "Excluir camada"
- 
--#: ../app/layer_dialog.c:305
-+#: ../app/layer_dialog.c:306
- msgid "Layers:"
- msgstr "Camadas:"
- 
--#: ../app/layer_dialog.c:385
-+#: ../app/layer_dialog.c:386
- msgid "Layers"
- msgstr "Camadas"
- 
--#: ../app/layer_dialog.c:399
-+#: ../app/layer_dialog.c:400
- msgid "Diagram:"
- msgstr "Diagrama:"
- 
--#: ../app/layer_dialog.c:513
-+#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
- #, c-format
- msgid "New layer %d"
- msgstr "Nova camada %d"
- 
--#: ../app/layer_dialog.c:728
-+#: ../app/layer_dialog.c:729
- msgid "none"
- msgstr "nenhuma"
- 
--#: ../app/layer_dialog.c:1153
--msgid "Edit Layer Attributes"
--msgstr "Editar atributos da camada"
-+#: ../app/layer_dialog.c:1196
-+msgid "Edit Layer"
-+msgstr "Editar camada"
-+
-+#: ../app/layer_dialog.c:1196
-+msgid "Add Layer"
-+msgstr "Adicionar camada"
- 
--#: ../app/layer_dialog.c:1172
-+#: ../app/layer_dialog.c:1215
- msgid "Layer name:"
- msgstr "Nome da camada:"
- 
--#: ../app/linewidth_area.c:246 ../lib/properties.h:490 ../lib/properties.h:493
-+#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
- #: ../objects/chronogram/chronoline.c:183
- #: ../objects/chronogram/chronoref.c:162
- msgid "Line width"
-@@ -1088,7 +1155,7 @@ msgstr "Largura da linha"
- msgid "Line width:"
- msgstr "Largura da linha:"
- 
--#: ../app/load_save.c:307
-+#: ../app/load_save.c:301
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
-@@ -1096,40 +1163,41 @@ msgstr ""
- "Erro ao carregar diagrama.\n"
- "Objeto vinculado não encontrado no documento."
- 
--#: ../app/load_save.c:311
-+#: ../app/load_save.c:305
-+#, c-format
- msgid ""
- "Error loading diagram.\n"
--"connection handle does not exist."
-+"connection handle %d does not exist on '%s'."
- msgstr ""
- "Erro ao carregar diagrama.\n"
--"Manipulador de conexão não existe."
-+"Manipulador de conexão %d não existe em \"%s\"."
- 
--#: ../app/load_save.c:338
-+#: ../app/load_save.c:333
- #, c-format
- msgid ""
- "Error loading diagram.\n"
--"connection point %s does not exist."
-+"connection point %d does not exist on '%s'."
- msgstr ""
- "Erro ao carregar diagrama.\n"
--"O ponto de conexão %s não existe."
-+"O ponto de conexão %d não existe em \"%s\"."
- 
--#: ../app/load_save.c:378
-+#: ../app/load_save.c:373
- #, c-format
- msgid "Can't find parent %s of %s object\n"
- msgstr "Não foi possível localizar o pai %s do objeto %s\n"
- 
--#: ../app/load_save.c:424
-+#: ../app/load_save.c:422
- msgid "You must specify a file, not a directory.\n"
- msgstr "Você deve especificar um arquivo, não um diretório.\n"
- 
--#: ../app/load_save.c:431 ../plug-ins/dxf/dxf-import.c:1309
-+#: ../app/load_save.c:429 ../plug-ins/dxf/dxf-import.c:1309
- #: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
- #: ../plug-ins/xslt/xslt.c:91
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "Não foi possível abrir \"%s\" para leitura.\n"
- 
--#: ../app/load_save.c:449 ../app/load_save.c:455
-+#: ../app/load_save.c:447 ../app/load_save.c:453
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1138,7 +1206,7 @@ msgstr ""
- "Erro ao carregar o diagrama %s.\n"
- "Tipo de arquivo desconhecido."
- 
--#: ../app/load_save.c:463
-+#: ../app/load_save.c:461
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1147,7 +1215,7 @@ msgstr ""
- "Erro ao carregar o diagrama %s.\n"
- "Não é um arquivo Dia."
- 
--#: ../app/load_save.c:669
-+#: ../app/load_save.c:678
- #, c-format
- msgid ""
- "Error loading diagram:\n"
-@@ -1158,412 +1226,433 @@ msgstr ""
- "%s.\n"
- "Um arquivo válido do Dia possui ao menos uma camada."
- 
--#: ../app/load_save.c:979
-+#: ../app/load_save.c:1001
- #, c-format
- msgid "Not allowed to write to output file %s\n"
- msgstr "Não é permitido gravar no arquivo de saída %s\n"
- 
--#: ../app/load_save.c:1011
-+#: ../app/load_save.c:1033
- #, c-format
- msgid "Not allowed to write temporary files in %s\n"
- msgstr "Não é permitido gravar arquivos temporários em %s\n"
- 
--#: ../app/load_save.c:1033 ../plug-ins/cairo/diacairo.c:121
--#: ../plug-ins/cgm/cgm.c:1153 ../plug-ins/dxf/dxf-export.c:547
--#: ../plug-ins/hpgl/hpgl.c:710 ../plug-ins/libart/export_png.c:157
-+#: ../app/load_save.c:1055 ../plug-ins/cairo/diacairo.c:121
-+#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
-+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
-+#: ../plug-ins/libart/export_png.c:159
- #: ../plug-ins/metapost/render_metapost.c:1177
- #: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
- #: ../plug-ins/pstricks/render_pstricks.c:916
--#: ../plug-ins/shape/shape-export.c:136 ../plug-ins/svg/render_svg.c:199
--#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
--#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:99
-+#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
-+#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
-+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
- #, c-format
- msgid "Can't open output file %s: %s\n"
- msgstr "Não é possível abrir o arquivo de saída %s: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:1044
-+#: ../app/load_save.c:1066
- #, c-format
- msgid "Internal error %d writing file %s\n"
- msgstr "Erro interno %d ao gravar arquivo %s\n"
- 
--#: ../app/load_save.c:1055
-+#: ../app/load_save.c:1077
- #, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
- msgstr "Não foi possível renomear %s para o arquivo de saída final %s: %s\n"
- 
--#: ../app/load_save.c:1146 ../app/load_save.c:1151
-+#: ../app/load_save.c:1168 ../app/load_save.c:1173
- msgid "Dia Diagram File"
- msgstr "Arquivo de diagrama do Dia"
- 
--#: ../app/menus.c:58
-+#: ../app/menus.c:63
- msgid "Fit"
- msgstr "Ajustar"
- 
--#: ../app/menus.c:76
-+#: ../app/menus.c:81
- msgid "_File"
- msgstr "_Arquivo"
- 
--#: ../app/menus.c:80
-+#: ../app/menus.c:85
- msgid "_Help"
- msgstr "Aj_uda"
- 
--#: ../app/menus.c:88
-+#: ../app/menus.c:93
- msgid "Sheets and Objects..."
--msgstr "Folhas e Objetos..."
-+msgstr "Folhas e objetos..."
- 
--#: ../app/menus.c:90
-+#: ../app/menus.c:95
- msgid "Plugins..."
- msgstr "Plug-ins..."
- 
--#: ../app/menus.c:96
-+#: ../app/menus.c:101
- msgid "_Diagram tree..."
- msgstr "�rvore de _diagramas..."
- 
--#: ../app/menus.c:102
-+#: ../app/menus.c:107
- msgid "Show Toolbar"
- msgstr "Mostrar barra de ferramentas"
- 
--#: ../app/menus.c:103
-+#: ../app/menus.c:108
- msgid "Show Statusbar"
- msgstr "Mostrar barra de status"
- 
--#: ../app/menus.c:104
-+#: ../app/menus.c:109
- msgid "Show Layers"
- msgstr "Mostrar camadas"
- 
--#: ../app/menus.c:112
-+#: ../app/menus.c:117
- msgid "_Export ..."
- msgstr "_Exportar..."
- 
--#: ../app/menus.c:113
-+#: ../app/menus.c:118
-+msgid "_Diagram Properties"
-+msgstr "Propriedades do _diagrama"
-+
-+#: ../app/menus.c:119
- msgid "Page Set_up..."
- msgstr "Configurar _página..."
- 
--#: ../app/menus.c:117 ../app/sheets_dialog.c:236
-+#: ../app/menus.c:123 ../app/sheets_dialog.c:236
- msgid "_Edit"
- msgstr "_Editar"
- 
--#: ../app/menus.c:124
-+#: ../app/menus.c:130
- msgid "_Duplicate"
- msgstr "D_uplicar"
- 
- #. the following used to bind to <control><shift>C which collides with Unicode input.
- #. * <control>>alt> doesn't work either
--#: ../app/menus.c:132
-+#: ../app/menus.c:138
- msgid "Copy Text"
- msgstr "Copiar texto"
- 
--#: ../app/menus.c:133
-+#: ../app/menus.c:139
- msgid "Cut Text"
- msgstr "Cortar texto"
- 
--#: ../app/menus.c:134
-+#: ../app/menus.c:140
- msgid "Paste _Text"
- msgstr "Colar _texto"
- 
--#: ../app/menus.c:136
--msgid "_Diagram"
--msgstr "_Diagrama"
-+#: ../app/menus.c:142
-+msgid "_Layers"
-+msgstr "_Camadas"
- 
--#: ../app/menus.c:138
-+#: ../app/menus.c:143
-+msgid "Add Layer..."
-+msgstr "Adicionar camada..."
-+
-+#: ../app/menus.c:144
-+msgid "Rename Layer..."
-+msgstr "Renomear camada..."
-+
-+#: ../app/menus.c:145
-+msgid "Move selection to layer above"
-+msgstr "Mover seleção para a camada acima"
-+
-+#: ../app/menus.c:146
-+msgid "Move selection to layer below"
-+msgstr "Mover seleção para a camada abaixo"
-+
-+#: ../app/menus.c:147
- msgid "_Layers..."
- msgstr "_Camadas..."
- 
--#: ../app/menus.c:140
-+#: ../app/menus.c:149
- msgid "_View"
- msgstr "_Ver"
- 
--#: ../app/menus.c:143
-+#: ../app/menus.c:152
- msgid "_Zoom"
- msgstr "_Zoom"
- 
--#: ../app/menus.c:144
-+#: ../app/menus.c:153
- msgid "1600%"
- msgstr "1600%"
- 
--#: ../app/menus.c:145 ../app/menus.c:564
-+#: ../app/menus.c:154 ../app/menus.c:573
- msgid "800%"
- msgstr "800%"
- 
--#: ../app/menus.c:146 ../app/menus.c:565
-+#: ../app/menus.c:155 ../app/menus.c:574
- msgid "400%"
- msgstr "400%"
- 
--#: ../app/menus.c:147
-+#: ../app/menus.c:156
- msgid "283"
- msgstr "283"
- 
--#: ../app/menus.c:148
-+#: ../app/menus.c:157
- msgid "200"
- msgstr "200"
- 
--#: ../app/menus.c:149
-+#: ../app/menus.c:158
- msgid "141"
- msgstr "141"
- 
--#: ../app/menus.c:151
-+#: ../app/menus.c:160
- msgid "85"
- msgstr "85"
- 
--#: ../app/menus.c:152
-+#: ../app/menus.c:161
- msgid "70.7"
- msgstr "70.7"
- 
--#: ../app/menus.c:153
-+#: ../app/menus.c:162
- msgid "50"
- msgstr "50"
- 
--#: ../app/menus.c:154
-+#: ../app/menus.c:163
- msgid "35.4"
- msgstr "35.4"
- 
--#: ../app/menus.c:155
-+#: ../app/menus.c:164
- msgid "25"
- msgstr "25"
- 
- #. "display_toggle_entries" items go here
--#: ../app/menus.c:161
-+#: ../app/menus.c:170
- msgid "New _View"
- msgstr "Nova _visão"
- 
--#: ../app/menus.c:162
-+#: ../app/menus.c:171
- msgid "C_lone View"
- msgstr "C_lonar visão"
- 
--#: ../app/menus.c:165
-+#: ../app/menus.c:174
- msgid "_Objects"
- msgstr "_Objetos"
- 
--#: ../app/menus.c:166
-+#: ../app/menus.c:175
- msgid "Send to _Back"
- msgstr "Enviar para _trás"
- 
--#: ../app/menus.c:167
-+#: ../app/menus.c:176
- msgid "Bring to _Front"
- msgstr "Enviar para _frente"
- 
--#: ../app/menus.c:168
-+#: ../app/menus.c:177
- msgid "Send Backwards"
- msgstr "Recuar o objeto"
- 
--#: ../app/menus.c:169
-+#: ../app/menus.c:178
- msgid "Bring Forwards"
- msgstr "Avançar o objeto"
- 
--#: ../app/menus.c:171
-+#: ../app/menus.c:180
- msgid "_Group"
- msgstr "_Agrupar"
- 
- #. deliberately not using Ctrl+U for Ungroup
--#: ../app/menus.c:173
-+#: ../app/menus.c:182
- msgid "_Ungroup"
- msgstr "_Desagrupar"
- 
--#: ../app/menus.c:175
-+#: ../app/menus.c:184
- msgid "_Parent"
- msgstr "_Pai"
- 
--#: ../app/menus.c:176
-+#: ../app/menus.c:185
- msgid "_Unparent"
- msgstr "_Remover do pai"
- 
--#: ../app/menus.c:177
-+#: ../app/menus.c:186
- msgid "_Unparent Children"
- msgstr "Remo_ver filho do pai"
- 
- #. Translators: Menu item Verb/Support/Position/Align
--#: ../app/menus.c:179 ../objects/FS/function.c:808
-+#: ../app/menus.c:188 ../objects/FS/function.c:808
- msgid "Align"
- msgstr "Alinhar"
- 
--#: ../app/menus.c:184 ../objects/standard/textobj.c:134
-+#: ../app/menus.c:193 ../objects/standard/textobj.c:137
- msgid "Top"
--msgstr "Topo"
-+msgstr "Superior"
- 
--#: ../app/menus.c:185
-+#: ../app/menus.c:194
- msgid "Middle"
- msgstr "Meio"
- 
--#: ../app/menus.c:186 ../objects/standard/textobj.c:133
-+#: ../app/menus.c:195 ../objects/standard/textobj.c:136
- msgid "Bottom"
--msgstr "Fundo"
-+msgstr "Inferior"
- 
--#: ../app/menus.c:188
-+#: ../app/menus.c:197
- msgid "Spread Out Horizontally"
- msgstr "Distribuir horizontalmente"
- 
--#: ../app/menus.c:189
-+#: ../app/menus.c:198
- msgid "Spread Out Vertically"
- msgstr "Distribuir verticalmente"
- 
--#: ../app/menus.c:190
-+#: ../app/menus.c:199
- msgid "Adjacent"
- msgstr "Adjacente"
- 
--#: ../app/menus.c:191
-+#: ../app/menus.c:200
- msgid "Stacked"
- msgstr "Sobreposto"
- 
--#: ../app/menus.c:195
-+#: ../app/menus.c:204
- msgid "_Select"
- msgstr "_Selecionar"
- 
--#: ../app/menus.c:196
-+#: ../app/menus.c:205
- msgid "All"
- msgstr "Tudo"
- 
--#: ../app/menus.c:197 ../lib/arrows.c:1882 ../objects/Jackson/domain.c:96
--#: ../objects/UML/association.c:223 ../objects/UML/association.c:229
-+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
-+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
- msgid "None"
- msgstr "Nenhum"
- 
--#: ../app/menus.c:198
-+#: ../app/menus.c:207
- msgid "Invert"
- msgstr "Invertido"
- 
--#: ../app/menus.c:200
-+#: ../app/menus.c:209
- msgid "Transitive"
- msgstr "Transitivo"
- 
--#: ../app/menus.c:201
-+#: ../app/menus.c:210
- msgid "Connected"
- msgstr "Conectado"
- 
--#: ../app/menus.c:202
-+#: ../app/menus.c:211
- msgid "Same Type"
- msgstr "Mesmo tipo"
- 
- #. display_select_radio_entries go here
--#: ../app/menus.c:206
-+#: ../app/menus.c:215
- msgid "Select By"
- msgstr "Selecionar por"
- 
--#: ../app/menus.c:208
-+#: ../app/menus.c:217
- msgid "_Input Methods"
- msgstr "_Métodos de entrada"
- 
--#: ../app/menus.c:210
-+#: ../app/menus.c:219
- msgid "D_ialogs"
- msgstr "D_iálogos"
- 
--#: ../app/menus.c:212
-+#: ../app/menus.c:221
- msgid "D_ebug"
- msgstr "D_epurar"
- 
--#: ../app/menus.c:218
-+#: ../app/menus.c:227
- msgid "_Tools"
- msgstr "_Ferramentas"
- 
--#: ../app/menus.c:219
-+#: ../app/menus.c:228
- msgid "Modify"
- msgstr "Modificar"
- 
--#: ../app/menus.c:221
-+#: ../app/menus.c:230
- msgid "Edit text"
- msgstr "Editar texto"
- 
--#: ../app/menus.c:222
-+#: ../app/menus.c:231
- msgid "Scroll"
- msgstr "Alterar enquadramento"
- 
--#: ../app/menus.c:245
-+#: ../app/menus.c:254
- msgid "Fullscr_een"
- msgstr "_Tela cheia"
- 
--#: ../app/menus.c:247
-+#: ../app/menus.c:256
- msgid "_AntiAliased"
--msgstr "_AntiAliased"
-+msgstr "Su_avizado"
- 
--#: ../app/menus.c:248
-+#: ../app/menus.c:257
- msgid "Show _Grid"
- msgstr "Mostrar _grade"
- 
--#: ../app/menus.c:249
-+#: ../app/menus.c:258
- msgid "_Snap To Grid"
- msgstr "Alin_har à grade"
- 
--#: ../app/menus.c:250
-+#: ../app/menus.c:259
- msgid "Snap To _Objects"
- msgstr "Alinhar aos _objetos"
- 
--#: ../app/menus.c:251
-+#: ../app/menus.c:260
- msgid "Show _Rulers"
- msgstr "Mostrar _réguas"
- 
--#: ../app/menus.c:252
-+#: ../app/menus.c:261
- msgid "Show _Connection Points"
- msgstr "Mostrar _pontos de conexão"
- 
--#: ../app/menus.c:259
-+#: ../app/menus.c:268
- msgid "Union"
- msgstr "União"
- 
--#: ../app/menus.c:260
-+#: ../app/menus.c:269
- msgid "Intersection"
- msgstr "Interseção"
- 
- #. Translators: Menu item Verb/Channel/Export/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
--#: ../app/menus.c:261 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
-+#: ../app/menus.c:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
- #: ../objects/FS/function.c:860 ../objects/FS/function.c:862
- msgid "Remove"
- msgstr "Remover"
- 
- #. Cannot also be called Invert, duplicate names caused keybinding problems
--#: ../app/menus.c:263
-+#: ../app/menus.c:272
- msgid "Inverse"
- msgstr "Inverso"
- 
--#: ../app/menus.c:327
-+#: ../app/menus.c:336
- msgid "NULL tooldata in tool_menu_select"
- msgstr "Não há dados de ferramenta em tool_menu_select"
- 
--#: ../app/menus.c:566
-+#: ../app/menus.c:575
- msgid "300%"
- msgstr "300%"
- 
--#: ../app/menus.c:567
-+#: ../app/menus.c:576
- msgid "200%"
- msgstr "200%"
- 
--#: ../app/menus.c:568
-+#: ../app/menus.c:577
- msgid "150%"
- msgstr "150%"
- 
--#: ../app/menus.c:569
-+#: ../app/menus.c:578
- msgid "100%"
- msgstr "100%"
- 
--#: ../app/menus.c:570
-+#: ../app/menus.c:579
- msgid "75%"
- msgstr "75%"
- 
--#: ../app/menus.c:571
-+#: ../app/menus.c:580
- msgid "50%"
- msgstr "50%"
- 
--#: ../app/menus.c:572
-+#: ../app/menus.c:581
- msgid "25%"
- msgstr "25%"
- 
--#: ../app/menus.c:573
-+#: ../app/menus.c:582
- msgid "10%"
- msgstr "10%"
- 
--#: ../app/menus.c:599
-+#: ../app/menus.c:608
- msgid "Toggles snap-to-grid."
--msgstr "Alterna o encaixe na grade."
-+msgstr "Alterna o alinhar à grade."
- 
--#: ../app/menus.c:611
-+#: ../app/menus.c:620
- msgid "Toggles object snapping."
--msgstr "Alterna o encaixe de objetos."
-+msgstr "Alterna o alinhar a objetos."
- 
--#: ../app/modify_tool.c:350
-+#: ../app/modify_tool.c:392
- msgid "Couldn't get GTK settings"
--msgstr "Não foi possível obter definições da GTK"
-+msgstr "Não foi possível obter as configurações do GTK"
- 
- #: ../app/plugin-manager.c:200
- msgid "Plug-ins"
-@@ -1573,8 +1662,8 @@ msgstr "Plug-ins"
- msgid "Loaded"
- msgstr "Carregado"
- 
--#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:615
--#: ../objects/SISSI/sissi_dialog.c:767
-+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-+#: ../objects/SISSI/sissi_dialog.c:882
- msgid "Description"
- msgstr "Descrição"
- 
-@@ -1586,35 +1675,35 @@ msgstr "Carregar na inicialização"
- msgid "File Name"
- msgstr "Nome do arquivo"
- 
--#: ../app/preferences.c:100 ../app/preferences.c:145
-+#: ../app/preferences.c:99 ../app/preferences.c:144
- msgid "any"
- msgstr "qualquer"
- 
--#: ../app/preferences.c:119
-+#: ../app/preferences.c:118
- msgid "User Interface"
--msgstr "Interface do usuário"
-+msgstr "Interface com usuário"
- 
--#: ../app/preferences.c:120
-+#: ../app/preferences.c:119
- msgid "Diagram Defaults"
- msgstr "Padrões do diagrama"
- 
--#: ../app/preferences.c:121
-+#: ../app/preferences.c:120
- msgid "View Defaults"
- msgstr "Padrões de visualização"
- 
--#: ../app/preferences.c:122
-+#: ../app/preferences.c:121
- msgid "Favorites"
- msgstr "Favoritos"
- 
--#: ../app/preferences.c:166
-+#: ../app/preferences.c:165
- msgid "Reset tools after create"
- msgstr "Redefinir ferramentas depois de criar"
- 
--#: ../app/preferences.c:169
-+#: ../app/preferences.c:168
- msgid "Number of undo levels:"
- msgstr "Número de ações a desfazer:"
- 
--#: ../app/preferences.c:172
-+#: ../app/preferences.c:171
- msgid ""
- "Reverse dragging selects\n"
- "intersecting objects"
-@@ -1622,50 +1711,59 @@ msgstr ""
- "Arrasto reverso seleciona\n"
- "objetos que se cruzam"
- 
--#: ../app/preferences.c:175
-+#: ../app/preferences.c:174
- msgid "Recent documents list size:"
- msgstr "Tamanho da lista de documentos recentes:"
- 
--#: ../app/preferences.c:178
-+#: ../app/preferences.c:177
- msgid "Use menu bar"
- msgstr "Usar a barra de menu"
- 
--#: ../app/preferences.c:181
-+#: ../app/preferences.c:180
- msgid "Keep tool box on top of diagram windows"
- msgstr "Manter a caixa de ferramentas sempre acima das janelas de diagramas"
- 
--#: ../app/preferences.c:184
-+#: ../app/preferences.c:183
- msgid "Length unit:"
- msgstr "Unidade de comprimento:"
- 
--#: ../app/preferences.c:187
-+#: ../app/preferences.c:186
- msgid "Font-size unit:"
- msgstr "Unidade de tamanho da fonte:"
- 
--#: ../app/preferences.c:191
--msgid "Integrated UI"
--msgstr "Interface de usuário integrada"
--
--#: ../app/preferences.c:194
-+#: ../app/preferences.c:189
- msgid "New diagram:"
- msgstr "Novo diagrama:"
- 
--#: ../app/preferences.c:195
-+#: ../app/preferences.c:190
- msgid "Portrait"
- msgstr "Retrato"
- 
--#: ../app/preferences.c:197
-+#: ../app/preferences.c:192
- msgid "Paper type:"
- msgstr "Tipo de papel:"
- 
--#: ../app/preferences.c:199 ../objects/Database/table_dialog.c:1078
-+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1078
- msgid "Background Color:"
- msgstr "Cor do segundo plano:"
- 
--#: ../app/preferences.c:201
-+#: ../app/preferences.c:196
- msgid "Compress saved files"
- msgstr "Compactar arquivos salvos"
- 
-+#: ../app/preferences.c:199
-+msgid "Connection Points:"
-+msgstr "Pontos de conexão:"
-+
-+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-+#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
-+msgid "Visible"
-+msgstr "Visível"
-+
-+#: ../app/preferences.c:201
-+msgid "Snap to object"
-+msgstr "Alinhar ao objeto"
-+
- #: ../app/preferences.c:204
- msgid "New window:"
- msgstr "Nova janela:"
-@@ -1683,114 +1781,104 @@ msgid "Magnify:"
- msgstr "Ampliação:"
- 
- #: ../app/preferences.c:210
--msgid "Connection Points:"
--msgstr "Pontos de conexão:"
--
--#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
--#: ../app/preferences.c:211 ../app/preferences.c:215 ../app/preferences.c:239
--msgid "Visible"
--msgstr "Visível"
--
--#: ../app/preferences.c:214
- msgid "Page breaks:"
- msgstr "Quebras de página:"
- 
--#: ../app/preferences.c:216 ../app/preferences.c:244
-+#: ../app/preferences.c:212 ../app/preferences.c:240
- msgid "Color:"
- msgstr "Cor:"
- 
--#: ../app/preferences.c:217
-+#: ../app/preferences.c:213
- msgid "Solid lines"
- msgstr "Linhas sólidas"
- 
--#: ../app/preferences.c:220
-+#: ../app/preferences.c:216
- msgid "Antialias:"
--msgstr "Antialias:"
-+msgstr "Suavização:"
- 
--#: ../app/preferences.c:221
-+#: ../app/preferences.c:217
- msgid "view antialised"
--msgstr "ver \"antialised\""
-+msgstr "ver suavizado"
- 
- #. Favored Filter
- #. Translators: Menu item Verb/Channel/Export
- #. Translators: Menu item Verb/Channel/Export/Export
--#: ../app/preferences.c:225 ../objects/FS/function.c:698
--#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:323
-+#: ../app/preferences.c:221 ../objects/FS/function.c:698
-+#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
- msgid "Export"
- msgstr "Exportar"
- 
--#: ../app/preferences.c:227
-+#: ../app/preferences.c:223
- msgid "Portable Network Graphics"
- msgstr "Portable Network Graphics"
- 
--#: ../app/preferences.c:229 ../plug-ins/svg/render_svg.c:515
--#: ../plug-ins/svg/svg-import.c:811
-+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
-+#: ../plug-ins/svg/svg-import.c:884
- msgid "Scalable Vector Graphics"
- msgstr "Scalable Vector Graphics"
- 
--#: ../app/preferences.c:231
-+#: ../app/preferences.c:227
- msgid "PostScript"
- msgstr "PostScript"
- 
--#: ../app/preferences.c:233
-+#: ../app/preferences.c:229
- msgid "Windows MetaFile"
- msgstr "Windows MetaFile"
- 
--#: ../app/preferences.c:235
-+#: ../app/preferences.c:231
- msgid "Enhanced MetaFile"
- msgstr "Enhanced MetaFile"
- 
--#: ../app/preferences.c:240
-+#: ../app/preferences.c:236
- msgid "Snap to"
--msgstr "Aderir à grade"
-+msgstr "Alinhar à grade"
- 
--#: ../app/preferences.c:241
-+#: ../app/preferences.c:237
- msgid "Dynamic grid resizing"
- msgstr "Grade de tamanho dinâmico"
- 
--#: ../app/preferences.c:242
-+#: ../app/preferences.c:238
- msgid "X Size:"
- msgstr "Tamanho na direção X:"
- 
--#: ../app/preferences.c:243
-+#: ../app/preferences.c:239
- msgid "Y Size:"
- msgstr "Tamanho na direção Y:"
- 
--#: ../app/preferences.c:245
-+#: ../app/preferences.c:241
- msgid "Lines per major line"
- msgstr "Linhas por linha mestre"
- 
--#: ../app/preferences.c:247
-+#: ../app/preferences.c:243
- msgid "Hex Size:"
- msgstr "Tamanho do hexágono:"
- 
--#: ../app/preferences.c:262
-+#. There's really no reason to not pretty format it, and allowing non-pretty
-+#. can lead to problems with long lines, CVS etc.
-+#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
-+#. &default_true,0,"pretty formated xml",NULL, TRUE},
-+#.
-+#: ../app/preferences.c:255
- msgid "Diagram tree window:"
- msgstr "Janela da árvore de diagramas:"
- 
--#: ../app/preferences.c:264
-+#: ../app/preferences.c:257
- msgid "Save hidden object types"
- msgstr "Salvar tipos de objetos ocultos"
- 
--#: ../app/preferences.c:474 ../lib/prop_inttypes.c:158
-+#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
- msgid "Yes"
- msgstr "Sim"
- 
--#: ../app/preferences.c:474 ../app/preferences.c:485
-+#: ../app/preferences.c:485 ../app/preferences.c:496
- #: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
- msgid "No"
- msgstr "Não"
- 
--#: ../app/preferences.c:580
-+#: ../app/preferences.c:591
- msgid "Preferences"
- msgstr "Preferências"
- 
--#: ../app/preferences.c:782
--msgid "User Interface type settings change will take after restart"
--msgstr ""
--"As alterações da configuração de tipo da interface de usuário terão efeito "
--"após o reinício do programa"
--
- #: ../app/properties-dialog.c:56
- msgid "Object properties"
- msgstr "Propriedades do objeto"
-@@ -1799,11 +1887,11 @@ msgstr "Propriedades do objeto"
- msgid "This object has no properties."
- msgstr "Este objeto não tem propriedades."
- 
--#: ../app/properties-dialog.c:240
-+#: ../app/properties-dialog.c:245
- msgid "Properties: "
- msgstr "Propriedades: "
- 
--#: ../app/properties-dialog.c:244
-+#: ../app/properties-dialog.c:249
- msgid "Object properties:"
- msgstr "Propriedades do objeto:"
- 
-@@ -1882,7 +1970,7 @@ msgstr "Novo"
- #: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
- #: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
- #: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
--#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:242
-+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
- #: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
- #: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
- msgid "Type"
-@@ -1925,8 +2013,8 @@ msgstr "Descrição:"
- #: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
- #: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
- #: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
--#: ../objects/UML/class_dialog.c:1155 ../objects/UML/class_dialog.c:2021
--#: ../objects/UML/class_dialog.c:2257 ../objects/UML/class_dialog.c:2860
-+#: ../objects/UML/class_dialog.c:1159 ../objects/UML/class_dialog.c:2025
-+#: ../objects/UML/class_dialog.c:2261 ../objects/UML/class_dialog.c:2864
- msgid "Type:"
- msgstr "Tipo:"
- 
-@@ -1937,8 +2025,8 @@ msgstr "Folha"
- #: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
- #: ../objects/Database/table_dialog.c:1046 ../objects/ER/attribute.c:155
- #: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
--#: ../objects/UML/class_dialog.c:1144 ../objects/UML/class_dialog.c:2010
--#: ../objects/UML/class_dialog.c:2246 ../objects/UML/class_dialog.c:2849
-+#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
-+#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
- #: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
- #: ../objects/UML/realizes.c:134
- msgid "Name:"
-@@ -2072,172 +2160,173 @@ msgstr "Editor de diagramas Dia"
- msgid "Edit your Diagrams"
- msgstr "Edite os seus diagramas"
- 
--#: ../lib/arrows.c:1883
-+#: ../lib/arrows.c:1899
- msgid "Lines"
- msgstr "Linhas"
- 
--#: ../lib/arrows.c:1884
-+#: ../lib/arrows.c:1900
- msgid "Hollow Triangle"
- msgstr "Triângulo vazado"
- 
--#: ../lib/arrows.c:1885
-+#: ../lib/arrows.c:1901
- msgid "Filled Triangle"
- msgstr "Triângulo preenchido"
- 
--#: ../lib/arrows.c:1886
-+#: ../lib/arrows.c:1902
- msgid "Unfilled Triangle"
- msgstr "Triângulo não preenchido"
- 
--#: ../lib/arrows.c:1887
-+#: ../lib/arrows.c:1903
- msgid "Hollow Diamond"
--msgstr "Diamante vazado"
-+msgstr "Losango vazado"
- 
--#: ../lib/arrows.c:1888
-+#: ../lib/arrows.c:1904
- msgid "Filled Diamond"
--msgstr "Diamante preenchido"
-+msgstr "Losango preenchido"
- 
--#: ../lib/arrows.c:1889
-+#: ../lib/arrows.c:1905
- msgid "Half Diamond"
--msgstr "Diamante pela metade"
-+msgstr "Losango pela metade"
- 
--#: ../lib/arrows.c:1890
-+#: ../lib/arrows.c:1906
- msgid "Half Head"
--msgstr "Cabeça pela metade"
-+msgstr "Ponta pela metade"
- 
--#: ../lib/arrows.c:1891
-+#: ../lib/arrows.c:1907
- msgid "Slashed Cross"
- msgstr "Cruz tracejada"
- 
--#: ../lib/arrows.c:1892
-+#: ../lib/arrows.c:1908
- msgid "Filled Ellipse"
- msgstr "Elipse preenchida"
- 
--#: ../lib/arrows.c:1893
-+#: ../lib/arrows.c:1909
- msgid "Hollow Ellipse"
- msgstr "Elipse vazada"
- 
--#: ../lib/arrows.c:1894
-+#: ../lib/arrows.c:1910
- msgid "Filled Dot"
- msgstr "Ponto preenchido"
- 
--#: ../lib/arrows.c:1895
-+#: ../lib/arrows.c:1911
- msgid "Dimension Origin"
- msgstr "Origem da dimensão"
- 
--#: ../lib/arrows.c:1896
-+#: ../lib/arrows.c:1912
- msgid "Blanked Dot"
- msgstr "Ponto em branco"
- 
--#: ../lib/arrows.c:1897
-+#: ../lib/arrows.c:1913
- msgid "Double Hollow Triangle"
- msgstr "Triângulo vazado duplo"
- 
--#: ../lib/arrows.c:1898
-+#: ../lib/arrows.c:1914
- msgid "Double Filled Triangle"
- msgstr "Triângulo preenchido duplo"
- 
--#: ../lib/arrows.c:1899
-+#: ../lib/arrows.c:1915
- msgid "Filled Dot and Triangle"
- msgstr "Ponto e triângulo preenchidos"
- 
--#: ../lib/arrows.c:1900
-+#: ../lib/arrows.c:1916
- msgid "Filled Box"
- msgstr "Caixa preenchida"
- 
--#: ../lib/arrows.c:1901
-+#: ../lib/arrows.c:1917
- msgid "Blanked Box"
- msgstr "Caixa em branco"
- 
--#: ../lib/arrows.c:1902
-+#: ../lib/arrows.c:1918
- msgid "Slashed"
- msgstr "Tracejado"
- 
--#: ../lib/arrows.c:1903
-+#: ../lib/arrows.c:1919
- msgid "Integral Symbol"
- msgstr "Símbolo de integral"
- 
--#: ../lib/arrows.c:1904
-+#: ../lib/arrows.c:1920
- msgid "Crow Foot"
- msgstr "Pé de cabra"
- 
--#: ../lib/arrows.c:1905
-+#: ../lib/arrows.c:1921
- msgid "Cross"
- msgstr "Cruz"
- 
--#: ../lib/arrows.c:1906
-+#: ../lib/arrows.c:1922
- msgid "1-or-many"
- msgstr "1-ou-muitos"
- 
--#: ../lib/arrows.c:1907
-+#: ../lib/arrows.c:1923
- msgid "0-or-many"
- msgstr "0-ou-muitos"
- 
--#: ../lib/arrows.c:1908
-+#: ../lib/arrows.c:1924
- msgid "1-or-0"
- msgstr "1-ou-0"
- 
--#: ../lib/arrows.c:1909
-+#: ../lib/arrows.c:1925
- msgid "1 exactly"
- msgstr "Exatamente 1"
- 
--#: ../lib/arrows.c:1910
-+#: ../lib/arrows.c:1926
- msgid "Filled Concave"
- msgstr "Côncavo preenchido"
- 
--#: ../lib/arrows.c:1911
-+#: ../lib/arrows.c:1927
- msgid "Blanked Concave"
- msgstr "Côncavo vazio"
- 
--#: ../lib/arrows.c:1912
-+#: ../lib/arrows.c:1928
- msgid "Round"
- msgstr "Arredondado"
- 
--#: ../lib/arrows.c:1913
-+#: ../lib/arrows.c:1929
- msgid "Open Round"
- msgstr "Arredondado aberto"
- 
--#: ../lib/arrows.c:1914
-+#: ../lib/arrows.c:1930
- msgid "Backslash"
- msgstr "Barra invertida"
- 
--#: ../lib/arrows.c:1915
-+#: ../lib/arrows.c:1931
- msgid "Infinite Line"
- msgstr "Linha infinita"
- 
--#: ../lib/arrows.c:2043
-+#: ../lib/arrows.c:2059
- msgid "Arrow head of unknown type"
- msgstr "Ponta da seta de tipo desconhecido"
- 
--#: ../lib/arrows.c:2051
-+#: ../lib/arrows.c:2067
- #, c-format
- msgid "Arrow head of type %s has too small dimensions, removing.\n"
--msgstr "A ponta da seta do tipo %s tem dimensões muito pequenas, removendo.\n"
-+msgstr ""
-+"A ponta da seta do tipo %s tem dimensões muito pequenas, removendo-a.\n"
- 
--#: ../lib/arrows.c:2184
-+#: ../lib/arrows.c:2200
- msgid "unknown arrow"
- msgstr "Seta desconhecida"
- 
- #: ../lib/bezier_conn.c:636
- msgid "Internal error: Setting corner type of endpoint of bezier"
- msgstr ""
--"Erro interno ao configurar tipo de canto do ponto final da curva de bézier"
-+"Erro interno ao configurar tipo de canto do ponto final da curva de Bézier"
- 
- #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
- #: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
- #: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
--#: ../plug-ins/svg/svg-import.c:247 ../plug-ins/vdx/vdx-import.c:140
-+#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
- msgid "Can't find standard object"
- msgstr "Não foi possível localizar o objeto padrão"
- 
--#: ../lib/dia_dirs.c:237
-+#: ../lib/dia_dirs.c:242
- #, c-format
- msgid "%s<illegal characters>..."
- msgstr "%s<caracteres ilegais>..."
- 
--#: ../lib/dia_dirs.c:268
-+#: ../lib/dia_dirs.c:273
- #, c-format
- msgid "Too many ..'s in filename %s\n"
--msgstr "Muitos ..'s no nome de arquivo %s\n"
-+msgstr "Muitos .. no nome de arquivo %s\n"
- 
- #: ../lib/dia_xml.c:192
- #, c-format
-@@ -2248,37 +2337,42 @@ msgstr ""
- "O arquivo %s não possui informação de codificação;\n"
- "supondo que está codificado em %s"
- 
--#: ../lib/dia_xml.c:593
-+#: ../lib/dia_xml.c:597
- msgid "Taking point value of non-point node."
- msgstr "Tomando o valor do ponto de um nó que não é um ponto."
- 
--#: ../lib/dia_xml.c:604
-+#: ../lib/dia_xml.c:608
- #, c-format
- msgid "Incorrect x Point value \"%s\" %f; discarding it."
- msgstr "Valor x do ponto \"%s\" %f incorreto; descartando-o."
- 
--#: ../lib/dia_xml.c:611
-+#: ../lib/dia_xml.c:615
- msgid "Error parsing point."
- msgstr "Erro ao analisar o ponto."
- 
- #. don't bother with useless warnings (see above)
--#: ../lib/dia_xml.c:619
-+#: ../lib/dia_xml.c:623
- #, c-format
- msgid "Incorrect y Point value \"%s\" %f; discarding it."
- msgstr "Valor y do ponto \"%s\" %f incorreto; descartando-o."
- 
--#: ../lib/dia_xml.c:1091
--msgid ""
--"Your local character set is UTF-8. Because of issues with libxml1 and the "
--"support of files generated by previous versions of dia, you will encounter  "
--"problems. Please report to dia-list@gnome.org if you see this message."
--msgstr ""
--"O seu conjunto de caracteres local é UTF-8. Devido a particularidades com a "
--"libxml1 e o suporte de arquivos gerados por versões anteriores do Dia, você "
--"poderá encontrar problemas. Por favor, relate para dia-list@gnome.org se "
--"você recebeu esta mensagem."
-+#: ../lib/dia_xml.c:640
-+msgid "Taking bezpoint value of non-point node."
-+msgstr "Tomando o valor do ponto de Bézier de um nó que não é um ponto."
-+
-+#: ../lib/dia_xml.c:658
-+msgid "Error parsing bezpoint p1."
-+msgstr "Erro ao analisar o ponto de Bézier p1."
-+
-+#: ../lib/dia_xml.c:672
-+msgid "Error parsing bezpoint p2."
-+msgstr "Erro ao analisar o ponto de Bézier p2."
- 
--#: ../lib/diaarrowchooser.c:352
-+#: ../lib/dia_xml.c:686
-+msgid "Error parsing bezpoint p3."
-+msgstr "Erro ao analisar o ponto de Bézier p3."
-+
-+#: ../lib/diaarrowchooser.c:361
- msgid "Arrow Properties"
- msgstr "Propriedades da seta"
- 
-@@ -2286,7 +2380,7 @@ msgstr "Propriedades da seta"
- msgid "Line Style Properties"
- msgstr "Propriedades do estilo de linha"
- 
--#: ../lib/dialinechooser.c:332
-+#: ../lib/dialinechooser.c:339
- msgid "Details..."
- msgstr "Detalhes..."
- 
-@@ -2298,7 +2392,7 @@ msgstr "Ok"
- msgid "Cancel"
- msgstr "Cancelar"
- 
--#: ../lib/filter.c:176
-+#: ../lib/filter.c:177
- #, c-format
- msgid "Multiple export filters with unique name %s"
- msgstr "Múltiplos filtros de exportação com um único nome %s"
-@@ -2308,28 +2402,28 @@ msgstr "Múltiplos filtros de exportação com um único nome %s"
- msgid "Can't load font %s.\n"
- msgstr "Não foi possível carregar a fonte %s.\n"
- 
--#: ../lib/message.c:90 ../lib/message.c:276
-+#: ../lib/message.c:92 ../lib/message.c:278
- msgid "Warning"
- msgstr "Aviso"
- 
--#: ../lib/message.c:117
-+#: ../lib/message.c:119
- msgid "There is one similar message."
- msgstr "Há uma mensagem semelhante."
- 
--#: ../lib/message.c:122
-+#: ../lib/message.c:124
- msgid "Show repeated messages"
- msgstr "Mostrar as mensagens repetidas"
- 
--#: ../lib/message.c:143
-+#: ../lib/message.c:145
- msgid "Don't show this message again"
- msgstr "Não mostrar essa mensagem novamente"
- 
--#: ../lib/message.c:201
-+#: ../lib/message.c:203
- #, c-format
- msgid "There are %d similar messages."
- msgstr "Há %d mensagens semelhantes."
- 
--#: ../lib/message.c:260
-+#: ../lib/message.c:262
- msgid "Notice"
- msgstr "Aviso"
- 
-@@ -2350,25 +2444,25 @@ msgstr ""
- msgid "???"
- msgstr "???"
- 
--#: ../lib/plug-ins.c:185
-+#: ../lib/plug-ins.c:186
- #, c-format
- msgid "Missing dependencies for '%s'?"
- msgstr "Dependências faltando para \"%s\"?"
- 
--#: ../lib/plug-ins.c:196
-+#: ../lib/plug-ins.c:197
- msgid "Missing symbol 'dia_plugin_init'"
- msgstr "Símbolo \"dia_plugin_init\" faltando"
- 
--#: ../lib/plug-ins.c:204 ../lib/plug-ins.c:212
-+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
- msgid "dia_plugin_init() call failed"
- msgstr "A chamada dia_plugin_init() falhou"
- 
--#: ../lib/plug-ins.c:231
-+#: ../lib/plug-ins.c:232
- #, c-format
- msgid "%s Plugin could not be unloaded"
- msgstr "Não foi possível descarregar o plugin %s"
- 
--#: ../lib/plug-ins.c:302
-+#: ../lib/plug-ins.c:303
- #, c-format
- msgid ""
- "Could not open `%s'\n"
-@@ -2377,61 +2471,81 @@ msgstr ""
- "Não foi possível abrir \"%s\"\n"
- "\"%s\""
- 
-+#: ../lib/prop_dict.c:43
-+msgid "Author"
-+msgstr "Autor"
-+
-+#: ../lib/prop_dict.c:44
-+msgid "Identifier"
-+msgstr "Identificador"
-+
-+#: ../lib/prop_dict.c:45
-+msgid "Creation date"
-+msgstr "Data da criação"
-+
-+#: ../lib/prop_dict.c:46
-+msgid "Modification date"
-+msgstr "Data da modificação"
-+
-+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
-+msgid "URL"
-+msgstr "URL"
-+
- #: ../lib/prop_inttypes.c:558
- msgid "Property cast from int to enum out of range"
- msgstr ""
--"A alteração de forma da propriedade de int para enum está fora do intervalo"
-+"A invocação da propriedade de inteiro para enumeração está fora do intervalo"
- 
--#: ../lib/prop_text.c:468
-+#: ../lib/prop_text.c:469
- #, c-format
- msgid "Group with %d objects"
- msgstr "Grupo com %d objetos"
- 
--#: ../lib/properties.c:64 ../lib/properties.h:476 ../lib/widgets.c:724
-+#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
- msgid "Left"
- msgstr "Esquerda"
- 
--#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:730
--#: ../objects/standard/textobj.c:135
-+#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
-+#: ../objects/standard/textobj.c:138
- msgid "Center"
- msgstr "Centro"
- 
--#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:736
-+#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
- msgid "Right"
- msgstr "Direita"
- 
--#: ../lib/properties.c:73 ../lib/properties.h:496 ../lib/properties.h:499
-+#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
- #: ../objects/chronogram/chronoline.c:181
- #: ../objects/chronogram/chronoref.c:160
- msgid "Line color"
- msgstr "Cor da linha"
- 
--#: ../lib/properties.c:74 ../lib/properties.h:502 ../lib/properties.h:505
-+#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
- msgid "Line style"
- msgstr "Estilo da linha"
- 
--#: ../lib/properties.c:75 ../lib/properties.h:509 ../lib/properties.h:512
-+#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
- msgid "Fill color"
- msgstr "Cor de preenchimento"
- 
--#: ../lib/properties.c:76 ../lib/properties.h:515 ../lib/properties.h:518
-+#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
- msgid "Draw background"
--msgstr "Opaco"
-+msgstr "Desenhar fundo"
- 
--#: ../lib/properties.c:77 ../lib/properties.h:522
-+#: ../lib/properties.c:78 ../lib/properties.h:523
- msgid "Start arrow"
- msgstr "Seta inicial"
- 
--#: ../lib/properties.c:78 ../lib/properties.h:525
-+#: ../lib/properties.c:79 ../lib/properties.h:526
- msgid "End arrow"
- msgstr "Seta final"
- 
--#: ../lib/properties.c:80 ../lib/properties.h:535
-+#: ../lib/properties.c:81 ../lib/properties.h:536
- msgid "Text alignment"
- msgstr "Alinhamento do texto"
- 
- #. all this just to make the defaults selectable ...
--#: ../lib/properties.c:81 ../lib/properties.h:540
-+#: ../lib/properties.c:82 ../lib/properties.h:541
- #: ../objects/Database/table_dialog.c:1036 ../objects/Database/reference.c:117
- #: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
- #: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
-@@ -2440,14 +2554,14 @@ msgstr "Alinhamento do texto"
- msgid "Font"
- msgstr "Fonte"
- 
--#: ../lib/properties.c:82 ../lib/properties.h:548
-+#: ../lib/properties.c:83 ../lib/properties.h:549
- #: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
- #: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
- #: ../objects/chronogram/chronoref.c:168
- msgid "Font size"
- msgstr "Tamanho da fonte"
- 
--#: ../lib/properties.c:83 ../lib/properties.h:554
-+#: ../lib/properties.c:84 ../lib/properties.h:555
- #: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
- #: ../objects/chronogram/chronoref.c:170
- msgid "Text color"
-@@ -2456,7 +2570,37 @@ msgstr "Cor do texto"
- #: ../lib/proplist.c:163
- #, c-format
- msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
--msgstr "Nenhum atributo \"%s\" (%p) ou nenhum dado(%p) neste atributo"
-+msgstr "Nenhum atributo \"%s\" (%p) ou nenhum dado (%p) neste atributo"
-+
-+#: ../lib/sheet.c:69 ../lib/sheet.c:84
-+#, c-format
-+msgid ""
-+"DiaObject '%s' needed in sheet '%s' was not found.\n"
-+"It will not be available for use."
-+msgstr ""
-+"O DiaObject \"%s\" necessário na folha \"%s\" não foi localizado.\n"
-+"Ele não estará disponível para uso."
-+
-+#: ../lib/sheet.c:314
-+#, c-format
-+msgid ""
-+"The system sheet '%s' appears to be more recent than your custom\n"
-+"version and has been loaded as '%s' for this session.\n"
-+"\n"
-+"Move new objects (if any) from '%s' into your custom sheet\n"
-+"or remove '%s', using the 'Sheets and Objects' dialog."
-+msgstr ""
-+"A folha de sistema \"%s\" parece ser mais recente do que a sua\n"
-+"versão personalizada e foi carregada como \"%s\" para esta sessão.\n"
-+"\n"
-+"Mova novos objetos (se existir algum) de \"%s\" para sua folha\n"
-+"personalizada ou remova \"%s\", usando o diálogo \"Folhas e objetos\"."
-+
-+#: ../lib/sheet.c:371
-+#, c-format
-+msgid "%s: you should use object tags rather than shape tags now"
-+msgstr ""
-+"%s: você deveria usar etiquetas de objeto em vez de etiquetas de formas agora"
- 
- #: ../lib/widgets.c:441
- msgid "Other fonts"
-@@ -2517,119 +2661,247 @@ msgstr "Selecione o arquivo de imagem"
- msgid "Browse"
- msgstr "Navegar"
- 
--#: ../lib/widgets.c:2076
-+#: ../lib/widgets.c:2087
- msgid "Reset menu"
- msgstr "Restaurar menu"
- 
-+#. Installer message if no GTK+ was found
-+#: ../installer/win32/gennsh.c:39
-+msgid ""
-+"GTK+ is not installed. Please use the full installer. It is available from "
-+"http://dia-installer.de."
-+msgstr ""
-+"O GTK+ não está instalado. Por favor, use o instalador completo. Ele está "
-+"disponível em http://dia-installer.de."
-+
-+#. Installer message: Don't install over pre 0.95 versions
-+#: ../installer/win32/gennsh.c:42
-+msgid ""
-+"Please remove old Dia installations completely or install Dia to a different "
-+"location."
-+msgstr ""
-+"Por favor, remova por completo outras instalações do Dia ou instale o Dia em "
-+"um local diferente."
-+
-+#. Installer message:  License Page
-+#: ../installer/win32/gennsh.c:45
-+msgid "Next >"
-+msgstr "Próximo >"
-+
-+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-+#: ../installer/win32/gennsh.c:48
-+msgid ""
-+"$(^Name) is released under the GPL license. The license is provided here for "
-+"information purposes only. $_CLICK"
-+msgstr ""
-+"$(^Name) é lançado sob a licença GPL. A licença é fornecida aqui somente com "
-+"o propósito de informação. $_CLICK"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:51
-+msgid "Dia Diagram Editor (required)"
-+msgstr "Editor de diagramas Dia (obrigatório)"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:54
-+msgid "Translations"
-+msgstr "Traduções"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:57
-+msgid "Optional translations of the Dia user interface"
-+msgstr "Traduções opcionais da interface de usuário do Dia"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:60
-+msgid "Core Dia files and dlls"
-+msgstr "Arquivos e dlls principais do Dia"
-+
-+#. Installer message: Component name
-+#: ../installer/win32/gennsh.c:63
-+msgid "Python plug-in"
-+msgstr "Plug-in Python"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:66
-+msgid ""
-+"Support for the Python Scripting Language 2.3. Do not select this if Python "
-+"is not installed."
-+msgstr ""
-+"Suporte para a linguagem de script Python 2.3. Não selecione isto se o "
-+"Python não estiver instalado."
-+
-+#. Installer message: hyperlink text on finish page
-+#: ../installer/win32/gennsh.c:69
-+msgid "Visit the Dia for Windows Web Page"
-+msgstr "Acesse a página web do Dia para Windows"
-+
-+#. Installer message: Dia uninstaller entry in Control Panel
-+#: ../installer/win32/gennsh.c:72
-+msgid "Dia (remove only)"
-+msgstr "Dia (somente excluir)"
-+
-+#. Installer message: confirmation question. Keep $\r
-+#: ../installer/win32/gennsh.c:75
-+msgid ""
-+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-+"$\rNote: Any non-standard plugins that you may have installed will be "
-+"deleted.$\rDia user settings will not be affected."
-+msgstr ""
-+"Seu diretório Dia antigo está prestes a ser excluído. Você deseja continuar?"
-+"$\n"
-+"$\n"
-+"Nota: quaisquer plug-ins de terceiros que tiverem sido instalados serão "
-+"excluídos.$\n"
-+"As configurações de usuário do Dia não serão afetadas."
-+
-+#. Installer message: confirmatin question. Keep $\r
-+#: ../installer/win32/gennsh.c:78
-+msgid ""
-+"The installation directory you specified already exists. Any contents$\rwill "
-+"be deleted. Would you like to continue?"
-+msgstr ""
-+"O diretório de instalação especificado já existe. Qualquer conteúdo$\n"
-+"será excluído. Deseja continuar?"
-+
-+#. Installer message: Uninstall Section Prompts. Keep $\r
-+#: ../installer/win32/gennsh.c:81
-+msgid ""
-+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-+"another user installed this application."
-+msgstr ""
-+"O desinstalador não pôde localizar nenhuma entrada de registro para o Dia.$\n"
-+"Parece que outro usuário instalou essa aplicação."
-+
-+#. Installer message: Uninstall error message
-+#: ../installer/win32/gennsh.c:84
-+msgid "You do not have permission to uninstall this application."
-+msgstr "Você não possui permissão para desinstalar esta aplicação."
-+
-+#. Installer message: Uninstallation warning. Keep $INSTDIR
-+#: ../installer/win32/gennsh.c:87
-+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-+msgstr ""
-+"Isto removerá completamente $INSTDIR e todos os seus subdiretórios. "
-+"Continuar?"
-+
-+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-+#: ../installer/win32/gennsh.c:90
-+msgid ""
-+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+msgstr ""
-+"Isto removerá completamente $PROFILE\\.dia e todos os seus subdiretórios. "
-+"Continuar?"
-+
- #: ../objects/AADL/aadl.c:52
- msgid "Architecture Analysis & Design Language diagram objects"
--msgstr "Objetos do diagrama da linguagem de projeto e análise de arquitetura"
-+msgstr "Objetos do diagrama de Linguagem de projeto e análise de arquitetura"
- 
--#: ../objects/AADL/aadlbox.c:150
-+#: ../objects/AADL/aadlbox.c:147
- msgid "Declaration"
- msgstr "Declaração"
- 
--#: ../objects/AADL/aadlbox.c:361
-+#: ../objects/AADL/aadlbox.c:358
- msgid "Add Access Provider"
- msgstr "Adicionar provedor de acesso"
- 
--#: ../objects/AADL/aadlbox.c:363
-+#: ../objects/AADL/aadlbox.c:360
- msgid "Add Access Requirer"
- msgstr "Adicionar requisitor de acesso"
- 
--#: ../objects/AADL/aadlbox.c:365
-+#: ../objects/AADL/aadlbox.c:362
- msgid "Add In Data Port"
- msgstr "Adicionar porta de entrada de dados"
- 
--#: ../objects/AADL/aadlbox.c:367
-+#: ../objects/AADL/aadlbox.c:364
- msgid "Add In Event Port"
- msgstr "Adicionar porta de entrada de eventos"
- 
--#: ../objects/AADL/aadlbox.c:369
-+#: ../objects/AADL/aadlbox.c:366
- msgid "Add In Event Data Port"
--msgstr "Adicionar porta de entrada de dados de eventos"
-+msgstr "Adicionar porta de entrada de dados e eventos"
- 
--#: ../objects/AADL/aadlbox.c:371
-+#: ../objects/AADL/aadlbox.c:368
- msgid "Add Out Data Port"
- msgstr "Adicionar porta de saída de dados"
- 
--#: ../objects/AADL/aadlbox.c:373
-+#: ../objects/AADL/aadlbox.c:370
- msgid "Add Out Event Port"
- msgstr "Adicionar porta de saída de eventos"
- 
--#: ../objects/AADL/aadlbox.c:375
-+#: ../objects/AADL/aadlbox.c:372
- msgid "Add Out Event Data Port"
--msgstr "Adicionar porta de saída de dados de eventos"
-+msgstr "Adicionar porta de saída de dados e eventos"
- 
--#: ../objects/AADL/aadlbox.c:377
-+#: ../objects/AADL/aadlbox.c:374
- msgid "Add In Out Data Port"
- msgstr "Adicionar porta de entrada e saída de dados"
- 
--#: ../objects/AADL/aadlbox.c:379
-+#: ../objects/AADL/aadlbox.c:376
- msgid "Add In Out Event Port"
- msgstr "Adicionar porta de entrada e saída de eventos"
- 
--#: ../objects/AADL/aadlbox.c:381
-+#: ../objects/AADL/aadlbox.c:378
- msgid "Add In Out Event Data Port"
--msgstr "Adicionar porta de entrada e saída de dados de eventos"
-+msgstr "Adicionar porta de entrada e saída de dados e eventos"
- 
--#: ../objects/AADL/aadlbox.c:383
-+#: ../objects/AADL/aadlbox.c:380
- msgid "Add Port Group"
- msgstr "Adicionar grupo de portas"
- 
--#: ../objects/AADL/aadlbox.c:385
-+#: ../objects/AADL/aadlbox.c:382
- msgid "Add Connection Point"
- msgstr "Adicionar ponto de conexão"
- 
--#: ../objects/AADL/aadlbox.c:389
-+#: ../objects/AADL/aadlbox.c:386
- msgid "Delete Port"
- msgstr "Excluir porta"
- 
--#: ../objects/AADL/aadlbox.c:390
-+#: ../objects/AADL/aadlbox.c:387
- msgid "Edit Port Declaration"
- msgstr "Editar declaração de porta"
- 
--#: ../objects/AADL/aadlbox.c:394
-+#: ../objects/AADL/aadlbox.c:391
- msgid "Delete Connection Point"
- msgstr "Excluir ponto de conexão"
- 
--#: ../objects/Database/compound.c:197
-+#: ../objects/Database/compound.c:198
- msgid "Number of arms"
- msgstr "Número de braços"
- 
--#: ../objects/Database/compound.c:219
-+#: ../objects/Database/compound.c:221
- msgid "Flip arms verticaly"
- msgstr "Virar braços na vertical"
- 
--#: ../objects/Database/compound.c:221
-+#: ../objects/Database/compound.c:223
- msgid "Flip arms horizontaly"
- msgstr "Virar braços na horizontal"
- 
--#: ../objects/Database/compound.c:223
-+#: ../objects/Database/compound.c:225
- msgid "Center mount point verticaly"
--msgstr "Centralizar ponto de montagem na vertical"
-+msgstr "Centralizar ponto de montagem verticalmente"
- 
--#: ../objects/Database/compound.c:225
-+#: ../objects/Database/compound.c:227
- msgid "Center mount point horizontaly"
- msgstr "Centralizar ponto de montagem horizontalmente"
- 
--#: ../objects/Database/compound.c:227
-+#: ../objects/Database/compound.c:229
- msgid "Center mount point"
- msgstr "Centralizar ponto de montagem"
- 
--#: ../objects/Database/compound.c:232
-+#: ../objects/Database/compound.c:234
- msgid "Compound"
- msgstr "Composição"
- 
- #: ../objects/Database/database.c:39
- msgid "Entity/Relationship table diagram objects"
--msgstr "Objetos do diagrama de tabelas entidade/relacionamento"
-+msgstr "Objetos do diagrama de Tabelas de entidade/relacionamento"
- 
- #: ../objects/Database/table.c:142 ../objects/Database/table.c:183
- #: ../objects/Database/table.c:200 ../objects/UML/class.c:148
- #: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
- #: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
--#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
- msgid "Comment"
- msgstr "Comentário"
- 
-@@ -2651,7 +2923,7 @@ msgstr "Comentários visíveis"
- 
- #: ../objects/Database/table.c:187 ../objects/UML/class.c:171
- msgid "Comment tagging"
--msgstr "Marcação de comentário"
-+msgstr "Etiquetagem de comentário"
- 
- #: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
- msgid "Underline primary keys"
-@@ -2662,7 +2934,7 @@ msgid "Use bold font for primary keys"
- msgstr "Usar negrito para chaves primárias"
- 
- #. property rows
--#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:136
-+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
- #: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
- msgid "Normal"
- msgstr "Normal"
-@@ -2673,9 +2945,9 @@ msgstr "Nome da tabela"
- 
- #: ../objects/Database/table.c:203 ../objects/Database/table.c:205
- #: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
--#: ../objects/UML/association.c:247 ../objects/UML/association.c:258
--#: ../objects/UML/association.c:260 ../objects/UML/association.c:262
--#: ../objects/UML/association.c:264 ../objects/UML/association.c:266
-+#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-+#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
-+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
- #: ../objects/UML/class.c:193 ../objects/UML/class.c:195
- #: ../objects/UML/class.c:197 ../objects/UML/class.c:199
- #: ../objects/UML/class.c:201 ../objects/UML/class.c:203
-@@ -2693,18 +2965,18 @@ msgstr "Mostrar comentários"
- 
- #. init data
- #: ../objects/Database/table.c:253 ../objects/Database/table.c:356
--#: ../sheets/Database.sheet.in.h:5
-+#: ../sheets/Database.sheet.in.h:3
- msgid "Table"
- msgstr "Tabela"
- 
- #. Attributes page:
--#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1077
-+#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1081
- msgid "_Attributes"
- msgstr "_Atributos"
- 
- #. the "new" button
--#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:624
--#: ../objects/SISSI/sissi_dialog.c:756
-+#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
-+#: ../objects/SISSI/sissi_dialog.c:871
- msgid "_New"
- msgstr "_Novo"
- 
-@@ -2723,15 +2995,15 @@ msgstr "Subir"
- msgid "Move down"
- msgstr "Descer"
- 
--#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1134
-+#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1138
- msgid "Attribute data"
- msgstr "Dados do atributo"
- 
- #: ../objects/Database/table_dialog.c:707
- #: ../objects/Database/table_dialog.c:946
- #: ../objects/Database/table_dialog.c:1051 ../objects/UML/class_dialog.c:452
--#: ../objects/UML/class_dialog.c:1177 ../objects/UML/class_dialog.c:2107
--#: ../objects/UML/class_dialog.c:2279
-+#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
-+#: ../objects/UML/class_dialog.c:2283
- msgid "Comment:"
- msgstr "Comentário:"
- 
-@@ -2817,27 +3089,29 @@ msgstr "Raio dos cantos"
- 
- #: ../objects/Database/reference.c:111
- msgid "Start description"
--msgstr "Início da descrição"
-+msgstr "Descrição do início"
- 
- #: ../objects/Database/reference.c:113
- msgid "End description"
--msgstr "Fim da descrição"
-+msgstr "Descrição do fim"
- 
- #: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
- #: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
--#: ../objects/SADT/arrow.c:459 ../objects/UML/association.c:854
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
- #: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
- #: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
--#: ../objects/UML/transition.c:172 ../objects/standard/zigzagline.c:380
-+#: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
-+#: ../objects/standard/beziergon.c:495 ../objects/standard/zigzagline.c:380
- msgid "Add segment"
- msgstr "Adicionar segmento"
- 
- #: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
- #: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
--#: ../objects/SADT/arrow.c:460 ../objects/UML/association.c:855
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
- #: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
- #: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
--#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:381
-+#: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
-+#: ../objects/standard/beziergon.c:496 ../objects/standard/zigzagline.c:381
- msgid "Delete segment"
- msgstr "Excluir segmento"
- 
-@@ -2861,7 +3135,7 @@ msgstr "Derivado:"
- msgid "Multivalue:"
- msgstr "Multivalorado:"
- 
--#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
- msgid "Attribute"
- msgstr "Atributo"
- 
-@@ -2874,7 +3148,7 @@ msgid "Associative:"
- msgstr "Associativa:"
- 
- #: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
--#: ../sheets/ER.sheet.in.h:4
-+#: ../sheets/ER.sheet.in.h:3
- msgid "Entity"
- msgstr "Entidade"
- 
-@@ -2902,7 +3176,7 @@ msgstr "Girar:"
- msgid "Identifying:"
- msgstr "Identificação:"
- 
--#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Relacionamento"
- 
-@@ -2933,7 +3207,7 @@ msgstr "Sinal"
- 
- #: ../objects/FS/fs.c:43
- msgid "Function structure diagram objects"
--msgstr "Objetos do diagrama de estrutura funcional"
-+msgstr "Objetos do diagrama de Estrutura funcional"
- 
- #: ../objects/FS/function.c:144
- msgid "Wish function"
-@@ -3081,12 +3355,12 @@ msgstr "Rotacionar"
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
- #: ../objects/FS/function.c:752
- msgid "Turn"
--msgstr "Voltar"
-+msgstr "Girar"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
- #: ../objects/FS/function.c:754
- msgid "Spin"
--msgstr "Girar"
-+msgstr "Parafuso"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-@@ -3102,18 +3376,18 @@ msgstr "Restringir"
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
- #: ../objects/FS/function.c:762
- msgid "Unlock"
--msgstr "Desbloquear"
-+msgstr "Destravar"
- 
- #. Translators: Menu item Verb/Support
- #. Translators: Menu item Verb/Support/Support
- #: ../objects/FS/function.c:764 ../objects/FS/function.c:766
- msgid "Support"
--msgstr "Suportar"
-+msgstr "Apoiar"
- 
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
- #: ../objects/FS/function.c:768 ../objects/FS/function.c:770
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
- msgstr "Parar"
- 
-@@ -3136,7 +3410,7 @@ msgstr "Prevenir"
- #. Translators: Menu item Verb/Support/Stop/Shield
- #: ../objects/FS/function.c:778
- msgid "Shield"
--msgstr "Proteger"
-+msgstr "Abrigar"
- 
- #. Translators: Menu item Verb/Support/Stop/Inhibit
- #: ../objects/FS/function.c:780
-@@ -3172,14 +3446,14 @@ msgid "Mount"
- msgstr "Montar"
- 
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
- msgstr "Travar"
- 
- #. Translators: Menu item Verb/Support/Secure/Fasten
- #: ../objects/FS/function.c:798
- msgid "Fasten"
--msgstr "Corrigir"
-+msgstr "Apertar"
- 
- #. Translators: Menu item Verb/Support/Secure/Hold
- #: ../objects/FS/function.c:800
-@@ -3260,7 +3534,7 @@ msgstr "Incorporar"
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
- #: ../objects/FS/function.c:840 ../objects/FS/function.c:842
--#: ../sheets/UML.sheet.in.h:5
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
- msgstr "Ramificar"
- 
-@@ -3290,7 +3564,7 @@ msgstr "Liberar"
- #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
- #: ../objects/FS/function.c:856
- msgid "Detach"
--msgstr "Separar"
-+msgstr "Desanexar"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
- #: ../objects/FS/function.c:858
-@@ -3404,7 +3678,7 @@ msgstr "Umedecer"
- #. Translators: Menu item Verb/Branch/Dissipate/Dispel
- #: ../objects/FS/function.c:910
- msgid "Dispel"
--msgstr "Expedir"
-+msgstr "Expelir"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Resist
- #: ../objects/FS/function.c:914
-@@ -3415,7 +3689,7 @@ msgstr "Resistir"
- #. Translators: Menu item Verb/Provision/Provision
- #: ../objects/FS/function.c:916 ../objects/FS/function.c:918
- msgid "Provision"
--msgstr "Provisionar"
-+msgstr "Prover"
- 
- #. Translators: Menu item Verb/Provision/Store
- #. Translators: Menu item Verb/Provision/Store/Store
-@@ -3465,7 +3739,7 @@ msgid "Expose"
- msgstr "Expor"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Extrair"
- 
-@@ -3562,7 +3836,7 @@ msgstr "Multiplicar"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Scale
- #. FIXME: mark read-only
--#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:187
-+#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:186
- msgid "Scale"
- msgstr "Escalar"
- 
-@@ -3621,7 +3895,7 @@ msgstr "Transformar"
- #. Translators: Menu item Verb/Convert/Liquefy
- #: ../objects/FS/function.c:1020
- msgid "Liquefy"
--msgstr "Liqüefazer"
-+msgstr "Liquefazer"
- 
- #. Translators: Menu item Verb/Convert/Solidify
- #: ../objects/FS/function.c:1022
-@@ -3654,7 +3928,7 @@ msgid "Differentiate"
- msgstr "Diferenciar"
- 
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
- msgstr "Processar"
-@@ -3683,7 +3957,7 @@ msgstr "Discernir"
- #. Translators: Menu item Verb/Signal/Sense/Check
- #: ../objects/FS/function.c:1050
- msgid "Check"
--msgstr "Checar"
-+msgstr "Conferir"
- 
- #. Translators: Menu item Verb/Signal/Sense/Verify
- #: ../objects/FS/function.c:1054
-@@ -3796,7 +4070,7 @@ msgid "Force"
- msgstr "Força"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Rotation
--#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:204
-+#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
- msgid "Rotation"
- msgstr "Rotação"
- 
-@@ -3838,7 +4112,7 @@ msgstr "Eletricidade"
- #. Translators: Menu item Noun/Energy/Electricity/Voltage
- #: ../objects/FS/function.c:1124
- msgid "Voltage"
--msgstr "Voltagem"
-+msgstr "Tensão"
- 
- #. Translators: Menu item Noun/Energy/Electricity/Current
- #: ../objects/FS/function.c:1126
-@@ -3848,7 +4122,7 @@ msgstr "Corrente"
- #. Translators: Menu item Noun/Energy/Hydraulic
- #: ../objects/FS/function.c:1128
- msgid "Hydraulic"
--msgstr "Hidráulico"
-+msgstr "Hidráulica"
- 
- #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
- #: ../objects/FS/function.c:1130
-@@ -3889,22 +4163,22 @@ msgstr "Radiação"
- #. Translators: Menu item Noun/Energy/Pneumatic
- #: ../objects/FS/function.c:1144
- msgid "Pneumatic"
--msgstr "Pneumático"
-+msgstr "Pneumática"
- 
- #. Translators: Menu item Noun/Energy/Chemical
- #: ../objects/FS/function.c:1146
- msgid "Chemical"
--msgstr "Químico"
-+msgstr "Química"
- 
- #. Translators: Menu item Noun/Energy/Radioactive
- #: ../objects/FS/function.c:1148
- msgid "Radioactive"
--msgstr "Radioativo"
-+msgstr "Radioativa"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
- #: ../objects/FS/function.c:1152
- msgid "Microwaves"
--msgstr "Microondas"
-+msgstr "Micro-ondas"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
- #: ../objects/FS/function.c:1154
-@@ -3964,7 +4238,7 @@ msgstr "Função usuário/dispositivo"
- msgid "Wish Fn"
- msgstr "Função desejada"
- 
--#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Chamada de macro"
- 
-@@ -3998,21 +4272,21 @@ msgstr "A cor da condição"
- 
- #: ../objects/GRAFCET/grafcet.c:45
- msgid "GRAFCET diagram objects"
--msgstr "Diagrama de objetos GRAFCET"
-+msgstr "Objetos de diagrama GRAFCET"
- 
--#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Passo regular"
- 
--#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "Passo inicial"
- 
--#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Passo de entrada de macro"
- 
--#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Passo de saída de macro"
- 
-@@ -4078,7 +4352,7 @@ msgstr "Ponto sul"
- 
- #: ../objects/GRAFCET/vector.c:131
- msgid "Draw arrow heads on upward arcs:"
--msgstr "Desenhar cabeças das setas em arcos para cima:"
-+msgstr "Desenhar pontas das setas em arcos para cima:"
- 
- #: ../objects/GRAFCET/vergent.c:124
- msgid "OR"
-@@ -4094,14 +4368,14 @@ msgstr "Tipo de vergente:"
- 
- #: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
- #: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
--#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:449
-+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
- #: ../objects/standard/line.c:223
- msgid "Add connection point"
- msgstr "Adicionar ponto de conexão"
- 
- #: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
- #: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
--#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:450
-+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
- #: ../objects/standard/line.c:224
- msgid "Delete connection point"
- msgstr "Excluir ponto de conexão"
-@@ -4118,13 +4392,13 @@ msgstr "Não especificado"
- msgid "Agent"
- msgstr "Agente"
- 
--#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:249
-+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
- msgid "Role"
- msgstr "Regra"
- 
- #: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
- msgid "Softgoal"
--msgstr "Meta soft"
-+msgstr "Meta leve"
- 
- #: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
- msgid "Goal"
-@@ -4147,7 +4421,7 @@ msgstr "Contribuição positiva"
- msgid "Negative contrib"
- msgstr "Contribuição negativa"
- 
--#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Dependência"
- 
-@@ -4163,7 +4437,7 @@ msgstr "Meios-Fins"
- msgid "Resource"
- msgstr "Recurso"
- 
--#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr "Tarefa"
- 
-@@ -4177,7 +4451,7 @@ msgstr "Domínio fornecido"
- 
- #: ../objects/Jackson/domain.c:80
- msgid "Designed Domain"
--msgstr "Domínio designado"
-+msgstr "Domínio projetado"
- 
- #: ../objects/Jackson/domain.c:81
- msgid "Machine Domain"
-@@ -4292,7 +4566,7 @@ msgstr "Controles"
- 
- #: ../objects/KAOS/metabinrel.c:163
- msgid "CapableOf"
--msgstr "CapableOf"
-+msgstr "CapazDe"
- 
- #: ../objects/KAOS/metabinrel.c:164
- msgid "Performs"
-@@ -4326,52 +4600,68 @@ msgstr "Largura da linha do ponteiro de segundos"
- msgid "Show hours"
- msgstr "Mostrar horas"
- 
--#: ../objects/Misc/libmisc.c:40
-+#: ../objects/Misc/grid_object.c:140
-+msgid "Rows"
-+msgstr "Linhas"
-+
-+#: ../objects/Misc/grid_object.c:142
-+msgid "Columns"
-+msgstr "Colunas"
-+
-+#: ../objects/Misc/grid_object.c:144
-+msgid "Gridline color"
-+msgstr "Cor da linha de grade"
-+
-+#: ../objects/Misc/grid_object.c:146
-+msgid "Gridline width"
-+msgstr "Largura da linha de grade"
-+
-+#: ../objects/Misc/libmisc.c:41
- msgid "Miscellaneous objects"
--msgstr "Miscelânea de objetos"
-+msgstr "Objetos diversos"
- 
--#: ../objects/Misc/measure.c:170
-+#: ../objects/Misc/measure.c:169
- msgid "cm"
- msgstr "cm"
- 
--#: ../objects/Misc/measure.c:171
-+#: ../objects/Misc/measure.c:170
- msgid "dm"
- msgstr "dm"
- 
--#: ../objects/Misc/measure.c:172
-+#: ../objects/Misc/measure.c:171
- msgid "ft"
--msgstr "ft"
-+msgstr "pés"
- 
--#: ../objects/Misc/measure.c:173
-+#: ../objects/Misc/measure.c:172
- msgid "in"
--msgstr "in"
-+msgstr "polegadas"
- 
--#: ../objects/Misc/measure.c:174
-+#: ../objects/Misc/measure.c:173
- msgid "m"
- msgstr "m"
- 
--#: ../objects/Misc/measure.c:175
-+#: ../objects/Misc/measure.c:174
- msgid "mm"
- msgstr "mm"
- 
--#: ../objects/Misc/measure.c:176
-+#: ../objects/Misc/measure.c:175
- msgid "pt"
- msgstr "pt"
- 
--#: ../objects/Misc/measure.c:177
-+#: ../objects/Misc/measure.c:176
- msgid "pi"
- msgstr "pi"
- 
- #. PROP_FLAG_VISIBLE|
--#: ../objects/Misc/measure.c:186 ../sheets/ChemEng.sheet.in.h:28
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
- msgid "Measurement"
- msgstr "Medida"
- 
--#: ../objects/Misc/measure.c:188
-+#: ../objects/Misc/measure.c:187
- msgid "Unit"
- msgstr "Unidade"
- 
--#: ../objects/Misc/measure.c:189
-+#: ../objects/Misc/measure.c:188
- msgid "Precision"
- msgstr "Precisão"
- 
-@@ -4383,31 +4673,31 @@ msgstr "Adicionar alça"
- msgid "Delete Handle"
- msgstr "Excluir alça"
- 
--#: ../objects/SADT/arrow.c:137
-+#: ../objects/SADT/arrow.c:138
- msgid "Import resource (not shown upstairs)"
- msgstr "Importar recurso (não mostrado acima)"
- 
--#: ../objects/SADT/arrow.c:138
-+#: ../objects/SADT/arrow.c:139
- msgid "Imply resource (not shown downstairs)"
- msgstr "Implicar recurso (não mostrado abaixo)"
- 
--#: ../objects/SADT/arrow.c:139
-+#: ../objects/SADT/arrow.c:140
- msgid "Dotted arrow"
- msgstr "Seta pontilhada"
- 
--#: ../objects/SADT/arrow.c:140
-+#: ../objects/SADT/arrow.c:141
- msgid "disable arrow heads"
--msgstr "Desabilitar cabeças de setas"
-+msgstr "Desabilitar pontas de setas"
- 
--#: ../objects/SADT/arrow.c:146
-+#: ../objects/SADT/arrow.c:148
- msgid "Flow style:"
- msgstr "Tipo de fluxo:"
- 
--#: ../objects/SADT/arrow.c:148
-+#: ../objects/SADT/arrow.c:150
- msgid "Automatically gray vertical flows:"
- msgstr "Acinzentar automaticamente fluxos verticais:"
- 
--#: ../objects/SADT/arrow.c:149
-+#: ../objects/SADT/arrow.c:151
- msgid ""
- "To improve the ease of reading, flows which begin and end vertically can be "
- "rendered gray"
-@@ -4415,25 +4705,25 @@ msgstr ""
- "Para facilitar a leitura, fluxos que começam e terminam verticalmente podem "
- "ser desenhados em cinza"
- 
--#: ../objects/SADT/arrow.c:465
-+#: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
- msgstr "Seta SADT"
- 
--#: ../objects/SADT/box.c:139 ../objects/custom/custom_object.c:226
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
- #: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
- #: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
- msgid "Text padding"
- msgstr "Espaço ao redor do texto"
- 
--#: ../objects/SADT/box.c:146
-+#: ../objects/SADT/box.c:149
- msgid "Activity/Data identifier"
- msgstr "Identificador de atividade/dados"
- 
--#: ../objects/SADT/box.c:147
-+#: ../objects/SADT/box.c:150
- msgid "The identifier which appears in the lower right corner of the Box"
- msgstr "O identificador que aparece no canto inferior direito da caixa"
- 
--#: ../objects/SADT/box.c:455
-+#: ../objects/SADT/box.c:460
- msgid "SADT box"
- msgstr "Caixa SADT"
- 
-@@ -4441,15 +4731,15 @@ msgstr "Caixa SADT"
- msgid "SADT diagram objects"
- msgstr "Objetos de diagrama SADT"
- 
--#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi.h:222
-+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
- msgid "No Protection"
- msgstr "Sem proteção"
- 
--#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi.h:223
-+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
- msgid "Restricted Diffusion"
- msgstr "Difusão restrita"
- 
--#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi.h:224
-+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
- msgid "Special Country Confidential"
- msgstr "Confidencial especial de um país"
- 
-@@ -4457,15 +4747,15 @@ msgstr "Confidencial especial de um país"
- msgid "Confidential"
- msgstr "Confidencial"
- 
--#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi.h:225
-+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
- msgid "NATO Confidential"
- msgstr "Confidencial da OTAN"
- 
--#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi.h:226
-+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
- msgid "Personal Confidential"
- msgstr "Confidencial pessoal"
- 
--#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi.h:227
-+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
- msgid "Medical Confidential"
- msgstr "Confidencial médico"
- 
-@@ -4477,7 +4767,7 @@ msgstr "Confidencial industrial"
- msgid "Defense Confidential"
- msgstr "Confidencial de defesa"
- 
--#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi.h:229
-+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
- msgid "Secret"
- msgstr "Secreto"
- 
-@@ -4485,19 +4775,19 @@ msgstr "Secreto"
- msgid "Defense Secret"
- msgstr "Secreto de defesa"
- 
--#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi.h:230
-+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
- msgid "Secret special country"
- msgstr "Secreto especial de um país"
- 
--#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi.h:231
-+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
- msgid "NATO Secret"
- msgstr "Secreto da OTAN"
- 
--#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi.h:232
-+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
- msgid "Very Secret"
- msgstr "Muito secreto"
- 
--#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi.h:233
-+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
- msgid "NATO Very Secret"
- msgstr "Muito secreto da OTAN"
- 
-@@ -4505,7 +4795,7 @@ msgstr "Muito secreto da OTAN"
- msgid "SISSI diagram"
- msgstr "Diagrama SISSI"
- 
--#: ../objects/SISSI/sissi.c:919
-+#: ../objects/SISSI/sissi.c:923
- #, c-format
- msgid ""
- "Error loading object.\n"
-@@ -4514,7 +4804,7 @@ msgstr ""
- "Erro ao carregar o objeto.\n"
- "Não é um arquivo normal: %s"
- 
--#: ../objects/SISSI/sissi.c:924 ../objects/SISSI/sissi.c:928
-+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
- #, c-format
- msgid ""
- "Error loading object.\n"
-@@ -4523,7 +4813,7 @@ msgstr ""
- "Erro ao carregar o objeto.\n"
- "Tipo incorreto de arquivo: %s"
- 
--#: ../objects/SISSI/sissi.c:936
-+#: ../objects/SISSI/sissi.c:940
- #, c-format
- msgid ""
- "Error loading object.\n"
-@@ -4532,406 +4822,402 @@ msgstr ""
- "Erro ao carregar o objeto.\n"
- "Não é um arquivo Dia: %s"
- 
--#: ../objects/SISSI/sissi.h:228
-+#: ../objects/SISSI/sissi_dialog.c:48
- msgid "Industrial Confidential"
- msgstr "Confidencial industrial"
- 
--#: ../objects/SISSI/sissi.h:238
-+#: ../objects/SISSI/sissi_dialog.c:58
- msgid "No integrity"
- msgstr "Sem integridade"
- 
--#: ../objects/SISSI/sissi.h:239
-+#: ../objects/SISSI/sissi_dialog.c:59
- msgid "Low integrity"
- msgstr "Integridade baixa"
- 
--#: ../objects/SISSI/sissi.h:240
-+#: ../objects/SISSI/sissi_dialog.c:60
- msgid "Average software integrity"
--msgstr "Média integridade de software"
-+msgstr "Integridade de software média"
- 
--#: ../objects/SISSI/sissi.h:241
-+#: ../objects/SISSI/sissi_dialog.c:61
- msgid "High software integrity"
--msgstr "Alta integridade de software"
-+msgstr "Integridade de software alta"
- 
--#: ../objects/SISSI/sissi.h:242
-+#: ../objects/SISSI/sissi_dialog.c:62
- msgid "Average hardware integrity"
--msgstr "Média integridade de hardware"
-+msgstr "Integridade de hardware média"
- 
--#: ../objects/SISSI/sissi.h:243
-+#: ../objects/SISSI/sissi_dialog.c:63
- msgid "High hardware integrity"
--msgstr "Alta integridade de hardware"
-+msgstr "Integridade de hardware alta"
- 
--#: ../objects/SISSI/sissi.h:248
-+#: ../objects/SISSI/sissi_dialog.c:68
- msgid "Millisecond"
- msgstr "Milissegundo"
- 
--#: ../objects/SISSI/sissi.h:249
-+#: ../objects/SISSI/sissi_dialog.c:69
- msgid "Second"
- msgstr "Segundo"
- 
--#: ../objects/SISSI/sissi.h:250
-+#: ../objects/SISSI/sissi_dialog.c:70
- msgid "Minute"
- msgstr "Minuto"
- 
--#: ../objects/SISSI/sissi.h:251
-+#: ../objects/SISSI/sissi_dialog.c:71
- msgid "Hour"
- msgstr "Hora"
- 
--#: ../objects/SISSI/sissi.h:252
-+#: ../objects/SISSI/sissi_dialog.c:72
- msgid "Day"
- msgstr "Dia"
- 
--#: ../objects/SISSI/sissi.h:253
-+#: ../objects/SISSI/sissi_dialog.c:73
- msgid "Week"
- msgstr "Semana"
- 
--#: ../objects/SISSI/sissi.h:258
-+#: ../objects/SISSI/sissi_dialog.c:78
- msgid "SYSTEM"
- msgstr "SISTEMA"
- 
--#: ../objects/SISSI/sissi.h:259
-+#: ../objects/SISSI/sissi_dialog.c:79
- msgid "Internet access device"
- msgstr "Dispositivo de acesso a Internet"
- 
--#: ../objects/SISSI/sissi.h:260
-+#: ../objects/SISSI/sissi_dialog.c:80
- msgid "Electronic messaging"
- msgstr "Mensagem eletrônica"
- 
--#: ../objects/SISSI/sissi.h:261
-+#: ../objects/SISSI/sissi_dialog.c:81
- msgid "Intranet"
- msgstr "Intranet"
- 
--#: ../objects/SISSI/sissi.h:262
-+#: ../objects/SISSI/sissi_dialog.c:82
- msgid "Company directory"
- msgstr "Direção da empresa"
- 
--#: ../objects/SISSI/sissi.h:263
-+#: ../objects/SISSI/sissi_dialog.c:83
- msgid "External portal"
- msgstr "Portal externo"
- 
--#: ../objects/SISSI/sissi.h:268
-+#: ../objects/SISSI/sissi_dialog.c:88
- msgid "ORGANISATION"
- msgstr "ORGANIZAÇÃO"
- 
--#: ../objects/SISSI/sissi.h:269
-+#: ../objects/SISSI/sissi_dialog.c:89
- msgid "Higher-tier organisation"
- msgstr "Organização de nível mais elevado"
- 
--#: ../objects/SISSI/sissi.h:270
-+#: ../objects/SISSI/sissi_dialog.c:90
- msgid "Structure of the organisation"
- msgstr "Estrutura da organização"
- 
--#: ../objects/SISSI/sissi.h:271
-+#: ../objects/SISSI/sissi_dialog.c:91
- msgid "Project or system organisation"
- msgstr "Organização de sistema ou projeto"
- 
--#: ../objects/SISSI/sissi.h:272
-+#: ../objects/SISSI/sissi_dialog.c:92
- msgid "Subcontractors / Suppliers / Manufacturers"
- msgstr "Subempreiteiros / Fornecedores / Fabricante"
- 
--#: ../objects/SISSI/sissi.h:277
-+#: ../objects/SISSI/sissi_dialog.c:97
- msgid "SITE"
- msgstr "SITE"
- 
--#: ../objects/SISSI/sissi.h:278
-+#: ../objects/SISSI/sissi_dialog.c:98
- msgid "Places"
- msgstr "Locais"
- 
--#: ../objects/SISSI/sissi.h:279
-+#: ../objects/SISSI/sissi_dialog.c:99
- msgid "External environment"
- msgstr "Ambiente externo"
- 
--#: ../objects/SISSI/sissi.h:280
-+#: ../objects/SISSI/sissi_dialog.c:100
- msgid "Premises"
- msgstr "Premissas"
- 
--#: ../objects/SISSI/sissi.h:281
-+#: ../objects/SISSI/sissi_dialog.c:101
- msgid "Zone"
- msgstr "Zona"
- 
--#: ../objects/SISSI/sissi.h:282
-+#: ../objects/SISSI/sissi_dialog.c:102
- msgid "Essential Services"
- msgstr "Serviços essenciais"
- 
--#: ../objects/SISSI/sissi.h:283
-+#: ../objects/SISSI/sissi_dialog.c:103
- msgid "Communication"
- msgstr "Comunicação"
- 
--#: ../objects/SISSI/sissi.h:284
-+#: ../objects/SISSI/sissi_dialog.c:104
- msgid "Power"
- msgstr "Energia"
- 
--#: ../objects/SISSI/sissi.h:285
-+#: ../objects/SISSI/sissi_dialog.c:105
- msgid "Cooling / Pollution"
- msgstr "Resfriamento / Poluição"
- 
--#: ../objects/SISSI/sissi.h:289
-+#: ../objects/SISSI/sissi_dialog.c:109
- msgid "Thermal detection"
- msgstr "Detecção térmica"
- 
--#: ../objects/SISSI/sissi.h:293
-+#: ../objects/SISSI/sissi_dialog.c:113
- msgid "Fire detection"
- msgstr "Detecção de fogo"
- 
--#: ../objects/SISSI/sissi.h:297
-+#: ../objects/SISSI/sissi_dialog.c:117
- msgid "Water detection"
- msgstr "Detecção de água"
- 
--#: ../objects/SISSI/sissi.h:301
-+#: ../objects/SISSI/sissi_dialog.c:121
- msgid "Air detection"
- msgstr "Detecção de ar"
- 
--#: ../objects/SISSI/sissi.h:305
-+#: ../objects/SISSI/sissi_dialog.c:125
- msgid "Energy detection"
- msgstr "Detecção de energia"
- 
- #
--#: ../objects/SISSI/sissi.h:309
-+#: ../objects/SISSI/sissi_dialog.c:129
- msgid "Intrusion detection"
- msgstr "Detecção de intrusão"
- 
--#: ../objects/SISSI/sissi.h:313
-+#: ../objects/SISSI/sissi_dialog.c:133
- msgid "Thermal action"
- msgstr "Ação relativa à temperatura"
- 
--#: ../objects/SISSI/sissi.h:317
-+#: ../objects/SISSI/sissi_dialog.c:137
- msgid "Fire action"
- msgstr "Ação relativa ao fogo"
- 
--#: ../objects/SISSI/sissi.h:321
-+#: ../objects/SISSI/sissi_dialog.c:141
- msgid "Water action"
- msgstr "Ação relativa à água"
- 
--#: ../objects/SISSI/sissi.h:325
-+#: ../objects/SISSI/sissi_dialog.c:145
- msgid "Air action"
- msgstr "Ação relativa ao ar"
- 
--#: ../objects/SISSI/sissi.h:329
-+#: ../objects/SISSI/sissi_dialog.c:149
- msgid "Energy action"
- msgstr "Ação relativa à energia"
- 
- #
--#: ../objects/SISSI/sissi.h:333
-+#: ../objects/SISSI/sissi_dialog.c:153
- msgid "Intrusion action"
- msgstr "Ação relativa à intrusão"
- 
--#: ../objects/SISSI/sissi.h:338
-+#: ../objects/SISSI/sissi_dialog.c:158
- msgid "Personal"
- msgstr "Pessoal"
- 
--#: ../objects/SISSI/sissi.h:339
-+#: ../objects/SISSI/sissi_dialog.c:159
- msgid "Decision maker"
- msgstr "Tomador de decisão"
- 
--#: ../objects/SISSI/sissi.h:340
-+#: ../objects/SISSI/sissi_dialog.c:160
- msgid "SSI Responsible"
- msgstr "Responsável por SSI"
- 
--#: ../objects/SISSI/sissi.h:341
-+#: ../objects/SISSI/sissi_dialog.c:161
- msgid "Users"
- msgstr "Usuários"
- 
--#: ../objects/SISSI/sissi.h:342
-+#: ../objects/SISSI/sissi_dialog.c:162
- msgid "Functional administrator"
- msgstr "Administrador funcional"
- 
--#: ../objects/SISSI/sissi.h:343
-+#: ../objects/SISSI/sissi_dialog.c:163
- msgid "Technical administrator"
- msgstr "Administrador técnico"
- 
--#: ../objects/SISSI/sissi.h:344
-+#: ../objects/SISSI/sissi_dialog.c:164
- msgid "SSI administrator"
- msgstr "Administrador SSI"
- 
--#: ../objects/SISSI/sissi.h:345
-+#: ../objects/SISSI/sissi_dialog.c:165
- msgid "Developer"
- msgstr "Desenvolvedor"
- 
--#: ../objects/SISSI/sissi.h:346
-+#: ../objects/SISSI/sissi_dialog.c:166
- msgid "Operator / Maintenance"
- msgstr "Operador / Manutenção"
- 
--#: ../objects/SISSI/sissi.h:351 ../sheets/network.sheet.in.h:20
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
- msgid "Network"
- msgstr "Rede"
- 
--#: ../objects/SISSI/sissi.h:352
-+#: ../objects/SISSI/sissi_dialog.c:172
- msgid "Medium and support"
- msgstr "Meio e suporte"
- 
--#: ../objects/SISSI/sissi.h:353
-+#: ../objects/SISSI/sissi_dialog.c:173
- msgid "Passive or active relay"
- msgstr "Retransmissão passiva ou ativa"
- 
--#: ../objects/SISSI/sissi.h:354
-+#: ../objects/SISSI/sissi_dialog.c:174
- msgid "Communication interface"
- msgstr "Interface de comunicação"
- 
--#: ../objects/SISSI/sissi.h:359 ../sheets/SISSI.sheet.in.h:54
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
- msgid "Software"
- msgstr "Software"
- 
--#: ../objects/SISSI/sissi.h:360
-+#: ../objects/SISSI/sissi_dialog.c:180
- msgid "Operating System"
- msgstr "Sistema Operacional"
- 
--#: ../objects/SISSI/sissi.h:361
-+#: ../objects/SISSI/sissi_dialog.c:181
- msgid "Service - maintenance or administration software"
- msgstr "Serviço - software de manutenção ou administração"
- 
--#: ../objects/SISSI/sissi.h:362
-+#: ../objects/SISSI/sissi_dialog.c:182
- msgid "Packaged software or standard software"
- msgstr "Software empacotado ou software padrão"
- 
--#: ../objects/SISSI/sissi.h:363
-+#: ../objects/SISSI/sissi_dialog.c:183
- msgid "Business application"
- msgstr "Aplicativo de negócios"
- 
--#: ../objects/SISSI/sissi.h:364
-+#: ../objects/SISSI/sissi_dialog.c:184
- msgid "Standard business application"
- msgstr "Aplicativo padrão de negócios"
- 
--#: ../objects/SISSI/sissi.h:365
-+#: ../objects/SISSI/sissi_dialog.c:185
- msgid "Specific business application"
- msgstr "Aplicativo específico de negócios"
- 
--#: ../objects/SISSI/sissi.h:370
-+#: ../objects/SISSI/sissi_dialog.c:190
- msgid "HARDWARE"
- msgstr "HARDWARE"
- 
--#: ../objects/SISSI/sissi.h:371
-+#: ../objects/SISSI/sissi_dialog.c:191
- msgid "Data-processing equipment (active)"
- msgstr "Equipamento de processamento de dados (ativo)"
- 
--#: ../objects/SISSI/sissi.h:372
-+#: ../objects/SISSI/sissi_dialog.c:192
- msgid "Mobile equipment"
- msgstr "Equipamento móvel"
- 
--#: ../objects/SISSI/sissi.h:373
-+#: ../objects/SISSI/sissi_dialog.c:193
- msgid "Fixed equipment"
- msgstr "Equipamento fixo"
- 
--#: ../objects/SISSI/sissi.h:374
-+#: ../objects/SISSI/sissi_dialog.c:194
- msgid "Peripheral processing"
- msgstr "Processamento periférico"
- 
--#: ../objects/SISSI/sissi.h:375
-+#: ../objects/SISSI/sissi_dialog.c:195
- msgid "Electronic medium"
- msgstr "Meio eletrônico"
- 
--#: ../objects/SISSI/sissi.h:376
-+#: ../objects/SISSI/sissi_dialog.c:196
- msgid "Other media"
- msgstr "Outra mídia"
- 
--#: ../objects/SISSI/sissi.h:377
-+#: ../objects/SISSI/sissi_dialog.c:197
- msgid "Data medium (passive)"
- msgstr "Meio dos dados (passivo)"
- 
- #. Class page:
--#: ../objects/SISSI/sissi_dialog.c:186
-+#: ../objects/SISSI/sissi_dialog.c:301
- msgid "_Menace"
- msgstr "A_meaça"
- 
- #. ********* label of board *********
--#: ../objects/SISSI/sissi_dialog.c:202 ../objects/SISSI/sissi_dialog.c:211
-+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
- msgid "Menace"
- msgstr "Ameaça"
- 
--#: ../objects/SISSI/sissi_dialog.c:204 ../objects/SISSI/sissi_dialog.c:213
-+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
- msgid "P Action"
- msgstr "Ação P"
- 
--#: ../objects/SISSI/sissi_dialog.c:206 ../objects/SISSI/sissi_dialog.c:215
-+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
- msgid "P Detection"
- msgstr "Detecção P"
- 
--#: ../objects/SISSI/sissi_dialog.c:208 ../objects/SISSI/sissi_dialog.c:217
-+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
- msgid "Vulnerability"
- msgstr "Vulnerabilidade"
- 
- #. Other properties of page:
--#: ../objects/SISSI/sissi_dialog.c:373
-+#: ../objects/SISSI/sissi_dialog.c:488
- msgid "Other properties"
- msgstr "Outras propriedades"
- 
- #. ********* selection menu of entity ********
- #. ********* Label of board *********
--#: ../objects/SISSI/sissi_dialog.c:611
-+#: ../objects/SISSI/sissi_dialog.c:726
- msgid "Label"
- msgstr "Rótulo"
- 
--#: ../objects/SISSI/sissi_dialog.c:613
-+#: ../objects/SISSI/sissi_dialog.c:728
- msgid "value"
- msgstr "valor"
- 
- #. Other properties of page
--#: ../objects/SISSI/sissi_dialog.c:747
-+#: ../objects/SISSI/sissi_dialog.c:862
- msgid "Documents"
- msgstr "Documentos"
- 
--#: ../objects/SISSI/sissi_dialog.c:763
-+#: ../objects/SISSI/sissi_dialog.c:878
- msgid "Document title"
- msgstr "Título do documento"
- 
--#: ../objects/SISSI/sissi_dialog.c:765
--msgid "URL"
--msgstr "URL"
--
- #: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
--#: ../sheets/UML.sheet.in.h:2
-+#: ../sheets/UML.sheet.in.h:15
- msgid "Actor"
- msgstr "Ator"
- 
--#: ../objects/UML/association.c:224
-+#: ../objects/UML/association.c:222
- msgid "From A to B"
- msgstr "De A até B"
- 
--#: ../objects/UML/association.c:225
-+#: ../objects/UML/association.c:223
- msgid "From B to A"
- msgstr "De B até A"
- 
--#: ../objects/UML/association.c:230
-+#: ../objects/UML/association.c:228
- msgid "Aggregation"
- msgstr "Agregação"
- 
--#: ../objects/UML/association.c:231
-+#: ../objects/UML/association.c:229
- msgid "Composition"
- msgstr "Composição"
- 
--#: ../objects/UML/association.c:238
-+#: ../objects/UML/association.c:236
- msgid "Direction"
- msgstr "Direção"
- 
--#: ../objects/UML/association.c:240
-+#: ../objects/UML/association.c:238
- msgid "Show direction"
- msgstr "Mostrar direção"
- 
--#: ../objects/UML/association.c:240
-+#: ../objects/UML/association.c:238
- msgid "Show the small arrow denoting the reading direction"
- msgstr "Mostra a seta pequena para denotar a direção de leitura"
- 
--#: ../objects/UML/association.c:247
-+#: ../objects/UML/association.c:245
- msgid "Side A"
- msgstr "Lado A"
- 
--#: ../objects/UML/association.c:251
-+#: ../objects/UML/association.c:249
- msgid "Multiplicity"
- msgstr "Multiplicidade"
- 
--#: ../objects/UML/association.c:253 ../objects/UML/umlattribute.c:45
-+#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
- #: ../objects/UML/umloperation.c:71
- msgid "Visibility"
- msgstr "Visibilidade"
- 
--#: ../objects/UML/association.c:255
-+#: ../objects/UML/association.c:253
- msgid "Show arrow"
- msgstr "Mostrar seta"
- 
--#: ../objects/UML/association.c:258
-+#: ../objects/UML/association.c:256
- msgid "Side B"
- msgstr "Lado B"
- 
- #: ../objects/UML/class.c:142 ../objects/UML/class.c:325
--#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
-+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
- msgid "Class"
- msgstr "Classe"
- 
-@@ -4946,7 +5232,7 @@ msgstr "Estereótipo"
- 
- #: ../objects/UML/class.c:150 ../objects/UML/class.c:183
- #: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
--#: ../objects/UML/class_dialog.c:2083 ../objects/UML/uml.c:110
-+#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
- msgid "Abstract"
- msgstr "Abstrata"
- 
-@@ -5019,7 +5305,7 @@ msgstr "_Classe"
- msgid "Class name:"
- msgstr "Nome da classe:"
- 
--#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2032
-+#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
- #: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
- #: ../objects/UML/realizes.c:136
- msgid "Stereotype:"
-@@ -5075,107 +5361,107 @@ msgstr "Cor do primeiro plano"
- msgid "Background Color"
- msgstr "Cor do segundo plano"
- 
--#: ../objects/UML/class_dialog.c:1166
-+#: ../objects/UML/class_dialog.c:1170
- msgid "Value:"
- msgstr "Valor:"
- 
--#: ../objects/UML/class_dialog.c:1199 ../objects/UML/class_dialog.c:2044
-+#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
- msgid "Visibility:"
- msgstr "Visibilidade:"
- 
--#: ../objects/UML/class_dialog.c:1208 ../objects/UML/class_dialog.c:2053
-+#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
- #: ../objects/UML/uml.c:102
- msgid "Public"
- msgstr "Público"
- 
--#: ../objects/UML/class_dialog.c:1211 ../objects/UML/class_dialog.c:2056
-+#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
- #: ../objects/UML/uml.c:103
- msgid "Private"
- msgstr "Privado"
- 
--#: ../objects/UML/class_dialog.c:1214 ../objects/UML/class_dialog.c:2059
-+#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
- #: ../objects/UML/uml.c:104
- msgid "Protected"
- msgstr "Protegido"
- 
--#: ../objects/UML/class_dialog.c:1217 ../objects/UML/class_dialog.c:2062
-+#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
- #: ../objects/UML/uml.c:105
- msgid "Implementation"
- msgstr "Implementação"
- 
- #. end: Inheritance type
--#: ../objects/UML/class_dialog.c:1233 ../objects/UML/class_dialog.c:2099
-+#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
- msgid "Class scope"
- msgstr "Escopo da classe"
- 
- #. end: Visibility
--#: ../objects/UML/class_dialog.c:2074
-+#: ../objects/UML/class_dialog.c:2078
- msgid "Inheritance type:"
- msgstr "Tipo de herança:"
- 
--#: ../objects/UML/class_dialog.c:2086 ../objects/UML/uml.c:111
-+#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
- msgid "Polymorphic (virtual)"
- msgstr "Polimórfica (virtual)"
- 
--#: ../objects/UML/class_dialog.c:2089 ../objects/UML/uml.c:112
-+#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
- msgid "Leaf (final)"
- msgstr "Folha (final)"
- 
--#: ../objects/UML/class_dialog.c:2103
-+#: ../objects/UML/class_dialog.c:2107
- msgid "Query"
- msgstr "Consulta"
- 
--#: ../objects/UML/class_dialog.c:2150
-+#: ../objects/UML/class_dialog.c:2154
- msgid "Parameters:"
- msgstr "Parâmetros:"
- 
--#: ../objects/UML/class_dialog.c:2235
-+#: ../objects/UML/class_dialog.c:2239
- msgid "Parameter data"
- msgstr "Dados dos parâmetros"
- 
--#: ../objects/UML/class_dialog.c:2268
-+#: ../objects/UML/class_dialog.c:2272
- msgid "Def. value:"
- msgstr "Valor padrão:"
- 
--#: ../objects/UML/class_dialog.c:2302
-+#: ../objects/UML/class_dialog.c:2306
- msgid "Direction:"
- msgstr "Direção:"
- 
--#: ../objects/UML/class_dialog.c:2311 ../objects/UML/umlparameter.c:34
-+#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
- msgid "Undefined"
- msgstr "Indefinido"
- 
--#: ../objects/UML/class_dialog.c:2314 ../objects/UML/umlparameter.c:35
-+#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
- msgid "In"
- msgstr "Dentro"
- 
--#: ../objects/UML/class_dialog.c:2317 ../objects/UML/umlparameter.c:36
-+#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
- msgid "Out"
- msgstr "Fora"
- 
--#: ../objects/UML/class_dialog.c:2320 ../objects/UML/umlparameter.c:37
-+#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
- msgid "In & Out"
- msgstr "Dentro & Fora"
- 
- #. Operations page:
--#: ../objects/UML/class_dialog.c:2355
-+#: ../objects/UML/class_dialog.c:2359
- msgid "_Operations"
- msgstr "_Operações"
- 
--#: ../objects/UML/class_dialog.c:2413
-+#: ../objects/UML/class_dialog.c:2417
- msgid "Operation data"
- msgstr "Dados da operação"
- 
- #. Templates page:
--#: ../objects/UML/class_dialog.c:2776
-+#: ../objects/UML/class_dialog.c:2780
- msgid "_Templates"
- msgstr "_Modelos"
- 
--#: ../objects/UML/class_dialog.c:2782 ../sheets/UML.sheet.in.h:29
-+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
- msgid "Template class"
- msgstr "Classe modelo"
- 
--#: ../objects/UML/class_dialog.c:2839
-+#: ../objects/UML/class_dialog.c:2843
- msgid "Formal parameter data"
- msgstr "Dados formais do parâmetro"
- 
-@@ -5187,19 +5473,19 @@ msgstr "Limite"
- msgid "Is object"
- msgstr "É um objeto"
- 
--#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
- msgid "Facet"
- msgstr "Observação"
- 
--#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr "Receptáculo"
- 
--#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr "Origem do evento"
- 
--#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr "Dissipador de eventos"
- 
-@@ -5342,7 +5628,7 @@ msgstr "Ação"
- msgid "Action to perform when this transition is taken"
- msgstr "Ação a ser realizada quando esta transição se inicia"
- 
--#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
-+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
- msgstr "Guarda"
- 
-@@ -5390,7 +5676,7 @@ msgstr "Colaboração"
- msgid "Chronogram diagram objects"
- msgstr "Objetos do diagrama de cronograma"
- 
--#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Dados"
- 
-@@ -5481,10 +5767,12 @@ msgid "Custom XML shapes loader"
- msgstr "Carregador de formas XML personalizadas"
- 
- #: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
-+#: ../objects/custom/custom_object.c:1782
- msgid "Flip horizontal"
- msgstr "Virar na horizontal"
- 
- #: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
-+#: ../objects/custom/custom_object.c:1783
- msgid "Flip vertical"
- msgstr "Virar na vertical"
- 
-@@ -5492,15 +5780,7 @@ msgstr "Virar na vertical"
- msgid "Scale of the subshapes"
- msgstr "Escala das sub-formas"
- 
--#: ../objects/custom/custom_object.c:1780
--msgid "Flip Horizontal"
--msgstr "Virar na horizontal"
--
--#: ../objects/custom/custom_object.c:1781
--msgid "Flip Vertical"
--msgstr "Virar na vertical"
--
--#: ../objects/custom/custom_object.c:1818
-+#: ../objects/custom/custom_object.c:1820
- #: ../objects/custom_lines/custom_linetypes.c:263
- #, c-format
- msgid "Cannot open icon file %s for object type '%s'."
-@@ -5544,7 +5824,7 @@ msgstr "Ângulo de cisalhamento"
- msgid "Sectors"
- msgstr "Setores"
- 
--#: ../objects/network/basestation.c:398 ../objects/network/basestation.c:400
-+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
- msgid "Base Station"
- msgstr "Estação base"
- 
-@@ -5560,7 +5840,7 @@ msgstr "Raio"
- msgid "Width"
- msgstr "Largura"
- 
--#: ../objects/standard/arc.c:142
-+#: ../objects/standard/arc.c:141
- msgid "Curve distance"
- msgstr "Distância da curva"
- 
-@@ -5579,14 +5859,6 @@ msgstr "Intervalo inicial absoluto"
- msgid "Absolute end gap"
- msgstr "Intervalo final absoluto"
- 
--#: ../objects/standard/bezier.c:731 ../objects/standard/beziergon.c:495
--msgid "Add Segment"
--msgstr "Adicionar segmento"
--
--#: ../objects/standard/bezier.c:732 ../objects/standard/beziergon.c:496
--msgid "Delete Segment"
--msgstr "Excluir segmento"
--
- #: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
- msgid "Symmetric control"
- msgstr "Controle de simetria"
-@@ -5615,33 +5887,33 @@ msgstr "Quadrado"
- msgid "Aspect ratio"
- msgstr "Taxa de proporção"
- 
--#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:670
-+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
- msgid "Free aspect"
- msgstr "Aspecto livre"
- 
--#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:672
-+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
- msgid "Fixed aspect"
- msgstr "Aspecto fixo"
- 
--#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:674
-+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
- msgid "Circle"
- msgstr "Círculo"
- 
--#: ../objects/standard/image.c:138
-+#: ../objects/standard/image.c:139
- msgid "Image file"
- msgstr "Arquivo de imagem"
- 
--#: ../objects/standard/image.c:140
-+#: ../objects/standard/image.c:141
- msgid "Draw border"
- msgstr "Desenhar borda"
- 
--#: ../objects/standard/image.c:142
-+#: ../objects/standard/image.c:143
- msgid "Keep aspect ratio"
- msgstr "Manter taxa de proporção"
- 
- #. Found file in same dir as diagram.
- #. Found file in current dir.
--#: ../objects/standard/image.c:695 ../objects/standard/image.c:706
-+#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
- #, c-format
- msgid ""
- "The image file '%s' was not found in that directory.\n"
-@@ -5651,7 +5923,7 @@ msgstr ""
- "Utilizando o arquivo \"%s\" ao invés daquele.\n"
- 
- #. Didn't find file in current dir.
--#: ../objects/standard/image.c:712 ../objects/standard/image.c:734
-+#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
- #, c-format
- msgid "The image file '%s' was not found.\n"
- msgstr "O arquivo de imagem \"%s\" não foi localizado.\n"
-@@ -5668,11 +5940,11 @@ msgstr "Ponto inicial"
- msgid "End point"
- msgstr "Ponto final"
- 
--#: ../objects/standard/outline.c:202
-+#: ../objects/standard/outline.c:204
- msgid "Text content"
- msgstr "Conteúdo do texto"
- 
--#: ../objects/standard/outline.c:204
-+#: ../objects/standard/outline.c:206
- msgid "Angle to rotate the outline"
- msgstr "Ângulo para girar o contorno"
- 
-@@ -5688,11 +5960,11 @@ msgstr "Excluir canto"
- msgid "Standard objects"
- msgstr "Objetos padrão"
- 
--#: ../objects/standard/textobj.c:136
-+#: ../objects/standard/textobj.c:139
- msgid "First Line"
- msgstr "Primeira linha"
- 
--#: ../objects/standard/textobj.c:143
-+#: ../objects/standard/textobj.c:146
- msgid "Vertical text alignment"
- msgstr "Alinhamento vertical de texto"
- 
-@@ -5726,7 +5998,7 @@ msgid "Clipboard copy failed"
- msgstr "Falha ao copiar da área de transferência"
- 
- #: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
--#: ../plug-ins/wmf/wmf.cpp:1388
-+#: ../plug-ins/wmf/wmf.cpp:1381
- msgid "Nothing to print"
- msgstr "Nada a ser impresso"
- 
-@@ -5774,7 +6046,7 @@ msgstr "Imprimir (GTK) ..."
- msgid "Cairo based Rendering"
- msgstr "Renderização baseada na Cairo"
- 
--#: ../plug-ins/cgm/cgm.c:1105
-+#: ../plug-ins/cgm/cgm.c:1106
- msgid ""
- "Image row length larger than maximum cell array.\n"
- "Image not exported to CGM."
-@@ -5783,28 +6055,26 @@ msgstr ""
- "do que a matriz de células máxima.\n"
- "A imagem não foi exportada para o formato CGM."
- 
--#: ../plug-ins/cgm/cgm.c:1360
-+#: ../plug-ins/cgm/cgm.c:1362
- msgid "Computer Graphics Metafile"
- msgstr "Computer Graphics Metafile"
- 
--#: ../plug-ins/cgm/cgm.c:1385
-+#: ../plug-ins/cgm/cgm.c:1387
- msgid "Computer Graphics Metafile export filter"
- msgstr "Filtro de exportação para CGM"
- 
-+#: ../plug-ins/drs/dia-render-script.c:153
-+msgid "DiaRenderScript"
-+msgstr "DiaRenderScript"
-+
-+#: ../plug-ins/drs/dia-render-script.c:164
-+msgid "DiaRenderScript filter"
-+msgstr "Filtro DiaRenderScript"
-+
- #: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
- msgid "Drawing Interchange File"
- msgstr "Drawing Interchange File - DXF"
- 
--#. better than complaining?
--#: ../plug-ins/dxf/dxf-import.c:518 ../plug-ins/dxf/dxf-import.c:536
--msgid "Bad vertex bulge\n"
--msgstr "Conjunto de vértices mal formado\n"
--
--#: ../plug-ins/dxf/dxf-import.c:1067
--#, c-format
--msgid "Scale: %f\n"
--msgstr "Escala: %f\n"
--
- #: ../plug-ins/dxf/dxf-import.c:1319
- #, c-format
- msgid "read_dxf_codes failed on '%s'\n"
-@@ -5815,11 +6085,6 @@ msgstr "read_dxf_codes falhou em \"%s\"\n"
- msgid "Binary DXF from '%s' not supported\n"
- msgstr "DXF binário de \"%s\" não suportado\n"
- 
--#: ../plug-ins/dxf/dxf-import.c:1367
--#, c-format
--msgid "Unknown dxf code %d\n"
--msgstr "Código dxf %d desconhecido\n"
--
- #: ../plug-ins/dxf/dxf.c:50
- msgid "Drawing Interchange File import and export filters"
- msgstr "Filtros de importação e exportação para o formato DXF"
-@@ -5836,33 +6101,33 @@ msgstr "Filtro de exportação para Linguagem Gráfica HP"
- msgid "Libart based rendering"
- msgstr "Renderização baseada na Libart"
- 
--#: ../plug-ins/libart/export_png.c:165
-+#: ../plug-ins/libart/export_png.c:167
- msgid "Could not create PNG write structure"
- msgstr "Não foi possível criar a estrutura de gravação PNG"
- 
--#: ../plug-ins/libart/export_png.c:174
-+#: ../plug-ins/libart/export_png.c:176
- msgid "Could not create PNG header info structure"
- msgstr "Não foi possível criar a estrutura de informação de cabeçalho PNG"
- 
--#: ../plug-ins/libart/export_png.c:182
-+#: ../plug-ins/libart/export_png.c:184
- msgid "Error occurred while writing PNG"
- msgstr "Erro durante a gravação do arquivo PNG"
- 
- #. Create a dialog
--#: ../plug-ins/libart/export_png.c:322
-+#: ../plug-ins/libart/export_png.c:327
- msgid "PNG Export Options"
- msgstr "Opções de exportação PNG"
- 
--#: ../plug-ins/libart/export_png.c:328
-+#: ../plug-ins/libart/export_png.c:333
- msgid "Image width:"
- msgstr "Largura da imagem:"
- 
--#: ../plug-ins/libart/export_png.c:331
-+#: ../plug-ins/libart/export_png.c:336
- msgid "Image height:"
- msgstr "Altura da imagem:"
- 
- #
--#: ../plug-ins/libart/export_png.c:377
-+#: ../plug-ins/libart/export_png.c:382
- msgid "PNG (anti-aliased)"
- msgstr "PNG (anti-aliased)"
- 
-@@ -5870,11 +6135,11 @@ msgstr "PNG (anti-aliased)"
- msgid "gdk_renderer: Unsupported fill mode specified!\n"
- msgstr "gdk_renderer: O modo de preenchimento especificado não é suportado!\n"
- 
--#: ../plug-ins/libart/dialibartrenderer.c:1474
-+#: ../plug-ins/libart/dialibartrenderer.c:1476
- msgid "Renderer transformation"
- msgstr "Transformação do renderizador"
- 
--#: ../plug-ins/libart/dialibartrenderer.c:1475
-+#: ../plug-ins/libart/dialibartrenderer.c:1477
- msgid "Transform pointer"
- msgstr "Transformar ponteiro"
- 
-@@ -5919,11 +6184,11 @@ msgid "Select Printer"
- msgstr "Selecione a impressora"
- 
- #: ../plug-ins/postscript/paginate_psprint.c:285
--#: ../sheets/ciscocomputer.sheet.in.h:36
-+#: ../sheets/ciscocomputer.sheet.in.h:37
- msgid "Printer"
- msgstr "Impressora"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
- msgid "File"
- msgstr "Arquivo"
- 
-@@ -5931,22 +6196,22 @@ msgstr "Arquivo"
- msgid "OK"
- msgstr "OK"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:464
-+#: ../plug-ins/postscript/paginate_psprint.c:456
- #, c-format
- msgid "Could not run command '%s': %s"
- msgstr "Não foi possível executar o comando \"%s\": %s"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:467
-+#: ../plug-ins/postscript/paginate_psprint.c:459
- #, c-format
- msgid "Could not open '%s' for writing: %s"
- msgstr "Não foi possível abrir \"%s\" para escrita: %s"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:489
-+#: ../plug-ins/postscript/paginate_psprint.c:481
- #, c-format
- msgid "Printing error: command '%s' returned %d\n"
- msgstr "Erro de impressão: o comando \"%s\" retornou %d\n"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:500
-+#: ../plug-ins/postscript/paginate_psprint.c:492
- #, c-format
- msgid "Printing error: command '%s' caused sigpipe."
- msgstr "Erro de impressão: o comando \"%s\" causou um sigpipe."
-@@ -5979,7 +6244,7 @@ msgstr "Filtro de exportação para TeX Pstricks"
- msgid "TeX PSTricks macros"
- msgstr "Macros TeX PSTricks"
- 
--#: ../plug-ins/python/pydia-render.c:719
-+#: ../plug-ins/python/pydia-render.c:779
- #, c-format
- msgid "Couldn't open '%s' for writing.\n"
- msgstr "Não foi possível abrir \"%s\" para escrita.\n"
-@@ -5988,17 +6253,17 @@ msgstr "Não foi possível abrir \"%s\" para escrita.\n"
- msgid "Python scripting support"
- msgstr "Suporte aos scripts Python"
- 
--#: ../plug-ins/shape/shape-export.c:473
-+#: ../plug-ins/shape/shape-export.c:474
- msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
- msgstr ""
- "Os arquivos de forma devem terminar em .shape ou eles não poderão ser "
- "carregados pelo Dia"
- 
--#: ../plug-ins/shape/shape-export.c:484
--msgid "Can't export png without libart!"
--msgstr "Não é possível exportar para PNG sem a libart!"
-+#: ../plug-ins/shape/shape-export.c:488
-+msgid "Can't export png icon without export plug-in!"
-+msgstr "Não é possível exportar para PNG sem um plug-in de exportação!"
- 
--#: ../plug-ins/shape/shape-export.c:509
-+#: ../plug-ins/shape/shape-export.c:512
- msgid "Dia Shape File"
- msgstr "Arquivo de formas do Dia"
- 
-@@ -6006,7 +6271,7 @@ msgstr "Arquivo de formas do Dia"
- msgid "dia shape export filter"
- msgstr "filtro de exportação para formas do Dia"
- 
--#: ../plug-ins/svg/svg-import.c:238
-+#: ../plug-ins/svg/svg-import.c:258
- msgid ""
- "Invalid path data.\n"
- "svg:path data must start with moveto."
-@@ -6014,11 +6279,11 @@ msgstr ""
- "Dados de caminho inválidos.\n"
- "Dados svg:path devem começar com moveto."
- 
--#: ../plug-ins/svg/svg-import.c:734
-+#: ../plug-ins/svg/svg-import.c:806
- msgid "Expected SVG Namespace not found in file"
- msgstr "O espaço de nomes SVG esperado não foi encontrado no arquivo"
- 
--#: ../plug-ins/svg/svg-import.c:754
-+#: ../plug-ins/svg/svg-import.c:826
- #, c-format
- msgid "root element was '%s' -- expecting 'svg'."
- msgstr "o elemento raiz era \"%s\" -- esperava-se \"svg\"."
-@@ -6033,53 +6298,53 @@ msgstr ""
- msgid "Couldn't read file %s"
- msgstr "Não foi possível ler o arquivo %s"
- 
--#: ../plug-ins/vdx/vdx-export.c:1905
-+#: ../plug-ins/vdx/vdx-export.c:1912
- msgid "Visio XML format"
- msgstr "Formato XML do Visio"
- 
--#: ../plug-ins/vdx/vdx-import.c:219 ../plug-ins/xfig/xfig-import.c:1046
-+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
- #, c-format
- msgid "Couldn't read color: %s\n"
- msgstr "Não foi possível ler a cor: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:513
-+#: ../plug-ins/vdx/vdx-import.c:541
- #, c-format
- msgid "Couldn't find shape %d\n"
- msgstr "Não foi possível localizar a forma %d\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:987
-+#: ../plug-ins/vdx/vdx-import.c:1047
- #, c-format
- msgid "Unexpected Ellipse object: %s\n"
- msgstr "Objeto de elipse inesperado: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1001
-+#: ../plug-ins/vdx/vdx-import.c:1061
- msgid "Can't rotate ellipse\n"
- msgstr "Não foi possível girar a elipse\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1317
-+#: ../plug-ins/vdx/vdx-import.c:1392
- msgid "MoveTo not at start of Bezier\n"
- msgstr "MoveTo não está no início do Bezier\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1650
-+#: ../plug-ins/vdx/vdx-import.c:1740
- msgid "Invalid NURBS formula"
- msgstr "Fórmula NURBS inválida"
- 
--#: ../plug-ins/vdx/vdx-import.c:1886
-+#: ../plug-ins/vdx/vdx-import.c:1984
- #, c-format
- msgid "Couldn't write file %s"
- msgstr "Não foi possível gravar o arquivo %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:1971 ../plug-ins/vdx/vdx-import.c:1984
-+#: ../plug-ins/vdx/vdx-import.c:2069 ../plug-ins/vdx/vdx-import.c:2082
- #, c-format
- msgid "Couldn't handle foreign object type %s"
- msgstr "Não foi possível manipular o objeto externo %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:2012
-+#: ../plug-ins/vdx/vdx-import.c:2110
- #, c-format
- msgid "Couldn't make object dir %s"
- msgstr "Não foi possível criar o diretório de objeto %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:2959
-+#: ../plug-ins/vdx/vdx-import.c:3100
- msgid "Visio XML File Format"
- msgstr "Formato de arquivo XML do Visio"
- 
-@@ -6097,7 +6362,7 @@ msgstr "Não foi possível gravar o objeto %u"
- msgid "Visio XML Format import and export filter"
- msgstr "Filtro de importação e exportação do formato XML do Visio"
- 
--#: ../plug-ins/wmf/wmf.cpp:506
-+#: ../plug-ins/wmf/wmf.cpp:499
- #, c-format
- msgid ""
- "Can not render unknown font:\n"
-@@ -6106,24 +6371,24 @@ msgstr ""
- "Não foi possível renderizar a fonte desconhecida:\n"
- "%s"
- 
--#: ../plug-ins/wmf/wmf.cpp:1265
-+#: ../plug-ins/wmf/wmf.cpp:1258
- #, c-format
- msgid "Couldn't open: '%s' for writing.\n"
- msgstr "Não foi possível abrir \"%s\" para escrita.\n"
- 
--#: ../plug-ins/wmf/wmf.cpp:1364
-+#: ../plug-ins/wmf/wmf.cpp:1357
- msgid "Windows Meta File"
- msgstr "Windows Meta File"
- 
--#: ../plug-ins/wmf/wmf.cpp:1373
-+#: ../plug-ins/wmf/wmf.cpp:1366
- msgid "Enhanced Meta File"
- msgstr "Enhanced Meta File"
- 
--#: ../plug-ins/wmf/wmf.cpp:1395
-+#: ../plug-ins/wmf/wmf.cpp:1388
- msgid "Print (GDI) ..."
- msgstr "Imprimir (GDI) ..."
- 
--#: ../plug-ins/wmf/wmf.cpp:1410
-+#: ../plug-ins/wmf/wmf.cpp:1403
- msgid "WMF export filter"
- msgstr "Filtro de exportação para WMF"
- 
-@@ -6140,16 +6405,16 @@ msgstr "WPG"
- msgid "WordPerfect Graphics export filter"
- msgstr "Filtro de exportação para gráficos do WordPerfect"
- 
--#: ../plug-ins/xfig/xfig-export.c:461
-+#: ../plug-ins/xfig/xfig-export.c:463
- #, c-format
- msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
- msgstr "Formato FIG não possui seta com estilo %s, usando seta simples.\n"
- 
--#: ../plug-ins/xfig/xfig-export.c:484
-+#: ../plug-ins/xfig/xfig-export.c:486
- msgid "No more user-definable colors - using black"
- msgstr "Mais nenhuma cor definível pelo usuário - usando preto"
- 
--#: ../plug-ins/xfig/xfig-export.c:1205
-+#: ../plug-ins/xfig/xfig-export.c:1207
- msgid "XFig format"
- msgstr "Formato XFig"
- 
-@@ -6397,15 +6662,15 @@ msgstr ""
- "Nenhum arquivo de configuração válido encontrado para o plug-in XSLT, não "
- "carregando."
- 
--#: ../plug-ins/xslt/xsltdialog.c:96
-+#: ../plug-ins/xslt/xsltdialog.c:97
- msgid "Export through XSLT"
- msgstr "Exportar através de XSLT"
- 
--#: ../plug-ins/xslt/xsltdialog.c:111
-+#: ../plug-ins/xslt/xsltdialog.c:112
- msgid "From:"
- msgstr "De:"
- 
--#: ../plug-ins/xslt/xsltdialog.c:146
-+#: ../plug-ins/xslt/xsltdialog.c:147
- msgid "To:"
- msgstr "Para:"
- 
-@@ -6417,46 +6682,51 @@ msgstr "AADL"
- msgid "AADL Shapes"
- msgstr "Formas AADL"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
--msgstr "Barramento"
--
--#: ../sheets/AADL.sheet.in.h:5
--msgid "Device"
--msgstr "Dispositivo"
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
-+msgstr "Thread"
- 
- #: ../sheets/AADL.sheet.in.h:6
-+msgid "Processor"
-+msgstr "Processador"
-+
-+#: ../sheets/AADL.sheet.in.h:7
- msgid "Memory"
- msgstr "Memória"
- 
--#: ../sheets/AADL.sheet.in.h:7
--msgid "Package"
--msgstr "Pacote"
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Barramento"
- 
- #: ../sheets/AADL.sheet.in.h:9
--msgid "Processor"
--msgstr "Processador"
-+msgid "System"
-+msgstr "Sistema"
- 
- #: ../sheets/AADL.sheet.in.h:10
- msgid "Subprogram"
- msgstr "Subprograma"
- 
- #: ../sheets/AADL.sheet.in.h:11
--msgid "System"
--msgstr "Sistema"
-+msgid "Thread Group"
-+msgstr "Grupo de threads"
- 
- #: ../sheets/AADL.sheet.in.h:12
--msgid "Thread"
--msgstr "Thread"
-+msgid "Device"
-+msgstr "Dispositivo"
- 
- #: ../sheets/AADL.sheet.in.h:13
--msgid "Thread Group"
--msgstr "Grupo de threads"
-+msgid "Package"
-+msgstr "Pacote"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Variados"
- 
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
-+#: ../sheets/Assorted.sheet.in.h:6
- msgid ""
- "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
- "Geometric Shapes"
-@@ -6464,562 +6734,557 @@ msgstr ""
- "Uma coleção variada de polígonos, curvas de Bézier e outras formas "
- "geométricas variadas"
- 
--#. Please talk to me before making any changes to this sheet
--#: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Variados"
--
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "Chevron"
-+msgid "Right angle triangle"
-+msgstr "Triângulo retângulo"
- 
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Estrela de oito pontas arredondadas"
-+msgid "Isoceles triangle"
-+msgstr "Triângulo isósceles"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Estrela de quatro pontas arredondadas"
-+msgid "Perfect square, height equals width"
-+msgstr "Quadrado perfeito, altura igual à largura"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Diamante"
-+msgid "Perfect circle"
-+msgstr "Círculo perfeito"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Seta para baixo"
-+msgid "Quarter circle"
-+msgstr "Quarto de círculo"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "Estrela de oito pontas"
-+msgid "Diamond"
-+msgstr "Diamante"
- 
- #: ../sheets/Assorted.sheet.in.h:13
--msgid "Five point star"
--msgstr "Estrela de cinco pontas"
-+msgid "Pentagon. Five sided shape"
-+msgstr "Pentágono. Forma de cinco lados"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Estrela de quatro pontas"
-+msgid "Hexagon. Six sided shape"
-+msgstr "Hexágono. Forma de seis lados"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Coração"
--
--#: ../sheets/Assorted.sheet.in.h:16
- msgid "Heptagon. Seven sided shape"
- msgstr "Heptágono. Forma de sete lados"
- 
--#: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Hexágono. Forma de seis lados"
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Octágono. Forma de oito lados"
- 
--#: ../sheets/Assorted.sheet.in.h:18
-+#: ../sheets/Assorted.sheet.in.h:17
- msgid "Horizontal parallelogram"
- msgstr "Paralelogramo horizontal"
- 
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Paralelogramo vertical"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Triângulo isósceles"
-+msgid "Trapezoid"
-+msgstr "Trapezóide"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Seta à esquerda"
-+msgid "Four point star"
-+msgstr "Estrela de quatro pontas"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Seta esquerda-direita"
-+msgid "Curved four point star"
-+msgstr "Estrela de quatro pontas arredondadas"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Seta esquerda-direita-acima"
-+msgid "Five point star"
-+msgstr "Estrela de cinco pontas"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Seta esquerda-acima"
-+msgid "Six point star"
-+msgstr "Estrela de seis pontas"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Cruz de malta"
-+msgid "Seven point star"
-+msgstr "Estrela de sete pontas"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "Seta chanfrada à esquerda"
-+msgid "Eight point star"
-+msgstr "Estrela de oito pontas"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "Seta chanfrada à direita"
-+msgid "Sharp eight point star"
-+msgstr "Estrela de oito pontas afiadas"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "Octágono. Forma de oito lados"
-+msgid "Curved eight point star"
-+msgstr "Estrela de oito pontas arredondadas"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "Seta de bloco pentagonal"
-+msgid "Swiss cross"
-+msgstr "Cruz suíça"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Pentágono. Forma de cinco lados"
-+msgid "Maltese cross"
-+msgstr "Cruz de malta"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Círculo perfeito"
-+msgid "Down arrow"
-+msgstr "Seta para baixo"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Quadrado perfeito, altura igual à largura"
-+msgid "Up arrow"
-+msgstr "Seta para cima"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Seta quádrupla"
-+msgid "Left arrow"
-+msgstr "Seta à esquerda"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "Quarto de círculo"
-+msgid "Right arrow"
-+msgstr "Seta à direita"
- 
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "Quarto de lua"
-+msgid "Notched left arrow"
-+msgstr "Seta chanfrada à esquerda"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Triângulo retângulo"
-+msgid "Notched right arrow"
-+msgstr "Seta chanfrada à direita"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Seta à direita"
-+msgid "Left-up arrow"
-+msgstr "Seta esquerda-acima"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Estrela de sete pontas"
-+msgid "Turn-up arrow"
-+msgstr "Seta esquerda-acima"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Estrela de oito pontas afiadas"
-+msgid "Left-right arrow"
-+msgstr "Seta esquerda-direita"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Estrela de seis pontas"
-+msgid "Up-down arrow"
-+msgstr "Seta acima-abaixo"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Sol"
-+msgid "Quad arrow"
-+msgstr "Seta quádrupla"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Cruz suíça"
-+msgid "Left-right-up arrow"
-+msgstr "Seta esquerda-direita-acima"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Trapezóide"
-+msgid "Up-down-left arrow"
-+msgstr "Seta acima-abaixo-esquerda"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--msgid "Turn-up arrow"
--msgstr "Seta esquerda-acima"
-+msgid "Pentagon block arrow"
-+msgstr "Seta de bloco pentagonal"
- 
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "Seta para cima"
-+msgid "Chevron"
-+msgstr "Chevron"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Seta acima-abaixo"
-+msgid "Heart"
-+msgstr "Coração"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Seta acima-abaixo-esquerda"
-+msgid "Sun"
-+msgstr "Sol"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "Paralelogramo vertical"
--
--#: ../sheets/BPMN.sheet.in.h:1
--msgid "Activity Looping"
--msgstr "Loop de atividade"
--
--#: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
--msgstr "Subprocessos Ad-Hoc em colapso"
-+msgid "Quarter moon"
-+msgstr "Quarto de lua"
- 
- #. For: anthonym
--#: ../sheets/BPMN.sheet.in.h:4
-+#: ../sheets/BPMN.sheet.in.h:2
- msgid "BPMN"
- msgstr "BPMN"
- 
--#: ../sheets/BPMN.sheet.in.h:5
-+#: ../sheets/BPMN.sheet.in.h:3
- msgid "Business Process Modeling Notation"
- msgstr ""
- "Business Process Modeling Notation (Notação de Modelagem de Processos de "
- "Negócio)"
- 
-+#: ../sheets/BPMN.sheet.in.h:4
-+msgid "Start Event"
-+msgstr "Evento inicial"
-+
-+#: ../sheets/BPMN.sheet.in.h:5
-+msgid "Start Event - Message"
-+msgstr "Evento inicial - mensagem"
-+
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
--msgstr "Subprocessos em colapso"
-+msgid "Start Event - Timer"
-+msgstr "Evento inicial - temporizador"
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
--msgstr "Subprocessos de compensação em colapso"
-+msgid "Start Event - Rule"
-+msgstr "Evento inicial - regra"
- 
- #: ../sheets/BPMN.sheet.in.h:8
--msgid "Compensation Task"
--msgstr "Tarefa de compensação"
-+msgid "Start Event - Link"
-+msgstr "Evento inicial - link"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--msgid "Complex"
--msgstr "Complexo"
-+msgid "Start Event - Multiple"
-+msgstr "Evento inicial - múltiplo"
- 
- #: ../sheets/BPMN.sheet.in.h:10
--msgid "Data Object"
--msgstr "Objeto de dados"
-+msgid "Intermediate Event"
-+msgstr "Evento intermediário"
- 
- #: ../sheets/BPMN.sheet.in.h:11
--msgid "End Event"
--msgstr "Evento final"
-+msgid "Intermediate Event - Message"
-+msgstr "Evento intermediário - mensagem"
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
--msgstr "Evento final - cancelar"
-+msgid "Intermediate Event - Timer"
-+msgstr "Evento intermediário - temporizador"
- 
- #: ../sheets/BPMN.sheet.in.h:13
--msgid "End Event - Compensation"
--msgstr "Evento final - compensação"
-+msgid "Intermediate Event - Error"
-+msgstr "Evento intermediário - erro"
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
--msgstr "Evento final - erro"
-+msgid "Intermediate Event - Cancel"
-+msgstr "Evento intermediário - cancelar"
- 
- #: ../sheets/BPMN.sheet.in.h:15
--msgid "End Event - Link"
--msgstr "Evento final - link"
-+msgid "Intermediate Event - Compensation"
-+msgstr "Evento intermediário - compensação"
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
--msgstr "Evento final - mensagem"
-+msgid "Intermediate Event - Rule"
-+msgstr "Evento intermediário - regra"
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
--msgstr "Evento final - múltiplo"
-+msgid "Intermediate Event - Link"
-+msgstr "Evento intermediário - vínculo"
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
--msgstr "Evento final - terminar"
-+msgid "Intermediate Event - Multiple"
-+msgstr "Evento intermediário - múltiplo"
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
--msgstr "Dados baseados em exclusividade (XOR)"
-+msgid "End Event"
-+msgstr "Evento final"
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
--msgstr "Eventos baseados em exclusividade (XOR)"
-+msgid "End Event - Message"
-+msgstr "Evento final - mensagem"
- 
- #: ../sheets/BPMN.sheet.in.h:21
--msgid "Gateway"
--msgstr "Gateway"
-+msgid "End Event - Error"
-+msgstr "Evento final - erro"
- 
- #: ../sheets/BPMN.sheet.in.h:22
--msgid "Group"
--msgstr "Grupo"
-+msgid "End Event - Cancel"
-+msgstr "Evento final - cancelar"
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
--msgstr "Inclusivo (OR)"
-+msgid "End Event - Compensation"
-+msgstr "Evento final - compensação"
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr "Evento intermediário"
-+msgid "End Event - Link"
-+msgstr "Evento final - link"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
--msgstr "Evento intermediário - cancelar"
-+msgid "End Event - Multiple"
-+msgstr "Evento final - múltiplo"
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
--msgstr "Evento intermediário - compensação"
-+msgid "End Event - Terminate"
-+msgstr "Evento final - terminar"
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
--msgstr "Evento intermediário - erro"
-+msgid "Gateway"
-+msgstr "Gateway"
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
--msgstr "Evento intermediário - vínculo"
-+msgid "Exclusive (XOR) Data Based"
-+msgstr "Dados baseados em exclusividade (XOR)"
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
--msgstr "Evento intermediário - mensagem"
-+msgid "Exclusive (XOR) Event Based"
-+msgstr "Eventos baseados em exclusividade (XOR)"
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
--msgstr "Evento intermediário - múltiplo"
-+msgid "Inclusive (OR)"
-+msgstr "Inclusivo (OR)"
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
--msgstr "Evento intermediário - regra"
-+msgid "Complex"
-+msgstr "Complexo"
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr "Evento intermediário - temporizador"
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
--msgstr "Loop de subprocessos em colapso"
-+msgid "Parallel (AND)"
-+msgstr "Paralelo (AND)"
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
--msgstr "Subprocessos em colapso de múltiplas instâncias"
-+msgid "Activity Looping"
-+msgstr "Loop de atividade"
- 
- #: ../sheets/BPMN.sheet.in.h:35
- msgid "Multiple Instance Task"
- msgstr "Tarefa de múltiplas instâncias"
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
--msgstr "Paralelo (AND)"
-+msgid "Compensation Task"
-+msgstr "Tarefa de compensação"
- 
- #: ../sheets/BPMN.sheet.in.h:37
--msgid "Start Event"
--msgstr "Evento inicial"
-+msgid "Collapsed Sub-Process"
-+msgstr "Subprocessos em colapso"
- 
- #: ../sheets/BPMN.sheet.in.h:38
--msgid "Start Event - Link"
--msgstr "Evento inicial - link"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr "Loop de subprocessos em colapso"
- 
- #: ../sheets/BPMN.sheet.in.h:39
--msgid "Start Event - Message"
--msgstr "Evento inicial - mensagem"
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr "Subprocessos em colapso de múltiplas instâncias"
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
--msgstr "Evento inicial - múltiplo"
-+msgid "Ad-Hoc Collapsed Sub-Process"
-+msgstr "Subprocessos Ad-Hoc em colapso"
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
--msgstr "Evento inicial - regra"
-+msgid "Compensation Collapsed Sub-Process"
-+msgstr "Subprocessos de compensação em colapso"
- 
- #: ../sheets/BPMN.sheet.in.h:42
--msgid "Start Event - Timer"
--msgstr "Evento inicial - temporizador"
--
--#: ../sheets/BPMN.sheet.in.h:44
--msgid "Text Annotation"
--msgstr "Anotação textual"
-+msgid "Group"
-+msgstr "Grupo"
- 
--#: ../sheets/BPMN.sheet.in.h:45
-+#: ../sheets/BPMN.sheet.in.h:43
- msgid "Transaction"
- msgstr "Transação"
- 
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
--msgstr "Gerador AC"
-+#: ../sheets/BPMN.sheet.in.h:44
-+msgid "Data Object"
-+msgstr "Objeto de dados"
-+
-+#: ../sheets/BPMN.sheet.in.h:45
-+msgid "Text Annotation"
-+msgstr "Anotação textual"
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--msgid "Air Cooler"
--msgstr "Resfriador de ar"
-+msgid "ChemEng"
-+msgstr "Engenharia Química"
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
--msgstr "Autoclave"
-+msgid "Collection for chemical engineering"
-+msgstr "Coleção de Engenharia Química"
- 
- #: ../sheets/ChemEng.sheet.in.h:4
--msgid "Axial Flow Fan"
--msgstr "Ventilador de fluxo axial"
-+msgid "Fan or Stirrer"
-+msgstr "Ventilador ou agitador"
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--msgid "Basic Filter"
--msgstr "Filtro básico"
-+msgid "Spraying Device"
-+msgstr "Mecanismo de secagem"
- 
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
--msgstr "Ventilador ou bomba centrífuga"
-+msgid "Pneumatic Line"
-+msgstr "Linha pneumática"
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--msgid "Centrifuge"
--msgstr "Centrifugadora"
-+msgid "Pneumatic Line, vertical"
-+msgstr "Linha pneumática, vertical"
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--msgid "ChemEng"
--msgstr "Engenharia Química"
-+msgid "Simple Heat Exchanger"
-+msgstr "Trocador de calor simples"
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
--msgstr "Tanque clarificador ou de estabilização"
-+msgid "Simple Heat Exchanger, vertical"
-+msgstr "Trocador de calor simples, vertical"
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
--msgstr "Coleção de Engenharia Química"
-+msgid "Water Cooler"
-+msgstr "Resfriador de água"
- 
- #: ../sheets/ChemEng.sheet.in.h:12
--msgid "Compressor or Turbine"
--msgstr "Compressor ou turbina"
-+msgid "Water Cooler, vertical"
-+msgstr "Resfriador de água, vertical"
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--msgid "Covered tank"
--msgstr "Tanque coberto"
-+msgid "Fixed-Sheet Exchanger"
-+msgstr "Trocador de placa fixa"
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
--msgstr "Ciclone e hidrociclone"
-+msgid "Floating-Head or U-Tube Exchanger"
-+msgstr "Trocador de tubo U ou de cabeça flutuante"
- 
- #: ../sheets/ChemEng.sheet.in.h:15
--msgid "Double-Pipe Exchanger"
--msgstr "Trocador de tubulação dupla"
-+msgid "Kettle Reboiler"
-+msgstr "Caldeira de re-evaporação"
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
--msgstr "Ejetor ou injetor"
-+msgid "Air Cooler"
-+msgstr "Resfriador de ar"
- 
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
--msgstr "Ventilador ou agitador"
-+msgid "Forced-Flow Air Cooler"
-+msgstr "Resfriador de ar de fluxo forçado"
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
--msgstr "Trocador de placa fixa"
-+msgid "Induced-Flow Air Cooler"
-+msgstr "Resfriador de ar de fluxo induzido"
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
--msgstr "Trocador de tubo U ou de cabeça flutuante"
-+msgid "Plate Exchanger"
-+msgstr "Trocador de placas"
- 
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
--msgstr "Vaso de fluido de contato, simples"
-+msgid "Double-Pipe Exchanger"
-+msgstr "Trocador de tubulação dupla"
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
--msgstr "Resfriador de ar de fluxo forçado"
-+msgid "Heating/Cooling Coil"
-+msgstr "Serpentina de aquecimento/resfriamento"
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
--msgstr "Cilindro de gás, básico"
-+msgid "Heating/Cooling Coil, vertical"
-+msgstr "Serpentina de aquecimento/resfriamento, vertical"
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
--msgstr "Serpentina de aquecimento/resfriamento"
-+msgid "Simple Furnace"
-+msgstr "Forno simples"
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
--msgstr "Serpentina de aquecimento/resfriamento, vertical"
-+msgid "Simple Vessel"
-+msgstr "Vaso simples"
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
--msgstr "Resfriador de ar de fluxo induzido"
-+msgid "Knock-out Drum (with demister pad)"
-+msgstr "Cilindro rotativo (com desembaçador)"
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
--msgstr "Caldeira de re-evaporação"
-+msgid "Tray Column, simple"
-+msgstr "Coluna Tray, simples"
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
--msgstr "Cilindro rotativo (com desembaçador)"
-+msgid "Tray Column, detailed"
-+msgstr "Coluna Tray, detalhada"
-+
-+#: ../sheets/ChemEng.sheet.in.h:28
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr "Vaso de fluido de contato, simples"
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--msgid "Mixer"
--msgstr "Misturador"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr "Reator ou vaso de absorção, simples"
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
--msgstr "Tanque aberto"
-+msgid "Autoclave"
-+msgstr "Autoclave"
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
--msgstr "Trocador de placas"
-+msgid "Open Tank"
-+msgstr "Tanque aberto"
- 
- #: ../sheets/ChemEng.sheet.in.h:32
--msgid "Pneumatic Line"
--msgstr "Linha pneumática"
-+msgid "Clarifier or Settling Tank"
-+msgstr "Tanque clarificador ou de estabilização"
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
--msgstr "Linha pneumática, vertical"
-+msgid "Sealed Tank"
-+msgstr "Tanque selado"
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
--msgstr "Compressor ou bomba rotativa de deslocamento positivo"
-+msgid "Covered tank"
-+msgstr "Tanque coberto"
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Pressure Relief Valve"
--msgstr "Válvula para alívio da pressão"
-+msgid "Tank with Fixed Roof"
-+msgstr "Tanque com cobertura fixa"
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reactor or Absorption Vessel, simple"
--msgstr "Reator ou vaso de absorção, simples"
-+msgid "Tank with Floating Roof"
-+msgstr "Tanque com cobertura flutuante"
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--msgid "Reciprocating Compressor or Pump"
--msgstr "Bomba ou compressor de reciprocação"
-+msgid "Storage Sphere"
-+msgstr "Esfera de armazenamento"
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--msgid "Regulable Valve"
--msgstr "Válvula regulável"
-+msgid "Gas Holder, basic"
-+msgstr "Cilindro de gás, básico"
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Regulable Valve, vertical"
--msgstr "Válvula regulável, vertical"
-+msgid "Centrifugal Pump or Fan"
-+msgstr "Ventilador ou bomba centrífuga"
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--msgid "Sealed Tank"
--msgstr "Tanque selado"
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr "Compressor ou bomba rotativa de deslocamento positivo"
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Furnace"
--msgstr "Forno simples"
-+msgid "Reciprocating Compressor or Pump"
-+msgstr "Bomba ou compressor de reciprocação"
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger"
--msgstr "Trocador de calor simples"
-+msgid "Axial Flow Fan"
-+msgstr "Ventilador de fluxo axial"
- 
- #: ../sheets/ChemEng.sheet.in.h:43
--msgid "Simple Heat Exchanger, vertical"
--msgstr "Trocador de calor simples, vertical"
-+msgid "Compressor or Turbine"
-+msgstr "Compressor ou turbina"
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Simple Vessel"
--msgstr "Vaso simples"
-+msgid "Ejector or Injector"
-+msgstr "Ejetor ou injetor"
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spray Drier"
--msgstr "Spray de secagem"
-+msgid "AC Generator"
-+msgstr "Gerador AC"
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--msgid "Spraying Device"
--msgstr "Mecanismo de secagem"
-+msgid "Valve"
-+msgstr "Válvula"
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Storage Sphere"
--msgstr "Esfera de armazenamento"
-+msgid "Valve, vertical"
-+msgstr "Válvula, vertical"
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Fixed Roof"
--msgstr "Tanque com cobertura fixa"
-+msgid "Regulable Valve"
-+msgstr "Válvula regulável"
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tank with Floating Roof"
--msgstr "Tanque com cobertura flutuante"
-+msgid "Regulable Valve, vertical"
-+msgstr "Válvula regulável, vertical"
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, detailed"
--msgstr "Coluna Tray, detalhada"
-+msgid "Basic Filter"
-+msgstr "Filtro básico"
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--msgid "Tray Column, simple"
--msgstr "Coluna Tray, simples"
-+msgid "Mixer"
-+msgstr "Misturador"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--msgid "Valve"
--msgstr "Válvula"
-+msgid "Cyclone and hydrocyclone"
-+msgstr "Ciclone e hidrociclone"
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--msgid "Valve, vertical"
--msgstr "Válvula, vertical"
-+msgid "Spray Drier"
-+msgstr "Spray de secagem"
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--msgid "Water Cooler"
--msgstr "Resfriador de água"
-+msgid "Centrifuge"
-+msgstr "Centrifugadora"
- 
- #: ../sheets/ChemEng.sheet.in.h:55
--msgid "Water Cooler, vertical"
--msgstr "Resfriador de água, vertical"
-+msgid "Pressure Relief Valve"
-+msgstr "Válvula para alívio da pressão"
- 
- #: ../sheets/Circuit.sheet.in.h:1
- msgid "Circuit"
-@@ -7030,304 +7295,304 @@ msgid "Components for circuit diagrams"
- msgstr "Componentes para diagramas de circuito"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "Ponto de terra"
-+msgid "Vertically aligned resistor"
-+msgstr "Resistor alinhado verticalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Jumper horizontal"
-+msgid "Horizontally aligned inductor"
-+msgstr "Indutor alinhado horizontalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "LED alinhado horizontalmente"
-+msgid "Vertically aligned inductor"
-+msgstr "Indutor alinhado verticalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Capacitor alinhado horizontalmente"
-+msgid "Horizontally aligned resistor"
-+msgstr "Resistor alinhado horizontalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Diodo alinhado horizontalmente"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Resistor alinhado verticalmente (europeu)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Fusível alinhado horizontalmente"
-+msgid "Horizontally aligned inductor (European)"
-+msgstr "Indutor alinhado horizontalmente (europeu)"
- 
- #: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Indutor alinhado horizontalmente"
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Indutor alinhado verticalmente (europeu)"
- 
- #: ../sheets/Circuit.sheet.in.h:10
--msgid "Horizontally aligned inductor (European)"
--msgstr "Indutor alinhado horizontalmente (europeu)"
-+msgid "Horizontally aligned resistor (European)"
-+msgstr "Resistor alinhado horizontalmente (europeu)"
- 
- #: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Fonte de energia alinhada horizontalmente"
-+msgid "Horizontally aligned capacitor"
-+msgstr "Capacitor alinhado horizontalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Resistor alinhado horizontalmente"
--
--#: ../sheets/Circuit.sheet.in.h:13
--msgid "Horizontally aligned resistor (European)"
--msgstr "Resistor alinhado horizontalmente (europeu)"
--
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Diodo zener alinhado horizontalmente"
-+msgid "Vertically aligned capacitor"
-+msgstr "Capacitor alinhado verticalmente"
- 
-+#.
-+#.
- #: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Lâmpada"
--
--#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Microfone"
--
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "Transistor NMOS"
-+msgid "NPN bipolar transistor"
-+msgstr "Transistor bipolar NPN"
- 
- #.
- #.
-+#: ../sheets/Circuit.sheet.in.h:18
-+msgid "PNP bipolar transistor"
-+msgstr "Transistor bipolar PNP"
-+
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Diodo alinhado horizontalmente"
-+
- #: ../sheets/Circuit.sheet.in.h:20
--msgid "NPN bipolar transistor"
--msgstr "Transistor bipolar NPN"
-+msgid "Vertically aligned diode"
-+msgstr "Diodo alinhado verticalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Amplificador operacional"
-+msgid "Horizontally aligned zener diode"
-+msgstr "Diodo zener alinhado horizontalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "Transistor PMOS"
-+msgid "Vertically aligned zener diode"
-+msgstr "Diodo zener alinhado verticalmente"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Ponto de terra"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Amplificador operacional"
- 
--#.
--#.
- #: ../sheets/Circuit.sheet.in.h:25
--msgid "PNP bipolar transistor"
--msgstr "Transistor bipolar PNP"
-+msgid "Horizontally aligned fuse"
-+msgstr "Fusível alinhado horizontalmente"
- 
--#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Auto-falante"
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "Fusível alinhado verticalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "LED alinhado verticalmente"
-+msgid "Horizontally aligned powersource"
-+msgstr "Fonte de energia alinhada horizontalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "Capacitor alinhado verticalmente"
-+msgid "Vertically aligned powersource"
-+msgstr "Fonte de energia alinhada verticalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "Diodo alinhado verticalmente"
-+msgid "Lamp"
-+msgstr "Lâmpada"
- 
--#: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "Fusível alinhado verticalmente"
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Auto-falante"
- 
--#: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "Indutor alinhado verticalmente"
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Microfone"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "Indutor alinhado verticalmente (europeu)"
-+msgid "Horizontally aligned LED"
-+msgstr "LED alinhado horizontalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "Fonte de energia alinhada verticalmente"
-+msgid "Vertically aligned LED"
-+msgstr "LED alinhado verticalmente"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "Resistor alinhado verticalmente"
-+msgid "NMOS transistor"
-+msgstr "Transistor NMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "Resistor alinhado verticalmente (europeu)"
-+msgid "PMOS transistor"
-+msgstr "Transistor PMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "Diodo zener alinhado verticalmente"
-+msgid "Horizontal jumper"
-+msgstr "Jumper horizontal"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "Contato ladder \"se não\" (normalmente fechado)"
-+msgid "Ladder"
-+msgstr "Ladder - diagrama de contatos"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "Contato ladder \"se\" (normalmente aberto)"
-+msgid "Components for LADDER circuits"
-+msgstr "Componentes para circuitos LADDER"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "Variável de saída \"jump\""
-+msgid "'if' (normally open) ladder contact"
-+msgstr "Contato ladder \"se\" (normalmente aberto)"
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "Variável de saída \"reset\""
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "Contato ladder \"se não\" (normalmente fechado)"
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "Variável de saída \"set\""
-+msgid "Simple output variable"
-+msgstr "Variável de saída simples"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Componentes para circuitos LADDER"
-+msgid "Negative output variable"
-+msgstr "Variável de saída negativa"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Ladder - diagrama de contatos"
-+msgid "'set' output variable"
-+msgstr "Variável de saída \"set\""
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "Variável de saída negativa"
-+msgid "'reset' output variable"
-+msgstr "Variável de saída \"reset\""
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Variável de saída \"reset\" com economia de energia"
-+msgid "'jump' output variable"
-+msgstr "Variável de saída \"jump\""
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Variável de saída \"set\" com economia de energia"
-+msgid "Receptivity output variable"
-+msgstr "Variável de saída de receptividade"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Variável de saída negativa com economia de energia"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Variável de saída simples com economia de energia"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Variável de saída negativa com economia de energia"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "Variável de saída de receptividade"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Variável de saída \"set\" com economia de energia"
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Variável de saída simples"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Variável de saída \"reset\" com economia de energia"
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr "Fator constante abaixo de -1"
-+msgid "Cybernetics"
-+msgstr "Cibernética"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
--msgstr "Fator constante entre 0 e -1"
-+msgid "Elements of cybernetic circuits"
-+msgstr "Componentes para circuitos cibernéticos"
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
--msgstr "Fator constante entre 0 e 1"
-+msgid "Sensor - left"
-+msgstr "Sensor - esquerda"
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
--msgstr "Fator constante maior que 1"
-+msgid "Sensor - right"
-+msgstr "Sensor - direita"
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
--msgstr "Mudança negativa de constante no eixo y"
-+msgid "Sensor - bottom"
-+msgstr "Sensor - inferior"
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
--msgstr "Mudança positiva de constante no eixo y"
-+msgid "Sensor - top"
-+msgstr "Sensor - superior"
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
--msgstr "Cibernética"
-+msgid "Sum, subtracting left input"
-+msgstr "Soma, subtraindo entrada da esquerda"
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--msgid "Elements of cybernetic circuits"
--msgstr "Componentes para circuitos cibernéticos"
-+msgid "Sum, subtracting right input"
-+msgstr "Soma, subtraindo entrada da direita"
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
--msgstr "Retificador de onda completa (valor absoluto)"
-+msgid "Sum, subtracting bottom input"
-+msgstr "Soma, subtraindo entrada inferior"
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
--msgstr "Retificador de meia onda ou rampa de entrada"
-+msgid "Sum, subtracting top input"
-+msgstr "Soma, subtraindo entrada superior"
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
--msgstr "Filtro de passagem alta"
--
--#: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
--msgstr "Integrador - entrada inferior"
--
--#: ../sheets/Cybernetics.sheet.in.h:13
- msgid "Integrator - input left"
- msgstr "Integrador - entrada da esquerda"
- 
--#: ../sheets/Cybernetics.sheet.in.h:14
-+#: ../sheets/Cybernetics.sheet.in.h:12
- msgid "Integrator - input right"
- msgstr "Integrador - entrada direita"
- 
--#: ../sheets/Cybernetics.sheet.in.h:15
-+#: ../sheets/Cybernetics.sheet.in.h:13
-+msgid "Integrator - input bottom"
-+msgstr "Integrador - entrada inferior"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:14
- msgid "Integrator - input top"
- msgstr "Integrador - entrada superior"
- 
--#: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
--msgstr "Filtro de passagem baixa"
-+#: ../sheets/Cybernetics.sheet.in.h:15
-+msgid "Sum"
-+msgstr "Soma"
- 
--#: ../sheets/Cybernetics.sheet.in.h:17
-+#: ../sheets/Cybernetics.sheet.in.h:16
- msgid "Product"
- msgstr "Produto"
- 
-+#: ../sheets/Cybernetics.sheet.in.h:17
-+msgid "High pass filter"
-+msgstr "Filtro de passagem alta"
-+
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
--msgstr "Relay característico (sigma)"
-+msgid "Low pass filter"
-+msgstr "Filtro de passagem baixa"
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
--msgstr "Saturação característica"
-+msgid "Sine characteristic or input"
-+msgstr "Seno característico ou de entrada"
- 
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
--msgstr "Sensor - inferior"
-+msgid "Sigmoid characteristic"
-+msgstr "Sigmóide característico"
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
--msgstr "Sensor - esquerda"
-+msgid "Saturation characteristic"
-+msgstr "Saturação característica"
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
--msgstr "Sensor - direita"
-+msgid "Relay characteristic (sigma)"
-+msgstr "Relay característico (sigma)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
--msgstr "Sensor - superior"
-+msgid "Half wave rectifier or ramp input"
-+msgstr "Retificador de meia onda ou rampa de entrada"
- 
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
--msgstr "Sigmóide característico"
-+msgid "Full wave rectifier (absolute value)"
-+msgstr "Retificador de onda completa (valor absoluto)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
--msgstr "Seno característico ou de entrada"
-+msgid "Constant positive shift on the y-axis"
-+msgstr "Mudança positiva de constante no eixo y"
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--msgid "Sum"
--msgstr "Soma"
-+msgid "Constant negative shift on the y-axis"
-+msgstr "Mudança negativa de constante no eixo y"
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
--msgstr "Soma, subtraindo entrada inferior"
-+msgid "Constant factor greater 1"
-+msgstr "Fator constante maior que 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
--msgstr "Soma, subtraindo entrada da esquerda"
-+msgid "Constant factor between 0 and 1"
-+msgstr "Fator constante entre 0 e 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
--msgstr "Soma, subtraindo entrada da direita"
-+msgid "Constant factor between 0 and -1"
-+msgstr "Fator constante entre 0 e -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
--msgstr "Soma, subtraindo entrada superior"
-+msgid "Constant factor below -1"
-+msgstr "Fator constante abaixo de -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
- msgid "Template for custom characteristics"
-@@ -7338,329 +7603,323 @@ msgid "Time delay"
- msgstr "Tempo de espera"
- 
- #: ../sheets/Database.sheet.in.h:1
--msgid "Attribute compound"
--msgstr "Composição do atributo"
--
--#: ../sheets/Database.sheet.in.h:2
- msgid "Database"
- msgstr "Banco de dados"
- 
--#: ../sheets/Database.sheet.in.h:3
-+#: ../sheets/Database.sheet.in.h:2
- msgid "Editor for Database Table Relation Diagrams"
- msgstr ""
- "Editor para diagramas de relacionamentos para tabelas de bancos de dados"
- 
--#: ../sheets/ER.sheet.in.h:2
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr "Composição do atributo"
-+
-+#: ../sheets/ER.sheet.in.h:1
- msgid "ER"
- msgstr "ER"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
- msgstr "Editor para diagramas Entidade/Relacionamento"
- 
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Participação"
--
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr "Entidade fraca"
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Participação"
-+
- #: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Elétrico"
-+
-+#: ../sheets/Electric.sheet.in.h:2
- msgid "Components for electric circuits"
- msgstr "Componentes para circuitos elétricos"
- 
--#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "Ponto de conexão"
--
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Elétrico"
-+msgid "Normally open contact (horizontal)"
-+msgstr "Um contato normalmente aberto (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
--msgstr "Uma lâmpada ou indicador de luz (horizontal)"
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Um contato normalmente fechado (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
--msgstr "Uma lâmpada ou indicador de luz (vertical)"
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Um interruptor normalmente aberto (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
--msgstr "Um contato normalmente fechado (horizontal)"
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Um interruptor normalmente fechado (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
--msgstr "Um contato normalmente fechado (vertical)"
-+msgid "Normally open contact (vertical)"
-+msgstr "Um contato normalmente aberto (vertical)"
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
--msgstr "Um interruptor normalmente fechado (horizontal)"
-+msgid "Normally closed contact (vertical)"
-+msgstr "Um contato normalmente fechado (vertical)"
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
--msgstr "Um interruptor normalmente fechado (vertical)"
-+msgid "Normally open position switch (vertical)"
-+msgstr "Um interruptor normalmente aberto (vertical)"
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
--msgstr "Um contato normalmente aberto (horizontal)"
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Um interruptor normalmente fechado (vertical)"
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
--msgstr "Um contato normalmente aberto (vertical)"
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "O órgão de comando de um relé (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
--msgstr "Um interruptor normalmente aberto (horizontal)"
-+msgid "Relay (horizontal)"
-+msgstr "Relé (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
--msgstr "Um interruptor normalmente aberto (vertical)"
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Uma lâmpada ou indicador de luz (horizontal)"
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
--msgstr "Relé (horizontal)"
-+msgid "The command organ of a relay (vertical)"
-+msgstr "O órgão de comando de um relé (vertical)"
- 
- #: ../sheets/Electric.sheet.in.h:15
- msgid "Relay (vertical)"
- msgstr "Relé (vertical)"
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
--msgstr "O órgão de comando de um relé (horizontal)"
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Uma lâmpada ou indicador de luz (vertical)"
- 
--#: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr "O órgão de comando de um relé (vertical)"
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "Ponto de conexão"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Editor para diagramas de estrutura funcional."
--
--#: ../sheets/FS.sheet.in.h:2
- msgid "FS"
- msgstr "Estrutura funcional"
- 
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Editor para diagramas de estrutura funcional."
-+
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr "Fluxo"
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Função"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr "Fluxo de polilinha ortogonal"
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Função"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Ordenar"
-+msgid "Objects to draw flowcharts"
-+msgstr "Objetos para desenhar fluxogramas"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "Conector"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Operação processo/auxiliar"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--msgid "Data source"
--msgstr "Origem dos dados"
-+msgid "Input/Output"
-+msgstr "Entrada/Saída"
- 
--#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Decisão"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Atraso"
-+msgid "Connector"
-+msgstr "Conector"
- 
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Documento"
-+msgid "Transaction file"
-+msgstr "Arquivo de transação"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:10
-+msgid "Off page connector"
-+msgstr "Conector fora de página"
- 
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Entrada/Saída"
-+msgid "Document"
-+msgstr "Documento"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Armazenamento interno"
-+msgid "Manual operation"
-+msgstr "Operação manual"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Disco magnético"
-+msgid "Preparation"
-+msgstr "Preparação"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Tambor magnético"
-+msgid "Manual input"
-+msgstr "Entrada manual"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Fita magnética"
-+msgid "Predefined process"
-+msgstr "Processos predefinidos"
- 
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Entrada manual"
-+msgid "Terminal Interrupt"
-+msgstr "Interruptor de terminal"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Operação manual"
-+msgid "Magnetic disk"
-+msgstr "Disco magnético"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "Mesclar"
-+msgid "Magnetic drum"
-+msgstr "Tambor magnético"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Objetos para desenhar fluxogramas"
-+msgid "Magnetic tape"
-+msgstr "Fita magnética"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Conector fora de página"
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Armazenamento interno"
- 
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "Armazenamento offline"
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Mesclar"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Ou"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Processos predefinidos"
-+msgid "Delay"
-+msgstr "Atraso"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Preparação"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Operação processo/auxiliar"
-+msgid "Summing junction"
-+msgstr "Combinação de saída"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Cartão perfurado"
-+msgid "Collate"
-+msgstr "Ordenar"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Fita perfurada"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Ordenar"
- 
--#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Ou"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Cartão perfurado"
-+
- #: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Combinação de saída"
-+msgid "Punched tape"
-+msgstr "Fita perfurada"
- 
- #: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "Interruptor de terminal"
-+msgid "Transmittal tape"
-+msgstr "Fita de transmissão"
- 
- #: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Arquivo de transação"
-+msgid "Offline storage"
-+msgstr "Armazenamento offline"
- 
- #: ../sheets/Flowchart.sheet.in.h:34
--msgid "Transmittal tape"
--msgstr "Fita de transmissão"
-+msgid "Data source"
-+msgstr "Origem dos dados"
- 
- #: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr "E vergente"
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
- 
- #: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Objetos para projetar gráficos GRAFCET"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Passo de chamada a subprograma de macro"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:9
- msgid "Action to associate to a step"
- msgstr "Ação para associar a um passo"
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
--msgid "Arc (upward)"
--msgstr "Arco (para cima)"
--
--#: ../sheets/GRAFCET.sheet.in.h:4
-+#: ../sheets/GRAFCET.sheet.in.h:10
- msgid "Condition (of an action)"
- msgstr "Condição (de uma ação)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr "Passo de chamada a subprograma de macro"
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "Transição"
- 
--#: ../sheets/GRAFCET.sheet.in.h:11
-+#: ../sheets/GRAFCET.sheet.in.h:12
- msgid "OR vergent"
- msgstr "OU vergente "
- 
--#: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Objetos para projetar gráficos GRAFCET"
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "E vergente"
- 
--#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
--msgid "Transition"
--msgstr "Transição"
-+#: ../sheets/GRAFCET.sheet.in.h:14
-+msgid "Arc (upward)"
-+msgstr "Arco (para cima)"
-+
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+msgid "Gane and Sarson"
-+msgstr "Gane e Sarson"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+msgid "Gane and Sarson DFD"
-+msgstr "DFD Gane e Sarson"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
- msgid "Alternate external entity"
- msgstr "Entidade externa alternativa"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
- msgid "Data store"
- msgstr "Armazenamento de dados"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
- msgid "External entity"
- msgstr "Entidade externa"
- 
--#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
--#: ../sheets/Gane_and_Sarson.sheet.in.h:5
--msgid "Gane and Sarson"
--msgstr "Gane e Sarson"
--
--#: ../sheets/Gane_and_Sarson.sheet.in.h:6
--msgid "Gane and Sarson DFD"
--msgstr "DFD Gane e Sarson"
--
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
--msgstr "Bloco 1, 2:4"
--
-+#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
--msgstr "Bloco 2, 2:8"
--
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
--msgstr "Bloco 3, 4:4"
-+msgid "Map, Isometric"
-+msgstr "Mapa, isométrico"
- 
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
--msgstr "Bloco 4, 4:8"
-+msgid "Isometric Directional Map Shapes"
-+msgstr "Formas do mapa direcional isométrico"
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
--msgstr "Bloco 5, 3:3"
-+msgid "Road Section"
-+msgstr "Seção de estrada"
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
--msgstr "Bloco 6, 4:6"
-+msgid "Long Straight Road Section"
-+msgstr "Seção de estrada reta longa"
- 
- #: ../sheets/IsometricMap.sheet.in.h:7
--msgid "Block 7"
--msgstr "Bloco 7"
-+msgid "Crossroads"
-+msgstr "Cruzamento"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
--msgstr "Carro 1, vista frontal"
-+msgid "T-Junction"
-+msgstr "Junção em T"
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
--msgstr "Carro 2, vista posterior"
-+msgid "Elevated Road"
-+msgstr "Pista elevada"
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
- msgid "Corner 1"
-@@ -7671,1456 +7930,1470 @@ msgid "Corner 2"
- msgstr "Canto 2"
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--msgid "Crossroads"
--msgstr "Cruzamento"
-+msgid "River"
-+msgstr "Rio"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
--msgstr "Pista elevada"
-+msgid "Roof1"
-+msgstr "Teto 1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--msgid "Factory"
--msgstr "Fábrica"
-+msgid "Block 1, 2:4"
-+msgstr "Bloco 1, 2:4"
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
--msgstr "Passarela de pedestres"
-+msgid "Block 2, 2:8"
-+msgstr "Bloco 2, 2:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
-+msgstr "Bloco 3, 4:4"
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
--msgstr "Formas do mapa direcional isométrico"
-+msgid "Block 4, 4:8"
-+msgstr "Bloco 4, 4:8"
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
--msgstr "Seção de estrada reta longa"
-+msgid "Block 5, 3:3"
-+msgstr "Bloco 5, 3:3"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
-+msgstr "Bloco 6, 4:6"
- 
--#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
--msgstr "Mapa, isométrico"
-+msgid "Block 7"
-+msgstr "Bloco 7"
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
--msgstr "Placa de mão única"
-+msgid "Factory"
-+msgstr "Fábrica"
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--msgid "River"
--msgstr "Rio"
-+msgid "Car 1, Front View"
-+msgstr "Carro 1, vista frontal"
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--msgid "Road Section"
--msgstr "Seção de estrada"
-+msgid "Car 2, Rear View"
-+msgstr "Carro 2, vista posterior"
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--msgid "Roof1"
--msgstr "Teto 1"
--
--#: ../sheets/IsometricMap.sheet.in.h:25
--msgid "T-Junction"
--msgstr "Junção em T"
--
--#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Train 1, angled downward"
- msgstr "Trem 1, vista lateral esquerda"
- 
--#: ../sheets/IsometricMap.sheet.in.h:27
-+#: ../sheets/IsometricMap.sheet.in.h:25
- msgid "Train 2, angled upward"
- msgstr "Trem 2, vista lateral direita"
- 
--#: ../sheets/IsometricMap.sheet.in.h:28
-+#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Tree 1"
- msgstr "�rvore 1"
- 
-+#: ../sheets/IsometricMap.sheet.in.h:27
-+msgid "Footbridge, Pedestrian Bridge"
-+msgstr "Passarela de pedestres"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:28
-+msgid "One Way Road Sign"
-+msgstr "Placa de mão única"
-+
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
--msgstr "Um agente i*"
-+msgid "RE-i*"
-+msgstr "RE-i*"
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr "Um vínculo de decomposição i*"
-+msgid "Objects to design i* diagrams"
-+msgstr "Objetos para projetar diagramas i*"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
--msgstr "Um vínculo de dependência i*"
-+msgid "An i* softgoal"
-+msgstr "Um objetivo fraco i*"
- 
- #: ../sheets/Istar.sheet.in.h:4
- msgid "An i* goal"
- msgstr "Uma meta i*"
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
--msgstr "Um vínculo de meios-fins i*"
-+msgid "An i* resource"
-+msgstr "Um recurso i*"
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
--msgstr "Uma contribuição negativa i*"
-+msgid "An i* task"
-+msgstr "Uma tarefa i*"
- 
- #: ../sheets/Istar.sheet.in.h:7
--msgid "An i* position"
--msgstr "Uma posição i*"
-+msgid "An i* unspecified actor"
-+msgstr "Um ator não especificado i*"
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
--msgstr "Uma contribuição positiva i*"
-+msgid "An i* agent"
-+msgstr "Um agente i*"
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
--msgstr "Um recurso i*"
-+msgid "An i* position"
-+msgstr "Uma posição i*"
- 
- #: ../sheets/Istar.sheet.in.h:10
- msgid "An i* role"
- msgstr "Uma regra i*"
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
--msgstr "Um objetivo fraco i*"
-+msgid "An i* unspecified link"
-+msgstr "Um vínculo não especificado i*"
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
--msgstr "Uma tarefa i*"
-+msgid "An i* positive contribution"
-+msgstr "Uma contribuição positiva i*"
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
--msgstr "Um ator não especificado i*"
-+msgid "An i* negative contribution"
-+msgstr "Uma contribuição negativa i*"
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
--msgstr "Um vínculo não especificado i*"
-+msgid "An i* dependency link"
-+msgstr "Um vínculo de dependência i*"
- 
- #: ../sheets/Istar.sheet.in.h:15
--msgid "Objects to design i* diagrams"
--msgstr "Objetos para projetar diagramas i*"
-+msgid "An i* decomposition link"
-+msgstr "Um vínculo de decomposição i*"
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
--msgstr "RE-i*"
-+msgid "An i* means-ends link"
-+msgstr "Um vínculo de meios-fins i*"
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
--msgstr "Um domínio Jackson designado"
-+msgid "RE-Jackson"
-+msgstr "RE-Jackson"
- 
- #: ../sheets/Jackson.sheet.in.h:2
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Objetos para projetar diagramas Jackson"
-+
-+#: ../sheets/Jackson.sheet.in.h:3
- msgid "A Jackson given domain"
- msgstr "Um domínio Jackson fornecido"
- 
--#: ../sheets/Jackson.sheet.in.h:3
-+#: ../sheets/Jackson.sheet.in.h:4
-+msgid "A Jackson designed domain"
-+msgstr "Um domínio Jackson designado"
-+
-+#: ../sheets/Jackson.sheet.in.h:5
- msgid "A Jackson machine domain"
- msgstr "Um domínio de máquina Jackson"
- 
--#: ../sheets/Jackson.sheet.in.h:4
-+#: ../sheets/Jackson.sheet.in.h:6
- msgid "A Jackson requirement"
- msgstr "Um requisito Jackson"
- 
--#: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
--msgstr "Um fenômeno de solicitação Jackson"
--
--#: ../sheets/Jackson.sheet.in.h:6
-+#: ../sheets/Jackson.sheet.in.h:7
- msgid "A Jackson shared phenomenon"
- msgstr "Um fenômeno compartilhado Jackson"
- 
--#: ../sheets/Jackson.sheet.in.h:7
--msgid "Objects to design Jackson diagrams"
--msgstr "Objetos para projetar diagramas Jackson"
--
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
--msgstr "RE-Jackson"
-+msgid "A Jackson requirement phenomenon"
-+msgstr "Um fenômeno de solicitação Jackson"
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
--msgstr "Um refinamento E KAOS"
-+msgid "RE-KAOS"
-+msgstr "RE-KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr "Um refinamento OU KAOS"
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Objetos para projetar diagramas KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--msgid "A KAOS agent"
--msgstr "Um agente KAOS"
-+msgid "A KAOS softgoal"
-+msgstr "Um objetivo fraco KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
--msgstr "Uma hipótese KAOS"
-+msgid "A KAOS goal"
-+msgstr "Uma meta KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
--msgstr "Um conflito binário KAOS"
-+msgid "A KAOS requirement"
-+msgstr "Um requisito KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
--msgstr "Uma folha \"capaz de\" do KAOS"
-+msgid "A KAOS assumption"
-+msgstr "Uma hipótese KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
--msgstr "Um refinamento completo E KAOS"
-+msgid "A KAOS obstacle"
-+msgstr "Um obstáculo KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
--msgstr "Um refinamento OU completo KAOS"
-+msgid "A KAOS AND refinement"
-+msgstr "Um refinamento E KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
--msgstr "Uma contribuição KAOS"
-+msgid "A KAOS complete AND refinement"
-+msgstr "Um refinamento completo E KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
--msgstr "Um vínculo de controle KAOS"
-+msgid "A KAOS OR refinement"
-+msgstr "Um refinamento OU KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
--msgstr "Uma meta KAOS"
-+msgid "A KAOS complete OR refinement"
-+msgstr "Um refinamento OU completo KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
--msgstr "Uma entrada KAOS"
-+msgid "A KAOS operationalization"
-+msgstr "Uma operacionalização KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
--msgstr "Um vínculo de monitoramento KAOS"
-+msgid "A KAOS contribution"
-+msgstr "Uma contribuição KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
--msgstr "Um obstáculo KAOS"
--
--#: ../sheets/KAOS.sheet.in.h:15
- msgid "A KAOS obstruction"
- msgstr "Uma obstrução KAOS"
- 
-+#: ../sheets/KAOS.sheet.in.h:15
-+msgid "A KAOS binary conflict"
-+msgstr "Um conflito binário KAOS"
-+
- #: ../sheets/KAOS.sheet.in.h:16
--msgid "A KAOS operation"
--msgstr "Uma operação KAOS"
-+msgid "A KAOS agent"
-+msgstr "Um agente KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
--msgstr "Uma operacionalização KAOS"
-+msgid "A KAOS responsibility"
-+msgstr "Uma responsabilidade KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
--msgstr "Uma saída KAOS"
-+msgid "A KAOS monitor link"
-+msgstr "Um vínculo de monitoramento KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
--msgstr "Uma execução KAOS"
-+msgid "A KAOS control link"
-+msgstr "Um vínculo de controle KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
--msgstr "Um requisito KAOS"
-+msgid "A KAOS capable-of"
-+msgstr "Uma folha \"capaz de\" do KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
--msgstr "Uma responsabilidade KAOS"
-+msgid "A KAOS performs"
-+msgstr "Uma execução KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
--msgstr "Um objetivo fraco KAOS"
-+msgid "A KAOS operation"
-+msgstr "Uma operação KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:23
--msgid "Objects to design KAOS diagrams"
--msgstr "Objetos para projetar diagramas KAOS"
-+msgid "A KAOS input"
-+msgstr "Uma entrada KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
--msgstr "RE-KAOS"
-+msgid "A KAOS output"
-+msgstr "Uma saída KAOS"
- 
- #: ../sheets/Lights.sheet.in.h:1
--msgid "ACL"
--msgstr "ACL"
-+msgid "Lights"
-+msgstr "Luzes"
- 
- #: ../sheets/Lights.sheet.in.h:2
--msgid "Black light"
--msgstr "Luz negra"
-+msgid "Objects to design simple lighting plots"
-+msgstr "Objetos para projetar gráficos simples de iluminação"
- 
- #: ../sheets/Lights.sheet.in.h:3
--msgid "Blinders"
--msgstr "Ofuscador"
-+msgid "PAR"
-+msgstr "PAR"
- 
- #: ../sheets/Lights.sheet.in.h:4
--msgid "Ellipsoidal Reflector Spotlight"
--msgstr "Holofote refletor elipsoidal"
-+msgid "PAR on the floor"
-+msgstr "PAR no chão"
- 
--# Tipo de lente inventada por Augustin-Jean Fresnel.
- #: ../sheets/Lights.sheet.in.h:5
--msgid "Fresel lantern"
--msgstr "Lente Fresnel"
-+msgid "ACL"
-+msgstr "ACL"
- 
- #: ../sheets/Lights.sheet.in.h:6
--msgid "Lights"
--msgstr "Luzes"
-+msgid "Pebble Convex lantern"
-+msgstr "Lente convexa de Pebble"
- 
-+# Tipo de lente inventada por Augustin-Jean Fresnel.
- #: ../sheets/Lights.sheet.in.h:7
--msgid "Moving head"
--msgstr "Cabeça móvel"
-+msgid "Fresel lantern"
-+msgstr "Lente Fresnel"
- 
- #: ../sheets/Lights.sheet.in.h:8
--msgid "Objects to design simple lighting plots"
--msgstr "Objetos para projetar gráficos simples de iluminação"
-+msgid "Striplight"
-+msgstr "Striplight"
- 
- #: ../sheets/Lights.sheet.in.h:9
--msgid "PAR"
--msgstr "PAR"
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr "Holofote refletor elipsoidal"
- 
- #: ../sheets/Lights.sheet.in.h:10
--msgid "PAR on the floor"
--msgstr "PAR no chão"
-+msgid "Blinders"
-+msgstr "Ofuscador"
- 
- #: ../sheets/Lights.sheet.in.h:11
--msgid "Pebble Convex lantern"
--msgstr "Lente convexa de Pebble"
-+msgid "Black light"
-+msgstr "Luz negra"
- 
--#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Scanner"
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr "Luz estroboscópica"
- 
- #: ../sheets/Lights.sheet.in.h:13
--msgid "Striplight"
--msgstr "Striplight"
-+msgid "Moving head"
-+msgstr "Cabeça móvel"
- 
--#: ../sheets/Lights.sheet.in.h:14
--msgid "Stroboscope light"
--msgstr "Luz estroboscópica"
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Scanner"
- 
- #: ../sheets/Lights.sheet.in.h:15
- msgid "Structure"
- msgstr "Estrutura"
- 
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "porta AND"
-+msgid "Logic"
-+msgstr "Lógica"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Lógica booleana"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr "Conector cruzado"
-+msgid "OR gate"
-+msgstr "Porta OR"
- 
--#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
--msgid "Inverter"
--msgstr "Inversor"
-+#: ../sheets/Logic.sheet.in.h:4
-+msgid "AND gate"
-+msgstr "porta AND"
- 
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Lógica"
-+msgid "XOR gate"
-+msgstr "Porta XOR"
- 
- #: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Buffer simples"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Inversor"
-+
-+#: ../sheets/Logic.sheet.in.h:8
- msgid "NAND gate"
- msgstr "Porta NAND"
- 
--#: ../sheets/Logic.sheet.in.h:7
-+#: ../sheets/Logic.sheet.in.h:9
- msgid "NOR gate"
- msgstr "Porta NOR"
- 
--#: ../sheets/Logic.sheet.in.h:8
-+#: ../sheets/Logic.sheet.in.h:10
- msgid "NOT"
- msgstr "NOT"
- 
--#: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "Porta OR"
--
--#: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Buffer simples"
--
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "Porta XOR"
-+msgid "Crossconnector"
-+msgstr "Conector cruzado"
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Demultiplexador"
-+msgid "MSE"
-+msgstr "MSE"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Nó de larga extensão"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr ""
-+"Componentes de equipamento móvel de comunicações do exército dos E.U.A."
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr "Nó central"
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "Multiplexador"
-+msgid "Large extension node"
-+msgstr "Nó de larga extensão"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr "Nó central"
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Nó de pequena extensão"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Terminal tático de comunicações via satélite"
- 
--#: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr ""
--"Componentes de equipamento móvel de comunicações do exército dos E.U.A."
--
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Pasta"
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplexador"
- 
--#: ../sheets/Misc.sheet.in.h:3
--msgid "Measure distance"
--msgstr "Medir distância"
-+#: ../sheets/MSE.sheet.in.h:8
-+msgid "Demultiplexer"
-+msgstr "Demultiplexador"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:1
- msgid "Misc"
- msgstr "Misc"
- 
--#: ../sheets/Misc.sheet.in.h:5
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Formas diversas"
- 
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "�rvore"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Pasta"
-+
- #: ../sheets/Misc.sheet.in.h:6
--msgid "New-style group object, for testing"
--msgstr "Novo estilo de objeto de grupo, para teste"
-+msgid "expensible node"
-+msgstr "Nó dispendioso"
- 
- #: ../sheets/Misc.sheet.in.h:7
--msgid "Traditional clock"
--msgstr "Relógio tradicional"
-+msgid "expended node"
-+msgstr "Nó expendido"
- 
- #: ../sheets/Misc.sheet.in.h:8
--msgid "Tree"
--msgstr "�rvore"
-+msgid "Traditional clock"
-+msgstr "Relógio tradicional"
- 
- #: ../sheets/Misc.sheet.in.h:9
--msgid "expended node"
--msgstr "Nó expendido"
-+msgid "Measure distance"
-+msgstr "Medir distância"
- 
- #: ../sheets/Misc.sheet.in.h:10
--msgid "expensible node"
--msgstr "Nó dispendioso"
-+msgid "Resizable grid"
-+msgstr "Grade redimensionável"
-+
-+#: ../sheets/Misc.sheet.in.h:11
-+msgid "New-style group object, for testing"
-+msgstr "Novo estilo de objeto de grupo, para teste"
- 
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "Distribuidor 2/2"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pneumático/Hidráulico"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "Distribuidor 3/2"
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Componentes para circuitos pneumáticos e hidráulicos"
- 
- #: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "Distribuidor 4/2"
-+msgid "Double-effect jack"
-+msgstr "Tomada de duplo efeito"
- 
- #: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "Distribuidor 5/2"
-+msgid "Normally-in simple-effect jack"
-+msgstr "Tomada de efeito simples de entrada"
- 
- #: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Orifício para saída de ar"
-+msgid "Normally-out simple-effect jack"
-+msgstr "Tomada de efeito simples de saída"
- 
- #: ../sheets/Pneumatic.sheet.in.h:6
--msgid "Components for pneumatic and hydraulic circuits"
--msgstr "Componentes para circuitos pneumáticos e hidráulicos"
-+msgid "Generic pressure source"
-+msgstr "Fonte de pressão genérica"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Fonte de pressão hidráulica"
- 
- #: ../sheets/Pneumatic.sheet.in.h:8
--msgid "Double-effect jack"
--msgstr "Tomada de duplo efeito"
-+msgid "Pneumatic pressure source"
-+msgstr "Fonte de pressão pneumática"
- 
- #: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Comando elétrico (mola dupla)"
-+msgid "Air exhaust orifice"
-+msgstr "Orifício para saída de ar"
- 
- #: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Comando elétrico (mola única)"
-+msgid "2/2 distributor"
-+msgstr "Distribuidor 2/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:11
--msgid "Generic pressure source"
--msgstr "Fonte de pressão genérica"
-+msgid "3/2 distributor"
-+msgstr "Distribuidor 3/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:12
--msgid "Hydraulic pressure source"
--msgstr "Fonte de pressão hidráulica"
-+msgid "4/2 distributor"
-+msgstr "Distribuidor 4/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "Comando indireto por condução hidráulica"
-+msgid "5/2 distributor"
-+msgstr "Distribuidor 5/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "Comando indireto por condução pneumática"
-+msgid "Muscular command"
-+msgstr "Comando muscular"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Comando mecânico por mola"
-+msgid "Push-button command"
-+msgstr "Comando de botão"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
- msgstr "Comando mecânico por alavanca"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Comando muscular"
-+msgid "Mechanical command by spring"
-+msgstr "Comando mecânico por mola"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Tomada de efeito simples de entrada"
-+msgid "Electric command (single coil)"
-+msgstr "Comando elétrico (mola única)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Tomada de efeito simples de saída"
-+msgid "Electric command (double coil)"
-+msgstr "Comando elétrico (mola dupla)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Fonte de pressão pneumática"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Comando indireto por condução hidráulica"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Pneumático/Hidráulico"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Comando de botão"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Comando indireto por condução pneumática"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Caixa de atividade/dados"
-+msgid "SADT/IDEF0"
-+msgstr "SADT/IDEF0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Seta de fluxo de atividade/dados"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Objetos para projetar diagramas SADT"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Rótulo de fluxo"
-+msgid "Activity/data flow arrow"
-+msgstr "Seta de fluxo de atividade/dados"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Objetos para projetar diagramas SADT"
-+msgid "Activity/data box"
-+msgstr "Caixa de atividade/dados"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT/IDEF0"
-+msgid "Flow label"
-+msgstr "Rótulo de fluxo"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Ação em execução"
-+msgid "SDL"
-+msgstr "SDL"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Linguagem de Especificação e Descrição."
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
- msgstr "Referência de tipo de bloco"
- 
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Referência de tipo de serviço"
-+
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Chamada de função"
-+msgid "Process type reference"
-+msgstr "Referência de tipo de processo"
-+
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Estado"
- 
--#: ../sheets/SDL.sheet.in.h:6
-+#: ../sheets/SDL.sheet.in.h:7
- msgid "Function header"
- msgstr "Cabeçalho de função"
- 
--#: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "Nota de texto genérica"
--
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "Conector de entrada/saída"
-+msgid "Send message"
-+msgstr "Enviar mensagem"
- 
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Retorno de procedimento"
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Receber mensagem"
- 
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Referência de tipo de processo"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Chamada de função"
- 
- #: ../sheets/SDL.sheet.in.h:12
--msgid "Receive message"
--msgstr "Receber mensagem"
-+msgid "Action being executed"
-+msgstr "Ação em execução"
- 
- #: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
--
--#: ../sheets/SDL.sheet.in.h:14
- msgid "Save state"
- msgstr "Salvar estado"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Enviar mensagem"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Referência de tipo de serviço"
-+msgid "In/Out connector"
-+msgstr "Conector de entrada/saída"
- 
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "Linguagem de Especificação e Descrição."
-+msgid "Procedure return"
-+msgstr "Retorno de procedimento"
- 
--#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "Estado"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Nota de texto genérica"
- 
- #: ../sheets/SISSI.sheet.in.h:1
--msgid "Air filter"
--msgstr "Filtro de ar"
-+msgid "Objects to design sissi diagrams"
-+msgstr "Objetos para projetar diagramas sissi"
- 
- #: ../sheets/SISSI.sheet.in.h:2
--msgid "Air quality detector"
--msgstr "Detector de qualidade do ar"
-+msgid "Workstation"
-+msgstr "Estação de trabalho"
- 
--#: ../sheets/SISSI.sheet.in.h:3
--msgid "Airconditioner"
--msgstr "Aparelho de ar condicionado"
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Banco de dados relacional"
- 
- #: ../sheets/SISSI.sheet.in.h:4
--msgid "Alarm center"
--msgstr "Centro de alarme"
-+msgid "Server"
-+msgstr "Servidor"
- 
--#: ../sheets/SISSI.sheet.in.h:5
--msgid "Axial Ventilator"
--msgstr "Ventilador axial"
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Laptop"
- 
--#: ../sheets/SISSI.sheet.in.h:6
--msgid "Backup"
--msgstr "Backup"
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "PDA"
- 
--#: ../sheets/SISSI.sheet.in.h:7
--msgid "Badge reader"
--msgstr "Leitor de emblema"
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Matriz de armazenamento"
- 
--#: ../sheets/SISSI.sheet.in.h:8
--msgid "Badge reader/keyboard"
--msgstr "Teclado/leitor de emblema"
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Roteador"
- 
--#: ../sheets/SISSI.sheet.in.h:9
--msgid "Biometric reader"
--msgstr "Leitor biométrico"
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Nuvem de rede"
- 
--#: ../sheets/SISSI.sheet.in.h:10
--msgid "Cell phone"
--msgstr "Telefone celular"
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefone"
- 
- #: ../sheets/SISSI.sheet.in.h:11
--msgid "Centrifugal Ventilator"
--msgstr "Ventilador de centrifugação"
-+msgid "Cell phone"
-+msgstr "Telefone celular"
- 
--#: ../sheets/SISSI.sheet.in.h:12
--msgid "Cipher machine"
--msgstr "Máquina criptográfica"
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Hub"
- 
--#: ../sheets/SISSI.sheet.in.h:13
--msgid "Circulation pump"
--msgstr "Bomba de circulação"
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
- 
- #: ../sheets/SISSI.sheet.in.h:14
--msgid "Condensator"
--msgstr "Condensador"
-+msgid "Cipher machine"
-+msgstr "Máquina criptográfica"
- 
- #: ../sheets/SISSI.sheet.in.h:15
--msgid "Current transducer"
--msgstr "Transdutor atual"
-+msgid "Magnetic storage"
-+msgstr "Armazenamento magnético"
- 
- #: ../sheets/SISSI.sheet.in.h:16
--msgid "Digital code"
--msgstr "Código digital"
-+msgid "Paper storage"
-+msgstr "Armazenamento em papel"
- 
- #: ../sheets/SISSI.sheet.in.h:17
--msgid "Enthalpy transducer"
--msgstr "Transdutor de entalpia"
--
--#: ../sheets/SISSI.sheet.in.h:18
--msgid "Extinguisher"
--msgstr "Extintor"
--
--#: ../sheets/SISSI.sheet.in.h:19
--msgid "Faraday cage"
--msgstr "Gaiola de Faraday"
-+msgid "Person"
-+msgstr "Pessoa"
- 
--#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
- msgid "File cabinet"
- msgstr "Gabinete de arquivo"
- 
--#: ../sheets/SISSI.sheet.in.h:21
--msgid "Gate"
--msgstr "Porta"
-+#: ../sheets/SISSI.sheet.in.h:19
-+msgid "Safe"
-+msgstr "Cofre"
-+
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
-+msgstr "Backup"
- 
- #: ../sheets/SISSI.sheet.in.h:22
--msgid "Geographic site"
--msgstr "Lugar geográfico"
-+msgid "Log analysis"
-+msgstr "Análise de log"
- 
- #: ../sheets/SISSI.sheet.in.h:23
--msgid "Glass-break sensor"
--msgstr "Sensor de quebra de vidro"
--
--#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "Hub"
-+msgid "Information system"
-+msgstr "Sistema de informação"
- 
--#: ../sheets/SISSI.sheet.in.h:25
-+#: ../sheets/SISSI.sheet.in.h:24
- msgid "Information"
- msgstr "Informação"
- 
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Aposento"
-+
- #: ../sheets/SISSI.sheet.in.h:26
--msgid "Information system"
--msgstr "Sistema de informação"
-+msgid "Faraday cage"
-+msgstr "Gaiola de Faraday"
- 
--#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Laptop"
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "�rea de segurança"
-+
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr "Lugar geográfico"
- 
- #: ../sheets/SISSI.sheet.in.h:29
--msgid "Level detector"
--msgstr "Detector de nível"
-+msgid "Gate"
-+msgstr "Porta"
- 
- #: ../sheets/SISSI.sheet.in.h:30
--msgid "Light detector"
--msgstr "Detector de luminosidade"
-+msgid "Video camera"
-+msgstr "Câmera de vídeo"
- 
- #: ../sheets/SISSI.sheet.in.h:31
--msgid "Log analysis"
--msgstr "Análise de log"
-+msgid "Glass-break sensor"
-+msgstr "Sensor de quebra de vidro"
- 
- #: ../sheets/SISSI.sheet.in.h:32
--msgid "Magnetic storage"
--msgstr "Armazenamento magnético"
-+msgid "Sensor beam"
-+msgstr "Feixe do sensor"
- 
--#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Modem"
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Condensador"
- 
- #: ../sheets/SISSI.sheet.in.h:34
--msgid "Moisture extractor"
--msgstr "Extrator de umidade"
-+msgid "Power transducer"
-+msgstr "Transdutor de energia"
- 
- #: ../sheets/SISSI.sheet.in.h:35
--msgid "Moisture sensor"
--msgstr "Sensor de umidade"
-+msgid "Current transducer"
-+msgstr "Transdutor atual"
- 
- #: ../sheets/SISSI.sheet.in.h:36
--msgid "Movement detector"
--msgstr "Detector de movimento"
-+msgid "Enthalpy transducer"
-+msgstr "Transdutor de entalpia"
- 
--#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Nuvem de rede"
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Detector de fumaça"
- 
- #: ../sheets/SISSI.sheet.in.h:38
--msgid "Objects to design sissi diagrams"
--msgstr "Objetos para projetar diagramas sissi"
-+msgid "Moisture sensor"
-+msgstr "Sensor de umidade"
- 
--#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "PDA"
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Detector de luminosidade"
- 
- #: ../sheets/SISSI.sheet.in.h:40
--msgid "Paper storage"
--msgstr "Armazenamento em papel"
-+msgid "Movement detector"
-+msgstr "Detector de movimento"
- 
- #: ../sheets/SISSI.sheet.in.h:41
--msgid "Person"
--msgstr "Pessoa"
-+msgid "Video movement detector"
-+msgstr "Detector de movimento em vídeo"
- 
- #: ../sheets/SISSI.sheet.in.h:42
--msgid "Power transducer"
--msgstr "Transdutor de energia"
-+msgid "Level detector"
-+msgstr "Detector de nível"
- 
- #: ../sheets/SISSI.sheet.in.h:43
- msgid "Pressure transducer"
- msgstr "Transdutor de pressão"
- 
- #: ../sheets/SISSI.sheet.in.h:44
--msgid "Pump"
--msgstr "Bomba"
-+msgid "Air quality detector"
-+msgstr "Detector de qualidade do ar"
- 
--#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr "Banco de dados relacional"
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Detector de voltagem"
- 
- #: ../sheets/SISSI.sheet.in.h:46
--msgid "Revolving door"
--msgstr "Porta giratória"
-+msgid "Vehicle detector"
-+msgstr "Detector de veículos"
- 
- #: ../sheets/SISSI.sheet.in.h:47
--msgid "Room"
--msgstr "Aposento"
-+msgid "Vibration sensor"
-+msgstr "Sensor de vibração"
- 
--#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "Roteador"
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Código digital"
- 
- #: ../sheets/SISSI.sheet.in.h:49
--msgid "Safe"
--msgstr "Cofre"
-+msgid "Moisture extractor"
-+msgstr "Extrator de umidade"
- 
- #: ../sheets/SISSI.sheet.in.h:50
--msgid "Security area"
--msgstr "�rea de segurança"
-+msgid "Air filter"
-+msgstr "Filtro de ar"
- 
- #: ../sheets/SISSI.sheet.in.h:51
--msgid "Sensor beam"
--msgstr "Feixe do sensor"
-+msgid "Badge reader/keyboard"
-+msgstr "Teclado/leitor de emblema"
- 
- #: ../sheets/SISSI.sheet.in.h:52
--msgid "Server"
--msgstr "Servidor"
-+msgid "Badge reader"
-+msgstr "Leitor de emblema"
- 
- #: ../sheets/SISSI.sheet.in.h:53
--msgid "Smoke detector"
--msgstr "Detector de fumaça"
-+msgid "Biometric reader"
-+msgstr "Leitor biométrico"
- 
--#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Matriz de armazenamento"
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "Bomba"
- 
--#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Telefone"
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr "Bomba de circulação"
-+
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr "Porta giratória"
- 
- #: ../sheets/SISSI.sheet.in.h:57
--msgid "Vehicle detector"
--msgstr "Detector de veículos"
-+msgid "Axial Ventilator"
-+msgstr "Ventilador axial"
- 
- #: ../sheets/SISSI.sheet.in.h:58
--msgid "Ventilator"
--msgstr "Ventilador"
-+msgid "Centrifugal Ventilator"
-+msgstr "Ventilador de centrifugação"
- 
- #: ../sheets/SISSI.sheet.in.h:59
--msgid "Vibration sensor"
--msgstr "Sensor de vibração"
-+msgid "Ventilator"
-+msgstr "Ventilador"
- 
- #: ../sheets/SISSI.sheet.in.h:60
--msgid "Video camera"
--msgstr "Câmera de vídeo"
--
--#: ../sheets/SISSI.sheet.in.h:61
--msgid "Video movement detector"
--msgstr "Detector de movimento em vídeo"
-+msgid "Extinguisher"
-+msgstr "Extintor"
- 
- #: ../sheets/SISSI.sheet.in.h:62
--msgid "Voltage detector"
--msgstr "Detector de voltagem"
-+msgid "Airconditioner"
-+msgstr "Aparelho de ar condicionado"
- 
- #: ../sheets/SISSI.sheet.in.h:63
--msgid "Workstation"
--msgstr "Estação de trabalho"
-+msgid "Alarm center"
-+msgstr "Centro de alarme"
- 
- #: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Atividade"
-+msgid "UML"
-+msgstr "UML"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "Agregação, uma classe é parte de outra"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Editor para diagramas de estruturas estáticas em UML"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "Associação, duas classes são associadas"
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Nota"
- 
- #: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr "�cone de estereótipo de classe"
-+msgid "Realizes, implements a specific interface"
-+msgstr "Realização, implementa uma interface específica"
- 
- #: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr "Componente"
-+msgid "Generalization, class inheritance"
-+msgstr "Generalização, herança de classe"
- 
- #: ../sheets/UML.sheet.in.h:9
--msgid "Constraint, place a constraint on something"
--msgstr "Restrição, colocar uma restrição em alguma coisa"
--
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "Editor para diagramas de estruturas estáticas em UML"
--
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Bifurcação/união"
-+msgid "Association, two classes are associated"
-+msgstr "Associação, duas classes são associadas"
- 
--#: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Generalização, herança de classe"
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Agregação, uma classe é parte de outra"
- 
--#: ../sheets/UML.sheet.in.h:17
-+#: ../sheets/UML.sheet.in.h:11
- msgid "Implements, class implements a specific interface"
- msgstr "Implementação, a classe implementa uma interface específica"
- 
--#: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr "Estado inicial/final"
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Restrição, colocar uma restrição em alguma coisa"
- 
--#: ../sheets/UML.sheet.in.h:19
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Pacote pequeno"
-+
-+#: ../sheets/UML.sheet.in.h:14
- msgid "Large package"
- msgstr "Pacote grande"
- 
--#: ../sheets/UML.sheet.in.h:20
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Caso de uso"
-+
-+#: ../sheets/UML.sheet.in.h:17
- msgid "Lifeline"
- msgstr "Linha da vida"
- 
--#: ../sheets/UML.sheet.in.h:21
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Objetos"
-+
-+#: ../sheets/UML.sheet.in.h:19
- msgid "Message"
- msgstr "Mensagem"
- 
--#: ../sheets/UML.sheet.in.h:22
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Componente"
-+
-+#: ../sheets/UML.sheet.in.h:25
- msgid "Node"
- msgstr "Nó"
- 
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "Nota"
--
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Objetos"
--
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "Realização, implementa uma interface específica"
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "�cone de estereótipo de classe"
- 
- #: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Pacote pequeno"
-+msgid "Initial/end state"
-+msgstr "Estado inicial/final"
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Atividade"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr "Caso de uso"
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Bifurcação/união"
- 
- #: ../sheets/chronogram.sheet.in.h:1
- msgid "Chronogram"
- msgstr "Cronograma"
- 
- #: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr "Linha de dados"
--
--#: ../sheets/chronogram.sheet.in.h:3
- msgid "Objects to design chronogram charts"
- msgstr "Objetos para projetar gráficos de cronograma"
- 
--#: ../sheets/chronogram.sheet.in.h:4
-+#: ../sheets/chronogram.sheet.in.h:3
- msgid "Time scale"
- msgstr "Escala de tempo"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--msgid "BBS"
--msgstr "BBS"
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Linha de dados"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
-+#: ../sheets/ciscocomputer.sheet.in.h:1
- msgid "Cisco - Computer"
- msgstr "Cisco - computador"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Figuras de computadores da Cisco"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "Cisco CA"
-+msgid "PC"
-+msgstr "PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "CiscoSecurity"
-+msgid "Macintosh"
-+msgstr "Macintosh"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr "Estação de trabalho CiscoWorks"
-+msgid "Terminal"
-+msgstr "Terminal"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Figuras de computadores da Cisco"
-+msgid "SUN workstation"
-+msgstr "Estação de trabalho SUN"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr "Subsistema de disco"
-+msgid "CiscoWorks workstation"
-+msgstr "Estação de trabalho CiscoWorks"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Disquete"
-+msgid "PC Router Card"
-+msgstr "Cartão roteador de PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:9
--msgid "EtherClient"
--msgstr "EtherClient"
-+msgid "PC Software"
-+msgstr "Software para PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:10
--msgid "FC Storage"
--msgstr "Armazenamento FC"
-+msgid "PC with Router-Based Software"
-+msgstr "PC com software baseado em Roteador"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Servidor de arquivos"
-+msgid "Workgroup director"
-+msgstr "Diretor de grupo de trabalho"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:12
--msgid "Front End Processor"
--msgstr "Processador Front End"
-+msgid "CiscoSecurity"
-+msgstr "CiscoSecurity"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP Mini"
-+msgid "Cisco CA"
-+msgstr "Cisco CA"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
--msgstr "Handheld"
-+msgid "WWW server"
-+msgstr "Servidor WWW"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Máquina"
-+msgid "Web browser"
-+msgstr "Navegador web"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "IBM Mini (AS400)"
-+msgid "File Server"
-+msgstr "Servidor de arquivos"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "Torre IBM"
-+msgid "Software-Based Router on File Server"
-+msgstr "Roteador baseado em software no servidor de arquivos"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "Mainframe IBM"
-+msgid "Server with PC Router"
-+msgstr "Servidor com roteador PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:19
--msgid "IBM mainframe with FEP"
--msgstr "Mainframe IBM com FEP"
-+msgid "IBM Tower"
-+msgstr "Torre IBM"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
--msgstr "JBOD"
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM Mini (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr "Processador Front End"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Macintosh"
-+msgid "IBM mainframe"
-+msgstr "Mainframe IBM"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "Microservidor Web"
-+msgid "IBM mainframe with FEP"
-+msgstr "Mainframe IBM com FEP"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Mini VAX"
-+msgid "HP Mini"
-+msgstr "HP Mini"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Monitor"
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Supercomputador"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:26
-+msgid "Web cluster"
-+msgstr "Cluster web"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:27
--msgid "Newton"
--msgstr "Newton"
-+msgid "Mini VAX"
-+msgstr "Mini VAX"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:29
--msgid "PC Adapter Card"
--msgstr "Cartão adaptador de PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:30
- msgid "PC Card"
- msgstr "Cartão para PC"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tablet"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:31
--msgid "PC Router Card"
--msgstr "Cartão roteador de PC"
-+msgid "EtherClient"
-+msgstr "EtherClient"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:32
--msgid "PC Software"
--msgstr "Software para PC"
-+msgid "Handheld"
-+msgstr "Handheld"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "Vídeo PC"
-+msgid "Wireless"
-+msgstr "Sem fio"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
--msgstr "PC com software baseado em Roteador"
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Newton"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "Estação de trabalho SUN"
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Monitor"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Servidor com roteador PC"
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "Vídeo PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:41
--msgid "Software-Based Router on File Server"
--msgstr "Roteador baseado em software no servidor de arquivos"
-+msgid "BBS"
-+msgstr "BBS"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Supercomputador"
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "Microservidor Web"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr "Tablet"
-+msgid "Diskette"
-+msgstr "Disquete"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:45
--msgid "Tape array"
--msgstr "Conjunto de fitas"
-+msgid "Host"
-+msgstr "Máquina"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:46
--msgid "Terminal"
--msgstr "Terminal"
-+msgid "Tape array"
-+msgstr "Conjunto de fitas"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:47
--msgid "WWW server"
--msgstr "Servidor WWW"
-+msgid "Disk subsystem"
-+msgstr "Subsistema de disco"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:48
--msgid "Web browser"
--msgstr "Navegador web"
--
--#: ../sheets/ciscocomputer.sheet.in.h:49
--msgid "Web cluster"
--msgstr "Cluster web"
-+msgid "JBOD"
-+msgstr "JBOD"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:50
--msgid "Wireless"
--msgstr "Sem fio"
-+msgid "FC Storage"
-+msgstr "Armazenamento FC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr "Diretor de grupo de trabalho"
-+msgid "PC Adapter Card"
-+msgstr "Cartão adaptador de PC"
- 
- #: ../sheets/ciscohub.sheet.in.h:1
--msgid "100BaseT Hub"
--msgstr "Hub 100BaseT"
-+msgid "Cisco - Switch"
-+msgstr "Cisco - switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:2
--msgid "7500ARS (7513) Router"
--msgstr "Roteador 7500ARS (7513)"
--
--#: ../sheets/ciscohub.sheet.in.h:3
--msgid "7505 Router"
--msgstr "Roteador 7505"
-+msgid "Router and switch shapes by Cisco"
-+msgstr "Formas de roteador e switch da Cisco"
- 
- #: ../sheets/ciscohub.sheet.in.h:4
--msgid "7507 Router"
--msgstr "Roteador 7507"
-+msgid "Router subdued"
-+msgstr "Roteador enfraquecido"
- 
- #: ../sheets/ciscohub.sheet.in.h:5
--msgid "ASIC Processor"
--msgstr "Processador ASIC"
-+msgid "Router with Silicon Switch"
-+msgstr "Roteador com Switch Silicon"
- 
- #: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+msgid "NetFlow router"
-+msgstr "Roteador NetFlow"
- 
- #: ../sheets/ciscohub.sheet.in.h:7
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "ATM Fast Gigabit Etherswitch"
-+msgid "Broadband router"
-+msgstr "Roteador de banda larga"
- 
- #: ../sheets/ciscohub.sheet.in.h:8
--msgid "ATM Switch"
--msgstr "Switch ATM"
-+msgid "Wavelength router"
-+msgstr "Roteador de Wavelenght"
- 
- #: ../sheets/ciscohub.sheet.in.h:9
--msgid "ATM Tag Switch Router"
--msgstr "Roteador Switch ATM"
-+msgid "Wireless router"
-+msgstr "Roteador sem fio"
- 
- #: ../sheets/ciscohub.sheet.in.h:10
--msgid "Access Gateway"
--msgstr "Gateway de acesso"
-+msgid "7507 Router"
-+msgstr "Roteador 7507"
- 
- #: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+msgid "7505 Router"
-+msgstr "Roteador 7505"
- 
- #: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Roteador de banda larga"
-+msgid "7500ARS (7513) Router"
-+msgstr "Roteador 7500ARS (7513)"
- 
- #: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr "CSM-S"
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr "Roteador switch de rótulo de canto com NetFlow"
- 
- #: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr "Sistema de roteamento de carregador"
-+msgid "Edge Label Switch Router"
-+msgstr "Roteador switch de rótulo de canto"
- 
- #: ../sheets/ciscohub.sheet.in.h:15
--msgid "Cisco - Switch"
--msgstr "Cisco - switch"
-+msgid "Router with Firewall"
-+msgstr "Roteador com Firewall"
- 
- #: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+msgid "Optical Services Router"
-+msgstr "Roteador de serviços óticos"
- 
- #: ../sheets/ciscohub.sheet.in.h:17
--msgid "Cisco Hub"
--msgstr "Cisco - hub"
--
--#: ../sheets/ciscohub.sheet.in.h:18
- msgid "Content Router"
- msgstr "Roteador de conteúdo"
- 
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Sistema de roteamento de carregador"
-+
- #: ../sheets/ciscohub.sheet.in.h:19
--msgid "Content Service Module"
--msgstr "Módulo de serviço de conteúdo"
-+msgid "Storage Router"
-+msgstr "Roteador de armazenamento"
- 
- #: ../sheets/ciscohub.sheet.in.h:20
--msgid "Content Service Switch 1100"
--msgstr "Switch de servidor de conteúdo 1100"
--
--#: ../sheets/ciscohub.sheet.in.h:21
--msgid "Content Switch"
--msgstr "Switch de conteúdo"
-+msgid "NetSonar"
-+msgstr "NetSonar"
- 
- #: ../sheets/ciscohub.sheet.in.h:22
--msgid "Data Center Switch"
--msgstr "Switch de centro de dados"
-+msgid "Hub subdued"
-+msgstr "Hub enfraquecido"
- 
- #: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr "Switch de centro de dados revertido"
-+msgid "Cisco Hub"
-+msgstr "Cisco - hub"
- 
- #: ../sheets/ciscohub.sheet.in.h:24
--msgid "Data Switch Processor"
--msgstr "Processador de switch de dados"
-+msgid "Small Hub"
-+msgstr "Hub pequeno"
- 
- #: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr "Switch inteligente de canal de fibra de classe diretora"
-+msgid "100BaseT Hub"
-+msgstr "Hub 100BaseT"
- 
- #: ../sheets/ciscohub.sheet.in.h:26
--msgid "Edge Label Switch Router"
--msgstr "Roteador switch de rótulo de canto"
-+msgid "Workgroup switch"
-+msgstr "Switch de grupo de trabalho"
- 
- #: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
--msgstr "Roteador switch de rótulo de canto com NetFlow"
-+msgid "Workgroup switch Subdued"
-+msgstr "Switch de grupo de trabalho enfraquecido"
- 
- #: ../sheets/ciscohub.sheet.in.h:28
--msgid "Generic Processor"
--msgstr "Processador genérico"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Switch de grupo de trabalho habilitado por voz"
-+
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
- 
- #: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr "Hub enfraquecido"
-+msgid "ATM Tag Switch Router"
-+msgstr "Roteador Switch ATM"
- 
- #: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "Switch ISDN"
-+msgid "Switch Processor"
-+msgstr "Processador de switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:32
--msgid "LAN2LAN Switch"
--msgstr "Switch LAN2LAN"
-+msgid "Route Switch Processor"
-+msgstr "Processador de roteamento de switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:33
--msgid "Label Switch Router"
--msgstr "Router switch de rótulo"
-+msgid "Route Switch Processor with Si"
-+msgstr "Processador de roteamento de switch com Si"
- 
- #: ../sheets/ciscohub.sheet.in.h:34
--msgid "Layer 2 Remote Switch"
--msgstr "Switch remoto da camada nº 2"
-+msgid "PXF"
-+msgstr "PXF"
- 
- #: ../sheets/ciscohub.sheet.in.h:35
--msgid "MGX 8220"
--msgstr "MGX 8220"
-+msgid "ASIC Processor"
-+msgstr "Processador ASIC"
- 
- #: ../sheets/ciscohub.sheet.in.h:36
--msgid "MGX 8240"
--msgstr "MGX 8240"
-+msgid "Generic Processor"
-+msgstr "Processador genérico"
- 
- #: ../sheets/ciscohub.sheet.in.h:37
--msgid "MGX 8260"
--msgstr "MGX 8260"
-+msgid "Data Center Switch"
-+msgstr "Switch de centro de dados"
- 
- #: ../sheets/ciscohub.sheet.in.h:38
--msgid "Multi-Fabric Server Switch"
--msgstr "Switch servidor multi-fabric"
-+msgid "Data Center Switch Reversed"
-+msgstr "Switch de centro de dados revertido"
- 
- #: ../sheets/ciscohub.sheet.in.h:39
--msgid "MultiSwitch Device"
--msgstr "Dispositivo MultiSwitch"
-+msgid "Data Switch Processor"
-+msgstr "Processador de switch de dados"
- 
- #: ../sheets/ciscohub.sheet.in.h:40
--msgid "Multilayer Remote Switch"
--msgstr "Switch Remoto multicamada"
-+msgid "Content Switch"
-+msgstr "Switch de conteúdo"
- 
- #: ../sheets/ciscohub.sheet.in.h:41
--msgid "Multilayer Switch"
--msgstr "Switch multicamada"
-+msgid "Content Service Module"
-+msgstr "Módulo de serviço de conteúdo"
- 
- #: ../sheets/ciscohub.sheet.in.h:42
--msgid "Multilayer Switch with Silicon"
--msgstr "Switch multicamada com Silicon"
-+msgid "CSM-S"
-+msgstr "CSM-S"
- 
- #: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
--msgstr "Switch multicamadas com Silicon enfraquecido"
-+msgid "Access Gateway"
-+msgstr "Gateway de acesso"
- 
- #: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr "Roteador NetFlow"
-+msgid "ATM Switch"
-+msgstr "Switch ATM"
- 
- #: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr "NetRanger"
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
- 
- #: ../sheets/ciscohub.sheet.in.h:46
--msgid "NetSonar"
--msgstr "NetSonar"
-+msgid "Cisco 1000"
-+msgstr "Cisco 1000"
- 
- #: ../sheets/ciscohub.sheet.in.h:47
--msgid "Optical Services Router"
--msgstr "Roteador de serviços óticos"
-+msgid "ISDN switch"
-+msgstr "Switch ISDN"
- 
- #: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
--msgstr "PXF"
-+msgid "Label Switch Router"
-+msgstr "Router switch de rótulo"
- 
- #: ../sheets/ciscohub.sheet.in.h:49
--msgid "Programmable Switch"
--msgstr "Switch programável"
-+msgid "MultiSwitch Device"
-+msgstr "Dispositivo MultiSwitch"
- 
- #: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr "RateMUX"
-+msgid "LAN2LAN Switch"
-+msgstr "Switch LAN2LAN"
- 
- #: ../sheets/ciscohub.sheet.in.h:51
--msgid "Route Switch Processor"
--msgstr "Processador de roteamento de switch"
-+msgid "Multilayer Switch"
-+msgstr "Switch multicamada"
- 
- #: ../sheets/ciscohub.sheet.in.h:52
--msgid "Route Switch Processor with Si"
--msgstr "Processador de roteamento de switch com Si"
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Switch multicamada com Silicon"
-+
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
-+msgstr "Switch multicamadas com Silicon enfraquecido"
- 
- #: ../sheets/ciscohub.sheet.in.h:54
--msgid "Router and switch shapes by Cisco"
--msgstr "Formas de roteador e switch da Cisco"
-+msgid "Programmable Switch"
-+msgstr "Switch programável"
- 
- #: ../sheets/ciscohub.sheet.in.h:55
--msgid "Router subdued"
--msgstr "Roteador enfraquecido"
-+msgid "Content Service Switch 1100"
-+msgstr "Switch de servidor de conteúdo 1100"
- 
- #: ../sheets/ciscohub.sheet.in.h:56
--msgid "Router with Firewall"
--msgstr "Roteador com Firewall"
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "ATM Fast Gigabit Etherswitch"
- 
- #: ../sheets/ciscohub.sheet.in.h:57
--msgid "Router with Silicon Switch"
--msgstr "Roteador com Switch Silicon"
-+msgid "RateMUX"
-+msgstr "RateMUX"
- 
- #: ../sheets/ciscohub.sheet.in.h:58
--msgid "Server Switch"
--msgstr "Switch de servidor"
-+msgid "Workgroup 5500"
-+msgstr "Workgroup 5500"
- 
- #: ../sheets/ciscohub.sheet.in.h:59
--msgid "Small Hub"
--msgstr "Hub pequeno"
-+msgid "Workgroup 5000"
-+msgstr "Workgroup 5000"
- 
- #: ../sheets/ciscohub.sheet.in.h:60
--msgid "Storage Router"
--msgstr "Roteador de armazenamento"
-+msgid "Workgroup 5002"
-+msgstr "Workgroup 5002"
- 
- #: ../sheets/ciscohub.sheet.in.h:61
--msgid "Switch Processor"
--msgstr "Processador de switch"
-+msgid "NetRanger"
-+msgstr "NetRanger"
- 
- #: ../sheets/ciscohub.sheet.in.h:62
--msgid "Universal Gateway"
--msgstr "Gateway universal"
-+msgid "MGX 8220"
-+msgstr "MGX 8220"
- 
- #: ../sheets/ciscohub.sheet.in.h:63
--msgid "Virtual Layer Switch"
--msgstr "Switch de camada virtual"
-+msgid "MGX 8240"
-+msgstr "MGX 8240"
- 
- #: ../sheets/ciscohub.sheet.in.h:64
--msgid "Wavelength router"
--msgstr "Roteador de Wavelenght"
-+msgid "MGX 8260"
-+msgstr "MGX 8260"
- 
- #: ../sheets/ciscohub.sheet.in.h:65
--msgid "Wireless router"
--msgstr "Roteador sem fio"
-+msgid "Universal Gateway"
-+msgstr "Gateway universal"
- 
- #: ../sheets/ciscohub.sheet.in.h:66
--msgid "Workgroup 5000"
--msgstr "Workgroup 5000"
-+msgid "iSCSI switch"
-+msgstr "Switch iSCSI"
- 
- #: ../sheets/ciscohub.sheet.in.h:67
--msgid "Workgroup 5002"
--msgstr "Workgroup 5002"
-+msgid "Workgroup Fibre Channel intelligent switch"
-+msgstr "Switch inteligente de canal de fibra por grupo de trabalho"
- 
- #: ../sheets/ciscohub.sheet.in.h:68
--msgid "Workgroup 5500"
--msgstr "Workgroup 5500"
-+msgid "Director-class Fibre Channel intelligent switch"
-+msgstr "Switch inteligente de canal de fibra de classe diretora"
- 
- #: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
--msgstr "Switch inteligente de canal de fibra por grupo de trabalho"
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Switch servidor multi-fabric"
- 
- #: ../sheets/ciscohub.sheet.in.h:70
--msgid "Workgroup Switch Voice-Enabled"
--msgstr "Switch de grupo de trabalho habilitado por voz"
-+msgid "Server Switch"
-+msgstr "Switch de servidor"
- 
- #: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
--msgstr "Switch de grupo de trabalho"
-+msgid "Multilayer Remote Switch"
-+msgstr "Switch Remoto multicamada"
- 
- #: ../sheets/ciscohub.sheet.in.h:72
--msgid "Workgroup switch Subdued"
--msgstr "Switch de grupo de trabalho enfraquecido"
-+msgid "Layer 2 Remote Switch"
-+msgstr "Switch remoto da camada nº 2"
- 
- #: ../sheets/ciscohub.sheet.in.h:73
--msgid "iSCSI switch"
--msgstr "Switch iSCSI"
-+msgid "Virtual Layer Switch"
-+msgstr "Switch de camada virtual"
- 
- #: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
--msgstr "Pessoa andrógena"
-+msgid "Cisco - Misc"
-+msgstr "Cisco - miscelânea"
- 
- #: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr "Antena"
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Miscelânea de formas da Cisco"
- 
- #: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Ramo do escritório"
-+msgid "Government Building"
-+msgstr "Prédio governamental"
- 
- #: ../sheets/ciscomisc.sheet.in.h:4
--msgid "Branch office blue"
--msgstr "Ramo do escritório azul"
-+msgid "University"
-+msgstr "Universidade"
- 
- #: ../sheets/ciscomisc.sheet.in.h:5
--msgid "Branch office subdued"
--msgstr "Ramo do escritório enfraquecido"
-+msgid "Small Business"
-+msgstr "Pequeno negócio"
- 
- #: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr "Carro"
-+msgid "Home office"
-+msgstr "Escritório residencial"
- 
- #: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Cisco - miscelânea"
-+msgid "Branch office"
-+msgstr "Ramo do escritório"
- 
- #: ../sheets/ciscomisc.sheet.in.h:8
--msgid "CiscoWorks Man"
--msgstr "Homem CiscoWorks"
-+msgid "Branch office subdued"
-+msgstr "Ramo do escritório enfraquecido"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:9
-+msgid "Branch office blue"
-+msgstr "Ramo do escritório azul"
- 
- #: ../sheets/ciscomisc.sheet.in.h:10
- msgid "Generic Building"
- msgstr "Prédio genérico"
- 
- #: ../sheets/ciscomisc.sheet.in.h:11
--msgid "Generic Building blue"
--msgstr "Prédio genérico azul"
--
--#: ../sheets/ciscomisc.sheet.in.h:12
- msgid "Generic Building subdued"
- msgstr "Prédio genérico enfraquecido"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:12
-+msgid "Generic Building blue"
-+msgstr "Prédio genérico azul"
-+
- #: ../sheets/ciscomisc.sheet.in.h:13
--msgid "Government Building"
--msgstr "Prédio governamental"
-+msgid "Medium Building"
-+msgstr "Prédio médio"
- 
- #: ../sheets/ciscomisc.sheet.in.h:14
--msgid "Headphones"
--msgstr "Fones de ouvido"
-+msgid "Medium Building subdued"
-+msgstr "Prédio médio enfraquecido"
- 
- #: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr "Escritório residencial"
-+msgid "Medium Building blue"
-+msgstr "Prédio médio azul"
- 
- #: ../sheets/ciscomisc.sheet.in.h:16
- msgid "House"
-@@ -9131,1132 +9404,1195 @@ msgid "House blue"
- msgstr "Casa azul"
- 
- #: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Chave"
-+msgid "Telecommuter house"
-+msgstr "Telecomutador caseiro"
- 
--#: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
--msgstr "Trava e chave"
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr "Telecomutador caseiro enfraquecido"
- 
--#: ../sheets/ciscomisc.sheet.in.h:21
-+#: ../sheets/ciscomisc.sheet.in.h:20
- msgid "MDU"
- msgstr "MDU"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr "Homem"
-+
- #: ../sheets/ciscomisc.sheet.in.h:22
--msgid "Mac Woman"
--msgstr "Mulher Mac"
-+msgid "Man red"
-+msgstr "Homem vermelho"
- 
- #: ../sheets/ciscomisc.sheet.in.h:23
--msgid "Man"
--msgstr "Homem"
-+msgid "Man gold"
-+msgstr "Homem ouro"
- 
- #: ../sheets/ciscomisc.sheet.in.h:24
- msgid "Man blue"
- msgstr "Homem azul"
- 
- #: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
--msgstr "Homem ouro"
-+msgid "Standing Man"
-+msgstr "Homem parado"
- 
- #: ../sheets/ciscomisc.sheet.in.h:26
--msgid "Man red"
--msgstr "Homem vermelho"
-+msgid "Standing woman"
-+msgstr "Mulher parada"
- 
- #: ../sheets/ciscomisc.sheet.in.h:27
--msgid "Medium Building"
--msgstr "Prédio médio"
-+msgid "Woman"
-+msgstr "Mulher"
- 
- #: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr "Prédio médio azul"
-+msgid "Woman red"
-+msgstr "Mulher vermelha"
- 
- #: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr "Prédio médio enfraquecido"
-+msgid "Woman gold"
-+msgstr "Mulher ouro"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Mulher azul"
- 
- #: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Miscelânea de formas da Cisco"
-+msgid "Running man"
-+msgstr "Homem correndo"
- 
- #: ../sheets/ciscomisc.sheet.in.h:32
--msgid "PC Man"
--msgstr "Homem usando PC"
-+msgid "Running man subdued"
-+msgstr "Homem correndo enfraquecido"
- 
- #: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
--msgstr "Homem à esquerda do PC"
-+msgid "Telecommuter"
-+msgstr "Telecomutador"
- 
- #: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
--msgstr "Homem correndo"
-+msgid "Running woman"
-+msgstr "Mulher correndo"
- 
- #: ../sheets/ciscomisc.sheet.in.h:35
--msgid "Running man subdued"
--msgstr "Homem correndo enfraquecido"
-+msgid "CiscoWorks Man"
-+msgstr "Homem CiscoWorks"
- 
- #: ../sheets/ciscomisc.sheet.in.h:36
--msgid "Running woman"
--msgstr "Mulher correndo"
-+msgid "PC Man left"
-+msgstr "Homem à esquerda do PC"
- 
- #: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Satélite"
-+msgid "PC Man"
-+msgstr "Homem usando PC"
- 
- #: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
--msgstr "Antena parabólica"
--
--#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman"
- msgstr "Mulher sentada"
- 
--#: ../sheets/ciscomisc.sheet.in.h:40
-+#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman right"
- msgstr "Mulher sentada à direita"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:40
-+msgid "Mac Woman"
-+msgstr "Mulher Mac"
-+
- #: ../sheets/ciscomisc.sheet.in.h:41
--msgid "Small Business"
--msgstr "Pequeno negócio"
-+msgid "Androgynous Person"
-+msgstr "Pessoa andrógena"
- 
- #: ../sheets/ciscomisc.sheet.in.h:43
--msgid "Standing Man"
--msgstr "Homem parado"
-+msgid "Key"
-+msgstr "Chave"
- 
- #: ../sheets/ciscomisc.sheet.in.h:44
--msgid "Standing woman"
--msgstr "Mulher parada"
-+msgid "Lock and Key"
-+msgstr "Trava e chave"
- 
- #: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
--msgstr "Telecomutador"
-+msgid "Satellite dish"
-+msgstr "Antena parabólica"
- 
- #: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr "Telecomutador caseiro"
-+msgid "Satellite"
-+msgstr "Satélite"
- 
- #: ../sheets/ciscomisc.sheet.in.h:47
--msgid "Telecommuter house subdued"
--msgstr "Telecomutador caseiro enfraquecido"
--
--#: ../sheets/ciscomisc.sheet.in.h:48
--msgid "Truck"
--msgstr "Caminhão"
-+msgid "Antenna"
-+msgstr "Antena"
- 
- #: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Universidade"
-+msgid "Car"
-+msgstr "Carro"
- 
- #: ../sheets/ciscomisc.sheet.in.h:50
-+msgid "Truck"
-+msgstr "Caminhão"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:51
- msgid "Video Camera"
- msgstr "Câmera de vídeo"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscomisc.sheet.in.h:52
- msgid "Video Camera right"
- msgstr "Câmera de vídeo à direita"
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
--msgid "Woman"
--msgstr "Mulher"
--
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr "Mulher azul"
--
- #: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr "Mulher ouro"
--
--#: ../sheets/ciscomisc.sheet.in.h:55
--msgid "Woman red"
--msgstr "Mulher vermelha"
-+msgid "Headphones"
-+msgstr "Fones de ouvido"
- 
- #: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr "10700"
-+msgid "Cisco - Network"
-+msgstr "Cisco - rede"
- 
- #: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr "15200"
-+msgid "Network shapes by Cisco"
-+msgstr "Formas de rede da Cisco"
- 
- #: ../sheets/cisconetwork.sheet.in.h:3
--msgid "15800"
--msgstr "15800"
-+msgid "Network Management"
-+msgstr "Gerenciamento de rede"
- 
- #: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr "Controlador de cluster 3174 (área de trabalho)"
-+msgid "Detector"
-+msgstr "Detector"
- 
- #: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
--msgstr "Controlador de cluster 3X74 (chão)"
-+msgid "Protocol Translator"
-+msgstr "Tradutor de protocolo"
- 
- #: ../sheets/cisconetwork.sheet.in.h:6
--msgid "Access Server"
--msgstr "Servidor de acesso"
-+msgid "IP"
-+msgstr "IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
--msgstr "AccessPoint"
-+msgid "IP Old-style"
-+msgstr "IP no estilo antigo"
- 
- #: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
--msgstr "Switch de proteção automático"
-+msgid "NAT"
-+msgstr "NAT"
- 
- #: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
-+msgid "VIP"
-+msgstr "VIP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "Mídia BBFW"
-+msgid "Terminal Server"
-+msgstr "Servidor de terminal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
--msgstr "Caixa de breakout"
-+msgid "Access Server"
-+msgstr "Servidor de acesso"
- 
- #: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Ponte"
-+msgid "System controller"
-+msgstr "Controlador do sistema"
- 
- #: ../sheets/cisconetwork.sheet.in.h:13
--msgid "CDDI/FDDI Concentrator"
--msgstr "Concentrador CDDI/FDDI"
-+msgid "Directory Server"
-+msgstr "Servidor de diretório"
- 
- #: ../sheets/cisconetwork.sheet.in.h:14
--msgid "CDM Content Distribution Manager"
--msgstr "Gerenciador de distribuição de conteúdo CDM"
-+msgid "Firewall"
-+msgstr "Firewall"
- 
- #: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr "CSU/DSU"
-+msgid "Firewall subdued"
-+msgstr "Firewall enfraquecido"
- 
- #: ../sheets/cisconetwork.sheet.in.h:16
--msgid "Cable Modem"
--msgstr "Cable Modem"
-+msgid "Firewall horizontal"
-+msgstr "Firewall horizontal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:17
--msgid "Catalyst Access Gateway"
--msgstr "Gateway de acesso Catalyst"
-+msgid "Firewall Service Module"
-+msgstr "Módulo de serviço do Firewall"
- 
- #: ../sheets/cisconetwork.sheet.in.h:18
--msgid "Centri Firewall"
--msgstr "Firewall Centri"
-+msgid "IOS Firewall"
-+msgstr "Firewall IOS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:19
--msgid "Channelized Pipe"
--msgstr "Sinal canalizado"
-+msgid "PIX Firewall"
-+msgstr "Firewall PIX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Cisco - rede"
-+msgid "PIX Firewall Left"
-+msgstr "Firewall PIX esquerda"
- 
- #: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Nuvem"
--
--#: ../sheets/cisconetwork.sheet.in.h:22
--msgid "Cloud Dark"
--msgstr "Nuvem escura"
-+msgid "Centri Firewall"
-+msgstr "Firewall Centri"
- 
- #: ../sheets/cisconetwork.sheet.in.h:23
--msgid "Cloud Gold"
--msgstr "Nuvem ouro"
-+msgid "Security appliance"
-+msgstr "Ferramenta de segurança"
- 
- #: ../sheets/cisconetwork.sheet.in.h:24
--msgid "Cloud White"
--msgstr "Nuvem branca"
-+msgid "VPN Concentrator"
-+msgstr "Concentrador VPN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
--msgstr "Sobrecarga concatenada"
-+msgid "VPN Gateway"
-+msgstr "Gateway VPN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:26
--msgid "Content Engine (Cache Director)"
--msgstr "Máquina de conteúdo (diretor de cache)"
-+msgid "LAN to LAN"
-+msgstr "LAN para LAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:27
--msgid "Content Transformation Engine (CTE)"
--msgstr "Máquina de transformação de conteúdo (CTE)"
-+msgid "SSL Terminator"
-+msgstr "Terminal SSL"
- 
- #: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr "DSLAM"
-+msgid "IP DSL Switch"
-+msgstr "Switch IP DSL"
- 
- #: ../sheets/cisconetwork.sheet.in.h:29
--msgid "DWDM Filter"
--msgstr "Filtro DWDM"
-+msgid "DSLAM"
-+msgstr "DSLAM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:30
--msgid "Detector"
--msgstr "Detector"
-+msgid "Cable Modem"
-+msgstr "Cable Modem"
- 
- #: ../sheets/cisconetwork.sheet.in.h:31
--msgid "Digital Cross-Connect"
--msgstr "Conector digital cruzado"
-+msgid "Wireless Connectivity"
-+msgstr "Conectividade sem fio"
- 
- #: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr "Servidor de diretório"
-+msgid "Wireless Transport"
-+msgstr "Transporte sem fio"
- 
- #: ../sheets/cisconetwork.sheet.in.h:33
--msgid "Distributed Director"
--msgstr "Diretor distribuído"
-+msgid "AccessPoint"
-+msgstr "AccessPoint"
- 
- #: ../sheets/cisconetwork.sheet.in.h:34
--msgid "Dual Mode AccessPoint"
--msgstr "AccessPoint de modo dual"
-+msgid "Wireless Bridge"
-+msgstr "Ponte sem fio"
- 
- #: ../sheets/cisconetwork.sheet.in.h:35
--msgid "FDDI Ring"
--msgstr "Anel FDDI"
-+msgid "Dual Mode AccessPoint"
-+msgstr "AccessPoint de modo dual"
- 
- #: ../sheets/cisconetwork.sheet.in.h:36
--msgid "File Engine"
--msgstr "Ferramenta de arquivo"
-+msgid "Wi-Fi Tag"
-+msgstr "Etiqueta Wi-Fi"
- 
- #: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
--msgstr "Firewall"
-+msgid "Wireless Location Appliance"
-+msgstr "Ferramenta de localização sem fio"
- 
- #: ../sheets/cisconetwork.sheet.in.h:38
--msgid "Firewall Service Module"
--msgstr "Módulo de serviço do Firewall"
-+msgid "Location server"
-+msgstr "Servidor de localização"
- 
- #: ../sheets/cisconetwork.sheet.in.h:39
--msgid "Firewall horizontal"
--msgstr "Firewall horizontal"
-+msgid "Lightweight AP"
-+msgstr "AP de peso leve"
- 
- #: ../sheets/cisconetwork.sheet.in.h:40
--msgid "Firewall subdued"
--msgstr "Firewall enfraquecido"
-+msgid "WLAN controller"
-+msgstr "Controlador WLAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
--msgstr "Ferramenta genérica"
-+msgid "BBFW"
-+msgstr "BBFW"
- 
- #: ../sheets/cisconetwork.sheet.in.h:42
--msgid "Generic Gateway"
--msgstr "Gateway genérico"
-+msgid "BBFW media"
-+msgstr "Mídia BBFW"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
-+msgstr "Sinal canalizado"
- 
- #: ../sheets/cisconetwork.sheet.in.h:44
--msgid "IOS Firewall"
--msgstr "Firewall IOS"
-+msgid "Concatenated Payload"
-+msgstr "Sobrecarga concatenada"
- 
- #: ../sheets/cisconetwork.sheet.in.h:45
--msgid "IOS SLB"
--msgstr "IOS SLB"
-+msgid "Optical Cross-Connect"
-+msgstr "Conexão ótica cruzada"
- 
- #: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
-+msgid "Optical Transport"
-+msgstr "Transporte ótico"
- 
- #: ../sheets/cisconetwork.sheet.in.h:47
--msgid "IP DSL Switch"
--msgstr "Switch IP DSL"
-+msgid "Optical Fiber"
-+msgstr "Fibra ótica"
- 
- #: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
--msgstr "IP no estilo antigo"
-+msgid "Optical Amplifier"
-+msgstr "Amplificador ótico"
- 
- #: ../sheets/cisconetwork.sheet.in.h:49
--msgid "IP Transport Concentrator"
--msgstr "Concentrador de transporte IP"
-+msgid "Digital Cross-Connect"
-+msgstr "Conector digital cruzado"
- 
- #: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
--msgstr "Servidor de broadcast IPTV"
-+msgid "IP Transport Concentrator"
-+msgstr "Concentrador de transporte IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
--msgstr "Gerenciador de conteúdo IPTV"
-+msgid "DWDM Filter"
-+msgstr "Filtro DWDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr "LAN para LAN"
-+msgid "WDM"
-+msgstr "WDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
--msgstr "AP de peso leve"
-+msgid "15200"
-+msgstr "15200"
- 
- #: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "LocalDirector"
-+msgid "15800"
-+msgstr "15800"
- 
- #: ../sheets/cisconetwork.sheet.in.h:55
--msgid "Location server"
--msgstr "Servidor de localização"
-+msgid "ONS15104"
-+msgstr "ONS15104"
- 
- #: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
--msgstr "LongReach CPE"
-+msgid "10700"
-+msgstr "10700"
- 
- #: ../sheets/cisconetwork.sheet.in.h:57
--msgid "MAS Gateway"
--msgstr "Gateway MAS"
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
- 
- #: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
-+msgid "ONS15540"
-+msgstr "ONS15540"
- 
- #: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME 1100"
-+msgid "Automatic Protection Switching"
-+msgstr "Switch de proteção automático"
- 
- #: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
-+msgid "RPS"
-+msgstr "RPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
-+msgid "UPS"
-+msgstr "UPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:62
--msgid "NAT"
--msgstr "NAT"
-+msgid "LongReach CPE"
-+msgstr "LongReach CPE"
- 
- #: ../sheets/cisconetwork.sheet.in.h:63
--msgid "Network Management"
--msgstr "Gerenciamento de rede"
-+msgid "3X74 (floor) cluster controller"
-+msgstr "Controlador de cluster 3X74 (chão)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Formas de rede da Cisco"
-+msgid "3174 (desktop) cluster controller"
-+msgstr "Controlador de cluster 3174 (área de trabalho)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
--msgstr "ONS15104"
-+msgid "CSU/DSU"
-+msgstr "CSU/DSU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
--msgstr "ONS15540"
-+msgid "WAN"
-+msgstr "WAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:67
--msgid "Optical Amplifier"
--msgstr "Amplificador ótico"
-+msgid "Cloud"
-+msgstr "Nuvem"
- 
- #: ../sheets/cisconetwork.sheet.in.h:68
--msgid "Optical Cross-Connect"
--msgstr "Conexão ótica cruzada"
-+msgid "Cloud Gold"
-+msgstr "Nuvem ouro"
- 
- #: ../sheets/cisconetwork.sheet.in.h:69
--msgid "Optical Fiber"
--msgstr "Fibra ótica"
-+msgid "Cloud White"
-+msgstr "Nuvem branca"
- 
- #: ../sheets/cisconetwork.sheet.in.h:70
--msgid "Optical Transport"
--msgstr "Transporte ótico"
-+msgid "Cloud Dark"
-+msgstr "Nuvem escura"
- 
- #: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
-+msgid "Distributed Director"
-+msgstr "Diretor distribuído"
- 
- #: ../sheets/cisconetwork.sheet.in.h:72
--msgid "PIX Firewall"
--msgstr "Firewall PIX"
-+msgid "LocalDirector"
-+msgstr "LocalDirector"
- 
- #: ../sheets/cisconetwork.sheet.in.h:73
--msgid "PIX Firewall Left"
--msgstr "Firewall PIX esquerda"
-+msgid "IOS SLB"
-+msgstr "IOS SLB"
- 
- #: ../sheets/cisconetwork.sheet.in.h:74
--msgid "Protocol Translator"
--msgstr "Tradutor de protocolo"
-+msgid "MUX"
-+msgstr "MUX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
-+msgid "General Appliance"
-+msgstr "Ferramenta genérica"
- 
- #: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr "Repetidor"
-+msgid "PAD"
-+msgstr "PAD"
- 
- #: ../sheets/cisconetwork.sheet.in.h:77
--msgid "SSL Terminator"
--msgstr "Terminal SSL"
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "Concentrador CDDI/FDDI"
- 
- #: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr "STB (set top box)"
-+msgid "FDDI Ring"
-+msgstr "Anel FDDI"
- 
- #: ../sheets/cisconetwork.sheet.in.h:79
--msgid "Security appliance"
--msgstr "Ferramenta de segurança"
-+msgid "TokenRing"
-+msgstr "TokenRing"
- 
- #: ../sheets/cisconetwork.sheet.in.h:80
--msgid "Service Control"
--msgstr "Controle de serviço"
-+msgid "MAU"
-+msgstr "MAU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:81
--msgid "Storage Solution Engine"
--msgstr "Ferramenta de solução de armazenamento"
-+msgid "Repeater"
-+msgstr "Repetidor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:82
--msgid "System controller"
--msgstr "Controlador do sistema"
-+msgid "Bridge"
-+msgstr "Ponte"
- 
- #: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "TV"
-+msgid "Breakout box"
-+msgstr "Caixa de breakout"
- 
- #: ../sheets/cisconetwork.sheet.in.h:84
--msgid "Terminal Server"
--msgstr "Servidor de terminal"
-+msgid "STB (set top box)"
-+msgstr "STB (set top box)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "TokenRing"
-+msgid "TV"
-+msgstr "TV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:86
--msgid "TransPath"
--msgstr "TransPath"
-+msgid "IPTV broadcast server"
-+msgstr "Servidor de broadcast IPTV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "UPS"
-+msgid "IPTV content manager"
-+msgstr "Gerenciador de conteúdo IPTV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
- msgid "VN2900"
- msgstr "VN2900"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "VN5902"
-+
- #: ../sheets/cisconetwork.sheet.in.h:90
- msgid "VN5900"
- msgstr "VN5900"
- 
- #: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr "VN5902"
-+msgid "Catalyst Access Gateway"
-+msgstr "Gateway de acesso Catalyst"
- 
- #: ../sheets/cisconetwork.sheet.in.h:92
--msgid "VPN Concentrator"
--msgstr "Concentrador VPN"
-+msgid "Generic Gateway"
-+msgstr "Gateway genérico"
- 
- #: ../sheets/cisconetwork.sheet.in.h:93
--msgid "VPN Gateway"
--msgstr "Gateway VPN"
-+msgid "TransPath"
-+msgstr "TransPath"
- 
- #: ../sheets/cisconetwork.sheet.in.h:94
--msgid "WAN"
--msgstr "WAN"
-+msgid "uBR910 Cable DSU"
-+msgstr "Cabo DSU uBR910"
- 
- #: ../sheets/cisconetwork.sheet.in.h:95
--msgid "WDM"
--msgstr "WDM"
-+msgid "Storage Solution Engine"
-+msgstr "Ferramenta de solução de armazenamento"
- 
- #: ../sheets/cisconetwork.sheet.in.h:96
--msgid "WLAN controller"
--msgstr "Controlador WLAN"
-+msgid "Content Engine (Cache Director)"
-+msgstr "Máquina de conteúdo (diretor de cache)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
--msgstr "Etiqueta Wi-Fi"
-+msgid "CDM Content Distribution Manager"
-+msgstr "Gerenciador de distribuição de conteúdo CDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:98
--msgid "Wireless Bridge"
--msgstr "Ponte sem fio"
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "Máquina de transformação de conteúdo (CTE)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr "Conectividade sem fio"
-+msgid "ME 1100"
-+msgstr "ME 1100"
- 
- #: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
--msgstr "Ferramenta de localização sem fio"
-+msgid "MAS Gateway"
-+msgstr "Gateway MAS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:101
--msgid "Wireless Transport"
--msgstr "Transporte sem fio"
-+msgid "File Engine"
-+msgstr "Ferramenta de arquivo"
- 
- #: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr "Cabo DSU uBR910"
-+msgid "Service Control"
-+msgstr "Controle de serviço"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
-+msgid "Cisco - Telephony"
-+msgstr "Cisco - telefonia"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:2
--msgid "6705"
--msgstr "6705"
-+msgid "Telephony shapes by Cisco"
-+msgstr "Formas de telefonia da Cisco"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr "6732"
-+msgid "Phone"
-+msgstr "Telefone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
-+msgid "Phone 2"
-+msgstr "Telefone 2"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
-+msgid "Phone Ethernet"
-+msgstr "Ethernet de telefone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
-+msgid "Phone Appliance"
-+msgstr "Ferramenta telefônica"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
--msgstr "CallManager"
-+msgid "Phone Feature"
-+msgstr "Recurso telefônico"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:8
--msgid "Cellular Phone"
--msgstr "Telefone celular"
-+msgid "Phone/Fax"
-+msgstr "Telefone/Fax"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:9
--msgid "Cisco - Telephony"
--msgstr "Cisco - telefonia"
-+msgid "HootPhone"
-+msgstr "HootPhone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr "Switch classe 4/5"
-+msgid "IP Phone"
-+msgstr "Telefone IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:11
--msgid "End Office"
--msgstr "Fim do escritório"
-+msgid "IP Softphone"
-+msgstr "Softphone IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
--msgstr "Fax"
-+msgid "Softphone"
-+msgstr "Softphone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
--msgstr "Gatekeeper"
-+msgid "Cellular Phone"
-+msgstr "Telefone celular"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
--msgstr "Softswitch genérico"
-+msgid "Mobile Access IP Phone"
-+msgstr "Telefone IP de acesso móvel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
-+msgid "Pager"
-+msgstr "Pager"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
--msgstr "HootPhone"
-+msgid "Fax"
-+msgstr "Fax"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "Roteador IAD"
-+msgid "Turret"
-+msgstr "Torre"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
-+msgid "Octel"
-+msgstr "Octel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
-+msgid "Radio Tower"
-+msgstr "Torre de rádio"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:20
--msgid "IP Phone"
--msgstr "Telefone IP"
-+msgid "PBX"
-+msgstr "PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "Softphone IP"
-+msgid "PBX Switch"
-+msgstr "Switch PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:22
--msgid "IP Telephony Router"
--msgstr "Roteador de telefonia IP"
-+msgid "Class 4/5 switch"
-+msgstr "Switch classe 4/5"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
-+msgid "SONET MUX"
-+msgstr "SONET MUX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr "Pilha IntelliSwitch"
-+msgid "ADM"
-+msgstr "ADM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:25
--msgid "MCU"
--msgstr "MCU"
-+msgid "ITP"
-+msgstr "ITP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr "MGX 8000 Series Voice Gateway"
-+msgid "ATA"
-+msgstr "ATA"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
--msgstr "Servidor MoH (música e espera)"
-+msgid "SIP Proxy Server"
-+msgstr "Servidor proxy SIP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:28
--msgid "Mobile Access IP Phone"
--msgstr "Telefone IP de acesso móvel"
-+msgid "Gatekeeper"
-+msgstr "Gatekeeper"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:29
--msgid "Mobile Access Router"
--msgstr "Roteador de acesso móvel"
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr "MGX 8000 Series Voice Gateway"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr "Octel"
-+msgid "End Office"
-+msgstr "Fim do escritório"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "PBX"
-+msgid "Voice-Enabled Access Server"
-+msgstr "Servidor de acesso habilitado por voz"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:32
--msgid "PBX Switch"
--msgstr "Switch PBX"
-+msgid "Voice-Enabled Router"
-+msgstr "Roteador habilitado por voz"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:33
--msgid "Pager"
--msgstr "Pager"
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Switch ATM habilitado por voz"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Telefone"
-+msgid "CallManager"
-+msgstr "CallManager"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:35
--msgid "Phone 2"
--msgstr "Telefone 2"
-+msgid "IP Telephony Router"
-+msgstr "Roteador de telefonia IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr "Ferramenta telefônica"
-+msgid "Mobile Access Router"
-+msgstr "Roteador de acesso móvel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:37
--msgid "Phone Ethernet"
--msgstr "Ethernet de telefone"
-+msgid "H.323"
-+msgstr "H.323"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:38
--msgid "Phone Feature"
--msgstr "Recurso telefônico"
-+msgid "STP"
-+msgstr "STP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr "Telefone/Fax"
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:40
--msgid "Radio Tower"
--msgstr "Torre de rádio"
-+msgid "Generic softswitch"
-+msgstr "Softswitch genérico"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:41
--msgid "SC2200 (Signalling Controller)"
--msgstr "SC2200 (controlador de sinalização)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:42
- msgid "SC2200/VSC3000 host"
- msgstr "Máquina SC2200/VSC3000"
- 
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Controlador de switch virtual (VSC 3000)"
-+
- #: ../sheets/ciscotelephony.sheet.in.h:43
--msgid "SIP Proxy Server"
--msgstr "Servidor proxy SIP"
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "SC2200 (controlador de sinalização)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
--msgstr "SONET MUX"
-+msgid "MoH server (Music on Hold)"
-+msgstr "Servidor MoH (música e espera)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
--msgstr "STP"
-+msgid "TDM router"
-+msgstr "Roteador TDM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr "Softphone"
-+msgid "6701"
-+msgstr "6701"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr "Roteador TDM"
-+msgid "6705"
-+msgstr "6705"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:48
--msgid "Telephony shapes by Cisco"
--msgstr "Formas de telefonia da Cisco"
-+msgid "6732"
-+msgstr "6732"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr "Torre"
-+msgid "IAD router"
-+msgstr "Roteador IAD"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:50
--msgid "Unity Express"
--msgstr "Unity Express"
-+msgid "ICS"
-+msgstr "ICS"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr "Servidor Unity"
-+msgid "ICM"
-+msgstr "ICM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
--msgstr "Controlador de switch virtual (VSC 3000)"
-+msgid "IntelliSwitch Stack"
-+msgstr "Pilha IntelliSwitch"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:53
--msgid "Voice-Enabled ATM Switch"
--msgstr "Switch ATM habilitado por voz"
-+msgid "Unity server"
-+msgstr "Servidor Unity"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:54
--msgid "Voice-Enabled Access Server"
--msgstr "Servidor de acesso habilitado por voz"
-+msgid "Unity Express"
-+msgstr "Unity Express"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:55
--msgid "Voice-Enabled Router"
--msgstr "Roteador habilitado por voz"
-+msgid "MCU"
-+msgstr "MCU"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:56
- msgid "uMG series"
- msgstr "uMG series"
- 
- #: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr "Areador com bolhas"
-+msgid "Civil"
-+msgstr "Civil"
- 
- #: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr "Prevenção de refluxo"
-+msgid "Civil Engineering Components"
-+msgstr "Componentes de Engenharia Civil"
- 
- #: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Bacia"
-+msgid "Vertical rest"
-+msgstr "Apoio vertical"
- 
- #: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Apoio vertical bivalente"
-+msgid "Horizontal rest"
-+msgstr "Apoio horizontal"
- 
- #: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Civil"
-+msgid "Bivalent vertical rest"
-+msgstr "Apoio vertical bivalente"
- 
- #: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Componentes de Engenharia Civil"
-+msgid "Reference line"
-+msgstr "Linha de referência"
- 
- #: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Recipiente"
-+msgid "Water level"
-+msgstr "Nível da água"
- 
- #: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Bacia de depósito final"
-+msgid "Soil"
-+msgstr "Solo"
- 
- #: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Conversor de freqüência"
-+msgid "Horizontally aligned arrow"
-+msgstr "Seta alinhada horizontalmente"
- 
- #: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Cilindro de gás"
-+msgid "Vertically aligned arrow"
-+msgstr "Seta alinhada verticalmente"
- 
- #: ../sheets/civil.sheet.in.h:11
- msgid "Horizontal limiting line"
- msgstr "Linha limite horizontal"
- 
- #: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Apoio horizontal"
-+msgid "Vertical limiting line"
-+msgstr "Linha limite vertical"
- 
- #: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Seta alinhada horizontalmente"
-+msgid "Horizontally aligned pump"
-+msgstr "Bomba alinhada horizontalmente"
- 
- #: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Compressor alinhado horizontalmente"
-+msgid "Vertically aligned pump"
-+msgstr "Bomba alinhada verticalmente"
- 
- #: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Bomba alinhada horizontalmente"
-+msgid "Horizontally aligned compressor"
-+msgstr "Compressor alinhado horizontalmente"
- 
- #: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Válvula alinhada horizontalmente"
-+msgid "Vertically aligned compressor"
-+msgstr "Compressor alinhado verticalmente"
- 
- #: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Motor"
-+msgid "Vertically aligned valve"
-+msgstr "Válvula alinhada verticalmente"
- 
- #: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Tanque de clarificação preliminar"
-+msgid "Horizontally aligned valve"
-+msgstr "Válvula alinhada horizontalmente"
- 
- #: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Linha de referência"
-+msgid "Backflow preventer"
-+msgstr "Prevenção de refluxo"
- 
- #: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Rotor"
-+msgid "Motor"
-+msgstr "Motor"
- 
- #: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Solo"
-+msgid "Gas bottle"
-+msgstr "Cilindro de gás"
- 
- #: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "Linha limite vertical"
-+msgid "Frequency converter"
-+msgstr "Conversor de freqüência"
- 
- #: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "Apoio vertical"
-+msgid "Vertically aligned propeller"
-+msgstr "Hélice alinhada verticalmente"
- 
- #: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "Seta alinhada verticalmente"
-+msgid "Aerator with bubbles"
-+msgstr "Areador com bolhas"
- 
- #: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "Compressor alinhado verticalmente"
-+msgid "Rotor"
-+msgstr "Rotor"
- 
- #: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "Hélice alinhada verticalmente"
-+msgid "Final-settling basin"
-+msgstr "Bacia de depósito final"
- 
- #: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "Bomba alinhada verticalmente"
-+msgid "Preliminary clarification tank"
-+msgstr "Tanque de clarificação preliminar"
- 
- #: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "Válvula alinhada verticalmente"
-+msgid "Basin"
-+msgstr "Bacia"
- 
- #: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "Nível da água"
-+msgid "Container"
-+msgstr "Recipiente"
- 
- #: ../sheets/jigsaw.sheet.in.h:1
- msgid "Jigsaw"
- msgstr "Quebra-cabeças"
- 
- #: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Quebra-cabeças - parte_iiii"
-+msgid "Pieces of a jigsaw"
-+msgstr "Peças de quebra-cabeças"
- 
- #: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Quebra-cabeças - parte_iiio"
-+msgid "Jigsaw - part_oioi"
-+msgstr "Quebra-cabeças - parte_oioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Quebra-cabeças - parte_iioi"
-+msgid "Jigsaw - part_ioio"
-+msgstr "Quebra-cabeças - parte_ioio"
- 
- #: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Quebra-cabeças - parte_iioo"
-+msgid "Jigsaw - part_iiii"
-+msgstr "Quebra-cabeças - parte_iiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Quebra-cabeças - parte_ioii"
-+msgid "Jigsaw - part_oooo"
-+msgstr "Quebra-cabeças - parte_oooo"
- 
- #: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Quebra-cabeças - parte_ioio"
-+msgid "Jigsaw - part_oooi"
-+msgstr "Quebra-cabeças - parte_oooi"
- 
- #: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Quebra-cabeças - parte_iooi"
--
--#: ../sheets/jigsaw.sheet.in.h:9
- msgid "Jigsaw - part_iooo"
- msgstr "Quebra-cabeças - parte_iooo"
- 
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Quebra-cabeças - parte_oioo"
-+
- #: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Quebra-cabeças - parte_oiii"
-+msgid "Jigsaw - part_ooio"
-+msgstr "Quebra-cabeças - parte_ooio"
- 
- #: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Quebra-cabeças - parte_oiio"
-+msgid "Jigsaw - part_iioo"
-+msgstr "Quebra-cabeças - parte_iioo"
- 
- #: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Quebra-cabeças - parte_oioi"
-+msgid "Jigsaw - part_oiio"
-+msgstr "Quebra-cabeças - parte_oiio"
- 
- #: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Quebra-cabeças - parte_oioo"
--
--#: ../sheets/jigsaw.sheet.in.h:14
- msgid "Jigsaw - part_ooii"
- msgstr "Quebra-cabeças - parte_ooii"
- 
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Quebra-cabeças - parte_iooi"
-+
- #: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Quebra-cabeças - parte_ooio"
-+msgid "Jigsaw - part_oiii"
-+msgstr "Quebra-cabeças - parte_oiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Quebra-cabeças - parte_oooi"
-+msgid "Jigsaw - part_ioii"
-+msgstr "Quebra-cabeças - parte_ioii"
- 
- #: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Quebra-cabeças - parte_oooo"
-+msgid "Jigsaw - part_iioi"
-+msgstr "Quebra-cabeças - parte_iioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Peças de quebra-cabeças"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr "Painel de 24 portas"
-+msgid "Jigsaw - part_iiio"
-+msgstr "Quebra-cabeças - parte_iiio"
- 
- #: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "Disquete de 3 1/2 polegadas"
-+msgid "Objects to design network diagrams with"
-+msgstr "Objetos para projetar diagramas de rede"
- 
- #: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "Símbolo de switch ATM"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "Antena para transmissão sem fio"
-+msgid "Computer"
-+msgstr "Computador"
- 
- #: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "PC de torre grande"
-+msgid "Storage"
-+msgstr "Armazenamento"
- 
- #: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Computador"
-+msgid "Ethernet bus"
-+msgstr "Barramento ethernet"
- 
- #: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "PC de mesa"
-+msgid "Simple printer"
-+msgstr "Impressora simples"
- 
- #: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Mesa de digitalização"
-+msgid "WAN connection"
-+msgstr "Conexão WAN"
- 
- #: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Barramento ethernet"
-+msgid "WAN link"
-+msgstr "Link WAN"
- 
- #: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Unidade DAT externa"
-+msgid "Stackable hub or switch"
-+msgstr "Hub ou switch empilhável"
- 
- #: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Roteador Firewall"
-+msgid "Modular switching system"
-+msgstr "Sistema de comutação modular"
- 
- #: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "PC portátil"
-+msgid "24 Port Patch Panel"
-+msgstr "Painel de 24 portas"
- 
- #: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "Torre média de PC"
-+msgid "RJ45 wall-plug"
-+msgstr "Tomada RJ45"
- 
- #: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "Minitorre de PC"
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Tomada do sistema de cabeamento scEAD"
- 
- #: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Telefone celular"
-+msgid "Simple modem"
-+msgstr "Modem simples"
- 
- #: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antena para transmissão sem fio"
-+
-+#: ../sheets/network.sheet.in.h:17
- msgid "Mobile telephony base station"
- msgstr "Estação base de telefonia móvel celular"
- 
--#: ../sheets/network.sheet.in.h:17
-+#: ../sheets/network.sheet.in.h:19
- msgid "Mobile telephony cell"
- msgstr "Telefone móvel celular"
- 
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Sistema de comutação modular"
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Símbolo de roteador"
-+
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Símbolo de switch"
- 
- #: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Objetos para projetar diagramas de rede"
-+msgid "ATM switch symbol"
-+msgstr "Símbolo de switch ATM"
- 
- #: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Plotter"
-+msgid "Firewall router"
-+msgstr "Roteador Firewall"
- 
- #: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "Tomada RJ45"
-+msgid "Workstation monitor"
-+msgstr "Monitor de estação de trabalho"
- 
- #: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Símbolo de roteador"
-+msgid "UNIX workstation"
-+msgstr "Estação de trabalho UNIX"
- 
- #: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Modem simples"
-+msgid "Desktop PC"
-+msgstr "PC de mesa"
- 
- #: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Impressora simples"
-+msgid "Laptop PC"
-+msgstr "PC portátil"
- 
- #: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Auto-falante com amplificador integrado"
-+msgid "Bigtower PC"
-+msgstr "PC de torre grande"
- 
- #: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Auto-falante sem amplificador"
-+msgid "Miditower PC"
-+msgstr "Torre média de PC"
- 
- #: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Hub ou switch empilhável"
-+msgid "Minitower PC"
-+msgstr "Minitorre de PC"
- 
- #: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Armazenamento"
-+msgid "Speaker with integrated amplifier"
-+msgstr "Auto-falante com amplificador integrado"
- 
- #: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Símbolo de switch"
-+msgid "Speaker without amplifier"
-+msgstr "Auto-falante sem amplificador"
-+
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "Disquete de 3 1/2 polegadas"
- 
- #: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "Estação de trabalho UNIX"
-+msgid "ZIP disk"
-+msgstr "Disco ZIP"
- 
- #: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "Conexão WAN"
-+msgid "External DAT drive"
-+msgstr "Unidade DAT externa"
- 
- #: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "Link WAN"
--
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Tomada do sistema de cabeamento scEAD"
-+msgid "Mobile phone"
-+msgstr "Telefone celular"
- 
- #: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Monitor de estação de trabalho"
-+msgid "Plotter"
-+msgstr "Plotter"
- 
- #: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "Disco ZIP"
-+msgid "Digitizing board"
-+msgstr "Mesa de digitalização"
- 
- #: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr "Gerenciador de transferência de logs ou agente de replicação"
-+msgid "Sybase"
-+msgstr "Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:2
- msgid "Objects to design Sybase replication domain diagrams with"
- msgstr "Objetos para projetar diagramas de domínios de replicação Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Gerenciador de servidor de replicação"
-+msgid "Sybase dataserver"
-+msgstr "Servidor de dados Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Dispositivo de armazenamento estável"
-+msgid "Sybase replication server"
-+msgstr "Servidor de replicação Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+msgid "Log transfer manager or rep agent"
-+msgstr "Gerenciador de transferência de logs ou agente de replicação"
- 
- #: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Aplicação Sybase cliente"
-+msgid "Stable storage device"
-+msgstr "Dispositivo de armazenamento estável"
- 
- #: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Servidor de dados Sybase"
-+msgid "Sybase client application"
-+msgstr "Aplicação Sybase cliente"
- 
- #: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Servidor de replicação Sybase"
-+msgid "Replication server manager"
-+msgstr "Gerenciador de servidor de replicação"
-+
-+#~ msgid "'%s' not found!\n"
-+#~ msgstr "\"%s\" não encontrado!\n"
-+
-+#~| msgid "'%s' not found!\n"
-+#~ msgid "'%s' not found in '%s'!\n"
-+#~ msgstr "\"%s\" não encontrado em \"%s\"!\n"
-+
-+#~ msgid ""
-+#~ "You have loaded a non-Dia file.  The file has become an element in a new "
-+#~ "diagram, and if you save it, it will be saved as a Dia diagram."
-+#~ msgstr ""
-+#~ "Você carregou um arquivo que não é do Dia. O arquivo tornou-se um "
-+#~ "elemento em um novo diagrama e se você salvá-lo, ele será salvo como um "
-+#~ "diagrama do Dia."
-+
-+#~ msgid "active"
-+#~ msgstr "ativo"
-+
-+#~ msgid "NULL tooldata in tool_select_update"
-+#~ msgstr "Dados de ferramenta NULOS em tool_select_update"
-+
-+#~ msgid "Edit Layer Attributes"
-+#~ msgstr "Editar atributos da camada"
-+
-+#~ msgid "_Diagram"
-+#~ msgstr "_Diagrama"
-+
-+#~ msgid "Integrated UI"
-+#~ msgstr "Interface de usuário integrada"
-+
-+#~ msgid "User Interface type settings change will take after restart"
-+#~ msgstr ""
-+#~ "As alterações da configuração de tipo da interface de usuário terão "
-+#~ "efeito após o reinício do programa"
-+
-+#~ msgid ""
-+#~ "Your local character set is UTF-8. Because of issues with libxml1 and the "
-+#~ "support of files generated by previous versions of dia, you will "
-+#~ "encounter  problems. Please report to dia-list@gnome.org if you see this "
-+#~ "message."
-+#~ msgstr ""
-+#~ "O seu conjunto de caracteres local é UTF-8. Devido a particularidades com "
-+#~ "a libxml1 e o suporte de arquivos gerados por versões anteriores do Dia, "
-+#~ "você poderá encontrar problemas. Por favor, relate para dia-list@gnome."
-+#~ "org se você recebeu esta mensagem."
-+
-+#~ msgid "Flip Horizontal"
-+#~ msgstr "Virar na horizontal"
-+
-+#~ msgid "Flip Vertical"
-+#~ msgstr "Virar na vertical"
-+
-+#~ msgid "Add Segment"
-+#~ msgstr "Adicionar segmento"
-+
-+#~ msgid "Delete Segment"
-+#~ msgstr "Excluir segmento"
-+
-+#~ msgid "Bad vertex bulge\n"
-+#~ msgstr "Conjunto de vértices mal formado\n"
-+
-+#~ msgid "Scale: %f\n"
-+#~ msgstr "Escala: %f\n"
-+
-+#~ msgid "Unknown dxf code %d\n"
-+#~ msgstr "Código dxf %d desconhecido\n"
- 
- #~ msgid "Show this help message"
- #~ msgstr "Mostrar esta mensagem de ajuda"
-@@ -10593,9 +10929,6 @@ msgstr "Servidor de replicação Sybase"
- #~ msgid "/Select/Replace"
- #~ msgstr "/Selecionar/Substituir"
- 
--#~ msgid "/Select/Union"
--#~ msgstr "/Selecionar/União"
--
- #~ msgid "/Select/Remove"
- #~ msgstr "/Selecionar/Remover"
- 
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0009-Updated-Hungarian-translation.patch b/graphics/dia/patches/0009-Updated-Hungarian-translation.patch
deleted file mode 100644
index 03422e4d30..0000000000
--- a/graphics/dia/patches/0009-Updated-Hungarian-translation.patch
+++ /dev/null
@@ -1,7489 +0,0 @@
-From a016c28489529bd2ceab0604943f3099d520cae7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= <urbalazs@src.gnome.org>
-Date: Sun, 13 Jan 2013 16:23:26 +0100
-Subject: [PATCH 09/24] Updated Hungarian translation
-
----
- po/hu.po | 4516 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 2272 insertions(+), 2244 deletions(-)
-
-diff --git a/po/hu.po b/po/hu.po
-index a8c569c..687c009 100644
---- a/po/hu.po
-+++ b/po/hu.po
-@@ -9,97 +9,110 @@
- # Kalman Kemenczy <kkemenczy at novell dot com>, 2005.
- # Szabolcs Varga <shirokuma at shirokuma dot hu>, 2005.
- # Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009.
-+# Balázs Úr <urbalazs at gmail dot com>, 2013.
- msgid ""
- msgstr ""
- "Project-Id-Version: dia 0-97\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-10-11 14:35+0200\n"
--"PO-Revision-Date: 2009-10-11 14:36+0200\n"
--"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-+"product=dia&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2012-12-28 03:17+0000\n"
-+"PO-Revision-Date: 2013-01-13 16:23+0100\n"
-+"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
- "Language-Team: Hungarian <gnome at fsf dot hu>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.11.4\n"
-+"X-Generator: Lokalize 1.2\n"
- "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
- 
- #. This is not an errror
--#: ../app/app_procs.c:214
-+#: ../app/app_procs.c:209
- #, c-format
- msgid "Warning: invalid layer range %lu - %lu\n"
- msgstr "Figyelmeztetés: érvénytelen rétegtartomány %lu - %lu\n"
- 
--#: ../app/app_procs.c:226
-+#: ../app/app_procs.c:221
- #, c-format
- msgid "Warning: Layer %lu (%s) selected more than once.\n"
- msgstr "Figyelmeztetés: %lu (%s) réteg egynél többször lett kiválasztva.\n"
- 
--#: ../app/app_procs.c:252
-+#: ../app/app_procs.c:247
- #, c-format
- msgid "Warning: Layer %d (%s) selected more than once.\n"
- msgstr "Figyelmeztetés: %d (%s) réteg egynél többször lett kiválasztva.\n"
- 
--#: ../app/app_procs.c:261
-+#: ../app/app_procs.c:256
- #, c-format
- msgid "Warning: There is no layer named %s\n"
- msgstr "Figyelmeztetés: %s nevű réteg nem létezik\n"
- 
--#: ../app/app_procs.c:343
-+#: ../app/app_procs.c:338
- #, c-format
- msgid "%s error: don't know how to export into %s\n"
- msgstr "%s hiba: nem lehet exportálni ebbe: %s\n"
- 
--#: ../app/app_procs.c:352
-+#: ../app/app_procs.c:347
- #, c-format
- msgid "%s error: input and output file name is identical: %s"
- msgstr "%s hiba: a bemeneti és kimeneti fájlok neve azonos: %s"
- 
--#: ../app/app_procs.c:360
-+#: ../app/app_procs.c:355
- #, c-format
- msgid "%s error: need valid input file %s\n"
- msgstr "%s hiba: %s érvényes bemeneti fájl kell\n"
- 
- #. if (!quiet)
--#: ../app/app_procs.c:385
-+#: ../app/app_procs.c:383
- #, c-format
- msgid "%s --> %s\n"
- msgstr "%s --> %s\n"
- 
--#: ../app/app_procs.c:560
-+#: ../app/app_procs.c:558
- #, c-format
- msgid "Can't find output format/filter %s\n"
- msgstr "Nem található a(z) %s kimeneti formátum/szűrő\n"
- 
-+#: ../app/app_procs.c:628
-+#, c-format
-+msgid "Input-directory '%s' must exist!\n"
-+msgstr "A bemeneti könyvtárnak („%s�) léteznie kell!\n"
-+
-+#: ../app/app_procs.c:645
-+#, c-format
-+msgid "Output-directory '%s' must exist!\n"
-+msgstr "A kimeneti könyvtárnak („%s�) léteznie kell!\n"
-+
- #. Translators:  The argument is a list of options, not to be translated
--#: ../app/app_procs.c:638
-+#: ../app/app_procs.c:702
- #, c-format
- msgid "Select the filter/format out of: %s"
- msgstr "Válassza ki a szűrőt/formátumot ezek közül: %s"
- 
- #. &export_file_name
--#: ../app/app_procs.c:656
-+#: ../app/app_procs.c:720
- msgid "Export loaded file and exit"
- msgstr "Betöltött fájl exportálása és kilépés"
- 
--#: ../app/app_procs.c:656
-+#: ../app/app_procs.c:720
- msgid "OUTPUT"
- msgstr "KIMENET"
- 
- #. &export_file_format
- #. &export_format_string
--#: ../app/app_procs.c:658
-+#: ../app/app_procs.c:722
- msgid "TYPE"
- msgstr "T�PUS"
- 
--#: ../app/app_procs.c:660
-+#: ../app/app_procs.c:724
- msgid "Export graphics size"
- msgstr "Grafika méretének exportálása"
- 
--#: ../app/app_procs.c:660
-+#: ../app/app_procs.c:724
- msgid "WxH"
- msgstr "WxH"
- 
--#: ../app/app_procs.c:662
-+#: ../app/app_procs.c:726
- msgid ""
- "Show only specified layers (e.g. when exporting). Can be either the layer "
- "name or a range of layer numbers (X-Y)"
-@@ -107,91 +120,113 @@ msgstr ""
- "Csak a megadott réteget mutassa (pl. exportáláskor). Vagy a réteg neve vagy "
- "rétegszámok tartománya (X-Y) lehet."
- 
--#: ../app/app_procs.c:663
-+#: ../app/app_procs.c:727
- msgid "LAYER,LAYER,..."
- msgstr "RÉTEG,RÉTEG,…"
- 
--#: ../app/app_procs.c:665
-+#: ../app/app_procs.c:729
- msgid "Don't show the splash screen"
- msgstr "Ne mutassa az üdvözlő képernyőt"
- 
--#: ../app/app_procs.c:667
-+#: ../app/app_procs.c:731
- msgid "Don't create empty diagram"
- msgstr "Ne hozzon létre üres diagramot"
- 
--#: ../app/app_procs.c:669
-+#: ../app/app_procs.c:733
- msgid "Start integrated user interface (diagrams in tabs)"
- msgstr "Integrált felhasználói felület indítása (diagramok lapokon)"
- 
--#: ../app/app_procs.c:671
-+#: ../app/app_procs.c:735
- msgid "Send error messages to stderr instead of showing dialogs."
- msgstr "Hibaüzenetek küldése stderr-re felugró ablakok helyett."
- 
--#. &input_directory
--#: ../app/app_procs.c:673
-+#: ../app/app_procs.c:737
- msgid "Directory containing input files"
- msgstr "Bemeneti fájlokat tartalmazó könyvtár"
- 
--#: ../app/app_procs.c:673 ../app/app_procs.c:675
-+#: ../app/app_procs.c:737 ../app/app_procs.c:739
- msgid "DIRECTORY"
- msgstr "KÖNYVT�R"
- 
--#. &output_directory
--#: ../app/app_procs.c:675
-+#: ../app/app_procs.c:739
- msgid "Directory containing output files"
- msgstr "Kimeneti fájlokat tartalmazó könyvtár"
- 
--#: ../app/app_procs.c:677
-+#: ../app/app_procs.c:741
- msgid "Display credits list and exit"
- msgstr "Közreműködők listájának megjelenítése, majd kilépés"
- 
--#: ../app/app_procs.c:679
-+#: ../app/app_procs.c:743
- msgid "Generate verbose output"
- msgstr "Bőbeszédű kimenet generálása"
- 
--#: ../app/app_procs.c:681
-+#: ../app/app_procs.c:745
- msgid "Display version and exit"
- msgstr "Verzió megjelenítése és kilépés"
- 
-+# app/app_procs.c:178
-+#: ../app/app_procs.c:768
-+msgid "[FILE...]"
-+msgstr "[F�JL…]"
-+
-+#: ../app/app_procs.c:780
-+#, c-format
-+#| msgid "Manual operation"
-+msgid "Invalid option?"
-+msgstr "Érvénytelen kapcsoló?"
-+
-+#  TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-+#: ../app/app_procs.c:803
-+#, c-format
-+#| msgid "Dia version %s, compiled %s %s\n"
-+msgid "Filename conversion failed: %s\n"
-+msgstr "A fájlnév átalakítása nem sikerült: %s\n"
-+
-+#: ../app/app_procs.c:816
-+#, c-format
-+msgid "Missing input: %s\n"
-+msgstr "Hiányzó bemenet: %s\n"
-+
- # app/app_procs.c:167
--#: ../app/app_procs.c:738
-+#: ../app/app_procs.c:841
- msgid "Can't connect to session manager!\n"
- msgstr "Nem lehet kapcsolódni a munkafolyamat-kezelőhöz!\n"
- 
- #  TRANSLATOR: 2nd and 3rd %s are time and date respectively.
- #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
--#: ../app/app_procs.c:778
-+#: ../app/app_procs.c:881
- #, c-format
- msgid "Dia version %s, compiled %s %s\n"
- msgstr "Dia %s verzió, fordítva %s %s\n"
- 
--#: ../app/app_procs.c:780
-+#: ../app/app_procs.c:883
- #, c-format
- msgid "Dia version %s\n"
- msgstr "Dia %s verzió\n"
- 
- # app/app_procs.c:229 app/app_procs.c:231
--#: ../app/app_procs.c:818
--msgid "Couldn't find standard objects when looking for object-libs; exiting...\n"
-+#: ../app/app_procs.c:921
-+msgid ""
-+"Couldn't find standard objects when looking for object-libs; exiting...\n"
- msgstr ""
- "Nem találhatók szabvány objektumok az objektumkönyvtárak keresése közben, "
- "kilépés…\n"
- 
- # app/app_procs.c:229 app/app_procs.c:231
--#: ../app/app_procs.c:820
-+#: ../app/app_procs.c:923
- #, c-format
- msgid ""
- "Couldn't find standard objects when looking for object-libs in '%s'; "
- "exiting...\n"
- msgstr ""
--"Nem találhatók szabvány objektumok az objektumkönyvtárak keresése közben „%"
--"s� helyen, kilépés…\n"
-+"Nem találhatók szabvány objektumok az objektumkönyvtárak keresése közben "
-+"„%s� helyen, kilépés…\n"
- 
--#: ../app/app_procs.c:886
-+#: ../app/app_procs.c:990
- msgid "Diagram1.dia"
- msgstr "Diagram1.dia"
- 
--#: ../app/app_procs.c:930
-+#: ../app/app_procs.c:1025
- msgid ""
- "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
- "describing how you can cause this message to appear.\n"
-@@ -200,16 +235,16 @@ msgstr ""
- "ra\n"
- "leírva azt, hogyan tudja ezt a hibaüzenetet előcsalni.\n"
- 
--#: ../app/app_procs.c:945
-+#: ../app/app_procs.c:1040
- msgid "Exiting Dia"
- msgstr "Kilépés a Dia-ból"
- 
- #. no standard buttons
--#: ../app/app_procs.c:1009
-+#: ../app/app_procs.c:1104
- msgid "Quitting without saving modified diagrams"
- msgstr "Kilépés a módosított diagramok mentése nélkül"
- 
--#: ../app/app_procs.c:1011
-+#: ../app/app_procs.c:1106
- msgid ""
- "Modified diagrams exist. Are you sure you want to quit Dia without saving "
- "them?"
-@@ -217,15 +252,15 @@ msgstr ""
- "Módosított diagram van a rajztáblán. Tényleg mentés nélkül akar kilépni a "
- "Dia-ból?"
- 
--#: ../app/app_procs.c:1015
-+#: ../app/app_procs.c:1110
- msgid "Quit Dia"
- msgstr "Kilépés a Dia-ból"
- 
--#: ../app/app_procs.c:1084 ../app/app_procs.c:1091
-+#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
- msgid "Could not create per-user Dia config directory"
- msgstr "Nem lehet létrehozni a felhasználói Dia konfigurációs könyvtárat"
- 
--#: ../app/app_procs.c:1094
-+#: ../app/app_procs.c:1189
- msgid ""
- "Could not create per-user Dia config directory. Please make sure that the "
- "environment variable HOME points to an existing directory."
-@@ -233,36 +268,11 @@ msgstr ""
- "Nem lehet létrehozni a felhasználói Dia konfigurációs könyvtárat. Győződjön "
- "meg arról, hogy a HOME környezeti változó egy létező könyvtárra mutat."
- 
--#: ../app/app_procs.c:1117
-+#: ../app/app_procs.c:1212
- msgid "Objects and filters internal to dia"
- msgstr "A dia saját objektumai és szűrői"
- 
--# app/app_procs.c:178
--#: ../app/app_procs.c:1150
--msgid "[FILE...]"
--msgstr "[F�JL…]"
--
--#: ../app/app_procs.c:1170
--#, c-format
--msgid "Input-directory '%s' must exist!\n"
--msgstr "A bemeneti könyvtárnak („%s�) léteznie kell!\n"
--
--#: ../app/app_procs.c:1175
--#, c-format
--msgid "Output-directory '%s' must exist!\n"
--msgstr "A kimeneti könyvtárnak („%s�) léteznie kell!\n"
--
--#: ../app/app_procs.c:1181
--#, c-format
--msgid "'%s' not found!\n"
--msgstr "„%s� nem található!\n"
--
--#: ../app/app_procs.c:1189
--#, c-format
--msgid "'%s' not found in '%s'!\n"
--msgstr "„%s� nem található itt: „%s�!\n"
--
--#: ../app/app_procs.c:1238
-+#: ../app/app_procs.c:1268
- #, c-format
- msgid ""
- "The original author of Dia was:\n"
-@@ -271,7 +281,7 @@ msgstr ""
- "A Dia eredeti szerzője:\n"
- "\n"
- 
--#: ../app/app_procs.c:1243
-+#: ../app/app_procs.c:1273
- #, c-format
- msgid ""
- "\n"
-@@ -282,7 +292,7 @@ msgstr ""
- "A Dia jelenlegi karbantartói:\n"
- "\n"
- 
--#: ../app/app_procs.c:1248
-+#: ../app/app_procs.c:1278
- #, c-format
- msgid ""
- "\n"
-@@ -293,7 +303,7 @@ msgstr ""
- "Egyéb szerzők:\n"
- "\n"
- 
--#: ../app/app_procs.c:1253
-+#: ../app/app_procs.c:1283
- #, c-format
- msgid ""
- "\n"
-@@ -333,15 +343,15 @@ msgstr "Nem található nyomtatási bővítmény!"
- msgid "Diagram%d.dia"
- msgstr "Diagram%d.dia"
- 
--#: ../app/commands.c:343
-+#: ../app/commands.c:344
- msgid "No existing object to paste.\n"
- msgstr "Nincs beillesztendő objektum.\n"
- 
--#: ../app/commands.c:646 ../app/commands.c:684
-+#: ../app/commands.c:653 ../app/commands.c:691
- msgid "Could not find help directory"
- msgstr "Nem található a súgó könyvtára"
- 
--#: ../app/commands.c:653
-+#: ../app/commands.c:660
- #, c-format
- msgid ""
- "Could not open help directory:\n"
-@@ -350,7 +360,7 @@ msgstr ""
- "Nem lehet megnyitni a súgókönyvtárat:\n"
- "%s"
- 
--#: ../app/commands.c:720
-+#: ../app/commands.c:727
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
- msgstr ""
- "Bán Szabolcs <shooby@gnome.hu>\n"
-@@ -360,7 +370,7 @@ msgstr ""
- "Kovács Emese <emese@gnome.hu>\n"
- "Varga Szabolcs <shirokuma@shirokuma.hu>"
- 
--#: ../app/commands.c:722
-+#: ../app/commands.c:729
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -389,7 +399,7 @@ msgstr ""
- "ha nem kapta meg, írjon a Free Software Foundation Inc.-nek. \n"
- "Levélcímük: 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- 
--#: ../app/commands.c:745
-+#: ../app/commands.c:752
- msgid "A program for drawing structured diagrams."
- msgstr "Strukturált diagramok szerkesztésére szolgáló program."
- 
-@@ -405,7 +415,8 @@ msgstr "Egy %d oldalból álló diagram exportálására készül."
- 
- #: ../app/confirm.c:73
- #, c-format
--msgid "You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgid ""
-+"You are about to export a diagram which may require %s of memory.(%d pages)."
- msgstr ""
- "Egy olyan diagram exportálására készül, amely %s memóriát igényelhet (%d "
- "oldal)."
-@@ -701,7 +712,12 @@ msgstr ""
- msgid "Properties..."
- msgstr "Tulajdonságok…"
- 
--#: ../app/disp_callbacks.c:1067
-+#: ../app/disp_callbacks.c:248
-+#| msgid "Select None"
-+msgid "Selection"
-+msgstr "Kijelölés"
-+
-+#: ../app/disp_callbacks.c:1075
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -725,20 +741,20 @@ msgid "Selected '%s'"
- msgstr "„%s� kiválasztva"
- 
- #. we really should not come here but instead disable the menu command earlier
--#: ../app/display.c:1081
-+#: ../app/display.c:1121
- msgid "No anti-aliased renderer found"
- msgstr "Nem található élsimítást használó megjelenítő"
- 
--#: ../app/display.c:1219
-+#: ../app/display.c:1259
- msgid "<unnamed>"
- msgstr "<névtelen>"
- 
- #. no standard buttons
--#: ../app/display.c:1225
-+#: ../app/display.c:1265
- msgid "Closing diagram without saving"
- msgstr "Diagram bezárása mentés nélkül"
- 
--#: ../app/display.c:1227
-+#: ../app/display.c:1267
- #, c-format
- msgid ""
- "The diagram '%s'\n"
-@@ -747,11 +763,11 @@ msgstr ""
- "A(z) „%s� diagram\n"
- "nem lett mentve. Menti most a változásokat?"
- 
--#: ../app/display.c:1229
-+#: ../app/display.c:1269
- msgid "Close Diagram"
- msgstr "Diagram bezárása"
- 
--#: ../app/display.c:1234
-+#: ../app/display.c:1274
- msgid "_Discard Changes"
- msgstr "_Változtatások eldobása"
- 
-@@ -912,22 +928,22 @@ msgstr "Csak _teljes szóra"
- msgid "Match _all properties (not just object name)"
- msgstr "Min_den tulajdonságra (nem csak az objektumnévre)"
- 
--#: ../app/find-and-replace.c:510
-+#: ../app/find-and-replace.c:513
- msgid "Find"
- msgstr "Keresés"
- 
--#: ../app/find-and-replace.c:542 ../app/menus.c:267
-+#: ../app/find-and-replace.c:545 ../app/menus.c:267
- msgid "Replace"
- msgstr "Csere"
- 
--#: ../app/find-and-replace.c:545
-+#: ../app/find-and-replace.c:548
- msgid "Replace _All"
- msgstr "Öss_zes cseréje"
- 
- #. not adding the button in the list above to modify it's text;
- #. * the default "Find and Replace" is just too long for my taste ;)
- #.
--#: ../app/find-and-replace.c:550
-+#: ../app/find-and-replace.c:553
- msgid "_Replace"
- msgstr "_Csere"
- 
-@@ -1044,7 +1060,7 @@ msgstr "%s nevű lap nincs"
- msgid "Other sheets"
- msgstr "Más lapok"
- 
--#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:10
-+#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:1
- msgid "Flowchart"
- msgstr "Folyamatábra"
- 
-@@ -1155,7 +1171,7 @@ msgstr "Vonalvastagság"
- msgid "Line width:"
- msgstr "Vonalvastagság:"
- 
--#: ../app/load_save.c:296
-+#: ../app/load_save.c:301
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
-@@ -1163,7 +1179,7 @@ msgstr ""
- "Hiba a diagram betöltése közben.\n"
- "A hivatkozott objektum nem található a dokumentumban."
- 
--#: ../app/load_save.c:300
-+#: ../app/load_save.c:305
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1172,7 +1188,7 @@ msgstr ""
- "Hiba a diagram betöltése közben.\n"
- "A(z) %d számú csatlakozásleíró nem létezik ezen: „%s�."
- 
--#: ../app/load_save.c:328
-+#: ../app/load_save.c:333
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1181,23 +1197,23 @@ msgstr ""
- "Hiba a diagram betöltése közben.\n"
- "A(z) %d számú csatlakozási pont nem létezik ezen: „%s�."
- 
--#: ../app/load_save.c:368
-+#: ../app/load_save.c:373
- #, c-format
- msgid "Can't find parent %s of %s object\n"
- msgstr "Nem található a(z) %s objektum %s szülője.\n"
- 
--#: ../app/load_save.c:417
-+#: ../app/load_save.c:422
- msgid "You must specify a file, not a directory.\n"
- msgstr "Fájlt kell megadnia, nem könyvtárat.\n"
- 
--#: ../app/load_save.c:424 ../plug-ins/dxf/dxf-import.c:1309
-+#: ../app/load_save.c:429 ../plug-ins/dxf/dxf-import.c:1309
- #: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
- #: ../plug-ins/xslt/xslt.c:91
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "A(z) „%s� nem nyitható meg olvasásra.\n"
- 
--#: ../app/load_save.c:442 ../app/load_save.c:448
-+#: ../app/load_save.c:447 ../app/load_save.c:453
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1206,7 +1222,7 @@ msgstr ""
- "Hiba a(z) %s diagram betöltése közben.\n"
- "Ismeretlen fájltípus."
- 
--#: ../app/load_save.c:456
-+#: ../app/load_save.c:461
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1215,7 +1231,7 @@ msgstr ""
- "Hiba a(z) %s diagram betöltése közben.\n"
- "Nem Dia-fájl."
- 
--#: ../app/load_save.c:673
-+#: ../app/load_save.c:678
- #, c-format
- msgid ""
- "Error loading diagram:\n"
-@@ -1226,43 +1242,43 @@ msgstr ""
- "%s.\n"
- "Az érvényes Dia-fájl legalább egy réteget tartalmaz."
- 
--#: ../app/load_save.c:996
-+#: ../app/load_save.c:1001
- #, c-format
- msgid "Not allowed to write to output file %s\n"
- msgstr "Az írás nem engedélyezett a(z) %s kimeneti fájlba\n"
- 
--#: ../app/load_save.c:1028
-+#: ../app/load_save.c:1033
- #, c-format
- msgid "Not allowed to write temporary files in %s\n"
- msgstr "Az írás nem engedélyezett a(z) %s alatti ideiglenes fájlokba\n"
- 
--#: ../app/load_save.c:1050 ../plug-ins/cairo/diacairo.c:121
-+#: ../app/load_save.c:1055 ../plug-ins/cairo/diacairo.c:121
- #: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
- #: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
--#: ../plug-ins/libart/export_png.c:157
-+#: ../plug-ins/libart/export_png.c:159
- #: ../plug-ins/metapost/render_metapost.c:1177
- #: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
- #: ../plug-ins/pstricks/render_pstricks.c:916
- #: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
--#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
--#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:99
-+#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
-+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
- #, c-format
- msgid "Can't open output file %s: %s\n"
- msgstr "Nem lehet megnyitni a(z) %s kimeneti fájlt: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:1061
-+#: ../app/load_save.c:1066
- #, c-format
- msgid "Internal error %d writing file %s\n"
- msgstr "%d. belső hiba %s fájl írásakor\n"
- 
--#: ../app/load_save.c:1072
-+#: ../app/load_save.c:1077
- #, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
- msgstr "Nem lehet átnevezni a(z) %s-t a(z) %s kimeneti fájllá: %s\n"
- 
--#: ../app/load_save.c:1163 ../app/load_save.c:1168
-+#: ../app/load_save.c:1168 ../app/load_save.c:1173
- msgid "Dia Diagram File"
- msgstr "Dia-diagramfájl"
- 
-@@ -1505,7 +1521,7 @@ msgstr "_Kijelölés"
- msgid "All"
- msgstr "Mindent"
- 
--#: ../app/menus.c:206 ../lib/arrows.c:1884 ../objects/Jackson/domain.c:96
-+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
- #: ../objects/UML/association.c:221 ../objects/UML/association.c:227
- msgid "None"
- msgstr "Semmit"
-@@ -1811,7 +1827,7 @@ msgstr "megjelenítés élsimítással"
- #. Translators: Menu item Verb/Channel/Export
- #. Translators: Menu item Verb/Channel/Export/Export
- #: ../app/preferences.c:221 ../objects/FS/function.c:698
--#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:326
-+#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
- msgid "Export"
- msgstr "Exportálás"
- 
-@@ -1819,7 +1835,7 @@ msgstr "Exportálás"
- msgid "Portable Network Graphics"
- msgstr "Portable Network Graphics"
- 
--#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:515
-+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
- #: ../plug-ins/svg/svg-import.c:884
- msgid "Scalable Vector Graphics"
- msgstr "Scalable Vector Graphics (SVG)"
-@@ -2167,148 +2183,148 @@ msgstr "Dia diagramszerkesztő"
- msgid "Edit your Diagrams"
- msgstr "Diagramok szerkesztése"
- 
--#: ../lib/arrows.c:1885
-+#: ../lib/arrows.c:1899
- msgid "Lines"
- msgstr "Vonalak"
- 
--#: ../lib/arrows.c:1886
-+#: ../lib/arrows.c:1900
- msgid "Hollow Triangle"
- msgstr "Lyukas háromszög"
- 
--#: ../lib/arrows.c:1887
-+#: ../lib/arrows.c:1901
- msgid "Filled Triangle"
- msgstr "Kitöltött háromszög"
- 
--#: ../lib/arrows.c:1888
-+#: ../lib/arrows.c:1902
- msgid "Unfilled Triangle"
- msgstr "Üres háromszög"
- 
--#: ../lib/arrows.c:1889
-+#: ../lib/arrows.c:1903
- msgid "Hollow Diamond"
- msgstr "Üres gyémánt"
- 
--#: ../lib/arrows.c:1890
-+#: ../lib/arrows.c:1904
- msgid "Filled Diamond"
- msgstr "Kitöltött gyémánt"
- 
--#: ../lib/arrows.c:1891
-+#: ../lib/arrows.c:1905
- msgid "Half Diamond"
- msgstr "Fél gyémánt"
- 
--#: ../lib/arrows.c:1892
-+#: ../lib/arrows.c:1906
- msgid "Half Head"
- msgstr "Fél fej"
- 
--#: ../lib/arrows.c:1893
-+#: ../lib/arrows.c:1907
- msgid "Slashed Cross"
- msgstr "�thúzott kereszt"
- 
--#: ../lib/arrows.c:1894
-+#: ../lib/arrows.c:1908
- msgid "Filled Ellipse"
- msgstr "Teli ellipszis"
- 
--#: ../lib/arrows.c:1895
-+#: ../lib/arrows.c:1909
- msgid "Hollow Ellipse"
- msgstr "Lyukas ellipszis"
- 
--#: ../lib/arrows.c:1896
-+#: ../lib/arrows.c:1910
- msgid "Filled Dot"
- msgstr "Kitöltött pont"
- 
--#: ../lib/arrows.c:1897
-+#: ../lib/arrows.c:1911
- msgid "Dimension Origin"
- msgstr "Dimenzióorigó"
- 
--#: ../lib/arrows.c:1898
-+#: ../lib/arrows.c:1912
- msgid "Blanked Dot"
- msgstr "Üres pötty"
- 
--#: ../lib/arrows.c:1899
-+#: ../lib/arrows.c:1913
- msgid "Double Hollow Triangle"
- msgstr "Dupla lyukas háromszög"
- 
--#: ../lib/arrows.c:1900
-+#: ../lib/arrows.c:1914
- msgid "Double Filled Triangle"
- msgstr "Dupla kitöltött háromszög"
- 
--#: ../lib/arrows.c:1901
-+#: ../lib/arrows.c:1915
- msgid "Filled Dot and Triangle"
- msgstr "Kitöltött pont és háromszög"
- 
--#: ../lib/arrows.c:1902
-+#: ../lib/arrows.c:1916
- msgid "Filled Box"
- msgstr "Kitöltött négyszög"
- 
--#: ../lib/arrows.c:1903
-+#: ../lib/arrows.c:1917
- msgid "Blanked Box"
- msgstr "Üres négyszög"
- 
--#: ../lib/arrows.c:1904
-+#: ../lib/arrows.c:1918
- msgid "Slashed"
- msgstr "�thúzott"
- 
--#: ../lib/arrows.c:1905
-+#: ../lib/arrows.c:1919
- msgid "Integral Symbol"
- msgstr "Integráljel"
- 
--#: ../lib/arrows.c:1906
-+#: ../lib/arrows.c:1920
- msgid "Crow Foot"
- msgstr "Madárláb"
- 
--#: ../lib/arrows.c:1907
-+#: ../lib/arrows.c:1921
- msgid "Cross"
- msgstr "Kereszt"
- 
--#: ../lib/arrows.c:1908
-+#: ../lib/arrows.c:1922
- msgid "1-or-many"
- msgstr "1-vagy-több"
- 
--#: ../lib/arrows.c:1909
-+#: ../lib/arrows.c:1923
- msgid "0-or-many"
- msgstr "0-vagy-több"
- 
--#: ../lib/arrows.c:1910
-+#: ../lib/arrows.c:1924
- msgid "1-or-0"
- msgstr "1-vagy-0"
- 
--#: ../lib/arrows.c:1911
-+#: ../lib/arrows.c:1925
- msgid "1 exactly"
- msgstr "pont 1"
- 
--#: ../lib/arrows.c:1912
-+#: ../lib/arrows.c:1926
- msgid "Filled Concave"
- msgstr "Kitöltött konkáv"
- 
--#: ../lib/arrows.c:1913
-+#: ../lib/arrows.c:1927
- msgid "Blanked Concave"
- msgstr "Üres konkáv"
- 
--#: ../lib/arrows.c:1914
-+#: ../lib/arrows.c:1928
- msgid "Round"
- msgstr "Kerek"
- 
--#: ../lib/arrows.c:1915
-+#: ../lib/arrows.c:1929
- msgid "Open Round"
- msgstr "Félkör"
- 
--#: ../lib/arrows.c:1916
-+#: ../lib/arrows.c:1930
- msgid "Backslash"
- msgstr "Fordított törtvonal"
- 
--#: ../lib/arrows.c:1917
-+#: ../lib/arrows.c:1931
- msgid "Infinite Line"
- msgstr "Végtelen egyenes"
- 
--#: ../lib/arrows.c:2045
-+#: ../lib/arrows.c:2059
- msgid "Arrow head of unknown type"
- msgstr "Ismeretlen típusú nyílvég"
- 
--#: ../lib/arrows.c:2053
-+#: ../lib/arrows.c:2067
- #, c-format
- msgid "Arrow head of type %s has too small dimensions, removing.\n"
- msgstr "A(z) %s típusú nyílvég túl kicsi, eltávolítás.\n"
- 
--#: ../lib/arrows.c:2186
-+#: ../lib/arrows.c:2200
- msgid "unknown arrow"
- msgstr "ismeretlen nyíl"
- 
-@@ -2319,7 +2335,7 @@ msgstr "Belső hiba: a Bezier-végpont saroktípusának megadása"
- #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
- #: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
- #: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
--#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:144
-+#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
- msgid "Can't find standard object"
- msgstr "Nem található a szabványos objektum"
- 
-@@ -2377,7 +2393,7 @@ msgstr "Hiba a p2 bezpoint elemzése közben."
- msgid "Error parsing bezpoint p3."
- msgstr "Hiba a p3 bezpoint elemzése közben."
- 
--#: ../lib/diaarrowchooser.c:352
-+#: ../lib/diaarrowchooser.c:361
- msgid "Arrow Properties"
- msgstr "Nyíl tulajdonságai"
- 
-@@ -2500,7 +2516,8 @@ msgstr "URL"
- 
- #: ../lib/prop_inttypes.c:558
- msgid "Property cast from int to enum out of range"
--msgstr "A tulajdonság-átalakítás egészről felsorolásra kívül esik a tartományon"
-+msgstr ""
-+"A tulajdonság-átalakítás egészről felsorolásra kívül esik a tartományon"
- 
- #: ../lib/prop_text.c:469
- #, c-format
-@@ -2667,12 +2684,12 @@ msgstr "Válasszon ki egy képfájlt"
- msgid "Browse"
- msgstr "Tallózás"
- 
--#: ../lib/widgets.c:2076
-+#: ../lib/widgets.c:2087
- msgid "Reset menu"
- msgstr "Menü visszaállítása"
- 
- #. Installer message if no GTK+ was found
--#: ../installer/win32/gennsh.c:38
-+#: ../installer/win32/gennsh.c:39
- msgid ""
- "GTK+ is not installed. Please use the full installer. It is available from "
- "http://dia-installer.de."
-@@ -2681,7 +2698,7 @@ msgstr ""
- "elérhető teljes telepítőt."
- 
- #. Installer message: Don't install over pre 0.95 versions
--#: ../installer/win32/gennsh.c:41
-+#: ../installer/win32/gennsh.c:42
- msgid ""
- "Please remove old Dia installations completely or install Dia to a different "
- "location."
-@@ -2690,12 +2707,12 @@ msgstr ""
- "a Diat."
- 
- #. Installer message:  License Page
--#: ../installer/win32/gennsh.c:44
-+#: ../installer/win32/gennsh.c:45
- msgid "Next >"
- msgstr "Tovább >"
- 
- #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
--#: ../installer/win32/gennsh.c:47
-+#: ../installer/win32/gennsh.c:48
- msgid ""
- "$(^Name) is released under the GPL license. The license is provided here for "
- "information purposes only. $_CLICK"
-@@ -2704,33 +2721,33 @@ msgstr ""
- "tájékoztatási célt szolgál. $_CLICK"
- 
- #. Installer message: Components page
--#: ../installer/win32/gennsh.c:50
-+#: ../installer/win32/gennsh.c:51
- msgid "Dia Diagram Editor (required)"
- msgstr "Dia diagramszerkesztő (kötelező)"
- 
- #. Installer message: Components page
--#: ../installer/win32/gennsh.c:53
-+#: ../installer/win32/gennsh.c:54
- msgid "Translations"
- msgstr "Fordítások"
- 
- #. Installer message: Component description
--#: ../installer/win32/gennsh.c:56
-+#: ../installer/win32/gennsh.c:57
- msgid "Optional translations of the Dia user interface"
- msgstr "A Dia felhasználói felületének fordításai"
- 
- #. Installer message: Component description
--#: ../installer/win32/gennsh.c:59
-+#: ../installer/win32/gennsh.c:60
- msgid "Core Dia files and dlls"
- msgstr "Alapvető Dia fájlok és programkönyvtárak"
- 
- # app/menus.c:43 app/plugin-manager.c:129 app/plugin-manager.c:135
- #. Installer message: Component name
--#: ../installer/win32/gennsh.c:62
-+#: ../installer/win32/gennsh.c:63
- msgid "Python plug-in"
- msgstr "Python bővítmény"
- 
- #. Installer message: Component description
--#: ../installer/win32/gennsh.c:65
-+#: ../installer/win32/gennsh.c:66
- msgid ""
- "Support for the Python Scripting Language 2.3. Do not select this if Python "
- "is not installed."
-@@ -2739,17 +2756,17 @@ msgstr ""
- "Python nincs telepítve."
- 
- #. Installer message: hyperlink text on finish page
--#: ../installer/win32/gennsh.c:68
-+#: ../installer/win32/gennsh.c:69
- msgid "Visit the Dia for Windows Web Page"
- msgstr "Keresse fel a Dia for Windows weboldalát"
- 
- #. Installer message: Dia uninstaller entry in Control Panel
--#: ../installer/win32/gennsh.c:71
-+#: ../installer/win32/gennsh.c:72
- msgid "Dia (remove only)"
- msgstr "Dia (csak eltávolítás)"
- 
- #. Installer message: confirmation question. Keep $\r
--#: ../installer/win32/gennsh.c:74
-+#: ../installer/win32/gennsh.c:75
- msgid ""
- "Your old Dia directory is about to be deleted. Would you like to continue?$\r"
- "$\rNote: Any non-standard plugins that you may have installed will be "
-@@ -2760,7 +2777,7 @@ msgstr ""
- "kerülnek.$\rA Dia felhasználói beállításait ez nem érinti."
- 
- #. Installer message: confirmatin question. Keep $\r
--#: ../installer/win32/gennsh.c:77
-+#: ../installer/win32/gennsh.c:78
- msgid ""
- "The installation directory you specified already exists. Any contents$\rwill "
- "be deleted. Would you like to continue?"
-@@ -2769,7 +2786,7 @@ msgstr ""
- "Folytatni akarja?"
- 
- #. Installer message: Uninstall Section Prompts. Keep $\r
--#: ../installer/win32/gennsh.c:80
-+#: ../installer/win32/gennsh.c:81
- msgid ""
- "The uninstaller could not find registry entries for Dia.$\rIt is likely that "
- "another user installed this application."
-@@ -2778,18 +2795,20 @@ msgstr ""
- "$\rValószínûleg másik felhasználó telepítette ezt az alkalmazást."
- 
- #. Installer message: Uninstall error message
--#: ../installer/win32/gennsh.c:83
-+#: ../installer/win32/gennsh.c:84
- msgid "You do not have permission to uninstall this application."
- msgstr "Nincs jogosultsága az alkalmazás eltávolítására."
- 
- #. Installer message: Uninstallation warning. Keep $INSTDIR
--#: ../installer/win32/gennsh.c:86
-+#: ../installer/win32/gennsh.c:87
- msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
--msgstr "Ez teljesen törli a(z) $INSTDIR könyvtárat és minden alkönyvtárát. Folytatja?"
-+msgstr ""
-+"Ez teljesen törli a(z) $INSTDIR könyvtárat és minden alkönyvtárát. Folytatja?"
- 
- #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
--#: ../installer/win32/gennsh.c:89
--msgid "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+#: ../installer/win32/gennsh.c:90
-+msgid ""
-+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
- msgstr ""
- "Ez teljesen törli a(z) $PROFILE\\.dia könyvtárat és minden alkönyvtárát. "
- "Folytatja?"
-@@ -2902,7 +2921,7 @@ msgstr "Egyed-kapcsolat tábladiagram-objektumok"
- #: ../objects/Database/table.c:200 ../objects/UML/class.c:148
- #: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
- #: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
--#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
- msgid "Comment"
- msgstr "Megjegyzés"
- 
-@@ -2936,7 +2955,7 @@ msgstr "Elsődleges kulcsok félkövérrel"
- 
- #  property rows
- #. property rows
--#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:136
-+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
- #: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
- msgid "Normal"
- msgstr "Normál"
-@@ -2967,7 +2986,7 @@ msgstr "Megjegyzések megjelenítése"
- 
- #. init data
- #: ../objects/Database/table.c:253 ../objects/Database/table.c:356
--#: ../sheets/Database.sheet.in.h:5
-+#: ../sheets/Database.sheet.in.h:3
- msgid "Table"
- msgstr "Tábla"
- 
-@@ -3102,7 +3121,7 @@ msgstr "Leírás vége"
- 
- #: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
- #: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
--#: ../objects/SADT/arrow.c:459 ../objects/UML/association.c:854
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
- #: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
- #: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
- #: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
-@@ -3112,7 +3131,7 @@ msgstr "Szakasz hozzáadása"
- 
- #: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
- #: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
--#: ../objects/SADT/arrow.c:460 ../objects/UML/association.c:855
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
- #: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
- #: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
- #: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
-@@ -3140,7 +3159,7 @@ msgstr "Származtatott:"
- msgid "Multivalue:"
- msgstr "Többértékű:"
- 
--#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
- msgid "Attribute"
- msgstr "Attribútum"
- 
-@@ -3153,7 +3172,7 @@ msgid "Associative:"
- msgstr "Társított:"
- 
- #: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
--#: ../sheets/ER.sheet.in.h:4
-+#: ../sheets/ER.sheet.in.h:3
- msgid "Entity"
- msgstr "Egyed"
- 
-@@ -3181,7 +3200,7 @@ msgstr "Forgatás:"
- msgid "Identifying:"
- msgstr "Meghatározó:"
- 
--#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Kapcsolat"
- 
-@@ -3396,7 +3415,7 @@ msgstr "Támogatás"
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
- #: ../objects/FS/function.c:768 ../objects/FS/function.c:770
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
- msgstr "Megállás"
- 
-@@ -3455,7 +3474,7 @@ msgid "Mount"
- msgstr "Felkapcsolás"
- 
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
- msgstr "Zárolás"
- 
-@@ -3543,7 +3562,7 @@ msgstr "Elegyítés"
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
- #: ../objects/FS/function.c:840 ../objects/FS/function.c:842
--#: ../sheets/UML.sheet.in.h:5
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
- msgstr "Elágazás"
- 
-@@ -3748,7 +3767,7 @@ msgid "Expose"
- msgstr "Feltárás"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Kinyerés"
- 
-@@ -3938,7 +3957,7 @@ msgid "Differentiate"
- msgstr "Szétválasztás"
- 
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
- msgstr "Megmunkálás"
-@@ -4250,7 +4269,7 @@ msgstr "Felhasználói/eszközfunkció"
- msgid "Wish Fn"
- msgstr "Wish függvény"
- 
--#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Makróhívás"
- 
-@@ -4286,19 +4305,19 @@ msgstr "A feltétel színe"
- msgid "GRAFCET diagram objects"
- msgstr "GRAFCET diagramobjektumok"
- 
--#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Szabályos lépés"
- 
--#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "Kezdőlépés"
- 
--#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Makró első lépés"
- 
--#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Makró utolsó lépés"
- 
-@@ -4380,14 +4399,14 @@ msgstr "Vergens típusa:"
- 
- #: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
- #: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
--#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:449
-+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
- #: ../objects/standard/line.c:223
- msgid "Add connection point"
- msgstr "Csatlakozási pont hozzáadása"
- 
- #: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
- #: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
--#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:450
-+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
- #: ../objects/standard/line.c:224
- msgid "Delete connection point"
- msgstr "Csatlakozási pont törlése"
-@@ -4434,7 +4453,7 @@ msgstr "Pozitív hozzájárulás"
- msgid "Negative contrib"
- msgstr "Negatív hozzájárulás"
- 
--#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Függőség"
- 
-@@ -4450,7 +4469,7 @@ msgstr "Eszközök-eredmények"
- msgid "Resource"
- msgstr "Erőforrás"
- 
--#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr "Feladat"
- 
-@@ -4666,7 +4685,7 @@ msgid "pi"
- msgstr "pi"
- 
- #. PROP_FLAG_VISIBLE|
--#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
- msgid "Measurement"
- msgstr "Mértékegység"
- 
-@@ -4686,31 +4705,31 @@ msgstr "Azonosító hozzáadása"
- msgid "Delete Handle"
- msgstr "Azonosító törlése"
- 
--#: ../objects/SADT/arrow.c:137
-+#: ../objects/SADT/arrow.c:138
- msgid "Import resource (not shown upstairs)"
- msgstr "Erőforrás importálása (az emeleten nem látszik)"
- 
--#: ../objects/SADT/arrow.c:138
-+#: ../objects/SADT/arrow.c:139
- msgid "Imply resource (not shown downstairs)"
- msgstr "Erőforrás beleértése (az alsóbb szinten nem látszik)"
- 
--#: ../objects/SADT/arrow.c:139
-+#: ../objects/SADT/arrow.c:140
- msgid "Dotted arrow"
- msgstr "Pontozott nyíl"
- 
--#: ../objects/SADT/arrow.c:140
-+#: ../objects/SADT/arrow.c:141
- msgid "disable arrow heads"
- msgstr "nyílhegyek letiltása"
- 
--#: ../objects/SADT/arrow.c:146
-+#: ../objects/SADT/arrow.c:148
- msgid "Flow style:"
- msgstr "Folyamat stílusa:"
- 
--#: ../objects/SADT/arrow.c:148
-+#: ../objects/SADT/arrow.c:150
- msgid "Automatically gray vertical flows:"
- msgstr "Függőleges folyamatok automatikus szürkítése:"
- 
--#: ../objects/SADT/arrow.c:149
-+#: ../objects/SADT/arrow.c:151
- msgid ""
- "To improve the ease of reading, flows which begin and end vertically can be "
- "rendered gray"
-@@ -4718,25 +4737,25 @@ msgstr ""
- "A jobb olvashatóság érdekében a függőlegesen induló és befejeződő folyamatok "
- "szürkén is megjeleníthetők"
- 
--#: ../objects/SADT/arrow.c:465
-+#: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
- msgstr "SADT-nyíl"
- 
--#: ../objects/SADT/box.c:139 ../objects/custom/custom_object.c:226
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
- #: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
- #: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
- msgid "Text padding"
- msgstr "Szövegköz"
- 
--#: ../objects/SADT/box.c:146
-+#: ../objects/SADT/box.c:149
- msgid "Activity/Data identifier"
- msgstr "Művelet-/adatazonosító"
- 
--#: ../objects/SADT/box.c:147
-+#: ../objects/SADT/box.c:150
- msgid "The identifier which appears in the lower right corner of the Box"
- msgstr "A mező jobb alsó sarkában megjelenő azonosító"
- 
--#: ../objects/SADT/box.c:455
-+#: ../objects/SADT/box.c:460
- msgid "SADT box"
- msgstr "SADT-mező"
- 
-@@ -5052,7 +5071,7 @@ msgstr "Fejlesztő"
- msgid "Operator / Maintenance"
- msgstr "Operátor / karbantartás"
- 
--#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
- msgid "Network"
- msgstr "Hálózat"
- 
-@@ -5068,7 +5087,7 @@ msgstr "Passzív vagy aktív közvetítő"
- msgid "Communication interface"
- msgstr "Kommunikációs felület"
- 
--#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
- msgid "Software"
- msgstr "Szoftver"
- 
-@@ -5175,7 +5194,7 @@ msgid "Document title"
- msgstr "Dokumentumcím"
- 
- #: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
--#: ../sheets/UML.sheet.in.h:2
-+#: ../sheets/UML.sheet.in.h:15
- msgid "Actor"
- msgstr "Szereplő"
- 
-@@ -5229,7 +5248,7 @@ msgid "Side B"
- msgstr "B oldal"
- 
- #: ../objects/UML/class.c:142 ../objects/UML/class.c:325
--#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
-+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
- msgid "Class"
- msgstr "Osztály"
- 
-@@ -5472,7 +5491,7 @@ msgstr "Műveletek adatai"
- msgid "_Templates"
- msgstr "_Sablonok"
- 
--#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
-+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
- msgid "Template class"
- msgstr "Sablonosztály"
- 
-@@ -5488,19 +5507,19 @@ msgstr "Határ"
- msgid "Is object"
- msgstr "Objektum?"
- 
--#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
- msgid "Facet"
- msgstr "Oldal"
- 
--#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr "Gyűjtő"
- 
--#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr "Eseményforrás"
- 
--#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr "Eseménygyűjtő"
- 
-@@ -5644,7 +5663,7 @@ msgstr "Művelet"
- msgid "Action to perform when this transition is taken"
- msgstr "A végrehajtandó művelet az átmenet bekövetkeztekor"
- 
--#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
-+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
- msgstr "�r"
- 
-@@ -5692,7 +5711,7 @@ msgstr "Együttműködés"
- msgid "Chronogram diagram objects"
- msgstr "Chronogram diagramobjektumok"
- 
--#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Adat"
- 
-@@ -5782,12 +5801,12 @@ msgid "Custom XML shapes loader"
- msgstr "Egyéni XML alakbetöltő"
- 
- #: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
--#: ../objects/custom/custom_object.c:1780
-+#: ../objects/custom/custom_object.c:1782
- msgid "Flip horizontal"
- msgstr "Vízszintes tükrözés"
- 
- #: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
--#: ../objects/custom/custom_object.c:1781
-+#: ../objects/custom/custom_object.c:1783
- msgid "Flip vertical"
- msgstr "Függőleges tükrözés"
- 
-@@ -5795,7 +5814,7 @@ msgstr "Függőleges tükrözés"
- msgid "Scale of the subshapes"
- msgstr "A részalakok mérete"
- 
--#: ../objects/custom/custom_object.c:1818
-+#: ../objects/custom/custom_object.c:1820
- #: ../objects/custom_lines/custom_linetypes.c:263
- #, c-format
- msgid "Cannot open icon file %s for object type '%s'."
-@@ -5816,7 +5835,8 @@ msgstr "BELS�: CustomLines: Érvénytelen vonaltípus a LineInfo objektumban."
- #: ../objects/custom_lines/custom_linetypes.c:251
- #, c-format
- msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
--msgstr "BELS�: CustomLines: Érvénytelen vonaltípus a LineInfo objektumban (%s)."
-+msgstr ""
-+"BELS�: CustomLines: Érvénytelen vonaltípus a LineInfo objektumban (%s)."
- 
- #: ../objects/custom/shape_info.c:162
- #, c-format
-@@ -5855,7 +5875,7 @@ msgstr "Sugár"
- msgid "Width"
- msgstr "Szélesség"
- 
--#: ../objects/standard/arc.c:143
-+#: ../objects/standard/arc.c:141
- msgid "Curve distance"
- msgstr "Görbe távolsága"
- 
-@@ -6014,7 +6034,7 @@ msgid "Clipboard copy failed"
- msgstr "A másolás meghiúsult a vágólapról"
- 
- #: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
--#: ../plug-ins/wmf/wmf.cpp:1388
-+#: ../plug-ins/wmf/wmf.cpp:1381
- msgid "Nothing to print"
- msgstr "Nincs mit nyomtatni"
- 
-@@ -6070,11 +6090,11 @@ msgstr ""
- "A képsor hossza nagyobb, mint a maximális cellatömb.\n"
- "A kép nem került CGM-be exportálásra."
- 
--#: ../plug-ins/cgm/cgm.c:1361
-+#: ../plug-ins/cgm/cgm.c:1362
- msgid "Computer Graphics Metafile"
- msgstr "Computer Graphics Metafile (CGM)"
- 
--#: ../plug-ins/cgm/cgm.c:1386
-+#: ../plug-ins/cgm/cgm.c:1387
- msgid "Computer Graphics Metafile export filter"
- msgstr "Computer Graphics Metafile exportálási szűrő"
- 
-@@ -6116,34 +6136,34 @@ msgstr "HP Graphics Language exportálási szűrő"
- msgid "Libart based rendering"
- msgstr "Libart-alapú megjelenítés"
- 
--#: ../plug-ins/libart/export_png.c:165
-+#: ../plug-ins/libart/export_png.c:167
- msgid "Could not create PNG write structure"
- msgstr "Nem lehet írható PNG struktúrát létrehozni"
- 
--#: ../plug-ins/libart/export_png.c:174
-+#: ../plug-ins/libart/export_png.c:176
- msgid "Could not create PNG header info structure"
- msgstr "Nem lehet létrehozni a PNG fejléc info struktúrát"
- 
--#: ../plug-ins/libart/export_png.c:182
-+#: ../plug-ins/libart/export_png.c:184
- msgid "Error occurred while writing PNG"
- msgstr "Hiba történt a PNG írásakor"
- 
- # app/filedlg.c:524
- #  Create a dialog
- #. Create a dialog
--#: ../plug-ins/libart/export_png.c:325
-+#: ../plug-ins/libart/export_png.c:327
- msgid "PNG Export Options"
- msgstr "PNG export tulajdonságok"
- 
--#: ../plug-ins/libart/export_png.c:331
-+#: ../plug-ins/libart/export_png.c:333
- msgid "Image width:"
- msgstr "Kép szélessége:"
- 
--#: ../plug-ins/libart/export_png.c:334
-+#: ../plug-ins/libart/export_png.c:336
- msgid "Image height:"
- msgstr "Kép magassága:"
- 
--#: ../plug-ins/libart/export_png.c:380
-+#: ../plug-ins/libart/export_png.c:382
- msgid "PNG (anti-aliased)"
- msgstr "PNG (élsimított)"
- 
-@@ -6200,11 +6220,11 @@ msgid "Select Printer"
- msgstr "Nyomtató kiválasztása"
- 
- #: ../plug-ins/postscript/paginate_psprint.c:285
--#: ../sheets/ciscocomputer.sheet.in.h:36
-+#: ../sheets/ciscocomputer.sheet.in.h:37
- msgid "Printer"
- msgstr "Nyomtató"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
- msgid "File"
- msgstr "Fájl"
- 
-@@ -6275,11 +6295,12 @@ msgstr ""
- "Az alakfájlok kiterjesztése .shape kell legyen, különben a Dia nem tölti be "
- "Å‘ket"
- 
--#: ../plug-ins/shape/shape-export.c:485
--msgid "Can't export png without libart!"
--msgstr "Nem lehet png-be exportálni libart nélkül!"
-+#: ../plug-ins/shape/shape-export.c:488
-+#| msgid "Can't export png without libart!"
-+msgid "Can't export png icon without export plug-in!"
-+msgstr "Nem lehet png ikonba exportálni exportáló bővítmény nélkül!"
- 
--#: ../plug-ins/shape/shape-export.c:510
-+#: ../plug-ins/shape/shape-export.c:512
- msgid "Dia Shape File"
- msgstr "Dia-alakfájl"
- 
-@@ -6313,53 +6334,53 @@ msgstr "Scalable Vector Graphics import- és exportszűrők"
- msgid "Couldn't read file %s"
- msgstr "Nem lehet beolvasni a fájlt: %s"
- 
--#: ../plug-ins/vdx/vdx-export.c:1905
-+#: ../plug-ins/vdx/vdx-export.c:1912
- msgid "Visio XML format"
- msgstr "Visio XML formátum"
- 
--#: ../plug-ins/vdx/vdx-import.c:226 ../plug-ins/xfig/xfig-import.c:1046
-+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
- #, c-format
- msgid "Couldn't read color: %s\n"
- msgstr "Nem lehet beolvasni a színt: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:540
-+#: ../plug-ins/vdx/vdx-import.c:541
- #, c-format
- msgid "Couldn't find shape %d\n"
- msgstr "Nem található a(z) %d alak\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1046
-+#: ../plug-ins/vdx/vdx-import.c:1047
- #, c-format
- msgid "Unexpected Ellipse object: %s\n"
- msgstr "Váratlan ellipszis objektum: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1060
-+#: ../plug-ins/vdx/vdx-import.c:1061
- msgid "Can't rotate ellipse\n"
- msgstr "Nem lehet forgatni az ellipszist\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1391
-+#: ../plug-ins/vdx/vdx-import.c:1392
- msgid "MoveTo not at start of Bezier\n"
- msgstr "A MoveTo elem nem a Bezier kezdeténél van\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1739
-+#: ../plug-ins/vdx/vdx-import.c:1740
- msgid "Invalid NURBS formula"
- msgstr "Érvénytelen NURBS képlet"
- 
--#: ../plug-ins/vdx/vdx-import.c:1983
-+#: ../plug-ins/vdx/vdx-import.c:1984
- #, c-format
- msgid "Couldn't write file %s"
- msgstr "Nem lehet írni a következő fájlba: %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:2068 ../plug-ins/vdx/vdx-import.c:2081
-+#: ../plug-ins/vdx/vdx-import.c:2069 ../plug-ins/vdx/vdx-import.c:2082
- #, c-format
- msgid "Couldn't handle foreign object type %s"
- msgstr "A külső, %s típusú objektum nem kezelhető"
- 
--#: ../plug-ins/vdx/vdx-import.c:2109
-+#: ../plug-ins/vdx/vdx-import.c:2110
- #, c-format
- msgid "Couldn't make object dir %s"
- msgstr "Nem hozható létre a következő objektumkönyvtár: %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:3090
-+#: ../plug-ins/vdx/vdx-import.c:3100
- msgid "Visio XML File Format"
- msgstr "Visio XML fájlformátum"
- 
-@@ -6377,7 +6398,7 @@ msgstr "Nem lehet írni a(z) %u. objektumba"
- msgid "Visio XML Format import and export filter"
- msgstr "Visio XML formátumú importálási és exportálási szűrő"
- 
--#: ../plug-ins/wmf/wmf.cpp:506
-+#: ../plug-ins/wmf/wmf.cpp:499
- #, c-format
- msgid ""
- "Can not render unknown font:\n"
-@@ -6386,24 +6407,24 @@ msgstr ""
- "Az ismeretlen betűkészlet nem jeleníthető meg:\n"
- "%s"
- 
--#: ../plug-ins/wmf/wmf.cpp:1265
-+#: ../plug-ins/wmf/wmf.cpp:1258
- #, c-format
- msgid "Couldn't open: '%s' for writing.\n"
- msgstr "A(z) „%s� nem nyitható meg írásra.\n"
- 
--#: ../plug-ins/wmf/wmf.cpp:1364
-+#: ../plug-ins/wmf/wmf.cpp:1357
- msgid "Windows Meta File"
- msgstr "Windows Meta File (WMF)"
- 
--#: ../plug-ins/wmf/wmf.cpp:1373
-+#: ../plug-ins/wmf/wmf.cpp:1366
- msgid "Enhanced Meta File"
- msgstr "Enhanced Meta File"
- 
--#: ../plug-ins/wmf/wmf.cpp:1395
-+#: ../plug-ins/wmf/wmf.cpp:1388
- msgid "Print (GDI) ..."
- msgstr "Nyomtatás (GDI)…"
- 
--#: ../plug-ins/wmf/wmf.cpp:1410
-+#: ../plug-ins/wmf/wmf.cpp:1403
- msgid "WMF export filter"
- msgstr "WMF-exportszűrő"
- 
-@@ -6420,18 +6441,18 @@ msgstr "WPG"
- msgid "WordPerfect Graphics export filter"
- msgstr "WordPerfect Graphics exportálási szűrő"
- 
--#: ../plug-ins/xfig/xfig-export.c:461
-+#: ../plug-ins/xfig/xfig-export.c:463
- #, c-format
- msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
- msgstr ""
- "A FIG-formátumnak nincs egyenértékű %s nyílstílusa, ezért egyszerű nyilak "
- "kerülnek felhasználásra.\n"
- 
--#: ../plug-ins/xfig/xfig-export.c:484
-+#: ../plug-ins/xfig/xfig-export.c:486
- msgid "No more user-definable colors - using black"
- msgstr "Nincs több felhasználó által megadható szín - marad a fekete"
- 
--#: ../plug-ins/xfig/xfig-export.c:1205
-+#: ../plug-ins/xfig/xfig-export.c:1207
- msgid "XFig format"
- msgstr "XFig-formátum"
- 
-@@ -6674,7 +6695,8 @@ msgstr "XSL-átalakításszűrő"
- 
- #: ../plug-ins/xslt/xslt.c:362
- msgid "No valid configuration files found for the XSLT plugin, not loading."
--msgstr "Nincs érvényes konfigurációs fájl az XSLT-bővítményhez, nem kerül betöltésre."
-+msgstr ""
-+"Nincs érvényes konfigurációs fájl az XSLT-bővítményhez, nem kerül betöltésre."
- 
- #: ../plug-ins/xslt/xsltdialog.c:97
- msgid "Export through XSLT"
-@@ -6696,607 +6718,607 @@ msgstr "AADL"
- msgid "AADL Shapes"
- msgstr "AADL alakok"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
--msgstr "Busz"
--
--#: ../sheets/AADL.sheet.in.h:5
--msgid "Device"
--msgstr "Eszköz"
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
-+msgstr "Szál"
- 
- #: ../sheets/AADL.sheet.in.h:6
-+msgid "Processor"
-+msgstr "Processzor"
-+
-+#: ../sheets/AADL.sheet.in.h:7
- msgid "Memory"
- msgstr "Memória"
- 
--#: ../sheets/AADL.sheet.in.h:7
--msgid "Package"
--msgstr "Csomag"
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Busz"
- 
- #: ../sheets/AADL.sheet.in.h:9
--msgid "Processor"
--msgstr "Processzor"
-+msgid "System"
-+msgstr "Rendszer"
- 
- #: ../sheets/AADL.sheet.in.h:10
- msgid "Subprogram"
- msgstr "Alprogram"
- 
- #: ../sheets/AADL.sheet.in.h:11
--msgid "System"
--msgstr "Rendszer"
-+msgid "Thread Group"
-+msgstr "Szálcsoport"
- 
- #: ../sheets/AADL.sheet.in.h:12
--msgid "Thread"
--msgstr "Szál"
-+msgid "Device"
-+msgstr "Eszköz"
- 
- #: ../sheets/AADL.sheet.in.h:13
--msgid "Thread Group"
--msgstr "Szálcsoport"
-+msgid "Package"
-+msgstr "Csomag"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Válogatott"
- 
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
-+#: ../sheets/Assorted.sheet.in.h:6
- msgid ""
- "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
- "Geometric Shapes"
- msgstr "Sokszögek, Bezier-alakzatok és más geometriai alakok gyűjteménye"
- 
--#. Please talk to me before making any changes to this sheet
--#: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Válogatott"
--
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "Ék alakú csík"
-+msgid "Right angle triangle"
-+msgstr "Derékszögű háromszög"
- 
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Görbe nyolcszögű csillag"
-+msgid "Isoceles triangle"
-+msgstr "Egyenlő szárú háromszög"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Görbe négyszögű csillag"
-+msgid "Perfect square, height equals width"
-+msgstr "Négyzet"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Rombusz"
-+msgid "Perfect circle"
-+msgstr "Teljes kör"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Lefelé mutató nyíl"
-+msgid "Quarter circle"
-+msgstr "Negyed kör"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "Nyolcszögű csillag"
-+msgid "Diamond"
-+msgstr "Rombusz"
- 
- #: ../sheets/Assorted.sheet.in.h:13
--msgid "Five point star"
--msgstr "Ötszögű csillag"
-+msgid "Pentagon. Five sided shape"
-+msgstr "Ötszög"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Négyszögű csillag"
-+msgid "Hexagon. Six sided shape"
-+msgstr "Hatszög"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Szív"
--
--#: ../sheets/Assorted.sheet.in.h:16
- msgid "Heptagon. Seven sided shape"
- msgstr "Hétszög"
- 
--#: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Hatszög"
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Nyolcszög"
- 
--#: ../sheets/Assorted.sheet.in.h:18
-+#: ../sheets/Assorted.sheet.in.h:17
- msgid "Horizontal parallelogram"
- msgstr "Vízszintes paralelogramma"
- 
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Függőleges paralelogramma"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Egyenlő szárú háromszög"
-+msgid "Trapezoid"
-+msgstr "Trapéz"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Balra mutató nyíl"
-+msgid "Four point star"
-+msgstr "Négyszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Balra-jobbra mutató nyíl"
-+msgid "Curved four point star"
-+msgstr "Görbe négyszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Balra, jobbra és felfelé mutató nyíl"
-+msgid "Five point star"
-+msgstr "Ötszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Balra és felfelé mutató nyíl"
-+msgid "Six point star"
-+msgstr "Hatszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Máltai kereszt"
-+msgid "Seven point star"
-+msgstr "Hétszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "Rovátkolt balra mutató nyíl"
-+msgid "Eight point star"
-+msgstr "Nyolcszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "Rovátkolt jobbra mutató nyíl"
-+msgid "Sharp eight point star"
-+msgstr "Hegyes nyolcszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "Nyolcszög"
-+msgid "Curved eight point star"
-+msgstr "Görbe nyolcszögű csillag"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "Ötszögblokk-nyíl"
-+msgid "Swiss cross"
-+msgstr "Svájci kereszt"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Ötszög"
-+msgid "Maltese cross"
-+msgstr "Máltai kereszt"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Teljes kör"
-+msgid "Down arrow"
-+msgstr "Lefelé mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Négyzet"
-+msgid "Up arrow"
-+msgstr "Felfelé mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Négyfelé mutató nyíl"
-+msgid "Left arrow"
-+msgstr "Balra mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "Negyed kör"
-+msgid "Right arrow"
-+msgstr "Jobbra mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "Negyed hold"
-+msgid "Notched left arrow"
-+msgstr "Rovátkolt balra mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Derékszögű háromszög"
-+msgid "Notched right arrow"
-+msgstr "Rovátkolt jobbra mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Jobbra mutató nyíl"
-+msgid "Left-up arrow"
-+msgstr "Balra és felfelé mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Hétszögű csillag"
-+msgid "Turn-up arrow"
-+msgstr "Felfelé forduló nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Hegyes nyolcszögű csillag"
-+msgid "Left-right arrow"
-+msgstr "Balra-jobbra mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Hatszögű csillag"
-+msgid "Up-down arrow"
-+msgstr "Felfelé és lefelé mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Nap"
-+msgid "Quad arrow"
-+msgstr "Négyfelé mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Svájci kereszt"
-+msgid "Left-right-up arrow"
-+msgstr "Balra, jobbra és felfelé mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Trapéz"
-+msgid "Up-down-left arrow"
-+msgstr "Felfelé, lefelé és balra mutató nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--msgid "Turn-up arrow"
--msgstr "Felfelé forduló nyíl"
-+msgid "Pentagon block arrow"
-+msgstr "Ötszögblokk-nyíl"
- 
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "Felfelé mutató nyíl"
-+msgid "Chevron"
-+msgstr "Ék alakú csík"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Felfelé és lefelé mutató nyíl"
-+msgid "Heart"
-+msgstr "Szív"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Felfelé, lefelé és balra mutató nyíl"
-+msgid "Sun"
-+msgstr "Nap"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "Függőleges paralelogramma"
--
--#: ../sheets/BPMN.sheet.in.h:1
--msgid "Activity Looping"
--msgstr "Tevékenységciklus"
--
--#: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
--msgstr "Eseti összecsukott alfolyamat"
-+msgid "Quarter moon"
-+msgstr "Negyed hold"
- 
- #. For: anthonym
--#: ../sheets/BPMN.sheet.in.h:4
-+#: ../sheets/BPMN.sheet.in.h:2
- msgid "BPMN"
- msgstr "BPMN"
- 
--#: ../sheets/BPMN.sheet.in.h:5
-+#: ../sheets/BPMN.sheet.in.h:3
- msgid "Business Process Modeling Notation"
- msgstr "Üzletifolyamat-modellezési jelölés"
- 
-+#: ../sheets/BPMN.sheet.in.h:4
-+msgid "Start Event"
-+msgstr "Kezdőesemény"
-+
-+#: ../sheets/BPMN.sheet.in.h:5
-+msgid "Start Event - Message"
-+msgstr "Kezdőesemény - Üzenet"
-+
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
--msgstr "Összecsukott alfolyamat"
-+msgid "Start Event - Timer"
-+msgstr "Kezdőesemény - Időzítő"
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
--msgstr "Ellensúlyozott összecsukott alfolyamat"
-+msgid "Start Event - Rule"
-+msgstr "Kezdőesemény - Szabály"
- 
- #: ../sheets/BPMN.sheet.in.h:8
--msgid "Compensation Task"
--msgstr "Ellensúlyozási feladat"
-+msgid "Start Event - Link"
-+msgstr "Kezdőesemény - Hivatkozás"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--msgid "Complex"
--msgstr "Komplex"
-+msgid "Start Event - Multiple"
-+msgstr "Kezdőesemény - Többszörös"
- 
- #: ../sheets/BPMN.sheet.in.h:10
--msgid "Data Object"
--msgstr "Adatobjektum"
-+msgid "Intermediate Event"
-+msgstr "Köztes esemény"
- 
- #: ../sheets/BPMN.sheet.in.h:11
--msgid "End Event"
--msgstr "Záró esemény"
-+msgid "Intermediate Event - Message"
-+msgstr "Köztes esemény - Üzenet"
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
--msgstr "Záró esemény - Megszakítás"
-+msgid "Intermediate Event - Timer"
-+msgstr "Köztes esemény - Időzítő"
- 
- #: ../sheets/BPMN.sheet.in.h:13
--msgid "End Event - Compensation"
--msgstr "Záró esemény - Ellensúlyozás"
-+msgid "Intermediate Event - Error"
-+msgstr "Köztes esemény - Hiba"
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
--msgstr "Záró esemény - Hiba"
-+msgid "Intermediate Event - Cancel"
-+msgstr "Köztes esemény - Megszakítás"
- 
- #: ../sheets/BPMN.sheet.in.h:15
--msgid "End Event - Link"
--msgstr "Záró esemény - Hivatkozás"
-+msgid "Intermediate Event - Compensation"
-+msgstr "Köztes esemény - Ellensúlyozás"
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
--msgstr "Záró esemény - Üzenet"
-+msgid "Intermediate Event - Rule"
-+msgstr "Köztes esemény - Szabály"
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
--msgstr "Záró esemény - Többszörös"
-+msgid "Intermediate Event - Link"
-+msgstr "Köztes esemény - Hivatkozás"
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
--msgstr "Záró esemény - Befejezés"
-+msgid "Intermediate Event - Multiple"
-+msgstr "Köztes esemény - Többszörös"
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
--msgstr "Kizárólagos (XOR) adatalapú"
-+msgid "End Event"
-+msgstr "Záró esemény"
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
--msgstr "Kizárólagos (XOR) eseményalapú"
-+msgid "End Event - Message"
-+msgstr "Záró esemény - Üzenet"
- 
- #: ../sheets/BPMN.sheet.in.h:21
--msgid "Gateway"
--msgstr "�tjáró"
-+msgid "End Event - Error"
-+msgstr "Záró esemény - Hiba"
- 
- #: ../sheets/BPMN.sheet.in.h:22
--msgid "Group"
--msgstr "Csoport"
-+msgid "End Event - Cancel"
-+msgstr "Záró esemény - Megszakítás"
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
--msgstr "Megengedő (OR)"
-+msgid "End Event - Compensation"
-+msgstr "Záró esemény - Ellensúlyozás"
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr "Köztes esemény"
-+msgid "End Event - Link"
-+msgstr "Záró esemény - Hivatkozás"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
--msgstr "Köztes esemény - Megszakítás"
-+msgid "End Event - Multiple"
-+msgstr "Záró esemény - Többszörös"
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
--msgstr "Köztes esemény - Ellensúlyozás"
-+msgid "End Event - Terminate"
-+msgstr "Záró esemény - Befejezés"
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
--msgstr "Köztes esemény - Hiba"
-+msgid "Gateway"
-+msgstr "�tjáró"
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
--msgstr "Köztes esemény - Hivatkozás"
-+msgid "Exclusive (XOR) Data Based"
-+msgstr "Kizárólagos (XOR) adatalapú"
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
--msgstr "Köztes esemény - Üzenet"
-+msgid "Exclusive (XOR) Event Based"
-+msgstr "Kizárólagos (XOR) eseményalapú"
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
--msgstr "Köztes esemény - Többszörös"
-+msgid "Inclusive (OR)"
-+msgstr "Megengedő (OR)"
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
--msgstr "Köztes esemény - Szabály"
-+msgid "Complex"
-+msgstr "Komplex"
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr "Köztes esemény - Időzítő"
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
--msgstr "Ismétlődő összecsukott alfolyamat"
-+msgid "Parallel (AND)"
-+msgstr "Párhuzamos (AND)"
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
--msgstr "Több példányos összecsukott alfolyamat"
-+msgid "Activity Looping"
-+msgstr "Tevékenységciklus"
- 
- #: ../sheets/BPMN.sheet.in.h:35
- msgid "Multiple Instance Task"
- msgstr "Több példányos feladat"
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
--msgstr "Párhuzamos (AND)"
-+msgid "Compensation Task"
-+msgstr "Ellensúlyozási feladat"
- 
- #: ../sheets/BPMN.sheet.in.h:37
--msgid "Start Event"
--msgstr "Kezdőesemény"
-+msgid "Collapsed Sub-Process"
-+msgstr "Összecsukott alfolyamat"
- 
- #: ../sheets/BPMN.sheet.in.h:38
--msgid "Start Event - Link"
--msgstr "Kezdőesemény - Hivatkozás"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr "Ismétlődő összecsukott alfolyamat"
- 
- #: ../sheets/BPMN.sheet.in.h:39
--msgid "Start Event - Message"
--msgstr "Kezdőesemény - Üzenet"
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr "Több példányos összecsukott alfolyamat"
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
--msgstr "Kezdőesemény - Többszörös"
-+msgid "Ad-Hoc Collapsed Sub-Process"
-+msgstr "Eseti összecsukott alfolyamat"
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
--msgstr "Kezdőesemény - Szabály"
-+msgid "Compensation Collapsed Sub-Process"
-+msgstr "Ellensúlyozott összecsukott alfolyamat"
- 
- #: ../sheets/BPMN.sheet.in.h:42
--msgid "Start Event - Timer"
--msgstr "Kezdőesemény - Időzítő"
--
--#: ../sheets/BPMN.sheet.in.h:44
--msgid "Text Annotation"
--msgstr "Szöveges feljegyzés"
-+msgid "Group"
-+msgstr "Csoport"
- 
--#: ../sheets/BPMN.sheet.in.h:45
-+#: ../sheets/BPMN.sheet.in.h:43
- msgid "Transaction"
- msgstr "Tranzakció"
- 
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
--msgstr "AC-generátor"
-+#: ../sheets/BPMN.sheet.in.h:44
-+msgid "Data Object"
-+msgstr "Adatobjektum"
-+
-+#: ../sheets/BPMN.sheet.in.h:45
-+msgid "Text Annotation"
-+msgstr "Szöveges feljegyzés"
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--msgid "Air Cooler"
--msgstr "Léghűtő"
-+msgid "ChemEng"
-+msgstr "ChemEng"
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
--msgstr "Autokláv"
-+msgid "Collection for chemical engineering"
-+msgstr "Gyűjtemény vegyészmérnökök számára"
- 
- #: ../sheets/ChemEng.sheet.in.h:4
--msgid "Axial Flow Fan"
--msgstr "Tengelyáramlású ventilátor"
-+msgid "Fan or Stirrer"
-+msgstr "Ventilátor vagy keverő"
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--msgid "Basic Filter"
--msgstr "Egyszerű szűrő"
-+msgid "Spraying Device"
-+msgstr "Porlasztóeszköz"
- 
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
--msgstr "Centrifugális pumpa vagy ventilátor"
-+msgid "Pneumatic Line"
-+msgstr "Pneumatikus vezeték"
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--msgid "Centrifuge"
--msgstr "Centrifuga"
-+msgid "Pneumatic Line, vertical"
-+msgstr "Pneumatikus vezeték, függőleges"
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--msgid "ChemEng"
--msgstr "ChemEng"
-+msgid "Simple Heat Exchanger"
-+msgstr "Egyszerű hőcserélő"
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
--msgstr "Derítő vagy ülepítő tartály"
-+msgid "Simple Heat Exchanger, vertical"
-+msgstr "Egyszerű hőcserélő, függőleges"
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
--msgstr "Gyűjtemény vegyészmérnökök számára"
-+msgid "Water Cooler"
-+msgstr "Vízhűtő"
- 
--#  Need better way to make it a reasonable size.  Isn't there some
--#  standard look for them (or is that just Gnome?)
- #: ../sheets/ChemEng.sheet.in.h:12
--msgid "Compressor or Turbine"
--msgstr "Kompresszor vagy turbina"
-+msgid "Water Cooler, vertical"
-+msgstr "Vízhűtő, függőleges"
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--msgid "Covered tank"
--msgstr "Fedett tartály"
-+msgid "Fixed-Sheet Exchanger"
-+msgstr "Rögzített lemezes hőcserélő"
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
--msgstr "Ciklon és hidrociklon"
-+msgid "Floating-Head or U-Tube Exchanger"
-+msgstr "Lebegőfejes vagy U-csöves hőcserélő"
- 
- #: ../sheets/ChemEng.sheet.in.h:15
--msgid "Double-Pipe Exchanger"
--msgstr "Kétcsöves hőcserélő"
-+msgid "Kettle Reboiler"
-+msgstr "Edény újraforraló"
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
--msgstr "Ki- vagy befecskendező (injektor)"
-+msgid "Air Cooler"
-+msgstr "Léghűtő"
- 
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
--msgstr "Ventilátor vagy keverő"
-+msgid "Forced-Flow Air Cooler"
-+msgstr "Cirkuláltatott léghűtő"
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
--msgstr "Rögzített lemezes hőcserélő"
-+msgid "Induced-Flow Air Cooler"
-+msgstr "Gerjesztett áramlású léghűtő"
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
--msgstr "Lebegőfejes vagy U-csöves hőcserélő"
-+msgid "Plate Exchanger"
-+msgstr "Lemezes hőcserélő"
- 
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
--msgstr "Folyadékkal érintkező edény, egyszerű"
-+msgid "Double-Pipe Exchanger"
-+msgstr "Kétcsöves hőcserélő"
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
--msgstr "Cirkuláltatott léghűtő"
-+msgid "Heating/Cooling Coil"
-+msgstr "Fűtő/hűtő tekercs"
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
--msgstr "Gáztartály, egyszerű"
-+msgid "Heating/Cooling Coil, vertical"
-+msgstr "Fűtő/hűtő tekercs, függőleges"
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
--msgstr "Fűtő/hűtő tekercs"
-+msgid "Simple Furnace"
-+msgstr "Egyszerű kemence"
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
--msgstr "Fűtő/hűtő tekercs, függőleges"
-+msgid "Simple Vessel"
-+msgstr "Egyszerű tartály"
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
--msgstr "Gerjesztett áramlású léghűtő"
-+msgid "Knock-out Drum (with demister pad)"
-+msgstr "Kiütő dob (ködtelenítő blokkal)"
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
--msgstr "Edény újraforraló"
-+msgid "Tray Column, simple"
-+msgstr "Tányéros oszlop, egyszerű"
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
--msgstr "Kiütő dob (ködtelenítő blokkal)"
-+msgid "Tray Column, detailed"
-+msgstr "Tányéros oszlop, részletes"
-+
-+#: ../sheets/ChemEng.sheet.in.h:28
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr "Folyadékkal érintkező edény, egyszerű"
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--msgid "Mixer"
--msgstr "Keverő"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr "Reaktor vagy elnyelető tartály, egyszerű"
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
--msgstr "Nyitott tartály"
-+msgid "Autoclave"
-+msgstr "Autokláv"
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
--msgstr "Lemezes hőcserélő"
-+msgid "Open Tank"
-+msgstr "Nyitott tartály"
- 
- #: ../sheets/ChemEng.sheet.in.h:32
--msgid "Pneumatic Line"
--msgstr "Pneumatikus vezeték"
-+msgid "Clarifier or Settling Tank"
-+msgstr "Derítő vagy ülepítő tartály"
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
--msgstr "Pneumatikus vezeték, függőleges"
-+msgid "Sealed Tank"
-+msgstr "Zárt tartály"
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
--msgstr "Pozitív kiszorítású forgópumpa vagy kompresszor"
-+msgid "Covered tank"
-+msgstr "Fedett tartály"
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Pressure Relief Valve"
--msgstr "Nyomáscsökkentő szelep"
-+msgid "Tank with Fixed Roof"
-+msgstr "Tartály rögzített tetővel"
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reactor or Absorption Vessel, simple"
--msgstr "Reaktor vagy elnyelető tartály, egyszerű"
-+msgid "Tank with Floating Roof"
-+msgstr "Tartály lebegő tetővel"
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--msgid "Reciprocating Compressor or Pump"
--msgstr "Reciprok kompresszor vagy pumpa"
-+msgid "Storage Sphere"
-+msgstr "Tárológömb"
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--msgid "Regulable Valve"
--msgstr "Szabályozható szelep"
-+msgid "Gas Holder, basic"
-+msgstr "Gáztartály, egyszerű"
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Regulable Valve, vertical"
--msgstr "Szabályozható szelep, függőleges"
-+msgid "Centrifugal Pump or Fan"
-+msgstr "Centrifugális pumpa vagy ventilátor"
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--msgid "Sealed Tank"
--msgstr "Zárt tartály"
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr "Pozitív kiszorítású forgópumpa vagy kompresszor"
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Furnace"
--msgstr "Egyszerű kemence"
-+msgid "Reciprocating Compressor or Pump"
-+msgstr "Reciprok kompresszor vagy pumpa"
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger"
--msgstr "Egyszerű hőcserélő"
-+msgid "Axial Flow Fan"
-+msgstr "Tengelyáramlású ventilátor"
- 
-+#  Need better way to make it a reasonable size.  Isn't there some
-+#  standard look for them (or is that just Gnome?)
- #: ../sheets/ChemEng.sheet.in.h:43
--msgid "Simple Heat Exchanger, vertical"
--msgstr "Egyszerű hőcserélő, függőleges"
-+msgid "Compressor or Turbine"
-+msgstr "Kompresszor vagy turbina"
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Simple Vessel"
--msgstr "Egyszerű tartály"
-+msgid "Ejector or Injector"
-+msgstr "Ki- vagy befecskendező (injektor)"
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spray Drier"
--msgstr "Porlasztva szárító"
-+msgid "AC Generator"
-+msgstr "AC-generátor"
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--msgid "Spraying Device"
--msgstr "Porlasztóeszköz"
-+msgid "Valve"
-+msgstr "Szelep"
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Storage Sphere"
--msgstr "Tárológömb"
-+msgid "Valve, vertical"
-+msgstr "Szelep, függőleges"
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Fixed Roof"
--msgstr "Tartály rögzített tetővel"
-+msgid "Regulable Valve"
-+msgstr "Szabályozható szelep"
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tank with Floating Roof"
--msgstr "Tartály lebegő tetővel"
-+msgid "Regulable Valve, vertical"
-+msgstr "Szabályozható szelep, függőleges"
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, detailed"
--msgstr "Tányéros oszlop, részletes"
-+msgid "Basic Filter"
-+msgstr "Egyszerű szűrő"
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--msgid "Tray Column, simple"
--msgstr "Tányéros oszlop, egyszerű"
-+msgid "Mixer"
-+msgstr "Keverő"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--msgid "Valve"
--msgstr "Szelep"
-+msgid "Cyclone and hydrocyclone"
-+msgstr "Ciklon és hidrociklon"
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--msgid "Valve, vertical"
--msgstr "Szelep, függőleges"
-+msgid "Spray Drier"
-+msgstr "Porlasztva szárító"
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--msgid "Water Cooler"
--msgstr "Vízhűtő"
-+msgid "Centrifuge"
-+msgstr "Centrifuga"
- 
- #: ../sheets/ChemEng.sheet.in.h:55
--msgid "Water Cooler, vertical"
--msgstr "Vízhűtő, függőleges"
-+msgid "Pressure Relief Valve"
-+msgstr "Nyomáscsökkentő szelep"
- 
- #: ../sheets/Circuit.sheet.in.h:1
- msgid "Circuit"
-@@ -7307,304 +7329,304 @@ msgid "Components for circuit diagrams"
- msgstr "Elektromos áramköri elemek"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "Földelési pont"
-+msgid "Vertically aligned resistor"
-+msgstr "Függőlegesen elrendezett ellenállás"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Vízszintes átkötő"
-+msgid "Horizontally aligned inductor"
-+msgstr "Vízszintesen elrendezett tekercs"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "Vízszintesen elrendezett LED"
-+msgid "Vertically aligned inductor"
-+msgstr "Függőlegesen elrendezett tekercs"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Vízszintesen elrendezett kondenzátor"
-+msgid "Horizontally aligned resistor"
-+msgstr "Vízszintesen elrendezett ellenállás"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Vízszintesen elrendezett dióda"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Függőlegesen elrendezett ellenállás (európai)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Vízszintesen elrendezett biztosító"
--
--#: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Vízszintesen elrendezett tekercs"
--
--#: ../sheets/Circuit.sheet.in.h:10
- msgid "Horizontally aligned inductor (European)"
- msgstr "Vízszintesen elrendezett tekercs (európai)"
- 
--#: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Vízszintesen elrendezett tápegység"
--
--#: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Vízszintesen elrendezett ellenállás"
-+#: ../sheets/Circuit.sheet.in.h:9
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Függőlegesen elrendezett tekercs (európai)"
- 
--#: ../sheets/Circuit.sheet.in.h:13
-+#: ../sheets/Circuit.sheet.in.h:10
- msgid "Horizontally aligned resistor (European)"
- msgstr "Vízszintesen elrendezett ellenállás (európai)"
- 
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Vízszintesen elrendezett Zener-dióda"
--
--#: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Lámpa"
--
--#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Mikrofon"
-+#: ../sheets/Circuit.sheet.in.h:11
-+msgid "Horizontally aligned capacitor"
-+msgstr "Vízszintesen elrendezett kondenzátor"
- 
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "NMOS tranzisztor"
-+#: ../sheets/Circuit.sheet.in.h:12
-+msgid "Vertically aligned capacitor"
-+msgstr "Függőlegesen elrendezett kondenzátor"
- 
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:20
-+#: ../sheets/Circuit.sheet.in.h:15
- msgid "NPN bipolar transistor"
- msgstr "NPN bipoláris tranzisztor"
- 
--#: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Műveleti erősítő"
-+#.
-+#.
-+#: ../sheets/Circuit.sheet.in.h:18
-+msgid "PNP bipolar transistor"
-+msgstr "PNP bipoláris tranzisztor"
-+
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Vízszintesen elrendezett dióda"
-+
-+#: ../sheets/Circuit.sheet.in.h:20
-+msgid "Vertically aligned diode"
-+msgstr "Függőlegesen elrendezett dióda"
-+
-+#: ../sheets/Circuit.sheet.in.h:21
-+msgid "Horizontally aligned zener diode"
-+msgstr "Vízszintesen elrendezett Zener-dióda"
- 
- #: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "PMOS tranzisztor"
-+msgid "Vertically aligned zener diode"
-+msgstr "Függőlegesen elrendezett Zener-dióda"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Földelési pont"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Műveleti erősítő"
- 
--#.
--#.
- #: ../sheets/Circuit.sheet.in.h:25
--msgid "PNP bipolar transistor"
--msgstr "PNP bipoláris tranzisztor"
-+msgid "Horizontally aligned fuse"
-+msgstr "Vízszintesen elrendezett biztosító"
- 
--#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Hangszóró"
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "Függőlegesen elrendezett biztosító"
- 
- #: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "Függőlegesen elrendezett LED"
-+msgid "Horizontally aligned powersource"
-+msgstr "Vízszintesen elrendezett tápegység"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "Függőlegesen elrendezett kondenzátor"
-+msgid "Vertically aligned powersource"
-+msgstr "Függőlegesen elrendezett tápegység"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "Függőlegesen elrendezett dióda"
-+msgid "Lamp"
-+msgstr "Lámpa"
- 
--#: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "Függőlegesen elrendezett biztosító"
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Hangszóró"
- 
--#: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "Függőlegesen elrendezett tekercs"
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Mikrofon"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "Függőlegesen elrendezett tekercs (európai)"
-+msgid "Horizontally aligned LED"
-+msgstr "Vízszintesen elrendezett LED"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "Függőlegesen elrendezett tápegység"
-+msgid "Vertically aligned LED"
-+msgstr "Függőlegesen elrendezett LED"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "Függőlegesen elrendezett ellenállás"
-+msgid "NMOS transistor"
-+msgstr "NMOS tranzisztor"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "Függőlegesen elrendezett ellenállás (európai)"
-+msgid "PMOS transistor"
-+msgstr "PMOS tranzisztor"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "Függőlegesen elrendezett Zener-dióda"
-+msgid "Horizontal jumper"
-+msgstr "Vízszintes átkötő"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "„ha nem� (alapesetben zárt) létrakapcsolás"
-+msgid "Ladder"
-+msgstr "Létra"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "„ha� (alapesetben nyitott) létrakapcsolás"
-+msgid "Components for LADDER circuits"
-+msgstr "Létraáramköri elemek"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "„jump� kimeneti változó"
-+msgid "'if' (normally open) ladder contact"
-+msgstr "„ha� (alapesetben nyitott) létrakapcsolás"
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "„reset� kimeneti változó"
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "„ha nem� (alapesetben zárt) létrakapcsolás"
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "„set� kimeneti változó"
-+msgid "Simple output variable"
-+msgstr "Egyszerű kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Létraáramköri elemek"
-+msgid "Negative output variable"
-+msgstr "Negatív kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Létra"
-+msgid "'set' output variable"
-+msgstr "„set� kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "Negatív kimeneti változó"
-+msgid "'reset' output variable"
-+msgstr "„reset� kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Védett tápú „reset� kimeneti változó"
-+msgid "'jump' output variable"
-+msgstr "„jump� kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Védett tápú „set� kimeneti változó"
-+msgid "Receptivity output variable"
-+msgstr "Fogadó kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Védett tápú „negatív� kimeneti változó"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Védett tápú egyszerű kimeneti változó"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Védett tápú „negatív� kimeneti változó"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "Fogadó kimeneti változó"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Védett tápú „set� kimeneti változó"
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Egyszerű kimeneti változó"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Védett tápú „reset� kimeneti változó"
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr "-1-nél kisebb konstans tényező"
-+msgid "Cybernetics"
-+msgstr "Kibernetika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
--msgstr "0 és -1 közötti konstans tényező"
-+msgid "Elements of cybernetic circuits"
-+msgstr "Kibernetikus áramköri elemek"
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
--msgstr "0 és 1 közötti konstans tényező"
-+msgid "Sensor - left"
-+msgstr "Szenzor - bal"
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
--msgstr "1-nél nagyobb konstans tényező"
-+msgid "Sensor - right"
-+msgstr "Szenzor - jobb"
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
--msgstr "Konstans negatív eltolás az y-tengelyen"
-+msgid "Sensor - bottom"
-+msgstr "Szenzor - lent"
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
--msgstr "Konstans pozitív eltolás az y-tengelyen"
-+msgid "Sensor - top"
-+msgstr "Szenzor - fent"
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
--msgstr "Kibernetika"
-+msgid "Sum, subtracting left input"
-+msgstr "Összeg, kivonó bal bemenet"
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--msgid "Elements of cybernetic circuits"
--msgstr "Kibernetikus áramköri elemek"
-+msgid "Sum, subtracting right input"
-+msgstr "Összeg, kivonó jobb bemenet"
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
--msgstr "Teljes hullámú egyenirányító (abszolút érték)"
-+msgid "Sum, subtracting bottom input"
-+msgstr "Összeg, kivonó alsó bemenet"
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
--msgstr "Félhullámú egyenirányító vagy felfutó bemenet"
-+msgid "Sum, subtracting top input"
-+msgstr "Összeg, kivonó felső bemenet"
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
--msgstr "Felüláteresztő szűrő"
--
--#: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
--msgstr "Integrátor - bemenet alul"
--
--#: ../sheets/Cybernetics.sheet.in.h:13
- msgid "Integrator - input left"
- msgstr "Integrátor - bemenet balra"
- 
--#: ../sheets/Cybernetics.sheet.in.h:14
-+#: ../sheets/Cybernetics.sheet.in.h:12
- msgid "Integrator - input right"
- msgstr "Integrátor - bemenet jobbra"
- 
--#: ../sheets/Cybernetics.sheet.in.h:15
-+#: ../sheets/Cybernetics.sheet.in.h:13
-+msgid "Integrator - input bottom"
-+msgstr "Integrátor - bemenet alul"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:14
- msgid "Integrator - input top"
- msgstr "Integrátor - bemenet fent"
- 
--#: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
--msgstr "Aluláteresztő szűrő"
-+#: ../sheets/Cybernetics.sheet.in.h:15
-+msgid "Sum"
-+msgstr "Összeg"
- 
--#: ../sheets/Cybernetics.sheet.in.h:17
-+#: ../sheets/Cybernetics.sheet.in.h:16
- msgid "Product"
- msgstr "Szorzat"
- 
-+#: ../sheets/Cybernetics.sheet.in.h:17
-+msgid "High pass filter"
-+msgstr "Felüláteresztő szűrő"
-+
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
--msgstr "Relékarakterisztika (szigma)"
-+msgid "Low pass filter"
-+msgstr "Aluláteresztő szűrő"
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
--msgstr "Telítési karakterisztika"
-+msgid "Sine characteristic or input"
-+msgstr "Szinuszkarakterisztika vagy bemenet"
- 
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
--msgstr "Szenzor - lent"
-+msgid "Sigmoid characteristic"
-+msgstr "Szigma-karakterisztika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
--msgstr "Szenzor - bal"
-+msgid "Saturation characteristic"
-+msgstr "Telítési karakterisztika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
--msgstr "Szenzor - jobb"
-+msgid "Relay characteristic (sigma)"
-+msgstr "Relékarakterisztika (szigma)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
--msgstr "Szenzor - fent"
-+msgid "Half wave rectifier or ramp input"
-+msgstr "Félhullámú egyenirányító vagy felfutó bemenet"
- 
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
--msgstr "Szigma-karakterisztika"
-+msgid "Full wave rectifier (absolute value)"
-+msgstr "Teljes hullámú egyenirányító (abszolút érték)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
--msgstr "Szinuszkarakterisztika vagy bemenet"
-+msgid "Constant positive shift on the y-axis"
-+msgstr "Konstans pozitív eltolás az y-tengelyen"
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--msgid "Sum"
--msgstr "Összeg"
-+msgid "Constant negative shift on the y-axis"
-+msgstr "Konstans negatív eltolás az y-tengelyen"
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
--msgstr "Összeg, kivonó alsó bemenet"
-+msgid "Constant factor greater 1"
-+msgstr "1-nél nagyobb konstans tényező"
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
--msgstr "Összeg, kivonó bal bemenet"
-+msgid "Constant factor between 0 and 1"
-+msgstr "0 és 1 közötti konstans tényező"
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
--msgstr "Összeg, kivonó jobb bemenet"
-+msgid "Constant factor between 0 and -1"
-+msgstr "0 és -1 közötti konstans tényező"
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
--msgstr "Összeg, kivonó felső bemenet"
-+msgid "Constant factor below -1"
-+msgstr "-1-nél kisebb konstans tényező"
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
- msgid "Template for custom characteristics"
-@@ -7615,328 +7637,322 @@ msgid "Time delay"
- msgstr "Időkésleltetés"
- 
- #: ../sheets/Database.sheet.in.h:1
--msgid "Attribute compound"
--msgstr "Összetett attribútumelem"
--
--#: ../sheets/Database.sheet.in.h:2
- msgid "Database"
- msgstr "Adatbázis"
- 
--#: ../sheets/Database.sheet.in.h:3
-+#: ../sheets/Database.sheet.in.h:2
- msgid "Editor for Database Table Relation Diagrams"
- msgstr "Adatbázistábla-kapcsolatdiagram szerkesztő"
- 
--#: ../sheets/ER.sheet.in.h:2
--msgid "ER"
--msgstr "EK"
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr "Összetett attribútumelem"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:1
-+msgid "ER"
-+msgstr "EK"
-+
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
- msgstr "Egyed-kapcsolat diagram szerkesztő"
- 
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Részvétel"
--
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr "Gyenge egyed"
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Részvétel"
-+
- #: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Elektromos áramkörök"
-+
-+#: ../sheets/Electric.sheet.in.h:2
- msgid "Components for electric circuits"
- msgstr "Elektromos áramköri elemek"
- 
--#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "Csatlakozási pont"
--
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Elektromos áramkörök"
-+msgid "Normally open contact (horizontal)"
-+msgstr "Alapállapotban nyitott érintkező (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
--msgstr "Lámpa vagy jelzőfény (vízszintes)"
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Alapállapotban zárt érintkező (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
--msgstr "Lámpa vagy jelzőfény (függőleges)"
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Alapállapotban nyitott kapcsoló (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
--msgstr "Alapállapotban zárt érintkező (vízszintes)"
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Alapállapotban zárt kapcsoló (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
--msgstr "Alapállapotban zárt érintkező (függőleges)"
-+msgid "Normally open contact (vertical)"
-+msgstr "Alapállapotban nyitott érintkező (függőleges)"
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
--msgstr "Alapállapotban zárt kapcsoló (vízszintes)"
-+msgid "Normally closed contact (vertical)"
-+msgstr "Alapállapotban zárt érintkező (függőleges)"
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
--msgstr "Alapállapotban zárt kapcsoló (függőleges)"
-+msgid "Normally open position switch (vertical)"
-+msgstr "Alapállapotban nyitott kapcsoló (függőleges)"
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
--msgstr "Alapállapotban nyitott érintkező (vízszintes)"
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Alapállapotban zárt kapcsoló (függőleges)"
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
--msgstr "Alapállapotban nyitott érintkező (függőleges)"
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "Egy relé parancsszerve (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
--msgstr "Alapállapotban nyitott kapcsoló (vízszintes)"
-+msgid "Relay (horizontal)"
-+msgstr "Relé (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
--msgstr "Alapállapotban nyitott kapcsoló (függőleges)"
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Lámpa vagy jelzőfény (vízszintes)"
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
--msgstr "Relé (vízszintes)"
-+msgid "The command organ of a relay (vertical)"
-+msgstr "Egy relé parancsszerve (függőleges)"
- 
- #: ../sheets/Electric.sheet.in.h:15
- msgid "Relay (vertical)"
- msgstr "Relé (függőleges)"
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
--msgstr "Egy relé parancsszerve (vízszintes)"
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Lámpa vagy jelzőfény (függőleges)"
- 
--#: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr "Egy relé parancsszerve (függőleges)"
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "Csatlakozási pont"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Függvénystruktúra-diagram szerkesztő."
--
--#: ../sheets/FS.sheet.in.h:2
- msgid "FS"
- msgstr "FS"
- 
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Függvénystruktúra-diagram szerkesztő."
-+
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr "Folyam"
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Függvény"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr "Ortogonális töröttvonal-folyam"
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Függvény"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Összevetés"
-+msgid "Objects to draw flowcharts"
-+msgstr "Objektumok folyamatábrák rajzolásához"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "Csatlakozó"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Folyamat/kiegészítő művelet"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--msgid "Data source"
--msgstr "Adatforrás"
-+msgid "Input/Output"
-+msgstr "Bemenet/kimenet"
- 
--#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Döntés"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Késleltetés"
-+msgid "Connector"
-+msgstr "Csatlakozó"
- 
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Dokumentum"
-+msgid "Transaction file"
-+msgstr "Tranzakciófájl"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:10
-+msgid "Off page connector"
-+msgstr "Oldalon kívüli csatlakozó"
- 
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Bemenet/kimenet"
-+msgid "Document"
-+msgstr "Dokumentum"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Belső tároló"
-+msgid "Manual operation"
-+msgstr "Kézi művelet"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Mágneslemez"
-+msgid "Preparation"
-+msgstr "Előkészítés"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Mágnesdob"
-+msgid "Manual input"
-+msgstr "Kézi bevitel"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Mágnesszalag"
-+msgid "Predefined process"
-+msgstr "Előredefiniált folyamat"
- 
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Kézi bevitel"
-+msgid "Terminal Interrupt"
-+msgstr "Végső megszakítás"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Kézi művelet"
-+msgid "Magnetic disk"
-+msgstr "Mágneslemez"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "Egyesítés"
-+msgid "Magnetic drum"
-+msgstr "Mágnesdob"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Objektumok folyamatábrák rajzolásához"
-+msgid "Magnetic tape"
-+msgstr "Mágnesszalag"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Oldalon kívüli csatlakozó"
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Belső tároló"
- 
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "Offline tároló"
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Egyesítés"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Vagy"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Előredefiniált folyamat"
-+msgid "Delay"
-+msgstr "Késleltetés"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Előkészítés"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Folyamat/kiegészítő művelet"
-+msgid "Summing junction"
-+msgstr "Összegző elágazás"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Lyukkártya"
-+msgid "Collate"
-+msgstr "Összevetés"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Lyukszalag"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Rendezés"
- 
--#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Vagy"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Lyukkártya"
-+
- #: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Összegző elágazás"
-+msgid "Punched tape"
-+msgstr "Lyukszalag"
- 
- #: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "Végső megszakítás"
-+msgid "Transmittal tape"
-+msgstr "�tviteli szalag"
- 
- #: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Tranzakciófájl"
-+msgid "Offline storage"
-+msgstr "Offline tároló"
- 
- #: ../sheets/Flowchart.sheet.in.h:34
--msgid "Transmittal tape"
--msgstr "�tviteli szalag"
-+msgid "Data source"
-+msgstr "Adatforrás"
- 
- #: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr "ÉS vergens"
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
- 
- #: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Objektumok GRAFCET-ábrák rajzolásához"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Makró alprogram hívási lépés"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:9
- msgid "Action to associate to a step"
- msgstr "Lépéshez rendelendő művelet"
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
--msgid "Arc (upward)"
--msgstr "�v (felfelé)"
--
--#: ../sheets/GRAFCET.sheet.in.h:4
-+#: ../sheets/GRAFCET.sheet.in.h:10
- msgid "Condition (of an action)"
- msgstr "Feltétel (egy műveleté)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr "Makró alprogram hívási lépés"
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "�tmenet"
- 
--#: ../sheets/GRAFCET.sheet.in.h:11
-+#: ../sheets/GRAFCET.sheet.in.h:12
- msgid "OR vergent"
- msgstr "VAGY vergens"
- 
--#: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Objektumok GRAFCET-ábrák rajzolásához"
--
--#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
--msgid "Transition"
--msgstr "�tmenet"
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "ÉS vergens"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
--msgid "Alternate external entity"
--msgstr "Alternatív külső egyed"
-+#: ../sheets/GRAFCET.sheet.in.h:14
-+msgid "Arc (upward)"
-+msgstr "�v (felfelé)"
- 
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
- #: ../sheets/Gane_and_Sarson.sheet.in.h:2
--msgid "Data store"
--msgstr "Adattár"
-+msgid "Gane and Sarson"
-+msgstr "Gane és Sarson"
- 
- #: ../sheets/Gane_and_Sarson.sheet.in.h:3
--msgid "External entity"
--msgstr "Külső egyed"
-+msgid "Gane and Sarson DFD"
-+msgstr "Gane és Sarson DFD"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
-+msgid "Alternate external entity"
-+msgstr "Alternatív külső egyed"
- 
--#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
- #: ../sheets/Gane_and_Sarson.sheet.in.h:5
--msgid "Gane and Sarson"
--msgstr "Gane és Sarson"
-+msgid "Data store"
-+msgstr "Adattár"
- 
- #: ../sheets/Gane_and_Sarson.sheet.in.h:6
--msgid "Gane and Sarson DFD"
--msgstr "Gane és Sarson DFD"
--
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
--msgstr "1. blokk, 2:4"
-+msgid "External entity"
-+msgstr "Külső egyed"
- 
-+#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
--msgstr "2. blokk, 2:8"
--
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
--msgstr "3. blokk, 4:4"
-+msgid "Map, Isometric"
-+msgstr "Izometrikus térkép"
- 
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
--msgstr "4. blokk, 4:8"
-+msgid "Isometric Directional Map Shapes"
-+msgstr "Izometrikus irányított térkép alakzatok"
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
--msgstr "5. blokk (3:3)"
-+msgid "Road Section"
-+msgstr "Útszakasz"
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
--msgstr "6. blokk (4:6)"
-+msgid "Long Straight Road Section"
-+msgstr "Hosszú egyenes útszakasz"
- 
- #: ../sheets/IsometricMap.sheet.in.h:7
--msgid "Block 7"
--msgstr "7. blokk"
-+msgid "Crossroads"
-+msgstr "Útkereszteződés"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
--msgstr "1. autó, elölnézet"
-+msgid "T-Junction"
-+msgstr "T elágazás"
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
--msgstr "2. autó, hátulnézet"
-+msgid "Elevated Road"
-+msgstr "Megemelt út"
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
- msgid "Corner 1"
-@@ -7947,1462 +7963,1473 @@ msgid "Corner 2"
- msgstr "2. sarok"
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--msgid "Crossroads"
--msgstr "Útkereszteződés"
-+msgid "River"
-+msgstr "Folyó"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
--msgstr "Megemelt út"
-+msgid "Roof1"
-+msgstr "Tető1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--msgid "Factory"
--msgstr "Ãœzem"
-+msgid "Block 1, 2:4"
-+msgstr "1. blokk, 2:4"
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
--msgstr "Gyalogos híd"
-+msgid "Block 2, 2:8"
-+msgstr "2. blokk, 2:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
-+msgstr "3. blokk, 4:4"
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
--msgstr "Izometrikus irányított térkép alakzatok"
-+msgid "Block 4, 4:8"
-+msgstr "4. blokk, 4:8"
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
--msgstr "Hosszú egyenes útszakasz"
-+msgid "Block 5, 3:3"
-+msgstr "5. blokk (3:3)"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
-+msgstr "6. blokk (4:6)"
- 
--#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
--msgstr "Izometrikus térkép"
-+msgid "Block 7"
-+msgstr "7. blokk"
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
--msgstr "Egyirányú út jel"
-+msgid "Factory"
-+msgstr "Ãœzem"
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--msgid "River"
--msgstr "Folyó"
-+msgid "Car 1, Front View"
-+msgstr "1. autó, elölnézet"
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--msgid "Road Section"
--msgstr "Útszakasz"
-+msgid "Car 2, Rear View"
-+msgstr "2. autó, hátulnézet"
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--msgid "Roof1"
--msgstr "Tető1"
--
--#: ../sheets/IsometricMap.sheet.in.h:25
--msgid "T-Junction"
--msgstr "T elágazás"
--
--#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Train 1, angled downward"
- msgstr "1. vasút, lefelé hajló"
- 
--#: ../sheets/IsometricMap.sheet.in.h:27
-+#: ../sheets/IsometricMap.sheet.in.h:25
- msgid "Train 2, angled upward"
- msgstr "2. vasút, felfelé hajló"
- 
--#: ../sheets/IsometricMap.sheet.in.h:28
-+#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Tree 1"
- msgstr "1. fa"
- 
-+#: ../sheets/IsometricMap.sheet.in.h:27
-+msgid "Footbridge, Pedestrian Bridge"
-+msgstr "Gyalogos híd"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:28
-+msgid "One Way Road Sign"
-+msgstr "Egyirányú út jel"
-+
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
--msgstr "i* ügynök"
-+msgid "RE-i*"
-+msgstr "RE-i*"
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr "i* dekompozíciós csatolás"
-+msgid "Objects to design i* diagrams"
-+msgstr "Objektumok i* diagramok tervezéséhez"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
--msgstr "i* függőségi csatolás"
-+msgid "An i* softgoal"
-+msgstr "i* lágy cél"
- 
- #: ../sheets/Istar.sheet.in.h:4
- msgid "An i* goal"
- msgstr "i* cél"
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
--msgstr "i* eszközök-eredmények csatolás"
-+msgid "An i* resource"
-+msgstr "i* erőforrás"
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
--msgstr "i* negatív hozzájárulás"
-+msgid "An i* task"
-+msgstr "i* feladat"
- 
- #: ../sheets/Istar.sheet.in.h:7
--msgid "An i* position"
--msgstr "i* pozíció"
-+msgid "An i* unspecified actor"
-+msgstr "i* nem megnevezett szereplő"
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
--msgstr "i* pozitív hozzájárulás"
-+msgid "An i* agent"
-+msgstr "i* ügynök"
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
--msgstr "i* erőforrás"
-+msgid "An i* position"
-+msgstr "i* pozíció"
- 
- #: ../sheets/Istar.sheet.in.h:10
- msgid "An i* role"
- msgstr "i* szerep"
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
--msgstr "i* lágy cél"
-+msgid "An i* unspecified link"
-+msgstr "i* nem megnevezett csatolás"
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
--msgstr "i* feladat"
-+msgid "An i* positive contribution"
-+msgstr "i* pozitív hozzájárulás"
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
--msgstr "i* nem megnevezett szereplő"
-+msgid "An i* negative contribution"
-+msgstr "i* negatív hozzájárulás"
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
--msgstr "i* nem megnevezett csatolás"
-+msgid "An i* dependency link"
-+msgstr "i* függőségi csatolás"
- 
- #: ../sheets/Istar.sheet.in.h:15
--msgid "Objects to design i* diagrams"
--msgstr "Objektumok i* diagramok tervezéséhez"
-+msgid "An i* decomposition link"
-+msgstr "i* dekompozíciós csatolás"
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
--msgstr "RE-i*"
-+msgid "An i* means-ends link"
-+msgstr "i* eszközök-eredmények csatolás"
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
--msgstr "Jackson tervezett tartomány"
-+msgid "RE-Jackson"
-+msgstr "RE-Jackson"
- 
- #: ../sheets/Jackson.sheet.in.h:2
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Objektumok Jackson-diagramokhoz"
-+
-+#: ../sheets/Jackson.sheet.in.h:3
- msgid "A Jackson given domain"
- msgstr "Jackson adott tartomány"
- 
--#: ../sheets/Jackson.sheet.in.h:3
-+#: ../sheets/Jackson.sheet.in.h:4
-+msgid "A Jackson designed domain"
-+msgstr "Jackson tervezett tartomány"
-+
-+#: ../sheets/Jackson.sheet.in.h:5
- msgid "A Jackson machine domain"
- msgstr "Jackson-géptartomány"
- 
--#: ../sheets/Jackson.sheet.in.h:4
-+#: ../sheets/Jackson.sheet.in.h:6
- msgid "A Jackson requirement"
- msgstr "Jackson-követelmény"
- 
--#: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
--msgstr "Jackson-követelményjelenség"
--
--#: ../sheets/Jackson.sheet.in.h:6
-+#: ../sheets/Jackson.sheet.in.h:7
- msgid "A Jackson shared phenomenon"
- msgstr "Jackson megosztott jelenség"
- 
--#: ../sheets/Jackson.sheet.in.h:7
--msgid "Objects to design Jackson diagrams"
--msgstr "Objektumok Jackson-diagramokhoz"
--
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
--msgstr "RE-Jackson"
-+msgid "A Jackson requirement phenomenon"
-+msgstr "Jackson-követelményjelenség"
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
--msgstr "KAOS ÉS-finomítás"
-+msgid "RE-KAOS"
-+msgstr "RE-KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr "KAOS VAGY-finomítás"
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Objektumok KAOS diagramokhoz"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--msgid "A KAOS agent"
--msgstr "KAOS ügynök"
-+msgid "A KAOS softgoal"
-+msgstr "KAOS lágy cél (softgoal)"
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
--msgstr "KAOS feltételezés"
-+msgid "A KAOS goal"
-+msgstr "KAOS cél"
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
--msgstr "KAOS bináris ütközés"
-+msgid "A KAOS requirement"
-+msgstr "KAOS követelmény"
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
--msgstr "KAOS a következő tulajdonságokkal"
-+msgid "A KAOS assumption"
-+msgstr "KAOS feltételezés"
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
--msgstr "KAOS teljes ÉS-finomítás"
-+msgid "A KAOS obstacle"
-+msgstr "KAOS akadály"
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
--msgstr "KAOS teljes VAGY-finomítás"
-+msgid "A KAOS AND refinement"
-+msgstr "KAOS ÉS-finomítás"
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
--msgstr "KAOS hozzájárulás"
-+msgid "A KAOS complete AND refinement"
-+msgstr "KAOS teljes ÉS-finomítás"
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
--msgstr "KAOS vezérlőhivatkozás"
-+msgid "A KAOS OR refinement"
-+msgstr "KAOS VAGY-finomítás"
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
--msgstr "KAOS cél"
-+msgid "A KAOS complete OR refinement"
-+msgstr "KAOS teljes VAGY-finomítás"
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
--msgstr "KAOS bemenet"
-+msgid "A KAOS operationalization"
-+msgstr "KAOS műveletesítés"
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
--msgstr "KAOS figyelési hivatkozás"
--
--#: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
--msgstr "KAOS akadály"
-+msgid "A KAOS contribution"
-+msgstr "KAOS hozzájárulás"
- 
--#: ../sheets/KAOS.sheet.in.h:15
-+#: ../sheets/KAOS.sheet.in.h:14
- msgid "A KAOS obstruction"
- msgstr "KAOS torlasz"
- 
-+#: ../sheets/KAOS.sheet.in.h:15
-+msgid "A KAOS binary conflict"
-+msgstr "KAOS bináris ütközés"
-+
- #: ../sheets/KAOS.sheet.in.h:16
--msgid "A KAOS operation"
--msgstr "KAOS művelet"
-+msgid "A KAOS agent"
-+msgstr "KAOS ügynök"
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
--msgstr "KAOS műveletesítés"
-+msgid "A KAOS responsibility"
-+msgstr "KAOS felelősség"
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
--msgstr "KAOS kimenet"
-+msgid "A KAOS monitor link"
-+msgstr "KAOS figyelési hivatkozás"
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
--msgstr "KAOS végrehajtó"
-+msgid "A KAOS control link"
-+msgstr "KAOS vezérlőhivatkozás"
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
--msgstr "KAOS követelmény"
-+msgid "A KAOS capable-of"
-+msgstr "KAOS a következő tulajdonságokkal"
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
--msgstr "KAOS felelősség"
-+msgid "A KAOS performs"
-+msgstr "KAOS végrehajtó"
- 
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
--msgstr "KAOS lágy cél (softgoal)"
-+msgid "A KAOS operation"
-+msgstr "KAOS művelet"
- 
- #: ../sheets/KAOS.sheet.in.h:23
--msgid "Objects to design KAOS diagrams"
--msgstr "Objektumok KAOS diagramokhoz"
-+msgid "A KAOS input"
-+msgstr "KAOS bemenet"
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
--msgstr "RE-KAOS"
-+msgid "A KAOS output"
-+msgstr "KAOS kimenet"
- 
- #: ../sheets/Lights.sheet.in.h:1
--msgid "ACL"
--msgstr "ACL"
-+msgid "Lights"
-+msgstr "Fények"
- 
- #: ../sheets/Lights.sheet.in.h:2
--msgid "Black light"
--msgstr "Fekete fény"
-+msgid "Objects to design simple lighting plots"
-+msgstr "Objektumok egyszerű világítási tervek készítéséhez"
- 
--# fixme: mi a manó ez?
- #: ../sheets/Lights.sheet.in.h:3
--msgid "Blinders"
--msgstr "Vakítók"
-+msgid "PAR"
-+msgstr "PAR"
- 
- #: ../sheets/Lights.sheet.in.h:4
--msgid "Ellipsoidal Reflector Spotlight"
--msgstr "Ellipszoid spotlámpa"
-+msgid "PAR on the floor"
-+msgstr "PAR a padlón"
- 
- #: ../sheets/Lights.sheet.in.h:5
--msgid "Fresel lantern"
--msgstr "Fresel lámpa"
-+msgid "ACL"
-+msgstr "ACL"
- 
-+# fixme: ötletek welcome
- #: ../sheets/Lights.sheet.in.h:6
--msgid "Lights"
--msgstr "Fények"
-+msgid "Pebble Convex lantern"
-+msgstr "PC lámpa"
- 
- #: ../sheets/Lights.sheet.in.h:7
--msgid "Moving head"
--msgstr "Mozgó fej"
-+msgid "Fresel lantern"
-+msgstr "Fresel lámpa"
- 
-+# fixme: ötletek welcome
- #: ../sheets/Lights.sheet.in.h:8
--msgid "Objects to design simple lighting plots"
--msgstr "Objektumok egyszerű világítási tervek készítéséhez"
-+msgid "Striplight"
-+msgstr "Összetett fényforrás"
- 
- #: ../sheets/Lights.sheet.in.h:9
--msgid "PAR"
--msgstr "PAR"
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr "Ellipszoid spotlámpa"
- 
-+# fixme: mi a manó ez?
- #: ../sheets/Lights.sheet.in.h:10
--msgid "PAR on the floor"
--msgstr "PAR a padlón"
-+msgid "Blinders"
-+msgstr "Vakítók"
- 
--# fixme: ötletek welcome
- #: ../sheets/Lights.sheet.in.h:11
--msgid "Pebble Convex lantern"
--msgstr "PC lámpa"
-+msgid "Black light"
-+msgstr "Fekete fény"
- 
--#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Lapolvasó"
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr "Stroboszkópfény"
- 
--# fixme: ötletek welcome
- #: ../sheets/Lights.sheet.in.h:13
--msgid "Striplight"
--msgstr "Összetett fényforrás"
-+msgid "Moving head"
-+msgstr "Mozgó fej"
- 
--#: ../sheets/Lights.sheet.in.h:14
--msgid "Stroboscope light"
--msgstr "Stroboszkópfény"
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Lapolvasó"
- 
- #: ../sheets/Lights.sheet.in.h:15
- msgid "Structure"
- msgstr "Struktúra"
- 
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "AND kapu"
-+msgid "Logic"
-+msgstr "Logika"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Boole-algebra"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr "Keresztkötés"
-+msgid "OR gate"
-+msgstr "OR kapu"
- 
--#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
--msgid "Inverter"
--msgstr "Inverter"
-+#: ../sheets/Logic.sheet.in.h:4
-+msgid "AND gate"
-+msgstr "AND kapu"
- 
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Logika"
-+msgid "XOR gate"
-+msgstr "XOR kapu"
- 
- #: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Egyszerű tároló"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Inverter"
-+
-+#: ../sheets/Logic.sheet.in.h:8
- msgid "NAND gate"
- msgstr "NAND kapu"
- 
--#: ../sheets/Logic.sheet.in.h:7
-+#: ../sheets/Logic.sheet.in.h:9
- msgid "NOR gate"
- msgstr "NOR kapu"
- 
--#: ../sheets/Logic.sheet.in.h:8
-+#: ../sheets/Logic.sheet.in.h:10
- msgid "NOT"
- msgstr "NEM"
- 
--#: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "OR kapu"
--
--#: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Egyszerű tároló"
--
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "XOR kapu"
-+msgid "Crossconnector"
-+msgstr "Keresztkötés"
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Demultiplexer"
-+msgid "MSE"
-+msgstr "MSE"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Nagy kibővítő csomópont"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "U.S. Army Mobil előfizetői berendezés komponensek"
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr "Csomópont közép"
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "Multiplexer"
-+msgid "Large extension node"
-+msgstr "Nagy kibővítő csomópont"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr "Csomópont közép"
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Kis kibővítő csomópont"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Taktikai szatellit kommunikációs terminál"
- 
--#: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr "U.S. Army Mobil előfizetői berendezés komponensek"
--
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Mappa"
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplexer"
- 
--#: ../sheets/Misc.sheet.in.h:3
--msgid "Measure distance"
--msgstr "Távolság mérése"
-+#: ../sheets/MSE.sheet.in.h:8
-+msgid "Demultiplexer"
-+msgstr "Demultiplexer"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:1
- msgid "Misc"
- msgstr "Egyéb"
- 
--#: ../sheets/Misc.sheet.in.h:5
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Egyéb alakok"
- 
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Fa"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Mappa"
-+
- #: ../sheets/Misc.sheet.in.h:6
--msgid "New-style group object, for testing"
--msgstr "Új stílusú csoportobjektum, tesztelésre"
-+msgid "expensible node"
-+msgstr "kibővíthető csomópont"
- 
- #: ../sheets/Misc.sheet.in.h:7
--msgid "Resizable grid"
--msgstr "�tméretezhető rács"
-+msgid "expended node"
-+msgstr "kibővített csomópont"
- 
- #: ../sheets/Misc.sheet.in.h:8
- msgid "Traditional clock"
- msgstr "Hagyományos óra"
- 
- #: ../sheets/Misc.sheet.in.h:9
--msgid "Tree"
--msgstr "Fa"
-+msgid "Measure distance"
-+msgstr "Távolság mérése"
- 
- #: ../sheets/Misc.sheet.in.h:10
--msgid "expended node"
--msgstr "kibővített csomópont"
-+msgid "Resizable grid"
-+msgstr "�tméretezhető rács"
- 
- #: ../sheets/Misc.sheet.in.h:11
--msgid "expensible node"
--msgstr "kibővíthető csomópont"
-+msgid "New-style group object, for testing"
-+msgstr "Új stílusú csoportobjektum, tesztelésre"
- 
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "2/2 elosztó"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pneumatikus/hidraulikus"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "3/2 elosztó"
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Pneumatikus és hidraulikus körök elemei"
- 
- #: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "4/2 elosztó"
-+msgid "Double-effect jack"
-+msgstr "Kéthatású emelő"
- 
- #: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "5/2 elosztó"
-+msgid "Normally-in simple-effect jack"
-+msgstr "Alapesetben bent egyszeres emelő"
- 
- #: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Légszellőző nyílás"
-+msgid "Normally-out simple-effect jack"
-+msgstr "Alapesetben kint egyszeres emelő"
- 
- #: ../sheets/Pneumatic.sheet.in.h:6
--msgid "Components for pneumatic and hydraulic circuits"
--msgstr "Pneumatikus és hidraulikus körök elemei"
-+msgid "Generic pressure source"
-+msgstr "�ltalános nyomásforrás"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Hidraulikus nyomásforrás"
- 
- #: ../sheets/Pneumatic.sheet.in.h:8
--msgid "Double-effect jack"
--msgstr "Kéthatású emelő"
-+msgid "Pneumatic pressure source"
-+msgstr "Pneumatikus nyomásforrás"
- 
- #: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Elektromos vezérlés (kettős tekercs)"
-+msgid "Air exhaust orifice"
-+msgstr "Légszellőző nyílás"
- 
- #: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Elektromos vezérlés (egyszeres tekercs)"
-+msgid "2/2 distributor"
-+msgstr "2/2 elosztó"
- 
- #: ../sheets/Pneumatic.sheet.in.h:11
--msgid "Generic pressure source"
--msgstr "�ltalános nyomásforrás"
-+msgid "3/2 distributor"
-+msgstr "3/2 elosztó"
- 
- #: ../sheets/Pneumatic.sheet.in.h:12
--msgid "Hydraulic pressure source"
--msgstr "Hidraulikus nyomásforrás"
-+msgid "4/2 distributor"
-+msgstr "4/2 elosztó"
- 
- #: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "Indirekt vezérlés a hidraulikus meghajtótól"
-+msgid "5/2 distributor"
-+msgstr "5/2 elosztó"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "Indirekt vezérlés a pneumatikus meghajtótól"
-+msgid "Muscular command"
-+msgstr "Izomvezérlés"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Mechanikus vezérlés rugóval"
-+msgid "Push-button command"
-+msgstr "Nyomógombos vezérlés"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
- msgstr "Mechanikus vezérlés excenterrel"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Izomvezérlés"
-+msgid "Mechanical command by spring"
-+msgstr "Mechanikus vezérlés rugóval"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Alapesetben bent egyszeres emelő"
-+msgid "Electric command (single coil)"
-+msgstr "Elektromos vezérlés (egyszeres tekercs)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Alapesetben kint egyszeres emelő"
-+msgid "Electric command (double coil)"
-+msgstr "Elektromos vezérlés (kettős tekercs)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Pneumatikus nyomásforrás"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Indirekt vezérlés a hidraulikus meghajtótól"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Pneumatikus/hidraulikus"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Nyomógombos vezérlés"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Indirekt vezérlés a pneumatikus meghajtótól"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Művelet/adat mező"
-+msgid "SADT/IDEF0"
-+msgstr "SADT/IDEF0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Művelet/adat folyamatnyíl"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Objektumok SADT diagramok készítéséhez"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Folyamatcímke"
-+msgid "Activity/data flow arrow"
-+msgstr "Művelet/adat folyamatnyíl"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Objektumok SADT diagramok készítéséhez"
-+msgid "Activity/data box"
-+msgstr "Művelet/adat mező"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT/IDEF0"
-+msgid "Flow label"
-+msgstr "Folyamatcímke"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Éppen végrehajtott művelet"
-+msgid "SDL"
-+msgstr "SDL"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr ""
-+"SDL (Specifikációs és leíró nyelv, Specification and Description Language)."
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
- msgstr "Blokktípus-referencia"
- 
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Szolgáltatástípus-hivatkozás"
-+
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Függvényhívás"
-+msgid "Process type reference"
-+msgstr "Folyamattípus-hivatkozás"
- 
--#: ../sheets/SDL.sheet.in.h:6
--msgid "Function header"
--msgstr "Függvényfejléc"
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "�llapot"
- 
- #: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "�ltalános szöveges megjegyzés"
-+msgid "Function header"
-+msgstr "Függvényfejléc"
- 
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "Be/ki csatlakozó"
-+msgid "Send message"
-+msgstr "Üzenet küldése"
- 
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Eljárás visszatérés"
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Üzenet fogadása"
- 
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Folyamattípus-hivatkozás"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Függvényhívás"
- 
- #: ../sheets/SDL.sheet.in.h:12
--msgid "Receive message"
--msgstr "Üzenet fogadása"
-+msgid "Action being executed"
-+msgstr "Éppen végrehajtott művelet"
- 
- #: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
--
--#: ../sheets/SDL.sheet.in.h:14
- msgid "Save state"
- msgstr "�llapot mentése"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Üzenet küldése"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Szolgáltatástípus-hivatkozás"
-+msgid "In/Out connector"
-+msgstr "Be/ki csatlakozó"
- 
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "SDL (Specifikációs és leíró nyelv, Specification and Description Language)."
-+msgid "Procedure return"
-+msgstr "Eljárás visszatérés"
- 
--#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "�llapot"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "�ltalános szöveges megjegyzés"
- 
- #: ../sheets/SISSI.sheet.in.h:1
--msgid "Air filter"
--msgstr "Légszűrő"
-+msgid "Objects to design sissi diagrams"
-+msgstr "Objektumok sissi diagramok tervezéséhez"
- 
- #: ../sheets/SISSI.sheet.in.h:2
--msgid "Air quality detector"
--msgstr "Levegőminőség-érzékelő"
-+msgid "Workstation"
-+msgstr "Munkaállomás"
- 
--#: ../sheets/SISSI.sheet.in.h:3
--msgid "Airconditioner"
--msgstr "Légkondicionáló"
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Relációs adatbázis"
- 
- #: ../sheets/SISSI.sheet.in.h:4
--msgid "Alarm center"
--msgstr "Riasztóközpont"
-+msgid "Server"
-+msgstr "Kiszolgáló"
- 
--#: ../sheets/SISSI.sheet.in.h:5
--msgid "Axial Ventilator"
--msgstr "Axiál ventilátor"
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Hordozható PC"
- 
--#: ../sheets/SISSI.sheet.in.h:6
--msgid "Backup"
--msgstr "Biztonsági mentés"
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "PDA"
- 
--#: ../sheets/SISSI.sheet.in.h:7
--msgid "Badge reader"
--msgstr "Kártyaolvasó"
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Tárolótömb"
- 
--#: ../sheets/SISSI.sheet.in.h:8
--msgid "Badge reader/keyboard"
--msgstr "Kártyaolvasó/billentyűzet"
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Útválasztó"
- 
--#: ../sheets/SISSI.sheet.in.h:9
--msgid "Biometric reader"
--msgstr "Biometrikus olvasó"
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Hálózat felhő"
- 
--#: ../sheets/SISSI.sheet.in.h:10
--msgid "Cell phone"
--msgstr "Mobiltelefon"
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefon"
- 
- #: ../sheets/SISSI.sheet.in.h:11
--msgid "Centrifugal Ventilator"
--msgstr "Centrifugál ventilátor"
-+msgid "Cell phone"
-+msgstr "Mobiltelefon"
- 
--#: ../sheets/SISSI.sheet.in.h:12
--msgid "Cipher machine"
--msgstr "Titkosítógép"
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Elosztó"
- 
--#: ../sheets/SISSI.sheet.in.h:13
--msgid "Circulation pump"
--msgstr "Keringető szivattyú"
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
- 
- #: ../sheets/SISSI.sheet.in.h:14
--msgid "Condensator"
--msgstr "Kondenzátor"
-+msgid "Cipher machine"
-+msgstr "Titkosítógép"
- 
- #: ../sheets/SISSI.sheet.in.h:15
--msgid "Current transducer"
--msgstr "�ramátalakító"
-+msgid "Magnetic storage"
-+msgstr "Mágneses tároló"
- 
- #: ../sheets/SISSI.sheet.in.h:16
--msgid "Digital code"
--msgstr "Digitális kód"
-+msgid "Paper storage"
-+msgstr "Papírtároló"
- 
- #: ../sheets/SISSI.sheet.in.h:17
--msgid "Enthalpy transducer"
--msgstr "Entalpiaátalakító"
--
--#: ../sheets/SISSI.sheet.in.h:18
--msgid "Extinguisher"
--msgstr "Tűzoltókészülék"
--
--#: ../sheets/SISSI.sheet.in.h:19
--msgid "Faraday cage"
--msgstr "Faraday-kalitka"
-+msgid "Person"
-+msgstr "Személy"
- 
--#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
- msgid "File cabinet"
- msgstr "Iratrendező"
- 
--#: ../sheets/SISSI.sheet.in.h:21
--msgid "Gate"
--msgstr "Kapu"
-+#: ../sheets/SISSI.sheet.in.h:19
-+msgid "Safe"
-+msgstr "Páncélszekrény"
-+
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
-+msgstr "Biztonsági mentés"
- 
- #: ../sheets/SISSI.sheet.in.h:22
--msgid "Geographic site"
--msgstr "Földrajzi hely"
-+msgid "Log analysis"
-+msgstr "Naplóelemzés"
- 
- #: ../sheets/SISSI.sheet.in.h:23
--msgid "Glass-break sensor"
--msgstr "Üvegtörés-érzékelő"
--
--#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "Elosztó"
-+msgid "Information system"
-+msgstr "Információs rendszer"
- 
--#: ../sheets/SISSI.sheet.in.h:25
-+#: ../sheets/SISSI.sheet.in.h:24
- msgid "Information"
- msgstr "Információ"
- 
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Szoba"
-+
- #: ../sheets/SISSI.sheet.in.h:26
--msgid "Information system"
--msgstr "Információs rendszer"
-+msgid "Faraday cage"
-+msgstr "Faraday-kalitka"
- 
--#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Hordozható PC"
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "Biztonsági terület"
-+
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr "Földrajzi hely"
- 
- #: ../sheets/SISSI.sheet.in.h:29
--msgid "Level detector"
--msgstr "Szintérzékelő"
-+msgid "Gate"
-+msgstr "Kapu"
- 
- #: ../sheets/SISSI.sheet.in.h:30
--msgid "Light detector"
--msgstr "Fényérzékelő"
-+msgid "Video camera"
-+msgstr "Videokamera"
- 
- #: ../sheets/SISSI.sheet.in.h:31
--msgid "Log analysis"
--msgstr "Naplóelemzés"
-+msgid "Glass-break sensor"
-+msgstr "Üvegtörés-érzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:32
--msgid "Magnetic storage"
--msgstr "Mágneses tároló"
-+msgid "Sensor beam"
-+msgstr "Szenzorsugár"
- 
--#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Modem"
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Kondenzátor"
- 
- #: ../sheets/SISSI.sheet.in.h:34
--msgid "Moisture extractor"
--msgstr "Páraelszívó"
-+msgid "Power transducer"
-+msgstr "Energiaátalakító"
- 
- #: ../sheets/SISSI.sheet.in.h:35
--msgid "Moisture sensor"
--msgstr "Páraérzékelő"
-+msgid "Current transducer"
-+msgstr "�ramátalakító"
- 
- #: ../sheets/SISSI.sheet.in.h:36
--msgid "Movement detector"
--msgstr "Mozgásérzékelő"
-+msgid "Enthalpy transducer"
-+msgstr "Entalpiaátalakító"
- 
--#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Hálózat felhő"
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Füstérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:38
--msgid "Objects to design sissi diagrams"
--msgstr "Objektumok sissi diagramok tervezéséhez"
-+msgid "Moisture sensor"
-+msgstr "Páraérzékelő"
- 
--#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "PDA"
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Fényérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:40
--msgid "Paper storage"
--msgstr "Papírtároló"
-+msgid "Movement detector"
-+msgstr "Mozgásérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:41
--msgid "Person"
--msgstr "Személy"
-+msgid "Video movement detector"
-+msgstr "Video mozgásérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:42
--msgid "Power transducer"
--msgstr "Energiaátalakító"
-+msgid "Level detector"
-+msgstr "Szintérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:43
- msgid "Pressure transducer"
- msgstr "Nyomásátalakító"
- 
- #: ../sheets/SISSI.sheet.in.h:44
--msgid "Pump"
--msgstr "Szivattyú"
-+msgid "Air quality detector"
-+msgstr "Levegőminőség-érzékelő"
- 
--#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr "Relációs adatbázis"
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Feszültségérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:46
--msgid "Revolving door"
--msgstr "Forgóajtó"
-+msgid "Vehicle detector"
-+msgstr "Járműérzékelő"
- 
- #: ../sheets/SISSI.sheet.in.h:47
--msgid "Room"
--msgstr "Szoba"
-+msgid "Vibration sensor"
-+msgstr "Rázkódásérzékelő"
- 
--#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "Útválasztó"
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Digitális kód"
- 
- #: ../sheets/SISSI.sheet.in.h:49
--msgid "Safe"
--msgstr "Páncélszekrény"
-+msgid "Moisture extractor"
-+msgstr "Páraelszívó"
- 
- #: ../sheets/SISSI.sheet.in.h:50
--msgid "Security area"
--msgstr "Biztonsági terület"
-+msgid "Air filter"
-+msgstr "Légszűrő"
- 
- #: ../sheets/SISSI.sheet.in.h:51
--msgid "Sensor beam"
--msgstr "Szenzorsugár"
-+msgid "Badge reader/keyboard"
-+msgstr "Kártyaolvasó/billentyűzet"
- 
- #: ../sheets/SISSI.sheet.in.h:52
--msgid "Server"
--msgstr "Kiszolgáló"
-+msgid "Badge reader"
-+msgstr "Kártyaolvasó"
- 
- #: ../sheets/SISSI.sheet.in.h:53
--msgid "Smoke detector"
--msgstr "Füstérzékelő"
-+msgid "Biometric reader"
-+msgstr "Biometrikus olvasó"
- 
--#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Tárolótömb"
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "Szivattyú"
- 
--#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Telefon"
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr "Keringető szivattyú"
-+
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr "Forgóajtó"
- 
- #: ../sheets/SISSI.sheet.in.h:57
--msgid "Vehicle detector"
--msgstr "Járműérzékelő"
-+msgid "Axial Ventilator"
-+msgstr "Axiál ventilátor"
- 
- #: ../sheets/SISSI.sheet.in.h:58
--msgid "Ventilator"
--msgstr "Ventilátor"
-+msgid "Centrifugal Ventilator"
-+msgstr "Centrifugál ventilátor"
- 
- #: ../sheets/SISSI.sheet.in.h:59
--msgid "Vibration sensor"
--msgstr "Rázkódásérzékelő"
-+msgid "Ventilator"
-+msgstr "Ventilátor"
- 
- #: ../sheets/SISSI.sheet.in.h:60
--msgid "Video camera"
--msgstr "Videokamera"
--
--#: ../sheets/SISSI.sheet.in.h:61
--msgid "Video movement detector"
--msgstr "Video mozgásérzékelő"
-+msgid "Extinguisher"
-+msgstr "Tűzoltókészülék"
- 
- #: ../sheets/SISSI.sheet.in.h:62
--msgid "Voltage detector"
--msgstr "Feszültségérzékelő"
-+msgid "Airconditioner"
-+msgstr "Légkondicionáló"
- 
- #: ../sheets/SISSI.sheet.in.h:63
--msgid "Workstation"
--msgstr "Munkaállomás"
-+msgid "Alarm center"
-+msgstr "Riasztóközpont"
- 
- #: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Tevékenység"
-+msgid "UML"
-+msgstr "UML"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "Aggregáció, egy osztály része a másiknak"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "UML statikus struktúra ábrák szerkesztője"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "Asszociáció, két osztály kapcsolatban van"
-+# lib/message.c:120
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Megjegyzés"
- 
- #: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr "Osztály sztereotípus ikon"
-+msgid "Realizes, implements a specific interface"
-+msgstr "Megvalósít egy bizonyos csatolót"
- 
- #: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr "Komponens"
-+msgid "Generalization, class inheritance"
-+msgstr "Generalizáció, osztályöröklődés"
- 
- #: ../sheets/UML.sheet.in.h:9
--msgid "Constraint, place a constraint on something"
--msgstr "Megkötés, megszorítást alkalmaz valamire"
--
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "UML statikus struktúra ábrák szerkesztője"
--
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Elágazás/egyesítés"
-+msgid "Association, two classes are associated"
-+msgstr "Asszociáció, két osztály kapcsolatban van"
- 
--#: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Generalizáció, osztályöröklődés"
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Aggregáció, egy osztály része a másiknak"
- 
--#: ../sheets/UML.sheet.in.h:17
-+#: ../sheets/UML.sheet.in.h:11
- msgid "Implements, class implements a specific interface"
- msgstr "Megvalósít, az osztály megvalósít egy bizonyos felületet"
- 
--#: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr "Kezdő/vég állapot"
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Megkötés, megszorítást alkalmaz valamire"
- 
--#: ../sheets/UML.sheet.in.h:19
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Kis csomag"
-+
-+#: ../sheets/UML.sheet.in.h:14
- msgid "Large package"
- msgstr "Nagy csomag"
- 
--#: ../sheets/UML.sheet.in.h:20
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Használati eset"
-+
-+#: ../sheets/UML.sheet.in.h:17
- msgid "Lifeline"
- msgstr "Életvonal"
- 
--#: ../sheets/UML.sheet.in.h:21
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Objektum"
-+
-+#: ../sheets/UML.sheet.in.h:19
- msgid "Message"
- msgstr "Ãœzenet"
- 
--#: ../sheets/UML.sheet.in.h:22
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Komponens"
-+
-+#: ../sheets/UML.sheet.in.h:25
- msgid "Node"
- msgstr "Csomópont"
- 
--# lib/message.c:120
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "Megjegyzés"
--
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Objektum"
--
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "Megvalósít egy bizonyos csatolót"
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "Osztály sztereotípus ikon"
- 
- #: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Kis csomag"
-+msgid "Initial/end state"
-+msgstr "Kezdő/vég állapot"
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Tevékenység"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr "Használati eset"
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Elágazás/egyesítés"
- 
- #: ../sheets/chronogram.sheet.in.h:1
- msgid "Chronogram"
- msgstr "Kronogram"
- 
- #: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr "Adatvonal"
--
--#: ../sheets/chronogram.sheet.in.h:3
- msgid "Objects to design chronogram charts"
- msgstr "Objektumok kronogramok készítéséhez"
- 
--#: ../sheets/chronogram.sheet.in.h:4
-+#: ../sheets/chronogram.sheet.in.h:3
- msgid "Time scale"
- msgstr "Időskála"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--msgid "BBS"
--msgstr "BBS"
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Adatvonal"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
-+#: ../sheets/ciscocomputer.sheet.in.h:1
- msgid "Cisco - Computer"
- msgstr "Cisco - Számítógép"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Számítógépes alakok a Cisco-tól"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "Cisco CA"
-+msgid "PC"
-+msgstr "PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "CiscoSecurity"
-+msgid "Macintosh"
-+msgstr "Macintosh"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr "CiscoWorks munkaállomás"
-+msgid "Terminal"
-+msgstr "Terminál"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Számítógépes alakok a Cisco-tól"
-+msgid "SUN workstation"
-+msgstr "SUN munkaállomás"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr "Lemez alrendszer"
-+msgid "CiscoWorks workstation"
-+msgstr "CiscoWorks munkaállomás"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Floppy"
-+msgid "PC Router Card"
-+msgstr "PC útválasztó kártya"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:9
--msgid "EtherClient"
--msgstr "EtherClient"
-+msgid "PC Software"
-+msgstr "PC szoftver"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:10
--msgid "FC Storage"
--msgstr "FC tároló"
-+msgid "PC with Router-Based Software"
-+msgstr "PC útválasztó-alapú szoftverrel"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Fájlkiszolgáló"
-+msgid "Workgroup director"
-+msgstr "Munkacsoport-vezérlő"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:12
--msgid "Front End Processor"
--msgstr "Előoldali processzor"
-+msgid "CiscoSecurity"
-+msgstr "CiscoSecurity"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP Mini"
-+msgid "Cisco CA"
-+msgstr "Cisco CA"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
--msgstr "Kézi számítógép"
-+msgid "WWW server"
-+msgstr "WWW kiszolgáló"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Gazda"
-+msgid "Web browser"
-+msgstr "Webböngésző"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "IBM Mini (AS400)"
-+msgid "File Server"
-+msgstr "Fájlkiszolgáló"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "IBM torony"
-+msgid "Software-Based Router on File Server"
-+msgstr "Szoftver alapú útválasztó a fájlkiszolgálón"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "IBM nagygép"
-+msgid "Server with PC Router"
-+msgstr "Kiszolgáló PC-útválasztóval"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:19
--msgid "IBM mainframe with FEP"
--msgstr "IBM nagygép FEP-pel"
-+msgid "IBM Tower"
-+msgstr "IBM torony"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
--msgstr "JBOD"
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM Mini (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr "Előoldali processzor"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Macintosh"
-+msgid "IBM mainframe"
-+msgstr "IBM nagygép"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "MicroWebserver"
-+msgid "IBM mainframe with FEP"
-+msgstr "IBM nagygép FEP-pel"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Mini VAX"
-+msgid "HP Mini"
-+msgstr "HP Mini"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Monitor"
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Szuperszámítógép"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:26
-+msgid "Web cluster"
-+msgstr "Webes fürt"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:27
--msgid "Newton"
--msgstr "Newton"
-+msgid "Mini VAX"
-+msgstr "Mini VAX"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:29
--msgid "PC Adapter Card"
--msgstr "PC csatlakozókártya"
--
--#: ../sheets/ciscocomputer.sheet.in.h:30
- msgid "PC Card"
- msgstr "PC kártya"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tábla"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:31
--msgid "PC Router Card"
--msgstr "PC útválasztó kártya"
-+msgid "EtherClient"
-+msgstr "EtherClient"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:32
--msgid "PC Software"
--msgstr "PC szoftver"
-+msgid "Handheld"
-+msgstr "Kézi számítógép"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "PC Video"
-+msgid "Wireless"
-+msgstr "Vezeték nélküli"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
--msgstr "PC útválasztó-alapú szoftverrel"
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Newton"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "SUN munkaállomás"
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Monitor"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Kiszolgáló PC-útválasztóval"
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "PC Video"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:41
--msgid "Software-Based Router on File Server"
--msgstr "Szoftver alapú útválasztó a fájlkiszolgálón"
-+msgid "BBS"
-+msgstr "BBS"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Szuperszámítógép"
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "MicroWebserver"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr "Tábla"
-+msgid "Diskette"
-+msgstr "Floppy"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:45
--msgid "Tape array"
--msgstr "Szalagos tömb"
-+msgid "Host"
-+msgstr "Gazda"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:46
--msgid "Terminal"
--msgstr "Terminál"
-+msgid "Tape array"
-+msgstr "Szalagos tömb"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:47
--msgid "WWW server"
--msgstr "WWW kiszolgáló"
-+msgid "Disk subsystem"
-+msgstr "Lemez alrendszer"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:48
--msgid "Web browser"
--msgstr "Webböngésző"
--
--#: ../sheets/ciscocomputer.sheet.in.h:49
--msgid "Web cluster"
--msgstr "Webes fürt"
-+msgid "JBOD"
-+msgstr "JBOD"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:50
--msgid "Wireless"
--msgstr "Vezeték nélküli"
-+msgid "FC Storage"
-+msgstr "FC tároló"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr "Munkacsoport-vezérlő"
-+msgid "PC Adapter Card"
-+msgstr "PC csatlakozókártya"
- 
- #: ../sheets/ciscohub.sheet.in.h:1
--msgid "100BaseT Hub"
--msgstr "100BaseT elosztó"
-+msgid "Cisco - Switch"
-+msgstr "Cisco - Kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:2
--msgid "7500ARS (7513) Router"
--msgstr "7500ARS (7513) útválasztó"
--
--#: ../sheets/ciscohub.sheet.in.h:3
--msgid "7505 Router"
--msgstr "7505 útválasztó"
-+msgid "Router and switch shapes by Cisco"
-+msgstr "Cisco elosztó és kapcsoló alakok"
- 
- #: ../sheets/ciscohub.sheet.in.h:4
--msgid "7507 Router"
--msgstr "7507 útválasztó"
-+msgid "Router subdued"
-+msgstr "Elfojtott útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:5
--msgid "ASIC Processor"
--msgstr "ASIC processzor"
-+msgid "Router with Silicon Switch"
-+msgstr "Útválasztó szilíciumkapcsolóval"
- 
- #: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+msgid "NetFlow router"
-+msgstr "NetFlow útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:7
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "ATM Fast Gigabit Etherswitch"
-+msgid "Broadband router"
-+msgstr "Széles sávú útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:8
--msgid "ATM Switch"
--msgstr "ATM-kapcsoló"
-+msgid "Wavelength router"
-+msgstr "Hullámhossz-útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:9
--msgid "ATM Tag Switch Router"
--msgstr "ATM-címkekapcsoló útválasztó"
-+msgid "Wireless router"
-+msgstr "Vezeték nélküli útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:10
--msgid "Access Gateway"
--msgstr "Hozzáférési átjáró"
-+msgid "7507 Router"
-+msgstr "7507 útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+msgid "7505 Router"
-+msgstr "7505 útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Széles sávú útválasztó"
-+msgid "7500ARS (7513) Router"
-+msgstr "7500ARS (7513) útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr "CSM-S"
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr "Perem címkekapcsoló útválasztó NetFlow-val"
- 
- #: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr "Vivőhang útválasztó rendszer"
-+msgid "Edge Label Switch Router"
-+msgstr "Perem címkekapcsoló útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:15
--msgid "Cisco - Switch"
--msgstr "Cisco - Kapcsoló"
-+msgid "Router with Firewall"
-+msgstr "Útválasztó tűzfallal"
- 
- #: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+msgid "Optical Services Router"
-+msgstr "Optikai szolgáltatások útválasztója"
- 
- #: ../sheets/ciscohub.sheet.in.h:17
--msgid "Cisco Hub"
--msgstr "Cisco elosztó"
--
--#: ../sheets/ciscohub.sheet.in.h:18
- msgid "Content Router"
- msgstr "Tartalom-útválasztó"
- 
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Vivőhang útválasztó rendszer"
-+
- #: ../sheets/ciscohub.sheet.in.h:19
--msgid "Content Service Module"
--msgstr "Tartalomszolgáltatási modul"
-+msgid "Storage Router"
-+msgstr "Tároló útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:20
--msgid "Content Service Switch 1100"
--msgstr "1100-as tartalomszolgáltató kapcsoló"
--
--#: ../sheets/ciscohub.sheet.in.h:21
--msgid "Content Switch"
--msgstr "Tartalomkapcsoló"
-+msgid "NetSonar"
-+msgstr "NetSonar"
- 
- #: ../sheets/ciscohub.sheet.in.h:22
--msgid "Data Center Switch"
--msgstr "Adatközpont kapcsoló"
-+msgid "Hub subdued"
-+msgstr "Elfojtott elosztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr "Fordított adatközpont kapcsoló"
-+msgid "Cisco Hub"
-+msgstr "Cisco elosztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:24
--msgid "Data Switch Processor"
--msgstr "Adatkapcsoló processzor"
-+msgid "Small Hub"
-+msgstr "Kis elosztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr "Igazgató-osztályú Fibre Channel intelligens kapcsoló"
-+msgid "100BaseT Hub"
-+msgstr "100BaseT elosztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:26
--msgid "Edge Label Switch Router"
--msgstr "Perem címkekapcsoló útválasztó"
-+msgid "Workgroup switch"
-+msgstr "Munkacsoportos kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
--msgstr "Perem címkekapcsoló útválasztó NetFlow-val"
-+msgid "Workgroup switch Subdued"
-+msgstr "Elfojtott munkacsoportos kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:28
--msgid "Generic Processor"
--msgstr "�ltalános feldolgozó"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Munkacsoportos kapcsoló hanggal"
-+
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
- 
- #: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr "Elfojtott elosztó"
-+msgid "ATM Tag Switch Router"
-+msgstr "ATM-címkekapcsoló útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "ISDN kapcsoló"
-+msgid "Switch Processor"
-+msgstr "Kapcsoló processzor"
- 
- #: ../sheets/ciscohub.sheet.in.h:32
--msgid "LAN2LAN Switch"
--msgstr "LAN2LAN kapcsoló"
-+msgid "Route Switch Processor"
-+msgstr "Útvonalkapcsoló processzor"
- 
- #: ../sheets/ciscohub.sheet.in.h:33
--msgid "Label Switch Router"
--msgstr "Címkekapcsoló útválasztó"
-+msgid "Route Switch Processor with Si"
-+msgstr "Útvonalkapcsoló processzor Si-vel"
- 
- #: ../sheets/ciscohub.sheet.in.h:34
--msgid "Layer 2 Remote Switch"
--msgstr "2. réteg távoli kapcsoló"
-+msgid "PXF"
-+msgstr "PXF"
- 
- #: ../sheets/ciscohub.sheet.in.h:35
--msgid "MGX 8220"
--msgstr "MGX 8220"
-+msgid "ASIC Processor"
-+msgstr "ASIC processzor"
- 
- #: ../sheets/ciscohub.sheet.in.h:36
--msgid "MGX 8240"
--msgstr "MGX 8240"
-+msgid "Generic Processor"
-+msgstr "�ltalános feldolgozó"
- 
- #: ../sheets/ciscohub.sheet.in.h:37
--msgid "MGX 8260"
--msgstr "MGX 8260"
-+msgid "Data Center Switch"
-+msgstr "Adatközpont kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:38
--msgid "Multi-Fabric Server Switch"
--msgstr "Összetett szerkezetű kiszolgálókapcsoló"
-+msgid "Data Center Switch Reversed"
-+msgstr "Fordított adatközpont kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:39
--msgid "MultiSwitch Device"
--msgstr "MultiSwitch eszköz"
-+msgid "Data Switch Processor"
-+msgstr "Adatkapcsoló processzor"
- 
- #: ../sheets/ciscohub.sheet.in.h:40
--msgid "Multilayer Remote Switch"
--msgstr "Többrétegű távoli kapcsoló"
-+msgid "Content Switch"
-+msgstr "Tartalomkapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:41
--msgid "Multilayer Switch"
--msgstr "Többrétegű kapcsoló"
-+msgid "Content Service Module"
-+msgstr "Tartalomszolgáltatási modul"
- 
- #: ../sheets/ciscohub.sheet.in.h:42
--msgid "Multilayer Switch with Silicon"
--msgstr "Többrétegű kapcsoló Siliconnal"
-+msgid "CSM-S"
-+msgstr "CSM-S"
- 
- #: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
--msgstr "Elfojtott többrétegű kapcsoló Siliconnal"
-+msgid "Access Gateway"
-+msgstr "Hozzáférési átjáró"
- 
- #: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr "NetFlow útválasztó"
-+msgid "ATM Switch"
-+msgstr "ATM-kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr "NetRanger"
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
- 
- #: ../sheets/ciscohub.sheet.in.h:46
--msgid "NetSonar"
--msgstr "NetSonar"
-+msgid "Cisco 1000"
-+msgstr "Cisco 1000"
- 
- #: ../sheets/ciscohub.sheet.in.h:47
--msgid "Optical Services Router"
--msgstr "Optikai szolgáltatások útválasztója"
-+msgid "ISDN switch"
-+msgstr "ISDN kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
--msgstr "PXF"
-+msgid "Label Switch Router"
-+msgstr "Címkekapcsoló útválasztó"
- 
- #: ../sheets/ciscohub.sheet.in.h:49
--msgid "Programmable Switch"
--msgstr "Programozható kapcsoló"
-+msgid "MultiSwitch Device"
-+msgstr "MultiSwitch eszköz"
- 
- #: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr "RateMUX"
-+msgid "LAN2LAN Switch"
-+msgstr "LAN2LAN kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:51
--msgid "Route Switch Processor"
--msgstr "Útvonalkapcsoló processzor"
-+msgid "Multilayer Switch"
-+msgstr "Többrétegű kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:52
--msgid "Route Switch Processor with Si"
--msgstr "Útvonalkapcsoló processzor Si-vel"
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Többrétegű kapcsoló Siliconnal"
-+
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
-+msgstr "Elfojtott többrétegű kapcsoló Siliconnal"
- 
- #: ../sheets/ciscohub.sheet.in.h:54
--msgid "Router and switch shapes by Cisco"
--msgstr "Cisco elosztó és kapcsoló alakok"
-+msgid "Programmable Switch"
-+msgstr "Programozható kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:55
--msgid "Router subdued"
--msgstr "Elfojtott útválasztó"
-+msgid "Content Service Switch 1100"
-+msgstr "1100-as tartalomszolgáltató kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:56
--msgid "Router with Firewall"
--msgstr "Útválasztó tűzfallal"
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "ATM Fast Gigabit Etherswitch"
- 
- #: ../sheets/ciscohub.sheet.in.h:57
--msgid "Router with Silicon Switch"
--msgstr "Útválasztó szilíciumkapcsolóval"
-+msgid "RateMUX"
-+msgstr "RateMUX"
- 
- #: ../sheets/ciscohub.sheet.in.h:58
--msgid "Server Switch"
--msgstr "Kiszolgálókapcsoló"
-+msgid "Workgroup 5500"
-+msgstr "Munkacsoport 5500"
- 
- #: ../sheets/ciscohub.sheet.in.h:59
--msgid "Small Hub"
--msgstr "Kis elosztó"
-+msgid "Workgroup 5000"
-+msgstr "Munkacsoport 5000"
- 
- #: ../sheets/ciscohub.sheet.in.h:60
--msgid "Storage Router"
--msgstr "Tároló útválasztó"
-+msgid "Workgroup 5002"
-+msgstr "Munkacsoport 5002"
- 
- #: ../sheets/ciscohub.sheet.in.h:61
--msgid "Switch Processor"
--msgstr "Kapcsoló processzor"
-+msgid "NetRanger"
-+msgstr "NetRanger"
- 
- #: ../sheets/ciscohub.sheet.in.h:62
--msgid "Universal Gateway"
--msgstr "Univerzális átjáró"
-+msgid "MGX 8220"
-+msgstr "MGX 8220"
- 
- #: ../sheets/ciscohub.sheet.in.h:63
--msgid "Virtual Layer Switch"
--msgstr "Virtuális rétegkapcsoló"
-+msgid "MGX 8240"
-+msgstr "MGX 8240"
- 
- #: ../sheets/ciscohub.sheet.in.h:64
--msgid "Wavelength router"
--msgstr "Hullámhossz-útválasztó"
-+msgid "MGX 8260"
-+msgstr "MGX 8260"
- 
- #: ../sheets/ciscohub.sheet.in.h:65
--msgid "Wireless router"
--msgstr "Vezeték nélküli útválasztó"
-+msgid "Universal Gateway"
-+msgstr "Univerzális átjáró"
- 
- #: ../sheets/ciscohub.sheet.in.h:66
--msgid "Workgroup 5000"
--msgstr "Munkacsoport 5000"
-+msgid "iSCSI switch"
-+msgstr "iSCSI kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:67
--msgid "Workgroup 5002"
--msgstr "Munkacsoport 5002"
-+msgid "Workgroup Fibre Channel intelligent switch"
-+msgstr "Munkacsoport Fibre Channel intelligens kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:68
--msgid "Workgroup 5500"
--msgstr "Munkacsoport 5500"
-+msgid "Director-class Fibre Channel intelligent switch"
-+msgstr "Igazgató-osztályú Fibre Channel intelligens kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
--msgstr "Munkacsoport Fibre Channel intelligens kapcsoló"
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Összetett szerkezetű kiszolgálókapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:70
--msgid "Workgroup Switch Voice-Enabled"
--msgstr "Munkacsoportos kapcsoló hanggal"
-+msgid "Server Switch"
-+msgstr "Kiszolgálókapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
--msgstr "Munkacsoportos kapcsoló"
-+msgid "Multilayer Remote Switch"
-+msgstr "Többrétegű távoli kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:72
--msgid "Workgroup switch Subdued"
--msgstr "Elfojtott munkacsoportos kapcsoló"
-+msgid "Layer 2 Remote Switch"
-+msgstr "2. réteg távoli kapcsoló"
- 
- #: ../sheets/ciscohub.sheet.in.h:73
--msgid "iSCSI switch"
--msgstr "iSCSI kapcsoló"
-+msgid "Virtual Layer Switch"
-+msgstr "Virtuális rétegkapcsoló"
- 
- #: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
--msgstr "Személy"
-+msgid "Cisco - Misc"
-+msgstr "Cisco - Egyéb"
- 
- #: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr "Antenna"
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Egyéb alakok a Cisco-tól"
- 
- #: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Fiókiroda"
-+msgid "Government Building"
-+msgstr "Kormányzati épület"
- 
- #: ../sheets/ciscomisc.sheet.in.h:4
--msgid "Branch office blue"
--msgstr "Fiókiroda - kék"
-+msgid "University"
-+msgstr "Egyetem"
- 
- #: ../sheets/ciscomisc.sheet.in.h:5
--msgid "Branch office subdued"
--msgstr "Elfojtott fiókiroda"
-+msgid "Small Business"
-+msgstr "Kisvállalkozás"
- 
- #: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr "Autó"
-+msgid "Home office"
-+msgstr "Otthoni iroda"
- 
- #: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Cisco - Egyéb"
-+msgid "Branch office"
-+msgstr "Fiókiroda"
- 
- #: ../sheets/ciscomisc.sheet.in.h:8
--msgid "CiscoWorks Man"
--msgstr "CiscoWorks férfi"
-+msgid "Branch office subdued"
-+msgstr "Elfojtott fiókiroda"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:9
-+msgid "Branch office blue"
-+msgstr "Fiókiroda - kék"
- 
- #: ../sheets/ciscomisc.sheet.in.h:10
- msgid "Generic Building"
- msgstr "�ltalános épület"
- 
- #: ../sheets/ciscomisc.sheet.in.h:11
--msgid "Generic Building blue"
--msgstr "�ltalános épület - kék"
--
--#: ../sheets/ciscomisc.sheet.in.h:12
- msgid "Generic Building subdued"
- msgstr "Elfojtott általános épület"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:12
-+msgid "Generic Building blue"
-+msgstr "�ltalános épület - kék"
-+
- #: ../sheets/ciscomisc.sheet.in.h:13
--msgid "Government Building"
--msgstr "Kormányzati épület"
-+msgid "Medium Building"
-+msgstr "Közepes épület"
- 
- #: ../sheets/ciscomisc.sheet.in.h:14
--msgid "Headphones"
--msgstr "Fejhallgató"
-+msgid "Medium Building subdued"
-+msgstr "Elfojtott közepes épület"
- 
- #: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr "Otthoni iroda"
-+msgid "Medium Building blue"
-+msgstr "Közepes épület - kék"
- 
- #: ../sheets/ciscomisc.sheet.in.h:16
- msgid "House"
-@@ -9413,1130 +9440,1131 @@ msgid "House blue"
- msgstr "Ház - kék"
- 
- #: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Kulcs"
-+msgid "Telecommuter house"
-+msgstr "Távmunkás otthona"
- 
--#: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
--msgstr "Zár és kulcs"
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr "Elfojtott távmunkás otthona"
- 
--#: ../sheets/ciscomisc.sheet.in.h:21
-+#: ../sheets/ciscomisc.sheet.in.h:20
- msgid "MDU"
- msgstr "MDU"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr "Férfi"
-+
- #: ../sheets/ciscomisc.sheet.in.h:22
--msgid "Mac Woman"
--msgstr "Macintosh-os nő"
-+msgid "Man red"
-+msgstr "Férfi - vörös"
- 
- #: ../sheets/ciscomisc.sheet.in.h:23
--msgid "Man"
--msgstr "Férfi"
-+msgid "Man gold"
-+msgstr "Férfi - arany"
- 
- #: ../sheets/ciscomisc.sheet.in.h:24
- msgid "Man blue"
- msgstr "Férfi -kék"
- 
- #: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
--msgstr "Férfi - arany"
-+msgid "Standing Man"
-+msgstr "�lló férfi"
- 
- #: ../sheets/ciscomisc.sheet.in.h:26
--msgid "Man red"
--msgstr "Férfi - vörös"
-+msgid "Standing woman"
-+msgstr "�lló nő"
- 
- #: ../sheets/ciscomisc.sheet.in.h:27
--msgid "Medium Building"
--msgstr "Közepes épület"
-+msgid "Woman"
-+msgstr "NÅ‘"
- 
- #: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr "Közepes épület - kék"
-+msgid "Woman red"
-+msgstr "Nő - vörös"
- 
- #: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr "Elfojtott közepes épület"
-+msgid "Woman gold"
-+msgstr "NÅ‘ - arany"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Nő - kék"
- 
- #: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Egyéb alakok a Cisco-tól"
-+msgid "Running man"
-+msgstr "Futó férfi"
- 
- #: ../sheets/ciscomisc.sheet.in.h:32
--msgid "PC Man"
--msgstr "PC-s férfi"
-+msgid "Running man subdued"
-+msgstr "Elfojtott futó férfi"
- 
- #: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
--msgstr "PC-s férfi balra"
-+msgid "Telecommuter"
-+msgstr "Távmunkás"
- 
- #: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
--msgstr "Futó férfi"
-+msgid "Running woman"
-+msgstr "Futó nő"
- 
- #: ../sheets/ciscomisc.sheet.in.h:35
--msgid "Running man subdued"
--msgstr "Elfojtott futó férfi"
-+msgid "CiscoWorks Man"
-+msgstr "CiscoWorks férfi"
- 
- #: ../sheets/ciscomisc.sheet.in.h:36
--msgid "Running woman"
--msgstr "Futó nő"
-+msgid "PC Man left"
-+msgstr "PC-s férfi balra"
- 
- #: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Műhold"
-+msgid "PC Man"
-+msgstr "PC-s férfi"
- 
- #: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
--msgstr "Műholdvevő antenna"
--
--#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman"
- msgstr "Ülő nő"
- 
--#: ../sheets/ciscomisc.sheet.in.h:40
-+#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman right"
- msgstr "Ülő nő jobbra"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:40
-+msgid "Mac Woman"
-+msgstr "Macintosh-os nő"
-+
- #: ../sheets/ciscomisc.sheet.in.h:41
--msgid "Small Business"
--msgstr "Kisvállalkozás"
-+msgid "Androgynous Person"
-+msgstr "Személy"
- 
- #: ../sheets/ciscomisc.sheet.in.h:43
--msgid "Standing Man"
--msgstr "�lló férfi"
-+msgid "Key"
-+msgstr "Kulcs"
- 
- #: ../sheets/ciscomisc.sheet.in.h:44
--msgid "Standing woman"
--msgstr "�lló nő"
-+msgid "Lock and Key"
-+msgstr "Zár és kulcs"
- 
- #: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
--msgstr "Távmunkás"
-+msgid "Satellite dish"
-+msgstr "Műholdvevő antenna"
- 
- #: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr "Távmunkás otthona"
-+msgid "Satellite"
-+msgstr "Műhold"
- 
- #: ../sheets/ciscomisc.sheet.in.h:47
--msgid "Telecommuter house subdued"
--msgstr "Elfojtott távmunkás otthona"
--
--#: ../sheets/ciscomisc.sheet.in.h:48
--msgid "Truck"
--msgstr "Kamion"
-+msgid "Antenna"
-+msgstr "Antenna"
- 
- #: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Egyetem"
-+msgid "Car"
-+msgstr "Autó"
- 
- #: ../sheets/ciscomisc.sheet.in.h:50
-+msgid "Truck"
-+msgstr "Kamion"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:51
- msgid "Video Camera"
- msgstr "Videokamera"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscomisc.sheet.in.h:52
- msgid "Video Camera right"
- msgstr "Videokamera jobbra"
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
--msgid "Woman"
--msgstr "NÅ‘"
--
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr "Nő - kék"
--
- #: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr "NÅ‘ - arany"
--
--#: ../sheets/ciscomisc.sheet.in.h:55
--msgid "Woman red"
--msgstr "Nő - vörös"
-+msgid "Headphones"
-+msgstr "Fejhallgató"
- 
- #: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr "10700"
-+msgid "Cisco - Network"
-+msgstr "Cisco - Hálózatok"
- 
- #: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr "15200"
-+msgid "Network shapes by Cisco"
-+msgstr "Hálózati alakok a Ciscótól"
- 
- #: ../sheets/cisconetwork.sheet.in.h:3
--msgid "15800"
--msgstr "15800"
-+msgid "Network Management"
-+msgstr "Hálózatfelügyelet"
- 
- #: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr "3174 (asztali) fürtvezérlő"
-+msgid "Detector"
-+msgstr "Érzékelő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
--msgstr "3X74 (padlón álló) fürtvezérlő"
-+msgid "Protocol Translator"
-+msgstr "Protokollfordító"
- 
- #: ../sheets/cisconetwork.sheet.in.h:6
--msgid "Access Server"
--msgstr "Hozzáférési kiszolgáló"
-+msgid "IP"
-+msgstr "IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
--msgstr "Hozzáférési pont"
-+msgid "IP Old-style"
-+msgstr "Régi stílusú IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
--msgstr "Automatikus védelmi kapcsolás"
-+msgid "NAT"
-+msgstr "NAT"
- 
- #: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
-+msgid "VIP"
-+msgstr "VIP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "BBFW közeg"
-+msgid "Terminal Server"
-+msgstr "Terminálkiszolgáló"
- 
- #: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
--msgstr "Csatlakozódoboz"
-+msgid "Access Server"
-+msgstr "Hozzáférési kiszolgáló"
- 
- #: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Híd"
-+msgid "System controller"
-+msgstr "Rendszervezérlő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:13
--msgid "CDDI/FDDI Concentrator"
--msgstr "CDDI/FDDI gyűjtő"
-+msgid "Directory Server"
-+msgstr "Könyvtárkiszolgáló"
- 
- #: ../sheets/cisconetwork.sheet.in.h:14
--msgid "CDM Content Distribution Manager"
--msgstr "CDM Tartalomterjesztés-kezelő"
-+msgid "Firewall"
-+msgstr "Tűzfal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr "CSU/DSU"
-+msgid "Firewall subdued"
-+msgstr "Elfojtott tűzfal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:16
--msgid "Cable Modem"
--msgstr "Kábelmodem"
-+msgid "Firewall horizontal"
-+msgstr "Vízszintes tűzfal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:17
--msgid "Catalyst Access Gateway"
--msgstr "Catalyst hozzáférési átjáró"
-+msgid "Firewall Service Module"
-+msgstr "Tűzfal-szolgáltatási modul"
- 
- #: ../sheets/cisconetwork.sheet.in.h:18
--msgid "Centri Firewall"
--msgstr "Centri tűzfal"
-+msgid "IOS Firewall"
-+msgstr "IOS tűzfal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:19
--msgid "Channelized Pipe"
--msgstr "Rovátkolt cső"
-+msgid "PIX Firewall"
-+msgstr "PIX tűzfal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Cisco - Hálózatok"
-+msgid "PIX Firewall Left"
-+msgstr "PIX tűzfal balra"
- 
- #: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Felhő"
--
--#: ../sheets/cisconetwork.sheet.in.h:22
--msgid "Cloud Dark"
--msgstr "Sötét felhő"
-+msgid "Centri Firewall"
-+msgstr "Centri tűzfal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:23
--msgid "Cloud Gold"
--msgstr "Arany felhő"
-+msgid "Security appliance"
-+msgstr "Biztonsági berendezés"
- 
- #: ../sheets/cisconetwork.sheet.in.h:24
--msgid "Cloud White"
--msgstr "Fehér felhő"
-+msgid "VPN Concentrator"
-+msgstr "VPN gyűjtő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
--msgstr "Láncolt hasznos teher"
-+msgid "VPN Gateway"
-+msgstr "VPN átjáró"
- 
- #: ../sheets/cisconetwork.sheet.in.h:26
--msgid "Content Engine (Cache Director)"
--msgstr "Tartalomkezelő alrendszer (Cache-vezérlő)"
-+msgid "LAN to LAN"
-+msgstr "LAN-LAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:27
--msgid "Content Transformation Engine (CTE)"
--msgstr "Tartalomátalakító alrendszer (CTE)"
-+msgid "SSL Terminator"
-+msgstr "SSL terminátor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr "DSLAM"
-+msgid "IP DSL Switch"
-+msgstr "IP DSL kapcsoló"
- 
- #: ../sheets/cisconetwork.sheet.in.h:29
--msgid "DWDM Filter"
--msgstr "DWDM szűrő"
-+msgid "DSLAM"
-+msgstr "DSLAM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:30
--msgid "Detector"
--msgstr "Érzékelő"
-+msgid "Cable Modem"
-+msgstr "Kábelmodem"
- 
- #: ../sheets/cisconetwork.sheet.in.h:31
--msgid "Digital Cross-Connect"
--msgstr "Digitális keresztkötés"
-+msgid "Wireless Connectivity"
-+msgstr "Vezeték nélküli összekapcsolhatóság"
- 
- #: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr "Könyvtárkiszolgáló"
-+msgid "Wireless Transport"
-+msgstr "Vezeték nélküli adatátvitel"
- 
- #: ../sheets/cisconetwork.sheet.in.h:33
--msgid "Distributed Director"
--msgstr "Elosztott vezérlő"
-+msgid "AccessPoint"
-+msgstr "Hozzáférési pont"
- 
- #: ../sheets/cisconetwork.sheet.in.h:34
--msgid "Dual Mode AccessPoint"
--msgstr "Kétszeres módú hozzáférési pont"
-+msgid "Wireless Bridge"
-+msgstr "Vezeték nélküli híd"
- 
- #: ../sheets/cisconetwork.sheet.in.h:35
--msgid "FDDI Ring"
--msgstr "FDDI gyűrű"
-+msgid "Dual Mode AccessPoint"
-+msgstr "Kétszeres módú hozzáférési pont"
- 
- #: ../sheets/cisconetwork.sheet.in.h:36
--msgid "File Engine"
--msgstr "Fájl-alrendszer"
-+msgid "Wi-Fi Tag"
-+msgstr "Wi-Fi Címke"
- 
- #: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
--msgstr "Tűzfal"
-+msgid "Wireless Location Appliance"
-+msgstr "Vezeték nélküli hely berendezés"
- 
- #: ../sheets/cisconetwork.sheet.in.h:38
--msgid "Firewall Service Module"
--msgstr "Tűzfal-szolgáltatási modul"
-+msgid "Location server"
-+msgstr "Helykiszolgáló"
- 
- #: ../sheets/cisconetwork.sheet.in.h:39
--msgid "Firewall horizontal"
--msgstr "Vízszintes tűzfal"
-+msgid "Lightweight AP"
-+msgstr "Könnyűsúlyú AP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:40
--msgid "Firewall subdued"
--msgstr "Elfojtott tűzfal"
-+msgid "WLAN controller"
-+msgstr "WLAN vezérlő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
--msgstr "�ltalános berendezés"
-+msgid "BBFW"
-+msgstr "BBFW"
- 
- #: ../sheets/cisconetwork.sheet.in.h:42
--msgid "Generic Gateway"
--msgstr "�ltalános átjáró"
-+msgid "BBFW media"
-+msgstr "BBFW közeg"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
-+msgstr "Rovátkolt cső"
- 
- #: ../sheets/cisconetwork.sheet.in.h:44
--msgid "IOS Firewall"
--msgstr "IOS tűzfal"
-+msgid "Concatenated Payload"
-+msgstr "Láncolt hasznos teher"
- 
- #: ../sheets/cisconetwork.sheet.in.h:45
--msgid "IOS SLB"
--msgstr "IOS SLB"
-+msgid "Optical Cross-Connect"
-+msgstr "Optikai keresztkötés"
- 
- #: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
-+msgid "Optical Transport"
-+msgstr "Optikai átvitel"
- 
- #: ../sheets/cisconetwork.sheet.in.h:47
--msgid "IP DSL Switch"
--msgstr "IP DSL kapcsoló"
-+msgid "Optical Fiber"
-+msgstr "Optikai szál"
- 
- #: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
--msgstr "Régi stílusú IP"
-+msgid "Optical Amplifier"
-+msgstr "Optikai erősítő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:49
--msgid "IP Transport Concentrator"
--msgstr "IP átvitel gyűjtő"
-+msgid "Digital Cross-Connect"
-+msgstr "Digitális keresztkötés"
- 
- #: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
--msgstr "IPTV műsorszóró kiszolgáló"
-+msgid "IP Transport Concentrator"
-+msgstr "IP átvitel gyűjtő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
--msgstr "IPTV tartalomvezérlő"
-+msgid "DWDM Filter"
-+msgstr "DWDM szűrő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr "LAN-LAN"
-+msgid "WDM"
-+msgstr "WDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
--msgstr "Könnyűsúlyú AP"
-+msgid "15200"
-+msgstr "15200"
- 
- #: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "LocalDirector"
-+msgid "15800"
-+msgstr "15800"
- 
- #: ../sheets/cisconetwork.sheet.in.h:55
--msgid "Location server"
--msgstr "Helykiszolgáló"
-+msgid "ONS15104"
-+msgstr "ONS15104"
- 
- #: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
--msgstr "LongReach CPE"
-+msgid "10700"
-+msgstr "10700"
- 
- #: ../sheets/cisconetwork.sheet.in.h:57
--msgid "MAS Gateway"
--msgstr "MAS átjáró"
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
- 
- #: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
-+msgid "ONS15540"
-+msgstr "ONS15540"
- 
- #: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME 1100"
-+msgid "Automatic Protection Switching"
-+msgstr "Automatikus védelmi kapcsolás"
- 
- #: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
-+msgid "RPS"
-+msgstr "RPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
-+msgid "UPS"
-+msgstr "UPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:62
--msgid "NAT"
--msgstr "NAT"
-+msgid "LongReach CPE"
-+msgstr "LongReach CPE"
- 
- #: ../sheets/cisconetwork.sheet.in.h:63
--msgid "Network Management"
--msgstr "Hálózatfelügyelet"
-+msgid "3X74 (floor) cluster controller"
-+msgstr "3X74 (padlón álló) fürtvezérlő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Hálózati alakok a Ciscótól"
-+msgid "3174 (desktop) cluster controller"
-+msgstr "3174 (asztali) fürtvezérlő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
--msgstr "ONS15104"
-+msgid "CSU/DSU"
-+msgstr "CSU/DSU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
--msgstr "ONS15540"
-+msgid "WAN"
-+msgstr "WAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:67
--msgid "Optical Amplifier"
--msgstr "Optikai erősítő"
-+msgid "Cloud"
-+msgstr "Felhő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:68
--msgid "Optical Cross-Connect"
--msgstr "Optikai keresztkötés"
-+msgid "Cloud Gold"
-+msgstr "Arany felhő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:69
--msgid "Optical Fiber"
--msgstr "Optikai szál"
-+msgid "Cloud White"
-+msgstr "Fehér felhő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:70
--msgid "Optical Transport"
--msgstr "Optikai átvitel"
-+msgid "Cloud Dark"
-+msgstr "Sötét felhő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
-+msgid "Distributed Director"
-+msgstr "Elosztott vezérlő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:72
--msgid "PIX Firewall"
--msgstr "PIX tűzfal"
-+msgid "LocalDirector"
-+msgstr "LocalDirector"
- 
- #: ../sheets/cisconetwork.sheet.in.h:73
--msgid "PIX Firewall Left"
--msgstr "PIX tűzfal balra"
-+msgid "IOS SLB"
-+msgstr "IOS SLB"
- 
- #: ../sheets/cisconetwork.sheet.in.h:74
--msgid "Protocol Translator"
--msgstr "Protokollfordító"
-+msgid "MUX"
-+msgstr "MUX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
-+msgid "General Appliance"
-+msgstr "�ltalános berendezés"
- 
- #: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr "Erősítő"
-+msgid "PAD"
-+msgstr "PAD"
- 
- #: ../sheets/cisconetwork.sheet.in.h:77
--msgid "SSL Terminator"
--msgstr "SSL terminátor"
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "CDDI/FDDI gyűjtő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr "STB (set-top doboz)"
-+msgid "FDDI Ring"
-+msgstr "FDDI gyűrű"
- 
- #: ../sheets/cisconetwork.sheet.in.h:79
--msgid "Security appliance"
--msgstr "Biztonsági berendezés"
-+msgid "TokenRing"
-+msgstr "Token Ring"
- 
- #: ../sheets/cisconetwork.sheet.in.h:80
--msgid "Service Control"
--msgstr "Szolgáltatásvezérlés"
-+msgid "MAU"
-+msgstr "MAU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:81
--msgid "Storage Solution Engine"
--msgstr "Tárolómegoldás-alrendszer"
-+msgid "Repeater"
-+msgstr "Erősítő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:82
--msgid "System controller"
--msgstr "Rendszervezérlő"
-+msgid "Bridge"
-+msgstr "Híd"
- 
- #: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "TV"
-+msgid "Breakout box"
-+msgstr "Csatlakozódoboz"
- 
- #: ../sheets/cisconetwork.sheet.in.h:84
--msgid "Terminal Server"
--msgstr "Terminálkiszolgáló"
-+msgid "STB (set top box)"
-+msgstr "STB (set-top doboz)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "Token Ring"
-+msgid "TV"
-+msgstr "TV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:86
--msgid "TransPath"
--msgstr "Transpath"
-+msgid "IPTV broadcast server"
-+msgstr "IPTV műsorszóró kiszolgáló"
- 
- #: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "UPS"
-+msgid "IPTV content manager"
-+msgstr "IPTV tartalomvezérlő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
- msgid "VN2900"
- msgstr "VN2900"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "VN5902"
-+
- #: ../sheets/cisconetwork.sheet.in.h:90
- msgid "VN5900"
- msgstr "VN5900"
- 
- #: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr "VN5902"
-+msgid "Catalyst Access Gateway"
-+msgstr "Catalyst hozzáférési átjáró"
- 
- #: ../sheets/cisconetwork.sheet.in.h:92
--msgid "VPN Concentrator"
--msgstr "VPN gyűjtő"
-+msgid "Generic Gateway"
-+msgstr "�ltalános átjáró"
- 
- #: ../sheets/cisconetwork.sheet.in.h:93
--msgid "VPN Gateway"
--msgstr "VPN átjáró"
-+msgid "TransPath"
-+msgstr "Transpath"
- 
- #: ../sheets/cisconetwork.sheet.in.h:94
--msgid "WAN"
--msgstr "WAN"
-+msgid "uBR910 Cable DSU"
-+msgstr "uBR910 kábel DSU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:95
--msgid "WDM"
--msgstr "WDM"
-+msgid "Storage Solution Engine"
-+msgstr "Tárolómegoldás-alrendszer"
- 
- #: ../sheets/cisconetwork.sheet.in.h:96
--msgid "WLAN controller"
--msgstr "WLAN vezérlő"
-+msgid "Content Engine (Cache Director)"
-+msgstr "Tartalomkezelő alrendszer (Cache-vezérlő)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
--msgstr "Wi-Fi Címke"
-+msgid "CDM Content Distribution Manager"
-+msgstr "CDM Tartalomterjesztés-kezelő"
- 
- #: ../sheets/cisconetwork.sheet.in.h:98
--msgid "Wireless Bridge"
--msgstr "Vezeték nélküli híd"
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "Tartalomátalakító alrendszer (CTE)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr "Vezeték nélküli összekapcsolhatóság"
-+msgid "ME 1100"
-+msgstr "ME 1100"
- 
- #: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
--msgstr "Vezeték nélküli hely berendezés"
-+msgid "MAS Gateway"
-+msgstr "MAS átjáró"
- 
- #: ../sheets/cisconetwork.sheet.in.h:101
--msgid "Wireless Transport"
--msgstr "Vezeték nélküli adatátvitel"
-+msgid "File Engine"
-+msgstr "Fájl-alrendszer"
- 
- #: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr "uBR910 kábel DSU"
-+msgid "Service Control"
-+msgstr "Szolgáltatásvezérlés"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
-+msgid "Cisco - Telephony"
-+msgstr "Cisco - Telefónia"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:2
--msgid "6705"
--msgstr "6705"
-+msgid "Telephony shapes by Cisco"
-+msgstr "Telefónia alakok a Ciscótól"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr "6732"
-+msgid "Phone"
-+msgstr "Telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
-+msgid "Phone 2"
-+msgstr "Telefon 2"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
-+msgid "Phone Ethernet"
-+msgstr "Ethernet telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
-+msgid "Phone Appliance"
-+msgstr "Telefonberendezés"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
--msgstr "Híváskezelő"
-+msgid "Phone Feature"
-+msgstr "Telefonszolgáltatás"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:8
--msgid "Cellular Phone"
--msgstr "Rádiótelefon"
-+msgid "Phone/Fax"
-+msgstr "Telefon/fax"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:9
--msgid "Cisco - Telephony"
--msgstr "Cisco - Telefónia"
-+msgid "HootPhone"
-+msgstr "HootPhone"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr "4/5. osztályú kapcsoló"
-+msgid "IP Phone"
-+msgstr "IP telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:11
--msgid "End Office"
--msgstr "Végiroda"
-+msgid "IP Softphone"
-+msgstr "IP szoftveres telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
--msgstr "Fax"
-+msgid "Softphone"
-+msgstr "Szoftveres telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
--msgstr "Forgalomirányító"
-+msgid "Cellular Phone"
-+msgstr "Rádiótelefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
--msgstr "�ltalános szoftveres kapcsoló"
-+msgid "Mobile Access IP Phone"
-+msgstr "Mobil hozzáférésű IP-telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
-+msgid "Pager"
-+msgstr "Személyhívó"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
--msgstr "HootPhone"
-+msgid "Fax"
-+msgstr "Fax"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "IAD útválasztó"
-+msgid "Turret"
-+msgstr "Torony"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
-+msgid "Octel"
-+msgstr "Octel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
-+msgid "Radio Tower"
-+msgstr "Rádiótorony"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:20
--msgid "IP Phone"
--msgstr "IP telefon"
-+msgid "PBX"
-+msgstr "PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "IP szoftveres telefon"
-+msgid "PBX Switch"
-+msgstr "PBX kapcsoló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:22
--msgid "IP Telephony Router"
--msgstr "IP-telefon útválasztó"
-+msgid "Class 4/5 switch"
-+msgstr "4/5. osztályú kapcsoló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
-+msgid "SONET MUX"
-+msgstr "SONET MUX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr "IntelliSwitch verem"
-+msgid "ADM"
-+msgstr "ADM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:25
--msgid "MCU"
--msgstr "MCU"
-+msgid "ITP"
-+msgstr "ITP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr "MGX 8000 sorozatú hang-forgalomirányító"
-+msgid "ATA"
-+msgstr "ATA"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
--msgstr "MoH (Music on Hold) kiszolgáló"
-+msgid "SIP Proxy Server"
-+msgstr "SIP proxykiszolgáló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:28
--msgid "Mobile Access IP Phone"
--msgstr "Mobil hozzáférésű IP-telefon"
-+msgid "Gatekeeper"
-+msgstr "Forgalomirányító"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:29
--msgid "Mobile Access Router"
--msgstr "Mobil hozzáférésű útválasztó"
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr "MGX 8000 sorozatú hang-forgalomirányító"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr "Octel"
-+msgid "End Office"
-+msgstr "Végiroda"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "PBX"
-+msgid "Voice-Enabled Access Server"
-+msgstr "Hang-képes hozzáférési kiszolgáló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:32
--msgid "PBX Switch"
--msgstr "PBX kapcsoló"
-+msgid "Voice-Enabled Router"
-+msgstr "Hang-képes útválasztó"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:33
--msgid "Pager"
--msgstr "Személyhívó"
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Hang-képes ATM-kapcsoló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Telefon"
-+msgid "CallManager"
-+msgstr "Híváskezelő"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:35
--msgid "Phone 2"
--msgstr "Telefon 2"
-+msgid "IP Telephony Router"
-+msgstr "IP-telefon útválasztó"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr "Telefonberendezés"
-+msgid "Mobile Access Router"
-+msgstr "Mobil hozzáférésű útválasztó"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:37
--msgid "Phone Ethernet"
--msgstr "Ethernet telefon"
-+msgid "H.323"
-+msgstr "H.323"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:38
--msgid "Phone Feature"
--msgstr "Telefonszolgáltatás"
-+msgid "STP"
-+msgstr "STP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr "Telefon/fax"
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:40
--msgid "Radio Tower"
--msgstr "Rádiótorony"
-+msgid "Generic softswitch"
-+msgstr "�ltalános szoftveres kapcsoló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:41
--msgid "SC2200 (Signalling Controller)"
--msgstr "SC2200 (Jelzésvezérlő)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:42
- msgid "SC2200/VSC3000 host"
- msgstr "SC2200/VSC3000 gép"
- 
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Virtuális kapcsolóvezérlő (VSC 3000)"
-+
- #: ../sheets/ciscotelephony.sheet.in.h:43
--msgid "SIP Proxy Server"
--msgstr "SIP proxykiszolgáló"
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "SC2200 (Jelzésvezérlő)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
--msgstr "SONET MUX"
-+msgid "MoH server (Music on Hold)"
-+msgstr "MoH (Music on Hold) kiszolgáló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
--msgstr "STP"
-+msgid "TDM router"
-+msgstr "TDM útválasztó"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr "Szoftveres telefon"
-+msgid "6701"
-+msgstr "6701"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr "TDM útválasztó"
-+msgid "6705"
-+msgstr "6705"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:48
--msgid "Telephony shapes by Cisco"
--msgstr "Telefónia alakok a Ciscótól"
-+msgid "6732"
-+msgstr "6732"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr "Torony"
-+msgid "IAD router"
-+msgstr "IAD útválasztó"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:50
--msgid "Unity Express"
--msgstr "Unity Express"
-+msgid "ICS"
-+msgstr "ICS"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr "Unity kiszolgáló"
-+msgid "ICM"
-+msgstr "ICM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
--msgstr "Virtuális kapcsolóvezérlő (VSC 3000)"
-+msgid "IntelliSwitch Stack"
-+msgstr "IntelliSwitch verem"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:53
--msgid "Voice-Enabled ATM Switch"
--msgstr "Hang-képes ATM-kapcsoló"
-+msgid "Unity server"
-+msgstr "Unity kiszolgáló"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:54
--msgid "Voice-Enabled Access Server"
--msgstr "Hang-képes hozzáférési kiszolgáló"
-+msgid "Unity Express"
-+msgstr "Unity Express"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:55
--msgid "Voice-Enabled Router"
--msgstr "Hang-képes útválasztó"
-+msgid "MCU"
-+msgstr "MCU"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:56
- msgid "uMG series"
- msgstr "uMG sorozatok"
- 
- #: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr "Levegőztető buborékokkal"
-+msgid "Civil"
-+msgstr "Közüzemi"
- 
- #: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr "Visszafolyásgátló"
-+msgid "Civil Engineering Components"
-+msgstr "Közüzemi tervezés részegységek"
- 
- #: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Medence"
-+msgid "Vertical rest"
-+msgstr "Függőleges támasz"
- 
- #: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Bivalens függőleges támasz"
-+msgid "Horizontal rest"
-+msgstr "Vízszintes támasz"
- 
- #: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Közüzemi"
-+msgid "Bivalent vertical rest"
-+msgstr "Bivalens függőleges támasz"
- 
- #: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Közüzemi tervezés részegységek"
-+msgid "Reference line"
-+msgstr "Referenciavonal"
- 
- #: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Tároló"
-+msgid "Water level"
-+msgstr "Vízszint"
- 
- #: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Végső ülepítő medence"
-+msgid "Soil"
-+msgstr "Tekercs"
- 
- #: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Frekvenciaváltó"
-+msgid "Horizontally aligned arrow"
-+msgstr "Vízszintesen elrendezett nyíl"
- 
- #: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Gáztartály"
-+msgid "Vertically aligned arrow"
-+msgstr "Függőlegesen elrendezett nyíl"
- 
- #: ../sheets/civil.sheet.in.h:11
- msgid "Horizontal limiting line"
- msgstr "Vízszintes határolóvonal"
- 
- #: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Vízszintes támasz"
-+msgid "Vertical limiting line"
-+msgstr "Függőleges határolóvonal"
- 
- #: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Vízszintesen elrendezett nyíl"
-+msgid "Horizontally aligned pump"
-+msgstr "Vízszintesen elrendezett pumpa"
- 
- #: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Vízszintesen elrendezett kompresszor"
-+msgid "Vertically aligned pump"
-+msgstr "Függőlegesen elrendezett pumpa"
- 
- #: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Vízszintesen elrendezett pumpa"
-+msgid "Horizontally aligned compressor"
-+msgstr "Vízszintesen elrendezett kompresszor"
- 
- #: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Vízszintesen elrendezett szelep"
-+msgid "Vertically aligned compressor"
-+msgstr "Függőlegesen elrendezett kompresszor"
- 
- #: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Motor"
-+msgid "Vertically aligned valve"
-+msgstr "Függőlegesen elrendezett szelep"
- 
- #: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Előzetes tisztítótartály"
-+msgid "Horizontally aligned valve"
-+msgstr "Vízszintesen elrendezett szelep"
- 
- #: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Referenciavonal"
-+msgid "Backflow preventer"
-+msgstr "Visszafolyásgátló"
- 
- #: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Forgórész"
-+msgid "Motor"
-+msgstr "Motor"
- 
- #: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Tekercs"
-+msgid "Gas bottle"
-+msgstr "Gáztartály"
- 
- #: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "Függőleges határolóvonal"
-+msgid "Frequency converter"
-+msgstr "Frekvenciaváltó"
- 
- #: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "Függőleges támasz"
-+msgid "Vertically aligned propeller"
-+msgstr "Függőlegesen elrendezett propeller"
- 
- #: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "Függőlegesen elrendezett nyíl"
-+msgid "Aerator with bubbles"
-+msgstr "Levegőztető buborékokkal"
- 
--#: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "Függőlegesen elrendezett kompresszor"
-+#: ../sheets/civil.sheet.in.h:25
-+msgid "Rotor"
-+msgstr "Forgórész"
- 
- #: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "Függőlegesen elrendezett propeller"
-+msgid "Final-settling basin"
-+msgstr "Végső ülepítő medence"
- 
- #: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "Függőlegesen elrendezett pumpa"
-+msgid "Preliminary clarification tank"
-+msgstr "Előzetes tisztítótartály"
- 
- #: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "Függőlegesen elrendezett szelep"
-+msgid "Basin"
-+msgstr "Medence"
- 
- #: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "Vízszint"
-+msgid "Container"
-+msgstr "Tároló"
- 
- #: ../sheets/jigsaw.sheet.in.h:1
- msgid "Jigsaw"
- msgstr "Puzzle"
- 
- #: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Puzzle - iiii alak"
-+msgid "Pieces of a jigsaw"
-+msgstr "Puzzle-darabok"
- 
- #: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Puzzle - iiio alak"
-+msgid "Jigsaw - part_oioi"
-+msgstr "Puzzle - oioi alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Puzzle - iioi alak"
-+msgid "Jigsaw - part_ioio"
-+msgstr "Puzzle - ioio alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Puzzle - iioo alak"
-+msgid "Jigsaw - part_iiii"
-+msgstr "Puzzle - iiii alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Puzzle - ioii alak"
-+msgid "Jigsaw - part_oooo"
-+msgstr "Puzzle - oooo alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Puzzle - ioio alak"
-+msgid "Jigsaw - part_oooi"
-+msgstr "Puzzle - oooi alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Puzzle - iooi alak"
--
--#: ../sheets/jigsaw.sheet.in.h:9
- msgid "Jigsaw - part_iooo"
- msgstr "Puzzle - iooo alak"
- 
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Puzzle - oioo alak"
-+
- #: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Puzzle - oiii alak"
-+msgid "Jigsaw - part_ooio"
-+msgstr "Puzzle - ooio alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Puzzle - oiio alak"
-+msgid "Jigsaw - part_iioo"
-+msgstr "Puzzle - iioo alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Puzzle - oioi alak"
-+msgid "Jigsaw - part_oiio"
-+msgstr "Puzzle - oiio alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Puzzle - oioo alak"
--
--#: ../sheets/jigsaw.sheet.in.h:14
- msgid "Jigsaw - part_ooii"
- msgstr "Puzzle - ooii alak"
- 
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Puzzle - iooi alak"
-+
- #: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Puzzle - ooio alak"
-+msgid "Jigsaw - part_oiii"
-+msgstr "Puzzle - oiii alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Puzzle - oooi alak"
-+msgid "Jigsaw - part_ioii"
-+msgstr "Puzzle - ioii alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Puzzle - oooo alak"
-+msgid "Jigsaw - part_iioi"
-+msgstr "Puzzle - iioi alak"
- 
- #: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Puzzle-darabok"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr "24 portos patch-panel"
-+msgid "Jigsaw - part_iiio"
-+msgstr "Puzzle - iiio alak"
- 
- #: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "3 1/2-es hajlékonylemez"
-+msgid "Objects to design network diagrams with"
-+msgstr "Objektumok hálózati diagramokhoz"
- 
- #: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "ATM-kapcsoló jele"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "Antenna, vezeték nélküli átvitelhez"
-+msgid "Computer"
-+msgstr "Számítógép"
- 
- #: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "PC (nagy torony)"
-+msgid "Storage"
-+msgstr "Tároló"
- 
- #: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Számítógép"
-+msgid "Ethernet bus"
-+msgstr "Ethernet busz"
- 
- #: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "Asztali PC"
-+msgid "Simple printer"
-+msgstr "Egyszerű nyomtató"
- 
- #: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Digitalizáló tábla"
-+msgid "WAN connection"
-+msgstr "WAN kapcsolat"
- 
- #: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Ethernet busz"
-+msgid "WAN link"
-+msgstr "WAN összeköttetés"
- 
- #: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Külső DAT-meghajtó"
-+msgid "Stackable hub or switch"
-+msgstr "Bővíthető elosztó vagy kapcsoló"
- 
- #: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Tűzfalas útválasztó"
-+msgid "Modular switching system"
-+msgstr "Moduláris kapcsolórendszer"
- 
- #: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "Hordozható PC"
-+msgid "24 Port Patch Panel"
-+msgstr "24 portos patch-panel"
- 
- #: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "PC (midi torony)"
-+msgid "RJ45 wall-plug"
-+msgstr "RJ45 falicsatlakozó"
- 
- #: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "PC (mini torony)"
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Falicsatlakozó scEAD kábelezéshez"
- 
- #: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Rádiótelefon"
-+msgid "Simple modem"
-+msgstr "Egyszerű modem"
- 
- #: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antenna, vezeték nélküli átvitelhez"
-+
-+#: ../sheets/network.sheet.in.h:17
- msgid "Mobile telephony base station"
- msgstr "Mobiltelefon bázisállomás"
- 
--#: ../sheets/network.sheet.in.h:17
-+#: ../sheets/network.sheet.in.h:19
- msgid "Mobile telephony cell"
- msgstr "Mobiltelefon cella"
- 
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Moduláris kapcsolórendszer"
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Útválasztó jele"
-+
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Kapcsoló jele"
- 
- #: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Objektumok hálózati diagramokhoz"
-+msgid "ATM switch symbol"
-+msgstr "ATM-kapcsoló jele"
- 
- #: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Plotter"
-+msgid "Firewall router"
-+msgstr "Tűzfalas útválasztó"
- 
- #: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "RJ45 falicsatlakozó"
-+msgid "Workstation monitor"
-+msgstr "Munkaállomás monitora"
- 
- #: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Útválasztó jele"
-+msgid "UNIX workstation"
-+msgstr "UNIX munkaállomás"
- 
- #: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Egyszerű modem"
-+msgid "Desktop PC"
-+msgstr "Asztali PC"
- 
- #: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Egyszerű nyomtató"
-+msgid "Laptop PC"
-+msgstr "Hordozható PC"
- 
- #: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Hangfal beépített erősítővel"
-+msgid "Bigtower PC"
-+msgstr "PC (nagy torony)"
- 
- #: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Hangfal erősítő nélkül"
-+msgid "Miditower PC"
-+msgstr "PC (midi torony)"
- 
- #: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Bővíthető elosztó vagy kapcsoló"
-+msgid "Minitower PC"
-+msgstr "PC (mini torony)"
- 
- #: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Tároló"
-+msgid "Speaker with integrated amplifier"
-+msgstr "Hangfal beépített erősítővel"
- 
- #: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Kapcsoló jele"
-+msgid "Speaker without amplifier"
-+msgstr "Hangfal erősítő nélkül"
-+
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "3 1/2-es hajlékonylemez"
- 
- #: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "UNIX munkaállomás"
-+msgid "ZIP disk"
-+msgstr "Zip-lemez"
- 
- #: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "WAN kapcsolat"
-+msgid "External DAT drive"
-+msgstr "Külső DAT-meghajtó"
- 
- #: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "WAN összeköttetés"
--
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Falicsatlakozó scEAD kábelezéshez"
-+msgid "Mobile phone"
-+msgstr "Rádiótelefon"
- 
- #: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Munkaállomás monitora"
-+msgid "Plotter"
-+msgstr "Plotter"
- 
- #: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "Zip-lemez"
-+msgid "Digitizing board"
-+msgstr "Digitalizáló tábla"
- 
- #: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr "Naplóátvitel-kezelő vagy jelentéskészítő ügynök"
-+msgid "Sybase"
-+msgstr "Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:2
- msgid "Objects to design Sybase replication domain diagrams with"
- msgstr "Objektumok Sybase replikációs tartomány diagramokhoz"
- 
- #: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Replikációs kiszolgáló felügyelő"
-+msgid "Sybase dataserver"
-+msgstr "Sybase-adatkiszolgáló"
- 
- #: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Stabil tárolóeszköz"
-+msgid "Sybase replication server"
-+msgstr "Sybase replikációs kiszolgáló"
- 
- #: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+msgid "Log transfer manager or rep agent"
-+msgstr "Naplóátvitel-kezelő vagy jelentéskészítő ügynök"
- 
- #: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Sybase-kliensalkalmazás"
-+msgid "Stable storage device"
-+msgstr "Stabil tárolóeszköz"
- 
- #: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Sybase-adatkiszolgáló"
-+msgid "Sybase client application"
-+msgstr "Sybase-kliensalkalmazás"
- 
- #: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Sybase replikációs kiszolgáló"
-+msgid "Replication server manager"
-+msgstr "Replikációs kiszolgáló felügyelő"
-+
-+#~ msgid "'%s' not found!\n"
-+#~ msgstr "„%s� nem található!\n"
- 
-+#~ msgid "'%s' not found in '%s'!\n"
-+#~ msgstr "„%s� nem található itt: „%s�!\n"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0010-Updated-Romanian-translation.patch b/graphics/dia/patches/0010-Updated-Romanian-translation.patch
deleted file mode 100644
index 3755c03ce8..0000000000
--- a/graphics/dia/patches/0010-Updated-Romanian-translation.patch
+++ /dev/null
@@ -1,7344 +0,0 @@
-From e0cff9315f5e1a4b6abb0557eb9f78b4a56e738e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <cyber19rider@gmail.com>
-Date: Sun, 10 Feb 2013 18:28:31 +0100
-Subject: [PATCH 10/24] Updated Romanian translation
-
----
- po/ro.po | 3994 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 2014 insertions(+), 1980 deletions(-)
-
-diff --git a/po/ro.po b/po/ro.po
-index 98d46d7..e4b7607 100644
---- a/po/ro.po
-+++ b/po/ro.po
-@@ -1,5 +1,5 @@
- # Romanian Dia translation
--# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-+# Copyright (C) YEAR Free Software Foundation, Inc.
- # Harald Ersch <hersch AT romatsa DOT ro>, 2002.
- # Cristian Secară <cristi AT secarica DOT ro>, 2010.
- #
-@@ -7,16 +7,17 @@ msgid ""
- msgstr ""
- "Project-Id-Version: dia\n"
- "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
--"product=dia&component=general\n"
--"POT-Creation-Date: 2010-04-20 19:11+0000\n"
--"PO-Revision-Date: 2010-05-02 23:25+0300\n"
-+"product=dia&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2012-12-28 03:17+0000\n"
-+"PO-Revision-Date: 2011-11-28 16:41+0200\n"
- "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
- "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
-+"Language: ro\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==0 || (n%100 > 0 && n%100 < "
--"20)) ? 1 : 2;\n"
-+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-+"20)) ? 1 : 2);\n"
- 
- #. This is not an errror
- #: ../app/app_procs.c:209
-@@ -39,7 +40,7 @@ msgstr "Avertisment: stratul %d (%s) a fost selectat mai mult de o dată.\n"
- msgid "Warning: There is no layer named %s\n"
- msgstr "Avertisment: nu există niciun strat denumit %s\n"
- 
--# hm?
-+# hm ?
- #: ../app/app_procs.c:338
- #, c-format
- msgid "%s error: don't know how to export into %s\n"
-@@ -69,44 +70,44 @@ msgstr "Nu s-a putut găsi formatul sau filtrul de ieșire %s\n"
- #: ../app/app_procs.c:628
- #, c-format
- msgid "Input-directory '%s' must exist!\n"
--msgstr "Directorul de intrare „%s� trebuie să existe !\n"
-+msgstr "Directorul de intrare „%s� trebuie să existe!\n"
- 
- #: ../app/app_procs.c:645
- #, c-format
- msgid "Output-directory '%s' must exist!\n"
--msgstr "Directorul de ieșire „%s� trebuie să existe !\n"
-+msgstr "Directorul de ieșire „%s� trebuie să existe!\n"
- 
- #. Translators:  The argument is a list of options, not to be translated
--#: ../app/app_procs.c:695
-+#: ../app/app_procs.c:702
- #, fuzzy, c-format
- msgid "Select the filter/format out of: %s"
- msgstr "Selectați filtrul sau formatul din %s"
- 
- #. &export_file_name
--#: ../app/app_procs.c:713
-+#: ../app/app_procs.c:720
- msgid "Export loaded file and exit"
- msgstr "Exportă fișierul încărcat, după care ieși"
- 
--#: ../app/app_procs.c:713
-+#: ../app/app_procs.c:720
- msgid "OUTPUT"
- msgstr "OUTPUT"
- 
- #. &export_file_format
- #. &export_format_string
--#: ../app/app_procs.c:715
-+#: ../app/app_procs.c:722
- msgid "TYPE"
- msgstr "TIP"
- 
--#: ../app/app_procs.c:717
-+#: ../app/app_procs.c:724
- msgid "Export graphics size"
- msgstr "Dimensiunea graficii de exportat"
- 
--# hm?
--#: ../app/app_procs.c:717
-+# hm ?
-+#: ../app/app_procs.c:724
- msgid "WxH"
- msgstr "L×Î"
- 
--#: ../app/app_procs.c:719
-+#: ../app/app_procs.c:726
- msgid ""
- "Show only specified layers (e.g. when exporting). Can be either the layer "
- "name or a range of layer numbers (X-Y)"
-@@ -114,91 +115,91 @@ msgstr ""
- "Arată numai straturile specificate (de exemplu la exportare). Poate fi ori "
- "numele stratului, ori un interval de numere de strat (X-Y)."
- 
--#: ../app/app_procs.c:720
-+#: ../app/app_procs.c:727
- msgid "LAYER,LAYER,..."
- msgstr "STRAT,STRAT,..."
- 
--#: ../app/app_procs.c:722
-+#: ../app/app_procs.c:729
- msgid "Don't show the splash screen"
- msgstr "Nu afișa ecranul de pornire"
- 
--#: ../app/app_procs.c:724
-+#: ../app/app_procs.c:731
- msgid "Don't create empty diagram"
- msgstr "Nu crea o diagramă goală"
- 
--#: ../app/app_procs.c:726
-+#: ../app/app_procs.c:733
- msgid "Start integrated user interface (diagrams in tabs)"
- msgstr "Pornește cu interfața utilizator integrată (diagrame în taburi)"
- 
--#: ../app/app_procs.c:728
-+#: ../app/app_procs.c:735
- msgid "Send error messages to stderr instead of showing dialogs."
- msgstr "Trimite mesaje de eroare la stderr în loc de a arăta dialogurile."
- 
--#: ../app/app_procs.c:730
-+#: ../app/app_procs.c:737
- msgid "Directory containing input files"
- msgstr "Directorul care conține fișierele de intrare"
- 
--#: ../app/app_procs.c:730 ../app/app_procs.c:732
-+#: ../app/app_procs.c:737 ../app/app_procs.c:739
- msgid "DIRECTORY"
- msgstr "DIRECTOR"
- 
--#: ../app/app_procs.c:732
-+#: ../app/app_procs.c:739
- msgid "Directory containing output files"
- msgstr "Directorul care conține fișierele de ieșire"
- 
--#: ../app/app_procs.c:734
-+#: ../app/app_procs.c:741
- msgid "Display credits list and exit"
- msgstr "Afișează lista contribuitorilor, după care ieși"
- 
--#: ../app/app_procs.c:736
-+#: ../app/app_procs.c:743
- msgid "Generate verbose output"
- msgstr "Generează ieșire detaliată"
- 
--#: ../app/app_procs.c:738
-+#: ../app/app_procs.c:745
- msgid "Display version and exit"
- msgstr "Afișează versiunea, după care ieși"
- 
--#: ../app/app_procs.c:761
-+#: ../app/app_procs.c:768
- msgid "[FILE...]"
- msgstr "[FIȘIERE...]"
- 
--#: ../app/app_procs.c:773
-+#: ../app/app_procs.c:780
- #, c-format
- msgid "Invalid option?"
- msgstr "Opțiune nevalidă?"
- 
--#: ../app/app_procs.c:796
-+#: ../app/app_procs.c:803
- #, c-format
- msgid "Filename conversion failed: %s\n"
- msgstr "Conversia de nume de fișier a eșuat: %s\n"
- 
--#: ../app/app_procs.c:809
-+#: ../app/app_procs.c:816
- #, c-format
- msgid "Missing input: %s\n"
- msgstr "Intrare lipsă: %s\n"
- 
--#: ../app/app_procs.c:834
-+#: ../app/app_procs.c:841
- msgid "Can't connect to session manager!\n"
--msgstr "Nu s-a putut conecta la managerul de sesiuni !\n"
-+msgstr "Nu s-a putut conecta la managerul de sesiuni!\n"
- 
- #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
--#: ../app/app_procs.c:874
-+#: ../app/app_procs.c:881
- #, c-format
- msgid "Dia version %s, compiled %s %s\n"
- msgstr "Dia versiunea %s, compilată %s %s\n"
- 
--#: ../app/app_procs.c:876
-+#: ../app/app_procs.c:883
- #, c-format
- msgid "Dia version %s\n"
- msgstr "Dia versiunea %s\n"
- 
--#: ../app/app_procs.c:914
-+#: ../app/app_procs.c:921
- msgid ""
- "Couldn't find standard objects when looking for object-libs; exiting...\n"
- msgstr ""
- "Nu s-au putut găsi obiecte standard la căutarea de object-libs; ieșire...\n"
- 
--#: ../app/app_procs.c:916
-+#: ../app/app_procs.c:923
- #, c-format
- msgid ""
- "Couldn't find standard objects when looking for object-libs in '%s'; "
-@@ -207,27 +208,30 @@ msgstr ""
- "Nu s-au putut găsi obiecte standard la căutarea de object-libs în „%s�; "
- "ieșire...\n"
- 
--#: ../app/app_procs.c:983
-+#: ../app/app_procs.c:990
- msgid "Diagram1.dia"
- msgstr "Diagrama1.dia"
- 
--#: ../app/app_procs.c:1018
-+#: ../app/app_procs.c:1025
- msgid ""
- "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
- "describing how you can cause this message to appear.\n"
- msgstr ""
-+"Acest lucru n-ar fi trebuit să se întâmple. Vă rugăm să completați un raport "
-+"de eroare la bugzilla.gnome.org\n"
-+"descriind cum puteți determina să apară acest mesaj.\n"
- 
- # a fost: Terminare Dia
--#: ../app/app_procs.c:1033
-+#: ../app/app_procs.c:1040
- msgid "Exiting Dia"
- msgstr "Ieșire Dia"
- 
- #. no standard buttons
--#: ../app/app_procs.c:1097
-+#: ../app/app_procs.c:1104
- msgid "Quitting without saving modified diagrams"
--msgstr "Salvare fără salvarea diagramelor modificate"
-+msgstr "Ieșire fără salvarea diagramelor modificate"
- 
--#: ../app/app_procs.c:1099
-+#: ../app/app_procs.c:1106
- msgid ""
- "Modified diagrams exist. Are you sure you want to quit Dia without saving "
- "them?"
-@@ -235,15 +239,15 @@ msgstr ""
- "Există diagrame modificate. Sigur doriți să ieșiți din Dia fără să le "
- "salvați?"
- 
--#: ../app/app_procs.c:1103
-+#: ../app/app_procs.c:1110
- msgid "Quit Dia"
- msgstr "Terminare Dia"
- 
--#: ../app/app_procs.c:1172 ../app/app_procs.c:1179
-+#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
- msgid "Could not create per-user Dia config directory"
- msgstr "Nu s-a putut crea directorul de configurare per utilizator"
- 
--#: ../app/app_procs.c:1182
-+#: ../app/app_procs.c:1189
- msgid ""
- "Could not create per-user Dia config directory. Please make sure that the "
- "environment variable HOME points to an existing directory."
-@@ -251,11 +255,11 @@ msgstr ""
- "Nu s-a putut crea directorul de configurare per utilizator. Asigurați-vă că "
- "variabila de mediu HOME indică un director existent."
- 
--#: ../app/app_procs.c:1205
-+#: ../app/app_procs.c:1212
- msgid "Objects and filters internal to dia"
- msgstr "Obiecte și filtre interne pentru Dia"
- 
--#: ../app/app_procs.c:1261
-+#: ../app/app_procs.c:1268
- #, c-format
- msgid ""
- "The original author of Dia was:\n"
-@@ -264,7 +268,7 @@ msgstr ""
- "Autorul original al Dia a fost:\n"
- "\n"
- 
--#: ../app/app_procs.c:1266
-+#: ../app/app_procs.c:1273
- #, c-format
- msgid ""
- "\n"
-@@ -275,7 +279,7 @@ msgstr ""
- "Responsabilii actuali ai Dia sunt:\n"
- "\n"
- 
--#: ../app/app_procs.c:1271
-+#: ../app/app_procs.c:1278
- #, c-format
- msgid ""
- "\n"
-@@ -286,7 +290,7 @@ msgstr ""
- "Alți autori sunt:\n"
- "\n"
- 
--#: ../app/app_procs.c:1276
-+#: ../app/app_procs.c:1283
- #, c-format
- msgid ""
- "\n"
-@@ -319,22 +323,22 @@ msgstr "Selectare culoare de fundal"
- 
- #: ../app/commands.c:130
- msgid "No print plug-in found!"
--msgstr "Nu s-a găsit plugin-ul pentru tipărire !"
-+msgstr "Nu s-a găsit plugin-ul pentru tipărire!"
- 
- #: ../app/commands.c:150
- #, c-format
- msgid "Diagram%d.dia"
- msgstr "Diagrama%d.dia"
- 
--#: ../app/commands.c:343
-+#: ../app/commands.c:344
- msgid "No existing object to paste.\n"
- msgstr "Nu există obiect de lipit.\n"
- 
--#: ../app/commands.c:646 ../app/commands.c:684
-+#: ../app/commands.c:653 ../app/commands.c:691
- msgid "Could not find help directory"
- msgstr "Nu s-a putut găsi directorul de ajutor"
- 
--#: ../app/commands.c:653
-+#: ../app/commands.c:660
- #, c-format
- msgid ""
- "Could not open help directory:\n"
-@@ -343,13 +347,13 @@ msgstr ""
- "Nu s-a putut deschide directorul de ajutor:\n"
- "%s"
- 
--#: ../app/commands.c:720
-+#: ../app/commands.c:727
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
- msgstr ""
- "Harald Ersch <hersch AT romatsa DOT ro>\n"
- "Cristian Secară <cristi AT secarica DOT ro>"
- 
--#: ../app/commands.c:722
-+#: ../app/commands.c:729
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -365,38 +369,61 @@ msgid ""
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- msgstr ""
-+"Acest program este software liber; îl puteți redistribui și/sau modifica\n"
-+"în conformitate cu termenii licenței GNU General Public License așa cum "
-+"este\n"
-+"publicată de către Free Software Foundation; fie versiunea 2 a Licenței, "
-+"fie\n"
-+"(la latitudinea dumneavoastră) orice versiune ulterioară.\n"
-+"\n"
-+"Acest program este distribuit cu speranța că va fi folositor, dar\n"
-+"FĂRĂ NICIO GARANȚIE; fără nici măcar garanția implicită asociată\n"
-+"COMERCIALIZÄ‚RII sau POTRIVIRII PENTRU UN SCOP PARTICULAR.\n"
-+"Vedeți licența GNU General Public License pentru detalii.\n"
-+"\n"
-+"Împreună cu acest program ar trebui să fi primit o copie a licenței\n"
-+"GNU General Public License. Dacă nu, scrieți la Free Software\n"
-+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- 
--#: ../app/commands.c:745
-+#: ../app/commands.c:752
- msgid "A program for drawing structured diagrams."
- msgstr "Un program pentru desenat diagrame structurate."
- 
- #: ../app/confirm.c:69
- #, c-format
- msgid "You are about to print a diagram with %d pages."
--msgstr ""
-+msgstr "Sunteți pe cale de a tipări o diagramă cu %d pagini."
- 
- #: ../app/confirm.c:71
- #, c-format
- msgid "You are about to export a diagram with %d pages."
--msgstr ""
-+msgstr "Sunteți pe cale de a exporta o diagramă cu %d pagini."
- 
- #: ../app/confirm.c:73
- #, c-format
- msgid ""
- "You are about to export a diagram which may require %s of memory.(%d pages)."
- msgstr ""
-+"Sunteți pe cale de a exporta o diagramă care ar putea necesita %s de memorie "
-+"(%d pagini)."
- 
-+# „
- #: ../app/confirm.c:81
-+#, fuzzy
- msgid ""
- "You can adjust the size of the diagram by changing the 'Scaling' in the "
- "'Page Setup' dialog.\n"
- "Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
- "the intended bounds."
- msgstr ""
-+"Puteți ajusta dimensiunea diagramei schimbând „Scalare� în dialogul "
-+"„Configurare pagină...�.\n"
-+"Alternativ, folosiți „Selectează tot� și „Cea mai bună potrivire� pentru a "
-+"muta obiectele/ma"
- 
- #: ../app/confirm.c:85
- msgid "Confirm Diagram Size"
--msgstr ""
-+msgstr "Confirmă dimensiunea diagramei"
- 
- #: ../app/create_object.c:71
- #, c-format
-@@ -476,7 +503,7 @@ msgstr "Proprietăți diagramă: %s"
- 
- #: ../app/dia_embedd.c:348
- msgid "Could not initialize Bonobo!"
--msgstr "Nu s-a putut inițializa Bonobo !"
-+msgstr "Nu s-a putut inițializa Bonobo!"
- 
- #: ../app/diacanvas.c:121
- msgid "X position"
-@@ -519,43 +546,43 @@ msgstr "/_Sortează obiectele"
- 
- #: ../app/diagram_tree_menu.c:48
- msgid "/Sort objects/by _name"
--msgstr "/Sortează obiectele/după _nume"
-+msgstr "/_Sortează obiectele/după _nume"
- 
- #: ../app/diagram_tree_menu.c:50
- msgid "/Sort objects/by _type"
--msgstr "/Sortează obiectele/după _tip"
-+msgstr "/_Sortează obiectele/după _tip"
- 
- #: ../app/diagram_tree_menu.c:52
- msgid "/Sort objects/as _inserted"
--msgstr "/Sortează obiectele/după _inserție"
-+msgstr "/_Sortează obiectele/după _inserție"
- 
- #: ../app/diagram_tree_menu.c:55
- msgid "/Sort objects/All by name"
--msgstr "/Sortează obiectele/Toate după nume"
-+msgstr "/_Sortează obiectele/Toate după nume"
- 
- #: ../app/diagram_tree_menu.c:57
- msgid "/Sort objects/All by type"
--msgstr "/Sortează obiectele/Toate după tip"
-+msgstr "/_Sortează obiectele/Toate după tip"
- 
- #: ../app/diagram_tree_menu.c:59
- msgid "/Sort objects/All as inserted"
--msgstr "/Sortează obiectele/Toate după momentul de inserție"
-+msgstr "/_Sortează obiectele/Toate după momentul de inserție"
- 
- #: ../app/diagram_tree_menu.c:61
- msgid "/Sort objects/_Default"
--msgstr "/Sortează obiectele/_Implicit"
-+msgstr "/_Sortează obiectele/_Implicit"
- 
- #: ../app/diagram_tree_menu.c:62
- msgid "/Sort objects/Default/by _name"
--msgstr "/Sortează obiectele/Implicit/după _nume"
-+msgstr "/_Sortează obiectele/_Implicit/după _nume"
- 
- #: ../app/diagram_tree_menu.c:64
- msgid "/Sort objects/Default/by _type"
--msgstr "/Sortează obiectele/Implicit/după _tip"
-+msgstr "/_Sortează obiectele/_Implicit/după _tip"
- 
- #: ../app/diagram_tree_menu.c:66
- msgid "/Sort objects/Default/as _inserted"
--msgstr "/Sortează obiectele/Implicit/după momentul de _inserție"
-+msgstr "/_Sortează obiectele/_Implicit/după momentul de _inserție"
- 
- #: ../app/diagram_tree_menu.c:68
- msgid "/Sort _diagrams"
-@@ -563,23 +590,23 @@ msgstr "/Sortează _diagramele"
- 
- #: ../app/diagram_tree_menu.c:69
- msgid "/Sort _diagrams/by _name"
--msgstr "/Sortează diagramele/după _nume"
-+msgstr "/Sortează _diagramele/după _nume"
- 
- #: ../app/diagram_tree_menu.c:71
- msgid "/Sort _diagrams/as _inserted"
--msgstr "/Sortează diagramele/după momentul de _inserție"
-+msgstr "/Sortează _diagramele/după momentul de _inserție"
- 
- #: ../app/diagram_tree_menu.c:73
- msgid "/Sort diagrams/_Default"
--msgstr "/Sortează diagramele/_Implicit"
-+msgstr "/Sortează _diagramele/_Implicit"
- 
- #: ../app/diagram_tree_menu.c:74
- msgid "/Sort diagrams/Default/by _name"
--msgstr "/Sortează diagramele/Implicit/după _nume"
-+msgstr "/Sortează _diagramele/_Implicit/după _nume"
- 
- #: ../app/diagram_tree_menu.c:76
- msgid "/Sort diagrams/Default/as _inserted"
--msgstr "/Sortează diagramele/Implicit/după momentul de _inserție"
-+msgstr "/Sortează _diagramele/_Implicit/după momentul de _inserție"
- 
- #: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
- msgid "/_Locate"
-@@ -670,7 +697,7 @@ msgstr "Proprietăți..."
- msgid "Selection"
- msgstr "Selecție"
- 
--#: ../app/disp_callbacks.c:1072
-+#: ../app/disp_callbacks.c:1075
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -693,20 +720,20 @@ msgid "Selected '%s'"
- msgstr ""
- 
- #. we really should not come here but instead disable the menu command earlier
--#: ../app/display.c:1081
-+#: ../app/display.c:1121
- msgid "No anti-aliased renderer found"
- msgstr ""
- 
--#: ../app/display.c:1219
-+#: ../app/display.c:1259
- msgid "<unnamed>"
- msgstr "<nedenumit>"
- 
- #. no standard buttons
--#: ../app/display.c:1225
-+#: ../app/display.c:1265
- msgid "Closing diagram without saving"
- msgstr "Închidere diagramă fără salvare"
- 
--#: ../app/display.c:1227
-+#: ../app/display.c:1267
- #, c-format
- msgid ""
- "The diagram '%s'\n"
-@@ -715,21 +742,22 @@ msgstr ""
- "Diagrama „%s�\n"
- "nu a fost salvată. Salvați modificările acum?"
- 
--#: ../app/display.c:1229
-+# titlu pe bară
-+#: ../app/display.c:1269
- msgid "Close Diagram"
--msgstr "ÃŽnchide diagrama"
-+msgstr "Închidere diagramă"
- 
--#: ../app/display.c:1234
-+#: ../app/display.c:1274
- msgid "_Discard Changes"
- msgstr "Renunță la mo_dificări"
- 
- #: ../app/exit_dialog.c:77
- msgid "Do Not Exit"
--msgstr "Renunță"
-+msgstr "Nu ieși"
- 
- #: ../app/exit_dialog.c:79
- msgid "Exit Without Save"
--msgstr "Închide fără salvare"
-+msgstr "Închide fără a salva"
- 
- #: ../app/exit_dialog.c:81
- msgid "Save Selected"
-@@ -844,12 +872,12 @@ msgstr ""
- "Nu s-a putut determnia ce filtru de export\n"
- "trebuie folosit pentru a salva „%s�"
- 
--# hm? acțiune sau titlu?
-+# hm ? acțiune sau titlu ?
- #: ../app/filedlg.c:704
- msgid "Export Diagram"
- msgstr "Exportă diagrama"
- 
--# hm? acțiune sau titlu?
-+# hm ? acțiune sau titlu ?
- #: ../app/filedlg.c:720
- msgid "Export Options"
- msgstr "Exportă opțiunile"
-@@ -875,24 +903,24 @@ msgid "Match _all properties (not just object name)"
- msgstr "Potrivește to_ate proprietățile (nu doar numele obiectului)"
- 
- # titlu pe bară
--#: ../app/find-and-replace.c:510
-+#: ../app/find-and-replace.c:513
- msgid "Find"
- msgstr "Căutare"
- 
- # titlu pe bară la înlocuire
- # apare în ultima parte în meniul selectare
--#: ../app/find-and-replace.c:542 ../app/menus.c:267
-+#: ../app/find-and-replace.c:545 ../app/menus.c:267
- msgid "Replace"
- msgstr "ÃŽnlocuire"
- 
--#: ../app/find-and-replace.c:545
-+#: ../app/find-and-replace.c:548
- msgid "Replace _All"
- msgstr "Înlocuiește _tot"
- 
- #. not adding the button in the list above to modify it's text;
- #. * the default "Find and Replace" is just too long for my taste ;)
- #.
--#: ../app/find-and-replace.c:550
-+#: ../app/find-and-replace.c:553
- msgid "_Replace"
- msgstr "Î_nlocuiește"
- 
-@@ -1009,7 +1037,7 @@ msgstr "Nu există nicio foaie denumită %s"
- msgid "Other sheets"
- msgstr "Alte foi"
- 
--#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:10
-+#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:1
- msgid "Flowchart"
- msgstr "Organigramă"
- 
-@@ -1097,13 +1125,16 @@ msgstr "Strat nou %d"
- msgid "none"
- msgstr "nimic"
- 
-+# titlu pe bară
-+# apare după comanda Redenumește stratul...
- #: ../app/layer_dialog.c:1196
- msgid "Edit Layer"
--msgstr "Editare strat"
-+msgstr "Editare nume strat"
- 
-+# titlu pe bară
- #: ../app/layer_dialog.c:1196
- msgid "Add Layer"
--msgstr "Adaugă un strat"
-+msgstr "Adăugare strat"
- 
- #: ../app/layer_dialog.c:1215
- msgid "Layer name:"
-@@ -1119,7 +1150,7 @@ msgstr "Lățime linie"
- msgid "Line width:"
- msgstr "Lățime linie:"
- 
--#: ../app/load_save.c:296
-+#: ../app/load_save.c:301
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
-@@ -1127,7 +1158,7 @@ msgstr ""
- "Eroare la încărcarea diagramei.\n"
- "Obiectul legat nu a fost găsit în document."
- 
--#: ../app/load_save.c:300
-+#: ../app/load_save.c:305
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1136,7 +1167,7 @@ msgstr ""
- "Eroare la încărcarea diagramei.\n"
- "Manipulatorul de conectare %d nu există pe „%s�."
- 
--#: ../app/load_save.c:328
-+#: ../app/load_save.c:333
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1145,23 +1176,23 @@ msgstr ""
- "Eroare la încărcarea diagramei.\n"
- "Punctul de conectare %d nu există pe „%s�."
- 
--#: ../app/load_save.c:368
-+#: ../app/load_save.c:373
- #, c-format
- msgid "Can't find parent %s of %s object\n"
- msgstr "Nu s-a putut găsi părintele %s al obiectului %s\n"
- 
--#: ../app/load_save.c:417
-+#: ../app/load_save.c:422
- msgid "You must specify a file, not a directory.\n"
- msgstr "Specificați un fișier, nu un director.\n"
- 
--#: ../app/load_save.c:424 ../plug-ins/dxf/dxf-import.c:1309
-+#: ../app/load_save.c:429 ../plug-ins/dxf/dxf-import.c:1309
- #: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
- #: ../plug-ins/xslt/xslt.c:91
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "Nu s-a putut deschide „%s� pentru citire.\n"
- 
--#: ../app/load_save.c:442 ../app/load_save.c:448
-+#: ../app/load_save.c:447 ../app/load_save.c:453
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1170,7 +1201,7 @@ msgstr ""
- "Eroare la încărcarea diagramei %s.\n"
- "Tip de fișier necunoscut."
- 
--#: ../app/load_save.c:456
-+#: ../app/load_save.c:461
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1179,7 +1210,7 @@ msgstr ""
- "Eroare la încărcarea diagramei %s.\n"
- "Nu este un fișier Dia."
- 
--#: ../app/load_save.c:673
-+#: ../app/load_save.c:678
- #, c-format
- msgid ""
- "Error loading diagram:\n"
-@@ -1190,17 +1221,17 @@ msgstr ""
- "%s.\n"
- "Un fișier Dia valid are cel puțin un strat."
- 
--#: ../app/load_save.c:996
-+#: ../app/load_save.c:1001
- #, c-format
- msgid "Not allowed to write to output file %s\n"
- msgstr ""
- 
--#: ../app/load_save.c:1028
-+#: ../app/load_save.c:1033
- #, c-format
- msgid "Not allowed to write temporary files in %s\n"
- msgstr ""
- 
--#: ../app/load_save.c:1050 ../plug-ins/cairo/diacairo.c:121
-+#: ../app/load_save.c:1055 ../plug-ins/cairo/diacairo.c:121
- #: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
- #: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
- #: ../plug-ins/libart/export_png.c:159
-@@ -1209,24 +1240,24 @@ msgstr ""
- #: ../plug-ins/pstricks/render_pstricks.c:916
- #: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
- #: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
--#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:99
-+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
- #, c-format
- msgid "Can't open output file %s: %s\n"
- msgstr "Nu s-a putut deschide fișierul de ieșire %s: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:1061
-+#: ../app/load_save.c:1066
- #, c-format
- msgid "Internal error %d writing file %s\n"
- msgstr "Eroare internă %d la scrierea fișierului %s\n"
- 
--#: ../app/load_save.c:1072
-+#: ../app/load_save.c:1077
- #, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
- msgstr "Nu s-a putut redenumi %s la fișierul de ieșire final %s: %s\n"
- 
--#: ../app/load_save.c:1163 ../app/load_save.c:1168
-+#: ../app/load_save.c:1168 ../app/load_save.c:1173
- msgid "Dia Diagram File"
- msgstr "Fișier diagramă Dia"
- 
-@@ -1470,7 +1501,7 @@ msgstr "_Selectare"
- msgid "All"
- msgstr "Toate"
- 
--#: ../app/menus.c:206 ../lib/arrows.c:1884 ../objects/Jackson/domain.c:96
-+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
- #: ../objects/UML/association.c:221 ../objects/UML/association.c:227
- msgid "None"
- msgstr "Nimic"
-@@ -1498,7 +1529,7 @@ msgstr "Selectează pe baza"
- 
- #: ../app/menus.c:217
- msgid "_Input Methods"
--msgstr "Metode de _input"
-+msgstr "Metode de _intrare"
- 
- #: ../app/menus.c:219
- msgid "D_ialogs"
-@@ -1530,10 +1561,10 @@ msgstr "Derulare"
- msgid "Fullscr_een"
- msgstr "P_e tot ecranul"
- 
--# hm? sau anticrenelat?
-+# hm ? sau anticrenelat ?
- #: ../app/menus.c:256
- msgid "_AntiAliased"
--msgstr "_Antialiat"
-+msgstr "_Anticrenelează"
- 
- #: ../app/menus.c:257
- msgid "Show _Grid"
-@@ -1769,11 +1800,11 @@ msgstr "Linii pline"
- # titlu pe chenar
- #: ../app/preferences.c:216
- msgid "Antialias:"
--msgstr "Antialiere:"
-+msgstr "Anticrenelare"
- 
- #: ../app/preferences.c:217
- msgid "view antialised"
--msgstr "arată antialiat"
-+msgstr "Vizualizează anticrenelat"
- 
- # titlu pe chenar
- #. Favored Filter
-@@ -1788,7 +1819,7 @@ msgstr "Export"
- msgid "Portable Network Graphics"
- msgstr "Portable Network Graphics"
- 
--#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:515
-+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
- #: ../plug-ins/svg/svg-import.c:884
- msgid "Scalable Vector Graphics"
- msgstr "Scalable Vector Graphics"
-@@ -1839,7 +1870,7 @@ msgstr "Dimensiune hexagon:"
- msgid "Diagram tree window:"
- msgstr "Fereastră arbore de diagrame"
- 
--# hm? pluralul este la tipuri, nu la obiect
-+# hm ? pluralul este la tipuri, nu la obiect
- #: ../app/preferences.c:257
- msgid "Save hidden object types"
- msgstr "Salvează tipurile de obiect ascunse"
-@@ -2138,150 +2169,150 @@ msgstr "Editor de diagrame Dia"
- 
- #: ../dia.desktop.in.in.h:2
- msgid "Edit your Diagrams"
--msgstr "Editați diagrame"
-+msgstr "Editați diagrama dumneavoastră"
- 
--#: ../lib/arrows.c:1885
-+#: ../lib/arrows.c:1899
- msgid "Lines"
- msgstr "Linii"
- 
--#: ../lib/arrows.c:1886
-+#: ../lib/arrows.c:1900
- msgid "Hollow Triangle"
- msgstr "Triunghi gol"
- 
--#: ../lib/arrows.c:1887
-+#: ../lib/arrows.c:1901
- msgid "Filled Triangle"
- msgstr "Triunghi plin"
- 
--#: ../lib/arrows.c:1888
-+#: ../lib/arrows.c:1902
- msgid "Unfilled Triangle"
- msgstr "Triunghi neumplut"
- 
--#: ../lib/arrows.c:1889
-+#: ../lib/arrows.c:1903
- msgid "Hollow Diamond"
- msgstr "Romb gol"
- 
--#: ../lib/arrows.c:1890
-+#: ../lib/arrows.c:1904
- msgid "Filled Diamond"
- msgstr "Diamant plin"
- 
--#: ../lib/arrows.c:1891
-+#: ../lib/arrows.c:1905
- msgid "Half Diamond"
- msgstr "Romb pe jumătate"
- 
--#: ../lib/arrows.c:1892
-+#: ../lib/arrows.c:1906
- msgid "Half Head"
- msgstr "Semi-vârf"
- 
--#: ../lib/arrows.c:1893
-+#: ../lib/arrows.c:1907
- msgid "Slashed Cross"
- msgstr "Cruce tăiată"
- 
--#: ../lib/arrows.c:1894
-+#: ../lib/arrows.c:1908
- msgid "Filled Ellipse"
- msgstr "Elipsă plină"
- 
--#: ../lib/arrows.c:1895
-+#: ../lib/arrows.c:1909
- msgid "Hollow Ellipse"
- msgstr "Elipsă goală"
- 
--#: ../lib/arrows.c:1896
-+#: ../lib/arrows.c:1910
- msgid "Filled Dot"
- msgstr "Punct plin"
- 
--#: ../lib/arrows.c:1897
-+#: ../lib/arrows.c:1911
- msgid "Dimension Origin"
- msgstr "Origine dimensiune"
- 
--#: ../lib/arrows.c:1898
-+#: ../lib/arrows.c:1912
- msgid "Blanked Dot"
- msgstr "Punct golit"
- 
--#: ../lib/arrows.c:1899
-+#: ../lib/arrows.c:1913
- msgid "Double Hollow Triangle"
- msgstr ""
- 
--#: ../lib/arrows.c:1900
-+#: ../lib/arrows.c:1914
- msgid "Double Filled Triangle"
--msgstr ""
-+msgstr "Triunghi umplut dublu"
- 
--#: ../lib/arrows.c:1901
-+#: ../lib/arrows.c:1915
- msgid "Filled Dot and Triangle"
- msgstr ""
- 
--#: ../lib/arrows.c:1902
-+#: ../lib/arrows.c:1916
- msgid "Filled Box"
- msgstr "Dreptunghi plin"
- 
--#: ../lib/arrows.c:1903
-+#: ../lib/arrows.c:1917
- msgid "Blanked Box"
- msgstr "Dreptunghi gol"
- 
--#: ../lib/arrows.c:1904
-+#: ../lib/arrows.c:1918
- msgid "Slashed"
- msgstr "Tăiat"
- 
--#: ../lib/arrows.c:1905
-+#: ../lib/arrows.c:1919
- msgid "Integral Symbol"
- msgstr "Simbol de integrală"
- 
--#: ../lib/arrows.c:1906
-+#: ../lib/arrows.c:1920
- msgid "Crow Foot"
- msgstr "Picior de cioară"
- 
--#: ../lib/arrows.c:1907
-+#: ../lib/arrows.c:1921
- msgid "Cross"
- msgstr "Cruce"
- 
--#: ../lib/arrows.c:1908
-+#: ../lib/arrows.c:1922
- msgid "1-or-many"
- msgstr "1-sau-multe"
- 
--#: ../lib/arrows.c:1909
-+#: ../lib/arrows.c:1923
- msgid "0-or-many"
- msgstr "0-sau-multe"
- 
--#: ../lib/arrows.c:1910
-+#: ../lib/arrows.c:1924
- msgid "1-or-0"
- msgstr "1-sau-0"
- 
--#: ../lib/arrows.c:1911
-+#: ../lib/arrows.c:1925
- msgid "1 exactly"
- msgstr "Exact 1"
- 
--#: ../lib/arrows.c:1912
-+#: ../lib/arrows.c:1926
- msgid "Filled Concave"
- msgstr "Concavitate plină"
- 
--#: ../lib/arrows.c:1913
-+#: ../lib/arrows.c:1927
- msgid "Blanked Concave"
- msgstr "Concavitate goală"
- 
--#: ../lib/arrows.c:1914
-+#: ../lib/arrows.c:1928
- msgid "Round"
- msgstr "Rotund"
- 
--#: ../lib/arrows.c:1915
-+#: ../lib/arrows.c:1929
- msgid "Open Round"
- msgstr ""
- 
--#: ../lib/arrows.c:1916
-+#: ../lib/arrows.c:1930
- msgid "Backslash"
- msgstr "Bară oblică inversă"
- 
--#: ../lib/arrows.c:1917
-+#: ../lib/arrows.c:1931
- msgid "Infinite Line"
- msgstr "Linie infinită"
- 
--#: ../lib/arrows.c:2045
-+#: ../lib/arrows.c:2059
- msgid "Arrow head of unknown type"
- msgstr "Vârf de săgeată de tip necunoscut"
- 
--#: ../lib/arrows.c:2053
-+#: ../lib/arrows.c:2067
- #, c-format
- msgid "Arrow head of type %s has too small dimensions, removing.\n"
- msgstr "Vârful de săgeată de tip %s are dimensiuni prea mici, se va elimina.\n"
- 
--#: ../lib/arrows.c:2186
-+#: ../lib/arrows.c:2200
- msgid "unknown arrow"
- msgstr "săgeată necunoscută"
- 
-@@ -2407,11 +2438,12 @@ msgstr "Există %d mesaje similare."
- msgid "Notice"
- msgstr "Notificare"
- 
-+# hm ? sau deschide grupul ?
- #: ../lib/newgroup.c:124
- msgid "Open group"
--msgstr ""
-+msgstr "Deschide un grup"
- 
--# hm? ce anume este implicit?
-+# hm ? ce anume este implicit ?
- #: ../lib/object_defaults.c:128
- #, c-format
- msgid ""
-@@ -2428,7 +2460,7 @@ msgstr "???"
- #: ../lib/plug-ins.c:186
- #, c-format
- msgid "Missing dependencies for '%s'?"
--msgstr ""
-+msgstr "Lipsesc dependențele pentru „%s�?"
- 
- #: ../lib/plug-ins.c:197
- msgid "Missing symbol 'dia_plugin_init'"
-@@ -2466,7 +2498,7 @@ msgstr "Dată de creare"
- 
- #: ../lib/prop_dict.c:46
- msgid "Modification date"
--msgstr ""
-+msgstr "Data modificării"
- 
- #: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
- msgid "URL"
-@@ -2506,7 +2538,7 @@ msgstr "Stil de linie"
- 
- #: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
- msgid "Fill color"
--msgstr "Culoare de umplere"
-+msgstr "Culoare umplere"
- 
- #: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
- msgid "Draw background"
-@@ -2633,80 +2665,80 @@ msgstr "Selectează fișierul de imagine"
- msgid "Browse"
- msgstr "Răsfoiește"
- 
--#: ../lib/widgets.c:2076
-+#: ../lib/widgets.c:2087
- msgid "Reset menu"
- msgstr "Resetează meniul"
- 
- #. Installer message if no GTK+ was found
--#: ../installer/win32/gennsh.c:38
-+#: ../installer/win32/gennsh.c:39
- msgid ""
- "GTK+ is not installed. Please use the full installer. It is available from "
- "http://dia-installer.de."
- msgstr ""
- 
- #. Installer message: Don't install over pre 0.95 versions
--#: ../installer/win32/gennsh.c:41
-+#: ../installer/win32/gennsh.c:42
- msgid ""
- "Please remove old Dia installations completely or install Dia to a different "
- "location."
- msgstr ""
- 
- #. Installer message:  License Page
--#: ../installer/win32/gennsh.c:44
-+#: ../installer/win32/gennsh.c:45
- msgid "Next >"
- msgstr "ÃŽnainte >"
- 
- #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
--#: ../installer/win32/gennsh.c:47
-+#: ../installer/win32/gennsh.c:48
- msgid ""
- "$(^Name) is released under the GPL license. The license is provided here for "
- "information purposes only. $_CLICK"
- msgstr ""
- 
- #. Installer message: Components page
--#: ../installer/win32/gennsh.c:50
-+#: ../installer/win32/gennsh.c:51
- msgid "Dia Diagram Editor (required)"
- msgstr "Editorul de diagrame Dia (necesar)"
- 
- #. Installer message: Components page
--#: ../installer/win32/gennsh.c:53
-+#: ../installer/win32/gennsh.c:54
- msgid "Translations"
- msgstr "Traduceri"
- 
- #. Installer message: Component description
--#: ../installer/win32/gennsh.c:56
-+#: ../installer/win32/gennsh.c:57
- msgid "Optional translations of the Dia user interface"
- msgstr ""
- 
- #. Installer message: Component description
--#: ../installer/win32/gennsh.c:59
-+#: ../installer/win32/gennsh.c:60
- msgid "Core Dia files and dlls"
- msgstr "Fișiere de bază și dll-uri Dia"
- 
- #. Installer message: Component name
--#: ../installer/win32/gennsh.c:62
-+#: ../installer/win32/gennsh.c:63
- msgid "Python plug-in"
- msgstr "Plugin-uri Python"
- 
- #. Installer message: Component description
--#: ../installer/win32/gennsh.c:65
-+#: ../installer/win32/gennsh.c:66
- msgid ""
- "Support for the Python Scripting Language 2.3. Do not select this if Python "
- "is not installed."
- msgstr ""
- 
- #. Installer message: hyperlink text on finish page
--#: ../installer/win32/gennsh.c:68
-+#: ../installer/win32/gennsh.c:69
- msgid "Visit the Dia for Windows Web Page"
- msgstr ""
- 
- #. Installer message: Dia uninstaller entry in Control Panel
--#: ../installer/win32/gennsh.c:71
-+#: ../installer/win32/gennsh.c:72
- msgid "Dia (remove only)"
- msgstr "Dia (doar eliminare)"
- 
- #. Installer message: confirmation question. Keep $\r
--#: ../installer/win32/gennsh.c:74
-+#: ../installer/win32/gennsh.c:75
- msgid ""
- "Your old Dia directory is about to be deleted. Would you like to continue?$\r"
- "$\rNote: Any non-standard plugins that you may have installed will be "
-@@ -2714,31 +2746,31 @@ msgid ""
- msgstr ""
- 
- #. Installer message: confirmatin question. Keep $\r
--#: ../installer/win32/gennsh.c:77
-+#: ../installer/win32/gennsh.c:78
- msgid ""
- "The installation directory you specified already exists. Any contents$\rwill "
- "be deleted. Would you like to continue?"
- msgstr ""
- 
- #. Installer message: Uninstall Section Prompts. Keep $\r
--#: ../installer/win32/gennsh.c:80
-+#: ../installer/win32/gennsh.c:81
- msgid ""
- "The uninstaller could not find registry entries for Dia.$\rIt is likely that "
- "another user installed this application."
- msgstr ""
- 
- #. Installer message: Uninstall error message
--#: ../installer/win32/gennsh.c:83
-+#: ../installer/win32/gennsh.c:84
- msgid "You do not have permission to uninstall this application."
- msgstr ""
- 
- #. Installer message: Uninstallation warning. Keep $INSTDIR
--#: ../installer/win32/gennsh.c:86
-+#: ../installer/win32/gennsh.c:87
- msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
- msgstr ""
- 
- #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
--#: ../installer/win32/gennsh.c:89
-+#: ../installer/win32/gennsh.c:90
- msgid ""
- "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
- msgstr ""
-@@ -2851,7 +2883,7 @@ msgstr ""
- #: ../objects/Database/table.c:200 ../objects/UML/class.c:148
- #: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
- #: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
--#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
- msgid "Comment"
- msgstr "Comentariu"
- 
-@@ -2884,7 +2916,7 @@ msgid "Use bold font for primary keys"
- msgstr ""
- 
- #. property rows
--#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:136
-+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
- #: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
- msgid "Normal"
- msgstr "Normal"
-@@ -2915,7 +2947,7 @@ msgstr "Arată comentariile"
- 
- #. init data
- #: ../objects/Database/table.c:253 ../objects/Database/table.c:356
--#: ../sheets/Database.sheet.in.h:5
-+#: ../sheets/Database.sheet.in.h:3
- msgid "Table"
- msgstr "Tabel"
- 
-@@ -2977,7 +3009,7 @@ msgstr "_Tabel"
- msgid "Table name:"
- msgstr "Nume tabel:"
- 
--# hm? la plural?
-+# hm ? la plural ?
- #. XXX create a handler and disable the 'show documentation tag' checkbox
- #. if 'comment visible' is not active.
- #: ../objects/Database/table_dialog.c:966
-@@ -2995,7 +3027,7 @@ msgstr "_Stil"
- 
- #: ../objects/Database/table_dialog.c:1021
- msgid "Border width:"
--msgstr "Lățime bordură:"
-+msgstr "Lățime bodură:"
- 
- #. head line
- #: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
-@@ -3036,7 +3068,7 @@ msgstr "unic"
- #: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
- #: ../objects/standard/zigzagline.c:132
- msgid "Corner radius"
--msgstr "Rază colț:"
-+msgstr "Rază colț"
- 
- #: ../objects/Database/reference.c:111
- msgid "Start description"
-@@ -3048,7 +3080,7 @@ msgstr "Sfârșit de descriere"
- 
- #: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
- #: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
--#: ../objects/SADT/arrow.c:459 ../objects/UML/association.c:854
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
- #: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
- #: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
- #: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
-@@ -3058,7 +3090,7 @@ msgstr "Adaugă un segment"
- 
- #: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
- #: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
--#: ../objects/SADT/arrow.c:460 ../objects/UML/association.c:855
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
- #: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
- #: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
- #: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
-@@ -3086,7 +3118,7 @@ msgstr "Derivată:"
- msgid "Multivalue:"
- msgstr "Multivaloare:"
- 
--#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
- msgid "Attribute"
- msgstr "Atribut"
- 
-@@ -3099,7 +3131,7 @@ msgid "Associative:"
- msgstr ""
- 
- #: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
--#: ../sheets/ER.sheet.in.h:4
-+#: ../sheets/ER.sheet.in.h:3
- msgid "Entity"
- msgstr "Entitate"
- 
-@@ -3127,7 +3159,7 @@ msgstr "Rotire:"
- msgid "Identifying:"
- msgstr "Identificare:"
- 
--#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Relație"
- 
-@@ -3338,7 +3370,7 @@ msgstr "Sprijină"
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
- #: ../objects/FS/function.c:768 ../objects/FS/function.c:770
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
- msgstr "Oprește"
- 
-@@ -3397,7 +3429,7 @@ msgid "Mount"
- msgstr "Montează"
- 
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
- msgstr "Blochează"
- 
-@@ -3485,7 +3517,7 @@ msgstr "Fuzionează"
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
- #: ../objects/FS/function.c:840 ../objects/FS/function.c:842
--#: ../sheets/UML.sheet.in.h:5
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
- msgstr "Ramifică"
- 
-@@ -3690,7 +3722,7 @@ msgid "Expose"
- msgstr "Expune"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Extrage"
- 
-@@ -3879,7 +3911,7 @@ msgid "Differentiate"
- msgstr "Diferențiază"
- 
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
- msgstr "Procesează"
-@@ -4189,7 +4221,7 @@ msgstr "Funcție utilizator/dispozitiv"
- msgid "Wish Fn"
- msgstr "Funcție dorită"
- 
--#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Apel macro"
- 
-@@ -4225,19 +4257,19 @@ msgstr "Culoarea condiției"
- msgid "GRAFCET diagram objects"
- msgstr "Obiecte de diagramă GRAFCET"
- 
--#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Pas normal"
- 
--#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "Pas inițial"
- 
--#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Pas de intrare macro"
- 
--#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Pas de ieșire macro"
- 
-@@ -4319,14 +4351,14 @@ msgstr "Tip de vergență:"
- 
- #: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
- #: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
--#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:449
-+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
- #: ../objects/standard/line.c:223
- msgid "Add connection point"
- msgstr "Adaugă un punct de conectare"
- 
- #: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
- #: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
--#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:450
-+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
- #: ../objects/standard/line.c:224
- msgid "Delete connection point"
- msgstr "Șterge punctul de conectare"
-@@ -4372,7 +4404,7 @@ msgstr ""
- msgid "Negative contrib"
- msgstr ""
- 
--#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Dependență"
- 
-@@ -4388,7 +4420,7 @@ msgstr ""
- msgid "Resource"
- msgstr ""
- 
--#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr ""
- 
-@@ -4604,7 +4636,7 @@ msgid "pi"
- msgstr "pi"
- 
- #. PROP_FLAG_VISIBLE|
--#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
- msgid "Measurement"
- msgstr "Măsurătoare"
- 
-@@ -4624,31 +4656,31 @@ msgstr "Adaugă un mâner"
- msgid "Delete Handle"
- msgstr "Șterge mânerul"
- 
--#: ../objects/SADT/arrow.c:137
-+#: ../objects/SADT/arrow.c:138
- msgid "Import resource (not shown upstairs)"
- msgstr "Importă o resursă (neafișată mai sus)"
- 
--#: ../objects/SADT/arrow.c:138
-+#: ../objects/SADT/arrow.c:139
- msgid "Imply resource (not shown downstairs)"
- msgstr "Implică o resursă (neafișată mai jos)"
- 
--#: ../objects/SADT/arrow.c:139
-+#: ../objects/SADT/arrow.c:140
- msgid "Dotted arrow"
- msgstr "Săgeată punctată"
- 
--#: ../objects/SADT/arrow.c:140
-+#: ../objects/SADT/arrow.c:141
- msgid "disable arrow heads"
- msgstr "Dezactivează capetele săgeții"
- 
--#: ../objects/SADT/arrow.c:146
-+#: ../objects/SADT/arrow.c:148
- msgid "Flow style:"
- msgstr "Stil de flux:"
- 
--#: ../objects/SADT/arrow.c:148
-+#: ../objects/SADT/arrow.c:150
- msgid "Automatically gray vertical flows:"
- msgstr "Colorează automat în gri fluxurile verticale:"
- 
--#: ../objects/SADT/arrow.c:149
-+#: ../objects/SADT/arrow.c:151
- msgid ""
- "To improve the ease of reading, flows which begin and end vertically can be "
- "rendered gray"
-@@ -4656,25 +4688,25 @@ msgstr ""
- "Pentru a ușura citirea, fluxurile care încep și se termină vertical pot fi "
- "randate gri."
- 
--#: ../objects/SADT/arrow.c:465
-+#: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
- msgstr "Săgeată SADT"
- 
--#: ../objects/SADT/box.c:139 ../objects/custom/custom_object.c:226
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
- #: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
- #: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
- msgid "Text padding"
- msgstr "Umplere text"
- 
--#: ../objects/SADT/box.c:146
-+#: ../objects/SADT/box.c:149
- msgid "Activity/Data identifier"
- msgstr "Identificator de date/activități"
- 
--#: ../objects/SADT/box.c:147
-+#: ../objects/SADT/box.c:150
- msgid "The identifier which appears in the lower right corner of the Box"
- msgstr "Identificatorul care apare în colțul din dreapta-jos al chenarului"
- 
--#: ../objects/SADT/box.c:455
-+#: ../objects/SADT/box.c:460
- msgid "SADT box"
- msgstr "Chenar SADT"
- 
-@@ -4989,7 +5021,7 @@ msgstr "Dezvoltator"
- msgid "Operator / Maintenance"
- msgstr "Operator sau întreținere"
- 
--#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
- msgid "Network"
- msgstr "Rețea"
- 
-@@ -5005,7 +5037,7 @@ msgstr ""
- msgid "Communication interface"
- msgstr ""
- 
--#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
- msgid "Software"
- msgstr "Software"
- 
-@@ -5112,7 +5144,7 @@ msgid "Document title"
- msgstr "Titlu document"
- 
- #: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
--#: ../sheets/UML.sheet.in.h:2
-+#: ../sheets/UML.sheet.in.h:15
- msgid "Actor"
- msgstr "Actor"
- 
-@@ -5166,7 +5198,7 @@ msgid "Side B"
- msgstr "Fața B"
- 
- #: ../objects/UML/class.c:142 ../objects/UML/class.c:325
--#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
-+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
- msgid "Class"
- msgstr "Clasă"
- 
-@@ -5405,7 +5437,7 @@ msgstr "Date de operații"
- msgid "_Templates"
- msgstr "Ș_abloane"
- 
--#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
-+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
- msgid "Template class"
- msgstr "Clasă de șablon"
- 
-@@ -5422,25 +5454,25 @@ msgstr "Limite"
- msgid "Is object"
- msgstr "Este un obiect"
- 
--#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
- msgid "Facet"
- msgstr ""
- 
--#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr ""
- 
--#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr ""
- 
--#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr ""
- 
- #: ../objects/UML/constraint.c:127
- msgid "Constraint:"
--msgstr "Constrângere:"
-+msgstr "Constângere:"
- 
- #: ../objects/UML/dependency.c:141
- msgid "Show arrow:"
-@@ -5578,7 +5610,7 @@ msgstr ""
- msgid "Action to perform when this transition is taken"
- msgstr ""
- 
--#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
-+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
- msgstr ""
- 
-@@ -5626,7 +5658,7 @@ msgstr "Colaborare"
- msgid "Chronogram diagram objects"
- msgstr "Obiecte diagramă cronogramă"
- 
--#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Date"
- 
-@@ -5716,12 +5748,12 @@ msgid "Custom XML shapes loader"
- msgstr "Încărcător de forme XML personalizate"
- 
- #: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
--#: ../objects/custom/custom_object.c:1780
-+#: ../objects/custom/custom_object.c:1782
- msgid "Flip horizontal"
- msgstr "Întoarce pe orizontală"
- 
- #: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
--#: ../objects/custom/custom_object.c:1781
-+#: ../objects/custom/custom_object.c:1783
- msgid "Flip vertical"
- msgstr "Răstoarnă pe verticală"
- 
-@@ -5729,8 +5761,8 @@ msgstr "Răstoarnă pe verticală"
- msgid "Scale of the subshapes"
- msgstr ""
- 
--# hm? sau fișierul de pictogramă?
--#: ../objects/custom/custom_object.c:1818
-+# hm ? sau fișierul de pictogramă ?
-+#: ../objects/custom/custom_object.c:1820
- #: ../objects/custom_lines/custom_linetypes.c:263
- #, c-format
- msgid "Cannot open icon file %s for object type '%s'."
-@@ -5770,7 +5802,7 @@ msgstr "Unghi ascuțit"
- 
- #: ../objects/network/basestation.c:137
- msgid "Sectors"
--msgstr ""
-+msgstr "Sectoare"
- 
- #: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
- msgid "Base Station"
-@@ -5788,25 +5820,26 @@ msgstr "Rază"
- msgid "Width"
- msgstr "Lățime"
- 
--# hm?
--#: ../objects/standard/arc.c:143
-+# hm ?
-+#: ../objects/standard/arc.c:141
- msgid "Curve distance"
--msgstr "Distanță curbă"
-+msgstr "Distanță de curbă"
- 
-+# hm ?
- #: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
- #: ../objects/standard/polyline.c:137
- msgid "Line gaps"
--msgstr ""
-+msgstr "Lipsuri de linie"
- 
- #: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
- #: ../objects/standard/polyline.c:139
- msgid "Absolute start gap"
--msgstr ""
-+msgstr "Lipsă absolută la început"
- 
- #: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
- #: ../objects/standard/polyline.c:141
- msgid "Absolute end gap"
--msgstr ""
-+msgstr "Lipsă absolută la sfârșit"
- 
- #: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
- msgid "Symmetric control"
-@@ -5891,11 +5924,12 @@ msgstr "Punct de sfârșit"
- 
- #: ../objects/standard/outline.c:204
- msgid "Text content"
--msgstr ""
-+msgstr "Conținut text"
- 
-+# hm ?
- #: ../objects/standard/outline.c:206
- msgid "Angle to rotate the outline"
--msgstr ""
-+msgstr "Unghiul pentru a roti conturul"
- 
- #: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
- msgid "Add Corner"
-@@ -5911,11 +5945,11 @@ msgstr "Obiecte standard"
- 
- #: ../objects/standard/textobj.c:139
- msgid "First Line"
--msgstr ""
-+msgstr "Prima linie"
- 
- #: ../objects/standard/textobj.c:146
- msgid "Vertical text alignment"
--msgstr ""
-+msgstr "Aliniere verticală a textului"
- 
- #: ../plug-ins/cairo/diacairo-interactive.c:263
- #: ../plug-ins/cairo/diacairo-interactive.c:264
-@@ -5944,7 +5978,7 @@ msgid "Clipboard copy failed"
- msgstr ""
- 
- #: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
--#: ../plug-ins/wmf/wmf.cpp:1388
-+#: ../plug-ins/wmf/wmf.cpp:1381
- msgid "Nothing to print"
- msgstr "Nimic de tipărit"
- 
-@@ -6077,7 +6111,7 @@ msgstr ""
- 
- #: ../plug-ins/libart/dialibartrenderer.c:295
- msgid "gdk_renderer: Unsupported fill mode specified!\n"
--msgstr "gdk_renderer: mod de umplere nesuportat !\n"
-+msgstr "gdk_renderer: mod de umplere nesuportat!\n"
- 
- #: ../plug-ins/libart/dialibartrenderer.c:1476
- msgid "Renderer transformation"
-@@ -6125,11 +6159,11 @@ msgid "Select Printer"
- msgstr "Selectare imprimantă"
- 
- #: ../plug-ins/postscript/paginate_psprint.c:285
--#: ../sheets/ciscocomputer.sheet.in.h:36
-+#: ../sheets/ciscocomputer.sheet.in.h:37
- msgid "Printer"
- msgstr "Imprimantă"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
- msgid "File"
- msgstr "Fișier"
- 
-@@ -6202,7 +6236,7 @@ msgstr ""
- 
- #: ../plug-ins/shape/shape-export.c:488
- msgid "Can't export png icon without export plug-in!"
--msgstr "Nu se poate exporta o pictogramă png fără plugin-ul de export !"
-+msgstr "Nu se poate exporta o pictogramă png fără plugin-ul de export!"
- 
- #: ../plug-ins/shape/shape-export.c:512
- msgid "Dia Shape File"
-@@ -6302,7 +6336,7 @@ msgstr "Nu s-a putut scrie obiectul %u"
- msgid "Visio XML Format import and export filter"
- msgstr "Filtru de export și import Visio XML"
- 
--#: ../plug-ins/wmf/wmf.cpp:506
-+#: ../plug-ins/wmf/wmf.cpp:499
- #, c-format
- msgid ""
- "Can not render unknown font:\n"
-@@ -6311,24 +6345,24 @@ msgstr ""
- "Nu s-a putut randa un font necunoscut:\n"
- "%s"
- 
--#: ../plug-ins/wmf/wmf.cpp:1265
-+#: ../plug-ins/wmf/wmf.cpp:1258
- #, c-format
- msgid "Couldn't open: '%s' for writing.\n"
- msgstr "Nu s-a putut deschide „%s� pentru scriere.\n"
- 
--#: ../plug-ins/wmf/wmf.cpp:1364
-+#: ../plug-ins/wmf/wmf.cpp:1357
- msgid "Windows Meta File"
- msgstr "Windows Meta File"
- 
--#: ../plug-ins/wmf/wmf.cpp:1373
-+#: ../plug-ins/wmf/wmf.cpp:1366
- msgid "Enhanced Meta File"
- msgstr "Enhanced Meta File"
- 
--#: ../plug-ins/wmf/wmf.cpp:1395
-+#: ../plug-ins/wmf/wmf.cpp:1388
- msgid "Print (GDI) ..."
- msgstr "Tipărește (GDI)..."
- 
--#: ../plug-ins/wmf/wmf.cpp:1410
-+#: ../plug-ins/wmf/wmf.cpp:1403
- msgid "WMF export filter"
- msgstr "Filtru de export WMF"
- 
-@@ -6345,16 +6379,16 @@ msgstr "WPG"
- msgid "WordPerfect Graphics export filter"
- msgstr "Filtru de export de grafică WordPerfect"
- 
--#: ../plug-ins/xfig/xfig-export.c:461
-+#: ../plug-ins/xfig/xfig-export.c:463
- #, c-format
- msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
- msgstr ""
- 
--#: ../plug-ins/xfig/xfig-export.c:484
-+#: ../plug-ins/xfig/xfig-export.c:486
- msgid "No more user-definable colors - using black"
- msgstr "Nu mai sunt culori definite de utilizator – se va folosi negru"
- 
--#: ../plug-ins/xfig/xfig-export.c:1205
-+#: ../plug-ins/xfig/xfig-export.c:1207
- msgid "XFig format"
- msgstr "Format XFig"
- 
-@@ -6390,7 +6424,7 @@ msgstr "Eroarea la citirea capătului săgeții\n"
- #: ../plug-ins/xfig/xfig-import.c:288
- #, c-format
- msgid "Unknown arrow type %d\n"
--msgstr "Tip de săgeată necunoscut %d\n"
-+msgstr "Tip de săgeată necunoscută %d\n"
- 
- #: ../plug-ins/xfig/xfig-import.c:379
- #, c-format
-@@ -6620,48 +6654,53 @@ msgstr "AADL"
- msgid "AADL Shapes"
- msgstr "Forme AADL"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
--msgstr "Magistrală"
--
--#: ../sheets/AADL.sheet.in.h:5
--msgid "Device"
--msgstr "Dispozitiv"
-+#: ../sheets/AADL.sheet.in.h:4
-+#, fuzzy
-+msgid "Thread"
-+msgstr "Fir"
- 
- #: ../sheets/AADL.sheet.in.h:6
-+msgid "Processor"
-+msgstr "Procesor"
-+
-+#: ../sheets/AADL.sheet.in.h:7
- msgid "Memory"
- msgstr "Memorie"
- 
--#: ../sheets/AADL.sheet.in.h:7
--msgid "Package"
--msgstr "Pachet"
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Magistrală"
- 
- #: ../sheets/AADL.sheet.in.h:9
--msgid "Processor"
--msgstr "Procesor"
-+msgid "System"
-+msgstr "Sistem"
- 
- #: ../sheets/AADL.sheet.in.h:10
- msgid "Subprogram"
- msgstr "Subprogram"
- 
- #: ../sheets/AADL.sheet.in.h:11
--msgid "System"
--msgstr "Sistem"
-+#, fuzzy
-+msgid "Thread Group"
-+msgstr "Grup de fire"
- 
- #: ../sheets/AADL.sheet.in.h:12
--#, fuzzy
--msgid "Thread"
--msgstr "Fir"
-+msgid "Device"
-+msgstr "Dispozitiv"
- 
- #: ../sheets/AADL.sheet.in.h:13
--#, fuzzy
--msgid "Thread Group"
--msgstr "Grup de fire"
-+msgid "Package"
-+msgstr "Pachet"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Asortate"
- 
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
-+#: ../sheets/Assorted.sheet.in.h:6
- msgid ""
- "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
- "Geometric Shapes"
-@@ -6669,560 +6708,555 @@ msgstr ""
- "O colecție asortată de poligoane simple, poligoane Bézier și alte forme "
- "geometrice diverse"
- 
--#. Please talk to me before making any changes to this sheet
--#: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Asortate"
--
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "Blazon"
-+msgid "Right angle triangle"
-+msgstr "Triunghi dreptunghic"
- 
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Stea cu opt colțuri curbată"
-+msgid "Isoceles triangle"
-+msgstr "Triunghi isoscel"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Stea cu patru colțuri curbată"
-+msgid "Perfect square, height equals width"
-+msgstr "Pătrat perfect, înălțimea egală cu lățimea"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Diamant"
-+msgid "Perfect circle"
-+msgstr "Cerc perfect"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Săgeată în jos"
-+msgid "Quarter circle"
-+msgstr "Sfert de cerc"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "Stea cu opt colțuri"
-+msgid "Diamond"
-+msgstr "Diamant"
- 
- #: ../sheets/Assorted.sheet.in.h:13
--msgid "Five point star"
--msgstr "Stea cu cinci colțuri"
-+msgid "Pentagon. Five sided shape"
-+msgstr "Pentagon – formă cu cinci laturi"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Stea cu patru colțuri"
-+msgid "Hexagon. Six sided shape"
-+msgstr "Hexagon – formă cu șase laturi"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Inimă"
--
--#: ../sheets/Assorted.sheet.in.h:16
- msgid "Heptagon. Seven sided shape"
- msgstr "Heptagon – formă cu șapte laturi"
- 
--#: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Hexagon – formă cu șase laturi"
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Octogon – formă cu opt laturi"
- 
--#: ../sheets/Assorted.sheet.in.h:18
-+#: ../sheets/Assorted.sheet.in.h:17
- msgid "Horizontal parallelogram"
- msgstr "Paralelogram orizontal"
- 
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Paralelogram vertical"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Triunghi isoscel"
-+msgid "Trapezoid"
-+msgstr "Trapez"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Săgeată spre stânga"
-+msgid "Four point star"
-+msgstr "Stea cu patru colțuri"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Săgeată stânga-dreapta"
-+msgid "Curved four point star"
-+msgstr "Stea cu patru colțuri curbată"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Săgeată stânga-dreapta-sus"
-+msgid "Five point star"
-+msgstr "Stea cu cinci colțuri"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Săgeată stânga-sus"
-+msgid "Six point star"
-+msgstr "Stea cu șase colțuri"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Cruce malteză"
-+msgid "Seven point star"
-+msgstr "Stea cu șapte colțuri"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "Săgeată spre stănga cu clemă"
-+msgid "Eight point star"
-+msgstr "Stea cu opt colțuri"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "Săgeată spre dreapta cu clemă"
-+msgid "Sharp eight point star"
-+msgstr "Stea cu opt colțuri ascuțite"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "Octogon – formă cu opt laturi"
-+msgid "Curved eight point star"
-+msgstr "Stea cu opt colțuri curbată"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "Săgeată de bloc pentagonal"
-+msgid "Swiss cross"
-+msgstr "Cruce elvețiană"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Pentagon – formă cu cinci laturi"
-+msgid "Maltese cross"
-+msgstr "Cruce malteză"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Cerc perfect"
-+msgid "Down arrow"
-+msgstr "Săgeată în jos"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Pătrat perfect, înălțimea egală cu lățimea"
-+msgid "Up arrow"
-+msgstr "Săgeată în sus"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Săgeată cvadruplă"
-+msgid "Left arrow"
-+msgstr "Săgeată spre stânga"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "Sfert de cerc"
-+msgid "Right arrow"
-+msgstr "Săgeată spre dreapta"
- 
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "Pătrar de lună"
-+msgid "Notched left arrow"
-+msgstr "Săgeată spre stănga cu clemă"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Triunghi dreptunghic"
-+msgid "Notched right arrow"
-+msgstr "Săgeată spre dreapta cu clemă"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Săgeată spre dreapta"
-+msgid "Left-up arrow"
-+msgstr "Săgeată stânga-sus"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Stea cu șapte colțuri"
-+msgid "Turn-up arrow"
-+msgstr "Săgeată întoarsă în sus"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Stea cu opt colțuri ascuțite"
-+msgid "Left-right arrow"
-+msgstr "Săgeată stânga-dreapta"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Stea cu șase colțuri"
-+msgid "Up-down arrow"
-+msgstr "Săgeată sus-jos"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Soare"
-+msgid "Quad arrow"
-+msgstr "Săgeată cvadruplă"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Cruce elvețiană"
-+msgid "Left-right-up arrow"
-+msgstr "Săgeată stânga-dreapta-sus"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Trapez"
-+msgid "Up-down-left arrow"
-+msgstr "Săgeată sus-jos-stânga"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--msgid "Turn-up arrow"
--msgstr "Săgeată întoarsă în sus"
-+msgid "Pentagon block arrow"
-+msgstr "Săgeată de bloc pentagonal"
- 
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "Săgeată în sus"
-+msgid "Chevron"
-+msgstr "Blazon"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Săgeată sus-jos"
-+msgid "Heart"
-+msgstr "Inimă"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Săgeată sus-jos-stânga"
-+msgid "Sun"
-+msgstr "Soare"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "Paralelogram vertical"
--
--#: ../sheets/BPMN.sheet.in.h:1
--msgid "Activity Looping"
--msgstr ""
-+msgid "Quarter moon"
-+msgstr "Pătrar de lună"
- 
-+#. For: anthonym
- #: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
-+msgid "BPMN"
-+msgstr "BPMN"
-+
-+#: ../sheets/BPMN.sheet.in.h:3
-+msgid "Business Process Modeling Notation"
- msgstr ""
- 
--#. For: anthonym
- #: ../sheets/BPMN.sheet.in.h:4
--msgid "BPMN"
--msgstr "BPMN"
-+msgid "Start Event"
-+msgstr "Eveniment de început"
- 
- #: ../sheets/BPMN.sheet.in.h:5
--msgid "Business Process Modeling Notation"
-+msgid "Start Event - Message"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
-+msgid "Start Event - Timer"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
-+msgid "Start Event - Rule"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:8
--msgid "Compensation Task"
--msgstr ""
-+msgid "Start Event - Link"
-+msgstr "Eveniment de început – legătură"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--msgid "Complex"
--msgstr "Complex"
-+msgid "Start Event - Multiple"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:10
--msgid "Data Object"
-+msgid "Intermediate Event"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:11
--msgid "End Event"
--msgstr "Eveniment final"
-+msgid "Intermediate Event - Message"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
-+msgid "Intermediate Event - Timer"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:13
--msgid "End Event - Compensation"
--msgstr "Eveniment final – compensare"
-+msgid "Intermediate Event - Error"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
-+msgid "Intermediate Event - Cancel"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:15
--msgid "End Event - Link"
--msgstr "Eveniment final – legătură"
-+msgid "Intermediate Event - Compensation"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
-+msgid "Intermediate Event - Rule"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
-+msgid "Intermediate Event - Link"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
-+msgid "Intermediate Event - Multiple"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
--msgstr ""
-+msgid "End Event"
-+msgstr "Eveniment final"
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
-+msgid "End Event - Message"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:21
--msgid "Gateway"
-+msgid "End Event - Error"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:22
--msgid "Group"
--msgstr "Grupează"
-+msgid "End Event - Cancel"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
--msgstr ""
-+msgid "End Event - Compensation"
-+msgstr "Eveniment final – compensare"
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr ""
-+msgid "End Event - Link"
-+msgstr "Eveniment final – legătură"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
-+msgid "End Event - Multiple"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
-+msgid "End Event - Terminate"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
-+msgid "Gateway"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
-+msgid "Exclusive (XOR) Data Based"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
-+msgid "Exclusive (XOR) Event Based"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
-+msgid "Inclusive (OR)"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
--msgstr ""
-+msgid "Complex"
-+msgstr "Complex"
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr ""
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
-+msgid "Parallel (AND)"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
-+msgid "Activity Looping"
- msgstr ""
- 
--# hm?
-+# hm ?
- #: ../sheets/BPMN.sheet.in.h:35
- msgid "Multiple Instance Task"
- msgstr "Sarcină de instanță multiplă"
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
-+msgid "Compensation Task"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:37
--msgid "Start Event"
--msgstr "Eveniment de început"
-+msgid "Collapsed Sub-Process"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:38
--msgid "Start Event - Link"
--msgstr "Eveniment de început – legătură"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:39
--msgid "Start Event - Message"
-+msgid "Multiple Instance Collapsed Sub-Process"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
-+msgid "Ad-Hoc Collapsed Sub-Process"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
-+msgid "Compensation Collapsed Sub-Process"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:42
--msgid "Start Event - Timer"
-+msgid "Group"
-+msgstr "Grupează"
-+
-+#: ../sheets/BPMN.sheet.in.h:43
-+msgid "Transaction"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:44
--msgid "Text Annotation"
-+msgid "Data Object"
- msgstr ""
- 
- #: ../sheets/BPMN.sheet.in.h:45
--msgid "Transaction"
--msgstr ""
--
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
-+msgid "Text Annotation"
- msgstr ""
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--msgid "Air Cooler"
-+msgid "ChemEng"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
-+msgid "Collection for chemical engineering"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:4
--msgid "Axial Flow Fan"
-+msgid "Fan or Stirrer"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--msgid "Basic Filter"
--msgstr ""
-+msgid "Spraying Device"
-+msgstr "Dispozitiv de pulverizare"
- 
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
--msgstr ""
-+msgid "Pneumatic Line"
-+msgstr "Linie pneumatică"
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--msgid "Centrifuge"
-+msgid "Pneumatic Line, vertical"
- msgstr ""
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--msgid "ChemEng"
-+msgid "Simple Heat Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
-+msgid "Simple Heat Exchanger, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
-+msgid "Water Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:12
--msgid "Compressor or Turbine"
-+msgid "Water Cooler, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--msgid "Covered tank"
-+msgid "Fixed-Sheet Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
-+msgid "Floating-Head or U-Tube Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:15
--msgid "Double-Pipe Exchanger"
-+msgid "Kettle Reboiler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
-+msgid "Air Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
-+msgid "Forced-Flow Air Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
-+msgid "Induced-Flow Air Cooler"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
-+msgid "Plate Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
-+msgid "Double-Pipe Exchanger"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
-+msgid "Heating/Cooling Coil"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
-+msgid "Heating/Cooling Coil, vertical"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
--msgstr ""
-+msgid "Simple Furnace"
-+msgstr "Cuptor simplu"
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
--msgstr ""
-+msgid "Simple Vessel"
-+msgstr "Vas simplu"
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
-+msgid "Knock-out Drum (with demister pad)"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
-+msgid "Tray Column, simple"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
-+msgid "Tray Column, detailed"
-+msgstr ""
-+
-+#: ../sheets/ChemEng.sheet.in.h:28
-+msgid "Fluid Contacting Vessel, simple"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--msgid "Mixer"
--msgstr "Mixer"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
-+msgid "Autoclave"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
-+msgid "Open Tank"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:32
--msgid "Pneumatic Line"
--msgstr "Linie pneumatică"
-+msgid "Clarifier or Settling Tank"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
-+msgid "Sealed Tank"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
-+msgid "Covered tank"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Pressure Relief Valve"
-+msgid "Tank with Fixed Roof"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reactor or Absorption Vessel, simple"
-+msgid "Tank with Floating Roof"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--msgid "Reciprocating Compressor or Pump"
--msgstr ""
-+msgid "Storage Sphere"
-+msgstr "Sferă de stocare"
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--msgid "Regulable Valve"
--msgstr "Valvă reglabilă"
-+msgid "Gas Holder, basic"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Regulable Valve, vertical"
--msgstr "Valvă reglabilă, verticală"
-+msgid "Centrifugal Pump or Fan"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--msgid "Sealed Tank"
-+msgid "Positive Displacement Rotary Pump or Compressor"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Furnace"
--msgstr "Cuptor simplu"
-+msgid "Reciprocating Compressor or Pump"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger"
-+msgid "Axial Flow Fan"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:43
--msgid "Simple Heat Exchanger, vertical"
-+msgid "Compressor or Turbine"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Simple Vessel"
--msgstr "Vas simplu"
-+msgid "Ejector or Injector"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spray Drier"
-+msgid "AC Generator"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--msgid "Spraying Device"
--msgstr "Dispozitiv de pulverizare"
-+msgid "Valve"
-+msgstr "Valvă"
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Storage Sphere"
--msgstr "Sferă de stocare"
-+msgid "Valve, vertical"
-+msgstr "Valvă, verticală"
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Fixed Roof"
--msgstr ""
-+msgid "Regulable Valve"
-+msgstr "Valvă reglabilă"
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tank with Floating Roof"
--msgstr ""
-+msgid "Regulable Valve, vertical"
-+msgstr "Valvă reglabilă, verticală"
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, detailed"
-+msgid "Basic Filter"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--msgid "Tray Column, simple"
--msgstr ""
-+msgid "Mixer"
-+msgstr "Mixer"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--msgid "Valve"
--msgstr "Valvă"
-+msgid "Cyclone and hydrocyclone"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--msgid "Valve, vertical"
--msgstr "Valvă, verticală"
-+msgid "Spray Drier"
-+msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--msgid "Water Cooler"
-+msgid "Centrifuge"
- msgstr ""
- 
- #: ../sheets/ChemEng.sheet.in.h:55
--msgid "Water Cooler, vertical"
-+msgid "Pressure Relief Valve"
- msgstr ""
- 
- #: ../sheets/Circuit.sheet.in.h:1
-@@ -7234,303 +7268,303 @@ msgid "Components for circuit diagrams"
- msgstr "Componente pentru diagrame circuit"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "Punct de masă"
-+msgid "Vertically aligned resistor"
-+msgstr "Rezistor aliniat vertical"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Jumper orizontal"
-+msgid "Horizontally aligned inductor"
-+msgstr "Inductanță aliniată orizontal"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "LED aliniat orizontal"
-+msgid "Vertically aligned inductor"
-+msgstr "Inductanță aliniată vertical"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Condensator aliniat orizontal"
-+msgid "Horizontally aligned resistor"
-+msgstr "Rezistor aliniat orizontal"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Diodă aliniată orizontal"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Rezistor aliniat vertical (european)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Siguranță aliniată orizontal"
-+msgid "Horizontally aligned inductor (European)"
-+msgstr "Inductanță aliniată orizontal (European)"
- 
- #: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Inductanță aliniată orizontal"
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Inductanță aliniată vertical (european)"
- 
- #: ../sheets/Circuit.sheet.in.h:10
--msgid "Horizontally aligned inductor (European)"
--msgstr "Inductanță aliniată orizontal (European)"
-+msgid "Horizontally aligned resistor (European)"
-+msgstr "Rezistor aliniat orizontal (European)"
- 
- #: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Sursă de putere aliniată orizontal"
-+msgid "Horizontally aligned capacitor"
-+msgstr "Condensator aliniat orizontal"
- 
- #: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Rezistor aliniat orizontal"
--
--#: ../sheets/Circuit.sheet.in.h:13
--msgid "Horizontally aligned resistor (European)"
--msgstr "Rezistor aliniat orizontal (European)"
--
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Diodă Zener aliniată orizontal"
-+msgid "Vertically aligned capacitor"
-+msgstr "Condensator aliniat vertical"
- 
-+#.
-+#.
- #: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Lampă"
--
--#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Microfon"
--
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "Tranzistor NMOS"
-+msgid "NPN bipolar transistor"
-+msgstr "Tranzistor bipolar NPN"
- 
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:20
--msgid "NPN bipolar transistor"
-+#: ../sheets/Circuit.sheet.in.h:18
-+msgid "PNP bipolar transistor"
- msgstr "Tranzistor bipolar NPN"
- 
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Diodă aliniată orizontal"
-+
-+#: ../sheets/Circuit.sheet.in.h:20
-+msgid "Vertically aligned diode"
-+msgstr "Diodă aliniată vertical"
-+
- #: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Amplificator operațional"
-+msgid "Horizontally aligned zener diode"
-+msgstr "Diodă Zener aliniată orizontal"
- 
- #: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "Tranzistor PMOS"
-+msgid "Vertically aligned zener diode"
-+msgstr "Diodă Zener aliniată vertical"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Punct de masă"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Amplificator operațional"
- 
--#.
--#.
- #: ../sheets/Circuit.sheet.in.h:25
--msgid "PNP bipolar transistor"
--msgstr "Tranzistor bipolar NPN"
-+msgid "Horizontally aligned fuse"
-+msgstr "Siguranță aliniată orizontal"
- 
--#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Difuzor"
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "Siguranță aliniată vertical"
- 
- #: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "LED aliniat vertical"
-+msgid "Horizontally aligned powersource"
-+msgstr "Sursă de putere aliniată orizontal"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "Condensator aliniat vertical"
-+msgid "Vertically aligned powersource"
-+msgstr "Sursă de putere aliniată vertical"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "Diodă aliniată vertical"
-+msgid "Lamp"
-+msgstr "Lampă"
- 
--#: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "Siguranță aliniată vertical"
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Difuzor"
- 
--#: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "Inductanță aliniată vertical"
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Microfon"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "Inductanță aliniată vertical (european)"
-+msgid "Horizontally aligned LED"
-+msgstr "LED aliniat orizontal"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "Sursă de putere aliniată vertical"
-+msgid "Vertically aligned LED"
-+msgstr "LED aliniat vertical"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "Rezistor aliniat vertical"
-+msgid "NMOS transistor"
-+msgstr "Tranzistor NMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "Rezistor aliniat vertical (european)"
-+msgid "PMOS transistor"
-+msgstr "Tranzistor PMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "Diodă Zener aliniată vertical"
-+msgid "Horizontal jumper"
-+msgstr "Jumper orizontal"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "Contact de scară (normal închis) „dacă-nu�"
-+msgid "Ladder"
-+msgstr "Scară"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "Contact de scară (normal deschis) „dacă�"
-+msgid "Components for LADDER circuits"
-+msgstr "Componente pentru circuite de scară"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "Variabilă de ieșire „jump�"
-+msgid "'if' (normally open) ladder contact"
-+msgstr "Contact de scară (normal deschis) „dacă�"
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "Variabilă de ieșire „reset�"
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "Contact de scară (normal închis) „dacă-nu�"
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "Variabilă de ieșire „set�"
-+msgid "Simple output variable"
-+msgstr "Variabilă de ieșire simplă"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Componente pentru circuite de scară"
-+msgid "Negative output variable"
-+msgstr "Variabilă de ieșire negativă"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Scară"
-+msgid "'set' output variable"
-+msgstr "Variabilă de ieșire „set�"
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "Variabilă de ieșire negativă"
-+msgid "'reset' output variable"
-+msgstr "Variabilă de ieșire „reset�"
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Variabilă de ieșire „reset� cu economie de putere"
-+msgid "'jump' output variable"
-+msgstr "Variabilă de ieșire „jump�"
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Variabilă de ieșire „set� cu economie de putere"
-+msgid "Receptivity output variable"
-+msgstr "Variabilă de ieșire de receptivitate"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Variabilă de ieșire negativă cu economie de putere"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Variabilă de ieșire simplă cu economie de putere"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Variabilă de ieșire negativă cu economie de putere"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "Variabilă de ieșire de receptivitate"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Variabilă de ieșire „set� cu economie de putere"
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Variabilă de ieșire simplă"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Variabilă de ieșire „reset� cu economie de putere"
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr ""
-+msgid "Cybernetics"
-+msgstr "Cibernetice"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
-+msgid "Elements of cybernetic circuits"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
-+msgid "Sensor - left"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
-+msgid "Sensor - right"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
-+msgid "Sensor - bottom"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
-+msgid "Sensor - top"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
--msgstr "Cibernetice"
-+msgid "Sum, subtracting left input"
-+msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--msgid "Elements of cybernetic circuits"
-+msgid "Sum, subtracting right input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
-+msgid "Sum, subtracting bottom input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
-+msgid "Sum, subtracting top input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
-+msgid "Integrator - input left"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
-+msgid "Integrator - input right"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:13
--msgid "Integrator - input left"
-+msgid "Integrator - input bottom"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:14
--msgid "Integrator - input right"
-+msgid "Integrator - input top"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:15
--msgid "Integrator - input top"
-+msgid "Sum"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
-+msgid "Product"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:17
--msgid "Product"
-+msgid "High pass filter"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
-+msgid "Low pass filter"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
-+msgid "Sine characteristic or input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
-+msgid "Sigmoid characteristic"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
-+msgid "Saturation characteristic"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
-+msgid "Relay characteristic (sigma)"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
-+msgid "Half wave rectifier or ramp input"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
-+msgid "Full wave rectifier (absolute value)"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
-+msgid "Constant positive shift on the y-axis"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--msgid "Sum"
-+msgid "Constant negative shift on the y-axis"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
-+msgid "Constant factor greater 1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
-+msgid "Constant factor between 0 and 1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
-+msgid "Constant factor between 0 and -1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
-+msgid "Constant factor below -1"
- msgstr ""
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
-@@ -7542,87 +7576,87 @@ msgid "Time delay"
- msgstr ""
- 
- #: ../sheets/Database.sheet.in.h:1
--msgid "Attribute compound"
--msgstr ""
--
--#: ../sheets/Database.sheet.in.h:2
- msgid "Database"
- msgstr "Bază de date"
- 
--#: ../sheets/Database.sheet.in.h:3
-+#: ../sheets/Database.sheet.in.h:2
- msgid "Editor for Database Table Relation Diagrams"
- msgstr ""
- 
--#: ../sheets/ER.sheet.in.h:2
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr ""
-+
-+#: ../sheets/ER.sheet.in.h:1
- msgid "ER"
- msgstr "ER"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
- msgstr "Editor pentru obiecte diagramă entitate-relație"
- 
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Participare"
--
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr ""
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Participare"
-+
- #: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Electric"
-+
-+#: ../sheets/Electric.sheet.in.h:2
- msgid "Components for electric circuits"
- msgstr "Componente pentru circuite electrice"
- 
--#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "Punct de conectare"
--
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Electric"
-+msgid "Normally open contact (horizontal)"
-+msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
-+msgid "Normally closed contact (horizontal)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
-+msgid "Normally open position switch (horizontal)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
-+msgid "Normally closed position switch (horizontal)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
-+msgid "Normally open contact (vertical)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
-+msgid "Normally closed contact (vertical)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
-+msgid "Normally open position switch (vertical)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
-+msgid "Normally closed position switch (vertical)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
-+msgid "The command organ of a relay (horizontal)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
-+msgid "Relay (horizontal)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
-+msgid "Lamp or indicator light (horizontal)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
-+msgid "The command organ of a relay (vertical)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:15
-@@ -7630,239 +7664,233 @@ msgid "Relay (vertical)"
- msgstr ""
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
-+msgid "Lamp or indicator light (vertical)"
- msgstr ""
- 
--#: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr ""
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "Punct de conectare"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Editor pentru diagramă structură-funcție"
--
--#: ../sheets/FS.sheet.in.h:2
- msgid "FS"
- msgstr "FS"
- 
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Editor pentru diagramă structură-funcție"
-+
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr ""
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Funcție"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr ""
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Funcție"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Colaționare"
-+msgid "Objects to draw flowcharts"
-+msgstr "Obiecte pentru desenare de organigrame"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "Conector"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Proces sau operație auxiliară"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--msgid "Data source"
--msgstr "Sursă de date"
-+msgid "Input/Output"
-+msgstr "Intrare sau ieșire"
- 
--#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Decizie"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Întârziere"
-+msgid "Connector"
-+msgstr "Conector"
- 
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Document"
-+msgid "Transaction file"
-+msgstr "Fișier de tranzacție"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:10
-+msgid "Off page connector"
-+msgstr "Conector inter-pagini"
- 
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Intrare/ieșire"
-+msgid "Document"
-+msgstr "Document"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Stocare internă"
-+msgid "Manual operation"
-+msgstr "Operare manuală"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Disc magnetic"
-+msgid "Preparation"
-+msgstr "Pregătire"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Tambur magnetic"
-+msgid "Manual input"
-+msgstr "Intrare manuală"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Bandă magnetică"
-+msgid "Predefined process"
-+msgstr "Proces predefinit"
- 
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Intrare manuală"
-+msgid "Terminal Interrupt"
-+msgstr "ÃŽntrerupere terminal"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Operare manuală"
-+msgid "Magnetic disk"
-+msgstr "Disc magnetic"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "Combinare"
-+msgid "Magnetic drum"
-+msgstr "Tambur magnetic"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Obiecte pentru desenare de organigrame"
-+msgid "Magnetic tape"
-+msgstr "Bandă magnetică"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Conector inter-pagini"
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Stocare internă"
- 
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "Stocare offline"
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Combinare"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Sau"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Proces predefinit"
-+msgid "Delay"
-+msgstr "Întârziere"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Pregătire"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Proces/operație auxiliară"
-+msgid "Summing junction"
-+msgstr "Joncțiune sumatoare"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Card perforat"
-+msgid "Collate"
-+msgstr "Colaționare"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Bandă perforată"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Sortare"
- 
--#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Sau"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Card perforat"
-+
- #: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Joncțiune sumatoare"
-+msgid "Punched tape"
-+msgstr "Bandă perforată"
- 
- #: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "ÃŽntrerupere terminal"
-+msgid "Transmittal tape"
-+msgstr "Bandă de transmisie"
- 
- #: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Fișier de tranzacție"
-+msgid "Offline storage"
-+msgstr "Stocare offline"
- 
- #: ../sheets/Flowchart.sheet.in.h:34
--msgid "Transmittal tape"
--msgstr "Bandă de transmisie"
-+msgid "Data source"
-+msgstr "Sursă de date"
- 
- #: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr ""
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
- 
- #: ../sheets/GRAFCET.sheet.in.h:2
--msgid "Action to associate to a step"
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Obiecte diagrama GRAFCET"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
- msgstr ""
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
--msgid "Arc (upward)"
-+#: ../sheets/GRAFCET.sheet.in.h:9
-+msgid "Action to associate to a step"
- msgstr ""
- 
--#: ../sheets/GRAFCET.sheet.in.h:4
-+#: ../sheets/GRAFCET.sheet.in.h:10
- msgid "Condition (of an action)"
- msgstr ""
- 
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr ""
--
--#: ../sheets/GRAFCET.sheet.in.h:11
--msgid "OR vergent"
--msgstr ""
--
--#: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Obiecte diagrama GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
- msgid "Transition"
- msgstr "Tranziție"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
--msgid "Alternate external entity"
-+#: ../sheets/GRAFCET.sheet.in.h:12
-+msgid "OR vergent"
- msgstr ""
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:2
--msgid "Data store"
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
- msgstr ""
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:3
--msgid "External entity"
--msgstr "Entitate externă"
-+#: ../sheets/GRAFCET.sheet.in.h:14
-+msgid "Arc (upward)"
-+msgstr ""
- 
- #. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
--#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
- msgid "Gane and Sarson"
- msgstr "Gane și Sarson"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
- msgid "Gane and Sarson DFD"
- msgstr "DFD Gane și Sarson"
- 
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
-+msgid "Alternate external entity"
- msgstr ""
- 
--#: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-+msgid "Data store"
- msgstr ""
- 
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
--msgstr ""
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+msgid "External entity"
-+msgstr "Entitate externă"
- 
-+#. use dc:title instead?
-+#: ../sheets/IsometricMap.sheet.in.h:2
-+msgid "Map, Isometric"
-+msgstr "Hartă, izometric"
-+
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
-+msgid "Isometric Directional Map Shapes"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
-+msgid "Road Section"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
-+msgid "Long Straight Road Section"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:7
--msgid "Block 7"
--msgstr ""
-+msgid "Crossroads"
-+msgstr "Intersecție de drumuri"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
--msgstr ""
-+msgid "T-Junction"
-+msgstr "Joncțiune-T"
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
-+msgid "Elevated Road"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
-@@ -7874,77 +7902,83 @@ msgid "Corner 2"
- msgstr "ColÈ› 2"
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--msgid "Crossroads"
--msgstr "Intersecție de drumuri"
-+msgid "River"
-+msgstr "Râu"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
--msgstr ""
-+msgid "Roof1"
-+msgstr "AcoperiÈ™ 1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--msgid "Factory"
-+msgid "Block 1, 2:4"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
-+msgid "Block 2, 2:8"
-+msgstr ""
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
- msgstr ""
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
-+msgid "Block 4, 4:8"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
-+msgid "Block 5, 3:3"
-+msgstr ""
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
- msgstr ""
- 
--#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
--msgstr "Hartă, izometric"
-+msgid "Block 7"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
-+msgid "Factory"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--msgid "River"
--msgstr "Râu"
-+msgid "Car 1, Front View"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--msgid "Road Section"
-+msgid "Car 2, Rear View"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--msgid "Roof1"
--msgstr "AcoperiÈ™ 1"
-+msgid "Train 1, angled downward"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:25
--msgid "T-Junction"
--msgstr "Joncțiune-T"
-+msgid "Train 2, angled upward"
-+msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:26
--msgid "Train 1, angled downward"
--msgstr ""
-+msgid "Tree 1"
-+msgstr "Arbore 1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:27
--msgid "Train 2, angled upward"
-+msgid "Footbridge, Pedestrian Bridge"
- msgstr ""
- 
- #: ../sheets/IsometricMap.sheet.in.h:28
--msgid "Tree 1"
--msgstr "Arbore 1"
-+msgid "One Way Road Sign"
-+msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
-+msgid "RE-i*"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr ""
-+msgid "Objects to design i* diagrams"
-+msgstr "Obiecte pentru desenarea diagramelor i*"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
-+msgid "An i* softgoal"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:4
-@@ -7952,23 +7986,23 @@ msgid "An i* goal"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
-+msgid "An i* resource"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
-+msgid "An i* task"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:7
--msgid "An i* position"
-+msgid "An i* unspecified actor"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
-+msgid "An i* agent"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
-+msgid "An i* position"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:10
-@@ -7976,315 +8010,315 @@ msgid "An i* role"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
-+msgid "An i* unspecified link"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
-+msgid "An i* positive contribution"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
-+msgid "An i* negative contribution"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
-+msgid "An i* dependency link"
- msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:15
--msgid "Objects to design i* diagrams"
--msgstr "Obiecte pentru desenarea diagramelor i*"
-+msgid "An i* decomposition link"
-+msgstr ""
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
-+msgid "An i* means-ends link"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
-+msgid "RE-Jackson"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:2
--msgid "A Jackson given domain"
--msgstr ""
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Obiecte pentru desenarea diagramelor Jackson"
- 
- #: ../sheets/Jackson.sheet.in.h:3
--msgid "A Jackson machine domain"
-+msgid "A Jackson given domain"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:4
--msgid "A Jackson requirement"
-+msgid "A Jackson designed domain"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
-+msgid "A Jackson machine domain"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:6
--msgid "A Jackson shared phenomenon"
-+msgid "A Jackson requirement"
- msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:7
--msgid "Objects to design Jackson diagrams"
--msgstr "Obiecte pentru desenarea diagramelor Jackson"
-+msgid "A Jackson shared phenomenon"
-+msgstr ""
- 
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
-+msgid "A Jackson requirement phenomenon"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
-+msgid "RE-KAOS"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr ""
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Obiecte pentru desenarea diagramelor KADOS"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--msgid "A KAOS agent"
--msgstr "Un agent KADOS"
-+msgid "A KAOS softgoal"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
-+msgid "A KAOS goal"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
--msgstr ""
-+msgid "A KAOS requirement"
-+msgstr "O cerință KADOS"
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
-+msgid "A KAOS assumption"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
-+msgid "A KAOS obstacle"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
-+msgid "A KAOS AND refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
-+msgid "A KAOS complete AND refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
-+msgid "A KAOS OR refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
-+msgid "A KAOS complete OR refinement"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
--msgstr ""
-+msgid "A KAOS operationalization"
-+msgstr "O operaționalizare KADOS"
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
--msgstr "O legătură de monitor KADOS"
-+msgid "A KAOS contribution"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
-+msgid "A KAOS obstruction"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:15
--msgid "A KAOS obstruction"
-+msgid "A KAOS binary conflict"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:16
--msgid "A KAOS operation"
--msgstr "O operație KADOS"
-+msgid "A KAOS agent"
-+msgstr "Un agent KADOS"
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
--msgstr "O operaționalizare KADOS"
-+msgid "A KAOS responsibility"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
--msgstr ""
-+msgid "A KAOS monitor link"
-+msgstr "O legătură de monitor KADOS"
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
-+msgid "A KAOS control link"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
--msgstr "O cerință KADOS"
-+msgid "A KAOS capable-of"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
-+msgid "A KAOS performs"
- msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
--msgstr ""
-+msgid "A KAOS operation"
-+msgstr "O operație KADOS"
- 
- #: ../sheets/KAOS.sheet.in.h:23
--msgid "Objects to design KAOS diagrams"
--msgstr "Obiecte pentru desenarea diagramelor KADOS"
-+msgid "A KAOS input"
-+msgstr ""
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
-+msgid "A KAOS output"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:1
--msgid "ACL"
--msgstr ""
-+msgid "Lights"
-+msgstr "Lumini"
- 
- #: ../sheets/Lights.sheet.in.h:2
--msgid "Black light"
--msgstr ""
-+msgid "Objects to design simple lighting plots"
-+msgstr "Obiecte pentru desenarea de fulgere simple"
- 
- #: ../sheets/Lights.sheet.in.h:3
--msgid "Blinders"
-+msgid "PAR"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:4
--msgid "Ellipsoidal Reflector Spotlight"
-+msgid "PAR on the floor"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:5
--msgid "Fresel lantern"
-+msgid "ACL"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:6
--msgid "Lights"
--msgstr "Lumini"
-+msgid "Pebble Convex lantern"
-+msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:7
--msgid "Moving head"
-+msgid "Fresel lantern"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:8
--msgid "Objects to design simple lighting plots"
--msgstr "Obiecte pentru desenarea de fulgere simple"
-+msgid "Striplight"
-+msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:9
--msgid "PAR"
-+msgid "Ellipsoidal Reflector Spotlight"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:10
--msgid "PAR on the floor"
-+msgid "Blinders"
- msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:11
--msgid "Pebble Convex lantern"
-+msgid "Black light"
- msgstr ""
- 
--#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Scaner"
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr ""
- 
- #: ../sheets/Lights.sheet.in.h:13
--msgid "Striplight"
-+msgid "Moving head"
- msgstr ""
- 
--#: ../sheets/Lights.sheet.in.h:14
--msgid "Stroboscope light"
--msgstr ""
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Scaner"
- 
- #: ../sheets/Lights.sheet.in.h:15
- msgid "Structure"
- msgstr "Structură"
- 
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "Poartă AND (ȘI)"
-+msgid "Logic"
-+msgstr "Logică"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Logică booleană"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr ""
-+msgid "OR gate"
-+msgstr "Poartă OR (SAU)"
- 
--#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
--msgid "Inverter"
--msgstr "Invertor"
-+#: ../sheets/Logic.sheet.in.h:4
-+msgid "AND gate"
-+msgstr "Poartă AND (ȘI)"
- 
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Logică"
-+msgid "XOR gate"
-+msgstr "Poartă XOR"
- 
- #: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Bufer simplu"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Invertor"
-+
-+#: ../sheets/Logic.sheet.in.h:8
- msgid "NAND gate"
- msgstr "Poartă NAND (ȘI negat)"
- 
--#: ../sheets/Logic.sheet.in.h:7
-+#: ../sheets/Logic.sheet.in.h:9
- msgid "NOR gate"
- msgstr "Poartă NOR (SAU negat)"
- 
--#: ../sheets/Logic.sheet.in.h:8
-+#: ../sheets/Logic.sheet.in.h:10
- msgid "NOT"
- msgstr ""
- 
--#: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "Poartă OR (SAU)"
--
--#: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Bufer simplu"
--
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "Poartă XOR"
-+msgid "Crossconnector"
-+msgstr ""
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Demultiplexor"
-+msgid "MSE"
-+msgstr "MSE"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Nod de extensie mare"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "Componente pentru echipamente mobile ale U.S. Army"
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr ""
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "Multiplexor"
-+msgid "Large extension node"
-+msgstr "Nod de extensie mare"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr ""
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Nod de extensie mic"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Terminal de comunicații tactice prin satelit"
- 
--#: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr "Componente pt. echipamente mobile ale U.S Army"
--
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Dosar"
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplexor"
- 
--#: ../sheets/Misc.sheet.in.h:3
--msgid "Measure distance"
--msgstr ""
-+#: ../sheets/MSE.sheet.in.h:8
-+msgid "Demultiplexer"
-+msgstr "Demultiplexor"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:1
- msgid "Misc"
- msgstr "Diverse"
- 
--#: ../sheets/Misc.sheet.in.h:5
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Diverse forme"
- 
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Ramificație"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Dosar"
-+
- #: ../sheets/Misc.sheet.in.h:6
--msgid "New-style group object, for testing"
-+msgid "expensible node"
- msgstr ""
- 
- #: ../sheets/Misc.sheet.in.h:7
--msgid "Resizable grid"
-+msgid "expended node"
- msgstr ""
- 
- #: ../sheets/Misc.sheet.in.h:8
-@@ -8292,1016 +8326,1020 @@ msgid "Traditional clock"
- msgstr "Ceas tradițional"
- 
- #: ../sheets/Misc.sheet.in.h:9
--msgid "Tree"
--msgstr "Ramificație"
-+msgid "Measure distance"
-+msgstr ""
- 
- #: ../sheets/Misc.sheet.in.h:10
--msgid "expended node"
-+msgid "Resizable grid"
- msgstr ""
- 
- #: ../sheets/Misc.sheet.in.h:11
--msgid "expensible node"
-+msgid "New-style group object, for testing"
- msgstr ""
- 
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "Distribitor 2/2"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pneumatic sau hidraulic"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "Distribitor 3/2"
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Componente pentru circuite hidraulice și pneumatice"
- 
- #: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "Distribitor 4/2"
-+msgid "Double-effect jack"
-+msgstr ""
- 
- #: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "Distribitor 5/2"
-+msgid "Normally-in simple-effect jack"
-+msgstr "Piston simplu cu efect de intrare"
- 
- #: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Orificiu de evacuare a aerului"
-+msgid "Normally-out simple-effect jack"
-+msgstr "Piston simplu cu efect de ieșire"
- 
- #: ../sheets/Pneumatic.sheet.in.h:6
--msgid "Components for pneumatic and hydraulic circuits"
--msgstr "Componente pentru circuite hidraulice și pneumatice"
-+msgid "Generic pressure source"
-+msgstr "Sursă de presiune generică"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Sursă de presiune hidraulică"
- 
- #: ../sheets/Pneumatic.sheet.in.h:8
--msgid "Double-effect jack"
--msgstr ""
-+msgid "Pneumatic pressure source"
-+msgstr "Sursă de presiune pneumatică"
- 
- #: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Comandă electrică (bobină dublă)"
-+msgid "Air exhaust orifice"
-+msgstr "Orificiu de evacuare a aerului"
- 
- #: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Comandă electrică (o bobină)"
-+msgid "2/2 distributor"
-+msgstr "Distribitor 2/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:11
--msgid "Generic pressure source"
--msgstr "Sursă de presiune generică"
-+msgid "3/2 distributor"
-+msgstr "Distribitor 3/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:12
--msgid "Hydraulic pressure source"
--msgstr "Sursă de presiune hidraulică"
-+msgid "4/2 distributor"
-+msgstr "Distribitor 4/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "Comandă indirectă hidraulică"
-+msgid "5/2 distributor"
-+msgstr "Distribitor 5/2"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "Comandă indirectă pneumatică"
-+msgid "Muscular command"
-+msgstr "Comandă musculară"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Comandă mecanică cu arc"
-+msgid "Push-button command"
-+msgstr "Comandă prin apăsare de buton"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
- msgstr "Comandă mecanică cu manivelă"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Comandă musculară"
-+msgid "Mechanical command by spring"
-+msgstr "Comandă mecanică cu arc"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Piston simplu cu efect de intrare"
-+msgid "Electric command (single coil)"
-+msgstr "Comandă electrică (bobină singulară)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Piston simplu cu efect de ieșire"
-+msgid "Electric command (double coil)"
-+msgstr "Comandă electrică (bobină dublă)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Sursă de presiune pneumatică"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Comandă indirectă hidraulică"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Pneumatic sau hidraulic"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Comandă prin apăsare de buton"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Comandă indirectă pneumatică"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Cutie de activitate/date"
-+msgid "SADT/IDEF0"
-+msgstr "SADT sau IDEF0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Săgeată de flux de activitate/date"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Obiecte pentru desenarea diagramelor SADT"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Etichetă de flux"
-+msgid "Activity/data flow arrow"
-+msgstr "Săgeată de flux de activitate sau de date"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Obiecte pentru desenarea diagramelor SADT"
-+msgid "Activity/data box"
-+msgstr "Cutie de activitate sau de date"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT sau IDEF0"
-+msgid "Flow label"
-+msgstr "Etichetă de flux"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Acțiune în execuție"
-+msgid "SDL"
-+msgstr "SDL"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Limbaj de descriere și specificare (SDL)"
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
- msgstr "Referință de tip de bloc"
- 
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Referință de tip de serviciu"
-+
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Apel de funcție"
-+msgid "Process type reference"
-+msgstr "Referință de tip de proces"
- 
--#: ../sheets/SDL.sheet.in.h:6
--msgid "Function header"
--msgstr "Antet de funcție"
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Stare"
- 
- #: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "Notiță de text generică"
-+msgid "Function header"
-+msgstr "Antet de funcție"
- 
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "Conector de intrare sau ieșire"
-+msgid "Send message"
-+msgstr "Trimitere mesaj"
- 
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Întoarcere de procedură"
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Recepționare mesaj"
- 
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Referință de tip de proces"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Apel de funcție"
- 
- #: ../sheets/SDL.sheet.in.h:12
--msgid "Receive message"
--msgstr "Recepționare mesaj"
-+msgid "Action being executed"
-+msgstr "Acțiune în execuție"
- 
- #: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
--
--#: ../sheets/SDL.sheet.in.h:14
- msgid "Save state"
- msgstr "Salvare de stare"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Trimitere mesaj"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Referință de tip de serviciu"
-+msgid "In/Out connector"
-+msgstr "Conector de intrare sau de ieșire"
- 
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "Limbaj de descriere și specificare (SDL)"
-+msgid "Procedure return"
-+msgstr "Întoarcere de procedură"
- 
--#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "Stare"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Notiță de text generică"
- 
- #: ../sheets/SISSI.sheet.in.h:1
--msgid "Air filter"
--msgstr "Filtru de aer"
-+msgid "Objects to design sissi diagrams"
-+msgstr "Obiecte pentru desenarea diagramelor sissi"
- 
- #: ../sheets/SISSI.sheet.in.h:2
--msgid "Air quality detector"
--msgstr ""
-+msgid "Workstation"
-+msgstr "Stație de lucru"
- 
--#: ../sheets/SISSI.sheet.in.h:3
--msgid "Airconditioner"
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:4
--msgid "Alarm center"
--msgstr ""
-+msgid "Server"
-+msgstr "Server"
- 
--#: ../sheets/SISSI.sheet.in.h:5
--msgid "Axial Ventilator"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Laptop"
- 
--#: ../sheets/SISSI.sheet.in.h:6
--msgid "Backup"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "PDA"
- 
--#: ../sheets/SISSI.sheet.in.h:7
--msgid "Badge reader"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Arie de stocare"
- 
--#: ../sheets/SISSI.sheet.in.h:8
--msgid "Badge reader/keyboard"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Ruter"
- 
--#: ../sheets/SISSI.sheet.in.h:9
--msgid "Biometric reader"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Nor de rețea"
- 
--#: ../sheets/SISSI.sheet.in.h:10
--msgid "Cell phone"
--msgstr "Telefon celular"
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefon"
- 
- #: ../sheets/SISSI.sheet.in.h:11
--msgid "Centrifugal Ventilator"
--msgstr "Ventilator centrifugal"
-+msgid "Cell phone"
-+msgstr "Telefon celular"
- 
--#: ../sheets/SISSI.sheet.in.h:12
--msgid "Cipher machine"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Hub"
- 
--#: ../sheets/SISSI.sheet.in.h:13
--msgid "Circulation pump"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
- 
- #: ../sheets/SISSI.sheet.in.h:14
--msgid "Condensator"
--msgstr "Condensator"
-+msgid "Cipher machine"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:15
--msgid "Current transducer"
--msgstr ""
-+msgid "Magnetic storage"
-+msgstr "Stocare magnetică"
- 
- #: ../sheets/SISSI.sheet.in.h:16
--msgid "Digital code"
--msgstr "Cod digital"
-+msgid "Paper storage"
-+msgstr "Stocare pe hârtie"
- 
- #: ../sheets/SISSI.sheet.in.h:17
--msgid "Enthalpy transducer"
-+msgid "Person"
- msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:18
--msgid "Extinguisher"
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
-+msgid "File cabinet"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:19
--msgid "Faraday cage"
-+msgid "Safe"
- msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
--msgid "File cabinet"
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
- msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:21
--msgid "Gate"
--msgstr "Poartă"
--
- #: ../sheets/SISSI.sheet.in.h:22
--msgid "Geographic site"
--msgstr "Sait geografic"
-+msgid "Log analysis"
-+msgstr "Analiză de jurnal"
- 
- #: ../sheets/SISSI.sheet.in.h:23
--msgid "Glass-break sensor"
--msgstr "Senzor de spargere de sticlă"
--
--#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "Hub"
-+msgid "Information system"
-+msgstr "Sistem de informații"
- 
--#: ../sheets/SISSI.sheet.in.h:25
-+#: ../sheets/SISSI.sheet.in.h:24
- msgid "Information"
- msgstr "Informații"
- 
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr ""
-+
- #: ../sheets/SISSI.sheet.in.h:26
--msgid "Information system"
--msgstr "Sistem de informații"
-+msgid "Faraday cage"
-+msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Laptop"
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr ""
-+
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr "Sait geografic"
- 
- #: ../sheets/SISSI.sheet.in.h:29
--msgid "Level detector"
--msgstr "Detector de nivel"
-+msgid "Gate"
-+msgstr "Poartă"
- 
- #: ../sheets/SISSI.sheet.in.h:30
--msgid "Light detector"
--msgstr "Detector de lumină"
-+msgid "Video camera"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:31
--msgid "Log analysis"
--msgstr "Analiză de jurnal"
-+msgid "Glass-break sensor"
-+msgstr "Senzor de spargere de sticlă"
- 
- #: ../sheets/SISSI.sheet.in.h:32
--msgid "Magnetic storage"
--msgstr "Stocare magnetică"
-+msgid "Sensor beam"
-+msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Modem"
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Condensator"
- 
- #: ../sheets/SISSI.sheet.in.h:34
--msgid "Moisture extractor"
--msgstr "Extractor de umezeală"
-+msgid "Power transducer"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:35
--msgid "Moisture sensor"
--msgstr "Senzor de umezeală"
-+msgid "Current transducer"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:36
--msgid "Movement detector"
--msgstr "Detector de mișcare"
-+msgid "Enthalpy transducer"
-+msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Nor de rețea"
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Detector de fum"
- 
- #: ../sheets/SISSI.sheet.in.h:38
--msgid "Objects to design sissi diagrams"
--msgstr "Obiecte pentru desenarea diagramelor sissi"
-+msgid "Moisture sensor"
-+msgstr "Senzor de umezeală"
- 
--#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "PDA"
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Detector de lumină"
- 
- #: ../sheets/SISSI.sheet.in.h:40
--msgid "Paper storage"
--msgstr "Stocare pe hârtie"
-+msgid "Movement detector"
-+msgstr "Detector de mișcare"
- 
- #: ../sheets/SISSI.sheet.in.h:41
--msgid "Person"
-+msgid "Video movement detector"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:42
--msgid "Power transducer"
--msgstr ""
-+msgid "Level detector"
-+msgstr "Detector de nivel"
- 
- #: ../sheets/SISSI.sheet.in.h:43
- msgid "Pressure transducer"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:44
--msgid "Pump"
-+msgid "Air quality detector"
- msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Detector de tensiune"
- 
- #: ../sheets/SISSI.sheet.in.h:46
--msgid "Revolving door"
-+msgid "Vehicle detector"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:47
--msgid "Room"
--msgstr ""
-+msgid "Vibration sensor"
-+msgstr "Senzor de vibrație"
- 
--#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "Ruter"
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Cod digital"
- 
- #: ../sheets/SISSI.sheet.in.h:49
--msgid "Safe"
--msgstr ""
-+msgid "Moisture extractor"
-+msgstr "Extractor de umezeală"
- 
- #: ../sheets/SISSI.sheet.in.h:50
--msgid "Security area"
--msgstr ""
-+msgid "Air filter"
-+msgstr "Filtru de aer"
- 
- #: ../sheets/SISSI.sheet.in.h:51
--msgid "Sensor beam"
-+msgid "Badge reader/keyboard"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:52
--msgid "Server"
--msgstr "Server"
-+msgid "Badge reader"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:53
--msgid "Smoke detector"
--msgstr "Detector de fum"
-+msgid "Biometric reader"
-+msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Arie de stocare"
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Telefon"
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr ""
-+
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:57
--msgid "Vehicle detector"
-+msgid "Axial Ventilator"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:58
--msgid "Ventilator"
--msgstr ""
-+msgid "Centrifugal Ventilator"
-+msgstr "Ventilator centrifugal"
- 
- #: ../sheets/SISSI.sheet.in.h:59
--msgid "Vibration sensor"
--msgstr "Senzor de vibrație"
--
--#: ../sheets/SISSI.sheet.in.h:60
--msgid "Video camera"
-+msgid "Ventilator"
- msgstr ""
- 
--#: ../sheets/SISSI.sheet.in.h:61
--msgid "Video movement detector"
-+#: ../sheets/SISSI.sheet.in.h:60
-+msgid "Extinguisher"
- msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:62
--msgid "Voltage detector"
--msgstr "Detector de tensiune"
-+msgid "Airconditioner"
-+msgstr ""
- 
- #: ../sheets/SISSI.sheet.in.h:63
--msgid "Workstation"
--msgstr "Stație de lucru"
-+msgid "Alarm center"
-+msgstr ""
- 
- #: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Activitate"
-+msgid "UML"
-+msgstr "UML"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "Agregare, o clasă este parte a alteia"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Editor pentru diagrame de structuri statice UML"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "Asociere, două clase sunt asociate"
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Notă"
- 
- #: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr ""
-+msgid "Realizes, implements a specific interface"
-+msgstr "Realizează, implementează o interfață specifică"
- 
- #: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr ""
-+msgid "Generalization, class inheritance"
-+msgstr "Generalizare, moștenire clase"
- 
- #: ../sheets/UML.sheet.in.h:9
-+msgid "Association, two classes are associated"
-+msgstr "Asociere, două clase sunt asociate"
-+
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Agregare, o clasă este parte a alteia"
-+
-+#: ../sheets/UML.sheet.in.h:11
-+msgid "Implements, class implements a specific interface"
-+msgstr "Implementează, clasa implementează o interfață specifică"
-+
-+#: ../sheets/UML.sheet.in.h:12
- msgid "Constraint, place a constraint on something"
- msgstr "Constrângere, plasează o restricție asupra ceva"
- 
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "Editor pentru diagrame de structuri statice UML"
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Pachet mic"
- 
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Bifurcație/uniune"
-+#: ../sheets/UML.sheet.in.h:14
-+msgid "Large package"
-+msgstr ""
- 
- #: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Generalizare, moștenire clase"
-+msgid "Use case"
-+msgstr ""
- 
- #: ../sheets/UML.sheet.in.h:17
--msgid "Implements, class implements a specific interface"
--msgstr "Implementează, clasa implementează o interfață specifică"
-+msgid "Lifeline"
-+msgstr ""
- 
- #: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr ""
-+msgid "Object"
-+msgstr "Obiect"
- 
- #: ../sheets/UML.sheet.in.h:19
--msgid "Large package"
--msgstr ""
-+msgid "Message"
-+msgstr "Mesaj"
- 
- #: ../sheets/UML.sheet.in.h:20
--msgid "Lifeline"
-+msgid "Component"
- msgstr ""
- 
--#: ../sheets/UML.sheet.in.h:21
--msgid "Message"
--msgstr "Mesaj"
--
--#: ../sheets/UML.sheet.in.h:22
-+#: ../sheets/UML.sheet.in.h:25
- msgid "Node"
- msgstr "Nod"
- 
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "Notă"
--
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Obiect"
--
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "Realizează, implementează o interfață specifică"
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr ""
- 
- #: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Pachet mic"
-+msgid "Initial/end state"
-+msgstr ""
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Activitate"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr ""
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Bifurcație/uniune"
- 
- #: ../sheets/chronogram.sheet.in.h:1
- msgid "Chronogram"
- msgstr "Diagramă temporală"
- 
- #: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr ""
--
--#: ../sheets/chronogram.sheet.in.h:3
- msgid "Objects to design chronogram charts"
- msgstr "Obiecte diagramă hărți temporale"
- 
--#: ../sheets/chronogram.sheet.in.h:4
-+#: ../sheets/chronogram.sheet.in.h:3
- msgid "Time scale"
- msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--msgid "BBS"
--msgstr "BBS"
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
-+#: ../sheets/ciscocomputer.sheet.in.h:1
- msgid "Cisco - Computer"
- msgstr "Calculator Cisco"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Forme de calculator de la Cisco"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "CA Cisco"
-+msgid "PC"
-+msgstr "PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "Securitate Cisco"
-+msgid "Macintosh"
-+msgstr "Macintosh"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr ""
-+msgid "Terminal"
-+msgstr "Terminal"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Forme de calculator de la Cisco"
-+msgid "SUN workstation"
-+msgstr "Stație de lucru SUN"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr "Subsistem de disc"
-+msgid "CiscoWorks workstation"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Dischetă"
-+msgid "PC Router Card"
-+msgstr "Placă de ruter PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:9
--msgid "EtherClient"
--msgstr "Client Ethernet"
-+msgid "PC Software"
-+msgstr "PC Software"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:10
--msgid "FC Storage"
--msgstr "Stocare FC"
-+msgid "PC with Router-Based Software"
-+msgstr "PC cu software bazat pe ruter"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Server de fișiere"
-+msgid "Workgroup director"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:12
--msgid "Front End Processor"
--msgstr ""
-+msgid "CiscoSecurity"
-+msgstr "Securitate Cisco"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP Mini"
-+msgid "Cisco CA"
-+msgstr "CA Cisco"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
-+msgid "WWW server"
- msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Gazdă"
-+msgid "Web browser"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "IBM Mini (AS400)"
-+msgid "File Server"
-+msgstr "Server de fișiere"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "IBM Tower"
-+msgid "Software-Based Router on File Server"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "IBM mainframe"
-+msgid "Server with PC Router"
-+msgstr "Server cu ruter PC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:19
--msgid "IBM mainframe with FEP"
--msgstr "IBM mainframe cu FEP"
-+msgid "IBM Tower"
-+msgstr "IBM Tower"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
--msgstr "JBOD"
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM Mini (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Macintosh"
-+msgid "IBM mainframe"
-+msgstr "IBM mainframe"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "Micro server Web"
-+msgid "IBM mainframe with FEP"
-+msgstr "IBM mainframe cu FEP"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Mini VAX"
-+msgid "HP Mini"
-+msgstr "HP Mini"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Monitor"
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Supercalculator"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:26
-+msgid "Web cluster"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:27
--msgid "Newton"
--msgstr "Newton"
-+msgid "Mini VAX"
-+msgstr "Mini VAX"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:29
--msgid "PC Adapter Card"
--msgstr "Adaptor de placă de PC"
--
--#: ../sheets/ciscocomputer.sheet.in.h:30
- msgid "PC Card"
- msgstr "Placă de PC"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tabletă"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:31
--msgid "PC Router Card"
--msgstr "Placă de ruter PC"
-+msgid "EtherClient"
-+msgstr "Client Ethernet"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:32
--msgid "PC Software"
--msgstr "PC Software"
-+msgid "Handheld"
-+msgstr ""
- 
- #: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "PC Video"
-+msgid "Wireless"
-+msgstr ""
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
--msgstr "PC cu software bazat pe ruter"
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Newton"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "Stație de lucru SUN"
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Monitor"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Server cu ruter PC"
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "PC Video"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:41
--msgid "Software-Based Router on File Server"
--msgstr ""
-+msgid "BBS"
-+msgstr "BBS"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Supercalculator"
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "Micro server Web"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr "Tabletă"
-+msgid "Diskette"
-+msgstr "Dischetă"
- 
--# hm?
- #: ../sheets/ciscocomputer.sheet.in.h:45
--msgid "Tape array"
--msgstr "Matrice de benzi"
-+msgid "Host"
-+msgstr "Gazdă"
- 
-+# hm ?
- #: ../sheets/ciscocomputer.sheet.in.h:46
--msgid "Terminal"
--msgstr "Terminal"
-+msgid "Tape array"
-+msgstr "Matrice de benzi"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:47
--msgid "WWW server"
--msgstr ""
-+msgid "Disk subsystem"
-+msgstr "Subsistem de disc"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:48
--msgid "Web browser"
--msgstr ""
--
--#: ../sheets/ciscocomputer.sheet.in.h:49
--msgid "Web cluster"
--msgstr ""
-+msgid "JBOD"
-+msgstr "JBOD"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:50
--msgid "Wireless"
--msgstr ""
-+msgid "FC Storage"
-+msgstr "Stocare FC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr ""
-+msgid "PC Adapter Card"
-+msgstr "Adaptor de placă de PC"
- 
- #: ../sheets/ciscohub.sheet.in.h:1
--msgid "100BaseT Hub"
--msgstr "Hub 100BaseT"
-+msgid "Cisco - Switch"
-+msgstr "Switch Cisco"
- 
- #: ../sheets/ciscohub.sheet.in.h:2
--msgid "7500ARS (7513) Router"
--msgstr "Ruter 7500ARS (7513)"
--
--#: ../sheets/ciscohub.sheet.in.h:3
--msgid "7505 Router"
--msgstr "Ruter 7505"
-+msgid "Router and switch shapes by Cisco"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:4
--msgid "7507 Router"
--msgstr "Ruter 7507"
-+msgid "Router subdued"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:5
--msgid "ASIC Processor"
--msgstr "Procesor ASIC"
-+msgid "Router with Silicon Switch"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+msgid "NetFlow router"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:7
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "ATM Fast Gigabit Etherswitch"
-+msgid "Broadband router"
-+msgstr "Ruter de bandă largă"
- 
- #: ../sheets/ciscohub.sheet.in.h:8
--msgid "ATM Switch"
--msgstr "ATM Switch"
-+msgid "Wavelength router"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:9
--msgid "ATM Tag Switch Router"
--msgstr "ATM Tag Switch Router"
-+msgid "Wireless router"
-+msgstr "Ruter fără fir"
- 
- #: ../sheets/ciscohub.sheet.in.h:10
--msgid "Access Gateway"
--msgstr "Gateway de acces"
-+msgid "7507 Router"
-+msgstr "Ruter 7507"
- 
- #: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+msgid "7505 Router"
-+msgstr "Ruter 7505"
- 
- #: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Ruter de bandă largă"
-+msgid "7500ARS (7513) Router"
-+msgstr "Ruter 7500ARS (7513)"
- 
- #: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr "CSM-S"
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr "Sistem de rutare de purtătoare"
-+msgid "Edge Label Switch Router"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:15
--msgid "Cisco - Switch"
--msgstr "Switch Cisco"
-+msgid "Router with Firewall"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+msgid "Optical Services Router"
-+msgstr "Ruter de servicii optic"
- 
- #: ../sheets/ciscohub.sheet.in.h:17
--msgid "Cisco Hub"
--msgstr "Hub Cisco"
--
--#: ../sheets/ciscohub.sheet.in.h:18
- msgid "Content Router"
- msgstr "Ruter de conținut"
- 
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Sistem de rutare de purtătoare"
-+
- #: ../sheets/ciscohub.sheet.in.h:19
--msgid "Content Service Module"
--msgstr "Modul de serviciu de conținut"
-+msgid "Storage Router"
-+msgstr "Ruter de stocare"
- 
- #: ../sheets/ciscohub.sheet.in.h:20
--msgid "Content Service Switch 1100"
--msgstr "Switch 1100 de serviciu de conținut"
--
--#: ../sheets/ciscohub.sheet.in.h:21
--msgid "Content Switch"
--msgstr "Switch de conținut"
-+msgid "NetSonar"
-+msgstr "Sonar de rețea"
- 
- #: ../sheets/ciscohub.sheet.in.h:22
--msgid "Data Center Switch"
--msgstr "Switch de centru de date"
-+msgid "Hub subdued"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr "Switch inversat de centru de date"
-+msgid "Cisco Hub"
-+msgstr "Hub Cisco"
- 
- #: ../sheets/ciscohub.sheet.in.h:24
--msgid "Data Switch Processor"
--msgstr "Procesor de switch de date"
-+msgid "Small Hub"
-+msgstr "Hub mic"
- 
- #: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr ""
-+msgid "100BaseT Hub"
-+msgstr "Hub 100BaseT"
- 
- #: ../sheets/ciscohub.sheet.in.h:26
--msgid "Edge Label Switch Router"
-+msgid "Workgroup switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
-+msgid "Workgroup switch Subdued"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:28
--msgid "Generic Processor"
--msgstr "Procesor generic"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr ""
-+
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
- 
- #: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr ""
-+msgid "ATM Tag Switch Router"
-+msgstr "ATM Tag Switch Router"
- 
- #: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "Switch ISDN"
-+msgid "Switch Processor"
-+msgstr "Procesor de switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:32
--msgid "LAN2LAN Switch"
--msgstr "Switch LAN2LAN"
-+msgid "Route Switch Processor"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:33
--msgid "Label Switch Router"
-+msgid "Route Switch Processor with Si"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:34
--msgid "Layer 2 Remote Switch"
-+msgid "PXF"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:35
--msgid "MGX 8220"
--msgstr "MGX 8220"
-+msgid "ASIC Processor"
-+msgstr "Procesor ASIC"
- 
- #: ../sheets/ciscohub.sheet.in.h:36
--msgid "MGX 8240"
--msgstr "MGX 8240"
-+msgid "Generic Processor"
-+msgstr "Procesor generic"
- 
- #: ../sheets/ciscohub.sheet.in.h:37
--msgid "MGX 8260"
--msgstr ""
-+msgid "Data Center Switch"
-+msgstr "Switch de centru de date"
- 
- #: ../sheets/ciscohub.sheet.in.h:38
--msgid "Multi-Fabric Server Switch"
--msgstr ""
-+msgid "Data Center Switch Reversed"
-+msgstr "Switch inversat de centru de date"
- 
- #: ../sheets/ciscohub.sheet.in.h:39
--msgid "MultiSwitch Device"
--msgstr ""
-+msgid "Data Switch Processor"
-+msgstr "Procesor de switch de date"
- 
- #: ../sheets/ciscohub.sheet.in.h:40
--msgid "Multilayer Remote Switch"
--msgstr ""
-+msgid "Content Switch"
-+msgstr "Switch de conținut"
- 
- #: ../sheets/ciscohub.sheet.in.h:41
--msgid "Multilayer Switch"
--msgstr ""
-+msgid "Content Service Module"
-+msgstr "Modul de serviciu de conținut"
- 
- #: ../sheets/ciscohub.sheet.in.h:42
--msgid "Multilayer Switch with Silicon"
--msgstr "Comutator multistrat cu silicon"
-+msgid "CSM-S"
-+msgstr "CSM-S"
- 
- #: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
--msgstr ""
-+msgid "Access Gateway"
-+msgstr "Gateway de acces"
- 
- #: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr ""
-+msgid "ATM Switch"
-+msgstr "ATM Switch"
- 
- #: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr ""
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
- 
- #: ../sheets/ciscohub.sheet.in.h:46
--msgid "NetSonar"
--msgstr "Sonar de rețea"
-+msgid "Cisco 1000"
-+msgstr "Cisco 1000"
- 
- #: ../sheets/ciscohub.sheet.in.h:47
--msgid "Optical Services Router"
--msgstr "Ruter de servicii optic"
-+msgid "ISDN switch"
-+msgstr "Switch ISDN"
- 
- #: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
-+msgid "Label Switch Router"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:49
--msgid "Programmable Switch"
--msgstr "Comutator programabil"
-+msgid "MultiSwitch Device"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr ""
-+msgid "LAN2LAN Switch"
-+msgstr "Switch LAN2LAN"
- 
- #: ../sheets/ciscohub.sheet.in.h:51
--msgid "Route Switch Processor"
-+msgid "Multilayer Switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:52
--msgid "Route Switch Processor with Si"
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Comutator multistrat cu silicon"
-+
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:54
--msgid "Router and switch shapes by Cisco"
--msgstr ""
-+msgid "Programmable Switch"
-+msgstr "Comutator programabil"
- 
- #: ../sheets/ciscohub.sheet.in.h:55
--msgid "Router subdued"
--msgstr ""
-+msgid "Content Service Switch 1100"
-+msgstr "Switch 1100 de serviciu de conținut"
- 
- #: ../sheets/ciscohub.sheet.in.h:56
--msgid "Router with Firewall"
--msgstr ""
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "ATM Fast Gigabit Etherswitch"
- 
- #: ../sheets/ciscohub.sheet.in.h:57
--msgid "Router with Silicon Switch"
-+msgid "RateMUX"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:58
--msgid "Server Switch"
--msgstr "Switch de server"
-+msgid "Workgroup 5500"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:59
--msgid "Small Hub"
-+msgid "Workgroup 5000"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:60
--msgid "Storage Router"
--msgstr "Ruter de stocare"
-+msgid "Workgroup 5002"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:61
--msgid "Switch Processor"
--msgstr "Procesor de switch"
-+msgid "NetRanger"
-+msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:62
--msgid "Universal Gateway"
--msgstr "Gateway universal"
-+msgid "MGX 8220"
-+msgstr "MGX 8220"
- 
- #: ../sheets/ciscohub.sheet.in.h:63
--msgid "Virtual Layer Switch"
--msgstr ""
-+msgid "MGX 8240"
-+msgstr "MGX 8240"
- 
- #: ../sheets/ciscohub.sheet.in.h:64
--msgid "Wavelength router"
-+msgid "MGX 8260"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:65
--msgid "Wireless router"
--msgstr "Ruter fără fir"
-+msgid "Universal Gateway"
-+msgstr "Gateway universal"
- 
- #: ../sheets/ciscohub.sheet.in.h:66
--msgid "Workgroup 5000"
-+msgid "iSCSI switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:67
--msgid "Workgroup 5002"
-+msgid "Workgroup Fibre Channel intelligent switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:68
--msgid "Workgroup 5500"
-+msgid "Director-class Fibre Channel intelligent switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
-+msgid "Multi-Fabric Server Switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:70
--msgid "Workgroup Switch Voice-Enabled"
--msgstr ""
-+msgid "Server Switch"
-+msgstr "Switch de server"
- 
- #: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
-+msgid "Multilayer Remote Switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:72
--msgid "Workgroup switch Subdued"
-+msgid "Layer 2 Remote Switch"
- msgstr ""
- 
- #: ../sheets/ciscohub.sheet.in.h:73
--msgid "iSCSI switch"
-+msgid "Virtual Layer Switch"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
--msgstr ""
-+msgid "Cisco - Misc"
-+msgstr "Diverse Cisco"
- 
- #: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr "Antenă"
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Forme diverse de la Cisco"
- 
- #: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Birou de sucursală"
-+msgid "Government Building"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:4
--msgid "Branch office blue"
--msgstr ""
-+msgid "University"
-+msgstr "Universitate"
- 
- #: ../sheets/ciscomisc.sheet.in.h:5
--msgid "Branch office subdued"
--msgstr "Birou de sucursală atenuat"
-+msgid "Small Business"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr ""
-+msgid "Home office"
-+msgstr "Birou de acasă"
- 
- #: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Diverse Cisco"
-+msgid "Branch office"
-+msgstr "Birou de sucursală"
- 
- #: ../sheets/ciscomisc.sheet.in.h:8
--msgid "CiscoWorks Man"
-+msgid "Branch office subdued"
-+msgstr "Birou de sucursală atenuat"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:9
-+msgid "Branch office blue"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:10
-@@ -9309,24 +9347,24 @@ msgid "Generic Building"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:11
--msgid "Generic Building blue"
-+msgid "Generic Building subdued"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:12
--msgid "Generic Building subdued"
-+msgid "Generic Building blue"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:13
--msgid "Government Building"
-+msgid "Medium Building"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:14
--msgid "Headphones"
-+msgid "Medium Building subdued"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr "Birou de acasă"
-+msgid "Medium Building blue"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:16
- msgid "House"
-@@ -9337,767 +9375,763 @@ msgid "House blue"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Cheie"
-+msgid "Telecommuter house"
-+msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
- msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:21
-+#: ../sheets/ciscomisc.sheet.in.h:20
- msgid "MDU"
- msgstr ""
- 
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr "Bărbat"
-+
- #: ../sheets/ciscomisc.sheet.in.h:22
--msgid "Mac Woman"
--msgstr ""
-+msgid "Man red"
-+msgstr "Bărbat roșu"
- 
- #: ../sheets/ciscomisc.sheet.in.h:23
--msgid "Man"
--msgstr "Bărbat"
-+msgid "Man gold"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:24
- msgid "Man blue"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
-+msgid "Standing Man"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:26
--msgid "Man red"
--msgstr "Bărbat roșu"
-+msgid "Standing woman"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:27
--msgid "Medium Building"
--msgstr ""
-+msgid "Woman"
-+msgstr "Femeie"
- 
- #: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr ""
-+msgid "Woman red"
-+msgstr "Femeie roșie"
- 
- #: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr ""
-+msgid "Woman gold"
-+msgstr "Femeie aurie"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Femeie albastră"
- 
- #: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Forme diverse de la Cisco"
-+msgid "Running man"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:32
--msgid "PC Man"
-+msgid "Running man subdued"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
-+msgid "Telecommuter"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
-+msgid "Running woman"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:35
--msgid "Running man subdued"
-+msgid "CiscoWorks Man"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:36
--msgid "Running woman"
-+msgid "PC Man left"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Satelit"
-+msgid "PC Man"
-+msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
-+msgid "Sitting Woman"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:39
--msgid "Sitting Woman"
-+msgid "Sitting Woman right"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:40
--msgid "Sitting Woman right"
-+msgid "Mac Woman"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:41
--msgid "Small Business"
-+msgid "Androgynous Person"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:43
--msgid "Standing Man"
--msgstr ""
-+msgid "Key"
-+msgstr "Cheie"
- 
- #: ../sheets/ciscomisc.sheet.in.h:44
--msgid "Standing woman"
-+msgid "Lock and Key"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
-+msgid "Satellite dish"
- msgstr ""
- 
- #: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr ""
-+msgid "Satellite"
-+msgstr "Satelit"
- 
- #: ../sheets/ciscomisc.sheet.in.h:47
--msgid "Telecommuter house subdued"
-+msgid "Antenna"
-+msgstr "Antenă"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:49
-+msgid "Car"
- msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:48
-+#: ../sheets/ciscomisc.sheet.in.h:50
- msgid "Truck"
- msgstr "Camion"
- 
--#: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Universitate"
--
--#: ../sheets/ciscomisc.sheet.in.h:50
-+#: ../sheets/ciscomisc.sheet.in.h:51
- msgid "Video Camera"
- msgstr "Cameră video"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscomisc.sheet.in.h:52
- msgid "Video Camera right"
- msgstr ""
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
--msgid "Woman"
--msgstr "Femeie"
--
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr "Femeie albastră"
--
- #: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr "Femeie aurie"
--
--#: ../sheets/ciscomisc.sheet.in.h:55
--msgid "Woman red"
--msgstr "Femeie roșie"
-+msgid "Headphones"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr ""
-+msgid "Cisco - Network"
-+msgstr "Rețea Cisco"
- 
- #: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr ""
-+msgid "Network shapes by Cisco"
-+msgstr "Forme de rețea de la Cisco"
- 
- #: ../sheets/cisconetwork.sheet.in.h:3
--msgid "15800"
-+msgid "Network Management"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr ""
-+msgid "Detector"
-+msgstr "Detector"
- 
- #: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
-+msgid "Protocol Translator"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:6
--msgid "Access Server"
--msgstr "Server de acces"
-+msgid "IP"
-+msgstr "IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
-+msgid "IP Old-style"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
--msgstr ""
-+msgid "NAT"
-+msgstr "NAT"
- 
- #: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
-+msgid "VIP"
-+msgstr "VIP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "Media BBFW"
-+msgid "Terminal Server"
-+msgstr "Server de terminal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
--msgstr ""
-+msgid "Access Server"
-+msgstr "Server de acces"
- 
- #: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Punte"
-+msgid "System controller"
-+msgstr "Controler de sistem"
- 
- #: ../sheets/cisconetwork.sheet.in.h:13
--msgid "CDDI/FDDI Concentrator"
-+msgid "Directory Server"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:14
--msgid "CDM Content Distribution Manager"
--msgstr ""
-+msgid "Firewall"
-+msgstr "Paravan de protecție"
- 
- #: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr ""
-+msgid "Firewall subdued"
-+msgstr "Paravan de protecție atenuat"
- 
- #: ../sheets/cisconetwork.sheet.in.h:16
--msgid "Cable Modem"
--msgstr "Modem de cablu"
-+msgid "Firewall horizontal"
-+msgstr "Firewall orizontal"
- 
- #: ../sheets/cisconetwork.sheet.in.h:17
--msgid "Catalyst Access Gateway"
--msgstr ""
-+msgid "Firewall Service Module"
-+msgstr "Modul de serviciu al paravanului de protecție"
- 
- #: ../sheets/cisconetwork.sheet.in.h:18
--msgid "Centri Firewall"
--msgstr "Firewall Centri"
-+msgid "IOS Firewall"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:19
--msgid "Channelized Pipe"
--msgstr ""
-+msgid "PIX Firewall"
-+msgstr "Firewall PIX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Rețea Cisco"
-+msgid "PIX Firewall Left"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Nor"
--
--#: ../sheets/cisconetwork.sheet.in.h:22
--msgid "Cloud Dark"
--msgstr "Nor întunecat"
-+msgid "Centri Firewall"
-+msgstr "Firewall Centri"
- 
- #: ../sheets/cisconetwork.sheet.in.h:23
--msgid "Cloud Gold"
-+msgid "Security appliance"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:24
--msgid "Cloud White"
--msgstr ""
-+msgid "VPN Concentrator"
-+msgstr "Concentrator VPN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
--msgstr ""
-+msgid "VPN Gateway"
-+msgstr "Gateway VPN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:26
--msgid "Content Engine (Cache Director)"
-+msgid "LAN to LAN"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:27
--msgid "Content Transformation Engine (CTE)"
--msgstr ""
-+msgid "SSL Terminator"
-+msgstr "Terminator SSL"
- 
- #: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr ""
-+msgid "IP DSL Switch"
-+msgstr "Switch DSL IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:29
--msgid "DWDM Filter"
-+msgid "DSLAM"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:30
--msgid "Detector"
--msgstr "Detector"
-+msgid "Cable Modem"
-+msgstr "Modem de cablu"
- 
- #: ../sheets/cisconetwork.sheet.in.h:31
--msgid "Digital Cross-Connect"
--msgstr ""
-+msgid "Wireless Connectivity"
-+msgstr "Conectivitate fără fir"
- 
--#: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr ""
-+#: ../sheets/cisconetwork.sheet.in.h:32
-+msgid "Wireless Transport"
-+msgstr "Transport fără fir"
- 
- #: ../sheets/cisconetwork.sheet.in.h:33
--msgid "Distributed Director"
-+msgid "AccessPoint"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:34
--msgid "Dual Mode AccessPoint"
--msgstr ""
-+msgid "Wireless Bridge"
-+msgstr "Punte fără fir"
- 
- #: ../sheets/cisconetwork.sheet.in.h:35
--msgid "FDDI Ring"
-+msgid "Dual Mode AccessPoint"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:36
--msgid "File Engine"
-+msgid "Wi-Fi Tag"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
-+msgid "Wireless Location Appliance"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:38
--msgid "Firewall Service Module"
-+msgid "Location server"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:39
--msgid "Firewall horizontal"
--msgstr "Firewall orizontal"
-+msgid "Lightweight AP"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:40
--msgid "Firewall subdued"
--msgstr ""
-+msgid "WLAN controller"
-+msgstr "Controler WLAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
--msgstr ""
-+msgid "BBFW"
-+msgstr "BBFW"
- 
- #: ../sheets/cisconetwork.sheet.in.h:42
--msgid "Generic Gateway"
-+msgid "BBFW media"
-+msgstr "Media BBFW"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:44
--msgid "IOS Firewall"
-+msgid "Concatenated Payload"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:45
--msgid "IOS SLB"
-+msgid "Optical Cross-Connect"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
-+msgid "Optical Transport"
-+msgstr "Transport optic"
- 
- #: ../sheets/cisconetwork.sheet.in.h:47
--msgid "IP DSL Switch"
--msgstr "Switch DSL IP"
-+msgid "Optical Fiber"
-+msgstr "Fibră optică"
- 
- #: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
--msgstr ""
-+msgid "Optical Amplifier"
-+msgstr "Amplificator optic"
- 
- #: ../sheets/cisconetwork.sheet.in.h:49
--msgid "IP Transport Concentrator"
-+msgid "Digital Cross-Connect"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
-+msgid "IP Transport Concentrator"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
-+msgid "DWDM Filter"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr ""
-+msgid "WDM"
-+msgstr "WDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
-+msgid "15200"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "Director local"
-+msgid "15800"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:55
--msgid "Location server"
--msgstr ""
-+msgid "ONS15104"
-+msgstr "ONS15104"
- 
- #: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
-+msgid "10700"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:57
--msgid "MAS Gateway"
--msgstr ""
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
- 
- #: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
-+msgid "ONS15540"
-+msgstr "ONS15540"
- 
- #: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME 1100"
-+msgid "Automatic Protection Switching"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
-+msgid "RPS"
-+msgstr "RPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
-+msgid "UPS"
-+msgstr "UPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:62
--msgid "NAT"
--msgstr "NAT"
-+msgid "LongReach CPE"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:63
--msgid "Network Management"
-+msgid "3X74 (floor) cluster controller"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Forme de rețea de la Cisco"
-+msgid "3174 (desktop) cluster controller"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
--msgstr "ONS15104"
-+msgid "CSU/DSU"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
--msgstr "ONS15540"
-+msgid "WAN"
-+msgstr "WAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:67
--msgid "Optical Amplifier"
--msgstr "Amplificator optic"
-+msgid "Cloud"
-+msgstr "Nor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:68
--msgid "Optical Cross-Connect"
-+msgid "Cloud Gold"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:69
--msgid "Optical Fiber"
--msgstr "Fibră optică"
-+msgid "Cloud White"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:70
--msgid "Optical Transport"
--msgstr "Transport optic"
-+msgid "Cloud Dark"
-+msgstr "Nor întunecat"
- 
- #: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
-+msgid "Distributed Director"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:72
--msgid "PIX Firewall"
--msgstr "Firewall PIX"
-+msgid "LocalDirector"
-+msgstr "Director local"
- 
- #: ../sheets/cisconetwork.sheet.in.h:73
--msgid "PIX Firewall Left"
-+msgid "IOS SLB"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:74
--msgid "Protocol Translator"
--msgstr ""
-+msgid "MUX"
-+msgstr "MUX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
-+msgid "General Appliance"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr ""
-+msgid "PAD"
-+msgstr "PAD"
- 
- #: ../sheets/cisconetwork.sheet.in.h:77
--msgid "SSL Terminator"
--msgstr "Terminator SSL"
-+msgid "CDDI/FDDI Concentrator"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr "STB (set top box)"
-+msgid "FDDI Ring"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:79
--msgid "Security appliance"
--msgstr ""
-+msgid "TokenRing"
-+msgstr "TokenRing"
- 
- #: ../sheets/cisconetwork.sheet.in.h:80
--msgid "Service Control"
--msgstr "Control de servicii"
-+msgid "MAU"
-+msgstr "MAU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:81
--msgid "Storage Solution Engine"
-+msgid "Repeater"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:82
--msgid "System controller"
--msgstr "Controler de sistem"
-+msgid "Bridge"
-+msgstr "Punte"
- 
- #: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "TV"
-+msgid "Breakout box"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:84
--msgid "Terminal Server"
--msgstr "Server de terminal"
-+msgid "STB (set top box)"
-+msgstr "STB (set top box)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "TokenRing"
-+msgid "TV"
-+msgstr "TV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:86
--msgid "TransPath"
-+msgid "IPTV broadcast server"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "UPS"
-+msgid "IPTV content manager"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
- msgid "VN2900"
- msgstr "VN2900"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "VN5902"
-+
- #: ../sheets/cisconetwork.sheet.in.h:90
- msgid "VN5900"
- msgstr "VN5900"
- 
- #: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr "VN5902"
-+msgid "Catalyst Access Gateway"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:92
--msgid "VPN Concentrator"
--msgstr "Concentrator VPN"
-+msgid "Generic Gateway"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:93
--msgid "VPN Gateway"
--msgstr "Gateway VPN"
-+msgid "TransPath"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:94
--msgid "WAN"
--msgstr "WAN"
-+msgid "uBR910 Cable DSU"
-+msgstr "DSU de cablu uBR910"
- 
- #: ../sheets/cisconetwork.sheet.in.h:95
--msgid "WDM"
--msgstr "WDM"
-+msgid "Storage Solution Engine"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:96
--msgid "WLAN controller"
--msgstr "Controler WLAN"
-+msgid "Content Engine (Cache Director)"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
-+msgid "CDM Content Distribution Manager"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:98
--msgid "Wireless Bridge"
--msgstr "Punte fără fir"
-+msgid "Content Transformation Engine (CTE)"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr "Conectivitate fără fir"
-+msgid "ME 1100"
-+msgstr "ME 1100"
- 
- #: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
-+msgid "MAS Gateway"
- msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:101
--msgid "Wireless Transport"
--msgstr "Transport fără fir"
-+msgid "File Engine"
-+msgstr ""
- 
- #: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr "DSU de cablu uBR910"
-+msgid "Service Control"
-+msgstr "Control de servicii"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
-+msgid "Cisco - Telephony"
-+msgstr "Telefonie Cisco"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:2
--msgid "6705"
--msgstr "6705"
-+msgid "Telephony shapes by Cisco"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr "6732"
-+msgid "Phone"
-+msgstr "Telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
-+msgid "Phone 2"
-+msgstr "Telefon 2"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
-+msgid "Phone Ethernet"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
-+msgid "Phone Appliance"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
-+msgid "Phone Feature"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:8
--msgid "Cellular Phone"
-+msgid "Phone/Fax"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:9
--msgid "Cisco - Telephony"
--msgstr "Telefonie Cisco"
-+msgid "HootPhone"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr ""
-+msgid "IP Phone"
-+msgstr "Telefon IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:11
--msgid "End Office"
--msgstr ""
-+msgid "IP Softphone"
-+msgstr "Telefon soft IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
-+msgid "Softphone"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
-+msgid "Cellular Phone"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
-+msgid "Mobile Access IP Phone"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
-+msgid "Pager"
-+msgstr "Pager"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
-+msgid "Fax"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "Ruter IAD"
-+msgid "Turret"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
-+msgid "Octel"
-+msgstr "Octel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
-+msgid "Radio Tower"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:20
--msgid "IP Phone"
--msgstr "Telefon IP"
-+msgid "PBX"
-+msgstr "PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "Telefon soft IP"
-+msgid "PBX Switch"
-+msgstr "Switch PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:22
--msgid "IP Telephony Router"
--msgstr "Ruter de telefonie IP"
-+msgid "Class 4/5 switch"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
-+msgid "SONET MUX"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr ""
-+msgid "ADM"
-+msgstr "ADM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:25
--msgid "MCU"
--msgstr ""
-+msgid "ITP"
-+msgstr "ITP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr ""
-+msgid "ATA"
-+msgstr "ATA"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
-+msgid "SIP Proxy Server"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:28
--msgid "Mobile Access IP Phone"
-+msgid "Gatekeeper"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:29
--msgid "Mobile Access Router"
--msgstr "Ruter de acces mobil"
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr "Octel"
-+msgid "End Office"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "PBX"
-+msgid "Voice-Enabled Access Server"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:32
--msgid "PBX Switch"
--msgstr "Switch PBX"
-+msgid "Voice-Enabled Router"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:33
--msgid "Pager"
--msgstr "Pager"
-+msgid "Voice-Enabled ATM Switch"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Telefon"
-+msgid "CallManager"
-+msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:35
--msgid "Phone 2"
--msgstr "Telefon 2"
-+msgid "IP Telephony Router"
-+msgstr "Ruter de telefonie IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr ""
-+msgid "Mobile Access Router"
-+msgstr "Ruter de acces mobil"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:37
--msgid "Phone Ethernet"
--msgstr ""
-+msgid "H.323"
-+msgstr "H.323"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:38
--msgid "Phone Feature"
-+msgid "STP"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr ""
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:40
--msgid "Radio Tower"
-+msgid "Generic softswitch"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:41
--msgid "SC2200 (Signalling Controller)"
-+msgid "SC2200/VSC3000 host"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:42
--msgid "SC2200/VSC3000 host"
-+msgid "Virtual switch controller (VSC 3000)"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:43
--msgid "SIP Proxy Server"
-+msgid "SC2200 (Signalling Controller)"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
-+msgid "MoH server (Music on Hold)"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
-+msgid "TDM router"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr ""
-+msgid "6701"
-+msgstr "6701"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr ""
-+msgid "6705"
-+msgstr "6705"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:48
--msgid "Telephony shapes by Cisco"
--msgstr ""
-+msgid "6732"
-+msgstr "6732"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr ""
-+msgid "IAD router"
-+msgstr "Ruter IAD"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:50
--msgid "Unity Express"
--msgstr ""
-+msgid "ICS"
-+msgstr "ICS"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr ""
-+msgid "ICM"
-+msgstr "ICM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
-+msgid "IntelliSwitch Stack"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:53
--msgid "Voice-Enabled ATM Switch"
-+msgid "Unity server"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:54
--msgid "Voice-Enabled Access Server"
-+msgid "Unity Express"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:55
--msgid "Voice-Enabled Router"
-+msgid "MCU"
- msgstr ""
- 
- #: ../sheets/ciscotelephony.sheet.in.h:56
-@@ -10105,361 +10139,361 @@ msgid "uMG series"
- msgstr ""
- 
- #: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr ""
-+msgid "Civil"
-+msgstr "Civil"
- 
- #: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr ""
-+msgid "Civil Engineering Components"
-+msgstr "Componente de inginerie civilă"
- 
- #: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Bazin"
-+msgid "Vertical rest"
-+msgstr "Refugiu vertical"
- 
- #: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Refugiu vertical bivalent"
-+msgid "Horizontal rest"
-+msgstr "Refugiu orizontal"
- 
- #: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Civil"
-+msgid "Bivalent vertical rest"
-+msgstr "Refugiu vertical bivalent"
- 
- #: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Componente de inginerie civilă"
-+msgid "Reference line"
-+msgstr "Linie de referință"
- 
- #: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Container"
-+msgid "Water level"
-+msgstr "Nivel de apă"
- 
- #: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Bazin de finalizare"
-+msgid "Soil"
-+msgstr "Sol"
- 
- #: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Convertor de frecvență"
-+msgid "Horizontally aligned arrow"
-+msgstr "Săgeată aliniată orizontal"
- 
- #: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Butelie cu gaz"
-+msgid "Vertically aligned arrow"
-+msgstr "Săgeată aliniată vertical"
- 
- #: ../sheets/civil.sheet.in.h:11
- msgid "Horizontal limiting line"
- msgstr "Linie limitatoare orizontală"
- 
- #: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Refugiu orizontal"
-+msgid "Vertical limiting line"
-+msgstr "Linie limitatoare verticală"
- 
- #: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Săgeată aliniată orizontal"
-+msgid "Horizontally aligned pump"
-+msgstr "Pompă aliniată orizontal"
- 
- #: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Compresor aliniat orizontal"
-+msgid "Vertically aligned pump"
-+msgstr "Pompă aliniată vertical"
- 
- #: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Pompă aliniată orizontal"
-+msgid "Horizontally aligned compressor"
-+msgstr "Compresor aliniat orizontal"
- 
- #: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Valvă aliniată orizontal"
-+msgid "Vertically aligned compressor"
-+msgstr "Compresor aliniat vertical"
- 
- #: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Motor"
-+msgid "Vertically aligned valve"
-+msgstr "Valvă aliniată vertical"
- 
- #: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Rezervor de limpezire preliminar"
-+msgid "Horizontally aligned valve"
-+msgstr "Valvă aliniată orizontal"
- 
- #: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Linie de referință"
-+msgid "Backflow preventer"
-+msgstr ""
- 
- #: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Rotor"
-+msgid "Motor"
-+msgstr "Motor"
- 
- #: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Sol"
-+msgid "Gas bottle"
-+msgstr "Butelie cu gaz"
- 
- #: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "Linie limitatoare verticală"
-+msgid "Frequency converter"
-+msgstr "Convertor de frecvență"
- 
- #: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "Refugiu vertical"
-+msgid "Vertically aligned propeller"
-+msgstr "Propulsor aliniat vertical"
- 
- #: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "Săgeată aliniată vertical"
-+msgid "Aerator with bubbles"
-+msgstr ""
- 
- #: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "Compresor aliniat vertical"
-+msgid "Rotor"
-+msgstr "Rotor"
- 
- #: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "Propulsor aliniat vertical"
-+msgid "Final-settling basin"
-+msgstr "Bazin de finalizare"
- 
- #: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "Pompă aliniată vertical"
-+msgid "Preliminary clarification tank"
-+msgstr "Rezervor de limpezire preliminar"
- 
- #: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "Valvă aliniată vertical"
-+msgid "Basin"
-+msgstr "Bazin"
- 
- #: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "Nivel de apă"
-+msgid "Container"
-+msgstr "Container"
- 
- #: ../sheets/jigsaw.sheet.in.h:1
- msgid "Jigsaw"
- msgstr "Puzzle"
- 
- #: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Puzzle - partea_iiii"
-+msgid "Pieces of a jigsaw"
-+msgstr "Piese ale unui puzzle"
- 
- #: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Puzzle - partea_iiio"
-+msgid "Jigsaw - part_oioi"
-+msgstr "Puzzle - partea_oioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Puzzle - partea_iioi"
-+msgid "Jigsaw - part_ioio"
-+msgstr "Puzzle - partea_ioio"
- 
- #: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Puzzle - partea_iioo"
-+msgid "Jigsaw - part_iiii"
-+msgstr "Puzzle - partea_iiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Puzzle - partea_ioii"
-+msgid "Jigsaw - part_oooo"
-+msgstr "Puzzle - partea_oooo"
- 
- #: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Puzzle - partea_ioio"
-+msgid "Jigsaw - part_oooi"
-+msgstr "Puzzle - partea_oooi"
- 
- #: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Puzzle - partea_iooi"
--
--#: ../sheets/jigsaw.sheet.in.h:9
- msgid "Jigsaw - part_iooo"
- msgstr "Puzzle - partea_iooo"
- 
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Puzzle - partea_oioo"
-+
- #: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Puzzle - partea_oiii"
-+msgid "Jigsaw - part_ooio"
-+msgstr "Puzzle - partea_ooio"
- 
- #: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Puzzle - partea_oiio"
-+msgid "Jigsaw - part_iioo"
-+msgstr "Puzzle - partea_iioo"
- 
- #: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Puzzle - partea_oioi"
-+msgid "Jigsaw - part_oiio"
-+msgstr "Puzzle - partea_oiio"
- 
- #: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Puzzle - partea_oioo"
--
--#: ../sheets/jigsaw.sheet.in.h:14
- msgid "Jigsaw - part_ooii"
- msgstr "Puzzle - partea_ooii"
- 
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Puzzle - partea_iooi"
-+
- #: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Puzzle - partea_ooio"
-+msgid "Jigsaw - part_oiii"
-+msgstr "Puzzle - partea_oiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Puzzle - partea_oooi"
-+msgid "Jigsaw - part_ioii"
-+msgstr "Puzzle - partea_ioii"
- 
- #: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Puzzle - partea_oooo"
-+msgid "Jigsaw - part_iioi"
-+msgstr "Puzzle - partea_iioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Piese ale unui puzzle"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr ""
-+msgid "Jigsaw - part_iiio"
-+msgstr "Puzzle - partea_iiio"
- 
- #: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "Dischetă de 3 1/2 țoli"
-+msgid "Objects to design network diagrams with"
-+msgstr "Obiecte pentru desenarea diagramelor de rețea"
- 
- #: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "Simbol de switch ATM"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "Antenă pentru transmisie fără fir"
-+msgid "Computer"
-+msgstr "Calculator"
- 
- #: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "PC tip turn înalt"
-+msgid "Storage"
-+msgstr "Stocare"
- 
- #: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Calculator"
-+msgid "Ethernet bus"
-+msgstr "Magistrală Ethernet"
- 
- #: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "PC tip desktop"
-+msgid "Simple printer"
-+msgstr "Imprimantă simplă"
- 
- #: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Tabletă digitizoare"
-+msgid "WAN connection"
-+msgstr "Conexiune WAN"
- 
- #: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Magistrală Ethernet"
-+msgid "WAN link"
-+msgstr "Legătură WAN"
- 
- #: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Unitate DAT externă"
-+msgid "Stackable hub or switch"
-+msgstr "Hub sau switch stivuibil"
- 
- #: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Ruter firewall"
-+msgid "Modular switching system"
-+msgstr "Sistem modular de comutare"
- 
- #: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "PC tip laptop"
-+msgid "24 Port Patch Panel"
-+msgstr ""
- 
- #: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "PC tip turn mediu"
-+msgid "RJ45 wall-plug"
-+msgstr "Priză de perete RJ45"
- 
- #: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "PC tip turn mic"
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Priză de perete pentru sistemul de cablare scEAD"
- 
- #: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Telefon mobil"
-+msgid "Simple modem"
-+msgstr "Modem simplu"
- 
- #: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antenă pentru transmisie fără fir"
-+
-+#: ../sheets/network.sheet.in.h:17
- msgid "Mobile telephony base station"
- msgstr "Stație de bază pentru telefonie mobilă"
- 
--#: ../sheets/network.sheet.in.h:17
-+#: ../sheets/network.sheet.in.h:19
- msgid "Mobile telephony cell"
- msgstr "Celulă de telefonie mobilă"
- 
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Sistem modular de comutare"
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Simbol de ruter"
-+
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Simbol de switch"
- 
- #: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Obiecte pentru desenarea diagramelor de rețea"
-+msgid "ATM switch symbol"
-+msgstr "Simbol de switch ATM"
- 
- #: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Ploter"
-+msgid "Firewall router"
-+msgstr "Ruter firewall"
- 
- #: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "Priză de perete RJ45"
-+msgid "Workstation monitor"
-+msgstr "Monitor de stație de lucru"
- 
- #: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Simbol de ruter"
-+msgid "UNIX workstation"
-+msgstr "Stație de lucru UNIX"
- 
- #: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Modem simplu"
-+msgid "Desktop PC"
-+msgstr "PC tip desktop"
- 
- #: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Imprimantă simplă"
-+msgid "Laptop PC"
-+msgstr "PC tip laptop"
- 
- #: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Difuzor cu amplificator integrat"
-+msgid "Bigtower PC"
-+msgstr "PC tip turn înalt"
- 
- #: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Difuzor fără amplificator"
-+msgid "Miditower PC"
-+msgstr "PC tip turn mediu"
- 
- #: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Hub sau switch stivuibil"
-+msgid "Minitower PC"
-+msgstr "PC tip turn mic"
- 
- #: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Stocare"
-+msgid "Speaker with integrated amplifier"
-+msgstr "Difuzor cu amplificator integrat"
- 
- #: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Simbol de switch"
-+msgid "Speaker without amplifier"
-+msgstr "Difuzor fără amplificator"
-+
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "Dischetă de 3 1/2 țoli"
- 
- #: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "Stație de lucru UNIX"
-+msgid "ZIP disk"
-+msgstr "Disc ZIP"
- 
- #: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "Conexiune WAN"
-+msgid "External DAT drive"
-+msgstr "Unitate DAT externă"
- 
- #: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "Legătură WAN"
--
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Priză de perete pentru sistemul de cablare scEAD"
-+msgid "Mobile phone"
-+msgstr "Telefon mobil"
- 
- #: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Monitor de stație de lucru"
-+msgid "Plotter"
-+msgstr "Ploter"
- 
- #: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "Disc ZIP"
-+msgid "Digitizing board"
-+msgstr "Tabletă digitizoare"
- 
- #: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr ""
-+msgid "Sybase"
-+msgstr "Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:2
- msgid "Objects to design Sybase replication domain diagrams with"
- msgstr "Obiecte pentru desenarea diagramelor de domeniu de replicare Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Gestionar de server de replicare"
-+msgid "Sybase dataserver"
-+msgstr "Server de date Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Dispozitiv de stocare stabil"
-+msgid "Sybase replication server"
-+msgstr "Server de replicare Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+msgid "Log transfer manager or rep agent"
-+msgstr ""
- 
- #: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Aplicație client Sybase"
-+msgid "Stable storage device"
-+msgstr "Dispozitiv de stocare stabil"
- 
- #: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Server de date Sybase"
-+msgid "Sybase client application"
-+msgstr "Aplicație client Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Server de replicare Sybase"
-+msgid "Replication server manager"
-+msgstr "Gestionar de server de replicare"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0011-Added-Serbian-translation.patch b/graphics/dia/patches/0011-Added-Serbian-translation.patch
deleted file mode 100644
index d3fbcf5557..0000000000
--- a/graphics/dia/patches/0011-Added-Serbian-translation.patch
+++ /dev/null
@@ -1,26299 +0,0 @@
-From c629ea6063bad6ad427caafae2f863603b37cf6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?=
- =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
- <miroslavnikolic@rocketmail.com>
-Date: Tue, 9 Apr 2013 21:19:36 +0200
-Subject: [PATCH 11/24] Added Serbian translation
-
----
- po/LINGUAS     |     1 +
- po/sr.po       | 11030 +++++++++++++++++++++++++++++--------------------------
- po/sr@latin.po | 10579 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 16416 insertions(+), 5194 deletions(-)
- create mode 100644 po/sr@latin.po
-
-diff --git a/po/LINGUAS b/po/LINGUAS
-index b3df8e4..d3b96d7 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -56,6 +56,7 @@ sk
- sl
- sq
- sr
-+sr@latin
- sr@Latn
- sv
- ta
-diff --git a/po/sr.po b/po/sr.po
-index 4f965dc..57f3a06 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -1,278 +1,311 @@
- # Serbian translation of dia
--# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005.
--#
-+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
- # This file is distributed under the same license as the dia package.
--#
- # Maintainer: Дејан Матијевић <dmax@neobee.net>
- # Reviewed on 2004-03-24 by: Данило Шеган <danilo@prevod.org>
--#
-+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2012, 2013.
- msgid ""
- msgstr ""
- "Project-Id-Version: dia\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-01-28 12:03+0100\n"
--"PO-Revision-Date: 2005-12-28 06:26+0100\n"
--"Last-Translator: Слободан Д. Средојевић <ssl@uns.ns.ac.yu>\n"
--"Language-Team: Serbian (sr) <gnom@prevod.org>\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dia&ke"
-+"ywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2013-02-10 17:29+0000\n"
-+"PO-Revision-Date: 2013-04-09 21:10+0200\n"
-+"Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
-+"Language-Team: Serbian <gnom@prevod.org>\n"
-+"Language: sr\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-+"X-Project-Style: gnome\n"
- 
- #. This is not an errror
--#: ../app/app_procs.c:260
-+#: ../app/app_procs.c:209
- #, c-format
- msgid "Warning: invalid layer range %lu - %lu\n"
--msgstr "Упозорење: неи�правни оп�ег �лоја %lu - %lu\n"
-+msgstr "Упозорење: неи�правни оп�ег �лоја %lu — %lu\n"
- 
--#: ../app/app_procs.c:272
-+#: ../app/app_procs.c:221
- #, c-format
- msgid "Warning: Layer %lu (%s) selected more than once.\n"
--msgstr "Упозорење: Слој %lu (%s) је означен више од једног пута.\n"
-+msgstr "Упозорење: Слој %lu (%s) је изабран више од једном.\n"
- 
--#: ../app/app_procs.c:298
-+#: ../app/app_procs.c:247
- #, c-format
- msgid "Warning: Layer %d (%s) selected more than once.\n"
--msgstr "Упозорење: Слој %d (%s) је означен више од једног пута.\n"
-+msgstr "Упозорење: Слој %d (%s) је изабран више од једном.\n"
- 
--#: ../app/app_procs.c:307
-+#: ../app/app_procs.c:256
- #, c-format
- msgid "Warning: There is no layer named %s\n"
--msgstr "Упозорење: �е по�тоји �лој по имену %s\n"
-+msgstr "Упозорење: �е по�тоји �лој под називом %s\n"
- 
--#: ../app/app_procs.c:389
-+#: ../app/app_procs.c:338
- #, c-format
- msgid "%s error: don't know how to export into %s\n"
--msgstr "%s грешка: не зна како да извезе у %s\n"
-+msgstr "%s грешка: не знам како да извезем у %s\n"
- 
--#: ../app/app_procs.c:398
-+#: ../app/app_procs.c:347
- #, c-format
- msgid "%s error: input and output file name is identical: %s"
--msgstr "%s грешка: улазно и излазно име датотеке �у и�ти: %s"
-+msgstr "%s грешка: називи улазне и излазне датотеке �у и�ти: %s"
- 
--#: ../app/app_procs.c:406
-+#: ../app/app_procs.c:355
- #, c-format
- msgid "%s error: need valid input file %s\n"
--msgstr "%s грашка: треба и�праван улазни тип %s\n"
-+msgstr "%s грашка: потребна је и�правна улазна датотека %s\n"
- 
- #. if (!quiet)
--#: ../app/app_procs.c:431
-+#: ../app/app_procs.c:383
- #, c-format
- msgid "%s --> %s\n"
--msgstr "%s —> %s\n"
-+msgstr "%s ——> %s\n"
- 
--#: ../app/app_procs.c:577
--#, fuzzy, c-format
-+#: ../app/app_procs.c:558
-+#, c-format
- msgid "Can't find output format/filter %s\n"
--msgstr "�е могу да нађем вр�ту излаза %s\n"
-+msgstr "�е могу да нађем излазни облик/филтер %s\n"
-+
-+#: ../app/app_procs.c:628
-+#, c-format
-+msgid "Input-directory '%s' must exist!\n"
-+msgstr "Улазни директоријум „%s“ мора да по�тоји!\n"
-+
-+#: ../app/app_procs.c:645
-+#, c-format
-+msgid "Output-directory '%s' must exist!\n"
-+msgstr "Излазни директоријум „%s“ мора да по�тоји!\n"
- 
- #. Translators:  The argument is a list of options, not to be translated
--#: ../app/app_procs.c:669
-+#: ../app/app_procs.c:702
- #, c-format
- msgid "Select the filter/format out of: %s"
--msgstr ""
-+msgstr "Изаберите филтер/облик из �ледећих: %s"
- 
- #. &export_file_name
--#: ../app/app_procs.c:688 ../app/app_procs.c:715
-+#: ../app/app_procs.c:720
- msgid "Export loaded file and exit"
--msgstr "Извези учитану датотеку и изађи"
-+msgstr "Извози учитану датотеку и излази"
- 
--#: ../app/app_procs.c:688 ../app/app_procs.c:715 ../app/diaconv.c:94
-+#: ../app/app_procs.c:720
- msgid "OUTPUT"
- msgstr "ИЗЛ�З"
- 
- #. &export_file_format
- #. &export_format_string
--#. &export_file_format
--#: ../app/app_procs.c:690 ../app/app_procs.c:717
-+#: ../app/app_procs.c:722
- msgid "TYPE"
--msgstr ""
-+msgstr "ВРСТ�"
- 
--#: ../app/app_procs.c:692 ../app/app_procs.c:720
-+#: ../app/app_procs.c:724
- msgid "Export graphics size"
--msgstr "Величина извозне �лике"
-+msgstr "Величина извеженог графика"
- 
--#: ../app/app_procs.c:692 ../app/app_procs.c:720
-+#: ../app/app_procs.c:724
- msgid "WxH"
- msgstr "ШxВ"
- 
--#. 13.3.2004 sampo@iki.fi
--#: ../app/app_procs.c:694 ../app/app_procs.c:722
-+#: ../app/app_procs.c:726
- msgid ""
- "Show only specified layers (e.g. when exporting). Can be either the layer "
- "name or a range of layer numbers (X-Y)"
- msgstr ""
-+"Приказује �амоназначене �лојеве (нпр. приликом извожења). Може бити било "
-+"назив �лоја или оп�ег бројева �лоја (X-Y)"
- 
--#: ../app/app_procs.c:695 ../app/app_procs.c:723
-+#: ../app/app_procs.c:727
- msgid "LAYER,LAYER,..."
--msgstr ""
-+msgstr "СЛОЈ,СЛОЈ,..."
- 
--#: ../app/app_procs.c:697 ../app/app_procs.c:725
-+#: ../app/app_procs.c:729
- msgid "Don't show the splash screen"
--msgstr "�е приказуј на�ловни екран"
-+msgstr "�е приказује поздравни екран"
- 
--#: ../app/app_procs.c:699 ../app/app_procs.c:727
-+#: ../app/app_procs.c:731
- msgid "Don't create empty diagram"
--msgstr ""
-+msgstr "�еће правити празан дијаграм"
-+
-+#: ../app/app_procs.c:733
-+msgid "Start integrated user interface (diagrams in tabs)"
-+msgstr "Покреће обједињено кори�ничко �учеље (дијаграми у језичцима)"
- 
--#: ../app/app_procs.c:701 ../app/app_procs.c:729
-+#: ../app/app_procs.c:735
- msgid "Send error messages to stderr instead of showing dialogs."
- msgstr ""
--"Пошаљи поруке о грешкама на �тандардни излаз за грешке уме�то приказивања "
--"прозорчета."
-+"Шаље поруке грешака на �тандардни излаз грешака уме�то да прикаже прозорчиће."
-+
-+#: ../app/app_procs.c:737
-+msgid "Directory containing input files"
-+msgstr "Директоријум који �адржи улазне датотеке"
-+
-+#: ../app/app_procs.c:737 ../app/app_procs.c:739
-+msgid "DIRECTORY"
-+msgstr "ДИРЕКТОРИЈУМ"
- 
--#: ../app/app_procs.c:703 ../app/app_procs.c:731
-+#: ../app/app_procs.c:739
-+msgid "Directory containing output files"
-+msgstr "Директоријум који �адржи излазне датотеке"
-+
-+#: ../app/app_procs.c:741
- msgid "Display credits list and exit"
--msgstr "Прикажи за�луге и изађи"
-+msgstr "Приказује �пи�ак за�луга и излази"
- 
--#: ../app/app_procs.c:705 ../app/app_procs.c:733
-+#: ../app/app_procs.c:743
- msgid "Generate verbose output"
--msgstr ""
-+msgstr "Ствара опширан излаз"
- 
--#: ../app/app_procs.c:707 ../app/app_procs.c:735
-+#: ../app/app_procs.c:745
- msgid "Display version and exit"
--msgstr "Покажи верзију и изађи"
-+msgstr "Приказује број издања и излази"
-+
-+#: ../app/app_procs.c:768
-+msgid "[FILE...]"
-+msgstr "[Д�ТОТЕК�...]"
-+
-+#: ../app/app_procs.c:780
-+#, c-format
-+msgid "Invalid option?"
-+msgstr "�еи�правна опција?"
-+
-+#: ../app/app_procs.c:803
-+#, c-format
-+msgid "Filename conversion failed: %s\n"
-+msgstr "�ије у�пело претварање назива датотеке: %s\n"
- 
--#: ../app/app_procs.c:736 ../app/diaconv.c:95
--msgid "Show this help message"
--msgstr "Прикажи овај помоћни тек�т"
-+#: ../app/app_procs.c:816
-+#, c-format
-+msgid "Missing input: %s\n"
-+msgstr "�едо�таје улаз: %s\n"
- 
--#: ../app/app_procs.c:796
-+#: ../app/app_procs.c:841
- msgid "Can't connect to session manager!\n"
--msgstr "�е може �е повезати �а управником �е�ије!\n"
-+msgstr "�е могу да �е повежем �а управником �е�ије!\n"
- 
- #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
--#: ../app/app_procs.c:836
-+#: ../app/app_procs.c:881
- #, c-format
- msgid "Dia version %s, compiled %s %s\n"
--msgstr "Диа верзија %s, преведена %s %s\n"
-+msgstr "Диа издање %s, преведена %s %s\n"
- 
--#: ../app/app_procs.c:838
-+#: ../app/app_procs.c:883
- #, c-format
- msgid "Dia version %s\n"
--msgstr "Диа верзија %s\n"
-+msgstr "Диа издање %s\n"
- 
--#: ../app/app_procs.c:895 ../app/diaconv.c:201 ../app/diaconv.c:203
--#, fuzzy, c-format
-+#: ../app/app_procs.c:921
- msgid ""
- "Couldn't find standard objects when looking for object-libs; exiting...\n"
--msgstr "�еможе да нађе �тандардане објекте када тражи object-libs, излази...\n"
-+msgstr ""
-+"�е могу да пронађем �тандардане објекте када тражим библиотеке објеката; "
-+"излазим...\n"
- 
--#: ../app/app_procs.c:897
--#, fuzzy, c-format
-+#: ../app/app_procs.c:923
-+#, c-format
- msgid ""
- "Couldn't find standard objects when looking for object-libs in '%s'; "
- "exiting...\n"
--msgstr "�еможе да нађе �тандардане објекте када тражи object-libs, излази...\n"
-+msgstr ""
-+"�е могу да пронађем �тандардане објекте када тражим библиотеке објеката у "
-+"„%s“; излазим...\n"
- 
--#: ../app/app_procs.c:938
--#, fuzzy
-+#: ../app/app_procs.c:990
- msgid "Diagram1.dia"
--msgstr "Дијаграм %d.dia"
-+msgstr "Дијаграм1.dia"
- 
--#: ../app/app_procs.c:978
-+#: ../app/app_procs.c:1025
- msgid ""
- "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
- "describing how you can cause this message to appear.\n"
- msgstr ""
--"Ово није требало да �е де�и. Пријавите грешку на bugzilla.gnome.org\n"
--"опи�ујући �е грешка може изазвати.\n"
-+"Ово није требало да �е де�и.  Пријавите грешку на „bugzilla.gnome.org“\n"
-+"опи�ујући шта �те радили те је дошло до грешке.\n"
-+
-+#: ../app/app_procs.c:1040
-+msgid "Exiting Dia"
-+msgstr "Излазим из Дие"
- 
- #. no standard buttons
--#: ../app/app_procs.c:991
-+#: ../app/app_procs.c:1104
- msgid "Quitting without saving modified diagrams"
--msgstr ""
-+msgstr "Прекидам без чувања измењених дијаграма"
- 
--#: ../app/app_procs.c:993
--#, fuzzy
-+#: ../app/app_procs.c:1106
- msgid ""
- "Modified diagrams exist. Are you sure you want to quit Dia without saving "
- "them?"
- msgstr ""
--"По�тоји промењени дијаграм.\n"
--"Да ли �те �игурни да желите да завршите Диа\n"
--"без претходног �нимања?"
-+"По�тоје измењени дијаграми. Да ли �те �игурни да желите да прекинете Диу без "
-+"њиховог чувања?"
- 
--#: ../app/app_procs.c:997
-+#: ../app/app_procs.c:1110
- msgid "Quit Dia"
- msgstr "Прекини Диу"
- 
--#. This printf seems to prevent a race condition with unrefs.
--#. Yuck.  -Lars
--#: ../app/app_procs.c:1050
--msgid "Thank you for using Dia.\n"
--msgstr "Хвала вам што кори�тите Диу.\n"
--
--#: ../app/app_procs.c:1067 ../app/app_procs.c:1074
-+#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
- msgid "Could not create per-user Dia config directory"
--msgstr "�е могу да направим директоријум �а Диа подешавањима за кори�ника"
-+msgstr "�е могу да направим директоријум подешавања Дие за кори�ника"
- 
--#: ../app/app_procs.c:1077
-+#: ../app/app_procs.c:1189
- msgid ""
- "Could not create per-user Dia config directory. Please make sure that the "
- "environment variable HOME points to an existing directory."
- msgstr ""
--"�е могу да направим директоријум �а Диа подешавањима за кори�ника. Проверите "
--"да ли променљива окружења HOME показује на по�тојећи директоријум."
-+"�е могу да направим директоријум подешавања Дие за кори�ника. Проверите да "
-+"ли променљива окружења „HOME“ указује на по�тојећи директоријум."
- 
--#: ../app/app_procs.c:1100 ../app/diaconv.c:251
-+#: ../app/app_procs.c:1212
- msgid "Objects and filters internal to dia"
--msgstr "Објекти и филтери интерни за диу"
--
--#: ../app/app_procs.c:1142 ../app/diaconv.c:121
--msgid "[OPTION...] [FILE...]"
--msgstr "[ОПЦИЈ�...] [Д�ТОТЕК�...]"
--
--#: ../app/app_procs.c:1145 ../app/diaconv.c:128
--#, c-format
--msgid ""
--"Error on option %s: %s.\n"
--"Run '%s --help' to see a full list of available command line options.\n"
--msgstr ""
--"Грешка у опцији %s: %s.\n"
--"Покрените '%s --help' да би�те видели целу ли�ту до�тупних опција командне "
--"линије.\n"
--
--#: ../app/app_procs.c:1169
--msgid "[FILE...]"
--msgstr "[Д�ТОТЕК�...]"
-+msgstr "Објекти и филтери унутрашњи за Диу"
- 
--#: ../app/app_procs.c:1192
-+#: ../app/app_procs.c:1268
- #, c-format
--msgid "'%s' not found!\n"
--msgstr ""
--
--#: ../app/app_procs.c:1273
- msgid ""
- "The original author of Dia was:\n"
- "\n"
- msgstr ""
-+"Оригинални аутор Дие је био:\n"
-+"\n"
- 
--#: ../app/app_procs.c:1278
-+#: ../app/app_procs.c:1273
-+#, c-format
- msgid ""
- "\n"
- "The current maintainers of Dia are:\n"
- "\n"
- msgstr ""
-+"\n"
-+"Садшњи одржаваоци Дие �у:\n"
-+"\n"
- 
--#: ../app/app_procs.c:1283
-+#: ../app/app_procs.c:1278
-+#, c-format
- msgid ""
- "\n"
- "Other authors are:\n"
- "\n"
- msgstr ""
-+"\n"
-+"О�тали аутори �у:\n"
-+"\n"
- 
--#: ../app/app_procs.c:1288
-+#: ../app/app_procs.c:1283
-+#, c-format
- msgid ""
- "\n"
- "Dia is documented by:\n"
- "\n"
- msgstr ""
-+"\n"
-+"Документацију �у напи�али:\n"
-+"\n"
- 
--#: ../app/autosave.c:91
-+#: ../app/autosave.c:90
- msgid "Recovering autosaved diagrams"
- msgstr "Опоравити аутомат�ки �нимљене дијаграме"
- 
--#: ../app/autosave.c:99
-+#: ../app/autosave.c:98
- msgid ""
- "Autosaved files exist.\n"
- "Please select those you wish to recover."
-@@ -280,37 +313,41 @@ msgstr ""
- "По�тоје �амозапамћене датотеке.\n"
- "Молим изаберите оне које желите да вратите."
- 
--#: ../app/color_area.c:317 ../app/color_area.c:364
-+#: ../app/color_area.c:317 ../app/color_area.c:360
- msgid "Select foreground color"
--msgstr "Одаберите боја тек�та"
-+msgstr "Изаберите боју првог плана"
- 
--#: ../app/color_area.c:318 ../app/color_area.c:365
-+#: ../app/color_area.c:318 ../app/color_area.c:361
- msgid "Select background color"
- msgstr "Изаберите боју позадине"
- 
--#: ../app/commands.c:134
-+#: ../app/commands.c:130
-+msgid "No print plug-in found!"
-+msgstr "�ије пронађен прикључак за штампање!"
-+
-+#: ../app/commands.c:150
- #, c-format
- msgid "Diagram%d.dia"
- msgstr "Дијаграм %d.dia"
- 
--#: ../app/commands.c:207
-+#: ../app/commands.c:344
- msgid "No existing object to paste.\n"
--msgstr "�ема по�тојечег објекта за убацивање.\n"
-+msgstr "�е по�тоји објекат за убацивање.\n"
- 
--#: ../app/commands.c:538 ../app/commands.c:576
-+#: ../app/commands.c:653 ../app/commands.c:691
- msgid "Could not find help directory"
--msgstr "�е могу да пронађем директоријум за помоћ"
-+msgstr "�е могу да пронађем директоријум помоћи"
- 
--#: ../app/commands.c:545
-+#: ../app/commands.c:660
- #, c-format
- msgid ""
- "Could not open help directory:\n"
- "%s"
- msgstr ""
--"�е могу да отворим директоријум за помоћ:\n"
-+"�е могу да отворим директоријум помоћи:\n"
- "%s"
- 
--#: ../app/commands.c:612
-+#: ../app/commands.c:727
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
- msgstr ""
- "Дејан Матијевић <dmax@neobee.net>\n"
-@@ -319,7 +356,7 @@ msgstr ""
- "\n"
- "Prevod.org — превод на �рп�ки језик."
- 
--#: ../app/commands.c:614
-+#: ../app/commands.c:729
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -335,23 +372,75 @@ msgid ""
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- msgstr ""
-+"Овај програм је �лободан �офтвер; можете га про�леђивати\n"
-+"и/или мењати под у�ловима Г�У Опште јавне лиценце коју је\n"
-+"објавила Задужбина �лободног �офтвера; верзије 2 лиценце\n"
-+"или (по вашем избору) било које новије верзије.\n"
-+"\n"
-+"Овај програм �е ра�подељује у нади да ће бити кори�тан,\n"
-+"али БЕЗ ИК�КВЕ Г�Р��ЦИЈЕ; чак и без примењене гаранције\n"
-+"ТРЖИШ�Е ВРЕД�ОСТИ или ПРИЛ�ГОЂЕ�ОСТИ ОДРЕЂЕ�ОЈ ��МЕ�И.\n"
-+"Погледајте Г�У Општу јавну лиценцу за више детаља.\n"
-+"\n"
-+"Требали �те да примите примерак Г�У Опште јавне лиценце\n"
-+"уз овај програм; ако ни�те, пишите Задужбини �лободног\n"
-+"�офтвера на адре�у: „Free Software Foundation, Inc.,\n"
-+"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA“.\n"
- 
--#: ../app/commands.c:637
--#, fuzzy
-+#: ../app/commands.c:752
- msgid "A program for drawing structured diagrams."
--msgstr "Уређивач за дијаграме �труктуре функција."
-+msgstr "Програм за цртање �труктурних дијаграма."
-+
-+#: ../app/confirm.c:69
-+#, c-format
-+msgid "You are about to print a diagram with %d pages."
-+msgstr "Хоћете да штампате дијаграм �а %d �траница."
-+
-+#: ../app/confirm.c:71
-+#, c-format
-+msgid "You are about to export a diagram with %d pages."
-+msgstr "Хоћете да извезете дијаграм �а %d �траница."
-+
-+#: ../app/confirm.c:73
-+#, c-format
-+msgid ""
-+"You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgstr ""
-+"Хоћете да извезете дијаграм који може да захтева %s меморије. (бр. �траница "
-+"— %d)."
-+
-+#: ../app/confirm.c:81
-+msgid ""
-+"You can adjust the size of the diagram by changing the 'Scaling' in the "
-+"'Page Setup' dialog.\n"
-+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-+"the intended bounds."
-+msgstr ""
-+"Можете да поде�ите величину дијаграма тако што ћете изменити „Размера“ у "
-+"прозорчету „Подешавање �транице“.\n"
-+"Или кори�тите „Изабери �ве“ и „�ајбоље и�пуњење“ да преме�тите објекте/"
-+"ручице унутар жељених граница."
-+
-+#: ../app/confirm.c:85
-+msgid "Confirm Diagram Size"
-+msgstr "Потврди величину дијаграма"
-+
-+#: ../app/create_object.c:71
-+#, c-format
-+msgid "'%s' creation failed"
-+msgstr "Стварање „%s“ није у�пело"
- 
--#: ../app/defaults.c:43 ../app/defaults.c:146
-+#: ../app/defaults.c:43 ../app/defaults.c:150
- msgid "Object defaults"
--msgstr "Подразумевано од објекта"
-+msgstr "О�новно објекта"
- 
- #: ../app/defaults.c:61
- msgid "This object has no defaults."
--msgstr "Овај објекат нема подразумевано."
-+msgstr "Овај објекат нема о�новних."
- 
--#: ../app/defaults.c:111
-+#: ../app/defaults.c:115
- msgid "Defaults: "
--msgstr "Уобичајено:"
-+msgstr "О�новно: "
- 
- #: ../app/dia-props.c:85
- msgid "Diagram Properties"
-@@ -379,30 +468,29 @@ msgid "Visible spacing"
- msgstr "Видљиви размак"
- 
- #. Hexes!
--#: ../app/dia-props.c:177 ../app/preferences.c:167
-+#: ../app/dia-props.c:177 ../app/preferences.c:242
- msgid "Hex grid"
--msgstr ""
-+msgstr "Хек� мрежа"
- 
- #: ../app/dia-props.c:185
--#, fuzzy
- msgid "Hex grid size"
--msgstr "Величина извозне �лике"
-+msgstr "Величина хек� мреже"
- 
- #: ../app/dia-props.c:198
- msgid "Grid"
--msgstr "Межа"
-+msgstr "Мрежа"
- 
--#: ../app/dia-props.c:209 ../lib/diagramdata.c:113
-+#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
- msgid "Background"
- msgstr "Позадина"
- 
--#: ../app/dia-props.c:220 ../app/preferences.c:109
-+#: ../app/dia-props.c:220 ../app/preferences.c:122
- msgid "Grid Lines"
--msgstr "Мрежне Линије"
-+msgstr "Линије мреже"
- 
- #: ../app/dia-props.c:231
- msgid "Page Breaks"
--msgstr "Преломи �траница"
-+msgstr "Преломи �транице"
- 
- #: ../app/dia-props.c:242
- msgid "Colors"
-@@ -414,242 +502,190 @@ msgstr "Боје"
- msgid "Diagram Properties: %s"
- msgstr "О�обине дијаграма: %s"
- 
--#: ../app/dia_embedd.c:352
-+#: ../app/dia_embedd.c:348
- msgid "Could not initialize Bonobo!"
- msgstr "�е може да покрене Бонобо!"
- 
- #: ../app/diacanvas.c:121
- msgid "X position"
--msgstr "x позиција"
-+msgstr "Водоравни положај"
- 
- #: ../app/diacanvas.c:122
- msgid "X position of child widget"
--msgstr ""
-+msgstr "Водоравни положај �адржаног елемента"
- 
- #: ../app/diacanvas.c:131
- msgid "Y position"
--msgstr "y позиција"
-+msgstr "У�правни положај"
- 
- #: ../app/diacanvas.c:132
- msgid "Y position of child widget"
--msgstr ""
--
--#. &export_file_format
--#: ../app/diaconv.c:92
--msgid "Export format to use"
--msgstr "Извези формат датотеке која ће �е кори�тити."
--
--#: ../app/diaconv.c:92
--msgid "eps,png,wmf,cgm,dxf,fig"
--msgstr "eps,png,wmf,cgm,dxf,fig"
-+msgstr "У�правни положај �адржаног елемента"
- 
--#. &export_file_name
--#: ../app/diaconv.c:94
--msgid "Export file name to use"
--msgstr "Извези име датотеке која ће �е кори�тити."
--
--#: ../app/diaconv.c:96
--msgid "Quiet operation"
--msgstr "Тихо опери�ање"
--
--#: ../app/diaconv.c:149
-+#: ../app/diagram.c:222
- #, c-format
--msgid ""
--"Error: No arguments found.\n"
--"Run '%s --help' to see a full list of available command line options.\n"
--msgstr ""
--"Грешка: аргументи ни�у нађени.\n"
--"Покрените „%s --help“ да видите �пи�ак �вих до�тупних параметара наредбе.\n"
-+msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
-+msgstr "�е могу да претворим назив датотеке „%s“ у УТФ-8: %s\n"
- 
--#: ../app/diaconv.c:159
--#, c-format
--msgid "%s error: can specify only one of -t or -o."
--msgstr "%s грешка: може да наведе �амо једно од -t или -o."
-+#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
-+msgid "Error"
-+msgstr "Грешка"
- 
--#: ../app/diaconv.c:165
--#, c-format
-+#: ../app/diagram.c:1209
-+msgid "Trying to group with no selected objects."
-+msgstr "Покушавам да групишем без изабраних објеката."
-+
-+#: ../app/diagram.c:1219
- msgid ""
--"%s error: must specify only one of -t or -o.\n"
--"Run '%s --help' to see a full list of available command line options.\n"
-+"You cannot group objects that belong to different groups or have different "
-+"parents"
- msgstr ""
--"%s грешка: морате наве�ти �амо један од -t или -o.\n"
--"Покрените „%s --help“ да видите �пи�ак �вих до�тупних параметара наредбе.\n"
--
--#: ../app/diaconv.c:174
--#, c-format
--msgid "%s error: no input file."
--msgstr "%s грешка: нема улазне датотеке."
--
--#: ../app/diaconv.c:227
--#, c-format
--msgid "%s error: only one input file expected."
--msgstr "%s грешка: очекивао �ам �амо једну улазну датотеку."
--
--#: ../app/diaconv.c:240
--#, c-format
--msgid "%s error: popt library not available on this system"
--msgstr "%s грешка: popt библиотека није до�тупна на овом �и�тему"
-+"�е можете да групишете објекте који припадају различитим групама или имају "
-+"различите родитеље"
- 
--#: ../app/diagram_tree_menu.c:46
-+#: ../app/diagram_tree_menu.c:47
- msgid "/_Sort objects"
--msgstr "/Сортирај објекте"
-+msgstr "/_Сортирај објекте"
- 
--#: ../app/diagram_tree_menu.c:47
-+#: ../app/diagram_tree_menu.c:48
- msgid "/Sort objects/by _name"
--msgstr "/Сортирај објекте/по имену"
-+msgstr "/Сортирај објекте/по _називу"
- 
--#: ../app/diagram_tree_menu.c:49
-+#: ../app/diagram_tree_menu.c:50
- msgid "/Sort objects/by _type"
--msgstr "/Сортирај објекте/по типу"
-+msgstr "/Сортирај објекте/по _вр�ти"
- 
--#: ../app/diagram_tree_menu.c:51
-+#: ../app/diagram_tree_menu.c:52
- msgid "/Sort objects/as _inserted"
--msgstr "/Сортирај објекте/по уно�у"
-+msgstr "/Сортирај објекте/по _уно�у"
- 
--#: ../app/diagram_tree_menu.c:54
-+#: ../app/diagram_tree_menu.c:55
- msgid "/Sort objects/All by name"
- msgstr "/Сортирај објекте/Све по имену"
- 
--#: ../app/diagram_tree_menu.c:56
-+#: ../app/diagram_tree_menu.c:57
- msgid "/Sort objects/All by type"
- msgstr "/Сортирај објекте/Све по типу"
- 
--#: ../app/diagram_tree_menu.c:58
-+#: ../app/diagram_tree_menu.c:59
- msgid "/Sort objects/All as inserted"
- msgstr "/Сортирај објекте/Све по уно�у"
- 
--#: ../app/diagram_tree_menu.c:60
-+#: ../app/diagram_tree_menu.c:61
- msgid "/Sort objects/_Default"
--msgstr "/Сортирај објекте/Подразумевано"
-+msgstr "/Сортирај објекте/_Подразумевано"
- 
--#: ../app/diagram_tree_menu.c:61
-+#: ../app/diagram_tree_menu.c:62
- msgid "/Sort objects/Default/by _name"
--msgstr "/Сортирај објекте/Подразумевано/по имену"
-+msgstr "/Сортирај објекте/Подразумевано/по _називу"
- 
--#: ../app/diagram_tree_menu.c:63
-+#: ../app/diagram_tree_menu.c:64
- msgid "/Sort objects/Default/by _type"
--msgstr "/Сортирај објекте/Подразумевано/по типу"
-+msgstr "/Сортирај објекте/Подразумевано/по _вр�ти"
- 
--#: ../app/diagram_tree_menu.c:65
-+#: ../app/diagram_tree_menu.c:66
- msgid "/Sort objects/Default/as _inserted"
--msgstr "/Сортирај објекте/Подразумевано/по уно�у"
-+msgstr "/Сортирај објекте/Подразумевано/по _уно�у"
- 
--#: ../app/diagram_tree_menu.c:67
-+#: ../app/diagram_tree_menu.c:68
- msgid "/Sort _diagrams"
--msgstr "/Сортирај дијаграме"
-+msgstr "/Сортирај _дијаграме"
- 
--#: ../app/diagram_tree_menu.c:68
-+#: ../app/diagram_tree_menu.c:69
- msgid "/Sort _diagrams/by _name"
--msgstr "/Сортирај дијаграме/по имену"
-+msgstr "/Сортирај _дијаграме/по _називу"
- 
--#: ../app/diagram_tree_menu.c:70
-+#: ../app/diagram_tree_menu.c:71
- msgid "/Sort _diagrams/as _inserted"
--msgstr "/Сортирај дијаграме/по уно�у"
-+msgstr "/Сортирај _дијаграме/по _уно�у"
- 
--#: ../app/diagram_tree_menu.c:72
-+#: ../app/diagram_tree_menu.c:73
- msgid "/Sort diagrams/_Default"
--msgstr "/Сортирај дијаграме/Подразумевано"
-+msgstr "/Сортирај дијаграме/_Подразумевано"
- 
--#: ../app/diagram_tree_menu.c:73
-+#: ../app/diagram_tree_menu.c:74
- msgid "/Sort diagrams/Default/by _name"
--msgstr "/Сортирај дијаграме/Подразумевано/по имену"
-+msgstr "/Сортирај дијаграме/Подразумевано/по _називу"
- 
--#: ../app/diagram_tree_menu.c:75
-+#: ../app/diagram_tree_menu.c:76
- msgid "/Sort diagrams/Default/as _inserted"
--msgstr "/Сортирај дијаграме/Подразумевано/по уно�у"
-+msgstr "/Сортирај дијаграме/Подразумевано/по _уно�у"
- 
--#: ../app/diagram_tree_menu.c:83 ../app/diagram_tree_menu.c:94
-+#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
- msgid "/_Locate"
--msgstr "/Лоцирај"
-+msgstr "/_Лоцирај"
- 
--#: ../app/diagram_tree_menu.c:84
-+#: ../app/diagram_tree_menu.c:85
- msgid "/_Properties"
--msgstr "/О�обине"
-+msgstr "/_Свој�тва"
- 
--#: ../app/diagram_tree_menu.c:85
-+#: ../app/diagram_tree_menu.c:86
- msgid "/_Hide this type"
--msgstr "/Сакриј овај тип"
-+msgstr "/_Сакриј ову вр�ту"
- 
--#: ../app/diagram_tree_window.c:80 ../app/preferences.c:110
-+#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
- msgid "Diagram Tree"
--msgstr "Стабло Дијаграма"
--
--#: ../app/diagram.c:221
--#, c-format
--msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
--msgstr "�е могу да претворим име датотеке „%s“ у УТФ-8 запи�: %s\n"
--
--#: ../app/diagram.c:224 ../lib/message.c:78 ../lib/message.c:238
--msgid "Error"
--msgstr "Грешка"
--
--#: ../app/dialogs.c:51
--msgid "Ok"
--msgstr "У реду"
--
--#: ../app/dialogs.c:52 ../app/paginate_psprint.c:320
--msgid "Cancel"
--msgstr "Поништи"
-+msgstr "Стабло дијаграма"
- 
- #  paper size
- #. paper size
--#: ../app/diapagelayout.c:116
-+#: ../app/diapagelayout.c:153
- msgid "Paper Size"
- msgstr "Величина папира"
- 
- #. orientation
--#: ../app/diapagelayout.c:149
-+#: ../app/diapagelayout.c:186
- msgid "Orientation"
--msgstr "Орјентација"
-+msgstr "У�мерење"
- 
- #. margins
--#: ../app/diapagelayout.c:187
-+#: ../app/diapagelayout.c:224
- msgid "Margins"
- msgstr "Маргине"
- 
--#: ../app/diapagelayout.c:199
-+#: ../app/diapagelayout.c:236
- msgid "Top:"
--msgstr "Врх:"
-+msgstr "Горња:"
- 
--#: ../app/diapagelayout.c:212
-+#: ../app/diapagelayout.c:249
- msgid "Bottom:"
--msgstr "Дно:"
-+msgstr "Доња:"
- 
--#: ../app/diapagelayout.c:225
-+#: ../app/diapagelayout.c:262
- msgid "Left:"
--msgstr "Лево:"
-+msgstr "Лева:"
- 
--#: ../app/diapagelayout.c:238
-+#: ../app/diapagelayout.c:275
- msgid "Right:"
--msgstr "Де�но:"
-+msgstr "Де�на:"
- 
- #. Scaling
--#: ../app/diapagelayout.c:252
-+#: ../app/diapagelayout.c:289
- msgid "Scaling"
--msgstr "Размеравање:"
-+msgstr "Размера"
- 
--#: ../app/diapagelayout.c:263
-+#: ../app/diapagelayout.c:300
- msgid "Scale:"
- msgstr "Размера:"
- 
--#: ../app/diapagelayout.c:275
-+#: ../app/diapagelayout.c:312
- msgid "Fit to:"
--msgstr "Уклопити �е у:"
-+msgstr "И�пуни до:"
- 
--#: ../app/diapagelayout.c:287
-+#: ../app/diapagelayout.c:324
- msgid "by"
- msgstr "�а"
- 
--#: ../app/diapagelayout.c:698
-+#: ../app/diapagelayout.c:741
- #, c-format
- msgid "%0.3gcm x %0.3gcm"
- msgstr "%0.3gcm x %0.3gcm"
- 
--#: ../app/diapagelayout.c:802 ../app/pagesetup.c:76
-+#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
- msgid "Page Setup"
- msgstr "Подешавање �тране"
- 
--#: ../app/disp_callbacks.c:84 ../app/properties.c:152
-+#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
- msgid ""
- "This object doesn't support Undo/Redo.\n"
- "Undo information erased."
-@@ -657,11 +693,15 @@ msgstr ""
- "Овај објекат не подржава Опозови/Понови.\n"
- "Подаци за опозивање �у обри�ани."
- 
--#: ../app/disp_callbacks.c:119
-+#: ../app/disp_callbacks.c:130
- msgid "Properties..."
- msgstr "О�обине..."
- 
--#: ../app/disp_callbacks.c:921
-+#: ../app/disp_callbacks.c:248
-+msgid "Selection"
-+msgstr "Избор"
-+
-+#: ../app/disp_callbacks.c:1075
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -669,36 +709,39 @@ msgstr ""
- "Објекат који �те �пу�тили не може да �тане у �вог �адржаоца. \n"
- "Или раширите �адржаоца, или објекат �пу�тите негде другде."
- 
--#: ../app/display.c:94
--msgid "Diagram modified!"
--msgstr "Дијаграм измењен!"
--
- # bug(slobo): plural forms
- #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
- #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
- #.
--#: ../app/display.c:121
--#, fuzzy, c-format
-+#: ../app/display.c:115
-+#, c-format
- msgid "Selection of %d object"
- msgid_plural "Selection of %d objects"
--msgstr[0] "Означен број објеката: %d"
--msgstr[1] "Означен број објеката: %d"
-+msgstr[0] "Избор %d објекта"
-+msgstr[1] "Избор %d објекта"
-+msgstr[2] "Избор %d објеката"
-+msgstr[3] "Избор једног објекта"
- 
--#: ../app/display.c:131
-+#: ../app/display.c:125
- #, c-format
- msgid "Selected '%s'"
--msgstr "Означено „%s“"
-+msgstr "Изабрано је „%s“"
-+
-+#. we really should not come here but instead disable the menu command earlier
-+#: ../app/display.c:1121
-+msgid "No anti-aliased renderer found"
-+msgstr "�ије пронађен и�цртавач умекшавања"
- 
--#: ../app/display.c:1130
-+#: ../app/display.c:1259
- msgid "<unnamed>"
--msgstr "<без имена>"
-+msgstr "<неименован>"
- 
- #. no standard buttons
--#: ../app/display.c:1136
-+#: ../app/display.c:1265
- msgid "Closing diagram without saving"
--msgstr ""
-+msgstr "Затварам дијаграм без чувања"
- 
--#: ../app/display.c:1139
-+#: ../app/display.c:1267
- #, c-format
- msgid ""
- "The diagram '%s'\n"
-@@ -707,103 +750,102 @@ msgstr ""
- "Дијаграм „%s“\n"
- "није �ачуван. Да �ачувам измене �ада?"
- 
--#: ../app/display.c:1141
-+#: ../app/display.c:1269
- msgid "Close Diagram"
- msgstr "Затвори дијаграм"
- 
--#: ../app/display.c:1146
--#, fuzzy
-+#: ../app/display.c:1274
- msgid "_Discard Changes"
--msgstr "Одбаци промене"
--
--#: ../app/export_png.c:136 ../app/load_save.c:951 ../app/render_eps.c:103
--#: ../plug-ins/cairo/diacairo.c:976 ../plug-ins/cgm/cgm.c:1151
--#: ../plug-ins/dxf/dxf-export.c:484 ../plug-ins/hpgl/hpgl.c:708
--#: ../plug-ins/metapost/render_metapost.c:1145
--#: ../plug-ins/pgf/render_pgf.c:1143
--#: ../plug-ins/pstricks/render_pstricks.c:914
--#: ../plug-ins/shape/shape-export.c:134 ../plug-ins/svg/render_svg.c:150
--#: ../plug-ins/vdx/vdx-export.c:1848 ../plug-ins/wpg/wpg.c:1070
--#: ../plug-ins/xfig/xfig-export.c:1136 ../plug-ins/xslt/xslt.c:93
--#, c-format
--msgid "Can't open output file %s: %s\n"
--msgstr "�еможе да отвори излазну датотеку %s: %s\n"
--
--#: ../app/export_png.c:144
--msgid "Could not create PNG write structure"
--msgstr "�е може да направи PNG �труктуру за упи�"
--
--#: ../app/export_png.c:153
--msgid "Could not create PNG header info structure"
--msgstr "�е може да направи �труктуру PNG заглавља"
--
--#: ../app/export_png.c:161
--msgid "Error occurred while writing PNG"
--msgstr "Грешка при пи�ању PNG"
-+msgstr "_Одбаци измене"
-+
-+#: ../app/exit_dialog.c:77
-+msgid "Do Not Exit"
-+msgstr "�емој изаћи"
-+
-+#: ../app/exit_dialog.c:79
-+msgid "Exit Without Save"
-+msgstr "Изађи без чувања"
-+
-+#: ../app/exit_dialog.c:81
-+msgid "Save Selected"
-+msgstr "Сачувај изабрано"
-+
-+#: ../app/exit_dialog.c:87
-+msgid "The following are not saved:"
-+msgstr "Следеће није �ачувано:"
-+
-+#: ../app/exit_dialog.c:113
-+msgid "Save"
-+msgstr "Сачувај"
-+
-+#. *** board of value **************
-+#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
-+#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
-+#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
-+#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
-+#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-+#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-+msgid "Name"
-+msgstr "�азив"
- 
--#. Create a dialog
--#: ../app/export_png.c:301
--msgid "PNG Export Options"
--msgstr "PNG извозне опције"
-+#: ../app/exit_dialog.c:129
-+msgid "Path"
-+msgstr "Путања"
- 
--#. Translators: Menu item Verb/Channel/Export
--#. Translators: Menu item Verb/Channel/Export/Export
--#: ../app/export_png.c:302 ../objects/FS/function.c:696
--#: ../objects/FS/function.c:698
--msgid "Export"
--msgstr "Извоз"
-+#: ../app/exit_dialog.c:142
-+msgid "Select All"
-+msgstr "Све"
- 
--#: ../app/export_png.c:307
--msgid "Image width:"
--msgstr "Ширина �лике:"
-+#: ../app/exit_dialog.c:150
-+msgid "Select None"
-+msgstr "�ишта"
- 
--#: ../app/export_png.c:310
--msgid "Image height:"
--msgstr "Ви�ина �лике:"
-+#: ../app/exit_dialog.c:236
-+msgid "Nothing selected for saving.  Would you like to try again?"
-+msgstr "�ишта није изабрано за чување.  Да ли желите да покушате опет?"
- 
--#: ../app/export_png.c:356
--msgid "Portable Network Graphics"
--msgstr "Прено�на Мрежна Графика"
-+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-+#: ../app/filedlg.c:746 ../lib/widgets.c:1488
-+msgid "Supported Formats"
-+msgstr "Подржани запи�и"
- 
--#: ../app/filedlg.c:129 ../app/filedlg.c:512
-+#: ../app/filedlg.c:192 ../app/filedlg.c:604
- msgid "By extension"
--msgstr "По ек�тензији"
-+msgstr "Према проширењу"
- 
--#: ../app/filedlg.c:214
-+#: ../app/filedlg.c:281
- msgid "Open Diagram"
--msgstr "Отвори оијаграм"
-+msgstr "Отворите дијаграм"
- 
--#: ../app/filedlg.c:243
-+#: ../app/filedlg.c:309
- msgid "Open Options"
--msgstr "Отвори опције"
-+msgstr "Опције отварања"
- 
--#: ../app/filedlg.c:251 ../app/filedlg.c:632
-+#: ../app/filedlg.c:317 ../app/filedlg.c:728
- msgid "Determine file type:"
--msgstr "Одреди тип датотеке:"
-+msgstr "Вр�та датотеке:"
- 
--#: ../app/filedlg.c:267 ../app/filedlg.c:645
-+#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
- msgid "All Files"
- msgstr "Све датотеке"
- 
--#: ../app/filedlg.c:272 ../app/filedlg.c:650
--msgid "Supported Formats"
--msgstr "Подржани формати"
--
--#: ../app/filedlg.c:307 ../app/paginate_psprint.c:406
-+#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
- msgid ""
- "Some characters in the filename are neither UTF-8\n"
- "nor your local encoding.\n"
- "Some things will break."
- msgstr ""
--"�еки знаци у имену датотеке ни�у ни у УТФ-8 \n"
--"ни u вашем локалном запи�у.\n"
--"Понешто неће радити."
-+"�еки знаци у називу датотеке ни�у ни у УТФ-8\n"
-+"ни у вашем локалном кодирању.\n"
-+"�еке �твари ће �е нарушити."
- 
--#: ../app/filedlg.c:317 ../app/filedlg.c:559 ../app/paginate_psprint.c:421
-+#: ../app/filedlg.c:380 ../app/filedlg.c:651
-+#: ../plug-ins/postscript/paginate_psprint.c:422
- msgid "File already exists"
- msgstr "Датотека већ по�тоји"
- 
--#: ../app/filedlg.c:319 ../app/filedlg.c:561 ../app/paginate_psprint.c:413
-+#: ../app/filedlg.c:382 ../app/filedlg.c:653
-+#: ../plug-ins/postscript/paginate_psprint.c:418
- #, c-format
- msgid ""
- "The file '%s' already exists.\n"
-@@ -812,176 +854,225 @@ msgstr ""
- "Датотека „%s“ већ по�тоји.\n"
- "Да ли желите да је пре�нимите?"
- 
--#: ../app/filedlg.c:369
-+#: ../app/filedlg.c:436
- msgid "Save Diagram"
--msgstr "Сачувај дијаграм"
-+msgstr "Сачувајте дијаграм"
- 
- #. Need better way to make it a reasonable size.  Isn't there some
- #. standard look for them (or is that just Gnome?)
--#: ../app/filedlg.c:381
-+#: ../app/filedlg.c:447
- msgid "Compress diagram files"
--msgstr "Компре�уј датотеке дијаграма"
-+msgstr "Датотеке �ажетих дијаграма"
- 
--#: ../app/filedlg.c:390
-+#: ../app/filedlg.c:457 ../app/filedlg.c:462
- msgid ""
- "Compression reduces file size to less than 1/10th size and speeds up loading "
- "and saving.  Some text programs cannot manipulate compressed files."
- msgstr ""
--"Компре�ија умањује величину датотеке на мање од де�етине величине и убрзава "
--"учитавање и �нимање. �еки тек�туални програми не могу да раде �а "
--"компре�ованим датотекама."
-+"Сажимање умањује величину датотеке на мање од де�етог дела величине и "
-+"убрзава учитавање и чување. �еки тек�туални програми не могу да раде �а "
-+"�ажетим датотекама."
- 
--#: ../app/filedlg.c:584
-+#: ../app/filedlg.c:677
- #, c-format
- msgid ""
- "Could not determine which export filter\n"
- "to use to save '%s'"
- msgstr ""
--"�е може да одреди који извозни филтер да \n"
--"кори�ти за �нимање „%s“"
-+"�е могу да одредим који филтер извожења\n"
-+"да кори�тим да �ачувам „%s“"
- 
--#: ../app/filedlg.c:607
-+#: ../app/filedlg.c:704
- msgid "Export Diagram"
--msgstr "Извези дијаграм"
-+msgstr "Извезите дијаграм"
- 
--#: ../app/filedlg.c:624
-+#: ../app/filedlg.c:720
- msgid "Export Options"
- msgstr "Опције извоза"
- 
--#: ../app/interface.c:57
-+#: ../app/find-and-replace.c:454
-+msgid "_Search for:"
-+msgstr "_Потражи:"
-+
-+#: ../app/find-and-replace.c:467
-+msgid "Replace _with:"
-+msgstr "_Замени �а:"
-+
-+#: ../app/find-and-replace.c:477
-+msgid "_Match case"
-+msgstr "_Упореди величину �лова"
-+
-+#: ../app/find-and-replace.c:481
-+msgid "Match _entire word only"
-+msgstr "Упор_еди �амо целе речи"
-+
-+#: ../app/find-and-replace.c:485
-+msgid "Match _all properties (not just object name)"
-+msgstr "Упореди _�ва �вој�тва (не �амо назив објекта)"
-+
-+#: ../app/find-and-replace.c:513
-+msgid "Find"
-+msgstr "�ађи"
-+
-+#: ../app/find-and-replace.c:545 ../app/menus.c:267
-+msgid "Replace"
-+msgstr "Замени"
-+
-+#: ../app/find-and-replace.c:548
-+msgid "Replace _All"
-+msgstr "Замени _�ве"
-+
-+#. not adding the button in the list above to modify it's text;
-+#. * the default "Find and Replace" is just too long for my taste ;)
-+#.
-+#: ../app/find-and-replace.c:553
-+msgid "_Replace"
-+msgstr "_Замени"
-+
-+#: ../app/interface.c:153
- msgid ""
- "Modify object(s)\n"
- "Use <Space> to toggle between this and other tools"
- msgstr ""
-+"Измените објекат\n"
-+"Кори�тите <Размак> да прелазите �а овог на о�тале алате"
-+
-+#: ../app/interface.c:159
-+msgid ""
-+"Text edit(s)\n"
-+"Use <Esc> to leave this tool"
-+msgstr ""
-+"Уређивање тек�та\n"
-+"Кори�тите <Е�ц> да напу�тите овај алат"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
--#: ../app/interface.c:63 ../app/menus.c:187 ../objects/FS/function.c:986
-+#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
- msgid "Magnify"
- msgstr "Увеличај"
- 
--#: ../app/interface.c:69
-+#: ../app/interface.c:171
- msgid "Scroll around the diagram"
--msgstr "У�правно померање око дијаграма"
--
--#: ../app/interface.c:75 ../app/menus.c:189 ../lib/properties.c:79
--#: ../lib/properties.h:520 ../objects/AADL/aadlbox.c:144
--#: ../objects/Jackson/requirement.c:142 ../objects/UML/activity.c:127
--#: ../objects/UML/actor.c:122 ../objects/UML/classicon.c:144
--#: ../objects/UML/component.c:128 ../objects/UML/component_feature.c:155
--#: ../objects/UML/node.c:127 ../objects/UML/note.c:121
--#: ../objects/UML/object.c:148 ../objects/UML/small_package.c:128
--#: ../objects/UML/state.c:152 ../objects/UML/usecase.c:138
--#: ../objects/custom/custom_object.c:200 ../objects/network/basestation.c:133
--#: ../objects/network/radiocell.c:125
-+msgstr "Крећите �е око дијаграма"
-+
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule
-+#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
-+#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
-+#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
-+#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
-+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
-+#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-+#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
-+#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
-+#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
-+#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
- msgid "Text"
- msgstr "Тек�т"
- 
--#: ../app/interface.c:81 ../app/menus.c:190
-+#: ../app/interface.c:183 ../app/menus.c:233
- msgid "Box"
--msgstr "Кућица"
-+msgstr "Квадрат"
- 
--#: ../app/interface.c:87 ../app/menus.c:191
-+#: ../app/interface.c:189 ../app/menus.c:234
- msgid "Ellipse"
- msgstr "Елип�а"
- 
--#: ../app/interface.c:93 ../app/menus.c:192
-+#: ../app/interface.c:195 ../app/menus.c:235
- msgid "Polygon"
- msgstr "Полигон"
- 
- # Ово је �клоп од „безиеров“ и „полигон“, па може и код на�
--#: ../app/interface.c:99 ../app/menus.c:193
-+#: ../app/interface.c:201 ../app/menus.c:236
- msgid "Beziergon"
- msgstr "Безиергон"
- 
--#: ../app/interface.c:105 ../app/menus.c:195 ../objects/standard/line.c:225
-+#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
- msgid "Line"
- msgstr "Линија"
- 
--#: ../app/interface.c:111 ../app/menus.c:196
-+#: ../app/interface.c:213 ../app/menus.c:239
- msgid "Arc"
- msgstr "Лук"
- 
--#: ../app/interface.c:117 ../app/menus.c:197
-+#: ../app/interface.c:219 ../app/menus.c:240
- msgid "Zigzagline"
- msgstr "Цик-цак линија"
- 
--#: ../app/interface.c:123 ../app/menus.c:198
-+#: ../app/interface.c:225 ../app/menus.c:241
- msgid "Polyline"
- msgstr "Изломљена линија"
- 
--#: ../app/interface.c:129 ../app/menus.c:199
-+#: ../app/interface.c:231 ../app/menus.c:242
- msgid "Bezierline"
- msgstr "Безиерова линија"
- 
--#: ../app/interface.c:135 ../app/menus.c:201
-+#: ../app/interface.c:237 ../app/menus.c:245
- msgid "Image"
- msgstr "Слика"
- 
--#: ../app/interface.c:413
--msgid "Diagram menu."
--msgstr "Мени дијаграма."
-+#: ../app/interface.c:244 ../app/menus.c:243
-+msgid "Outline"
-+msgstr "Контура"
- 
--#: ../app/interface.c:451
-+#: ../app/interface.c:621 ../app/interface.c:857
- msgid "Pops up the Navigation window."
--msgstr "Избацује прозор за управљање."
-+msgstr "Избаците прозор за кретање."
-+
-+#: ../app/interface.c:819
-+msgid "Diagram menu."
-+msgstr "Изборник дијаграма."
- 
--#: ../app/interface.c:517
-+#: ../app/interface.c:922
- msgid "Zoom"
- msgstr "Увећај"
- 
--#: ../app/interface.c:532
-+#: ../app/interface.c:937
- msgid "Toggles snap-to-grid for this window."
--msgstr "И�кључује или укључује пријањање уз мрежу за овај прозор."
-+msgstr "Пребаците пријањање уз мрежу за овај прозор."
- 
--#: ../app/interface.c:543
--#, fuzzy
-+#: ../app/interface.c:948
- msgid "Toggles object snapping for this window."
--msgstr "И�кључује или укључује пријањање уз мрежу за овај прозор."
--
--#: ../app/interface.c:608
--msgid "NULL tooldata in tool_select_update"
--msgstr "NULL tooldata у tool_select_update"
-+msgstr "Пребаците пријањање објекта за овај прозор."
- 
--#: ../app/interface.c:920
-+#: ../app/interface.c:1338
- #, c-format
- msgid "No sheet named %s"
--msgstr "�ема табеле по имену %s"
-+msgstr "�ема ли�та под називом %s"
- 
--#: ../app/interface.c:957
-+#: ../app/interface.c:1376
- msgid "Other sheets"
--msgstr "О�тале табеле"
-+msgstr "О�тали ли�тови"
- 
--#: ../app/interface.c:1015 ../sheets/Misc.sheet.in.h:3
--msgid "Misc"
--msgstr "Разно"
-+#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:1
-+msgid "Flowchart"
-+msgstr "Дијаграм тока"
- 
--#: ../app/interface.c:1076
-+#: ../app/interface.c:1496
- msgid ""
- "Foreground & background colors for new objects.  The small black and white "
- "squares reset colors.  The small arrows swap colors.  Double click to change "
- "colors."
- msgstr ""
--"Боја и боја позадине за нове објекте. Мали црни и бели квадрати враћају "
--"�таре боје. Мале �трелице размењују боје. Дво�труким кликом мењате боје."
-+"Боја лица и позадине за нове објекте.  Мали црни и бели квадрати враћају "
-+"�таре боје.  Мале �трелице размењују боје.  Дво�труким кликом мењате боје."
- 
--#: ../app/interface.c:1091
-+#: ../app/interface.c:1511
- msgid ""
- "Line widths.  Click on a line to set the default line width for new "
- "objects.  Double-click to set the line width more precisely."
- msgstr ""
- "Дебљине линија. Кликните на линију да по�тавите подразумевану дебљину линија "
--"нових објеката. Кликните два пута да по�тавите дебљину линије пнешто "
--"прецизније."
-+"нових објеката. Кликните два пута да по�тавите дебљину линије мало тачније."
- 
--#: ../app/interface.c:1131
-+#: ../app/interface.c:1554
- msgid ""
- "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
- "arrow parameters with Details..."
- msgstr ""
--"Стил �трелица за почетак нових линија. Кликните да изаберете �трелицу, или "
--"по�тавите о�обине �трелица помоћу „Детаља“..."
-+"Стил �трелица на почетку нових линија.  Кликните да изаберете �трелицу, или "
-+"по�тавите о�обине �трелице помоћу „Детаља“..."
- 
--#: ../app/interface.c:1136
-+#: ../app/interface.c:1559
- msgid ""
- "Line style for new lines.  Click to pick a line style, or set line style "
- "parameters with Details..."
-@@ -989,7 +1080,7 @@ msgstr ""
- "Стил линија за нове линије. Кликните да изаберете �тил линија, или по�тавите "
- "о�обине �тила линија помоћу „Детаља“..."
- 
--#: ../app/interface.c:1150
-+#: ../app/interface.c:1575
- msgid ""
- "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
- "parameters with Details..."
-@@ -997,54 +1088,62 @@ msgstr ""
- "Стил �трелица за крајеве линија. Кликните да изаберете �трелицу, или "
- "по�тавите о�обине �трелица помоћу „Детаља“..."
- 
--#: ../app/interface.c:1260
-+#: ../app/interface.c:1635 ../app/interface.c:1762
- msgid "Diagram Editor"
--msgstr "Уређиваћ Дијаграма"
-+msgstr "Уређиваћ дијаграма"
- 
--#: ../app/layer_dialog.c:101
-+#: ../app/layer_dialog.c:159
- msgid "New Layer"
- msgstr "�ови �лој"
- 
--#: ../app/layer_dialog.c:102
-+#: ../app/layer_dialog.c:160
- msgid "Raise Layer"
--msgstr "Подигни �лој"
-+msgstr "Издигни �лој"
- 
--#: ../app/layer_dialog.c:103
-+#: ../app/layer_dialog.c:161
- msgid "Lower Layer"
- msgstr "Спу�ти �лој"
- 
--#: ../app/layer_dialog.c:104
-+#: ../app/layer_dialog.c:162
- msgid "Delete Layer"
- msgstr "Избриши �лој"
- 
--#: ../app/layer_dialog.c:225
-+#: ../app/layer_dialog.c:306
-+msgid "Layers:"
-+msgstr "Слојеви:"
-+
-+#: ../app/layer_dialog.c:386
- msgid "Layers"
- msgstr "Слојеви"
- 
--#: ../app/layer_dialog.c:239
-+#: ../app/layer_dialog.c:400
- msgid "Diagram:"
- msgstr "Дијаграм:"
- 
--#: ../app/layer_dialog.c:349
-+#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
- #, c-format
- msgid "New layer %d"
- msgstr "�ови �лој %d"
- 
--#: ../app/layer_dialog.c:561
-+#: ../app/layer_dialog.c:729
- msgid "none"
- msgstr "ништа"
- 
--#: ../app/layer_dialog.c:983
--msgid "Edit Layer Attributes"
--msgstr "Измени �вој�тва �лоја"
-+#: ../app/layer_dialog.c:1196
-+msgid "Edit Layer"
-+msgstr "Уредите �лој"
- 
--#: ../app/layer_dialog.c:1002
-+#: ../app/layer_dialog.c:1196
-+msgid "Add Layer"
-+msgstr "Додајте �лој"
-+
-+#: ../app/layer_dialog.c:1215
- msgid "Layer name:"
- msgstr "�азив �лоја:"
- 
--#: ../app/linewidth_area.c:246 ../lib/properties.h:481 ../lib/properties.h:484
--#: ../objects/chronogram/chronoline.c:181
--#: ../objects/chronogram/chronoref.c:160
-+#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
-+#: ../objects/chronogram/chronoline.c:183
-+#: ../objects/chronogram/chronoref.c:162
- msgid "Line width"
- msgstr "Ширина линије"
- 
-@@ -1052,537 +1151,564 @@ msgstr "Ширина линије"
- msgid "Line width:"
- msgstr "Ширина линије:"
- 
--#: ../app/load_save.c:268
-+#: ../app/load_save.c:301
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
- msgstr ""
--"Грешка при учитавању дијаграма.\n"
-+"Грешка учитавања дијаграма.\n"
- "Везани објекат није нађен у документу."
- 
--#: ../app/load_save.c:271
-+#: ../app/load_save.c:305
-+#, c-format
- msgid ""
- "Error loading diagram.\n"
--"connection handle does not exist."
-+"connection handle %d does not exist on '%s'."
- msgstr ""
--"Грешка при учитавању дијаграма.\n"
--"Ручка везе не по�тоји."
-+"Грешка учитавања дијаграма.\n"
-+"Ручка везе %d не по�тоји на „%s“."
- 
--#: ../app/load_save.c:288
-+#: ../app/load_save.c:333
- #, c-format
- msgid ""
- "Error loading diagram.\n"
--"connection point %s does not exist."
-+"connection point %d does not exist on '%s'."
- msgstr ""
--"Грешка при учитавању дијаграма.\n"
--"Тачка везе %s не по�тоји."
-+"Грешка учитавања дијаграма.\n"
-+"Тачка везе %d не по�тоји на „%s“."
- 
--#: ../app/load_save.c:313
-+#: ../app/load_save.c:373
- #, c-format
- msgid "Can't find parent %s of %s object\n"
--msgstr "�е могу да нађем �адржаоца %s објекта %s\n"
-+msgstr "�е могу да нађем �адржаоца %s за објекат %s\n"
- 
--#: ../app/load_save.c:359
-+#: ../app/load_save.c:422
- msgid "You must specify a file, not a directory.\n"
--msgstr "Треба да одредите датотеку, а не директоријум.\n"
-+msgstr "Треба да наведете датотеку, а не директоријум.\n"
- 
--#: ../app/load_save.c:366 ../plug-ins/dxf/dxf-import.c:1306
--#: ../plug-ins/wpg/wpg.c:1175 ../plug-ins/xfig/xfig-import.c:1258
--#: ../plug-ins/xslt/xslt.c:85
-+#: ../app/load_save.c:429 ../plug-ins/dxf/dxf-import.c:1309
-+#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
-+#: ../plug-ins/xslt/xslt.c:91
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "�е могу да отворим „%s“ за читање.\n"
- 
--#: ../app/load_save.c:384 ../app/load_save.c:390
-+#: ../app/load_save.c:447 ../app/load_save.c:453
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
- "Unknown file type."
- msgstr ""
--"Грешлка учитавајући дијаграм %s.\n"
--"�епознати тип датотеке."
-+"Грешка учитавања дијаграма %s.\n"
-+"�епозната вр�та датотеке."
- 
--#: ../app/load_save.c:398
-+#: ../app/load_save.c:461
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
- "Not a Dia file."
- msgstr ""
--"Грешка учитавајући дијаграм %s.\n"
--"�ије Диа датотека."
-+"Грешка учитавања дијаграма %s.\n"
-+"�ије датотека Дие."
- 
--#: ../app/load_save.c:604
-+#: ../app/load_save.c:678
- #, c-format
- msgid ""
- "Error loading diagram:\n"
- "%s.\n"
- "A valid Dia file defines at least one layer."
- msgstr ""
--"Грешка учитавајући дијаграм:\n"
-+"Грешка учитавања дијаграма:\n"
- "%s.\n"
--"И�правана Диа датотека одређује најмање један ниво."
-+"И�правна датотека Дие одређује барем један �лој."
- 
--#: ../app/load_save.c:912
-+#: ../app/load_save.c:1001
- #, c-format
--msgid "No allowed to write to output file %s\n"
--msgstr ""
-+msgid "Not allowed to write to output file %s\n"
-+msgstr "�ије ми допуштено да пишем у излазну датотеку %s\n"
- 
--#: ../app/load_save.c:934
-+#: ../app/load_save.c:1033
- #, c-format
--msgid "No allowed to write temporary files in %s\n"
--msgstr ""
-+msgid "Not allowed to write temporary files in %s\n"
-+msgstr "�ије ми допуштено да запишем привремену датотеку у %s\n"
-+
-+#: ../app/load_save.c:1055 ../plug-ins/cairo/diacairo.c:121
-+#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
-+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
-+#: ../plug-ins/libart/export_png.c:159
-+#: ../plug-ins/metapost/render_metapost.c:1177
-+#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
-+#: ../plug-ins/pstricks/render_pstricks.c:916
-+#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
-+#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
-+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
-+#, c-format
-+msgid "Can't open output file %s: %s\n"
-+msgstr "�е могу да отворим излазну датотеку %s: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:962
--#, fuzzy, c-format
-+#: ../app/load_save.c:1066
-+#, c-format
- msgid "Internal error %d writing file %s\n"
--msgstr "%s грашка: треба и�праван улазни тип %s\n"
-+msgstr "Унутрашња грешка %d запи�ивања датотеке %s\n"
- 
--#: ../app/load_save.c:976
--#, fuzzy, c-format
-+#: ../app/load_save.c:1077
-+#, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
--msgstr "�еможе да отвори излазну датотеку %s: %s\n"
-+msgstr "�е могу да преименујем %s у крајњу излазну датотеку %s: %s\n"
- 
--#: ../app/load_save.c:1064 ../app/load_save.c:1069
-+#: ../app/load_save.c:1168 ../app/load_save.c:1173
- msgid "Dia Diagram File"
--msgstr "Датотека �а диа дијаграмима"
-+msgstr "Датотека дијаграма Дие"
-+
-+#: ../app/menus.c:63
-+msgid "Fit"
-+msgstr "И�пуни"
- 
--#: ../app/menus.c:54
- #
-+#: ../app/menus.c:81
- msgid "_File"
- msgstr "_Датотека"
- 
--#: ../app/menus.c:58
-+#: ../app/menus.c:85
- msgid "_Help"
- msgstr "_Помоћ"
- 
--#: ../app/menus.c:66
--#, fuzzy
-+#: ../app/menus.c:93
- msgid "Sheets and Objects..."
--msgstr "Стране и објекти..."
-+msgstr "Ли�тови и објекти..."
- 
--#: ../app/menus.c:68
--#, fuzzy
-+#: ../app/menus.c:95
- msgid "Plugins..."
--msgstr "Додаци..."
-+msgstr "Прикључци..."
- 
--#: ../app/menus.c:74
--#, fuzzy
-+#: ../app/menus.c:101
- msgid "_Diagram tree..."
--msgstr "Стабло дијаграма"
-+msgstr "Стабло _дијаграма..."
-+
-+#: ../app/menus.c:107
-+msgid "Show Toolbar"
-+msgstr "Прикажи линију алата"
-+
-+#: ../app/menus.c:108
-+msgid "Show Statusbar"
-+msgstr "Прикажи линију �тања"
- 
--#: ../app/menus.c:82
--#, fuzzy
-+#: ../app/menus.c:109
-+msgid "Show Layers"
-+msgstr "Прикажи �лојеве"
-+
-+#: ../app/menus.c:117
- msgid "_Export ..."
--msgstr "Извоз..."
-+msgstr "_Извези ..."
-+
-+#: ../app/menus.c:118
-+msgid "_Diagram Properties"
-+msgstr "Свој�тва _дијаграма"
- 
--#: ../app/menus.c:83
-+#: ../app/menus.c:119
- msgid "Page Set_up..."
--msgstr "Поде�и �траницу ..."
-+msgstr "Поде�и _�траницу..."
- 
--#: ../app/menus.c:87 ../app/sheets_dialog.c:236
-+#: ../app/menus.c:123 ../app/sheets_dialog.c:236
- msgid "_Edit"
--msgstr "Уреди"
-+msgstr "_Уређивање"
- 
- # и�пари па кондензуј у чвр�то �тање
--#: ../app/menus.c:94
--#, fuzzy
-+#: ../app/menus.c:130
- msgid "_Duplicate"
--msgstr "Удво�тручи"
-+msgstr "_Удво�тручи"
- 
- #. the following used to bind to <control><shift>C which collides with Unicode input.
- #. * <control>>alt> doesn't work either
--#: ../app/menus.c:99
-+#: ../app/menus.c:138
- msgid "Copy Text"
--msgstr "Копирај тек�т"
-+msgstr "Умножи тек�т"
- 
--#: ../app/menus.c:100
-+#: ../app/menus.c:139
- msgid "Cut Text"
- msgstr "И�еци тек�т"
- 
--#: ../app/menus.c:101
-+#: ../app/menus.c:140
- msgid "Paste _Text"
--msgstr "Убаци тек�т"
-+msgstr "Убаци _тек�т"
- 
--#: ../app/menus.c:103
--#
--msgid "_Diagram"
--msgstr "_Дијаграм"
-+#: ../app/menus.c:142
-+msgid "_Layers"
-+msgstr "_Слојеви"
-+
-+#: ../app/menus.c:143
-+msgid "Add Layer..."
-+msgstr "Додај �лој..."
-+
-+#: ../app/menus.c:144
-+msgid "Rename Layer..."
-+msgstr "Преименуј �лој..."
-+
-+#: ../app/menus.c:145
-+msgid "Move selection to layer above"
-+msgstr "Преме�ти избор на горњи �лој"
-+
-+#: ../app/menus.c:146
-+msgid "Move selection to layer below"
-+msgstr "Преме�ти избор на доњи �лој"
- 
--#: ../app/menus.c:105
--#, fuzzy
-+#: ../app/menus.c:147
- msgid "_Layers..."
--msgstr "Слојеви"
-+msgstr "_Слојеви..."
- 
--#: ../app/menus.c:107
- #
-+#: ../app/menus.c:149
- msgid "_View"
- msgstr "П_реглед"
- 
--#: ../app/menus.c:110
-+#: ../app/menus.c:152
- msgid "_Zoom"
--msgstr "Увећање"
-+msgstr "_Повећај"
- 
--#: ../app/menus.c:111
--#, fuzzy
-+#: ../app/menus.c:153
- msgid "1600%"
--msgstr "15800"
-+msgstr "1600%"
- 
--#: ../app/menus.c:112
--#, fuzzy
-+#: ../app/menus.c:154 ../app/menus.c:573
- msgid "800%"
--msgstr "15800"
-+msgstr "800%"
- 
--#: ../app/menus.c:113
-+#: ../app/menus.c:155 ../app/menus.c:574
- msgid "400%"
--msgstr ""
-+msgstr "400%"
- 
--#: ../app/menus.c:114
-+#: ../app/menus.c:156
- msgid "283"
--msgstr ""
-+msgstr "283"
- 
--#: ../app/menus.c:115
--#, fuzzy
-+#: ../app/menus.c:157
- msgid "200"
--msgstr "15200"
-+msgstr "200"
- 
--#: ../app/menus.c:116
-+#: ../app/menus.c:158
- msgid "141"
--msgstr ""
-+msgstr "141"
- 
--#: ../app/menus.c:118
-+#: ../app/menus.c:160
- msgid "85"
--msgstr ""
-+msgstr "85"
- 
--#: ../app/menus.c:119
--#, fuzzy
-+#: ../app/menus.c:161
- msgid "70.7"
--msgstr "7507"
-+msgstr "70.7"
- 
--#: ../app/menus.c:120
--#, fuzzy
-+#: ../app/menus.c:162
- msgid "50"
--msgstr "7507"
-+msgstr "50"
- 
--#: ../app/menus.c:121
-+#: ../app/menus.c:163
- msgid "35.4"
--msgstr ""
-+msgstr "35.4"
- 
--#: ../app/menus.c:122
-+#: ../app/menus.c:164
- msgid "25"
--msgstr ""
-+msgstr "25"
- 
- #. "display_toggle_entries" items go here
--#: ../app/menus.c:126
-+#: ../app/menus.c:170
- msgid "New _View"
--msgstr "�ови поглед"
-+msgstr "�ови _преглед"
- 
--#: ../app/menus.c:127
--#, fuzzy
-+#: ../app/menus.c:171
- msgid "C_lone View"
--msgstr "�ови поглед"
-+msgstr "_Клонирај преглед"
- 
--#: ../app/menus.c:132
-+#: ../app/menus.c:174
- msgid "_Objects"
--msgstr "Објекти"
-+msgstr "_Објекти"
- 
--#: ../app/menus.c:133
-+#: ../app/menus.c:175
- msgid "Send to _Back"
--msgstr "Пошаљи на крај"
-+msgstr "Пошаљи на _крај"
- 
--#: ../app/menus.c:134
-+#: ../app/menus.c:176
- msgid "Bring to _Front"
--msgstr "Додај на површину"
-+msgstr "Изне�и на _површину"
- 
--#: ../app/menus.c:135
-+#: ../app/menus.c:177
- msgid "Send Backwards"
--msgstr "Пошаљи уназад"
-+msgstr "Пошаљи у позадину"
- 
--#: ../app/menus.c:136
-+#: ../app/menus.c:178
- msgid "Bring Forwards"
--msgstr "Додај унапред"
-+msgstr "Изне�и на површину"
- 
--#: ../app/menus.c:138
-+#: ../app/menus.c:180
- msgid "_Group"
- msgstr "_Групиши"
- 
- #. deliberately not using Ctrl+U for Ungroup
--#: ../app/menus.c:140
-+#: ../app/menus.c:182
- msgid "_Ungroup"
--msgstr "О_дгрупиши"
-+msgstr "_Разгрупиши"
- 
--#: ../app/menus.c:142
-+#: ../app/menus.c:184
- msgid "_Parent"
- msgstr "_Садржалац"
- 
--#: ../app/menus.c:143
-+#: ../app/menus.c:185
- msgid "_Unparent"
- msgstr "_�е�адржалац"
- 
--#: ../app/menus.c:144
-+#: ../app/menus.c:186
- msgid "_Unparent Children"
- msgstr "Из_баци из �адржаоца"
- 
- #. Translators: Menu item Verb/Support/Position/Align
--#: ../app/menus.c:146 ../objects/FS/function.c:806
-+#: ../app/menus.c:188 ../objects/FS/function.c:808
- msgid "Align"
--msgstr "Поравнати"
-+msgstr "Поравнај"
- 
--#: ../app/menus.c:151 ../objects/standard/textobj.c:132
-+#: ../app/menus.c:193 ../objects/standard/textobj.c:137
- msgid "Top"
- msgstr "Врх"
- 
--#: ../app/menus.c:152
--#, fuzzy
-+#: ../app/menus.c:194
- msgid "Middle"
- msgstr "Средина"
- 
--#: ../app/menus.c:153 ../objects/standard/textobj.c:131
-+#: ../app/menus.c:195 ../objects/standard/textobj.c:136
- msgid "Bottom"
- msgstr "Дно"
- 
--#: ../app/menus.c:155
- #
-+#: ../app/menus.c:197
- msgid "Spread Out Horizontally"
- msgstr "Рашири водоравно"
- 
--#: ../app/menus.c:156
- #
-+#: ../app/menus.c:198
- msgid "Spread Out Vertically"
- msgstr "Рашири у�правно"
- 
--#: ../app/menus.c:157
-+#: ../app/menus.c:199
- msgid "Adjacent"
--msgstr "Подешавања"
-+msgstr "Припијено"
- 
--#: ../app/menus.c:158
--#, fuzzy
-+#: ../app/menus.c:200
- msgid "Stacked"
--msgstr "Стање"
-+msgstr "�а�лагано"
- 
--#: ../app/menus.c:162
- #
-+#: ../app/menus.c:204
- msgid "_Select"
--msgstr "Изабери"
-+msgstr "_Изабери"
- 
--#: ../app/menus.c:163
-+#: ../app/menus.c:205
- msgid "All"
- msgstr "Све"
- 
--#: ../app/menus.c:164 ../lib/arrows.c:43 ../objects/Jackson/domain.c:96
--#: ../objects/UML/association.c:1183
-+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
-+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
- msgid "None"
- msgstr "�ишта"
- 
--#: ../app/menus.c:165
-+#: ../app/menus.c:207
- msgid "Invert"
- msgstr "Преокрени"
- 
--#: ../app/menus.c:167
-+#: ../app/menus.c:209
- msgid "Transitive"
--msgstr "Прелазни"
-+msgstr "Прелазне"
- 
--#: ../app/menus.c:168
-+#: ../app/menus.c:210
- msgid "Connected"
--msgstr "Повезан"
-+msgstr "Повезане"
- 
--#: ../app/menus.c:169
- #
-+#: ../app/menus.c:211
- msgid "Same Type"
--msgstr "И�ти Тип"
-+msgstr "И�те вр�те"
- 
--#. display_select_radio_entries go here
--#: ../app/menus.c:173
- #
-+#. display_select_radio_entries go here
-+#: ../app/menus.c:215
- msgid "Select By"
--msgstr "Изабери"
-+msgstr "Изабери према"
- 
--#: ../app/menus.c:175
-+#: ../app/menus.c:217
- msgid "_Input Methods"
--msgstr "Методе уно�а"
-+msgstr "_�ачини уно�а"
- 
--#: ../app/menus.c:177
--#, fuzzy
-+#: ../app/menus.c:219
- msgid "D_ialogs"
--msgstr "Про_зори"
-+msgstr "_Прозорчићи"
- 
--#: ../app/menus.c:179
-+#: ../app/menus.c:221
- msgid "D_ebug"
--msgstr ""
-+msgstr "_Уклањање грешака"
- 
--#: ../app/menus.c:185
-+#: ../app/menus.c:227
- msgid "_Tools"
- msgstr "_�лати"
- 
--#: ../app/menus.c:186
-+#: ../app/menus.c:228
- msgid "Modify"
- msgstr "Измени"
- 
--#: ../app/menus.c:188
-+#: ../app/menus.c:230
-+msgid "Edit text"
-+msgstr "Уредите тек�т"
-+
-+#: ../app/menus.c:231
- msgid "Scroll"
--msgstr "Померање тек�та"
-+msgstr "Померање"
- 
--#: ../app/menus.c:210
-+#: ../app/menus.c:254
- msgid "Fullscr_een"
--msgstr ""
-+msgstr "Преко _целог екрана"
- 
--#. we must have all actions registered to avoid configuration specific ui-files and crashing in GTK+,
--#. * see: http://bugzilla.gnome.org/show_bug.cgi?id=396161
--#.
--#: ../app/menus.c:213 ../app/menus.c:218
-+#: ../app/menus.c:256
- msgid "_AntiAliased"
--msgstr "_Омекшано"
-+msgstr "_Умекшано"
- 
--#: ../app/menus.c:220
-+#: ../app/menus.c:257
- msgid "Show _Grid"
--msgstr "Прикажи Мрежу"
-+msgstr "Прикажи _мрежу"
- 
--#: ../app/menus.c:221
-+#: ../app/menus.c:258
- msgid "_Snap To Grid"
--msgstr "Уравнај на мрежу"
-+msgstr "Приони на _мрежу"
- 
--#: ../app/menus.c:222
- #
-+#: ../app/menus.c:259
- msgid "Snap To _Objects"
--msgstr "Уравнај на мрежу"
-+msgstr "Приони на _објекте"
- 
--#: ../app/menus.c:223
-+#: ../app/menus.c:260
- msgid "Show _Rulers"
--msgstr "Прикажи Лењире"
-+msgstr "Прикажи _лењире"
- 
--#: ../app/menus.c:224
-+#: ../app/menus.c:261
- msgid "Show _Connection Points"
--msgstr "Покажи Поене Везе"
--
--#: ../app/menus.c:230
--msgid "Replace"
--msgstr "Замени"
-+msgstr "Прикажи тачке _везе"
- 
--#: ../app/menus.c:231
-+#: ../app/menus.c:268
- msgid "Union"
- msgstr "Унија"
- 
--#: ../app/menus.c:232
--#, fuzzy
-+#: ../app/menus.c:269
- msgid "Intersection"
- msgstr "Пре�ек"
- 
- #. Translators: Menu item Verb/Channel/Export/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
--#: ../app/menus.c:233 ../app/sheets_dialog.c:785 ../objects/FS/function.c:706
--#: ../objects/FS/function.c:858 ../objects/FS/function.c:860
-+#: ../app/menus.c:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
-+#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
- msgid "Remove"
- msgstr "Уклони"
- 
- #. Cannot also be called Invert, duplicate names caused keybinding problems
--#: ../app/menus.c:235
--#, fuzzy
-+#: ../app/menus.c:272
- msgid "Inverse"
--msgstr "Инвертор"
-+msgstr "Изврнуто"
- 
--#: ../app/menus.c:278
-+#: ../app/menus.c:336
- msgid "NULL tooldata in tool_menu_select"
--msgstr "NULL tooldata у tool_menu_select"
-+msgstr "�ИШТ�В�И подаци алата у избору_изборника_алата"
- 
--#: ../app/modify_tool.c:344
--msgid "Couldn't get GTK settings"
--msgstr "�е може да преузме GTK подешавања"
-+#: ../app/menus.c:575
-+msgid "300%"
-+msgstr "300%"
- 
--#: ../app/newgroup.c:117
--#, fuzzy
--msgid "Open group"
--msgstr "Отворена округла"
-+#: ../app/menus.c:576
-+msgid "200%"
-+msgstr "200%"
- 
--#: ../app/paginate_psprint.c:271
--msgid "Select Printer"
--msgstr "Одреди штампач"
-+#: ../app/menus.c:577
-+msgid "150%"
-+msgstr "150%"
- 
--#: ../app/paginate_psprint.c:283 ../sheets/ciscocomputer.sheet.in.h:36
--msgid "Printer"
--msgstr "Штампач"
-+#: ../app/menus.c:578
-+msgid "100%"
-+msgstr "100%"
- 
--#: ../app/paginate_psprint.c:297 ../sheets/Misc.sheet.in.h:1
--msgid "File"
--msgstr "Датотека"
-+#: ../app/menus.c:579
-+msgid "75%"
-+msgstr "75%"
- 
--#: ../app/paginate_psprint.c:312
--msgid "OK"
--msgstr "У реду"
-+#: ../app/menus.c:580
-+msgid "50%"
-+msgstr "50%"
- 
--#: ../app/paginate_psprint.c:458
--#, c-format
--msgid "Could not run command '%s': %s"
--msgstr "�е могу да покренем наредбу „%s“: %s"
-+#: ../app/menus.c:581
-+msgid "25%"
-+msgstr "25%"
- 
--#: ../app/paginate_psprint.c:461
--#, c-format
--msgid "Could not open '%s' for writing: %s"
--msgstr "�е могу да отворим „%s“ ради упи�а: %s"
-+#: ../app/menus.c:582
-+msgid "10%"
-+msgstr "10%"
- 
--#: ../app/paginate_psprint.c:481
--#, c-format
--msgid "Printing error: command '%s' returned %d\n"
--msgstr "Грешка при штампи: наредба „%s“ је вратила %d\n"
-+#: ../app/menus.c:608
-+msgid "Toggles snap-to-grid."
-+msgstr "Пребаците пријањање уз мрежу."
- 
--#: ../app/paginate_psprint.c:492
--#, c-format
--msgid "Printing error: command '%s' caused sigpipe."
--msgstr "Грешка при штампи: наредба „%s“ је изазвала SIGPIPE."
-+#: ../app/menus.c:620
-+msgid "Toggles object snapping."
-+msgstr "Пребаците пријањање објекта."
-+
-+#: ../app/modify_tool.c:392
-+msgid "Couldn't get GTK settings"
-+msgstr "�е могу да добавим ГТК подешавања"
- 
- #: ../app/plugin-manager.c:200
- msgid "Plug-ins"
--msgstr "Додаци"
-+msgstr "Прикључци"
- 
- #: ../app/plugin-manager.c:255
- msgid "Loaded"
--msgstr "Учитано"
--
--#: ../app/plugin-manager.c:262 ../objects/UML/class.c:139
--#: ../objects/UML/large_package.c:131 ../objects/UML/umlattribute.c:37
--#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
--#: ../objects/UML/umlparameter.c:43
--msgid "Name"
--msgstr "Име"
-+msgstr "Учитан"
- 
--#: ../app/plugin-manager.c:268
-+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-+#: ../objects/SISSI/sissi_dialog.c:882
- msgid "Description"
- msgstr "Опи�"
- 
- #: ../app/plugin-manager.c:277
- msgid "Load at Startup"
--msgstr "Учитај при покретању"
-+msgstr "Учитан при покретању"
- 
- #: ../app/plugin-manager.c:284
- msgid "File Name"
- msgstr "�азив датотеке"
- 
--#: ../app/preferences.c:106
-+#: ../app/preferences.c:99 ../app/preferences.c:144
-+msgid "any"
-+msgstr "било који"
-+
-+#: ../app/preferences.c:118
- msgid "User Interface"
--msgstr "Кори�нички интерфеј�"
-+msgstr "Кори�ничко �учеље"
- 
--#: ../app/preferences.c:107
-+#: ../app/preferences.c:119
- msgid "Diagram Defaults"
--msgstr "Подразумевано од дијаграма"
-+msgstr "О�новно дијаграма"
- 
--#: ../app/preferences.c:108
-+#: ../app/preferences.c:120
- msgid "View Defaults"
--msgstr "Преглед подразумеваног"
-+msgstr "О�новно прегледа"
-+
-+#: ../app/preferences.c:121
-+msgid "Favorites"
-+msgstr "Омиљено"
- 
--#: ../app/preferences.c:124
-+#: ../app/preferences.c:165
- msgid "Reset tools after create"
- msgstr "Поново по�тави алате по�ле прављења"
- 
--#: ../app/preferences.c:125
--msgid "Compress saved files"
--msgstr "Компре�уј �нимљене датотеке"
--
--#: ../app/preferences.c:126
-+#: ../app/preferences.c:168
- msgid "Number of undo levels:"
--msgstr "Мак�имални број нивоа поништавања:"
-+msgstr "Број нивоа поништавања:"
- 
--#: ../app/preferences.c:127
-+#: ../app/preferences.c:171
- msgid ""
- "Reverse dragging selects\n"
- "intersecting objects"
-@@ -1590,203 +1716,249 @@ msgstr ""
- "Обрнуто превлачење бира\n"
- "пре�ечне објекте"
- 
--#: ../app/preferences.c:128
-+#: ../app/preferences.c:174
- msgid "Recent documents list size:"
--msgstr "Величина �пи�ка �коро отвараних датотека:"
-+msgstr "Број недавно отвараних датотека:"
- 
--#: ../app/preferences.c:129
-+#: ../app/preferences.c:177
- msgid "Use menu bar"
--msgstr "Кори�ти мени линију"
-+msgstr "Кори�ти линију изборника"
- 
--#: ../app/preferences.c:131
-+#: ../app/preferences.c:180
- msgid "Keep tool box on top of diagram windows"
--msgstr "Држи алатке изнад прозора дијаграма"
-+msgstr "Задржи алате изнад прозора дијаграма"
-+
-+#: ../app/preferences.c:183
-+msgid "Length unit:"
-+msgstr "Јединица дужине:"
-+
-+#: ../app/preferences.c:186
-+msgid "Font-size unit:"
-+msgstr "Величина пи�ма:"
- 
--#: ../app/preferences.c:134
-+#: ../app/preferences.c:189
- msgid "New diagram:"
- msgstr "�ови дијаграм:"
- 
--#: ../app/preferences.c:135
-+#: ../app/preferences.c:190
- msgid "Portrait"
- msgstr "Портрет"
- 
--#: ../app/preferences.c:137
-+#: ../app/preferences.c:192
- msgid "Paper type:"
- msgstr "Вр�та папира:"
- 
--#: ../app/preferences.c:140
-+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1078
- msgid "Background Color:"
- msgstr "Боја позадине:"
- 
--#: ../app/preferences.c:143
-+#: ../app/preferences.c:196
-+msgid "Compress saved files"
-+msgstr "Сажми �ачуване датотеке"
-+
-+#: ../app/preferences.c:199
-+msgid "Connection Points:"
-+msgstr "Тачке везе:"
-+
-+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-+#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
-+msgid "Visible"
-+msgstr "Видљиво"
-+
-+#
-+#: ../app/preferences.c:201
-+msgid "Snap to object"
-+msgstr "Приони на објекат"
-+
-+#: ../app/preferences.c:204
- msgid "New window:"
- msgstr "�ови прозор:"
- 
--#: ../app/preferences.c:144
-+#: ../app/preferences.c:205
- msgid "Width:"
- msgstr "Ширина:"
- 
--#: ../app/preferences.c:145
-+#: ../app/preferences.c:206
- msgid "Height:"
- msgstr "Ви�ина:"
- 
--#: ../app/preferences.c:146
-+#: ../app/preferences.c:207
- msgid "Magnify:"
--msgstr "Увеличај:"
--
--#: ../app/preferences.c:149
--msgid "Connection Points:"
--msgstr "Поени Везе:"
--
--#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
--#: ../app/preferences.c:150 ../app/preferences.c:154 ../app/preferences.c:160
--msgid "Visible"
--msgstr "Видљиво"
-+msgstr "Увеличање:"
- 
--#: ../app/preferences.c:153
-+#: ../app/preferences.c:210
- msgid "Page breaks:"
- msgstr "Преломи �траница:"
- 
--#: ../app/preferences.c:155 ../app/preferences.c:165
-+#: ../app/preferences.c:212 ../app/preferences.c:240
- msgid "Color:"
- msgstr "Боја:"
- 
--#: ../app/preferences.c:156
-+#: ../app/preferences.c:213
- msgid "Solid lines"
- msgstr "Пуне линије"
- 
--#: ../app/preferences.c:161
-+#: ../app/preferences.c:216
-+msgid "Antialias:"
-+msgstr "Умекшавање:"
-+
-+#: ../app/preferences.c:217
-+msgid "view antialised"
-+msgstr "Прикажи умекшано"
-+
-+#. Favored Filter
-+#. Translators: Menu item Verb/Channel/Export
-+#. Translators: Menu item Verb/Channel/Export/Export
-+#: ../app/preferences.c:221 ../objects/FS/function.c:698
-+#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
-+msgid "Export"
-+msgstr "Извоз"
-+
-+#: ../app/preferences.c:223
-+msgid "Portable Network Graphics"
-+msgstr "Прено�на мрежна графика"
-+
-+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
-+#: ../plug-ins/svg/svg-import.c:884
-+msgid "Scalable Vector Graphics"
-+msgstr "Променљива вектор�ка графика"
-+
-+#: ../app/preferences.c:227
-+msgid "PostScript"
-+msgstr "По�т�крипт"
-+
-+#: ../app/preferences.c:229
-+msgid "Windows MetaFile"
-+msgstr "Виндоуз мета-датотека"
-+
-+#: ../app/preferences.c:231
-+msgid "Enhanced MetaFile"
-+msgstr "Побољшана мета-датотека"
-+
-+#: ../app/preferences.c:236
- msgid "Snap to"
- msgstr "Приони на"
- 
--#: ../app/preferences.c:162
-+#: ../app/preferences.c:237
- msgid "Dynamic grid resizing"
--msgstr "Динамична измену величине мреже"
-+msgstr "Динамичка промена величине мреже"
- 
--#: ../app/preferences.c:163
-+#: ../app/preferences.c:238
- msgid "X Size:"
--msgstr "X Величина:"
-+msgstr "Водоравна величина:"
- 
--#: ../app/preferences.c:164
-+#: ../app/preferences.c:239
- msgid "Y Size:"
--msgstr "Y Величина:"
-+msgstr "У�правна величина:"
- 
--#: ../app/preferences.c:166
-+#: ../app/preferences.c:241
- msgid "Lines per major line"
--msgstr "Линије по главној линији"
-+msgstr "Линија по главној линији"
- 
--#: ../app/preferences.c:168
--#, fuzzy
-+#: ../app/preferences.c:243
- msgid "Hex Size:"
--msgstr "X Величина:"
-+msgstr "Хек� величина:"
- 
--#: ../app/preferences.c:184
-+#. There's really no reason to not pretty format it, and allowing non-pretty
-+#. can lead to problems with long lines, CVS etc.
-+#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
-+#. &default_true,0,"pretty formated xml",NULL, TRUE},
-+#.
-+#: ../app/preferences.c:255
- msgid "Diagram tree window:"
- msgstr "Прозор �табла дијаграма:"
- 
--#: ../app/preferences.c:186
-+#: ../app/preferences.c:257
- msgid "Save hidden object types"
- msgstr "Сними типове �акривених објеката"
- 
--#: ../app/preferences.c:394 ../lib/prop_inttypes.c:158
-+#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
- msgid "Yes"
- msgstr "Да"
- 
--#: ../app/preferences.c:394 ../app/preferences.c:405
-+#: ../app/preferences.c:485 ../app/preferences.c:496
- #: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
- msgid "No"
- msgstr "�е"
- 
--#: ../app/preferences.c:507
-+#: ../app/preferences.c:591
- msgid "Preferences"
- msgstr "По�тавке"
- 
--#: ../app/properties.c:55
-+#: ../app/properties-dialog.c:56
- msgid "Object properties"
--msgstr "О�обине objekta"
-+msgstr "Свој�тва објекта"
- 
--#: ../app/properties.c:80
-+#: ../app/properties-dialog.c:81
- msgid "This object has no properties."
--msgstr "Овај објекат нема одређене о�обине."
-+msgstr "Овај објекат нема �вој�тва."
- 
--#: ../app/properties.c:217
-+#: ../app/properties-dialog.c:245
- msgid "Properties: "
--msgstr "О�обине: "
-+msgstr "Свој�тва: "
- 
--#: ../app/properties.c:221
-+#: ../app/properties-dialog.c:249
- msgid "Object properties:"
--msgstr "О�обине објекта:"
--
--#: ../app/render_eps.c:148
--msgid "Encapsulated Postscript (using Pango fonts)"
--msgstr "Угнежђени По�т�крипт (EPS — кори�ти Панго фонтове)"
--
--#: ../app/render_eps.c:157
--msgid "Encapsulated Postscript with preview (using Pango fonts)"
--msgstr "Угњеждени По�т�крипт �а прегледом (EPS — кори�ти Панго фонтове)"
--
--#: ../app/render_eps.c:167
--msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
--msgstr "Угњеждени По�т�крипт (EPS — кори�ти ИСО 8859-1 фонтове)"
-+msgstr "Свој�тва објекта:"
- 
--#: ../app/sheets.c:156
-+#: ../app/sheets.c:162
- #, c-format
- msgid ""
- "%s\n"
- "System sheet"
- msgstr ""
- "%s\n"
--"Си�тем �трана"
-+"Си�тем�ки ли�т"
- 
--#: ../app/sheets.c:158
-+#: ../app/sheets.c:164
- #, c-format
- msgid ""
- "%s\n"
- "User sheet"
- msgstr ""
- "%s\n"
--"Кори�ничка �трана"
-+"Кори�нички ли�т"
- 
--#: ../app/sheets.c:273
-+#: ../app/sheets.c:279
- msgid ""
- "Can't get symbol 'custom_type' from any module.\n"
- "Editing shapes is disabled."
- msgstr ""
--"�е може да нађе �имбол „custom_type“ ни у једном модулу.\n"
-+"�е могу да нађе �имбол „custom_type“ ни у једном модулу.\n"
- "Уређивање облика је и�кључено."
- 
--#: ../app/sheets.c:381
-+#: ../app/sheets.c:399
- #, c-format
- msgid "Widget not found: %s"
- msgstr "Елемент није нађен: %s"
- 
--#: ../app/sheets.c:456
-+#: ../app/sheets.c:474
- msgid "SVG Shape"
--msgstr "SVG облик"
-+msgstr "СВГ облик"
- 
--#: ../app/sheets.c:458
-+#: ../app/sheets.c:476
- msgid "Programmed DiaObject"
--msgstr "Програмирани диа објекат"
-+msgstr "Програмирани објекат Дие"
- 
- #: ../app/sheets_dialog.c:84
- msgid "Sheets and Objects"
--msgstr "Површине и објекти"
-+msgstr "Ли�тови и објекти"
- 
--#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:178
-+#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
- msgid "<- Copy"
--msgstr "<- Копирај"
-+msgstr "<— Умножи"
- 
--#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:180
-+#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
- msgid "<- Copy All"
--msgstr "<- Копирај Све"
-+msgstr "<— Умножи �ве"
- 
--#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:182
-+#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
- msgid "<- Move"
--msgstr "<- Помери"
-+msgstr "<— Преме�ти"
- 
--#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:184
-+#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
- msgid "<- Move All"
--msgstr "<- Омогући Све"
-+msgstr "<— Преме�ти �ве"
- 
- #: ../app/sheets_dialog.c:234
- msgid "Edit"
-@@ -1801,9 +1973,10 @@ msgid "New"
- msgstr "�ово"
- 
- #: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
--#: ../objects/Istar/actor.c:144 ../objects/Istar/actor.c:145
--#: ../objects/Istar/other.c:148 ../objects/Istar/other.c:149
--#: ../objects/KAOS/other.c:151 ../objects/KAOS/other.c:152
-+#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
-+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
- #: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
- #: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
- msgid "Type"
-@@ -1825,8 +1998,8 @@ msgstr "опи�:"
- msgid "Sheet name:"
- msgstr "Име �тране:"
- 
--#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:290
--#: ../app/sheets_dialog_callbacks.c:1093
-+#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
-+#: ../app/sheets_dialog_callbacks.c:1109
- msgid "Line Break"
- msgstr "Прелом линије"
- 
-@@ -1842,12 +2015,12 @@ msgstr "Диа Објекат"
- msgid "Description:"
- msgstr "Опи�:"
- 
--#: ../app/sheets_dialog.c:619 ../objects/FS/flow-ortho.c:169
--#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:164
--#: ../objects/Jackson/phenomenon.c:144 ../objects/KAOS/metaandorrel.c:164
--#: ../objects/KAOS/metabinrel.c:171 ../objects/UML/class_dialog.c:975
--#: ../objects/UML/class_dialog.c:1928 ../objects/UML/class_dialog.c:2166
--#: ../objects/UML/class_dialog.c:2692
-+#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:695
-+#: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
-+#: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
-+#: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
-+#: ../objects/UML/class_dialog.c:1159 ../objects/UML/class_dialog.c:2025
-+#: ../objects/UML/class_dialog.c:2261 ../objects/UML/class_dialog.c:2864
- msgid "Type:"
- msgstr "Вр�та:"
- 
-@@ -1855,15 +2028,15 @@ msgstr "Вр�та:"
- msgid "Sheet"
- msgstr "Страна"
- 
--#: ../app/sheets_dialog.c:673 ../objects/ER/attribute.c:153
--#: ../objects/ER/entity.c:135 ../objects/ER/relationship.c:140
--#: ../objects/UML/association.c:238 ../objects/UML/association.c:1160
--#: ../objects/UML/class_dialog.c:964 ../objects/UML/class_dialog.c:1917
--#: ../objects/UML/class_dialog.c:2155 ../objects/UML/class_dialog.c:2681
--#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:131
--#: ../objects/UML/realizes.c:132
-+#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
-+#: ../objects/Database/table_dialog.c:1046 ../objects/ER/attribute.c:155
-+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-+#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
-+#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
-+#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-+#: ../objects/UML/realizes.c:134
- msgid "Name:"
--msgstr "Име:"
-+msgstr "�азив:"
- 
- #: ../app/sheets_dialog.c:810
- msgid "DiaObject:"
-@@ -1875,25 +2048,25 @@ msgstr "Страна:"
- 
- #: ../app/sheets_dialog.c:921
- msgid "Select SVG Shape File"
--msgstr "Изаберите SVG облик датотеке"
-+msgstr "Изаберите датотеку СВГ облика"
- 
--#: ../app/sheets_dialog_callbacks.c:165
-+#: ../app/sheets_dialog_callbacks.c:167
- msgid "Copy ->"
--msgstr "Копирај ->"
-+msgstr "Умножи —>"
- 
--#: ../app/sheets_dialog_callbacks.c:167
-+#: ../app/sheets_dialog_callbacks.c:169
- msgid "Copy All ->"
--msgstr "Копирај Све ->"
-+msgstr "Умножи �ве —>"
- 
--#: ../app/sheets_dialog_callbacks.c:169
-+#: ../app/sheets_dialog_callbacks.c:171
- msgid "Move ->"
--msgstr "Помери ->"
-+msgstr "Преме�ти —>"
- 
--#: ../app/sheets_dialog_callbacks.c:171
-+#: ../app/sheets_dialog_callbacks.c:173
- msgid "Move All ->"
--msgstr "Омогући Све ->"
-+msgstr "Преме�ти �ве —>"
- 
--#: ../app/sheets_dialog_callbacks.c:304
-+#: ../app/sheets_dialog_callbacks.c:306
- #, c-format
- msgid ""
- "%s\n"
-@@ -1902,7 +2075,7 @@ msgstr ""
- "%s\n"
- "Облик"
- 
--#: ../app/sheets_dialog_callbacks.c:307
-+#: ../app/sheets_dialog_callbacks.c:309
- #, c-format
- msgid ""
- "%s\n"
-@@ -1911,72 +2084,76 @@ msgstr ""
- "%s\n"
- "Објекат"
- 
--#: ../app/sheets_dialog_callbacks.c:310
-+#: ../app/sheets_dialog_callbacks.c:312
- #, c-format
- msgid ""
- "%s\n"
- "Unassigned type"
- msgstr ""
- "%s\n"
--"Тип неодређеног предзнака"
-+"�едодељена вр�та"
- 
--#: ../app/sheets_dialog_callbacks.c:801
-+#: ../app/sheets_dialog_callbacks.c:803
- #, c-format
- msgid "Filename must end with '%s': '%s'"
--msgstr "Датотека �е мора завршити �а '%s': '%s'"
-+msgstr "Датотека мора да �е заврши на „%s“: „%s“"
- 
--#: ../app/sheets_dialog_callbacks.c:809
-+#: ../app/sheets_dialog_callbacks.c:811
- #, c-format
- msgid "Error examining %s: %s"
- msgstr "Грешка и�питујући %s: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:830
-+#: ../app/sheets_dialog_callbacks.c:842
-+msgid "Please export the diagram as a shape."
-+msgstr "Молим извезите дијаграм као облик."
-+
-+#: ../app/sheets_dialog_callbacks.c:845
- #, c-format
- msgid "Could not interpret shape file: '%s'"
--msgstr "�е могу преве�ти облик датотеке: '%s'"
-+msgstr "�е могу да преведем датотеку облика: „%s“"
- 
--#: ../app/sheets_dialog_callbacks.c:900
-+#: ../app/sheets_dialog_callbacks.c:916
- msgid "Sheet must have a Name"
--msgstr "Страна мора имати име"
-+msgstr "Ли�т мора имати назив"
- 
--#: ../app/sheets_dialog_callbacks.c:1597 ../app/sheets_dialog_callbacks.c:1604
-+#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
- #, c-format
- msgid "Couldn't open '%s': %s"
--msgstr "�е може да отвори '%s': %s"
-+msgstr "�е могу да отворим „%s“: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1656
-+#: ../app/sheets_dialog_callbacks.c:1680
- #, c-format
- msgid "Couldn't open: '%s' for writing"
--msgstr "�е може да отвори: '%s' за пи�ање"
-+msgstr "�е могу да отворим: „%s“ за пи�ање"
- 
--#: ../app/sheets_dialog_callbacks.c:1666
-+#: ../app/sheets_dialog_callbacks.c:1690
- msgid "a user"
- msgstr "кори�ник"
- 
--#: ../app/sheets_dialog_callbacks.c:1679
-+#: ../app/sheets_dialog_callbacks.c:1703
- #, c-format
- msgid "File: %s"
- msgstr "Датотека: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1682
-+#: ../app/sheets_dialog_callbacks.c:1706
- #, c-format
- msgid "Date: %s"
- msgstr "Датум: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1686
-+#: ../app/sheets_dialog_callbacks.c:1710
- #, c-format
- msgid "For: %s"
- msgstr "За: %s"
- 
--#: ../app/sheets_dialog_callbacks.c:1703
-+#: ../app/sheets_dialog_callbacks.c:1727
- msgid "add shapes here"
- msgstr "додај облик овде"
- 
--#: ../app/splash.c:56
-+#: ../app/splash.c:57
- msgid "Loading ..."
--msgstr "Учитава..."
-+msgstr "Учитавам ..."
- 
--#: ../app/splash.c:74
-+#: ../app/splash.c:75
- #, c-format
- msgid "Dia v %s"
- msgstr "Диа в %s"
-@@ -1987,352 +2164,310 @@ msgstr "Диа уређивач дијаграма"
- 
- #: ../dia.desktop.in.in.h:2
- msgid "Edit your Diagrams"
--msgstr "Уређивање ваших дијаграм"
-+msgstr "Уређујте ваше дијаграме"
- 
--#: ../lib/arrows.c:44
-+#: ../lib/arrows.c:1899
- msgid "Lines"
--msgstr "Линија"
-+msgstr "Линије"
- 
--#: ../lib/arrows.c:45
-+#: ../lib/arrows.c:1900
- msgid "Hollow Triangle"
- msgstr "Уоквирени троугао"
- 
--#: ../lib/arrows.c:46
-+#: ../lib/arrows.c:1901
- msgid "Filled Triangle"
- msgstr "И�пуњени троугао"
- 
--#: ../lib/arrows.c:47
-+#: ../lib/arrows.c:1902
- msgid "Unfilled Triangle"
- msgstr "�еи�пуњени троугао"
- 
--#: ../lib/arrows.c:48
-+#: ../lib/arrows.c:1903
- msgid "Hollow Diamond"
--msgstr "Уоквирени дијамант"
-+msgstr "Уоквирени ромб"
- 
--#: ../lib/arrows.c:49
-+#: ../lib/arrows.c:1904
- msgid "Filled Diamond"
--msgstr "И�пуњени дијамант"
-+msgstr "И�пуњени ромб"
- 
--#: ../lib/arrows.c:50
-+#: ../lib/arrows.c:1905
- msgid "Half Diamond"
--msgstr "Пола дијаманта"
-+msgstr "Полуромб"
- 
--#: ../lib/arrows.c:51
-+#: ../lib/arrows.c:1906
- msgid "Half Head"
--msgstr "Пола Главе"
-+msgstr "Пола врха"
- 
--#: ../lib/arrows.c:52
-+#: ../lib/arrows.c:1907
- msgid "Slashed Cross"
- msgstr "Прецртани кр�т"
- 
--#: ../lib/arrows.c:53
-+#: ../lib/arrows.c:1908
- msgid "Filled Ellipse"
--msgstr "И�пуњена Елип�а"
-+msgstr "И�пуњена елип�а"
- 
--#: ../lib/arrows.c:54
-+#: ../lib/arrows.c:1909
- msgid "Hollow Ellipse"
--msgstr "Уоквирена Елип�а"
-+msgstr "Уоквирена елип�а"
- 
--#: ../lib/arrows.c:55
-+#: ../lib/arrows.c:1910
- msgid "Filled Dot"
--msgstr "И�пуњена Тачку"
-+msgstr "И�пуњена тачка"
- 
--#: ../lib/arrows.c:56
-+#: ../lib/arrows.c:1911
- msgid "Dimension Origin"
--msgstr "Порекло Димензија"
-+msgstr "Порекло димензије"
- 
--#: ../lib/arrows.c:57
-+#: ../lib/arrows.c:1912
- msgid "Blanked Dot"
- msgstr "Празна тачка"
- 
--#: ../lib/arrows.c:58
-+#: ../lib/arrows.c:1913
- msgid "Double Hollow Triangle"
- msgstr "Дво�труки уоквирени троугао"
- 
--#: ../lib/arrows.c:59
-+#: ../lib/arrows.c:1914
- msgid "Double Filled Triangle"
- msgstr "Дво�труки и�пуњени троугао"
- 
--#: ../lib/arrows.c:60
-+#: ../lib/arrows.c:1915
- msgid "Filled Dot and Triangle"
- msgstr "И�пуњена тачка и троугао"
- 
--#: ../lib/arrows.c:61
-+#: ../lib/arrows.c:1916
- msgid "Filled Box"
--msgstr "И�пуњена кућица"
-+msgstr "И�пуњен квадратић"
- 
--#: ../lib/arrows.c:62
-+#: ../lib/arrows.c:1917
- msgid "Blanked Box"
--msgstr "Празна кућица"
-+msgstr "Празан квадратић"
- 
--#: ../lib/arrows.c:63
-+#: ../lib/arrows.c:1918
- msgid "Slashed"
- msgstr "Прецртано"
- 
--#: ../lib/arrows.c:64
-+#: ../lib/arrows.c:1919
- msgid "Integral Symbol"
--msgstr "Интегрални Симбол"
-+msgstr "Симбол интеграла"
- 
--#: ../lib/arrows.c:65
-+#: ../lib/arrows.c:1920
- msgid "Crow Foot"
- msgstr "�ога вране"
- 
--#: ../lib/arrows.c:66
-+#: ../lib/arrows.c:1921
- msgid "Cross"
--msgstr "Унакр�но"
-+msgstr "Унакр�т"
- 
--#: ../lib/arrows.c:67
-+#: ../lib/arrows.c:1922
- msgid "1-or-many"
- msgstr "1-или-више"
- 
--#: ../lib/arrows.c:68
-+#: ../lib/arrows.c:1923
- msgid "0-or-many"
- msgstr "0-или-више"
- 
--#: ../lib/arrows.c:69
-+#: ../lib/arrows.c:1924
- msgid "1-or-0"
- msgstr "1-или-0"
- 
--#: ../lib/arrows.c:70
-+#: ../lib/arrows.c:1925
- msgid "1 exactly"
--msgstr "тачно 1"
-+msgstr "Тачно 1"
- 
--#: ../lib/arrows.c:71
-+#: ../lib/arrows.c:1926
- msgid "Filled Concave"
--msgstr "И�пуњено конкавно"
-+msgstr "И�пуњено удубљење"
- 
--#: ../lib/arrows.c:72
-+#: ../lib/arrows.c:1927
- msgid "Blanked Concave"
--msgstr "И�пражњено конкавно"
-+msgstr "И�пражњено удубљење"
- 
--#: ../lib/arrows.c:73
-+#: ../lib/arrows.c:1928
- msgid "Round"
--msgstr "Округла"
-+msgstr "Округло"
- 
--#: ../lib/arrows.c:74
-+#: ../lib/arrows.c:1929
- msgid "Open Round"
--msgstr "Отворена округла"
-+msgstr "Округло отворено"
- 
--#: ../lib/arrows.c:75
-+#: ../lib/arrows.c:1930
- msgid "Backslash"
--msgstr ""
-+msgstr "Контра ко�а црта"
- 
--#: ../lib/arrows.c:76
-+#: ../lib/arrows.c:1931
- msgid "Infinite Line"
--msgstr ""
-+msgstr "Бе�коначна линија"
- 
--#: ../lib/arrows.c:1892
-+#: ../lib/arrows.c:2059
- msgid "Arrow head of unknown type"
--msgstr ""
-+msgstr "Врх �трелице непознате вр�те"
- 
--#: ../lib/arrows.c:1900
-+#: ../lib/arrows.c:2067
- #, c-format
- msgid "Arrow head of type %s has too small dimensions, removing.\n"
--msgstr ""
-+msgstr "Врх �трелице вр�те „%s“ има и�увише мале димензије; уклањам је.\n"
- 
--#: ../lib/arrows.c:2021
--#, fuzzy
-+#: ../lib/arrows.c:2200
- msgid "unknown arrow"
--msgstr "Стрелица надоле"
-+msgstr "непозната �трелица"
- 
- #: ../lib/bezier_conn.c:636
- msgid "Internal error: Setting corner type of endpoint of bezier"
- msgstr ""
--"Унутрашња грешка: По�тављање ћошка�тог типа на крајњу тачку безијерове криве"
-+"Унутрашња грешка: По�тављање угаоне вр�те крајње тачке безијерове криве"
- 
- #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
- #: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
--#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:335
--#: ../plug-ins/svg/svg-import.c:204 ../plug-ins/vdx/vdx-import.c:140
-+#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-+#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
- msgid "Can't find standard object"
--msgstr "�е могу да нађем �тандардан објекат"
-+msgstr "�е могу да нађем уобичајени објекат"
- 
--#: ../lib/dia_dirs.c:238
-+#: ../lib/dia_dirs.c:242
- #, c-format
- msgid "%s<illegal characters>..."
- msgstr "%s<недозвољени знаци>..."
- 
--#: ../lib/dia_dirs.c:269
-+#: ../lib/dia_dirs.c:273
- #, c-format
- msgid "Too many ..'s in filename %s\n"
--msgstr ""
-+msgstr "Превише „..“ у називу датотеке %s\n"
- 
--#: ../lib/dia_xml.c:163
-+#: ../lib/dia_xml.c:192
- #, c-format
- msgid ""
- "The file %s has no encoding specification;\n"
- "assuming it is encoded in %s"
- msgstr ""
--"Датотека %s не �адржи навод кодирања;\n"
-+"Датотека „%s“ не �адржи навод кодирања;\n"
- "претпо�тављам да је кодирана помоћу %s"
- 
--#: ../lib/dia_xml.c:565
-+#: ../lib/dia_xml.c:597
- msgid "Taking point value of non-point node."
--msgstr "Узима вредно�т тачке за чвор који није тачка."
-+msgstr "Узимам вредно�т тачке за чвор који није тачка."
- 
--#: ../lib/dia_xml.c:576
-+#: ../lib/dia_xml.c:608
- #, c-format
- msgid "Incorrect x Point value \"%s\" %f; discarding it."
- msgstr "�еи�правна x-вредно�т тачке „%s“ %f; занемарујем је."
- 
--#: ../lib/dia_xml.c:583
-+#: ../lib/dia_xml.c:615
- msgid "Error parsing point."
--msgstr "Грешка при рашчлањивању тачке."
-+msgstr "Грешка рашчлањивања тачке."
- 
- #. don't bother with useless warnings (see above)
--#: ../lib/dia_xml.c:591
-+#: ../lib/dia_xml.c:623
- #, c-format
- msgid "Incorrect y Point value \"%s\" %f; discarding it."
- msgstr "�еи�правна y-вредно�т тачке „%s“ %f; занемарујем је."
- 
--#: ../lib/dia_xml.c:1063
--msgid ""
--"Your local character set is UTF-8. Because of issues with libxml1 and the "
--"support of files generated by previous versions of dia, you will encounter  "
--"problems. Please report to dia-list@gnome.org if you see this message."
--msgstr ""
--"Ваш локални �куп знакова је УТФ-8. Због проблема �а libxml1-ом и подршком "
--"датотека из претходног издања Дие, наићи ћете на неприлике. Молим пријавите "
--"на dia-list@gnome.org уколико угледате ову поруку."
--
--#: ../lib/diaarrowchooser.c:322
--msgid "Arrow Properties"
--msgstr "По�тавке �трелица"
--
--#: ../lib/diaarrowchooser.c:421 ../lib/dialinechooser.c:333
--msgid "Details..."
--msgstr "Детаљи..."
--
--#  This is the default text shown in the preview entry, though the user
--#  can set it. Remember that some fonts only have capital letters.
--#. This is the default text shown in the preview entry, though the user
--#. can set it. Remember that some fonts only have capital letters.
--#: ../lib/diagtkfontsel.c:74
--msgid "abcdefghijk ABCDEFGHIJK"
--msgstr "абвгдђежзијк �БВГДЂЕЖЗИЈК"
--
--#: ../lib/diagtkfontsel.c:209
--msgid "Font name"
--msgstr "Име �ловног лика"
--
--#: ../lib/diagtkfontsel.c:210
--msgid "The X string that represents this font."
--msgstr "X низ знакова који пред�тавља овај �ловни лик."
-+#: ../lib/dia_xml.c:640
-+msgid "Taking bezpoint value of non-point node."
-+msgstr "Узимам вредно�т безиер тачке за чвор који није тачка."
- 
--#: ../lib/diagtkfontsel.c:216
--msgid "Preview text"
--msgstr "Преглед тек�та"
-+#: ../lib/dia_xml.c:658
-+msgid "Error parsing bezpoint p1."
-+msgstr "Грешка рашчлањивања безиер тачке т1."
- 
--#: ../lib/diagtkfontsel.c:217
--msgid "The text to display in order to demonstrate the selected font."
--msgstr "Тек�т који �е приказује ради и�пробавања изабраног пи�ма"
-+#: ../lib/dia_xml.c:672
-+msgid "Error parsing bezpoint p2."
-+msgstr "Грешка рашчлањивања безиер тачке т2."
- 
--#: ../lib/diagtkfontsel.c:321
--msgid "_Family:"
--msgstr "Породица:"
-+#: ../lib/dia_xml.c:686
-+msgid "Error parsing bezpoint p3."
-+msgstr "Грешка рашчлањивања безиер тачке т3."
- 
--#: ../lib/diagtkfontsel.c:327
--msgid "_Style:"
--msgstr "Стил:"
--
--#: ../lib/diagtkfontsel.c:333
--msgid "Si_ze:"
--msgstr "Величина:"
-+#: ../lib/diaarrowchooser.c:361
-+msgid "Arrow Properties"
-+msgstr "Свој�тва �трелице"
- 
--#. create the text entry widget
--#: ../lib/diagtkfontsel.c:462
--msgid "_Preview:"
--msgstr "Преглед:"
-+#: ../lib/dialinechooser.c:297
-+msgid "Line Style Properties"
-+msgstr "Свој�тва �тила линије"
- 
--#: ../lib/diagtkfontsel.c:1252
--msgid "Font Selection"
--msgstr "Избор �ловног лика"
-+#: ../lib/dialinechooser.c:339
-+msgid "Details..."
-+msgstr "Детаљи..."
- 
--#: ../lib/dialibartrenderer.c:295
--msgid "gdk_renderer: Unsupported fill mode specified!\n"
--msgstr "gdk_renderer: �аведен је неподржани режим и�пуњавања!\n"
-+#: ../lib/dialogs.c:51
-+msgid "Ok"
-+msgstr "У реду"
- 
--#: ../lib/dialinechooser.c:297
--msgid "Line Style Properties"
--msgstr "По�тавке Стила Линија"
-+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
-+msgid "Cancel"
-+msgstr "Поништи"
- 
--#: ../lib/filter.c:126
-+#: ../lib/filter.c:177
- #, c-format
- msgid "Multiple export filters with unique name %s"
--msgstr "Више извозних филтера �а једин�твеним именом %s"
-+msgstr "Више филтера извожења �а једин�твеним називом %s"
- 
--#: ../lib/font.c:102
-+#: ../lib/font.c:84
- #, c-format
- msgid "Can't load font %s.\n"
--msgstr "�е могу да учитам �ловни лик %s.\n"
-+msgstr "�е могу да учитам пи�мо %s.\n"
- 
--#: ../lib/message.c:80 ../lib/message.c:226
-+#: ../lib/message.c:92 ../lib/message.c:278
- msgid "Warning"
- msgstr "Упозорење"
- 
--#: ../lib/message.c:106
-+#: ../lib/message.c:119
- msgid "There is one similar message."
- msgstr "По�тоји једна и�та порука."
- 
--#: ../lib/message.c:111
-+#: ../lib/message.c:124
- msgid "Show repeated messages"
- msgstr "Прикажи поновљене поруке"
- 
--#: ../lib/message.c:170
-+#: ../lib/message.c:145
-+msgid "Don't show this message again"
-+msgstr "�е приказуј више ову поруку"
-+
-+#: ../lib/message.c:203
- #, c-format
- msgid "There are %d similar messages."
--msgstr "По�тоји %d и�тих порука."
-+msgstr "По�тоје %d и�те поруке."
- 
--#: ../lib/message.c:215
-+#: ../lib/message.c:262
- msgid "Notice"
- msgstr "�апомена"
- 
--#: ../lib/object_defaults.c:127
-+#: ../lib/newgroup.c:124
-+msgid "Open group"
-+msgstr "Отворена група"
-+
-+#: ../lib/object_defaults.c:128
- #, c-format
- msgid ""
- "Error loading defaults '%s'.\n"
- "Not a Dia diagram file."
- msgstr ""
--"Грешка при учитавању подразумеваних „%s“.\n"
--"�е пред�тавља датотеку �а Диа дијаграмом."
-+"Грешка учитавања подразумеваних „%s“.\n"
-+"�ије датотека дијаграма Дие."
- 
--#: ../lib/plug-ins.c:120
-+#: ../lib/plug-ins.c:111
- msgid "???"
- msgstr "???"
- 
--#: ../lib/plug-ins.c:227
--#, c-format
--msgid "Could not deduce correct path for `%s'"
--msgstr "�е могу да изведем и�правну путању за „%s“"
--
--#: ../lib/plug-ins.c:233
--#, c-format
--msgid ""
--"Could not load plugin '%s'\n"
--"%s"
--msgstr ""
--"�е могу да учитам датотеку „%s“\n"
--"%s"
--
--#: ../lib/plug-ins.c:246
-+#: ../lib/plug-ins.c:186
- #, c-format
--msgid "Could not find plugin init function in `%s'"
--msgstr "�е могу да нађем функцију за покретање додатка у „%s“"
-+msgid "Missing dependencies for '%s'?"
-+msgstr "�едо�тају зави�но�ти за „%s“?"
- 
--#: ../lib/plug-ins.c:248
-+#: ../lib/plug-ins.c:197
- msgid "Missing symbol 'dia_plugin_init'"
- msgstr "�едо�таје �имбол „dia_plugin_init“"
- 
--#: ../lib/plug-ins.c:256 ../lib/plug-ins.c:264
-+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
- msgid "dia_plugin_init() call failed"
--msgstr "Позив функције dia_plugin_init() није у�пео"
-+msgstr "�ије у�пео позив функције „dia_plugin_init()“"
- 
--#: ../lib/plug-ins.c:283
-+#: ../lib/plug-ins.c:232
- #, c-format
- msgid "%s Plugin could not be unloaded"
--msgstr "�е могу да уга�им додатак %s"
-+msgstr "�е могу да уга�им прикључак „%s“"
- 
--#: ../lib/plug-ins.c:371
-+#: ../lib/plug-ins.c:303
- #, c-format
- msgid ""
- "Could not open `%s'\n"
-@@ -2341,318 +2476,730 @@ msgstr ""
- "�е могу да отворим „%s“\n"
- "„%s“"
- 
--#: ../lib/prop_text.c:466
-+#: ../lib/prop_dict.c:43
-+msgid "Author"
-+msgstr "�утор"
-+
-+#: ../lib/prop_dict.c:44
-+msgid "Identifier"
-+msgstr "Идентификатор"
-+
-+#: ../lib/prop_dict.c:45
-+msgid "Creation date"
-+msgstr "Време �тварања"
-+
-+#: ../lib/prop_dict.c:46
-+msgid "Modification date"
-+msgstr "Време измене"
-+
-+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
-+msgid "URL"
-+msgstr "�дре�а"
-+
-+#: ../lib/prop_inttypes.c:558
-+msgid "Property cast from int to enum out of range"
-+msgstr "Обликовање �вој�тва из „int“ у „enum“ је ван оп�ега"
-+
-+#: ../lib/prop_text.c:469
- #, c-format
- msgid "Group with %d objects"
--msgstr ""
-+msgstr "Група од %d објекта"
- 
--#: ../lib/properties.c:64 ../lib/properties.h:469 ../lib/widgets.c:638
-+#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
- msgid "Left"
- msgstr "Лево"
- 
--#: ../lib/properties.c:65 ../lib/properties.h:470 ../lib/widgets.c:644
--#: ../objects/standard/textobj.c:133
-+#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
-+#: ../objects/standard/textobj.c:138
- msgid "Center"
--msgstr "Центар"
-+msgstr "Средина"
- 
--#: ../lib/properties.c:66 ../lib/properties.h:471 ../lib/widgets.c:650
-+#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
- msgid "Right"
- msgstr "Де�но"
- 
--#: ../lib/properties.c:73 ../lib/properties.h:487 ../lib/properties.h:490
--#: ../objects/chronogram/chronoline.c:179
--#: ../objects/chronogram/chronoref.c:158
-+#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
-+#: ../objects/chronogram/chronoline.c:181
-+#: ../objects/chronogram/chronoref.c:160
- msgid "Line color"
- msgstr "Боја линије"
- 
--#: ../lib/properties.c:74 ../lib/properties.h:493 ../lib/properties.h:496
-+#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
- msgid "Line style"
--msgstr "Стил Линије"
-+msgstr "Стил линије"
- 
--#: ../lib/properties.c:75 ../lib/properties.h:500 ../lib/properties.h:503
-+#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
- msgid "Fill color"
--msgstr "Боја попуњавања"
-+msgstr "Боја и�пуњавања"
- 
--#: ../lib/properties.c:76 ../lib/properties.h:506 ../lib/properties.h:509
-+#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
- msgid "Draw background"
--msgstr "И�цртај позадину радне површине"
-+msgstr "И�цртај позадину"
- 
--#: ../lib/properties.c:77 ../lib/properties.h:513
-+#: ../lib/properties.c:78 ../lib/properties.h:523
- msgid "Start arrow"
- msgstr "Почетна �трелица"
- 
--#: ../lib/properties.c:78 ../lib/properties.h:516
-+#: ../lib/properties.c:79 ../lib/properties.h:526
- msgid "End arrow"
- msgstr "Крајња �трелица"
- 
--#: ../lib/properties.c:80 ../lib/properties.h:526
-+#: ../lib/properties.c:81 ../lib/properties.h:536
- msgid "Text alignment"
- msgstr "Поравнање тек�та"
- 
- #. all this just to make the defaults selectable ...
--#: ../lib/properties.c:81 ../lib/properties.h:531
--#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:165
--#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class.c:169
--#: ../objects/UML/class_dialog.c:394 ../objects/chronogram/chronoline.c:183
--#: ../objects/chronogram/chronoref.c:164
--msgid "Font"
--msgstr "Словни лик"
--
--#: ../lib/properties.c:82 ../lib/properties.h:537
-+#: ../lib/properties.c:82 ../lib/properties.h:541
-+#: ../objects/Database/table_dialog.c:1036 ../objects/Database/reference.c:117
- #: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
--#: ../objects/GRAFCET/transition.c:144 ../objects/chronogram/chronoline.c:185
-+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
-+#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
- #: ../objects/chronogram/chronoref.c:166
-+msgid "Font"
-+msgstr "Пи�мо"
-+
-+#: ../lib/properties.c:83 ../lib/properties.h:549
-+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
-+#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
-+#: ../objects/chronogram/chronoref.c:168
- msgid "Font size"
- msgstr "Величина пи�ма"
- 
--#: ../lib/properties.c:83 ../lib/properties.h:543
--#: ../objects/GRAFCET/step.c:169 ../objects/chronogram/chronoline.c:187
--#: ../objects/chronogram/chronoref.c:168
-+#: ../lib/properties.c:84 ../lib/properties.h:555
-+#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-+#: ../objects/chronogram/chronoref.c:170
- msgid "Text color"
- msgstr "Боја тек�та"
- 
- #: ../lib/proplist.c:163
- #, c-format
- msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
-+msgstr "�ема атрибута „%s“ (%p) или нема података (%p) у овом атрибуту"
-+
-+#: ../lib/sheet.c:69 ../lib/sheet.c:84
-+#, c-format
-+msgid ""
-+"DiaObject '%s' needed in sheet '%s' was not found.\n"
-+"It will not be available for use."
-+msgstr ""
-+"Објекат Дие „%s“ потребан у ли�ту „%s“ није пронађен.\n"
-+"�еће бити до�тупан за коришћење."
-+
-+#: ../lib/sheet.c:314
-+#, c-format
-+msgid ""
-+"The system sheet '%s' appears to be more recent than your custom\n"
-+"version and has been loaded as '%s' for this session.\n"
-+"\n"
-+"Move new objects (if any) from '%s' into your custom sheet\n"
-+"or remove '%s', using the 'Sheets and Objects' dialog."
-+msgstr ""
-+"Си�тем�ки ли�т „%s“ изгледа да је �корији од вашег произвољног\n"
-+"издања и учитан је као „%s“ за ову �е�ију.\n"
-+"\n"
-+"Преме�тите нове објекте (ако их има) из „%s“ у ваш произвољни ли�т\n"
-+"или уклоните „%s“, кори�тећи прозорче „Ли�тови и објекти“."
-+
-+#: ../lib/sheet.c:371
-+#, c-format
-+msgid "%s: you should use object tags rather than shape tags now"
- msgstr ""
-+"%s: �ада би�те требали да кори�тите ознаке објекта уме�то ознака облика"
- 
--#: ../lib/widgets.c:375
-+#: ../lib/widgets.c:441
- msgid "Other fonts"
--msgstr "О�тали �ловни ликови"
-+msgstr "О�тала пи�ма"
- 
--#: ../lib/widgets.c:445
-+#: ../lib/widgets.c:513
- #, c-format
- msgid "Couldn't find font family for %s\n"
--msgstr "�е могу да нађем породицу фонта за %s\n"
-+msgstr "�е могу да нађем породицу пи�ма за %s\n"
- 
- # bug: "Solid material" is waaay different from "solid line" in Serbian
- #. Translators: Menu item Noun/Material/Solid
--#: ../lib/widgets.c:786 ../objects/FS/function.c:1074
-+#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
- msgid "Solid"
- msgstr "Пуна"
- 
--#: ../lib/widgets.c:792
-+#: ../lib/widgets.c:902
- msgid "Dashed"
--msgstr "Црткано"
-+msgstr "И�прекидана"
- 
--#: ../lib/widgets.c:798
-+#: ../lib/widgets.c:908
- msgid "Dash-Dot"
- msgstr "Црта-Тачка"
- 
--#: ../lib/widgets.c:804
-+#: ../lib/widgets.c:914
- msgid "Dash-Dot-Dot"
- msgstr "Црта-Тачка-Тачка"
- 
--#: ../lib/widgets.c:810
-+#: ../lib/widgets.c:920
- msgid "Dotted"
--msgstr "Тачка�то"
-+msgstr "Тачка�та"
- 
- #. fs->sizebox = GTK_HBOX(box);
--#: ../lib/widgets.c:829
-+#: ../lib/widgets.c:938
- msgid "Dash length: "
--msgstr "Дужина црте:"
-+msgstr "Дужина црте: "
- 
--#: ../lib/widgets.c:959
-+#: ../lib/widgets.c:1066
- msgid "Select color"
--msgstr "Изабери боју"
-+msgstr "Изаберите боју"
- 
--#: ../lib/widgets.c:1025
-+#: ../lib/widgets.c:1132
- msgid "More colors..."
- msgstr "Још боја..."
- 
--#: ../lib/widgets.c:1149
-+#: ../lib/widgets.c:1280
- msgid "More arrows"
- msgstr "Још �трелица"
- 
--#: ../lib/widgets.c:1162
-+#: ../lib/widgets.c:1297
- msgid "Size: "
- msgstr "Величина: "
- 
--#: ../lib/widgets.c:1314
-+#: ../lib/widgets.c:1475
- msgid "Select image file"
--msgstr "Одаберите датотеку �а �ликом"
-+msgstr "Изаберите датотеку �лике"
- 
--#: ../lib/widgets.c:1348
-+#: ../lib/widgets.c:1523
- msgid "Browse"
- msgstr "Претражи"
- 
--#: ../lib/widgets.c:1962
--#, fuzzy
-+#: ../lib/widgets.c:2087
- msgid "Reset menu"
--msgstr "Кори�ти мени линију"
-+msgstr "Поврати изборник"
-+
-+#. Installer message if no GTK+ was found
-+#: ../installer/win32/gennsh.c:39
-+msgid ""
-+"GTK+ is not installed. Please use the full installer. It is available from "
-+"http://dia-installer.de."
-+msgstr ""
-+"ГТК+ није ин�талиран. Молим кори�тите потпун ин�талациони програм. До�тупан "
-+"је �а „http://dia-installer.de“."
-+
-+#. Installer message: Don't install over pre 0.95 versions
-+#: ../installer/win32/gennsh.c:42
-+msgid ""
-+"Please remove old Dia installations completely or install Dia to a different "
-+"location."
-+msgstr ""
-+"Уклоните �тару ин�талацију Дие у потпуно�ти или је ин�талирајте на друго "
-+"ме�то."
-+
-+#. Installer message:  License Page
-+#: ../installer/win32/gennsh.c:45
-+msgid "Next >"
-+msgstr "Даље >"
-+
-+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-+#: ../installer/win32/gennsh.c:48
-+msgid ""
-+"$(^Name) is released under the GPL license. The license is provided here for "
-+"information purposes only. $_CLICK"
-+msgstr ""
-+"$(^Name) је издата под ОЈЛ лиценцом. Лиценца је овде обезбеђена �амо зарад "
-+"обавештавања. $_CLICK"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:51
-+msgid "Dia Diagram Editor (required)"
-+msgstr "Диа уређивач дијаграма (потребно)"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:54
-+msgid "Translations"
-+msgstr "Превод"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:57
-+msgid "Optional translations of the Dia user interface"
-+msgstr "Додатни преводи кори�ничког �учеља Дие"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:60
-+msgid "Core Dia files and dlls"
-+msgstr "Кључне датотеке Дие и длл�"
-+
-+#. Installer message: Component name
-+#: ../installer/win32/gennsh.c:63
-+msgid "Python plug-in"
-+msgstr "Питонов прикључак"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:66
-+msgid ""
-+"Support for the Python Scripting Language 2.3. Do not select this if Python "
-+"is not installed."
-+msgstr ""
-+"Подршка за Питонов језик �крипте 2.3. �емојте ово да изаберете ако Питон "
-+"није ин�талиран."
-+
-+#. Installer message: hyperlink text on finish page
-+#: ../installer/win32/gennsh.c:69
-+msgid "Visit the Dia for Windows Web Page"
-+msgstr "По�етите Диу за Виндоуз веб �траницу"
-+
-+#. Installer message: Dia uninstaller entry in Control Panel
-+#: ../installer/win32/gennsh.c:72
-+msgid "Dia (remove only)"
-+msgstr "Диа (уклањање �амо)"
-+
-+#. Installer message: confirmation question. Keep $\r
-+#: ../installer/win32/gennsh.c:75
-+msgid ""
-+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-+"$\rNote: Any non-standard plugins that you may have installed will be "
-+"deleted.$\rDia user settings will not be affected."
-+msgstr ""
-+"Стари директоријум Дие ће �ада бити обри�ан. Да ли желите да на�тавите?$\n"
-+"$\n"
-+"�апомена: Било који не�тандардни прикључак који �те ин�талирали биће "
-+"обри�ан.$\n"
-+"Кори�ничка подешавања Дие биће о�тављена."
-+
-+#. Installer message: confirmatin question. Keep $\r
-+#: ../installer/win32/gennsh.c:78
-+msgid ""
-+"The installation directory you specified already exists. Any contents$\rwill "
-+"be deleted. Would you like to continue?"
-+msgstr ""
-+"Ин�талациони директоријум који �те навели већ по�тоји. Сав �адржај$\n"
-+"ће бити обри�ан. Да ли желите да на�тавите?"
-+
-+#. Installer message: Uninstall Section Prompts. Keep $\r
-+#: ../installer/win32/gennsh.c:81
-+msgid ""
-+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-+"another user installed this application."
-+msgstr ""
-+"Програм за уклањање не може да пронађе �тавке реги�тра за Диу.$\n"
-+"�ајвероватније да је други кори�ник ин�талирао овај програм."
-+
-+#. Installer message: Uninstall error message
-+#: ../installer/win32/gennsh.c:84
-+msgid "You do not have permission to uninstall this application."
-+msgstr "�емате овлашћења да уклоните овај програм."
-+
-+#. Installer message: Uninstallation warning. Keep $INSTDIR
-+#: ../installer/win32/gennsh.c:87
-+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-+msgstr ""
-+"Ово ће у потпуно�ти да обрише $INSTDIR и �ве �адржане директоријуме. Да "
-+"на�тавим?"
-+
-+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-+#: ../installer/win32/gennsh.c:90
-+msgid ""
-+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+msgstr ""
-+"Ово ће у потпуно�ти да обрише $PROFILE\\.dia и �ве �адржане директоријуме. "
-+"Да на�тавим?"
- 
- #: ../objects/AADL/aadl.c:52
- msgid "Architecture Analysis & Design Language diagram objects"
--msgstr ""
-+msgstr "Објекти дијаграма архитектурне анализе и језика цртања"
- 
--#: ../objects/AADL/aadlbox.c:138
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:147
- msgid "Declaration"
--msgstr "Опи�"
-+msgstr "Прогла�"
- 
--#: ../objects/AADL/aadlbox.c:349
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:358
- msgid "Add Access Provider"
--msgstr "При�тупни �ервер"
-+msgstr "Додај до�тављача при�тупа"
- 
--#: ../objects/AADL/aadlbox.c:351
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:360
- msgid "Add Access Requirer"
--msgstr "При�тупни �ервер"
-+msgstr "Додај потражиоца при�тупа"
- 
--#: ../objects/AADL/aadlbox.c:353
-+#: ../objects/AADL/aadlbox.c:362
- msgid "Add In Data Port"
--msgstr ""
-+msgstr "Додај у прикључак података"
- 
--#: ../objects/AADL/aadlbox.c:355
-+#: ../objects/AADL/aadlbox.c:364
- msgid "Add In Event Port"
--msgstr ""
-+msgstr "Додај у прикључак догађаја"
- 
--#: ../objects/AADL/aadlbox.c:357
-+#: ../objects/AADL/aadlbox.c:366
- msgid "Add In Event Data Port"
--msgstr ""
-+msgstr "Додај у прикључак података догађаја"
- 
--#: ../objects/AADL/aadlbox.c:359
-+#: ../objects/AADL/aadlbox.c:368
- msgid "Add Out Data Port"
--msgstr ""
-+msgstr "Додај из прикључка података"
- 
--#: ../objects/AADL/aadlbox.c:361
-+#: ../objects/AADL/aadlbox.c:370
- msgid "Add Out Event Port"
--msgstr ""
-+msgstr "Додај из прикључка догађаја"
- 
--#: ../objects/AADL/aadlbox.c:363
-+#: ../objects/AADL/aadlbox.c:372
- msgid "Add Out Event Data Port"
--msgstr ""
-+msgstr "Додај из прикључка података догађаја"
- 
--#: ../objects/AADL/aadlbox.c:365
-+#: ../objects/AADL/aadlbox.c:374
- msgid "Add In Out Data Port"
--msgstr ""
-+msgstr "Додај у прикључак �пољних података"
- 
--#: ../objects/AADL/aadlbox.c:367
-+#: ../objects/AADL/aadlbox.c:376
- msgid "Add In Out Event Port"
--msgstr ""
-+msgstr "Додај у прикључак �пољних догађаја"
- 
--#: ../objects/AADL/aadlbox.c:369
-+#: ../objects/AADL/aadlbox.c:378
- msgid "Add In Out Event Data Port"
--msgstr ""
-+msgstr "Додај у прикључак �пољних података догађаја"
- 
--#: ../objects/AADL/aadlbox.c:371
-+#: ../objects/AADL/aadlbox.c:380
- msgid "Add Port Group"
--msgstr ""
-+msgstr "Додај групу прикључка"
- 
--#: ../objects/AADL/aadlbox.c:373
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:382
- msgid "Add Connection Point"
--msgstr "Додај везивну тачку"
-+msgstr "Додај тачку везе"
- 
--#: ../objects/AADL/aadlbox.c:377
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:386
- msgid "Delete Port"
--msgstr "Обриши Угао"
-+msgstr "Обриши прикључак"
- 
--#: ../objects/AADL/aadlbox.c:378
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:387
- msgid "Edit Port Declaration"
--msgstr "Припрема"
-+msgstr "Уреди прогла� прикључка"
- 
--#: ../objects/AADL/aadlbox.c:382
--#, fuzzy
-+#: ../objects/AADL/aadlbox.c:391
- msgid "Delete Connection Point"
--msgstr "Обриши везивну тачку"
-+msgstr "Обриши тачку везе"
- 
--#: ../objects/ER/attribute.c:155
--msgid "Key:"
--msgstr "Кључ:"
-+#: ../objects/Database/compound.c:198
-+msgid "Number of arms"
-+msgstr "Број наоружања"
- 
--#: ../objects/ER/attribute.c:157
--msgid "Weak key:"
--msgstr "Слаб кључ:"
-+#: ../objects/Database/compound.c:221
-+msgid "Flip arms verticaly"
-+msgstr "Изврни наоружања у�правно"
- 
--#: ../objects/ER/attribute.c:159
--msgid "Derived:"
--msgstr "Изведен:"
-+#: ../objects/Database/compound.c:223
-+msgid "Flip arms horizontaly"
-+msgstr "Изврни наоружања водоравно"
- 
--#: ../objects/ER/attribute.c:161
--msgid "Multivalue:"
--msgstr "Вишевредно�ни:"
-+#: ../objects/Database/compound.c:225
-+msgid "Center mount point verticaly"
-+msgstr "У�редишти тачку качења у�правно"
- 
--# note(slobo): proveri?
--#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:1
--msgid "Attribute"
--msgstr "О�обине:"
-+#: ../objects/Database/compound.c:227
-+msgid "Center mount point horizontaly"
-+msgstr "У�редишти тачку качења водоравно"
- 
--#: ../objects/ER/entity.c:137
--msgid "Weak:"
--msgstr "Слаб:"
-+#: ../objects/Database/compound.c:229
-+msgid "Center mount point"
-+msgstr "У�редишти тачку качења"
- 
--# Повезујуће? Повезано? Везујуће?
--#: ../objects/ER/entity.c:139
--msgid "Associative:"
--msgstr "��оцијативно:"
-+#: ../objects/Database/compound.c:234
-+msgid "Compound"
-+msgstr "Комплек�"
- 
--#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:129
--#: ../sheets/ER.sheet.in.h:4
--msgid "Entity"
--msgstr "Ентитет"
-+#: ../objects/Database/database.c:39
-+msgid "Entity/Relationship table diagram objects"
-+msgstr "Објекти табеле дијаграма ентитета/одно�а"
- 
--#: ../objects/ER/er.c:44
--msgid "Entity/Relationship diagram objects"
--msgstr "Објекти дијаграма ентитета/одно�а"
-+#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
-+#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
-+#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
-+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
-+msgid "Comment"
-+msgstr "�апомена"
- 
--#: ../objects/ER/participation.c:116
--msgid "Total:"
--msgstr "Укупно:"
-+#: ../objects/Database/table.c:144
-+msgid "Primary key"
-+msgstr "Примарни кључ"
- 
--#: ../objects/ER/participation.c:406 ../objects/FS/flow-ortho.c:639
--#: ../objects/GRAFCET/vector.c:312 ../objects/SADT/arrow.c:457
--#: ../objects/UML/association.c:769 ../objects/UML/component_feature.c:184
--#: ../objects/UML/dependency.c:374 ../objects/UML/generalization.c:370
--#: ../objects/UML/realizes.c:361 ../objects/UML/transition.c:161
--#: ../objects/standard/zigzagline.c:348
--msgid "Add segment"
--msgstr "Додај �егмент"
--
--#: ../objects/ER/participation.c:407 ../objects/FS/flow-ortho.c:640
--#: ../objects/GRAFCET/vector.c:313 ../objects/SADT/arrow.c:458
--#: ../objects/UML/association.c:770 ../objects/UML/component_feature.c:185
--#: ../objects/UML/dependency.c:375 ../objects/UML/generalization.c:371
--#: ../objects/UML/realizes.c:362 ../objects/UML/transition.c:162
--#: ../objects/standard/zigzagline.c:349
--msgid "Delete segment"
--msgstr "Обриши �егмент"
-+#: ../objects/Database/table.c:146
-+msgid "Nullable"
-+msgstr "�иштавно"
- 
--# можда „пребројиво�т“?
--#: ../objects/ER/relationship.c:142
--msgid "Left Cardinality:"
--msgstr "Лева кардинално�т:"
-+#: ../objects/Database/table.c:148
-+msgid "Unique"
-+msgstr "Једин�твено"
- 
-+#: ../objects/Database/table.c:185
-+msgid "Visible comments"
-+msgstr "Видљиве напомене"
-+
-+#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
-+msgid "Comment tagging"
-+msgstr "Означавање напомене"
-+
-+#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
-+msgid "Underline primary keys"
-+msgstr "Подвуци примарне кључеве"
-+
-+#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:981
-+msgid "Use bold font for primary keys"
-+msgstr "Кори�ти подебљано пи�мо за примарне кључеве"
-+
-+#. property rows
-+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
-+#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
-+msgid "Normal"
-+msgstr "Обичан"
-+
-+#: ../objects/Database/table.c:198
-+msgid "Tablename"
-+msgstr "�азив табеле"
-+
-+#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
-+#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
-+#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-+#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
-+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-+#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
-+#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
-+#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
-+msgid " "
-+msgstr " "
-+
-+#  Attributes page:
-+#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
-+#: ../objects/UML/object.c:157
-+msgid "Attributes"
-+msgstr "О�обине"
-+
-+#: ../objects/Database/table.c:248
-+msgid "Show comments"
-+msgstr "Прикажи напомене"
-+
-+#. init data
-+#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
-+#: ../sheets/Database.sheet.in.h:3
-+msgid "Table"
-+msgstr "Табела"
-+
-+#  Attributes page:
-+#. Attributes page:
-+#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1081
-+msgid "_Attributes"
-+msgstr "_О�обине"
-+
-+#. the "new" button
-+#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
-+#: ../objects/SISSI/sissi_dialog.c:871
-+msgid "_New"
-+msgstr "_�ово"
-+
-+#. the "delete" button
-+#: ../objects/Database/table_dialog.c:647
-+msgid "_Delete"
-+msgstr "_Обриши"
-+
-+#. the "Move up" button
-+#: ../objects/Database/table_dialog.c:655
-+msgid "Move up"
-+msgstr "Помери навише"
-+
-+#. the "Move down" button
-+#: ../objects/Database/table_dialog.c:663
-+msgid "Move down"
-+msgstr "Помери наниже"
-+
-+#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1138
-+msgid "Attribute data"
-+msgstr "Подаци о�обина"
-+
-+#: ../objects/Database/table_dialog.c:707
-+#: ../objects/Database/table_dialog.c:946
-+#: ../objects/Database/table_dialog.c:1051 ../objects/UML/class_dialog.c:452
-+#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
-+#: ../objects/UML/class_dialog.c:2283
-+msgid "Comment:"
-+msgstr "�апомена:"
-+
-+#: ../objects/Database/table_dialog.c:726
-+msgid "_Primary key"
-+msgstr "_Примарни кључ"
-+
-+#: ../objects/Database/table_dialog.c:733
-+msgid "N_ullable"
-+msgstr "_�иштавно"
-+
-+#: ../objects/Database/table_dialog.c:740
-+msgid "Uni_que"
-+msgstr "_Једин�твено"
-+
-+#: ../objects/Database/table_dialog.c:928
-+msgid "_Table"
-+msgstr "_Табела"
-+
-+#: ../objects/Database/table_dialog.c:936
-+msgid "Table name:"
-+msgstr "�азив табеле:"
-+
-+#. XXX create a handler and disable the 'show documentation tag' checkbox
-+#. if 'comment visible' is not active.
-+#: ../objects/Database/table_dialog.c:966
-+msgid "Comment visible"
-+msgstr "�апомена је приказана"
-+
-+#: ../objects/Database/table_dialog.c:971 ../objects/UML/class_dialog.c:522
-+msgid "Show documentation tag"
-+msgstr "Прикажи ознаку документације"
-+
-+#. * Fonts and Colors selection *
-+#: ../objects/Database/table_dialog.c:1010 ../objects/UML/class_dialog.c:551
-+msgid "_Style"
-+msgstr "_Стил"
-+
-+#: ../objects/Database/table_dialog.c:1021
-+msgid "Border width:"
-+msgstr "Ширина ивице:"
-+
-+#. head line
-+#: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
-+#: ../objects/UML/umlparameter.c:51
-+msgid "Kind"
-+msgstr "Вр�та"
-+
-+#: ../objects/Database/table_dialog.c:1038 ../objects/UML/class_dialog.c:566
-+msgid "Size"
-+msgstr "Величина"
-+
-+#: ../objects/Database/table_dialog.c:1041
-+msgid "Normal:"
-+msgstr "Обичан:"
-+
-+#: ../objects/Database/table_dialog.c:1062
-+msgid "Text Color:"
-+msgstr "Боја тек�та:"
-+
-+#: ../objects/Database/table_dialog.c:1070
-+msgid "Foreground Color:"
-+msgstr "Боја и�цртавања:"
-+
-+#. two chars at the beginning
-+#: ../objects/Database/table_dialog.c:1383
-+msgid "not null"
-+msgstr "није ништа"
-+
-+#: ../objects/Database/table_dialog.c:1384
-+msgid "null"
-+msgstr "ништа"
-+
-+#: ../objects/Database/table_dialog.c:1385
-+msgid "unique"
-+msgstr "једин�твен"
-+
-+#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
-+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
-+#: ../objects/standard/zigzagline.c:132
-+msgid "Corner radius"
-+msgstr "Полупречник угла"
-+
-+#: ../objects/Database/reference.c:111
-+msgid "Start description"
-+msgstr "Започните опи�"
-+
-+#: ../objects/Database/reference.c:113
-+msgid "End description"
-+msgstr "Завршите опи�"
-+
-+#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
-+#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
-+#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
-+#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
-+#: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
-+#: ../objects/standard/beziergon.c:495 ../objects/standard/zigzagline.c:380
-+msgid "Add segment"
-+msgstr "Додај део"
-+
-+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
-+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
-+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
-+#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
-+#: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
-+#: ../objects/standard/beziergon.c:496 ../objects/standard/zigzagline.c:381
-+msgid "Delete segment"
-+msgstr "Обриши део"
-+
-+#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
-+msgid "Reference"
-+msgstr "Референце"
-+
-+#: ../objects/ER/attribute.c:157
-+msgid "Key:"
-+msgstr "Кључ:"
-+
-+#: ../objects/ER/attribute.c:159
-+msgid "Weak key:"
-+msgstr "Слаб кључ:"
-+
-+#: ../objects/ER/attribute.c:161
-+msgid "Derived:"
-+msgstr "Изведен:"
-+
-+#: ../objects/ER/attribute.c:163
-+msgid "Multivalue:"
-+msgstr "Вишевредно�ни:"
-+
-+# note(slobo): proveri?
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
-+msgid "Attribute"
-+msgstr "О�обине"
-+
-+#: ../objects/ER/entity.c:139
-+msgid "Weak:"
-+msgstr "Слаб:"
-+
-+# Повезујуће? Повезано? Везујуће?
-+#: ../objects/ER/entity.c:141
-+msgid "Associative:"
-+msgstr "Придруживо:"
-+
-+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
-+#: ../sheets/ER.sheet.in.h:3
-+msgid "Entity"
-+msgstr "Ентитет"
-+
-+#: ../objects/ER/er.c:44
-+msgid "Entity/Relationship diagram objects"
-+msgstr "Објекти дијаграма ентитета/одно�а"
-+
-+#: ../objects/ER/participation.c:118
-+msgid "Total:"
-+msgstr "Укупно:"
-+
-+# можда „пребројиво�т“?
- #: ../objects/ER/relationship.c:144
--msgid "Right Cardinality:"
--msgstr "Де�на кардинално�т:"
-+msgid "Left Cardinality:"
-+msgstr "Лева о�новно�т:"
- 
- #: ../objects/ER/relationship.c:146
--msgid "Rotate:"
--msgstr "Ротирај:"
-+msgid "Right Cardinality:"
-+msgstr "Де�на о�новно�т:"
- 
- #: ../objects/ER/relationship.c:148
-+msgid "Rotate:"
-+msgstr "Заокрени:"
-+
-+#: ../objects/ER/relationship.c:150
- msgid "Identifying:"
--msgstr "Идентификује:"
-+msgstr "Препознаје:"
- 
--#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Одно�"
- 
- #. Translators: Menu item Noun/Energy
--#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:636
--#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:580
--#: ../objects/FS/function.c:1096
-+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
-+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
-+#: ../objects/FS/function.c:1098
- msgid "Energy"
- msgstr "Енергија"
- 
- #. Translators: Menu item Noun/Material
--#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:637
--#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:581
--#: ../objects/FS/function.c:1072
-+#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
-+#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
-+#: ../objects/FS/function.c:1074
- msgid "Material"
- msgstr "Материјал"
- 
-@@ -2660,1283 +3207,1279 @@ msgstr "Материјал"
- #. Translators: Menu item Verb/Signal/Signal
- #. Translators: Menu item Noun/Signal
- #. Translators: Menu item Noun/Signal/Signal
--#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:638
--#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:582
--#: ../objects/FS/function.c:1034 ../objects/FS/function.c:1036
--#: ../objects/FS/function.c:1172 ../objects/FS/function.c:1174
-+#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
-+#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
-+#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
-+#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
- msgid "Signal"
- msgstr "Сигнал"
- 
- #: ../objects/FS/fs.c:43
- msgid "Function structure diagram objects"
--msgstr "Објекти за дијаграме функционалне �труктуре"
-+msgstr "Објекти дијаграма функционалне �труктуре"
- 
--#: ../objects/FS/function.c:142
-+#: ../objects/FS/function.c:144
- msgid "Wish function"
- msgstr "Функција жеље"
- 
--#: ../objects/FS/function.c:144
-+#: ../objects/FS/function.c:146
- msgid "User function"
- msgstr "Функција кори�ника"
- 
- #. Translators: Menu item Verb
--#: ../objects/FS/function.c:676
-+#: ../objects/FS/function.c:678
- msgid "Verb"
- msgstr "Глагол"
- 
- #. Translators: Menu item Verb/Channel
- #. Translators: Menu item Verb/Channel/Channel
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
--#: ../objects/FS/function.c:678 ../objects/FS/function.c:680
--#: ../objects/FS/function.c:720
-+#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
-+#: ../objects/FS/function.c:722
- msgid "Channel"
- msgstr "Канал"
- 
- #. Translators: Menu item Verb/Channel/Import
- #. Translators: Menu item Verb/Channel/Import/Import
--#: ../objects/FS/function.c:682 ../objects/FS/function.c:684
-+#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
- msgid "Import"
- msgstr "Увези"
- 
- #. Translators: Menu item Verb/Channel/Import/Input
--#: ../objects/FS/function.c:686 ../objects/KAOS/metabinrel.c:163
-+#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
- msgid "Input"
--msgstr "Уно�"
-+msgstr "Уне�и"
- 
- #. Translators: Menu item Verb/Channel/Import/Receive
--#: ../objects/FS/function.c:688
-+#: ../objects/FS/function.c:690
- msgid "Receive"
--msgstr "Преузимање"
-+msgstr "Прими"
- 
- #. Translators: Menu item Verb/Channel/Import/Allow
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
--#: ../objects/FS/function.c:690 ../objects/FS/function.c:962
-+#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
- msgid "Allow"
--msgstr "Одобрити"
-+msgstr "Одобри"
- 
- #  Translators: Menu item Verb/Channel/Import/Form Entrance
- #  Translators: Menu item Verb/Channel/Import/Form Entrance
- #. Translators: Menu item Verb/Channel/Import/Form Entrance
--#: ../objects/FS/function.c:692
-+#: ../objects/FS/function.c:694
- msgid "Form Entrance"
--msgstr "Образуј Улаз"
-+msgstr "Обликуј улаз"
- 
- #. Translators: Menu item Verb/Channel/Import/Capture
- #. Translators: Menu item Verb/Provision/Store/Capture
--#: ../objects/FS/function.c:694 ../objects/FS/function.c:928
-+#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
- msgid "Capture"
--msgstr "Снимити"
-+msgstr "Сними"
- 
- #. Translators: Menu item Verb/Channel/Export/Discharge
--#: ../objects/FS/function.c:700
-+#: ../objects/FS/function.c:702
- msgid "Discharge"
- msgstr "И�празни"
- 
- #. Translators: Menu item Verb/Channel/Export/Eject
--#: ../objects/FS/function.c:702
-+#: ../objects/FS/function.c:704
- msgid "Eject"
--msgstr "Избацити"
-+msgstr "Избаци"
- 
- #  Translators: Menu item Verb/Channel/Export/Dispose
- #. Translators: Menu item Verb/Channel/Export/Dispose
--#: ../objects/FS/function.c:704
-+#: ../objects/FS/function.c:706
- msgid "Dispose"
- msgstr "О�тави"
- 
- #. Translators: Menu item Verb/Channel/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
--#: ../objects/FS/function.c:708 ../objects/FS/function.c:710
--#: ../objects/FS/function.c:728
-+#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
-+#: ../objects/FS/function.c:730
- msgid "Transfer"
--msgstr "Прено�"
-+msgstr "Пребаци"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
--#: ../objects/FS/function.c:712 ../objects/FS/function.c:714
-+#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
- msgid "Transport"
--msgstr "Тран�портуј"
-+msgstr "Прене�и"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
--#: ../objects/FS/function.c:716
-+#: ../objects/FS/function.c:718
- msgid "Lift"
- msgstr "Подигни"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
--#: ../objects/FS/function.c:718
-+#: ../objects/FS/function.c:720
- msgid "Move"
--msgstr "Померити"
-+msgstr "Помери"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
--#: ../objects/FS/function.c:722 ../objects/FS/function.c:724
-+#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
- msgid "Transmit"
--msgstr "Пренети"
-+msgstr "Прене�и"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
--#: ../objects/FS/function.c:726
-+#: ../objects/FS/function.c:728
- msgid "Conduct"
--msgstr "Проводник"
-+msgstr "Проведи"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
--#: ../objects/FS/function.c:730
-+#: ../objects/FS/function.c:732
- msgid "Convey"
--msgstr "Прено�ник"
-+msgstr "Прено�и"
- 
- #. Translators: Menu item Verb/Channel/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
--#: ../objects/FS/function.c:732 ../objects/FS/function.c:734
--#: ../objects/FS/function.c:736
-+#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
-+#: ../objects/FS/function.c:738
- msgid "Guide"
--msgstr "Упутити"
-+msgstr "Упути"
- 
- #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
--#: ../objects/FS/function.c:738
-+#: ../objects/FS/function.c:740
- msgid "Direct"
--msgstr "У�мерити"
-+msgstr "У�мери"
- 
- #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
--#: ../objects/FS/function.c:740
-+#: ../objects/FS/function.c:742
- msgid "Straighten"
- msgstr "И�прави"
- 
- #  Translators: Menu item Verb/Channel/Guide/Guide/Steer
- #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
--#: ../objects/FS/function.c:742
-+#: ../objects/FS/function.c:744
- msgid "Steer"
- msgstr "Измути"
- 
- #. Translators: Menu item Verb/Channel/Guide/Translate
--#: ../objects/FS/function.c:744
-+#: ../objects/FS/function.c:746
- msgid "Translate"
--msgstr "Преве�ти"
-+msgstr "Преведи"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
--#: ../objects/FS/function.c:746 ../objects/FS/function.c:748
-+#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
- msgid "Rotate"
--msgstr "Окренути"
-+msgstr "Заокрени"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
--#: ../objects/FS/function.c:750
-+#: ../objects/FS/function.c:752
- msgid "Turn"
--msgstr "Окрет"
-+msgstr "Окрени"
- 
- #  Translators: Menu item Verb/Channel/Guide/Rotate/Spin
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
--#: ../objects/FS/function.c:752
-+#: ../objects/FS/function.c:754
- msgid "Spin"
--msgstr "Вртети"
-+msgstr "Заврти"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
--#: ../objects/FS/function.c:754 ../objects/FS/function.c:756
-+#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
- msgid "Allow DOF"
--msgstr "Дозволити DOF"
-+msgstr "Дозволи ДОФ"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
--#: ../objects/FS/function.c:758
-+#: ../objects/FS/function.c:760
- msgid "Constrain"
- msgstr "Ограничи"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
--#: ../objects/FS/function.c:760
-+#: ../objects/FS/function.c:762
- msgid "Unlock"
- msgstr "Откључај"
- 
- #. Translators: Menu item Verb/Support
- #. Translators: Menu item Verb/Support/Support
--#: ../objects/FS/function.c:762 ../objects/FS/function.c:764
-+#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
- msgid "Support"
--msgstr "Подршка"
-+msgstr "Подржи"
- 
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
--#: ../objects/FS/function.c:766 ../objects/FS/function.c:768
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../objects/FS/function.c:768 ../objects/FS/function.c:770
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
--msgstr "Зау�тавити"
-+msgstr "Зау�тави"
- 
- #. Translators: Menu item Verb/Support/Stop/Insulate
--#: ../objects/FS/function.c:770
-+#: ../objects/FS/function.c:772
- msgid "Insulate"
--msgstr "Оклопити"
-+msgstr "Оклопи"
- 
- #. Translators: Menu item Verb/Support/Stop/Protect
--#: ../objects/FS/function.c:772
-+#: ../objects/FS/function.c:774
- msgid "Protect"
--msgstr "Заштитити"
-+msgstr "Заштити"
- 
- #. Translators: Menu item Verb/Support/Stop/Prevent
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
--#: ../objects/FS/function.c:774 ../objects/FS/function.c:964
-+#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
- msgid "Prevent"
- msgstr "Спречи"
- 
- #  Translators: Menu item Verb/Support/Stop/Shield
- #. Translators: Menu item Verb/Support/Stop/Shield
--#: ../objects/FS/function.c:776
-+#: ../objects/FS/function.c:778
- msgid "Shield"
- msgstr "Оклопи"
- 
- #. Translators: Menu item Verb/Support/Stop/Inhibit
--#: ../objects/FS/function.c:778
-+#: ../objects/FS/function.c:780
- msgid "Inhibit"
--msgstr "�а�ледити"
-+msgstr "�а�леди"
- 
- #. Translators: Menu item Verb/Support/Stabilize
- #. Translators: Menu item Verb/Support/Stabilize/Stabilize
--#: ../objects/FS/function.c:780 ../objects/FS/function.c:782
-+#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
- msgid "Stabilize"
--msgstr "Стабилно"
-+msgstr "Стабилиши"
- 
- #. Translators: Menu item Verb/Support/Stabilize/Steady
--#: ../objects/FS/function.c:784
-+#: ../objects/FS/function.c:786
- msgid "Steady"
--msgstr "Мирно"
-+msgstr "Умири"
- 
- #  Translators: Menu item Verb/Support/Secure
- #. Translators: Menu item Verb/Support/Secure
- #. Translators: Menu item Verb/Support/Secure/Secure
--#: ../objects/FS/function.c:786 ../objects/FS/function.c:788
-+#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
- msgid "Secure"
--msgstr "Обезбедити"
-+msgstr "Обезбеди"
- 
- #. Translators: Menu item Verb/Support/Secure/Attach
- #. Translators: Menu item Verb/Connect/Couple/Attach
--#: ../objects/FS/function.c:790 ../objects/FS/function.c:822
-+#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
- msgid "Attach"
--msgstr "Додати"
-+msgstr "Додај"
- 
- #. Translators: Menu item Verb/Support/Secure/Mount
--#: ../objects/FS/function.c:792
-+#: ../objects/FS/function.c:794
- msgid "Mount"
--msgstr "Прикључити"
-+msgstr "Прикачи"
- 
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:794 ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
--msgstr "Закључати"
-+msgstr "Закључај"
- 
- #. Translators: Menu item Verb/Support/Secure/Fasten
--#: ../objects/FS/function.c:796
-+#: ../objects/FS/function.c:798
- msgid "Fasten"
--msgstr "Убрзано"
-+msgstr "Убрзај"
- 
- #  Translators: Menu item Verb/Support/Secure/Hold
- #. Translators: Menu item Verb/Support/Secure/Hold
--#: ../objects/FS/function.c:798
-+#: ../objects/FS/function.c:800
- msgid "Hold"
--msgstr "Задржати"
-+msgstr "Задржи"
- 
- #. Translators: Menu item Verb/Support/Position
- #. Translators: Menu item Verb/Support/Position/Position
--#: ../objects/FS/function.c:800 ../objects/FS/function.c:802
-+#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
- #: ../objects/Istar/actor.c:70
- msgid "Position"
--msgstr "Позиција"
-+msgstr "По�тави"
- 
- #. Translators: Menu item Verb/Support/Position/Orient
--#: ../objects/FS/function.c:804
-+#: ../objects/FS/function.c:806
- msgid "Orient"
- msgstr "У�мери"
- 
- #. Translators: Menu item Verb/Support/Position/Locate
- #. Translators: Menu item Verb/Signal/Sense/Locate
--#: ../objects/FS/function.c:808 ../objects/FS/function.c:1050
-+#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
- msgid "Locate"
--msgstr "Лоцирати"
-+msgstr "Пронађи"
- 
- #. Translators: Menu item Verb/Connect
- #. Translators: Menu item Verb/Connect/Connect
--#: ../objects/FS/function.c:810 ../objects/FS/function.c:812
-+#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
- msgid "Connect"
--msgstr "Повезати"
-+msgstr "Повежи"
- 
- #. Translators: Menu item Verb/Connect/Couple
- #. Translators: Menu item Verb/Connect/Couple/Couple
--#: ../objects/FS/function.c:814 ../objects/FS/function.c:816
-+#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
- msgid "Couple"
--msgstr "Пар"
-+msgstr "Упари"
- 
- #. Translators: Menu item Verb/Connect/Couple/Join
--#: ../objects/FS/function.c:818
-+#: ../objects/FS/function.c:820
- msgid "Join"
- msgstr "Придружи"
- 
- #  Translators: Menu item Verb/Connect/Couple/Assemble
- #. Translators: Menu item Verb/Connect/Couple/Assemble
--#: ../objects/FS/function.c:820
-+#: ../objects/FS/function.c:822
- msgid "Assemble"
- msgstr "Споји"
- 
- #. Translators: Menu item Verb/Connect/Mix
- #. Translators: Menu item Verb/Connect/Mix/Mix
--#: ../objects/FS/function.c:824 ../objects/FS/function.c:826
-+#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
- msgid "Mix"
--msgstr "Измешати"
-+msgstr "Измешај"
- 
- #. Translators: Menu item Verb/Connect/Mix/Combine
--#: ../objects/FS/function.c:828
-+#: ../objects/FS/function.c:830
- msgid "Combine"
--msgstr "Сјединити"
-+msgstr "Обједини"
- 
- #. Translators: Menu item Verb/Connect/Mix/Blend
--#: ../objects/FS/function.c:830
-+#: ../objects/FS/function.c:832
- msgid "Blend"
--msgstr "Стапати"
-+msgstr "Стапај"
- 
- #. Translators: Menu item Verb/Connect/Mix/Add
--#: ../objects/FS/function.c:832
-+#: ../objects/FS/function.c:834
- msgid "Add"
--msgstr "Додати"
-+msgstr "Додај"
- 
- #. Translators: Menu item Verb/Connect/Mix/Pack
--#: ../objects/FS/function.c:834
-+#: ../objects/FS/function.c:836
- msgid "Pack"
- msgstr "Сме�ти"
- 
- #. Translators: Menu item Verb/Connect/Mix/Coalesce
--#: ../objects/FS/function.c:836
-+#: ../objects/FS/function.c:838
- msgid "Coalesce"
- msgstr "Са�тави"
- 
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
--#: ../objects/FS/function.c:838 ../objects/FS/function.c:840
--#: ../sheets/UML.sheet.in.h:5
-+#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
--msgstr "Гранати"
-+msgstr "Гранај"
- 
- #. Translators: Menu item Verb/Branch/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
--#: ../objects/FS/function.c:842 ../objects/FS/function.c:844
--#: ../objects/FS/function.c:846
-+#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
-+#: ../objects/FS/function.c:848
- msgid "Separate"
--msgstr "Раздвајати"
-+msgstr "Раздвој"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
--#: ../objects/FS/function.c:848
-+#: ../objects/FS/function.c:850
- msgid "Switch"
--msgstr "Пребацити"
-+msgstr "Пребаци"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
--#: ../objects/FS/function.c:850
-+#: ../objects/FS/function.c:852
- msgid "Divide"
--msgstr "Делити"
-+msgstr "Подели"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Release
--#: ../objects/FS/function.c:852
-+#: ../objects/FS/function.c:854
- msgid "Release"
--msgstr "Пу�тити"
-+msgstr "Отпу�ти"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
--#: ../objects/FS/function.c:854
-+#: ../objects/FS/function.c:856
- msgid "Detach"
--msgstr "Одвојити"
-+msgstr "Одвој"
- 
- #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
--#: ../objects/FS/function.c:856
-+#: ../objects/FS/function.c:858
- msgid "Disconnect"
--msgstr "И�кључи �е"
-+msgstr "Прекини везу"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
--#: ../objects/FS/function.c:862
-+#: ../objects/FS/function.c:864
- msgid "Cut"
- msgstr "И�еци"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
--#: ../objects/FS/function.c:864
-+#: ../objects/FS/function.c:866
- msgid "Polish"
- msgstr "Пољ�ки"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
--#: ../objects/FS/function.c:866
-+#: ../objects/FS/function.c:868
- msgid "Sand"
- msgstr "Пе�ак"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
--#: ../objects/FS/function.c:868
-+#: ../objects/FS/function.c:870
- msgid "Drill"
- msgstr "Избуши"
- 
- #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
--#: ../objects/FS/function.c:870
-+#: ../objects/FS/function.c:872
- msgid "Lathe"
- msgstr "Струг"
- 
- #. Translators: Menu item Verb/Branch/Refine
- #. Translators: Menu item Verb/Branch/Refine/Refine
--#: ../objects/FS/function.c:872 ../objects/FS/function.c:874
-+#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
- msgid "Refine"
- msgstr "Рафиниши"
- 
- #. Translators: Menu item Verb/Branch/Refine/Purify
--#: ../objects/FS/function.c:876
-+#: ../objects/FS/function.c:878
- msgid "Purify"
- msgstr "Прочи�ти"
- 
- #. Translators: Menu item Verb/Branch/Refine/Strain
--#: ../objects/FS/function.c:878
-+#: ../objects/FS/function.c:880
- msgid "Strain"
- msgstr "�атегни"
- 
- #. Translators: Menu item Verb/Branch/Refine/Filter
--#: ../objects/FS/function.c:880
-+#: ../objects/FS/function.c:882
- msgid "Filter"
- msgstr "Филтрирај"
- 
- #. Translators: Menu item Verb/Branch/Refine/Percolate
--#: ../objects/FS/function.c:882
-+#: ../objects/FS/function.c:884
- msgid "Percolate"
- msgstr "Процеди"
- 
- #. Translators: Menu item Verb/Branch/Refine/Clear
--#: ../objects/FS/function.c:884
-+#: ../objects/FS/function.c:886
- msgid "Clear"
- msgstr "Очи�тити"
- 
- #  Translators: Menu item Verb/Branch/Distribute
- #. Translators: Menu item Verb/Branch/Distribute
- #. Translators: Menu item Verb/Branch/Distribute/Distribute
--#: ../objects/FS/function.c:886 ../objects/FS/function.c:888
-+#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
- msgid "Distribute"
- msgstr "Ди�трибуиши"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Diverge
--#: ../objects/FS/function.c:890
-+#: ../objects/FS/function.c:892
- msgid "Diverge"
- msgstr "Дивергирај"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Scatter
--#: ../objects/FS/function.c:892
-+#: ../objects/FS/function.c:894
- msgid "Scatter"
- msgstr "Разбацај"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Disperse
--#: ../objects/FS/function.c:894
-+#: ../objects/FS/function.c:896
- msgid "Disperse"
- msgstr "Разиђи"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Diffuse
- #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
--#: ../objects/FS/function.c:896 ../objects/FS/function.c:910
-+#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
- msgid "Diffuse"
- msgstr "И�текни"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Empty
--#: ../objects/FS/function.c:898
-+#: ../objects/FS/function.c:900
- msgid "Empty"
- msgstr "Празнити"
- 
- #. Translators: Menu item Verb/Branch/Dissipate
- #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
--#: ../objects/FS/function.c:900 ../objects/FS/function.c:902
-+#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
- msgid "Dissipate"
- msgstr "Ра�пи"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Absorb
--#: ../objects/FS/function.c:904
-+#: ../objects/FS/function.c:906
- msgid "Absorb"
- msgstr "Упиј"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Dampen
--#: ../objects/FS/function.c:906
-+#: ../objects/FS/function.c:908
- msgid "Dampen"
- msgstr "Удуби"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Dispel
--#: ../objects/FS/function.c:908
-+#: ../objects/FS/function.c:910
- msgid "Dispel"
- msgstr "Ра�тури"
- 
- #. Translators: Menu item Verb/Branch/Dissipate/Resist
--#: ../objects/FS/function.c:912
-+#: ../objects/FS/function.c:914
- msgid "Resist"
- msgstr "Издржи"
- 
- #. Translators: Menu item Verb/Provision
- #. Translators: Menu item Verb/Provision/Provision
--#: ../objects/FS/function.c:914 ../objects/FS/function.c:916
-+#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
- msgid "Provision"
- msgstr "Провизија"
- 
- #. Translators: Menu item Verb/Provision/Store
- #. Translators: Menu item Verb/Provision/Store/Store
--#: ../objects/FS/function.c:918 ../objects/FS/function.c:920
-+#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
- msgid "Store"
- msgstr "Сме�тити"
- 
- #. Translators: Menu item Verb/Provision/Store/Contain
--#: ../objects/FS/function.c:922
-+#: ../objects/FS/function.c:924
- msgid "Contain"
- msgstr "Садржати"
- 
- #. Translators: Menu item Verb/Provision/Store/Collect
--#: ../objects/FS/function.c:924
-+#: ../objects/FS/function.c:926
- msgid "Collect"
- msgstr "Сакупи"
- 
- #. Translators: Menu item Verb/Provision/Store/Reserve
--#: ../objects/FS/function.c:926
-+#: ../objects/FS/function.c:928
- msgid "Reserve"
- msgstr "Резерви�ати"
- 
- #. Translators: Menu item Verb/Provision/Supply
- #. Translators: Menu item Verb/Provision/Supply/Supply
--#: ../objects/FS/function.c:930 ../objects/FS/function.c:932
-+#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
- msgid "Supply"
- msgstr "�амири"
- 
- #. Translators: Menu item Verb/Provision/Supply/Fill
--#: ../objects/FS/function.c:934
-+#: ../objects/FS/function.c:936
- msgid "Fill"
- msgstr "И�пунити"
- 
- #. Translators: Menu item Verb/Provision/Supply/Provide
--#: ../objects/FS/function.c:936
-+#: ../objects/FS/function.c:938
- msgid "Provide"
- msgstr "Обезбеди"
- 
- #. Translators: Menu item Verb/Provision/Supply/Replenish
--#: ../objects/FS/function.c:938
-+#: ../objects/FS/function.c:940
- msgid "Replenish"
- msgstr "Попуни"
- 
- #. Translators: Menu item Verb/Provision/Supply/Expose
--#: ../objects/FS/function.c:940
-+#: ../objects/FS/function.c:942
- msgid "Expose"
- msgstr "Изложи"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:942 ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Извуци"
- 
- #. Translators: Menu item Verb/Control Magnitude
- #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
--#: ../objects/FS/function.c:944 ../objects/FS/function.c:946
-+#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
- msgid "Control Magnitude"
- msgstr "Контролиши магнитуду"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
--#: ../objects/FS/function.c:948 ../objects/FS/function.c:950
-+#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
- msgid "Actuate"
- msgstr "Деј�твуј"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
--#: ../objects/FS/function.c:952
-+#: ../objects/FS/function.c:954
- msgid "Start"
- msgstr "Почни"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
--#: ../objects/FS/function.c:954
-+#: ../objects/FS/function.c:956
- msgid "Initiate"
- msgstr "Покрени"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
--#: ../objects/FS/function.c:956 ../objects/FS/function.c:958
-+#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
- msgid "Regulate"
- msgstr "Регулиши"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
- #. Translators: Menu item Noun/Signal/Control
--#: ../objects/FS/function.c:960 ../objects/FS/function.c:1178
--#: ../objects/UML/classicon.c:127
-+#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
-+#: ../objects/UML/classicon.c:129
- msgid "Control"
- msgstr "Контролиши"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
--#: ../objects/FS/function.c:966
-+#: ../objects/FS/function.c:968
- msgid "Enable"
- msgstr "Омогући"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
--#: ../objects/FS/function.c:968
-+#: ../objects/FS/function.c:970
- msgid "Disable"
- msgstr "Онемогући"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
--#: ../objects/FS/function.c:970
-+#: ../objects/FS/function.c:972
- msgid "Limit"
- msgstr "Ограничи"
- 
- #  Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
--#: ../objects/FS/function.c:972
-+#: ../objects/FS/function.c:974
- msgid "Interrupt"
- msgstr "Прекини"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change
- #. Translators: Menu item Verb/Control Magnitude/Change/Change
--#: ../objects/FS/function.c:974 ../objects/FS/function.c:976
-+#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
- msgid "Change"
- msgstr "Изменути"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Increase
--#: ../objects/FS/function.c:978
-+#: ../objects/FS/function.c:980
- msgid "Increase"
- msgstr "Повећати"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
--#: ../objects/FS/function.c:980
-+#: ../objects/FS/function.c:982
- msgid "Decrease"
- msgstr "Смањити"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
--#: ../objects/FS/function.c:982
-+#: ../objects/FS/function.c:984
- msgid "Amplify"
- msgstr "Појачај"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
--#: ../objects/FS/function.c:984
-+#: ../objects/FS/function.c:986
- msgid "Reduce"
- msgstr "Умањи"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
--#: ../objects/FS/function.c:988
-+#: ../objects/FS/function.c:990
- msgid "Normalize"
- msgstr "�ормализуј"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
--#: ../objects/FS/function.c:990
-+#: ../objects/FS/function.c:992
- msgid "Multiply"
- msgstr "Помножи"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Scale
--#: ../objects/FS/function.c:992
-+#. FIXME: mark read-only
-+#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:186
- msgid "Scale"
- msgstr "Размери"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
--#: ../objects/FS/function.c:994
-+#: ../objects/FS/function.c:996
- msgid "Rectify"
- msgstr "Поравнај"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
--#: ../objects/FS/function.c:996
-+#: ../objects/FS/function.c:998
- msgid "Adjust"
- msgstr "Поде�и"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form
- #. Translators: Menu item Verb/Control Magnitude/Form/Form
--#: ../objects/FS/function.c:998 ../objects/FS/function.c:1000
-+#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
- msgid "Form"
- msgstr "Обликуј"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Compact
--#: ../objects/FS/function.c:1002
-+#: ../objects/FS/function.c:1004
- msgid "Compact"
- msgstr "Сабиј"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Crush
--#: ../objects/FS/function.c:1004
-+#: ../objects/FS/function.c:1006
- msgid "Crush"
- msgstr "Здроби"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Shape
--#: ../objects/FS/function.c:1006
-+#: ../objects/FS/function.c:1008
- msgid "Shape"
- msgstr "Обликуј"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Compress
--#: ../objects/FS/function.c:1008
-+#: ../objects/FS/function.c:1010
- msgid "Compress"
- msgstr "Сажми"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
--#: ../objects/FS/function.c:1010
-+#: ../objects/FS/function.c:1012
- msgid "Pierce"
- msgstr "Избоди"
- 
- #. Translators: Menu item Verb/Convert
- #. Translators: Menu item Verb/Convert/Convert
--#: ../objects/FS/function.c:1012 ../objects/FS/function.c:1014
-+#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
- msgid "Convert"
- msgstr "Претвори"
- 
- #. Translators: Menu item Verb/Convert/Transform
--#: ../objects/FS/function.c:1016
-+#: ../objects/FS/function.c:1018
- msgid "Transform"
- msgstr "Тра�формиши"
- 
- #. Translators: Menu item Verb/Convert/Liquefy
--#: ../objects/FS/function.c:1018
-+#: ../objects/FS/function.c:1020
- msgid "Liquefy"
- msgstr "И�топи"
- 
- #. Translators: Menu item Verb/Convert/Solidify
--#: ../objects/FS/function.c:1020
-+#: ../objects/FS/function.c:1022
- msgid "Solidify"
--msgstr "Очврни"
-+msgstr "Очвр�ни"
- 
- #. Translators: Menu item Verb/Convert/Evaporate
--#: ../objects/FS/function.c:1022
-+#: ../objects/FS/function.c:1024
- msgid "Evaporate"
- msgstr "И�пари"
- 
- # и�пари па кондензуј у чвр�то �тање
- #. Translators: Menu item Verb/Convert/Sublimate
--#: ../objects/FS/function.c:1024
-+#: ../objects/FS/function.c:1026
- msgid "Sublimate"
- msgstr "Сублимирај"
- 
- #. Translators: Menu item Verb/Convert/Condense
--#: ../objects/FS/function.c:1026
-+#: ../objects/FS/function.c:1028
- msgid "Condense"
- msgstr "Кондензуј"
- 
- #. Translators: Menu item Verb/Convert/Integrate
--#: ../objects/FS/function.c:1028
-+#: ../objects/FS/function.c:1030
- msgid "Integrate"
- msgstr "Интегриши"
- 
- #. Translators: Menu item Verb/Convert/Differentiate
--#: ../objects/FS/function.c:1030
-+#: ../objects/FS/function.c:1032
- msgid "Differentiate"
- msgstr "Раздвоји"
- 
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1032 ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
--msgstr "Обради"
-+msgstr "Обрада"
- 
- #. Translators: Menu item Verb/Signal/Sense
- #. Translators: Menu item Verb/Signal/Sense/Sense
--#: ../objects/FS/function.c:1038 ../objects/FS/function.c:1040
-+#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
- msgid "Sense"
- msgstr "О�ети"
- 
- #. Translators: Menu item Verb/Signal/Sense/Perceive
--#: ../objects/FS/function.c:1042
-+#: ../objects/FS/function.c:1044
- msgid "Perceive"
- msgstr "Спознај"
- 
- #. Translators: Menu item Verb/Signal/Sense/Recognize
--#: ../objects/FS/function.c:1044
-+#: ../objects/FS/function.c:1046
- msgid "Recognize"
- msgstr "Препознај"
- 
- #. Translators: Menu item Verb/Signal/Sense/Discern
--#: ../objects/FS/function.c:1046
-+#: ../objects/FS/function.c:1048
- msgid "Discern"
- msgstr "Разлучи"
- 
- #. Translators: Menu item Verb/Signal/Sense/Check
--#: ../objects/FS/function.c:1048
-+#: ../objects/FS/function.c:1050
- msgid "Check"
- msgstr "И�питај"
- 
- #. Translators: Menu item Verb/Signal/Sense/Verify
--#: ../objects/FS/function.c:1052
-+#: ../objects/FS/function.c:1054
- msgid "Verify"
- msgstr "Провери"
- 
- #. Translators: Menu item Verb/Signal/Indicate
- #. Translators: Menu item Verb/Signal/Indicate/Indicate
--#: ../objects/FS/function.c:1054 ../objects/FS/function.c:1056
-+#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
- msgid "Indicate"
- msgstr "Укажи"
- 
- #  Translators: Menu item Verb/Signal/Indicate/Mark
- #  Translators: Menu item Verb/Signal/Indicate/Mark
- #. Translators: Menu item Verb/Signal/Indicate/Mark
--#: ../objects/FS/function.c:1058
-+#: ../objects/FS/function.c:1060
- msgid "Mark"
- msgstr "Означи"
- 
- #. Translators: Menu item Verb/Signal/Display
--#: ../objects/FS/function.c:1060 ../sheets/Flowchart.sheet.in.h:7
-+#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
- msgid "Display"
- msgstr "Прикажи"
- 
- #. Translators: Menu item Verb/Signal/Measure
- #. Translators: Menu item Verb/Signal/Measure/Measure
--#: ../objects/FS/function.c:1062 ../objects/FS/function.c:1064
-+#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
- msgid "Measure"
- msgstr "Измери"
- 
- #. Translators: Menu item Verb/Signal/Measure/Calculate
--#: ../objects/FS/function.c:1066
-+#: ../objects/FS/function.c:1068
- msgid "Calculate"
- msgstr "Израчунај"
- 
- #. Translators: Menu item Verb/Signal/Represent
--#: ../objects/FS/function.c:1068
-+#: ../objects/FS/function.c:1070
- msgid "Represent"
- msgstr "Пред�тави"
- 
- #. Translators: Menu item Noun
--#: ../objects/FS/function.c:1070
-+#: ../objects/FS/function.c:1072
- msgid "Noun"
- msgstr "Именица"
- 
- #. Translators: Menu item Noun/Material/Liquid
--#: ../objects/FS/function.c:1076
-+#: ../objects/FS/function.c:1078
- msgid "Liquid"
- msgstr "Течно�т"
- 
- #. Translators: Menu item Noun/Material/Gas
--#: ../objects/FS/function.c:1078
-+#: ../objects/FS/function.c:1080
- msgid "Gas"
- msgstr "Га�"
- 
- #. Translators: Menu item Noun/Material/Human
- #. Translators: Menu item Noun/Material/Human/Human
- #. Translators: Menu item Noun/Energy/Human
--#: ../objects/FS/function.c:1080 ../objects/FS/function.c:1082
--#: ../objects/FS/function.c:1166
-+#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
-+#: ../objects/FS/function.c:1168
- msgid "Human"
- msgstr "Човек"
- 
- #. Translators: Menu item Noun/Material/Human/Hand
--#: ../objects/FS/function.c:1084
-+#: ../objects/FS/function.c:1086
- msgid "Hand"
- msgstr "Рука"
- 
- #. Translators: Menu item Noun/Material/Human/Foot
--#: ../objects/FS/function.c:1086
-+#: ../objects/FS/function.c:1088
- msgid "Foot"
- msgstr "Стопало"
- 
- #. Translators: Menu item Noun/Material/Human/Head
--#: ../objects/FS/function.c:1088
-+#: ../objects/FS/function.c:1090
- msgid "Head"
- msgstr "Глава"
- 
- #. Translators: Menu item Noun/Material/Human/Finger
--#: ../objects/FS/function.c:1090
-+#: ../objects/FS/function.c:1092
- msgid "Finger"
- msgstr "Пр�т"
- 
- #. Translators: Menu item Noun/Material/Human/Toe
--#: ../objects/FS/function.c:1092
-+#: ../objects/FS/function.c:1094
- msgid "Toe"
--msgstr "Пр�т на нози"
-+msgstr "�ожни палац"
- 
- #. Translators: Menu item Noun/Material/Biological
--#: ../objects/FS/function.c:1094
-+#: ../objects/FS/function.c:1096
- msgid "Biological"
- msgstr "Биолошки"
- 
- #  Translators: Menu item Noun/Energy/Mechanical
- #  Translators: Menu item Noun/Energy/Mechanical
- #. Translators: Menu item Noun/Energy/Mechanical
--#: ../objects/FS/function.c:1098
-+#: ../objects/FS/function.c:1100
- msgid "Mechanical"
- msgstr "Механички"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
--#: ../objects/FS/function.c:1100
-+#: ../objects/FS/function.c:1102
- msgid "Mech. Energy"
--msgstr "Мех. Енергија"
-+msgstr "Мех. еанергија"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Translation
--#: ../objects/FS/function.c:1102
-+#: ../objects/FS/function.c:1104
- msgid "Translation"
- msgstr "Превод"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Force
--#: ../objects/FS/function.c:1104
-+#: ../objects/FS/function.c:1106
- msgid "Force"
- msgstr "Сила"
- 
- #  Translators: Menu item Noun/Energy/Mechanical/Rotation
- #. Translators: Menu item Noun/Energy/Mechanical/Rotation
--#: ../objects/FS/function.c:1106
-+#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
- msgid "Rotation"
- msgstr "Ротација"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Torque
--#: ../objects/FS/function.c:1108
-+#: ../objects/FS/function.c:1110
- msgid "Torque"
- msgstr "Заокрет"
- 
- #  Translators: Menu item Noun/Energy/Mechanical/Random Motion
- #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
--#: ../objects/FS/function.c:1110
-+#: ../objects/FS/function.c:1112
- msgid "Random Motion"
- msgstr "Случајно кретање"
- 
- #  Translators: Menu item Noun/Energy/Mechanical/Vibration
- #. Translators: Menu item Noun/Energy/Mechanical/Vibration
--#: ../objects/FS/function.c:1112
-+#: ../objects/FS/function.c:1114
- msgid "Vibration"
- msgstr "Вибрација"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
--#: ../objects/FS/function.c:1114
-+#: ../objects/FS/function.c:1116
- msgid "Rotational Energy"
--msgstr "Ротациона енергија"
-+msgstr "Енергија ротације"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
--#: ../objects/FS/function.c:1116
-+#: ../objects/FS/function.c:1118
- msgid "Translational Energy"
--msgstr "Прено�на енергија"
-+msgstr "Енергија прено�а"
- 
- #. Translators: Menu item Noun/Energy/Electricity
--#: ../objects/FS/function.c:1118
-+#: ../objects/FS/function.c:1120
- msgid "Electrical"
--msgstr "Електрично"
-+msgstr "Електрика"
- 
- #. Translators: Menu item Noun/Energy/Electricity/Electricity
--#: ../objects/FS/function.c:1120
-+#: ../objects/FS/function.c:1122
- msgid "Electricity"
- msgstr "Електрицитет"
- 
- #. Translators: Menu item Noun/Energy/Electricity/Voltage
--#: ../objects/FS/function.c:1122
-+#: ../objects/FS/function.c:1124
- msgid "Voltage"
- msgstr "Волтажа"
- 
- #  Translators: Menu item Noun/Energy/Electricity/Current
- #. Translators: Menu item Noun/Energy/Electricity/Current
--#: ../objects/FS/function.c:1124
-+#: ../objects/FS/function.c:1126
- msgid "Current"
- msgstr "Струја"
- 
- #. Translators: Menu item Noun/Energy/Hydraulic
--#: ../objects/FS/function.c:1126
-+#: ../objects/FS/function.c:1128
- msgid "Hydraulic"
- msgstr "Хидраулика"
- 
- #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
--#: ../objects/FS/function.c:1128
-+#: ../objects/FS/function.c:1130
- msgid "Pressure"
- msgstr "Прити�ак"
- 
- #  Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
- #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
--#: ../objects/FS/function.c:1130
-+#: ../objects/FS/function.c:1132
- msgid "Volumetric Flow"
--msgstr "Количина Протока"
-+msgstr "Проток количина"
- 
- #. Translators: Menu item Noun/Energy/Thermal
--#: ../objects/FS/function.c:1132
-+#: ../objects/FS/function.c:1134
- msgid "Thermal"
- msgstr "Термални"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Heat
--#: ../objects/FS/function.c:1134
-+#: ../objects/FS/function.c:1136
- msgid "Heat"
- msgstr "Топлота"
- 
- #  Translators: Menu item Noun/Energy/Thermal/Conduction
- #. Translators: Menu item Noun/Energy/Thermal/Conduction
--#: ../objects/FS/function.c:1136
-+#: ../objects/FS/function.c:1138
- msgid "Conduction"
--msgstr "Кондукција"
-+msgstr "Проводљиво�т"
- 
- #  Translators: Menu item Noun/Energy/Thermal/Convection
- #. Translators: Menu item Noun/Energy/Thermal/Convection
--#: ../objects/FS/function.c:1138
-+#: ../objects/FS/function.c:1140
- msgid "Convection"
- msgstr "Претварање"
- 
- #  Translators: Menu item Noun/Energy/Thermal/Radiation
- #. Translators: Menu item Noun/Energy/Thermal/Radiation
- #. Translators: Menu item Noun/Energy/Radioactive/Radiation
--#: ../objects/FS/function.c:1140 ../objects/FS/function.c:1148
-+#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
- msgid "Radiation"
- msgstr "Радијација"
- 
- #  Translators: Menu item Noun/Energy/Pneumatic
- #. Translators: Menu item Noun/Energy/Pneumatic
--#: ../objects/FS/function.c:1142
-+#: ../objects/FS/function.c:1144
- msgid "Pneumatic"
- msgstr "Пнеуматика"
- 
- #. Translators: Menu item Noun/Energy/Chemical
--#: ../objects/FS/function.c:1144
-+#: ../objects/FS/function.c:1146
- msgid "Chemical"
- msgstr "Хемија"
- 
- #. Translators: Menu item Noun/Energy/Radioactive
--#: ../objects/FS/function.c:1146
-+#: ../objects/FS/function.c:1148
- msgid "Radioactive"
- msgstr "Радиоактивно"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
--#: ../objects/FS/function.c:1150
-+#: ../objects/FS/function.c:1152
- msgid "Microwaves"
- msgstr "Микро тала�и"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
--#: ../objects/FS/function.c:1152
-+#: ../objects/FS/function.c:1154
- msgid "Radio waves"
- msgstr "Радио тала�и"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
--#: ../objects/FS/function.c:1154
-+#: ../objects/FS/function.c:1156
- msgid "X-Rays"
- msgstr "Ик� зраци"
- 
- #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
--#: ../objects/FS/function.c:1156
-+#: ../objects/FS/function.c:1158
- msgid "Gamma Rays"
- msgstr "Гама Зраци"
- 
- #. Translators: Menu item Noun/Energy/Acoustic Energy
--#: ../objects/FS/function.c:1158
-+#: ../objects/FS/function.c:1160
- msgid "Acoustic Energy"
--msgstr "Енергија звука"
-+msgstr "Звучна енергија"
- 
- #. Translators: Menu item Noun/Energy/Optical Energy
--#: ../objects/FS/function.c:1160
-+#: ../objects/FS/function.c:1162
- msgid "Optical Energy"
- msgstr "Оптичка енергија"
- 
- #. Translators: Menu item Noun/Energy/Solar Energy
--#: ../objects/FS/function.c:1162
-+#: ../objects/FS/function.c:1164
- msgid "Solar Energy"
- msgstr "Соларна енергија"
- 
- #. Translators: Menu item Noun/Energy/Magnetic Energy
--#: ../objects/FS/function.c:1164
-+#: ../objects/FS/function.c:1166
- msgid "Magnetic Energy"
- msgstr "Магнетна енергија"
- 
- #  Translators: Menu item Noun/Energy/Human/Human Motion
- #. Translators: Menu item Noun/Energy/Human/Human Motion
--#: ../objects/FS/function.c:1168
-+#: ../objects/FS/function.c:1170
- msgid "Human Motion"
- msgstr "Људ�ко кретање"
- 
- #. Translators: Menu item Noun/Energy/Human/Human Force
--#: ../objects/FS/function.c:1170
-+#: ../objects/FS/function.c:1172
- msgid "Human Force"
- msgstr "Људ�ка �ила"
- 
- #. Translators: Menu item Noun/Signal/Status
--#: ../objects/FS/function.c:1176
-+#: ../objects/FS/function.c:1178
- msgid "Status"
- msgstr "Стање"
- 
--#: ../objects/FS/function.c:1180
-+#: ../objects/FS/function.c:1182
- msgid "User/Device Fn"
- msgstr "Функција кори�ника/уређаја"
- 
--#: ../objects/FS/function.c:1181
-+#: ../objects/FS/function.c:1183
- msgid "Wish Fn"
- msgstr "Функција жеља"
- 
--#: ../objects/GRAFCET/action.c:135 ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Позив макроа"
- 
--#: ../objects/GRAFCET/action.c:135
-+#: ../objects/GRAFCET/action.c:137
- msgid "This action is a call to a macro-step"
- msgstr "Ова акција је позив макро-корака"
- 
--#: ../objects/GRAFCET/condition.c:130
-+#: ../objects/GRAFCET/condition.c:132
- msgid "Condition"
- msgstr "У�лов"
- 
--#: ../objects/GRAFCET/condition.c:130
-+#: ../objects/GRAFCET/condition.c:132
- msgid "The boolean equation of the condition"
- msgstr "Логичка једначина у�лова"
- 
--#: ../objects/GRAFCET/condition.c:132
-+#: ../objects/GRAFCET/condition.c:134
- msgid "The condition's font"
--msgstr "Фонт у�лова"
-+msgstr "Пи�мо у�лова"
- 
--#: ../objects/GRAFCET/condition.c:134
-+#: ../objects/GRAFCET/condition.c:136
- msgid "The condition's font size"
--msgstr "Величина фонта у�лова"
-+msgstr "Величина пи�ма у�лова"
- 
--#: ../objects/GRAFCET/condition.c:137 ../objects/GRAFCET/transition.c:147
-+#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
- msgid "Color"
- msgstr "Боја"
- 
--#: ../objects/GRAFCET/condition.c:137
-+#: ../objects/GRAFCET/condition.c:139
- msgid "The condition's color"
- msgstr "Боја у�лова"
- 
- #: ../objects/GRAFCET/grafcet.c:45
- msgid "GRAFCET diagram objects"
--msgstr "Објекти GRAFCET дијаграма"
-+msgstr "Објекти ГР�ФЦЕТ дијаграма"
- 
--#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Обичан корак"
- 
--#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "Почетни корак"
- 
--#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Корак улаза у макро"
- 
--#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Корак излаза из макроа"
- 
--#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
-+#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
- msgid "Macro call step"
- msgstr "Корак позива макроа"
- 
--#: ../objects/GRAFCET/step.c:151
-+#: ../objects/GRAFCET/step.c:153
- msgid "Subprogram call step"
- msgstr "Позив корака подпрограма"
- 
--#: ../objects/GRAFCET/step.c:158
-+#: ../objects/GRAFCET/step.c:160
- msgid "Step name"
--msgstr "Име корака"
-+msgstr "�азив корака"
- 
--#: ../objects/GRAFCET/step.c:158
-+#: ../objects/GRAFCET/step.c:160
- msgid "The name of the step"
--msgstr "Име од корака"
-+msgstr "�азив корака"
- 
--#: ../objects/GRAFCET/step.c:161
-+#: ../objects/GRAFCET/step.c:163
- msgid "Step type"
--msgstr "Тип корака"
-+msgstr "Вр�та корака"
- 
--#: ../objects/GRAFCET/step.c:161
-+#: ../objects/GRAFCET/step.c:163
- msgid "The kind of step"
- msgstr "Вр�та корака"
- 
--#: ../objects/GRAFCET/step.c:163
-+#: ../objects/GRAFCET/step.c:165
- msgid "Active"
- msgstr "�ктивно"
- 
--#: ../objects/GRAFCET/step.c:163
-+#: ../objects/GRAFCET/step.c:165
- msgid "Shows a red dot to figure the step's activity"
- msgstr "Приказује црвену тачку да о�лика активно�т корака"
- 
--#: ../objects/GRAFCET/transition.c:140
-+#: ../objects/GRAFCET/transition.c:142
- msgid "Receptivity"
- msgstr "Пријем"
- 
--#: ../objects/GRAFCET/transition.c:140
-+#: ../objects/GRAFCET/transition.c:142
- msgid "The boolean equation of the receptivity"
- msgstr "Логичка једначина за пријем"
- 
--#: ../objects/GRAFCET/transition.c:142
-+#: ../objects/GRAFCET/transition.c:144
- msgid "The receptivity's font"
--msgstr "Фонт за пријем"
-+msgstr "Пи�мо пријема"
- 
--#: ../objects/GRAFCET/transition.c:144
-+#: ../objects/GRAFCET/transition.c:146
- msgid "The receptivity's font size"
--msgstr "Величина фонта за пријем"
-+msgstr "Величина пи�ма за пријем"
- 
--#: ../objects/GRAFCET/transition.c:147
-+#: ../objects/GRAFCET/transition.c:149
- msgid "The receptivity's color"
--msgstr "Величина фонта за пријем"
-+msgstr "Боја пријема"
- 
--#: ../objects/GRAFCET/transition.c:148
-+#: ../objects/GRAFCET/transition.c:150
- msgid "North point"
- msgstr "Северна тачка"
- 
--#: ../objects/GRAFCET/transition.c:149
-+#: ../objects/GRAFCET/transition.c:151
- msgid "South point"
- msgstr "Јужна тачка"
- 
--#: ../objects/GRAFCET/vector.c:129
-+#: ../objects/GRAFCET/vector.c:131
- msgid "Draw arrow heads on upward arcs:"
--msgstr "И�цртај �трелице на луковима у�мереним на горе:"
-+msgstr "Црта �трелице на луковима у�мереним на горе:"
- 
--#: ../objects/GRAFCET/vergent.c:122
-+#: ../objects/GRAFCET/vergent.c:124
- msgid "OR"
- msgstr "ИЛИ"
- 
--#: ../objects/GRAFCET/vergent.c:123
-+#: ../objects/GRAFCET/vergent.c:125
- msgid "AND"
- msgstr "И"
- 
- # Ово �ам изми�лио на брзину ;-)
--#: ../objects/GRAFCET/vergent.c:134
-+#: ../objects/GRAFCET/vergent.c:136
- msgid "Vergent type:"
- msgstr "Вр�та темена:"
- 
--#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:469
--#: ../objects/Jackson/domain.c:531 ../objects/KAOS/goal.c:572
--#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:447
--#: ../objects/standard/line.c:219
-+#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
-+#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
-+#: ../objects/standard/line.c:223
- msgid "Add connection point"
--msgstr "Додај везивну тачку"
-+msgstr "Додај тачку везе"
- 
--#: ../objects/GRAFCET/vergent.c:406
--msgid "Delete  connection point"
--msgstr "Обриши везивну тачку"
-+#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
-+#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
-+#: ../objects/standard/line.c:224
-+msgid "Delete connection point"
-+msgstr "Обриши тачку везе"
- 
--#: ../objects/GRAFCET/vergent.c:410
-+#: ../objects/GRAFCET/vergent.c:412
- msgid "GRAFCET OR/AND vergent"
--msgstr "GRAFCET OR/AND vergent"
-+msgstr "ГР�ФЦЕТ ИЛИ/И теме"
- 
--#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:152
-+#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
- msgid "Unspecified"
--msgstr "�ије наведено"
-+msgstr "�еодређено"
- 
- #: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
--#, fuzzy
- msgid "Agent"
--msgstr "Додај �егмент"
-+msgstr "За�тупник"
- 
--#: ../objects/Istar/actor.c:71
-+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
- msgid "Role"
- msgstr "Улога"
- 
- #: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
- msgid "Softgoal"
--msgstr ""
-+msgstr "Блажи циљ"
- 
- #: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
- msgid "Goal"
- msgstr "Циљ"
- 
--#: ../objects/Istar/goal.c:154 ../objects/Istar/goal.c:155
--#: ../objects/KAOS/goal.c:157 ../objects/KAOS/goal.c:158
-+#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-+#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
- msgid "Goal Type"
--msgstr "Циљна вр�та"
-+msgstr "Вр�та циља"
- 
- #: ../objects/Istar/istar.c:46
- msgid "Istar diagram"
--msgstr "I.S.T.A.R. дијаграми"
-+msgstr "И�тар дијаграм"
- 
--#: ../objects/Istar/link.c:153
--msgid "Positive Contrib"
-+#: ../objects/Istar/link.c:151
-+msgid "Positive contrib"
- msgstr "Позитивни доприно�"
- 
--#: ../objects/Istar/link.c:154
-+#: ../objects/Istar/link.c:152
- msgid "Negative contrib"
- msgstr "�егативни доприно�"
- 
--#: ../objects/Istar/link.c:155 ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Зави�но�т"
- 
--#: ../objects/Istar/link.c:156
-+#: ../objects/Istar/link.c:154
- msgid "Decomposition"
- msgstr "Разлагање"
- 
--#: ../objects/Istar/link.c:157
-+#: ../objects/Istar/link.c:155
- msgid "Means-Ends"
--msgstr ""
-+msgstr "Сред�тва-завршеци"
- 
- #: ../objects/Istar/other.c:73
- msgid "Resource"
- msgstr "Ре�ур�"
- 
--#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr "Задатак"
- 
--#: ../objects/Istar/other.c:470 ../objects/Jackson/domain.c:532
--#: ../objects/KAOS/goal.c:573 ../objects/KAOS/other.c:526
--#: ../objects/SADT/box.c:448 ../objects/standard/line.c:220
--msgid "Delete connection point"
--msgstr "Обриши везивну тачку"
--
--#: ../objects/Istar/other.c:475
--#, fuzzy
-+#: ../objects/Istar/other.c:477
- msgid "i* other"
--msgstr "Рутер гла�а"
-+msgstr "i* други"
- 
- #: ../objects/Jackson/domain.c:79
- msgid "Given Domain"
-@@ -3944,7 +4487,7 @@ msgstr "Задани домен"
- 
- #: ../objects/Jackson/domain.c:80
- msgid "Designed Domain"
--msgstr "Циљни домен"
-+msgstr "Зацртани домен"
- 
- #: ../objects/Jackson/domain.c:81
- msgid "Machine Domain"
-@@ -3955,27 +4498,26 @@ msgid "Causal"
- msgstr "Узрочни"
- 
- #: ../objects/Jackson/domain.c:98
--#, fuzzy
- msgid "Biddable"
--msgstr "Средина"
-+msgstr "Изразив"
- 
- #: ../objects/Jackson/domain.c:99
- msgid "Lexical"
- msgstr "Лек�ички"
- 
--#: ../objects/Jackson/domain.c:176 ../objects/Jackson/domain.c:177
-+#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
- msgid "Domain Type"
- msgstr "Тип домена"
- 
--#: ../objects/Jackson/domain.c:181
-+#: ../objects/Jackson/domain.c:183
- msgid "Domain Kind"
- msgstr "Вр�та домена"
- 
--#: ../objects/Jackson/domain.c:182
-+#: ../objects/Jackson/domain.c:184
- msgid "Optional kind which appears in the lower right corner of the Domain"
- msgstr "�еобавезна вр�та која �е појављује у доњем де�ном углу домена"
- 
--#: ../objects/Jackson/domain.c:537
-+#: ../objects/Jackson/domain.c:539
- msgid "Jackson domain"
- msgstr "�ек�онов домен"
- 
-@@ -3983,15 +4525,18 @@ msgstr "�ек�онов домен"
- msgid "Jackson diagram"
- msgstr "�ек�онов дијаграм"
- 
--#: ../objects/Jackson/phenomenon.c:134
-+#: ../objects/Jackson/phenomenon.c:136
- msgid "Shared"
- msgstr "Дељен"
- 
--#: ../objects/Jackson/phenomenon.c:135 ../objects/KAOS/goal.c:81
-+#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
- msgid "Requirement"
- msgstr "Захтев"
- 
--#: ../objects/Jackson/phenomenon.c:142 ../objects/UML/message.c:151
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule
-+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
-+#: ../objects/UML/message.c:155
- msgid "Message:"
- msgstr "Порука:"
- 
-@@ -4003,650 +4548,1098 @@ msgstr "Претпо�тавка"
- msgid "Obstacle"
- msgstr "Препрека"
- 
--#: ../objects/KAOS/goal.c:578
-+#: ../objects/KAOS/goal.c:580
- msgid "KAOS goal"
--msgstr "KAOS циљ"
-+msgstr "Циљ К�ОС"
- 
- #: ../objects/KAOS/kaos.c:49
- msgid "KAOS diagram"
--msgstr "KAOS дијаграм"
-+msgstr "Дијаграм К�ОС"
- 
--#: ../objects/KAOS/metaandorrel.c:151
--#, fuzzy
-+#: ../objects/KAOS/metaandorrel.c:153
- msgid "AND Refinement"
--msgstr "И ивица"
-+msgstr "И прочишћавање"
- 
--#: ../objects/KAOS/metaandorrel.c:152
-+#: ../objects/KAOS/metaandorrel.c:154
- msgid "Complete AND Refinement"
--msgstr ""
-+msgstr "Потпуно И прочишћавање"
- 
--#: ../objects/KAOS/metaandorrel.c:153
--#, fuzzy
-+#: ../objects/KAOS/metaandorrel.c:155
- msgid "OR Refinement"
--msgstr "Рафиниши"
-+msgstr "ИЛИ проћишћавање"
- 
--#: ../objects/KAOS/metaandorrel.c:154
--#, fuzzy
-+#: ../objects/KAOS/metaandorrel.c:156
- msgid "Operationalization"
--msgstr "Подаци операција"
-+msgstr "Операционализација"
- 
--#: ../objects/KAOS/metaandorrel.c:161
-+#: ../objects/KAOS/metaandorrel.c:163
- msgid "Text:"
- msgstr "Тек�т:"
- 
--#: ../objects/KAOS/metabinrel.c:155
-+#: ../objects/KAOS/metabinrel.c:157
- msgid "Contributes"
- msgstr "Доприно�и"
- 
--#: ../objects/KAOS/metabinrel.c:156
-+#: ../objects/KAOS/metabinrel.c:158
- msgid "Obstructs"
- msgstr "Омета"
- 
--#: ../objects/KAOS/metabinrel.c:157
-+#: ../objects/KAOS/metabinrel.c:159
- msgid "Conflicts"
- msgstr "Сукобљава �е"
- 
--#: ../objects/KAOS/metabinrel.c:158
-+#: ../objects/KAOS/metabinrel.c:160
- msgid "Responsibility"
- msgstr "Одговорно�т"
- 
--#: ../objects/KAOS/metabinrel.c:159
-+#: ../objects/KAOS/metabinrel.c:161
- msgid "Monitors"
- msgstr "�адгледа"
- 
--#: ../objects/KAOS/metabinrel.c:160
-+#: ../objects/KAOS/metabinrel.c:162
- msgid "Controls"
--msgstr "Контролиши"
-+msgstr "Контролише"
- 
--#: ../objects/KAOS/metabinrel.c:161
-+#: ../objects/KAOS/metabinrel.c:163
- msgid "CapableOf"
- msgstr "Спо�обан да"
- 
--#: ../objects/KAOS/metabinrel.c:162
-+#: ../objects/KAOS/metabinrel.c:164
- msgid "Performs"
- msgstr "Обавља"
- 
--#: ../objects/KAOS/metabinrel.c:164
-+#: ../objects/KAOS/metabinrel.c:166
- msgid "Output"
- msgstr "Излаз"
- 
--#: ../objects/KAOS/other.c:531
--#, fuzzy
-+#: ../objects/KAOS/other.c:533
- msgid "KAOS other"
--msgstr "IAD рутер"
-+msgstr "К�ОС други"
- 
--#: ../objects/Misc/analog_clock.c:137
-+#: ../objects/Misc/analog_clock.c:139
- msgid "Arrow color"
- msgstr "Боја казаљке"
- 
--#: ../objects/Misc/analog_clock.c:139
-+#: ../objects/Misc/analog_clock.c:141
- msgid "Arrow line width"
- msgstr "Ширина казаљке"
- 
--#: ../objects/Misc/analog_clock.c:141
-+#: ../objects/Misc/analog_clock.c:143
- msgid "Seconds arrow color"
--msgstr "Боја казаљке за �екунде"
-+msgstr "Боја �екундаре"
- 
--#: ../objects/Misc/analog_clock.c:143
-+#: ../objects/Misc/analog_clock.c:145
- msgid "Seconds arrow line width"
--msgstr "Ширина казаљке за �екунде"
-+msgstr "Ширина �екундаре"
- 
--#: ../objects/Misc/analog_clock.c:145
-+#: ../objects/Misc/analog_clock.c:147
- msgid "Show hours"
--msgstr "Прикажи време"
-+msgstr "Прикажи �ате"
-+
-+#: ../objects/Misc/grid_object.c:140
-+msgid "Rows"
-+msgstr "Редови"
-+
-+#: ../objects/Misc/grid_object.c:142
-+msgid "Columns"
-+msgstr "Ступци"
-+
-+#: ../objects/Misc/grid_object.c:144
-+msgid "Gridline color"
-+msgstr "Боја линије мреже"
- 
--#: ../objects/Misc/libmisc.c:42
-+#: ../objects/Misc/grid_object.c:146
-+msgid "Gridline width"
-+msgstr "Ширина линије мреже"
-+
-+#: ../objects/Misc/libmisc.c:41
- msgid "Miscellaneous objects"
- msgstr "Разни објекти"
- 
--#. property rows
--#: ../objects/SADT/arrow.c:134 ../objects/UML/class.c:174
--#: ../objects/UML/class_dialog.c:400
--msgid "Normal"
--msgstr "Обичан"
-+#: ../objects/Misc/measure.c:169
-+msgid "cm"
-+msgstr "cm"
-+
-+#: ../objects/Misc/measure.c:170
-+msgid "dm"
-+msgstr "dm"
-+
-+#: ../objects/Misc/measure.c:171
-+msgid "ft"
-+msgstr "�топа"
-+
-+#: ../objects/Misc/measure.c:172
-+msgid "in"
-+msgstr "инчи"
-+
-+#: ../objects/Misc/measure.c:173
-+msgid "m"
-+msgstr "m"
-+
-+#: ../objects/Misc/measure.c:174
-+msgid "mm"
-+msgstr "mm"
-+
-+#: ../objects/Misc/measure.c:175
-+msgid "pt"
-+msgstr "тачака"
-+
-+#  Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-+#: ../objects/Misc/measure.c:176
-+msgid "pi"
-+msgstr "пи"
-+
-+#. PROP_FLAG_VISIBLE|
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
-+msgid "Measurement"
-+msgstr "Мерење"
-+
-+#: ../objects/Misc/measure.c:187
-+msgid "Unit"
-+msgstr "Јединица"
-+
-+#: ../objects/Misc/measure.c:188
-+msgid "Precision"
-+msgstr "Тачно�т"
-+
-+#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
-+msgid "Add Handle"
-+msgstr "Додај ручку"
-+
-+#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
-+msgid "Delete Handle"
-+msgstr "Обриши ручку"
- 
--#: ../objects/SADT/arrow.c:135
-+#: ../objects/SADT/arrow.c:138
- msgid "Import resource (not shown upstairs)"
- msgstr "Увези ре�ур� (није приказан горе)"
- 
--#: ../objects/SADT/arrow.c:136
-+#: ../objects/SADT/arrow.c:139
- msgid "Imply resource (not shown downstairs)"
- msgstr "Подразумевај ре�ур� (није приказан доле)"
- 
--#: ../objects/SADT/arrow.c:137
-+#: ../objects/SADT/arrow.c:140
- msgid "Dotted arrow"
- msgstr "Тачка�та �трелица"
- 
--#: ../objects/SADT/arrow.c:138
-+#: ../objects/SADT/arrow.c:141
- msgid "disable arrow heads"
--msgstr "и�кључи главе �трелица"
-+msgstr "и�кључи врхове �трелица"
- 
--#: ../objects/SADT/arrow.c:144
-+#: ../objects/SADT/arrow.c:148
- msgid "Flow style:"
- msgstr "Стил протока:"
- 
--#: ../objects/SADT/arrow.c:146
-+#: ../objects/SADT/arrow.c:150
- msgid "Automatically gray vertical flows:"
--msgstr "�утомат�ки по�иви у�правни проток:"
-+msgstr "Само�тално за�иви у�правни проток:"
- 
--#: ../objects/SADT/arrow.c:147
-+#: ../objects/SADT/arrow.c:151
- msgid ""
- "To improve the ease of reading, flows which begin and end vertically can be "
- "rendered gray"
- msgstr ""
--"Да �е олакша читање, токови који почињу и завршавају �е у�правно �е могу "
--"и�цртати �ивом бојом"
-+"Зарад олакшавања читања, токови који почињу и завршавају �е у�правно могу "
-+"бити и�цртани �ивом бојом"
- 
--#: ../objects/SADT/arrow.c:463
-+#: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
--msgstr "SADT Стрелица"
-+msgstr "С�ДТ �трелица"
- 
--#: ../objects/SADT/box.c:137 ../objects/flowchart/box.c:152
--#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
--#: ../objects/flowchart/parallelogram.c:154
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
-+#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
-+#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
- msgid "Text padding"
- msgstr "Попуњавање тек�та"
- 
--#: ../objects/SADT/box.c:144
-+#: ../objects/SADT/box.c:149
- msgid "Activity/Data identifier"
- msgstr "Идентификатор активно�ти/података"
- 
--#: ../objects/SADT/box.c:145
-+#: ../objects/SADT/box.c:150
- msgid "The identifier which appears in the lower right corner of the Box"
--msgstr "Идентификатор који �е појављује у доњем де�ном углу кутије"
-+msgstr "Идентификатор који �е појављује у доњем де�ном углу квадратића"
- 
--#: ../objects/SADT/box.c:453
-+#: ../objects/SADT/box.c:460
- msgid "SADT box"
--msgstr "SADT кућица"
-+msgstr "С�ДТ квадратић"
- 
- #: ../objects/SADT/sadt.c:41
- msgid "SADT diagram objects"
--msgstr "SADT дијаграм објеката"
-+msgstr "Објекти С�ДТ дијаграма"
- 
--#: ../objects/UML/actor.c:349 ../objects/UML/actor.c:351
--#: ../sheets/UML.sheet.in.h:2
--msgid "Actor"
--msgstr "Глумац"
-+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-+msgid "No Protection"
-+msgstr "Без заштите"
- 
--#: ../objects/UML/association.c:1173 ../objects/UML/class_dialog.c:2208
--msgid "Direction:"
--msgstr "Правац:"
-+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-+msgid "Restricted Diffusion"
-+msgstr "Ограничено про�тирање"
- 
--#: ../objects/UML/association.c:1190
--msgid "From A to B"
--msgstr "Од � до Б"
-+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-+msgid "Special Country Confidential"
-+msgstr "По�ебна државна поверљиво�т"
- 
--#: ../objects/UML/association.c:1197
--msgid "From B to A"
--msgstr "Од Б до �"
-+#: ../objects/SISSI/classification.h:41
-+msgid "Confidential"
-+msgstr "Поверљиво"
- 
--#: ../objects/UML/association.c:1221 ../objects/UML/association.c:1229
--msgid "Side A"
--msgstr "Страна �"
-+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-+msgid "NATO Confidential"
-+msgstr "Поверљиво�т ��ТО-а"
- 
--#: ../objects/UML/association.c:1223 ../objects/UML/association.c:1231
--msgid "Side B"
--msgstr "Страна Б"
-+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-+msgid "Personal Confidential"
-+msgstr "Лична поверљиво�т"
- 
--#: ../objects/UML/association.c:1237
--msgid "Role:"
--msgstr "Улога:"
-+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-+msgid "Medical Confidential"
-+msgstr "Поверљиво�т медицине"
- 
--#: ../objects/UML/association.c:1249
--msgid "Multiplicity:"
--msgstr "Више�труко�т:"
-+#: ../objects/SISSI/classification.h:45
-+msgid "Industrie Confidential"
-+msgstr "Инду�триј�ка поверљиво�т"
- 
--#: ../objects/UML/association.c:1260 ../objects/UML/class_dialog.c:1019
--#: ../objects/UML/class_dialog.c:1952
--msgid "Visibility:"
--msgstr "Видљиво�т:"
-+#: ../objects/SISSI/classification.h:46
-+msgid "Defense Confidential"
-+msgstr "Поверљиво�т одбране"
- 
--#: ../objects/UML/association.c:1269 ../objects/UML/class_dialog.c:1028
--#: ../objects/UML/class_dialog.c:1961 ../objects/UML/uml.c:102
--msgid "Public"
--msgstr "Јавно"
-+#  Translators: Menu item Verb/Support/Secure
-+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-+msgid "Secret"
-+msgstr "Тајно"
- 
--#: ../objects/UML/association.c:1279 ../objects/UML/class_dialog.c:1036
--#: ../objects/UML/class_dialog.c:1969 ../objects/UML/uml.c:103
--msgid "Private"
--msgstr "Приватно"
-+#: ../objects/SISSI/classification.h:48
-+msgid "Defense Secret"
-+msgstr "Тајна одбране"
- 
--#: ../objects/UML/association.c:1289 ../objects/UML/class_dialog.c:1044
--#: ../objects/UML/class_dialog.c:1977 ../objects/UML/uml.c:104
--msgid "Protected"
--msgstr "Заштићен"
-+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-+msgid "Secret special country"
-+msgstr "Тајна по�ебна земља"
- 
--#: ../objects/UML/association.c:1299 ../objects/UML/class_dialog.c:1052
--#: ../objects/UML/class_dialog.c:1985 ../objects/UML/uml.c:105
--msgid "Implementation"
--msgstr "Изведба"
-+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-+msgid "NATO Secret"
-+msgstr "��ТО тајна"
- 
--#. Show arrow:
--#: ../objects/UML/association.c:1318
--msgid "Show arrow"
--msgstr "Покажи �трелице"
-+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-+msgid "Very Secret"
-+msgstr "Строго поверљиво"
- 
--#. Aggregate
--#: ../objects/UML/association.c:1324
--msgid "Aggregate"
--msgstr "Сакупљено"
-+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-+msgid "NATO Very Secret"
-+msgstr "��ТО �трого поверљиво"
- 
--#. Composition
--#: ../objects/UML/association.c:1332
--msgid "Composition"
--msgstr "Слагање"
-+#: ../objects/SISSI/sissi.c:66
-+msgid "SISSI diagram"
-+msgstr "СИССИ дијаграм"
- 
--#  Class page:
--#: ../objects/UML/class.c:137 ../objects/UML/class.c:308
--#: ../objects/UML/class.c:1703 ../sheets/UML.sheet.in.h:6
--msgid "Class"
--msgstr "Кла�а"
-+#: ../objects/SISSI/sissi.c:923
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Not a regular file: %s"
-+msgstr ""
-+"Грешка учитавања објекта.\n"
-+"�ије обична датотека: %s"
- 
--#: ../objects/UML/class.c:141 ../objects/UML/classicon.c:138
--#: ../objects/UML/component.c:124 ../objects/UML/large_package.c:129
--#: ../objects/UML/object.c:150 ../objects/UML/small_package.c:124
--#: ../objects/UML/umloperation.c:68
--msgid "Stereotype"
--msgstr "Стереотип"
-+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Incorrect file type: %s"
-+msgstr ""
-+"Грешка учитавања објекта.\n"
-+"�еи�правна вр�та датотеке: %s"
- 
--#: ../objects/UML/class.c:143 ../objects/UML/class.c:184
--#: ../objects/UML/class_dialog.c:425 ../objects/UML/umlattribute.c:43
--#: ../objects/UML/umloperation.c:66 ../objects/UML/umlparameter.c:49
--#: ../sheets/SDL.sheet.in.h:3
--msgid "Comment"
--msgstr "�апомена"
-+#: ../objects/SISSI/sissi.c:940
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Not a Dia file: %s"
-+msgstr ""
-+"Грешка учитавања објекта.\n"
-+"�ије датотека Дие: %s"
- 
--#: ../objects/UML/class.c:145 ../objects/UML/class.c:178
--#: ../objects/UML/class_dialog.c:324 ../objects/UML/class_dialog.c:410
--#: ../objects/UML/class_dialog.c:2016 ../objects/UML/uml.c:110
--msgid "Abstract"
--msgstr "�п�тракт"
-+#: ../objects/SISSI/sissi_dialog.c:48
-+msgid "Industrial Confidential"
-+msgstr "Инду�триј�ка поверљиво�т"
- 
--#: ../objects/UML/class.c:147 ../objects/UML/class.c:1700
--msgid "Template"
--msgstr "Шаблон"
-+#: ../objects/SISSI/sissi_dialog.c:58
-+msgid "No integrity"
-+msgstr "Без целовито�ти"
- 
--#: ../objects/UML/class.c:150 ../objects/UML/class_dialog.c:333
--msgid "Suppress Attributes"
--msgstr "Занемари атрибуте"
-+#: ../objects/SISSI/sissi_dialog.c:59
-+msgid "Low integrity"
-+msgstr "�и�ка целовито�т"
- 
--#: ../objects/UML/class.c:152
--msgid "Suppress Operations"
--msgstr "Занемари операције"
-+#: ../objects/SISSI/sissi_dialog.c:60
-+msgid "Average software integrity"
-+msgstr "Про�ечна �офтвер�ка целовито�т"
- 
--#: ../objects/UML/class.c:154
--msgid "Visible Attributes"
--msgstr "Видљиве О�обине"
-+#: ../objects/SISSI/sissi_dialog.c:61
-+msgid "High software integrity"
-+msgstr "Ви�ока �офтвер�ка целовито�т"
- 
--#: ../objects/UML/class.c:156
--msgid "Visible Operations"
--msgstr "Видљиве Операције"
-+#: ../objects/SISSI/sissi_dialog.c:62
-+msgid "Average hardware integrity"
-+msgstr "Про�ечна хардвер�ка целовито�т"
- 
--#: ../objects/UML/class.c:158
--msgid "Visible Comments"
--msgstr "Видљиви Коментари"
-+#: ../objects/SISSI/sissi_dialog.c:63
-+msgid "High hardware integrity"
-+msgstr "Ви�ока хардвер�ка целовито�т"
- 
--#  Operations page:
--#: ../objects/UML/class.c:160 ../objects/UML/class_dialog.c:349
--#, fuzzy
--msgid "Wrap Operations"
--msgstr "Операције"
-+#: ../objects/SISSI/sissi_dialog.c:68
-+msgid "Millisecond"
-+msgstr "Мили�екунда"
- 
--#: ../objects/UML/class.c:162
--#, fuzzy
--msgid "Wrap after char"
--msgstr "PC картица за прикључење"
-+#: ../objects/SISSI/sissi_dialog.c:69
-+msgid "Second"
-+msgstr "Секунда"
- 
--#: ../objects/UML/class.c:164
--msgid "Comment line length"
--msgstr "Дужина напомене"
-+#: ../objects/SISSI/sissi_dialog.c:70
-+msgid "Minute"
-+msgstr "Минут"
- 
--#: ../objects/UML/class.c:166
--#, fuzzy
--msgid "Comment tagging"
--msgstr "Дужина напомене"
-+#: ../objects/SISSI/sissi_dialog.c:71
-+msgid "Hour"
-+msgstr "Сат"
- 
--#: ../objects/UML/class.c:176 ../objects/UML/class_dialog.c:405
--msgid "Polymorphic"
--msgstr "Полиморфна"
-+#: ../objects/SISSI/sissi_dialog.c:72
-+msgid "Day"
-+msgstr "Дан"
- 
--#: ../objects/UML/class.c:180
--msgid "Classname"
--msgstr "Име кла�е"
-+#: ../objects/SISSI/sissi_dialog.c:73
-+msgid "Week"
-+msgstr "Седмица"
- 
--#: ../objects/UML/class.c:182
--msgid "Abstract Classname"
--msgstr "�п�трактна кла�а"
-+#: ../objects/SISSI/sissi_dialog.c:78
-+msgid "SYSTEM"
-+msgstr "СИСТЕМ"
- 
--#: ../objects/UML/class.c:188 ../objects/UML/class.c:190
--#: ../objects/UML/class.c:192 ../objects/UML/class.c:194
--#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
--msgid " "
--msgstr " "
-+#: ../objects/SISSI/sissi_dialog.c:79
-+msgid "Internet access device"
-+msgstr "Уређај при�тупа интернету"
- 
--#  Attributes page:
--#: ../objects/UML/class.c:204 ../objects/UML/object.c:154
--msgid "Attributes"
--msgstr "О�обине"
-+#: ../objects/SISSI/sissi_dialog.c:80
-+msgid "Electronic messaging"
-+msgstr "Електрон�ко допи�ивање"
- 
--#  Operations page:
--#: ../objects/UML/class.c:206
--msgid "Operations"
--msgstr "Операције"
-+#: ../objects/SISSI/sissi_dialog.c:81
-+msgid "Intranet"
-+msgstr "Интранет"
- 
--#: ../objects/UML/class.c:209
--msgid "Template Parameters"
--msgstr "Параметри шаблона"
-+#: ../objects/SISSI/sissi_dialog.c:82
-+msgid "Company directory"
-+msgstr "Реги�тар предузећа"
- 
--#: ../objects/UML/class.c:303
--msgid "Show Comments"
--msgstr "Прикажи напомене"
-+#: ../objects/SISSI/sissi_dialog.c:83
-+msgid "External portal"
-+msgstr "Спољни портал"
- 
--#  Class page:
--#. Class page:
--#: ../objects/UML/class_dialog.c:285
--msgid "_Class"
--msgstr "_Кла�а"
-+#: ../objects/SISSI/sissi_dialog.c:88
-+msgid "ORGANISATION"
-+msgstr "ОРГ��ИЗ�ЦИЈ�"
- 
--#: ../objects/UML/class_dialog.c:293
--msgid "Class name:"
--msgstr "Име кла�е:"
-+#: ../objects/SISSI/sissi_dialog.c:89
-+msgid "Higher-tier organisation"
-+msgstr "Организација ви�оког нивоа"
- 
--#: ../objects/UML/class_dialog.c:301 ../objects/UML/class_dialog.c:1939
--#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
--#: ../objects/UML/realizes.c:134
--msgid "Stereotype:"
--msgstr "Стереотип:"
-+#: ../objects/SISSI/sissi_dialog.c:90
-+msgid "Structure of the organisation"
-+msgstr "Структура организације"
- 
--#: ../objects/UML/class_dialog.c:308 ../objects/UML/class_dialog.c:997
--#: ../objects/UML/class_dialog.c:2057 ../objects/UML/class_dialog.c:2188
--msgid "Comment:"
--msgstr "�апомена:"
-+#: ../objects/SISSI/sissi_dialog.c:91
-+msgid "Project or system organisation"
-+msgstr "Организација пројекта или �и�тема"
- 
--#: ../objects/UML/class_dialog.c:330
--msgid "Attributes visible"
--msgstr "О�обине видљиве"
-+#: ../objects/SISSI/sissi_dialog.c:92
-+msgid "Subcontractors / Suppliers / Manufacturers"
-+msgstr "Подизвођачи / Добављачи / Произвођачи"
- 
--#: ../objects/UML/class_dialog.c:339
--msgid "Operations visible"
--msgstr "Операције видљиве"
-+#: ../objects/SISSI/sissi_dialog.c:97
-+msgid "SITE"
-+msgstr "С�ЈТ"
- 
--#: ../objects/UML/class_dialog.c:342
--msgid "Suppress operations"
--msgstr "Поти�ни операције"
-+#: ../objects/SISSI/sissi_dialog.c:98
-+msgid "Places"
-+msgstr "Ме�та"
- 
--#: ../objects/UML/class_dialog.c:356
--msgid "Wrap after this length: "
--msgstr ""
-+#: ../objects/SISSI/sissi_dialog.c:99
-+msgid "External environment"
-+msgstr "Спољно окружење"
- 
--#: ../objects/UML/class_dialog.c:364
--msgid "Comments visible"
--msgstr "�апомене �у приказане"
-+#: ../objects/SISSI/sissi_dialog.c:100
-+msgid "Premises"
-+msgstr "Про�торије"
- 
--#: ../objects/UML/class_dialog.c:371
--msgid "Wrap comment after this length: "
--msgstr ""
-+#: ../objects/SISSI/sissi_dialog.c:101
-+msgid "Zone"
-+msgstr "Зона"
- 
--#: ../objects/UML/class_dialog.c:378
--msgid "Show documenation tag"
--msgstr ""
-+#: ../objects/SISSI/sissi_dialog.c:102
-+msgid "Essential Services"
-+msgstr "Суштин�ке у�луге"
- 
--#. head line
--#: ../objects/UML/class_dialog.c:391 ../objects/UML/umlparameter.c:51
--msgid "Kind"
--msgstr "Вр�та"
-+#: ../objects/SISSI/sissi_dialog.c:103
-+msgid "Communication"
-+msgstr "Комуникација"
- 
--#: ../objects/UML/class_dialog.c:396
--msgid "Size"
--msgstr "Величина"
-+#: ../objects/SISSI/sissi_dialog.c:104
-+msgid "Power"
-+msgstr "�апајање"
-+
-+#: ../objects/SISSI/sissi_dialog.c:105
-+msgid "Cooling / Pollution"
-+msgstr "Хлађење / Загађење"
-+
-+#: ../objects/SISSI/sissi_dialog.c:109
-+msgid "Thermal detection"
-+msgstr "Откривање топлоте"
-+
-+#: ../objects/SISSI/sissi_dialog.c:113
-+msgid "Fire detection"
-+msgstr "Откривање ватре"
-+
-+#: ../objects/SISSI/sissi_dialog.c:117
-+msgid "Water detection"
-+msgstr "Откривање воде"
-+
-+#: ../objects/SISSI/sissi_dialog.c:121
-+msgid "Air detection"
-+msgstr "Откривање ваздуха"
-+
-+#: ../objects/SISSI/sissi_dialog.c:125
-+msgid "Energy detection"
-+msgstr "Откривање енергије"
-+
-+#: ../objects/SISSI/sissi_dialog.c:129
-+msgid "Intrusion detection"
-+msgstr "Откривање упада"
-+
-+#: ../objects/SISSI/sissi_dialog.c:133
-+msgid "Thermal action"
-+msgstr "Радња топлоте"
-+
-+#: ../objects/SISSI/sissi_dialog.c:137
-+msgid "Fire action"
-+msgstr "Радња ватре"
-+
-+#: ../objects/SISSI/sissi_dialog.c:141
-+msgid "Water action"
-+msgstr "Радња воде"
-+
-+#: ../objects/SISSI/sissi_dialog.c:145
-+msgid "Air action"
-+msgstr "Радња ваздуха"
-+
-+#: ../objects/SISSI/sissi_dialog.c:149
-+msgid "Energy action"
-+msgstr "Радња енергије"
-+
-+#: ../objects/SISSI/sissi_dialog.c:153
-+msgid "Intrusion action"
-+msgstr "Радња упада"
-+
-+#: ../objects/SISSI/sissi_dialog.c:158
-+msgid "Personal"
-+msgstr "Лично"
-+
-+#: ../objects/SISSI/sissi_dialog.c:159
-+msgid "Decision maker"
-+msgstr "Доно�илац одлуке"
-+
-+#: ../objects/SISSI/sissi_dialog.c:160
-+msgid "SSI Responsible"
-+msgstr "ССИ одговоран"
-+
-+#: ../objects/SISSI/sissi_dialog.c:161
-+msgid "Users"
-+msgstr "Кори�ници"
-+
-+#: ../objects/SISSI/sissi_dialog.c:162
-+msgid "Functional administrator"
-+msgstr "Функционални админи�тратор"
-+
-+#: ../objects/SISSI/sissi_dialog.c:163
-+msgid "Technical administrator"
-+msgstr "Технички админи�тратор"
-+
-+#: ../objects/SISSI/sissi_dialog.c:164
-+msgid "SSI administrator"
-+msgstr "ССИ админи�тратор"
-+
-+#: ../objects/SISSI/sissi_dialog.c:165
-+msgid "Developer"
-+msgstr "Програмер"
-+
-+#: ../objects/SISSI/sissi_dialog.c:166
-+msgid "Operator / Maintenance"
-+msgstr "Извршилац / Одржавање"
-+
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
-+msgid "Network"
-+msgstr "Мрежа"
-+
-+#: ../objects/SISSI/sissi_dialog.c:172
-+msgid "Medium and support"
-+msgstr "Медијум и подршка"
-+
-+#: ../objects/SISSI/sissi_dialog.c:173
-+msgid "Passive or active relay"
-+msgstr "Па�иван или активан прено�"
-+
-+#: ../objects/SISSI/sissi_dialog.c:174
-+msgid "Communication interface"
-+msgstr "Сучеље комуникације"
-+
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
-+msgid "Software"
-+msgstr "Софтвер"
-+
-+#  Operations page:
-+#: ../objects/SISSI/sissi_dialog.c:180
-+msgid "Operating System"
-+msgstr "Оперативни �и�тем"
-+
-+#: ../objects/SISSI/sissi_dialog.c:181
-+msgid "Service - maintenance or administration software"
-+msgstr "У�луга — �офтвер одржавања или админи�трације"
-+
-+#: ../objects/SISSI/sissi_dialog.c:182
-+msgid "Packaged software or standard software"
-+msgstr "Запаковани или уобичајени �офтвер"
-+
-+#: ../objects/SISSI/sissi_dialog.c:183
-+msgid "Business application"
-+msgstr "По�ловни програм"
-+
-+#: ../objects/SISSI/sissi_dialog.c:184
-+msgid "Standard business application"
-+msgstr "Уобичајен по�ловни програм"
-+
-+#: ../objects/SISSI/sissi_dialog.c:185
-+msgid "Specific business application"
-+msgstr "По�ебан по�ловни програм"
-+
-+#: ../objects/SISSI/sissi_dialog.c:190
-+msgid "HARDWARE"
-+msgstr "Х�РДВЕР"
-+
-+#: ../objects/SISSI/sissi_dialog.c:191
-+msgid "Data-processing equipment (active)"
-+msgstr "Опрема за обраду података (радна)"
-+
-+#: ../objects/SISSI/sissi_dialog.c:192
-+msgid "Mobile equipment"
-+msgstr "Покретна опрема"
-+
-+#: ../objects/SISSI/sissi_dialog.c:193
-+msgid "Fixed equipment"
-+msgstr "Стална опрема"
-+
-+#: ../objects/SISSI/sissi_dialog.c:194
-+msgid "Peripheral processing"
-+msgstr "Спољно обрађивање"
-+
-+#: ../objects/SISSI/sissi_dialog.c:195
-+msgid "Electronic medium"
-+msgstr "Електрон�ки медиј"
-+
-+#: ../objects/SISSI/sissi_dialog.c:196
-+msgid "Other media"
-+msgstr "О�тали медији"
-+
-+#: ../objects/SISSI/sissi_dialog.c:197
-+msgid "Data medium (passive)"
-+msgstr "Медиј података (па�иван)"
-+
-+#. Class page:
-+#: ../objects/SISSI/sissi_dialog.c:301
-+msgid "_Menace"
-+msgstr "_Опа�но�т"
-+
-+#. ********* label of board *********
-+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-+msgid "Menace"
-+msgstr "Опа�но�т"
-+
-+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-+msgid "P Action"
-+msgstr "П радња"
-+
-+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-+msgid "P Detection"
-+msgstr "П откривање"
-+
-+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-+msgid "Vulnerability"
-+msgstr "Рањиво�т"
-+
-+#. Other properties of page:
-+#: ../objects/SISSI/sissi_dialog.c:488
-+msgid "Other properties"
-+msgstr "О�тала �вој�тва"
-+
-+#. ********* selection menu of entity ********
-+#. ********* Label of board *********
-+#: ../objects/SISSI/sissi_dialog.c:726
-+msgid "Label"
-+msgstr "�атпи�"
-+
-+#: ../objects/SISSI/sissi_dialog.c:728
-+msgid "value"
-+msgstr "вредно�т"
-+
-+#. Other properties of page
-+#: ../objects/SISSI/sissi_dialog.c:862
-+msgid "Documents"
-+msgstr "Документи"
-+
-+#: ../objects/SISSI/sissi_dialog.c:878
-+msgid "Document title"
-+msgstr "�а�лов документа"
-+
-+#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
-+#: ../sheets/UML.sheet.in.h:15
-+msgid "Actor"
-+msgstr "Глумац"
-+
-+#: ../objects/UML/association.c:222
-+msgid "From A to B"
-+msgstr "Од � до Б"
-+
-+#: ../objects/UML/association.c:223
-+msgid "From B to A"
-+msgstr "Од Б до �"
-+
-+#: ../objects/UML/association.c:228
-+msgid "Aggregation"
-+msgstr "Прикупљање"
-+
-+#: ../objects/UML/association.c:229
-+msgid "Composition"
-+msgstr "Слагање"
-+
-+#: ../objects/UML/association.c:236
-+msgid "Direction"
-+msgstr "Смер"
-+
-+#: ../objects/UML/association.c:238
-+msgid "Show direction"
-+msgstr "Прикажи �мер"
-+
-+#: ../objects/UML/association.c:238
-+msgid "Show the small arrow denoting the reading direction"
-+msgstr "Приказује малу �трелицу означавајући �мер читања"
-+
-+#: ../objects/UML/association.c:245
-+msgid "Side A"
-+msgstr "Страна �"
-+
-+#: ../objects/UML/association.c:249
-+msgid "Multiplicity"
-+msgstr "Више�труко�т"
-+
-+#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
-+#: ../objects/UML/umloperation.c:71
-+msgid "Visibility"
-+msgstr "Видљиво�т"
-+
-+#: ../objects/UML/association.c:253
-+msgid "Show arrow"
-+msgstr "Прикажи �трелице"
-+
-+#: ../objects/UML/association.c:256
-+msgid "Side B"
-+msgstr "Страна Б"
-+
-+#  Class page:
-+#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
-+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
-+msgid "Class"
-+msgstr "Разред"
-+
-+#. how it used to be before 0.96+SVN
-+#. one name, one type: but breaks forward-compatibiliy so kind of reverted
-+#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
-+#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
-+#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
-+#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
-+msgid "Stereotype"
-+msgstr "Стереотип"
-+
-+#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
-+#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
-+#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
-+msgid "Abstract"
-+msgstr "�п�тракт"
-+
-+#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
-+msgid "Template"
-+msgstr "Шаблон"
-+
-+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
-+msgid "Suppress Attributes"
-+msgstr "Занемари атрибуте"
-+
-+#: ../objects/UML/class.c:157
-+msgid "Suppress Operations"
-+msgstr "Занемари операције"
-+
-+#: ../objects/UML/class.c:159
-+msgid "Visible Attributes"
-+msgstr "Видљиве о�обине"
-+
-+#: ../objects/UML/class.c:161
-+msgid "Visible Operations"
-+msgstr "Видљиве операције"
-+
-+#: ../objects/UML/class.c:163
-+msgid "Visible Comments"
-+msgstr "Видљиве примедбе"
-+
-+#  Operations page:
-+#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
-+msgid "Wrap Operations"
-+msgstr "Операције прелома"
-+
-+#: ../objects/UML/class.c:167
-+msgid "Wrap after char"
-+msgstr "Преломи након знака"
-+
-+#: ../objects/UML/class.c:169
-+msgid "Comment line length"
-+msgstr "Дужина напомене"
-+
-+#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
-+msgid "Polymorphic"
-+msgstr "Полиморфна"
-+
-+#: ../objects/UML/class.c:185
-+msgid "Classname"
-+msgstr "�азив кла�е"
-+
-+#: ../objects/UML/class.c:187
-+msgid "Abstract Classname"
-+msgstr "�п�трактни назив разреда"
-+
-+#  Operations page:
-+#: ../objects/UML/class.c:211
-+msgid "Operations"
-+msgstr "Операције"
-+
-+#: ../objects/UML/class.c:214
-+msgid "Template Parameters"
-+msgstr "Параметри шаблона"
-+
-+#: ../objects/UML/class.c:320
-+msgid "Show Comments"
-+msgstr "Прикажи напомене"
-+
-+#  Class page:
-+#. Class page:
-+#: ../objects/UML/class_dialog.c:429
-+msgid "_Class"
-+msgstr "_Разред"
-+
-+#: ../objects/UML/class_dialog.c:437
-+msgid "Class name:"
-+msgstr "�азив разреда:"
-+
-+#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
-+#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
-+#: ../objects/UML/realizes.c:136
-+msgid "Stereotype:"
-+msgstr "Стереотип:"
-+
-+#: ../objects/UML/class_dialog.c:474
-+msgid "Attributes visible"
-+msgstr "О�обине �у видљиве"
-+
-+#: ../objects/UML/class_dialog.c:483
-+msgid "Operations visible"
-+msgstr "Операције �у видљиве"
-+
-+#: ../objects/UML/class_dialog.c:486
-+msgid "Suppress operations"
-+msgstr "Поти�ни операције"
-+
-+#: ../objects/UML/class_dialog.c:500
-+msgid "Wrap after this length: "
-+msgstr "Преломи након ове дужине: "
- 
--#: ../objects/UML/class_dialog.c:415
-+#: ../objects/UML/class_dialog.c:508
-+msgid "Comments visible"
-+msgstr "�апомене �у видљиве"
-+
-+#: ../objects/UML/class_dialog.c:515
-+msgid "Wrap comment after this length: "
-+msgstr "Преломи напомене након ове дужине: "
-+
-+#: ../objects/UML/class_dialog.c:585
- msgid "Class Name"
--msgstr "Име кла�е"
-+msgstr "�азив разреда"
- 
--#: ../objects/UML/class_dialog.c:420
-+#: ../objects/UML/class_dialog.c:590
- msgid "Abstract Class"
--msgstr "�п�трактна кла�а"
-+msgstr "�п�трактни разред"
- 
- #. should probably be refactored too.
--#: ../objects/UML/class_dialog.c:437
-+#: ../objects/UML/class_dialog.c:607
-+msgid "Line Width"
-+msgstr "Ширина линије"
-+
-+#: ../objects/UML/class_dialog.c:616
- msgid "Text Color"
- msgstr "Боја тек�та"
- 
--#: ../objects/UML/class_dialog.c:445
-+#: ../objects/UML/class_dialog.c:624
- msgid "Foreground Color"
- msgstr "Боја и�цртавања"
- 
--#: ../objects/UML/class_dialog.c:453
-+#: ../objects/UML/class_dialog.c:632
- msgid "Background Color"
- msgstr "Боја позадине"
- 
--#  Attributes page:
--#. Attributes page:
--#: ../objects/UML/class_dialog.c:897
--msgid "_Attributes"
--msgstr "О�об_ине"
--
--#: ../objects/UML/class_dialog.c:925 ../objects/UML/class_dialog.c:1875
--#: ../objects/UML/class_dialog.c:2112 ../objects/UML/class_dialog.c:2642
--msgid "_New"
--msgstr "_�ово"
-+#: ../objects/UML/class_dialog.c:1170
-+msgid "Value:"
-+msgstr "Вредно�т:"
- 
--#: ../objects/UML/class_dialog.c:931 ../objects/UML/class_dialog.c:1881
--#: ../objects/UML/class_dialog.c:2119 ../objects/UML/class_dialog.c:2648
--msgid "_Delete"
--msgstr "О_бриши"
-+#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
-+msgid "Visibility:"
-+msgstr "Видљиво�т:"
- 
--#: ../objects/UML/class_dialog.c:937 ../objects/UML/class_dialog.c:1887
--#: ../objects/UML/class_dialog.c:2126 ../objects/UML/class_dialog.c:2654
--msgid "Move up"
--msgstr "Помери навише"
-+#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
-+#: ../objects/UML/uml.c:102
-+msgid "Public"
-+msgstr "Јавно"
- 
--#: ../objects/UML/class_dialog.c:943 ../objects/UML/class_dialog.c:1893
--#: ../objects/UML/class_dialog.c:2133 ../objects/UML/class_dialog.c:2660
--msgid "Move down"
--msgstr "Помери наниже"
-+#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
-+#: ../objects/UML/uml.c:103
-+msgid "Private"
-+msgstr "Приватно"
- 
--#: ../objects/UML/class_dialog.c:954
--msgid "Attribute data"
--msgstr "Подаци о�обина"
-+#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
-+#: ../objects/UML/uml.c:104
-+msgid "Protected"
-+msgstr "Заштићен"
- 
--#: ../objects/UML/class_dialog.c:986
--msgid "Value:"
--msgstr "Вредно�т:"
-+#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
-+#: ../objects/UML/uml.c:105
-+msgid "Implementation"
-+msgstr "Изведба"
- 
--#: ../objects/UML/class_dialog.c:1073 ../objects/UML/class_dialog.c:2001
-+#. end: Inheritance type
-+#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
- msgid "Class scope"
--msgstr "Домет кла�е"
--
--#  Operations page:
--#. Operations page:
--#: ../objects/UML/class_dialog.c:1847
--msgid "_Operations"
--msgstr "_Операције"
--
--#: ../objects/UML/class_dialog.c:1905
--msgid "Operation data"
--msgstr "Подаци операција"
-+msgstr "Домет разреда"
- 
--#: ../objects/UML/class_dialog.c:2007
-+#. end: Visibility
-+#: ../objects/UML/class_dialog.c:2078
- msgid "Inheritance type:"
--msgstr "�а�ледни тип"
-+msgstr "Вр�та на�леђивања:"
- 
--#: ../objects/UML/class_dialog.c:2024 ../objects/UML/uml.c:111
-+#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
- msgid "Polymorphic (virtual)"
- msgstr "Полиморфна (виртуелна)"
- 
--#: ../objects/UML/class_dialog.c:2032 ../objects/UML/uml.c:112
-+#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
- msgid "Leaf (final)"
- msgstr "Ли�т (крајњи)"
- 
--#: ../objects/UML/class_dialog.c:2050
-+#: ../objects/UML/class_dialog.c:2107
- msgid "Query"
- msgstr "Упит"
- 
--#: ../objects/UML/class_dialog.c:2083
-+#: ../objects/UML/class_dialog.c:2154
- msgid "Parameters:"
- msgstr "Параметри:"
- 
--#: ../objects/UML/class_dialog.c:2145
-+#: ../objects/UML/class_dialog.c:2239
- msgid "Parameter data"
--msgstr "Подаци параметара"
-+msgstr "Подаци параметра"
- 
--#: ../objects/UML/class_dialog.c:2177
-+#: ../objects/UML/class_dialog.c:2272
- msgid "Def. value:"
--msgstr "Подр. вредно�т:"
-+msgstr "О�н. вредно�т:"
-+
-+#: ../objects/UML/class_dialog.c:2306
-+msgid "Direction:"
-+msgstr "Смер:"
- 
--#: ../objects/UML/class_dialog.c:2217 ../objects/UML/umlparameter.c:34
-+#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
- msgid "Undefined"
--msgstr "�едефини�ано"
-+msgstr "�еодређено"
- 
--#: ../objects/UML/class_dialog.c:2225 ../objects/UML/umlparameter.c:35
-+#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
- msgid "In"
- msgstr "Унутра"
- 
--#: ../objects/UML/class_dialog.c:2234 ../objects/UML/umlparameter.c:36
-+#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
- msgid "Out"
- msgstr "�апоље"
- 
--#: ../objects/UML/class_dialog.c:2243 ../objects/UML/umlparameter.c:37
-+#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
- msgid "In & Out"
- msgstr "Унутра и напоље"
- 
-+#  Operations page:
-+#. Operations page:
-+#: ../objects/UML/class_dialog.c:2359
-+msgid "_Operations"
-+msgstr "_Операције"
-+
-+#: ../objects/UML/class_dialog.c:2417
-+msgid "Operation data"
-+msgstr "Подаци операције"
-+
- #. Templates page:
--#: ../objects/UML/class_dialog.c:2608
-+#: ../objects/UML/class_dialog.c:2780
- msgid "_Templates"
- msgstr "_Шаблони"
- 
--#: ../objects/UML/class_dialog.c:2614 ../sheets/UML.sheet.in.h:29
-+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
- msgid "Template class"
--msgstr "Шаблон�ка кла�а"
-+msgstr "Разред шаблона"
- 
--#: ../objects/UML/class_dialog.c:2671
-+#: ../objects/UML/class_dialog.c:2843
- msgid "Formal parameter data"
--msgstr "Формални подаци параметара"
-+msgstr "Формални подаци параметра"
- 
--#: ../objects/UML/classicon.c:128
-+#: ../objects/UML/classicon.c:130
- msgid "Boundary"
- msgstr "Ограничење"
- 
--#: ../objects/UML/classicon.c:140
-+#: ../objects/UML/classicon.c:145
- msgid "Is object"
- msgstr "Објекат је"
- 
--#: ../objects/UML/component_feature.c:145 ../sheets/UML.sheet.in.h:14
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
- msgid "Facet"
- msgstr "Пљо�ан"
- 
--#: ../objects/UML/component_feature.c:146 ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr "Прикључак"
- 
--#: ../objects/UML/component_feature.c:147 ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr "Извор догађаја"
- 
--#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr "Одредиште догађаја"
- 
--#: ../objects/UML/constraint.c:125
-+#: ../objects/UML/constraint.c:127
- msgid "Constraint:"
- msgstr "Ограничење:"
- 
--#: ../objects/UML/dependency.c:139
-+#: ../objects/UML/dependency.c:141
- msgid "Show arrow:"
- msgstr "Покажи �трелице:"
- 
--#: ../objects/UML/implements.c:129
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-+#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
- msgid "Interface:"
--msgstr "Интерфеј�"
-+msgstr "Сучеље:"
- 
--#: ../objects/UML/lifeline.c:144
-+#: ../objects/UML/lifeline.c:152
- msgid "Draw focus of control:"
- msgstr "И�цртај фоку� елемента:"
- 
--#: ../objects/UML/lifeline.c:146
-+#: ../objects/UML/lifeline.c:154
- msgid "Draw destruction mark:"
--msgstr "И�цртај ознаку за уништење:"
-+msgstr "И�цртај ознаку уништења:"
- 
--#: ../objects/UML/lifeline.c:417
-+#: ../objects/UML/lifeline.c:505
- msgid "Add connection points"
--msgstr "Додај везивне тачке"
-+msgstr "Додај тачке везе"
- 
--#: ../objects/UML/lifeline.c:418
-+#: ../objects/UML/lifeline.c:506
- msgid "Remove connection points"
--msgstr "Уклони везивне тачке"
-+msgstr "Обриши тачке везе"
-+
-+#: ../objects/UML/lifeline.c:507
-+msgid "Increase connection points distance"
-+msgstr "Повећај ра�тојање тачака везе"
-+
-+#: ../objects/UML/lifeline.c:508
-+msgid "Decrease connection points distance"
-+msgstr "Умањи ра�тојање тачака везе"
- 
--#: ../objects/UML/lifeline.c:422
-+#: ../objects/UML/lifeline.c:509
-+msgid "Set default connection points distance"
-+msgstr "Поде�и о�новно ра�тојање тачака везе"
-+
-+#: ../objects/UML/lifeline.c:513
- msgid "UML Lifeline"
--msgstr "UML линија живота"
-+msgstr "УМЛ линија живота"
- 
--#: ../objects/UML/message.c:135
-+#: ../objects/UML/message.c:137
- msgid "Call"
- msgstr "Позив"
- 
--#: ../objects/UML/message.c:136
-+#: ../objects/UML/message.c:138
- msgid "Create"
--msgstr "Креирај"
-+msgstr "�аправи"
- 
--#: ../objects/UML/message.c:137
-+#: ../objects/UML/message.c:139
- msgid "Destroy"
- msgstr "Уништи"
- 
--#: ../objects/UML/message.c:138
-+#: ../objects/UML/message.c:140
- msgid "Simple"
- msgstr "Једно�тавно"
- 
--#: ../objects/UML/message.c:139
-+#: ../objects/UML/message.c:141
- msgid "Return"
- msgstr "Поврати"
- 
--#: ../objects/UML/message.c:140
-+#: ../objects/UML/message.c:142
- msgid "Send"
- msgstr "Пошаљи"
- 
--#: ../objects/UML/message.c:141
-+#: ../objects/UML/message.c:143
- msgid "Recursive"
- msgstr "Рекурзивно"
- 
--#: ../objects/UML/message.c:153
-+#: ../objects/UML/message.c:158
- msgid "Message type:"
--msgstr "Вр�та порука:"
-+msgstr "Вр�та поруке:"
- 
--#: ../objects/UML/object.c:152
-+#: ../objects/UML/object.c:155
- msgid "Explicit state"
- msgstr "Изричито �тање"
- 
--#: ../objects/UML/object.c:157
-+#: ../objects/UML/object.c:160
- msgid "Active object"
- msgstr "�ктивни објекат"
- 
--#: ../objects/UML/object.c:159
-+#: ../objects/UML/object.c:162
- msgid "Show attributes"
- msgstr "Прикажи о�обине"
- 
--#: ../objects/UML/object.c:161
-+#: ../objects/UML/object.c:164
- msgid "Multiple instance"
- msgstr "Више�труке ин�танце"
- 
--#: ../objects/UML/state.c:153
-+#: ../objects/UML/state.c:155
- msgid "Entry action"
--msgstr "�кција �тавке"
-+msgstr "Радња �тавке"
- 
- #  Translators: Menu item Noun/Energy/Mechanical/Rotation
--#: ../objects/UML/state.c:154
-+#: ../objects/UML/state.c:156
- msgid "Do action"
--msgstr "Изврши рад"
-+msgstr "Изврши радњу"
- 
--#: ../objects/UML/state.c:155
--#, fuzzy
-+#: ../objects/UML/state.c:157
- msgid "Exit action"
--msgstr "Извучи"
-+msgstr "�апу�ти радњу"
- 
- #. Would like to create a state_term instead, but making the connections
- #. * is a pain
--#: ../objects/UML/state.c:470
-+#: ../objects/UML/state.c:479
- msgid ""
- "This diagram uses the State object for initial/final states.\n"
- "That option will go away in future versions.\n"
-@@ -4654,103 +5647,93 @@ msgid ""
- msgstr ""
- "Овај дијаграм кори�ти објекат �тања за почетна/завршна �тања.\n"
- "Ова опција ће бити уклоњена у будућим издањима.\n"
--"Молим кори�тите уме�то њега објекте за почетна/завршна �тања\n"
-+"Молим уме�то њега кори�тите објекте за почетна/завршна �тања\n"
- 
--#: ../objects/UML/state_term.c:120
-+#: ../objects/UML/state_term.c:127
- msgid "Is final"
- msgstr "Је�те завршно"
- 
--#: ../objects/UML/transition.c:132
-+#: ../objects/UML/transition.c:141
- msgid "Trigger"
- msgstr "Окидач"
- 
--#: ../objects/UML/transition.c:133
-+#: ../objects/UML/transition.c:142
- msgid "The event that causes this transition to be taken"
- msgstr "Догађај који узрокује да �е догоди овај прелаз"
- 
--#: ../objects/UML/transition.c:134
-+#: ../objects/UML/transition.c:143
- msgid "Action"
- msgstr "Радња"
- 
--#: ../objects/UML/transition.c:135
-+#: ../objects/UML/transition.c:144
- msgid "Action to perform when this transition is taken"
- msgstr "Радња коју треба обавити када �е догоди овај прелаз"
- 
--#: ../objects/UML/transition.c:136 ../sheets/cisconetwork.sheet.in.h:43
-+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
- msgstr "Чувар"
- 
--#: ../objects/UML/transition.c:137
-+#: ../objects/UML/transition.c:146
- msgid "Condition for taking this transition when the event is fired"
- msgstr "У�лов за овај прелаз када �е де�и догађај"
- 
- #: ../objects/UML/uml.c:66
--#, fuzzy
- msgid "Unified Modelling Language diagram objects UML 1.3"
--msgstr "Unified Modelling Language (UML) дијаграм�ки објекти"
-+msgstr "Дијаграм�ки објекти Обједињеног језика модели�ања УМЛ 1.3"
- 
- #: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
- msgid "Value"
- msgstr "Вредно�т"
- 
--#: ../objects/UML/umlattribute.c:45 ../objects/UML/umloperation.c:71
--msgid "Visibility"
--msgstr "Видљиво�т"
--
- #: ../objects/UML/umlattribute.c:47
--#, fuzzy
- msgid "Abstract (?)"
--msgstr "�п�тракт"
-+msgstr "�п�трактно (?)"
- 
- #: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
- msgid "Class scope (static)"
--msgstr "Домет кла�е (�татички)"
-+msgstr "Домет разреда (�татички)"
- 
- #: ../objects/UML/umloperation.c:73
- msgid "Inheritance type"
--msgstr "�а�ледни тип"
-+msgstr "Вр�та на�леђа"
- 
- #: ../objects/UML/umloperation.c:75
- msgid "Query (const)"
- msgstr "Упит (кон�танта)"
- 
--#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:162
-+#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
- msgid "Parameters"
- msgstr "Параметри"
- 
--#: ../objects/UML/usecase.c:132
-+#: ../objects/UML/usecase.c:136
- msgid "Text outside"
- msgstr "Тек�т напољу"
- 
--#: ../objects/UML/usecase.c:134
-+#: ../objects/UML/usecase.c:138
- msgid "Collaboration"
- msgstr "Сарадња"
- 
--#: ../objects/bondgraph/bondgraph.c:39
--msgid "Bond graph objects"
--msgstr "Везани објекти графика"
--
- #: ../objects/chronogram/chronogram.c:40
- msgid "Chronogram diagram objects"
- msgstr "Хронограм�ки дијаграм�ки објекти"
- 
--#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Подаци"
- 
--#: ../objects/chronogram/chronoline.c:150
-+#: ../objects/chronogram/chronoline.c:152
- msgid "Data name"
--msgstr "Име података"
-+msgstr "�азив података"
- 
--#: ../objects/chronogram/chronoline.c:152
-+#: ../objects/chronogram/chronoline.c:154
- msgid "Events"
- msgstr "Догађаји"
- 
--#: ../objects/chronogram/chronoline.c:155
-+#: ../objects/chronogram/chronoline.c:157
- msgid "Event specification"
- msgstr "Одреднице догађаја"
- 
--#: ../objects/chronogram/chronoline.c:156
-+#: ../objects/chronogram/chronoline.c:158
- msgid ""
- "@ time    set the pointer at an absolute time.\n"
- "( duration  sets the signal up, then wait 'duration'.\n"
-@@ -4758,400 +5741,474 @@ msgid ""
- "u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
- "example : @ 1.0 (2.0)1.0(2.0)\n"
- msgstr ""
--"@ време     по�тави показивача на ап�олутно време.\n"
--"( трајање   по�тави �игнал горе, а затим чекај „трајање“.\n"
--") трајање   по�тави �игнал доле, а затим чекај „трајање“.\n"
--"u трајање   по�тави �игнал на „unknown“ �тање, а затим чекај „трајање“.\n"
-+"@ време     по�тавља показивача на ап�олутно време.\n"
-+"( трајање   по�тавља �игнал горе, а затим чека „трајање“.\n"
-+") трајање   по�тавља �игнал доле, а затим чека „трајање“.\n"
-+"u трајање   по�тавља �игнал на „непознато“ �тање, а затим чека „трајање“.\n"
- "пример : @ 1.0 (2.0)1.0(2.0)\n"
- 
--#: ../objects/chronogram/chronoline.c:164
--#: ../objects/chronogram/chronoref.c:146
--msgid "Start time"
--msgstr "Почетно време:"
--
- #: ../objects/chronogram/chronoline.c:166
- #: ../objects/chronogram/chronoref.c:148
--msgid "End time"
--msgstr "Крајње време:"
-+msgid "Start time"
-+msgstr "Почетно време"
- 
- #: ../objects/chronogram/chronoline.c:168
--msgid "Rise time"
--msgstr "Увеличај време"
-+#: ../objects/chronogram/chronoref.c:150
-+msgid "End time"
-+msgstr "Крајње време"
- 
- #: ../objects/chronogram/chronoline.c:170
-+msgid "Rise time"
-+msgstr "Време издизања"
-+
-+#: ../objects/chronogram/chronoline.c:172
- msgid "Fall time"
--msgstr "Умањи време"
-+msgstr "Време опадања"
- 
--#: ../objects/chronogram/chronoline.c:171
-+#: ../objects/chronogram/chronoline.c:173
- msgid "Multi-bit data"
- msgstr "Више-битни подаци"
- 
--#: ../objects/chronogram/chronoline.c:173
--#: ../objects/chronogram/chronoref.c:156
-+#: ../objects/chronogram/chronoline.c:175
-+#: ../objects/chronogram/chronoref.c:158
- msgid "Aspect"
--msgstr "Поглед"
-+msgstr "Изглед"
- 
--#: ../objects/chronogram/chronoline.c:175
-+#: ../objects/chronogram/chronoline.c:177
- msgid "Data color"
- msgstr "Подаци о бојама"
- 
--#: ../objects/chronogram/chronoline.c:177
-+#: ../objects/chronogram/chronoline.c:179
- msgid "Data line width"
- msgstr "Ширина линије �а подацима"
- 
--#: ../objects/chronogram/chronoref.c:144
-+#: ../objects/chronogram/chronoref.c:146
- msgid "Time data"
- msgstr "Подаци о времену"
- 
--#: ../objects/chronogram/chronoref.c:150
-+#: ../objects/chronogram/chronoref.c:152
- msgid "Major time step"
- msgstr "Главни времен�ки корак"
- 
--#: ../objects/chronogram/chronoref.c:152
-+#: ../objects/chronogram/chronoref.c:154
- msgid "Minor time step"
- msgstr "Мањин�ки времен�ки корак"
- 
--#: ../objects/chronogram/chronoref.c:162
-+#: ../objects/chronogram/chronoref.c:164
- msgid "Minor step line width"
- msgstr "Ширина линије мањин�ког корака"
- 
--#: ../objects/custom/custom.c:117
-+#: ../objects/custom/custom.c:140
- msgid "Custom"
- msgstr "Произвољно"
- 
--#: ../objects/custom/custom.c:117
-+#: ../objects/custom/custom.c:140
- msgid "Custom XML shapes loader"
--msgstr "Произвољан учитавач XML облика"
-+msgstr "Учитавач произвољних Ик�МЛ облика"
- 
--#: ../objects/custom/custom_object.c:178 ../objects/custom/custom_object.c:203
-+#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
-+#: ../objects/custom/custom_object.c:1782
- msgid "Flip horizontal"
--msgstr "Обрни водоравно"
-+msgstr "Изврните водоравно"
- 
--#: ../objects/custom/custom_object.c:180 ../objects/custom/custom_object.c:205
-+#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
-+#: ../objects/custom/custom_object.c:1783
- msgid "Flip vertical"
--msgstr "Обрни у�правно"
--
--#: ../objects/custom/custom_object.c:1439
--msgid "Flip Horizontal"
--msgstr "Обрни Водоравно"
-+msgstr "Изврните у�правно"
- 
--#: ../objects/custom/custom_object.c:1440
--msgid "Flip Vertical"
--msgstr "Обрни У�правно"
-+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
-+msgid "Scale of the subshapes"
-+msgstr "Размера �адржаних облика"
- 
--#: ../objects/custom/custom_object.c:1477
-+#: ../objects/custom/custom_object.c:1820
-+#: ../objects/custom_lines/custom_linetypes.c:263
- #, c-format
- msgid "Cannot open icon file %s for object type '%s'."
--msgstr "�еможе отворити датотеку иконе %s за објекат типа '%s'."
-+msgstr "�е могу да отворим датотеку иконице „%s“� за вр�ту објекта „%s“."
- 
--#: ../objects/custom/shape_info.c:129
--#, c-format
--msgid ""
--"The file '%s' has invalid path data.\n"
--"svg:path data must start with moveto."
--msgstr ""
-+#: ../objects/custom_lines/custom_lines.c:160
-+msgid "CustomLines"
-+msgstr "Произвољне линије"
- 
--#: ../objects/flowchart/box.c:150 ../objects/standard/box.c:150
--#: ../objects/standard/polyline.c:134 ../objects/standard/zigzagline.c:130
--msgid "Corner radius"
--msgstr "Угао радију�а"
-+#: ../objects/custom_lines/custom_lines.c:160
-+msgid "Custom XML lines loader"
-+msgstr "Учитавач произвољних Ик�МЛ линија"
-+
-+#: ../objects/custom_lines/custom_linetypes.c:226
-+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
-+msgstr ""
-+"У�УТР�ШЊЕ: Произвољне линије: �еи�правна вр�та линије у објекту података "
-+"линије."
-+
-+#: ../objects/custom_lines/custom_linetypes.c:251
-+#, c-format
-+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-+msgstr ""
-+"У�УТР�ШЊЕ: Произвољне линије: �еи�правна вр�та линије у објекту података "
-+"линије %s."
-+
-+#: ../objects/custom/shape_info.c:162
-+#, c-format
-+msgid ""
-+"The file '%s' has invalid path data.\n"
-+"svg:path data must start with moveto."
-+msgstr ""
-+"Датотека „%s“ има неи�правне податке о путањи.\n"
-+"подаци �вг:путање морају почети �а преме�ти у."
- 
- #: ../objects/flowchart/flowchart.c:37
- msgid "Flowchart objects"
- msgstr "Објекти дијаграма тока"
- 
--#: ../objects/flowchart/parallelogram.c:152
-+#: ../objects/flowchart/parallelogram.c:154
- msgid "Shear angle"
- msgstr "Оштар угао"
- 
--#: ../objects/network/basestation.c:135
--#, fuzzy
-+#: ../objects/network/basestation.c:137
- msgid "Sectors"
--msgstr "Глумац"
-+msgstr "Сектори"
- 
--#: ../objects/network/basestation.c:396 ../objects/network/basestation.c:398
-+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
- msgid "Base Station"
- msgstr "Базна �таница"
- 
--#: ../objects/network/bus.c:611
--msgid "Add Handle"
--msgstr "Додај ручку"
--
--#: ../objects/network/bus.c:612
--msgid "Delete Handle"
--msgstr "Обриши ручку"
--
- #: ../objects/network/network.c:43
- msgid "Network diagram objects"
--msgstr "Мрежни дијаграм објеката"
-+msgstr "Објекти дијаграма мреже"
- 
--#: ../objects/network/radiocell.c:119
-+#: ../objects/network/radiocell.c:121
- msgid "Radius"
--msgstr ""
-+msgstr "Полупречник"
- 
--#: ../objects/network/wanlink.c:117
--#, fuzzy
-+#: ../objects/network/wanlink.c:119
- msgid "Width"
--msgstr "Ширина:"
-+msgstr "Ширина"
- 
--#: ../objects/standard/arc.c:140
-+#: ../objects/standard/arc.c:141
- msgid "Curve distance"
- msgstr "Ра�тојање криве"
- 
--#: ../objects/standard/bezier.c:137 ../objects/standard/line.c:141
--#: ../objects/standard/polyline.c:135
--#, fuzzy
--msgid "Line gaps"
--msgstr "Линија"
--
- #: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
- #: ../objects/standard/polyline.c:137
--msgid "Absolute start gap"
--msgstr ""
-+msgid "Line gaps"
-+msgstr "Празнине линије"
- 
- #: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
- #: ../objects/standard/polyline.c:139
--msgid "Absolute end gap"
--msgstr ""
--
--#: ../objects/standard/bezier.c:698 ../objects/standard/beziergon.c:482
--msgid "Add Segment"
--msgstr "Додај Сегмент"
-+msgid "Absolute start gap"
-+msgstr "�п�олутна празнина почетка"
- 
--#: ../objects/standard/bezier.c:699 ../objects/standard/beziergon.c:483
--msgid "Delete Segment"
--msgstr "Обриши Сегмент"
-+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
-+#: ../objects/standard/polyline.c:141
-+msgid "Absolute end gap"
-+msgstr "�п�олутна празнина краја"
- 
--#: ../objects/standard/bezier.c:701 ../objects/standard/beziergon.c:485
-+#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
- msgid "Symmetric control"
- msgstr "Контрола једнако�ти"
- 
--#: ../objects/standard/bezier.c:703 ../objects/standard/beziergon.c:487
-+#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
- msgid "Smooth control"
- msgstr "Контрола глатко�ти"
- 
- # Ово ни�ам �игуран имамо ли ми бољи назив
--#: ../objects/standard/bezier.c:705 ../objects/standard/beziergon.c:489
-+#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
- msgid "Cusp control"
--msgstr "Контрола локалних ек�тремума"
-+msgstr "Контрола шиљка"
- 
--#: ../objects/standard/box.c:137 ../objects/standard/ellipse.c:131
-+#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
- msgid "Free"
- msgstr "Слободно"
- 
--#: ../objects/standard/box.c:138 ../objects/standard/ellipse.c:132
-+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
- msgid "Fixed"
- msgstr "Везано"
- 
- #  Translators: Menu item Verb/Support/Secure
--#: ../objects/standard/box.c:139 ../objects/standard/box.c:694
-+#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
- msgid "Square"
- msgstr "Квадрат"
- 
--#: ../objects/standard/box.c:152 ../objects/standard/ellipse.c:144
-+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
- msgid "Aspect ratio"
--msgstr "Одно� ширине и ви�ине"
-+msgstr "Одно� размере"
- 
--#: ../objects/standard/box.c:690 ../objects/standard/ellipse.c:668
-+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
- msgid "Free aspect"
- msgstr "Слободан одно�"
- 
--#: ../objects/standard/box.c:692 ../objects/standard/ellipse.c:670
-+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
- msgid "Fixed aspect"
- msgstr "Утврђен одно�"
- 
--#: ../objects/standard/ellipse.c:133 ../objects/standard/ellipse.c:672
-+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
- msgid "Circle"
- msgstr "Круг"
- 
--#: ../objects/standard/image.c:132
-+#: ../objects/standard/image.c:139
- msgid "Image file"
- msgstr "Датотека �лике"
- 
--#: ../objects/standard/image.c:134
-+#: ../objects/standard/image.c:141
- msgid "Draw border"
- msgstr "И�цртај границу"
- 
--#: ../objects/standard/image.c:136
-+#: ../objects/standard/image.c:143
- msgid "Keep aspect ratio"
--msgstr "Задржи одно� ширине и ви�ине"
-+msgstr "Задржи одно� размере"
- 
- #. Found file in same dir as diagram.
- #. Found file in current dir.
--#: ../objects/standard/image.c:679 ../objects/standard/image.c:690
-+#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
- #, c-format
- msgid ""
- "The image file '%s' was not found in that directory.\n"
- "Using the file '%s' instead\n"
- msgstr ""
- "Датотека �лике „%s“ није нађена у том директоријуму.\n"
--"Уме�то тога кори�тим датотеку „%s“.\n"
-+"Уме�то тога кори�тим датотеку „%s“\n"
- 
- #  Didn't find file in current dir.
- #. Didn't find file in current dir.
--#: ../objects/standard/image.c:696 ../objects/standard/image.c:718
-+#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
- #, c-format
- msgid "The image file '%s' was not found.\n"
- msgstr "Датотека �лике „%s“ није пронађена.\n"
- 
--#: ../objects/standard/line.c:132
-+#: ../objects/standard/line.c:134
- msgid "Arrows"
- msgstr "Стрелице"
- 
--#: ../objects/standard/line.c:137
-+#: ../objects/standard/line.c:139
- msgid "Start point"
- msgstr "Почетна тачка"
- 
--#: ../objects/standard/line.c:139
-+#: ../objects/standard/line.c:141
- msgid "End point"
- msgstr "Крајња тачка"
- 
--#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:577
-+#: ../objects/standard/outline.c:204
-+msgid "Text content"
-+msgstr "Садржај тек�та"
-+
-+#: ../objects/standard/outline.c:206
-+msgid "Angle to rotate the outline"
-+msgstr "Угао за заокретање контуре"
-+
-+#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
- msgid "Add Corner"
--msgstr "Додај Угао"
-+msgstr "Додај угао"
- 
--#: ../objects/standard/polygon.c:461 ../objects/standard/polyline.c:578
-+#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
- msgid "Delete Corner"
--msgstr "Обриши Угао"
-+msgstr "Обриши угао"
- 
--#: ../objects/standard/standard.c:45
-+#: ../objects/standard/standard.c:46
- msgid "Standard objects"
--msgstr "Стандардни објекат"
-+msgstr "Стандардни објекти"
- 
--#: ../objects/standard/textobj.c:134
-+#: ../objects/standard/textobj.c:139
- msgid "First Line"
--msgstr "Прва Линија"
-+msgstr "Прва линија"
- 
--#: ../objects/standard/textobj.c:141
-+#: ../objects/standard/textobj.c:146
- msgid "Vertical text alignment"
- msgstr "У�правно поравнање тек�та"
- 
--#: ../plug-ins/cairo/diacairo.c:1086
-+#: ../plug-ins/cairo/diacairo-interactive.c:263
-+#: ../plug-ins/cairo/diacairo-interactive.c:264
-+msgid "Zoom pointer"
-+msgstr "Показивач увећања"
-+
-+#: ../plug-ins/cairo/diacairo-interactive.c:270
-+#: ../plug-ins/cairo/diacairo-interactive.c:271
-+msgid "Visible rect pointer"
-+msgstr "Видљив правоугаони показивач"
-+
-+#: ../plug-ins/cairo/diacairo.c:129
-+#, c-format
-+msgid ""
-+"Can't convert output filename '%s' to locale encoding.\n"
-+"Please choose a different name to save with cairo.\n"
-+msgstr ""
-+"�е могу да претворим назив излазне датотеке „%s“ у локално кодирање.\n"
-+"Молим изаберите другачији назив за чување �а каиром.\n"
-+
-+#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
-+#, c-format
-+msgid "Can't write %d bytes to %s"
-+msgstr "�е могу да запишем %d бајта у %s"
-+
-+#: ../plug-ins/cairo/diacairo.c:285
-+msgid "Clipboard copy failed"
-+msgstr "Умножавање у о�таву није у�пело"
-+
-+#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
-+#: ../plug-ins/wmf/wmf.cpp:1381
-+msgid "Nothing to print"
-+msgstr "�ишта за штампање"
-+
-+#: ../plug-ins/cairo/diacairo.c:322
-+msgid "Printing with Gtk+(cairo) requires at least version 2.10."
-+msgstr "Штампање �а Гтк+(каиро)-ом захтева најмање издање 2.10."
-+
-+#: ../plug-ins/cairo/diacairo.c:329
- msgid "Cairo PostScript"
--msgstr "Каиро PostScript"
-+msgstr "Каиро По�т �крипт"
- 
--#: ../plug-ins/cairo/diacairo.c:1097
-+#: ../plug-ins/cairo/diacairo.c:340
- msgid "Cairo Portable Document Format"
- msgstr "Каиро ПДФ"
- 
--#: ../plug-ins/cairo/diacairo.c:1108
--#, fuzzy
-+#: ../plug-ins/cairo/diacairo.c:355
- msgid "Cairo Scalable Vector Graphics"
--msgstr "Скалабилна вектор�ка графика (SVG)"
-+msgstr "Каиро �размерна вектор�ка графика"
- 
--#: ../plug-ins/cairo/diacairo.c:1118
-+#: ../plug-ins/cairo/diacairo.c:366
- msgid "Cairo PNG"
- msgstr "Каиро П�Г"
- 
--#: ../plug-ins/cairo/diacairo.c:1126
-+#: ../plug-ins/cairo/diacairo.c:374
- msgid "Cairo PNG (with alpha)"
--msgstr "Каиро П�Г (�а алфа каналом)"
-+msgstr "Каиро П�Г (�а алфом)"
-+
-+#: ../plug-ins/cairo/diacairo.c:384
-+msgid "Cairo EMF"
-+msgstr "Каиро ЕМФ"
- 
--#: ../plug-ins/cairo/diacairo.c:1136
-+#: ../plug-ins/cairo/diacairo.c:394
- msgid "Cairo WMF"
--msgstr "Каиро WMF"
-+msgstr "Каиро ВМФ"
- 
--#: ../plug-ins/cairo/diacairo.c:1145
--msgid "Cairo old WMF"
--msgstr "Каиро �тари WMF"
-+#: ../plug-ins/cairo/diacairo.c:416
-+msgid "Copy _Diagram"
-+msgstr "Умножи _дијаграм"
- 
--#: ../plug-ins/cairo/diacairo.c:1154
--msgid "Cairo Clipboard"
--msgstr ""
-+#: ../plug-ins/cairo/diacairo.c:426
-+msgid "Print (GTK) ..."
-+msgstr "Штампај (ГДК) ..."
- 
--#: ../plug-ins/cairo/diacairo.c:1203
-+#: ../plug-ins/cairo/diacairo.c:471
- msgid "Cairo based Rendering"
--msgstr "И�цртавање уз помоћ Каиро технологије"
-+msgstr "И�цртавање за�новано на Каиру"
- 
--#: ../plug-ins/cgm/cgm.c:1103
-+#: ../plug-ins/cgm/cgm.c:1106
- msgid ""
- "Image row length larger than maximum cell array.\n"
- "Image not exported to CGM."
- msgstr ""
--"Дужина реда �лике је већа од највећег низа ћелија.\n"
--"Слика није извезена у CGM."
-+"Дужина реда �лике је већа од највећег низа ћелије.\n"
-+"Слика није извежена у ЦГМ."
- 
--#: ../plug-ins/cgm/cgm.c:1358
-+#: ../plug-ins/cgm/cgm.c:1362
- msgid "Computer Graphics Metafile"
--msgstr "Computer Graphics Metafile"
-+msgstr "Рачунар�ка графичка метадатотека"
- 
--#: ../plug-ins/cgm/cgm.c:1383
-+#: ../plug-ins/cgm/cgm.c:1387
- msgid "Computer Graphics Metafile export filter"
--msgstr "Филтер за извоз CGM датотека"
-+msgstr "Пропу�ник за извоз ЦГМ датотека"
- 
--#: ../plug-ins/dxf/dxf-export.c:527 ../plug-ins/dxf/dxf-import.c:1389
--msgid "Drawing Interchange File"
--msgstr "Датотека за размену цртежа (DIF)"
-+#: ../plug-ins/drs/dia-render-script.c:153
-+msgid "DiaRenderScript"
-+msgstr "Скрипта и�цртавања Дие"
- 
--#: ../plug-ins/dxf/dxf-import.c:481 ../plug-ins/dxf/dxf-import.c:498
--msgid "Bad vertex bulge\n"
--msgstr "Лоше и�такнуће темена\n"
-+#: ../plug-ins/drs/dia-render-script.c:164
-+msgid "DiaRenderScript filter"
-+msgstr "Пропу�ник �крипте и�цртавања Дие"
- 
--#: ../plug-ins/dxf/dxf-import.c:1051
--#, c-format
--msgid "Scale: %f\n"
--msgstr "Размера: %f\n"
-+#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
-+msgid "Drawing Interchange File"
-+msgstr "Датотека за размену цртежа"
- 
--#: ../plug-ins/dxf/dxf-import.c:1316
-+#: ../plug-ins/dxf/dxf-import.c:1319
- #, c-format
- msgid "read_dxf_codes failed on '%s'\n"
--msgstr "неу�пешно извођење функције read_dxf_codes над „%s“\n"
-+msgstr "није у�пело „read_dxf_codes“ над „%s“\n"
- 
--#: ../plug-ins/dxf/dxf-import.c:1324
-+#: ../plug-ins/dxf/dxf-import.c:1326
- #, c-format
- msgid "Binary DXF from '%s' not supported\n"
--msgstr ""
--
--#: ../plug-ins/dxf/dxf-import.c:1355
--#, c-format
--msgid "Unknown dxf code %d\n"
--msgstr "�епознат dxf код %d\n"
-+msgstr "�ије подржана извршна ДХФ из „%s“\n"
- 
- #: ../plug-ins/dxf/dxf.c:50
- msgid "Drawing Interchange File import and export filters"
--msgstr "Филтери за увоз и извоз DIF датотека"
-+msgstr "Пропу�ници за увоз и извоз ДИФ датотека"
- 
--#: ../plug-ins/gprint/diagnomeprint.c:81
--#, c-format
--msgid ""
--"GNOME Print Backend\n"
--" '%s'\n"
--" not available"
--msgstr ""
-+#: ../plug-ins/hpgl/hpgl.c:751
-+msgid "HP Graphics Language"
-+msgstr "Хевлет-Пакард графички језик"
- 
--#: ../plug-ins/gprint/diagnomeprint.c:112
--msgid "GNOME PostScript"
--msgstr ""
-+#: ../plug-ins/hpgl/hpgl.c:776
-+msgid "HP Graphics Language export filter"
-+msgstr "Пропу�ник извоза ХП графичког језика"
- 
--#: ../plug-ins/gprint/diagnomeprint.c:121
--msgid "GNOME Portable Document Format"
--msgstr ""
-+#: ../plug-ins/libart/dialibart.c:59
-+msgid "Libart based rendering"
-+msgstr "И�цртавање за�новано на Либарту"
- 
--#: ../plug-ins/gprint/diagnomeprint.c:131
--msgid "GNOME Scalable Vector Graphic"
--msgstr "Гномова �калабилна вектор�ка графика (SVG)"
-+#: ../plug-ins/libart/export_png.c:167
-+msgid "Could not create PNG write structure"
-+msgstr "�е могу да направим �труктуру П�Г упи�а"
- 
--#: ../plug-ins/gprint/diagnomeprint.c:164
--msgid "GNOME Print based Rendering"
--msgstr ""
-+#: ../plug-ins/libart/export_png.c:176
-+msgid "Could not create PNG header info structure"
-+msgstr "�е могу да направим �труктуру обавештења П�Г заглавља"
- 
--#: ../plug-ins/hpgl/hpgl.c:749
--msgid "HP Graphics Language"
--msgstr "HP-ов графички језик (HPGL)"
-+#: ../plug-ins/libart/export_png.c:184
-+msgid "Error occurred while writing PNG"
-+msgstr "Дошло је до грешке приликом запи�ивања П�Г-а"
- 
--#: ../plug-ins/hpgl/hpgl.c:774
--msgid "HP Graphics Language export filter"
--msgstr "Извозни филтер за HPGL"
-+#. Create a dialog
-+#: ../plug-ins/libart/export_png.c:327
-+msgid "PNG Export Options"
-+msgstr "Опције извожења П�Г-а"
-+
-+#: ../plug-ins/libart/export_png.c:333
-+msgid "Image width:"
-+msgstr "Ширина �лике:"
-+
-+#: ../plug-ins/libart/export_png.c:336
-+msgid "Image height:"
-+msgstr "Ви�ина �лике:"
-+
-+#: ../plug-ins/libart/export_png.c:382
-+msgid "PNG (anti-aliased)"
-+msgstr "П�Г (умекшано)"
-+
-+#: ../plug-ins/libart/dialibartrenderer.c:295
-+msgid "gdk_renderer: Unsupported fill mode specified!\n"
-+msgstr "гдк_и�цртавач: �аведен је неподржани режим и�пуњавања!\n"
-+
-+#: ../plug-ins/libart/dialibartrenderer.c:1476
-+msgid "Renderer transformation"
-+msgstr "Преображај и�цртавача"
-+
-+#: ../plug-ins/libart/dialibartrenderer.c:1477
-+msgid "Transform pointer"
-+msgstr "Преобрази показивач"
- 
- #: ../plug-ins/metapost/metapost.c:46
- msgid "TeX Metapost export filter"
--msgstr "Извозни филтер за Метапо�т"
-+msgstr "Пропу�ник извоза ТеК� метапо�та"
- 
--#: ../plug-ins/metapost/render_metapost.c:1214
-+#: ../plug-ins/metapost/render_metapost.c:1262
- msgid "TeX Metapost macros"
--msgstr "Метапо�т макрои"
-+msgstr "ТеК� метапо�т макрои"
-+
-+#: ../plug-ins/pgf/pgf.c:26
-+msgid "LaTeX PGF export filter"
-+msgstr "Пропу�ник извоза ЛаТеК� ПГФ-а"
-+
-+#: ../plug-ins/pgf/render_pgf.c:1112
-+#: ../plug-ins/pstricks/render_pstricks.c:733
-+msgid "Not valid UTF8"
-+msgstr "�ије и�праван УТФ8"
-+
-+#: ../plug-ins/pgf/render_pgf.c:1277
-+msgid "LaTeX PGF macros"
-+msgstr "ЛаТеК� ПГФ макрои"
- 
--#: ../plug-ins/pixbuf/pixbuf.c:91
-+#: ../plug-ins/pixbuf/pixbuf.c:93
- #, c-format
- msgid ""
- "Could not save file:\n"
-@@ -5162,1096 +6219,1114 @@ msgstr ""
- "%s\n"
- "%s"
- 
--#: ../plug-ins/pixbuf/pixbuf.c:197
-+#: ../plug-ins/pixbuf/pixbuf.c:199
- msgid "gdk-pixbuf based bitmap export/import"
--msgstr "Извоз/увоз битмапа за�нован на gdk-pixbuf-у"
-+msgstr "Извоз/увоз битмапа за�нован на гдк-�личици"
- 
--#: ../plug-ins/pgf/pgf.c:26
--#, fuzzy
--msgid "LaTeX PGF export filter"
--msgstr "TeX Pstricks извозни филтер"
-+#: ../plug-ins/postscript/paginate_psprint.c:273
-+msgid "Select Printer"
-+msgstr "Изабери штампач"
- 
--#: ../plug-ins/pgf/render_pgf.c:1047
--#: ../plug-ins/pstricks/render_pstricks.c:731
--msgid "Not valid UTF8"
--msgstr "�ије и�праван УТФ8"
-+#: ../plug-ins/postscript/paginate_psprint.c:285
-+#: ../sheets/ciscocomputer.sheet.in.h:37
-+msgid "Printer"
-+msgstr "Штампач"
- 
--#: ../plug-ins/pgf/render_pgf.c:1212
--#, fuzzy
--msgid "LaTeX PGF macros"
--msgstr "ТеХ PSTricks макрои"
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
-+msgid "File"
-+msgstr "Датотека"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:314
-+msgid "OK"
-+msgstr "У реду"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:456
-+#, c-format
-+msgid "Could not run command '%s': %s"
-+msgstr "�е могу да покренем наредбу „%s“: %s"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:459
-+#, c-format
-+msgid "Could not open '%s' for writing: %s"
-+msgstr "�е могу да отворим „%s“ за упи�ивање: %s"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:481
-+#, c-format
-+msgid "Printing error: command '%s' returned %d\n"
-+msgstr "Грешка штампања: наредба „%s“ је вратила %d\n"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:492
-+#, c-format
-+msgid "Printing error: command '%s' caused sigpipe."
-+msgstr "Грешка штампања: наредба „%s“ је изазвала проце�ни ланац �игнала."
-+
-+#: ../plug-ins/postscript/render_eps.c:150
-+msgid "Encapsulated Postscript (using Pango fonts)"
-+msgstr "Угнеждени По�т�крипт (кори�ти Панго пи�ма)"
-+
-+#: ../plug-ins/postscript/render_eps.c:159
-+msgid "Encapsulated Postscript with preview (using Pango fonts)"
-+msgstr "Угнеждени По�т�крипт �а прегледом (кори�ти Панго пи�ма)"
-+
-+#: ../plug-ins/postscript/render_eps.c:169
-+msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-+msgstr "Угнеждени По�т�крипт (кори�ти По�т �крипт латин�ка-1 пи�ма)"
-+
-+#: ../plug-ins/postscript/postscript.c:46
-+msgid "Print (PS)"
-+msgstr "Штампај (ПС)"
-+
-+#: ../plug-ins/postscript/postscript.c:70
-+msgid "Postscript Rendering"
-+msgstr "И�цртавање По�т �крипта"
- 
- #: ../plug-ins/pstricks/pstricks.c:26
- msgid "TeX Pstricks export filter"
--msgstr "TeX Pstricks извозни филтер"
-+msgstr "Пропу�ник извоза ТеК� П�трик�а"
- 
--#: ../plug-ins/pstricks/render_pstricks.c:985
-+#: ../plug-ins/pstricks/render_pstricks.c:987
- msgid "TeX PSTricks macros"
--msgstr "ТеХ PSTricks макрои"
-+msgstr "ТеК� ПСТрик� макрои"
- 
- # bug: ":" is not needed
--#: ../plug-ins/python/pydia-render.c:718
-+#: ../plug-ins/python/pydia-render.c:779
- #, c-format
- msgid "Couldn't open '%s' for writing.\n"
- msgstr "�е могу да отворим „%s“ ради упи�а.\n"
- 
- #: ../plug-ins/python/python.c:96
- msgid "Python scripting support"
--msgstr "Подршка за Питон �крипте"
-+msgstr "Подршка за Питонове �крипте"
- 
--#: ../plug-ins/shape/shape-export.c:475
--msgid "Can't export png without libart!"
--msgstr "�е могу да извезем PNG без libart-а!"
-+#: ../plug-ins/shape/shape-export.c:474
-+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
-+msgstr ""
-+"Датотеке облика морају да �е завршавају на „.shape“, или Диа неће моћи да их "
-+"учита"
-+
-+#: ../plug-ins/shape/shape-export.c:488
-+msgid "Can't export png icon without export plug-in!"
-+msgstr "�е могу да извезем пнг иконицу без прикључка за извоз!"
- 
--#: ../plug-ins/shape/shape-export.c:500
-+#: ../plug-ins/shape/shape-export.c:512
- msgid "Dia Shape File"
--msgstr "Датотека Диа облика (DSF)"
-+msgstr "Датотека Диа облика"
- 
- #: ../plug-ins/shape/shape.c:36
- msgid "dia shape export filter"
--msgstr "Извозни филтер за DSF"
--
--#: ../plug-ins/svg/render_svg.c:291 ../plug-ins/svg/svg-import.c:676
--msgid "Scalable Vector Graphics"
--msgstr "Скалабилна вектор�ка графика (SVG)"
-+msgstr "Пропу�ник извоза Диа облика"
- 
--#: ../plug-ins/svg/svg-import.c:195
-+#: ../plug-ins/svg/svg-import.c:258
- msgid ""
- "Invalid path data.\n"
- "svg:path data must start with moveto."
- msgstr ""
-+"�еи�правни подаци о путањи.\n"
-+"подаци �вг:путање морају почети �а преме�ти у."
- 
--#: ../plug-ins/svg/svg-import.c:637
-+#: ../plug-ins/svg/svg-import.c:806
- msgid "Expected SVG Namespace not found in file"
--msgstr ""
-+msgstr "Очекивани размак назива СВГ-а није пронађен у датотеци"
- 
--#: ../plug-ins/svg/svg-import.c:657
-+#: ../plug-ins/svg/svg-import.c:826
- #, c-format
- msgid "root element was '%s' -- expecting 'svg'."
--msgstr "корени елемент је био „%s“ — очекивао �ам „svg“."
-+msgstr "корени елемент беше „%s“ — очекивах „svg“."
- 
- #: ../plug-ins/svg/svg.c:50
- msgid "Scalable Vector Graphics import and export filters"
--msgstr "Филтери за увоз и извоз SVG-а"
-+msgstr "Пропу�ници за увоз и извоз СВГ-а"
- 
- #: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
--#, fuzzy, c-format
-+#, c-format
- msgid "Couldn't read file %s"
--msgstr "�е може да чита боју: %s\n"
-+msgstr "�е могу да читам датотеку %s"
- 
--#: ../plug-ins/vdx/vdx-export.c:1904
-+#: ../plug-ins/vdx/vdx-export.c:1912
- msgid "Visio XML format"
--msgstr ""
-+msgstr "Ик�МЛ запи� Визиа"
- 
--#: ../plug-ins/vdx/vdx-import.c:219 ../plug-ins/xfig/xfig-import.c:1034
-+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
- #, c-format
- msgid "Couldn't read color: %s\n"
--msgstr "�е може да чита боју: %s\n"
-+msgstr "�е могу да читам боју: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:507
--#, fuzzy, c-format
-+#: ../plug-ins/vdx/vdx-import.c:541
-+#, c-format
- msgid "Couldn't find shape %d\n"
--msgstr "�е могу да пронађем директоријум за помоћ"
-+msgstr "�е могу да пронађем облик %d\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:851
--msgid "MoveTo after start of polyline\n"
--msgstr ""
--
--#: ../plug-ins/vdx/vdx-import.c:864
--#, fuzzy, c-format
--msgid "Unexpected polyline object: %s\n"
--msgstr "�е могу да учитам податке о полигон�кој линији: %s\n"
--
--#: ../plug-ins/vdx/vdx-import.c:956
-+#: ../plug-ins/vdx/vdx-import.c:1047
- #, c-format
- msgid "Unexpected Ellipse object: %s\n"
--msgstr ""
-+msgstr "�еочекивани објекат Елип�е: %s\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:964
--msgid "Unexpected Ellipse additional objects\n"
--msgstr ""
--
--#: ../plug-ins/vdx/vdx-import.c:974
--#, fuzzy
-+#: ../plug-ins/vdx/vdx-import.c:1061
- msgid "Can't rotate ellipse\n"
--msgstr "�е може да прочита информације елип�е: %s\n"
-+msgstr "�е могу да заокренем елип�у\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1287
-+#: ../plug-ins/vdx/vdx-import.c:1392
- msgid "MoveTo not at start of Bezier\n"
--msgstr ""
--
--#: ../plug-ins/vdx/vdx-import.c:1374
--#, c-format
--msgid "Unexpected Bezier object: %s\n"
--msgstr ""
--
--#: ../plug-ins/vdx/vdx-import.c:1595
--#, c-format
--msgid "Unexpected NURBSTo object: %s\n"
--msgstr ""
--
--#: ../plug-ins/vdx/vdx-import.c:1603
--msgid "Unexpected NURBSTo additional objects\n"
--msgstr ""
-+msgstr "„Преме�ти у“ није на почетку Безјера\n"
- 
--#: ../plug-ins/vdx/vdx-import.c:1620
-+#: ../plug-ins/vdx/vdx-import.c:1740
- msgid "Invalid NURBS formula"
--msgstr ""
-+msgstr "�еи�правна �УРБС формула"
- 
--#: ../plug-ins/vdx/vdx-import.c:1742
--#, fuzzy, c-format
-+#: ../plug-ins/vdx/vdx-import.c:1984
-+#, c-format
- msgid "Couldn't write file %s"
--msgstr "�е може да чита боју: %s\n"
-+msgstr "�е могу да запишем датотеку %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:1826 ../plug-ins/vdx/vdx-import.c:1839
--#, fuzzy, c-format
-+#: ../plug-ins/vdx/vdx-import.c:2069 ../plug-ins/vdx/vdx-import.c:2082
-+#, c-format
- msgid "Couldn't handle foreign object type %s"
--msgstr "�е могу да идентификујем FIG објекат: %s\n"
-+msgstr "�е могу да рукујрм �траном вр�том објекта %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:1867
--#, fuzzy, c-format
-+#: ../plug-ins/vdx/vdx-import.c:2110
-+#, c-format
- msgid "Couldn't make object dir %s"
--msgstr "�е могу да идентификујем FIG објекат: %s\n"
-+msgstr "�е могу да направим директоријум објекта %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:2723
--#, fuzzy
-+#: ../plug-ins/vdx/vdx-import.c:3100
- msgid "Visio XML File Format"
--msgstr "XFig Формат Датотеке"
-+msgstr "Запи� Визио Ик�МЛ датотеке"
- 
- #: ../plug-ins/vdx/vdx-xml.c:3344
--#, fuzzy, c-format
-+#, c-format
- msgid "Can't decode object %s"
--msgstr "�е могу да учитам �ловни лик %s.\n"
-+msgstr "�е могу да декодирам објекат %s"
- 
- #: ../plug-ins/vdx/vdx-xml.c:5125
--#, fuzzy, c-format
-+#, c-format
- msgid "Can't write object %u"
--msgstr "�е могу да нађем �тандардан објекат"
-+msgstr "�е могу да запишем објекат %u"
- 
- #: ../plug-ins/vdx/vdx.c:53
--#, fuzzy
- msgid "Visio XML Format import and export filter"
--msgstr "Филтер за увоз и извоз FIG датотека"
-+msgstr "Пропу�ник за увоз и извоз Визио Ик�МЛ запи�а"
-+
-+#: ../plug-ins/wmf/wmf.cpp:499
-+#, c-format
-+msgid ""
-+"Can not render unknown font:\n"
-+"%s"
-+msgstr ""
-+"�е могу да и�цртам непознато пи�мо:\n"
-+"%s"
- 
- # bug: ":" is not needed
--#: ../plug-ins/wmf/wmf.cpp:1186
-+#: ../plug-ins/wmf/wmf.cpp:1258
- #, c-format
- msgid "Couldn't open: '%s' for writing.\n"
- msgstr "�е могу да отворим „%s“ ради упи�а.\n"
- 
--#: ../plug-ins/wmf/wmf.cpp:1270
-+#: ../plug-ins/wmf/wmf.cpp:1357
- msgid "Windows Meta File"
--msgstr "Windows мета датотека (WMF)"
-+msgstr "Виндоуз мета-датотека"
- 
--#: ../plug-ins/wmf/wmf.cpp:1279
--#, fuzzy
-+#: ../plug-ins/wmf/wmf.cpp:1366
- msgid "Enhanced Meta File"
--msgstr "Windows мета датотека (WMF)"
-+msgstr "Побољшана мета-датотека"
-+
-+#: ../plug-ins/wmf/wmf.cpp:1388
-+msgid "Print (GDI) ..."
-+msgstr "Штампај (ГДИ) ..."
- 
--#: ../plug-ins/wmf/wmf.cpp:1295
-+#: ../plug-ins/wmf/wmf.cpp:1403
- msgid "WMF export filter"
--msgstr "WMF извозни филтер"
-+msgstr "Пропу�ник извоза ВМФ-а"
- 
--#: ../plug-ins/wpg/wpg.c:1188
-+#: ../plug-ins/wpg/wpg.c:1190
- #, c-format
- msgid "File: %s type/version unsupported.\n"
- msgstr "Датотека: %s вр�та/издање ни�у подржани.\n"
- 
--#: ../plug-ins/wpg/wpg.c:1319 ../plug-ins/wpg/wpg.c:1326
-+#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
- msgid "WPG"
--msgstr "WPG"
-+msgstr "ВПГ"
- 
--#: ../plug-ins/wpg/wpg.c:1354
-+#: ../plug-ins/wpg/wpg.c:1356
- msgid "WordPerfect Graphics export filter"
--msgstr "Извозни филтер за WPG"
-+msgstr "Пропу�ник извоза графике �авршених речи"
- 
--#: ../plug-ins/xfig/xfig-export.c:459
-+#: ../plug-ins/xfig/xfig-export.c:463
- #, c-format
- msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
--msgstr "FIG запи� не омогућава �трелице �тила %s, кори�ти обичну �трелицу.\n"
-+msgstr "ФИГ запи� нема одговарајући �тил �трелице %s; кори�тим обичну �трелицу.\n"
- 
--#: ../plug-ins/xfig/xfig-export.c:481
-+#: ../plug-ins/xfig/xfig-export.c:486
- msgid "No more user-definable colors - using black"
--msgstr "�ема више боја по�тављених од �тране кори�ника — кори�тим црну"
-+msgstr "�ема више боја које је по�тавио кори�ник — кори�тим црну"
- 
--#: ../plug-ins/xfig/xfig-export.c:1186
-+#: ../plug-ins/xfig/xfig-export.c:1207
- msgid "XFig format"
--msgstr "XFig формат"
-+msgstr "Ик�Фиг запи�"
- 
--#: ../plug-ins/xfig/xfig-import.c:109
-+#: ../plug-ins/xfig/xfig-import.c:111
- #, c-format
- msgid "Color index %d too high, only 512 colors allowed. Using black instead."
--msgstr ""
-+msgstr "Индек� боје %d је преви�ок, допуштено је �амо 512 боја. Кори�тићу црну."
- 
--#: ../plug-ins/xfig/xfig-import.c:136
-+#: ../plug-ins/xfig/xfig-import.c:138
- msgid "Patterns are not supported by Dia"
--msgstr "Обра�ци ни�у подржани од Дие"
-+msgstr "Диа не подржава шаблоне"
- 
--#: ../plug-ins/xfig/xfig-import.c:164
-+#: ../plug-ins/xfig/xfig-import.c:166
- msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
--msgstr "Диа не подржава тротачка�те линије, кори�ти двотачка�те"
-+msgstr "Диа не подржава тротачка�те линије, кори�тићу двотачка�те"
- 
--#: ../plug-ins/xfig/xfig-import.c:168
-+#: ../plug-ins/xfig/xfig-import.c:170
- #, c-format
- msgid "Line style %d should not appear\n"
--msgstr "�е треба да �е појави �тил линија %d\n"
-+msgstr "Стил линије „%d“ не треба да �е појави\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:236
-+#: ../plug-ins/xfig/xfig-import.c:238
- #, c-format
- msgid "Error while reading %dth of %d points: %s\n"
--msgstr "Грешка при читању %dth од %d тачака: %s\n"
-+msgstr "Грешка читања %d. од %d тачака: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:264
-+#: ../plug-ins/xfig/xfig-import.c:266
- msgid "Error while reading arrowhead\n"
--msgstr "Грешка код читања главе �трелице\n"
-+msgstr "Грешка читања главе �трелице\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:286
-+#: ../plug-ins/xfig/xfig-import.c:288
- #, c-format
- msgid "Unknown arrow type %d\n"
--msgstr "�епознат тип �трелице %d\n"
-+msgstr "�епозната вр�та �трелице %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:377
-+#: ../plug-ins/xfig/xfig-import.c:379
- #, c-format
- msgid "Depth %d of of range, only 0-%d allowed.\n"
--msgstr ""
-+msgstr "Дубина %d изван оп�ега, допуштено је �амо 0-%d.\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:424
-+#: ../plug-ins/xfig/xfig-import.c:426
- #, c-format
- msgid "Couldn't read ellipse info: %s\n"
--msgstr "�е може да прочита информације елип�е: %s\n"
-+msgstr "�е могу да прочитам податке елип�е: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:492
-+#: ../plug-ins/xfig/xfig-import.c:494
- #, c-format
- msgid "Couldn't read polyline info: %s\n"
--msgstr "�е могу да учитам податке о полигон�кој линији: %s\n"
-+msgstr "�е могу да прочитам податке о полилинији: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:507
-+#: ../plug-ins/xfig/xfig-import.c:509
- #, c-format
- msgid "Couldn't read flipped bit: %s\n"
- msgstr "�е могу да прочитам изврнути бит: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:525
-+#: ../plug-ins/xfig/xfig-import.c:527
- msgid "Negative corner radius, negating"
--msgstr "�егативни полупречник код ћошка, негира"
-+msgstr "�егативни полупречник ћошка, негирам"
- 
--#: ../plug-ins/xfig/xfig-import.c:568 ../plug-ins/xfig/xfig-import.c:881
-+#: ../plug-ins/xfig/xfig-import.c:570
- #, c-format
- msgid "Unknown polyline subtype: %d\n"
--msgstr "�епознат подтип полигон�ке линије: %d\n"
-+msgstr "�епозната подвр�та полилиније: %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:718 ../plug-ins/xfig/xfig-import.c:750
-+#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
- #, c-format
- msgid "Couldn't read spline info: %s\n"
- msgstr "�е могу да прочитам податке о кривој: %s\n"
- 
- #. Open approximated spline
- #. Closed approximated spline
--#: ../plug-ins/xfig/xfig-import.c:737 ../plug-ins/xfig/xfig-import.c:755
-+#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
- msgid "Cannot convert approximated spline yet."
- msgstr "Још увек не могу да претворим приближну криву."
- 
--#: ../plug-ins/xfig/xfig-import.c:793
-+#: ../plug-ins/xfig/xfig-import.c:795
- #, c-format
- msgid "Unknown spline subtype: %d\n"
- msgstr "�епозната подвр�та криве: %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:856
-+#: ../plug-ins/xfig/xfig-import.c:860
- #, c-format
- msgid "Couldn't read arc info: %s\n"
- msgstr "�е могу да прочитам податке о луку: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:945
-+#. set new fill property on arc?
-+#: ../plug-ins/xfig/xfig-import.c:889
-+msgid "Filled arc treated as unfilled"
-+msgstr "И�пуњен лук �е �матра као неи�пуњен"
-+
-+#: ../plug-ins/xfig/xfig-import.c:893
-+#, c-format
-+msgid "Unknown polyline arc: %d\n"
-+msgstr "�епознат лук полилиније: %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:957
- #, c-format
- msgid "Couldn't read text info: %s\n"
- msgstr "�е могу да прочитам тек�туалне податке: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1007
-+#: ../plug-ins/xfig/xfig-import.c:1019
- #, c-format
- msgid "Couldn't identify FIG object: %s\n"
--msgstr "�е могу да идентификујем FIG објекат: %s\n"
-+msgstr "�е могу да препознам ФИГ објекат: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1015
-+#: ../plug-ins/xfig/xfig-import.c:1027
- msgid "Compound end outside compound\n"
--msgstr "Сложени и �пољни �ложени\n"
-+msgstr "Сложени завршава �пољни �ложени\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1039
-+#: ../plug-ins/xfig/xfig-import.c:1051
- #, c-format
- msgid "Color number %d out of range 0..%d.  Discarding color.\n"
--msgstr ""
-+msgstr "Број боје %d је ван оп�ега 0..%d.  Одбацујем боју.\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1085
-+#: ../plug-ins/xfig/xfig-import.c:1097
- #, c-format
- msgid "Couldn't read group extend: %s\n"
--msgstr "�е може да прочита продужење групе: %s\n"
-+msgstr "�е могу да прочитам продужење групе: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1096
-+#: ../plug-ins/xfig/xfig-import.c:1108
- #, c-format
- msgid "Unknown object type %d\n"
- msgstr "�епозната вр�та објекта %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1120
-+#: ../plug-ins/xfig/xfig-import.c:1132
- #, c-format
- msgid "`%s' is not one of `%s' or `%s'\n"
--msgstr "„%s“ није једна од „%s“ или „%s“\n"
-+msgstr "„%s“ није једно од „%s“ или „%s“\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1130
-+#: ../plug-ins/xfig/xfig-import.c:1142
- #, c-format
- msgid "Error reading paper size: %s\n"
--msgstr "Грешка при читању величине папира: %s\n"
-+msgstr "Грешка читања величине папира: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1141
-+#: ../plug-ins/xfig/xfig-import.c:1153
- #, c-format
- msgid "Unknown paper size `%s', using default\n"
--msgstr "�епозната величина папира „%s“, кори�ти подразумевано\n"
-+msgstr "�епозната величина папира „%s“, кори�тим о�новно\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1153
-+#: ../plug-ins/xfig/xfig-import.c:1165
- #, c-format
- msgid "Error reading paper orientation: %s\n"
--msgstr "Грешка при читању оријентације папира: %s\n"
-+msgstr "Грешка читања у�мерења папира: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1163
-+#: ../plug-ins/xfig/xfig-import.c:1175
- #, c-format
- msgid "Error reading justification: %s\n"
--msgstr "Грешка при читању поравнања: %s\n"
-+msgstr "Грешка читања поравнања: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1173
-+#: ../plug-ins/xfig/xfig-import.c:1185
- #, c-format
- msgid "Error reading units: %s\n"
--msgstr "Грешка при читању јединица: %s\n"
-+msgstr "Грешка читања јединица: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1189
-+#: ../plug-ins/xfig/xfig-import.c:1201
- #, c-format
- msgid "Error reading magnification: %s\n"
--msgstr "Грешка при читању увеличања: %s\n"
-+msgstr "Грешка читања увеличања: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1202
-+#: ../plug-ins/xfig/xfig-import.c:1214
- #, c-format
- msgid "Error reading multipage indicator: %s\n"
--msgstr "Грешка при читању индикатора више-�траница: %s\n"
-+msgstr "Грешка читања указивача више-�траница: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1213
-+#: ../plug-ins/xfig/xfig-import.c:1225
- #, c-format
- msgid "Error reading transparent color: %s\n"
--msgstr "Грешка при читању провидних боја: %s\n"
-+msgstr "Грешка читања провидних боја: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1222 ../plug-ins/xfig/xfig-import.c:1278
--#: ../plug-ins/xfig/xfig-import.c:1296
-+#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
-+#: ../plug-ins/xfig/xfig-import.c:1308
- #, c-format
- msgid "Error reading FIG file: %s\n"
--msgstr "Грешка при читању FIG датотеке: %s\n"
-+msgstr "Грешка читања ФИГ датотеке: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1224 ../plug-ins/xfig/xfig-import.c:1280
-+#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
- msgid "Premature end of FIG file\n"
--msgstr "Превремен крај FIG датотеке\n"
-+msgstr "Превремен крај ФИГ датотеке\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1233
-+#: ../plug-ins/xfig/xfig-import.c:1245
- #, c-format
- msgid "Error reading resolution: %s\n"
--msgstr "Грешка при читању резолуције: %s\n"
-+msgstr "Грешка читања резолуције: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1265
-+#: ../plug-ins/xfig/xfig-import.c:1277
- #, c-format
- msgid "Doesn't look like a Fig file: %s\n"
--msgstr "�е изгледа као FIG датотека: %s\n"
-+msgstr "�е изгледа као Фиг датотека: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1271
-+#: ../plug-ins/xfig/xfig-import.c:1283
- #, c-format
- msgid "This is a FIG version %d.%d file, I may not understand it\n"
--msgstr "Ово је FIG датотека издања %d.%d, можда је нећу разумети\n"
-+msgstr "Ово је датотека ФИГ издања %d.%d., можда је нећу разумети\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1319
-+#: ../plug-ins/xfig/xfig-import.c:1331
- msgid "XFig File Format"
--msgstr "XFig Формат Датотеке"
-+msgstr "Запи� Ик�фиг датотеке"
- 
- #: ../plug-ins/xfig/xfig.c:51
- msgid "Fig Format import and export filter"
--msgstr "Филтер за увоз и извоз FIG датотека"
-+msgstr "Пропу�ник за увоз и извоз Фиг запи�а"
- 
--#: ../plug-ins/xslt/xslt.c:102
-+#: ../plug-ins/xslt/xslt.c:108
- #, c-format
- msgid "Error while parsing %s\n"
--msgstr "Грешка при обради %s\n"
-+msgstr "Грешка приликом обраде %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:111
-+#: ../plug-ins/xslt/xslt.c:117
- #, c-format
- msgid "Error while parsing stylesheet %s\n"
--msgstr "Грешка при обради �тилова %s\n"
-+msgstr "Грешка приликом обраде �тилова %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:118
-+#: ../plug-ins/xslt/xslt.c:124
- #, c-format
- msgid "Error while applying stylesheet %s\n"
--msgstr "Грешка при примени �тилова %s\n"
-+msgstr "Грешка приликом примене �тилова %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:127
-+#: ../plug-ins/xslt/xslt.c:133
- #, c-format
- msgid "Error while parsing stylesheet: %s\n"
--msgstr "Грешка при обради �тилова: %s\n"
-+msgstr "Грешка приликом обраде �тилова: %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:136
-+#: ../plug-ins/xslt/xslt.c:142
- #, c-format
- msgid "Error while applying stylesheet: %s\n"
--msgstr "Грешка при примени �тилова: %s\n"
-+msgstr "Грешка приликом примене �тилова: %s\n"
- 
--#: ../plug-ins/xslt/xslt.c:322
-+#: ../plug-ins/xslt/xslt.c:150
-+#, c-format
-+msgid "Error while saving result: %s\n"
-+msgstr "Грешка приликом чувања резултата: %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:335
- msgid "XSL Transformation filter"
--msgstr "Филтер за XSL тран�формације"
-+msgstr "Пропу�ник Ик�СЛ преображаја"
- 
--#: ../plug-ins/xslt/xslt.c:346
-+#: ../plug-ins/xslt/xslt.c:362
- msgid "No valid configuration files found for the XSLT plugin, not loading."
- msgstr ""
--"�и�у нађени и�правне датотеке �а подешавањима за XSLT додатак; не учитавам."
-+"�и�у пронађене и�правне датотеке подешавања за Ик�СЛТ прикључак, не "
-+"учитавам."
- 
--#: ../plug-ins/xslt/xsltdialog.c:96
-+#: ../plug-ins/xslt/xsltdialog.c:97
- msgid "Export through XSLT"
--msgstr "Извези помоћу XSLT"
-+msgstr "Извези кроз Ик�СЛТ"
- 
--#: ../plug-ins/xslt/xsltdialog.c:111
-+#: ../plug-ins/xslt/xsltdialog.c:112
- msgid "From:"
- msgstr "Од:"
- 
--#: ../plug-ins/xslt/xsltdialog.c:146
-+#: ../plug-ins/xslt/xsltdialog.c:147
- msgid "To:"
- msgstr "До:"
- 
- #: ../sheets/AADL.sheet.in.h:1
- msgid "AADL"
--msgstr ""
-+msgstr "��ДЛ"
- 
- #: ../sheets/AADL.sheet.in.h:2
--#, fuzzy
- msgid "AADL Shapes"
--msgstr "Обликуј"
-+msgstr "��ДЛ облици"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
--msgstr ""
--
--#: ../sheets/AADL.sheet.in.h:5
--#, fuzzy
--msgid "Device"
--msgstr "Делити"
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
-+msgstr "�ит"
- 
- #: ../sheets/AADL.sheet.in.h:6
--msgid "Memory"
--msgstr ""
-+msgid "Processor"
-+msgstr "Проце�ор"
- 
- #: ../sheets/AADL.sheet.in.h:7
--#, fuzzy
--msgid "Package"
--msgstr "Сме�ти"
-+msgid "Memory"
-+msgstr "Меморија"
-+
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Маги�трала"
- 
- #: ../sheets/AADL.sheet.in.h:9
--#, fuzzy
--msgid "Processor"
--msgstr "Обради"
-+msgid "System"
-+msgstr "Си�тем"
- 
- #: ../sheets/AADL.sheet.in.h:10
--#, fuzzy
- msgid "Subprogram"
--msgstr "Позив корака подпрограма"
-+msgstr "Подпрограм"
- 
- #: ../sheets/AADL.sheet.in.h:11
--#, fuzzy
--msgid "System"
--msgstr "Sybase"
-+msgid "Thread Group"
-+msgstr "Група нити"
- 
- #: ../sheets/AADL.sheet.in.h:12
--#, fuzzy
--msgid "Thread"
--msgstr "Дељен"
-+msgid "Device"
-+msgstr "Уређај"
- 
- #: ../sheets/AADL.sheet.in.h:13
--msgid "Thread Group"
--msgstr ""
-+msgid "Package"
-+msgstr "Пакет"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Развр�тан"
- 
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
-+#: ../sheets/Assorted.sheet.in.h:6
- msgid ""
- "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
- "Geometric Shapes"
- msgstr ""
--"Разновр�ни �куп полигона, безијерових полигона и других разних геометриј�ких "
--"облика"
-+"Развр�тан �куп полигона, безијерогона и других разних геометриј�ких облика"
- 
--#. Please talk to me before making any changes to this sheet
--#: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Разновр�ни"
--
--# Хмммм...
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "Еполета"
-+msgid "Right angle triangle"
-+msgstr "Троугао де�ног угла"
- 
-+# или је ово једнако�транични?
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Крива о�мокрака звезда"
-+msgid "Isoceles triangle"
-+msgstr "Једнакокраки троугао"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Крива четворокрака звезда"
-+msgid "Perfect square, height equals width"
-+msgstr "Савршен квадрат, ви�ина једнака ширини"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Дијамант"
-+msgid "Perfect circle"
-+msgstr "Савршен круг"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Стрелица надоле"
-+msgid "Quarter circle"
-+msgstr "Четврт круга"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "О�мокрака звезда"
-+msgid "Diamond"
-+msgstr "Ромб"
- 
- #: ../sheets/Assorted.sheet.in.h:13
--msgid "Five point star"
--msgstr "Звезда петокрака"
-+msgid "Pentagon. Five sided shape"
-+msgstr "Пентагон. Петоугаоник"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Четворокрака звезда"
-+msgid "Hexagon. Six sided shape"
-+msgstr "Хек�агон. Ше�тоугаоник"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Срце"
--
--#: ../sheets/Assorted.sheet.in.h:16
- msgid "Heptagon. Seven sided shape"
- msgstr "Хептагон. Седмоугаоник"
- 
--#: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Хек�агон. Ше�тоугаоник"
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Октогон. О�моугаоник"
- 
--#: ../sheets/Assorted.sheet.in.h:18
-+#: ../sheets/Assorted.sheet.in.h:17
- msgid "Horizontal parallelogram"
- msgstr "Водоравни паралелограм"
- 
--# или је ово једнако�транични?
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "У�правни паралелограм"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Једнакокраки троугао"
-+msgid "Trapezoid"
-+msgstr "Трапезоид"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Стрелица улево"
-+msgid "Four point star"
-+msgstr "Четворокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Лева–де�на �трелица"
-+msgid "Curved four point star"
-+msgstr "Закривљена четворокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Лева–де�на–горе �трелица"
-+msgid "Five point star"
-+msgstr "Петокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Лево–горе �трелица"
-+msgid "Six point star"
-+msgstr "Ше�токрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Малтешки кр�т"
-+msgid "Seven point star"
-+msgstr "Седмокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "За�ечена �трелица налево"
-+msgid "Eight point star"
-+msgstr "О�мокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "За�ечена �трелица наде�но"
-+msgid "Sharp eight point star"
-+msgstr "Оштра о�мокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "О�моугаоник"
-+msgid "Curved eight point star"
-+msgstr "Закривљена о�мокрака звезда"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "И�пуњена петоугла�та �трелица"
-+msgid "Swiss cross"
-+msgstr "Швајцар�ки кр�т"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Петоугаоник"
-+msgid "Maltese cross"
-+msgstr "Малтешки кр�т"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Савршен круг"
-+msgid "Down arrow"
-+msgstr "Стрелица на доле"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Савршен квадрат, ви�ина једнака ширини"
-+msgid "Up arrow"
-+msgstr "Стрелица на горе"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Четворо�трука �трелица"
-+msgid "Left arrow"
-+msgstr "Стрелица на лево"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "Четврт круга"
-+msgid "Right arrow"
-+msgstr "Стрелица на де�но"
- 
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "Ме�ечева мена"
-+msgid "Notched left arrow"
-+msgstr "За�ечена �трелица налево"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Троугао де�ног угла"
-+msgid "Notched right arrow"
-+msgstr "За�ечена �трелица наде�но"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Де�на �трелица"
-+msgid "Left-up arrow"
-+msgstr "Лево–горе �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Седмокрака звезда"
-+msgid "Turn-up arrow"
-+msgstr "Окрени-горе �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Оштра о�мокрака звезда"
-+msgid "Left-right arrow"
-+msgstr "Лева–де�на �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Ше�токрака звезда"
-+msgid "Up-down arrow"
-+msgstr "Горе–доле �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Сунце"
-+msgid "Quad arrow"
-+msgstr "Четворо�трука �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Швајцар�ки кр�т"
-+msgid "Left-right-up arrow"
-+msgstr "Лева–де�на–горе �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Трапезоид"
-+msgid "Up-down-left arrow"
-+msgstr "Горе–доле–лево �трелица"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--msgid "Turn-up arrow"
--msgstr "Окрени-горе �трелица"
-+msgid "Pentagon block arrow"
-+msgstr "И�пуњена петоугла�та �трелица"
- 
-+# Хмммм...
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "�агоре �трелица"
-+msgid "Chevron"
-+msgstr "Еполета"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Горе–доле �трелица"
-+msgid "Heart"
-+msgstr "Срце"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Горе–доле–лево �трелица"
-+msgid "Sun"
-+msgstr "Сунце"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "У�правни паралелограм"
--
--#: ../sheets/BPMN.sheet.in.h:1
--#, fuzzy
--msgid "Activity Looping"
--msgstr "Радња"
-+msgid "Quarter moon"
-+msgstr "Четврт ме�еца"
- 
-+#. For: anthonym
- #: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
--msgstr ""
-+msgid "BPMN"
-+msgstr "БПМ�"
-+
-+#: ../sheets/BPMN.sheet.in.h:3
-+msgid "Business Process Modeling Notation"
-+msgstr "Бележење модели�ања по�ловног проце�а"
- 
--#. For: anthonym
- #: ../sheets/BPMN.sheet.in.h:4
--msgid "BPMN"
--msgstr ""
-+msgid "Start Event"
-+msgstr "Почетни догађај"
- 
- #: ../sheets/BPMN.sheet.in.h:5
--msgid "Business Process Modeling Notation"
--msgstr ""
-+msgid "Start Event - Message"
-+msgstr "Почетни догађај — Порука"
- 
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
--msgstr ""
-+msgid "Start Event - Timer"
-+msgstr "Почетни догађај — Временик"
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
--msgstr ""
-+msgid "Start Event - Rule"
-+msgstr "Почетни догађај — Правило"
- 
- #: ../sheets/BPMN.sheet.in.h:8
--#, fuzzy
--msgid "Compensation Task"
--msgstr "Слагање"
-+msgid "Start Event - Link"
-+msgstr "Почетни догађај — Веза"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--#, fuzzy
--msgid "Complex"
--msgstr "Пар"
-+msgid "Start Event - Multiple"
-+msgstr "Почетни догађај — Мноштво"
- 
- #: ../sheets/BPMN.sheet.in.h:10
--#, fuzzy
--msgid "Data Object"
--msgstr "Диа Објекат"
-+msgid "Intermediate Event"
-+msgstr "Средишњи догађај"
- 
- #: ../sheets/BPMN.sheet.in.h:11
--#, fuzzy
--msgid "End Event"
--msgstr "Крајња тачка"
-+msgid "Intermediate Event - Message"
-+msgstr "Средишњи догађај — Порука"
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
--msgstr ""
-+msgid "Intermediate Event - Timer"
-+msgstr "Средишњи догађај — Временик"
- 
- #: ../sheets/BPMN.sheet.in.h:13
--#, fuzzy
--msgid "End Event - Compensation"
--msgstr "Одреднице догађаја"
-+msgid "Intermediate Event - Error"
-+msgstr "Средишњи догађај — Грешка"
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
--msgstr ""
-+msgid "Intermediate Event - Cancel"
-+msgstr "Средишњи догађај — Бри�ање"
- 
- #: ../sheets/BPMN.sheet.in.h:15
--#, fuzzy
--msgid "End Event - Link"
--msgstr "Одредиште догађаја"
-+msgid "Intermediate Event - Compensation"
-+msgstr "Средишњи догађај — Поправка"
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
--msgstr ""
-+msgid "Intermediate Event - Rule"
-+msgstr "Средишњи догађај — Правило"
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
--msgstr ""
-+msgid "Intermediate Event - Link"
-+msgstr "Средишњи догађај — Веза"
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
--msgstr ""
-+msgid "Intermediate Event - Multiple"
-+msgstr "Средишњи догађај — Мноштво"
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
--msgstr ""
-+msgid "End Event"
-+msgstr "Завршни догађај"
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
--msgstr ""
-+msgid "End Event - Message"
-+msgstr "Завршни догађај — Порука"
- 
- #: ../sheets/BPMN.sheet.in.h:21
--#, fuzzy
--msgid "Gateway"
--msgstr "MAS пролаз"
-+msgid "End Event - Error"
-+msgstr "Завршни догађај — Грешка"
- 
- #: ../sheets/BPMN.sheet.in.h:22
--#, fuzzy
--msgid "Group"
--msgstr "_Групиши"
-+msgid "End Event - Cancel"
-+msgstr "Завршни догађај — Откажи"
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
--msgstr ""
-+msgid "End Event - Compensation"
-+msgstr "Завршни догађај — Поправка"
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr ""
-+msgid "End Event - Link"
-+msgstr "Завршни догађај — Веза"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
--msgstr ""
-+msgid "End Event - Multiple"
-+msgstr "Завршни догађај — Мноштво"
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
--msgstr ""
-+msgid "End Event - Terminate"
-+msgstr "Завршни догађај — Окончај"
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
--msgstr ""
-+msgid "Gateway"
-+msgstr "Мрежни пролаз"
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
--msgstr ""
-+msgid "Exclusive (XOR) Data Based"
-+msgstr "И�кључиво (ИЛЛИ) на о�нову података"
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
--msgstr ""
-+msgid "Exclusive (XOR) Event Based"
-+msgstr "И�кључиво (ИЛЛИ) на о�нову догађаја"
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
--msgstr ""
-+msgid "Inclusive (OR)"
-+msgstr "Укључиво (ИЛИ)"
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
--msgstr ""
-+msgid "Complex"
-+msgstr "Скупина"
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr ""
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
--msgstr ""
-+msgid "Parallel (AND)"
-+msgstr "Паралелни (И)"
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
--msgstr ""
-+msgid "Activity Looping"
-+msgstr "Понављање активно�ти"
- 
- #: ../sheets/BPMN.sheet.in.h:35
--#, fuzzy
- msgid "Multiple Instance Task"
--msgstr "Више�труке ин�танце"
-+msgstr "Задатак више примерака"
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
--msgstr ""
-+msgid "Compensation Task"
-+msgstr "Задатак поправке"
- 
- #: ../sheets/BPMN.sheet.in.h:37
--#, fuzzy
--msgid "Start Event"
--msgstr "Почетна тачка"
-+msgid "Collapsed Sub-Process"
-+msgstr "Уронули под-проце�"
- 
- #: ../sheets/BPMN.sheet.in.h:38
--#, fuzzy
--msgid "Start Event - Link"
--msgstr "Одредиште догађаја"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr "Понављање уронулог под-проце�а"
- 
- #: ../sheets/BPMN.sheet.in.h:39
--#, fuzzy
--msgid "Start Event - Message"
--msgstr "Пошаљи поруку"
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr "Уронули под-проце� више примерака"
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
--msgstr ""
-+msgid "Ad-Hoc Collapsed Sub-Process"
-+msgstr "�д-хок уронули под-проце�"
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
--msgstr ""
-+msgid "Compensation Collapsed Sub-Process"
-+msgstr "Поправка уронулог под-проце�а"
- 
- #: ../sheets/BPMN.sheet.in.h:42
--#, fuzzy
--msgid "Start Event - Timer"
--msgstr "Почетно време:"
-+msgid "Group"
-+msgstr "Група"
-+
-+#: ../sheets/BPMN.sheet.in.h:43
-+msgid "Transaction"
-+msgstr "Прено�"
- 
- #: ../sheets/BPMN.sheet.in.h:44
--#, fuzzy
--msgid "Text Annotation"
--msgstr "Орјентација"
-+msgid "Data Object"
-+msgstr "Објекат података"
- 
- #: ../sheets/BPMN.sheet.in.h:45
--#, fuzzy
--msgid "Transaction"
--msgstr "Превод"
--
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
--msgstr "Струјни наизменични извор"
-+msgid "Text Annotation"
-+msgstr "Забелешка тек�та"
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--msgid "Air Cooler"
--msgstr "Ваздушно хлађење"
-+msgid "ChemEng"
-+msgstr "Технолошки проце�и"
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
--msgstr ""
-+msgid "Collection for chemical engineering"
-+msgstr "Збирка технолошких проце�а"
- 
-+# bug(slobo): треба допунити
- #: ../sheets/ChemEng.sheet.in.h:4
--#, fuzzy
--msgid "Axial Flow Fan"
--msgstr "Дозволити DOF"
-+msgid "Fan or Stirrer"
-+msgstr "Вентилатор или мешалица"
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--msgid "Basic Filter"
--msgstr "Обичан филтер"
-+msgid "Spraying Device"
-+msgstr "Пр�калица"
- 
-+#  Translators: Menu item Noun/Energy/Pneumatic
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
--msgstr "Центрифуга или вентилатор"
-+msgid "Pneumatic Line"
-+msgstr "Пнеумат�ка линија"
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--msgid "Centrifuge"
--msgstr "Центрифуга"
-+msgid "Pneumatic Line, vertical"
-+msgstr "Пнеумат�ка линија, у�правна"
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--msgid "ChemEng"
--msgstr "Технолошки проце�и"
-+msgid "Simple Heat Exchanger"
-+msgstr "Једно�таван размењивач топлоте"
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
--msgstr "Пречишћавач или �уд за таложење"
-+msgid "Simple Heat Exchanger, vertical"
-+msgstr "Једно�таван размењивач топлоте, у�праван"
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
--msgstr "Збирка технолошких проце�а"
-+msgid "Water Cooler"
-+msgstr "Водено хлађење"
- 
- #: ../sheets/ChemEng.sheet.in.h:12
--msgid "Compressor or Turbine"
--msgstr "Компре�ор или турбина"
-+msgid "Water Cooler, vertical"
-+msgstr "Водено хлађење, у�правно"
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--msgid "Covered tank"
--msgstr "Затворени �уд"
-+msgid "Fixed-Sheet Exchanger"
-+msgstr "Размењивач �талног ли�та"
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
--msgstr ""
-+msgid "Floating-Head or U-Tube Exchanger"
-+msgstr "Размењивач покретне главе или У-цевке"
- 
--# bug(slobo): треба проверити
- #: ../sheets/ChemEng.sheet.in.h:15
--msgid "Double-Pipe Exchanger"
--msgstr "Двоцевни размењивач"
-+msgid "Kettle Reboiler"
-+msgstr "Котлић за подгревање"
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
--msgstr ""
-+msgid "Air Cooler"
-+msgstr "Ваздушно хлађење"
- 
--# bug(slobo): треба допунити
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
--msgstr "Вентилатор"
-+msgid "Forced-Flow Air Cooler"
-+msgstr "У�мерено ваздушно хлађење"
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
--msgstr ""
-+msgid "Induced-Flow Air Cooler"
-+msgstr "Ра�хладник индукованог протока ваздуха"
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
--msgstr ""
-+msgid "Plate Exchanger"
-+msgstr "Плоча�ти размењивач"
- 
-+# bug(slobo): треба проверити
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
--msgstr ""
-+msgid "Double-Pipe Exchanger"
-+msgstr "Двоцевни размењивач"
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
--msgstr "У�мерено ваздушно хлађење"
-+msgid "Heating/Cooling Coil"
-+msgstr "�амотај за грејање/хлађење"
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
--msgstr "Боца �а га�ом, о�новна"
-+msgid "Heating/Cooling Coil, vertical"
-+msgstr "�амотај за грејање/хлађење, у�правни"
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
--msgstr ""
-+msgid "Simple Furnace"
-+msgstr "Једно�тавна пећница"
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
--msgstr ""
-+msgid "Simple Vessel"
-+msgstr "Обична по�уда"
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
--msgstr ""
-+msgid "Knock-out Drum (with demister pad)"
-+msgstr "Ударни добош (�а уметком одмагљивача)"
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
--msgstr ""
-+msgid "Tray Column, simple"
-+msgstr "Стубац тацни, једно�таван"
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
--msgstr ""
-+msgid "Tray Column, detailed"
-+msgstr "Стубац тацни, детаљан"
- 
- #: ../sheets/ChemEng.sheet.in.h:28
--msgid "Measurement"
--msgstr "Мерач"
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr "По�уда за додиривање течно�ти, једно�тавна"
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--msgid "Mixer"
--msgstr "Мешалица"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr "Реактор или упијајућа по�уда, једно�таван"
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
--msgstr "Отворени �уд"
-+msgid "Autoclave"
-+msgstr "Стерилизатор"
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
--msgstr ""
-+msgid "Open Tank"
-+msgstr "Отворени �уд"
- 
--#  Translators: Menu item Noun/Energy/Pneumatic
- #: ../sheets/ChemEng.sheet.in.h:32
--msgid "Pneumatic Line"
--msgstr "Пнеумат�ка линија"
-+msgid "Clarifier or Settling Tank"
-+msgstr "Пречишћавач или �уд за таложење"
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
--msgstr "Пнеумат�ка линија, у�правна"
-+msgid "Sealed Tank"
-+msgstr "Запечаћен �уд"
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
--msgstr ""
-+msgid "Covered tank"
-+msgstr "Затворени �уд"
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Reactor or Absorption Vessel, simple"
--msgstr "Реактор или ап�орбциони �уд, једно�таван"
-+msgid "Tank with Fixed Roof"
-+msgstr "По�уда �а непокретним поклопцем"
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reciprocating Compressor or Pump"
--msgstr ""
-+msgid "Tank with Floating Roof"
-+msgstr "По�уда �а покретним поклопцем"
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--msgid "Regulable Valve"
--msgstr "Регулациони вентил"
-+msgid "Storage Sphere"
-+msgstr "Складишна �фера"
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--msgid "Regulable Valve, vertical"
--msgstr "Регулациони вентил (у�правно)"
-+msgid "Gas Holder, basic"
-+msgstr "Боца �а га�ом, о�новна"
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Sealed Tank"
--msgstr "Потопљен �уд"
-+msgid "Centrifugal Pump or Fan"
-+msgstr "Центрифугална пумпа или вентилатор"
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--msgid "Simple Furnace"
--msgstr "Једно�тавна пећница"
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr "Ротациона пумпа позитивног премештања или компре�ор"
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Heat Exchanger"
--msgstr "Једно�таван размењивач топлоте"
-+msgid "Reciprocating Compressor or Pump"
-+msgstr "Клипни компре�ор или пумпа"
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger, vertical"
--msgstr "Једно�таван размењивач топлоте"
-+msgid "Axial Flow Fan"
-+msgstr "О�овин�ки проточни вентилатор"
- 
- #: ../sheets/ChemEng.sheet.in.h:43
--msgid "Simple Vessel"
--msgstr "Обичан вентил"
-+msgid "Compressor or Turbine"
-+msgstr "Компре�ор или турбина"
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Spray Drier"
--msgstr "Сушилица"
-+msgid "Ejector or Injector"
-+msgstr "Избацивач или убацивач"
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spraying Device"
--msgstr "Пр�калица"
-+msgid "AC Generator"
-+msgstr "Извор наизмене �трује"
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--#, fuzzy
--msgid "Storage Sphere"
--msgstr "Рутер за �мештај"
-+msgid "Valve"
-+msgstr "Вентил"
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Tank with Fixed Roof"
--msgstr "По�уда �а непокретним поклопцем"
-+msgid "Valve, vertical"
-+msgstr "Вентил, у�праван"
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Floating Roof"
--msgstr "По�уда �а покретним поклопцем"
-+msgid "Regulable Valve"
-+msgstr "Регулациони вентил"
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tray Column, detailed"
--msgstr ""
-+msgid "Regulable Valve, vertical"
-+msgstr "Регулациони вентил, у�правни"
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, simple"
--msgstr ""
-+msgid "Basic Filter"
-+msgstr "Обичан филтер"
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--msgid "Valve"
--msgstr "Вентил"
-+msgid "Mixer"
-+msgstr "Мешалица"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--msgid "Valve, vertical"
--msgstr "Вентил, у�правни"
-+msgid "Cyclone and hydrocyclone"
-+msgstr "Циклон или хидроциклон"
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--msgid "Water Cooler"
--msgstr "Водено хлађење"
-+msgid "Spray Drier"
-+msgstr "Сушилица"
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--msgid "Water Cooler, vertical"
--msgstr "Водено хлађење, у�правно"
-+msgid "Centrifuge"
-+msgstr "Центрифуга"
-+
-+#: ../sheets/ChemEng.sheet.in.h:55
-+msgid "Pressure Relief Valve"
-+msgstr "Вентил за ра�терећење прити�ка"
- 
- #: ../sheets/Circuit.sheet.in.h:1
- msgid "Circuit"
-@@ -6262,632 +7337,631 @@ msgid "Components for circuit diagrams"
- msgstr "Делови дијаграма интегри�аних кôла"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "Уземљење"
-+msgid "Vertically aligned resistor"
-+msgstr "У�правно по�тављен отпорник"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Водоравна �појница"
-+msgid "Horizontally aligned inductor"
-+msgstr "Водоравно по�тављен калем"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "Водоравно поравнат ЛЕД"
-+msgid "Vertically aligned inductor"
-+msgstr "У�правно по�тављен калем"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Водоравно поравнат кондензатор"
-+msgid "Horizontally aligned resistor"
-+msgstr "Водоравно по�тављен отпорник"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Водоравно поравната диода"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "У�правно по�тављен отпорник (европ�ки)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Водоравно поравнат о�игурач"
-+msgid "Horizontally aligned inductor (European)"
-+msgstr "Водоравно по�тављен калем (европ�ки)"
- 
- #: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Водоравно поравнат калем"
-+msgid "Vertically aligned inductor (European)"
-+msgstr "У�правно по�тављен калем (европ�ки)"
- 
- #: ../sheets/Circuit.sheet.in.h:10
--msgid "Horizontally aligned inductor (European)"
--msgstr "Водоравно поравнат калем (европ�ки)"
-+msgid "Horizontally aligned resistor (European)"
-+msgstr "Водоравно по�тављен отпорник (европ�ки)"
- 
- #: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Водоравно поравнат напон�ки извор"
-+msgid "Horizontally aligned capacitor"
-+msgstr "Водоравно по�тављен кондензатор"
- 
- #: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Водоравно поравнат отпорник"
--
--#: ../sheets/Circuit.sheet.in.h:13
--msgid "Horizontally aligned resistor (European)"
--msgstr "Водоравно поравнат отпорник (европ�ки)"
--
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Водоравно поравната ценер диода"
-+msgid "Vertically aligned capacitor"
-+msgstr "У�правно по�тављен кондензатор"
- 
-+#.
-+#.
- #: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Сијалица"
--
--#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Микрофон"
--
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "NMOS транзи�тор"
-+msgid "NPN bipolar transistor"
-+msgstr "�П� биполарни транзи�тор"
- 
- #.
- #.
-+#: ../sheets/Circuit.sheet.in.h:18
-+msgid "PNP bipolar transistor"
-+msgstr "П�П биполарни транзи�тор"
-+
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Водоравно по�тављена диода"
-+
- #: ../sheets/Circuit.sheet.in.h:20
--msgid "NPN bipolar transistor"
--msgstr "NPN биполарни транзи�тор"
-+msgid "Vertically aligned diode"
-+msgstr "У�правно по�тављена диода"
- 
- #: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Операциони појачавач"
-+msgid "Horizontally aligned zener diode"
-+msgstr "Водоравно по�тављена ценер диода"
- 
- #: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "PMOS транзи�тор"
-+msgid "Vertically aligned zener diode"
-+msgstr "У�правно по�тављена ценер диода"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Уземљење"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Операциони појачавач"
- 
--#.
--#.
- #: ../sheets/Circuit.sheet.in.h:25
--msgid "PNP bipolar transistor"
--msgstr "PNP биполарни транзи�тор"
-+msgid "Horizontally aligned fuse"
-+msgstr "Водоравно по�тављен о�игурач"
- 
--#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Звучник"
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "У�правно по�тављен о�игурач"
- 
- #: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "У�правно поравната ЛЕД"
-+msgid "Horizontally aligned powersource"
-+msgstr "Водоравно по�тављен напон�ки извор"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "У�правно поравнат кондензатор"
-+msgid "Vertically aligned powersource"
-+msgstr "У�правно по�тављен напон�ки извор"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "У�правно поравната диода"
-+msgid "Lamp"
-+msgstr "Сијалица"
- 
--#: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "У�правно поравнат о�игурач"
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Звучник"
- 
--#: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "У�правно поравнат калем"
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Микрофон"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "У�правно поравнат калем (европ�ки)"
-+msgid "Horizontally aligned LED"
-+msgstr "Водоравно по�тављена ЛЕД"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "У�правно поравнат напон�ки извор"
-+msgid "Vertically aligned LED"
-+msgstr "У�правно по�тављена ЛЕД"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "У�правно поравнат отпорник"
-+msgid "NMOS transistor"
-+msgstr "�МОС транзи�тор"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "У�правно поравнат отпорник (европ�ки)"
-+msgid "PMOS transistor"
-+msgstr "ПМОС транзи�тор"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "У�правно поравната Ценер диода"
-+msgid "Horizontal jumper"
-+msgstr "Водоравна �појница"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "„ако није“ (обично затворен) прекидач"
-+msgid "Ladder"
-+msgstr "Ле�твице"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "„ако је“ (обично отворен) прекидач"
-+msgid "Components for LADDER circuits"
-+msgstr "Са�тојци за Л�ДДЕР кола"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "„подигни“ излазну промењиву"
-+msgid "'if' (normally open) ladder contact"
-+msgstr "„ако је“ (обично отворен) прекидач"
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "„поново поде�и“ излазну промењиву"
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "„ако није“ (обично затворен) прекидач"
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "„по�тави“ излазну промењиву"
-+msgid "Simple output variable"
-+msgstr "Једно�тавна излазна промењива"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Са�тојци за LADDER кола"
-+msgid "Negative output variable"
-+msgstr "�егативна излазна промењива"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Мердевине"
-+msgid "'set' output variable"
-+msgstr "„по�тави“ излазну промењиву"
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "�егативна излазна промењива"
-+msgid "'reset' output variable"
-+msgstr "„поново поде�и“ излазну промењиву"
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Излазна „ре�етуј“ променљива �а штедњом �трује"
-+msgid "'jump' output variable"
-+msgstr "„подигни“ излазну промењиву"
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Излазна „по�тави“ променљива �а штедњом �трује"
-+msgid "Receptivity output variable"
-+msgstr "Пријемна излазна променљива"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Излазна негативна променљива �а штедњом �трује"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Излазна једно�тавна променљива �а штедњом �трује"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Излазна негативна променљива �а штедњом �трује"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "Пријемна излазна променљива"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Излазна променљива „по�тави“ �а штедњом �трује"
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Једно�тавна излазна промењива"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Излазна променљива „ре�етуј“ �а штедњом �трује"
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr "Кон�тантни чинилац и�под -1"
-+msgid "Cybernetics"
-+msgstr "Кибернетика"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
--msgstr "Кон�тантни чинилац између 0 и -1"
-+msgid "Elements of cybernetic circuits"
-+msgstr "Делови кибернетичких кола"
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
--msgstr "Кон�тантни чинилац између 0 и 1"
-+msgid "Sensor - left"
-+msgstr "Сензор — леви"
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
--msgstr "Кон�тантни чинилац већи од 1"
-+msgid "Sensor - right"
-+msgstr "Сензор — де�ни"
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
--msgstr "Кон�тантни негативан померај дуж у�правне о�е"
-+msgid "Sensor - bottom"
-+msgstr "Сензор — доњи"
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
--msgstr "Кон�тантни позитиван померај дуж у�правне о�е"
-+msgid "Sensor - top"
-+msgstr "Сензор — горњи"
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
--msgstr "Кибернетика"
-+msgid "Sum, subtracting left input"
-+msgstr "Збир, одузимајући леви улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--msgid "Elements of cybernetic circuits"
--msgstr "Делови кибернетичких кола"
-+msgid "Sum, subtracting right input"
-+msgstr "Збир, одузимајући де�ни улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
--msgstr "Пунотала�ни и�прављач (ап�олутна вредно�т)"
-+msgid "Sum, subtracting bottom input"
-+msgstr "Збир, одузимајући доњи улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
--msgstr "Полутала�ни и�прављач или улазна рампа"
-+msgid "Sum, subtracting top input"
-+msgstr "Збир, одузимајући горњи улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
--msgstr "Ви�окопропу�ни појачавач"
-+msgid "Integrator - input left"
-+msgstr "Интегратор — леви улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
--msgstr "Интегратор — улаз у дну"
-+msgid "Integrator - input right"
-+msgstr "Интегратор — де�ни улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:13
--msgid "Integrator - input left"
--msgstr "Интегратор — улаз у лево"
-+msgid "Integrator - input bottom"
-+msgstr "Интегратор — доњи улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:14
--msgid "Integrator - input right"
--msgstr "Интегратор — улаз у де�но"
-+msgid "Integrator - input top"
-+msgstr "Интегратор — горњи улаз"
- 
- #: ../sheets/Cybernetics.sheet.in.h:15
--msgid "Integrator - input top"
--msgstr "Интегратор — улаз у врху"
-+msgid "Sum"
-+msgstr "Збир"
- 
- #: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
--msgstr "�и�копропу�ни појачавач"
--
--#: ../sheets/Cybernetics.sheet.in.h:17
- msgid "Product"
- msgstr "Производ"
- 
-+#: ../sheets/Cybernetics.sheet.in.h:17
-+msgid "High pass filter"
-+msgstr "Ви�окопропу�ни појачавач"
-+
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
--msgstr "Карактери�тика релеја (�игма)"
-+msgid "Low pass filter"
-+msgstr "�и�копропу�ни појачавач"
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
--msgstr "Карактери�тика за�ићења"
-+msgid "Sine characteristic or input"
-+msgstr "Сину�на одлика или улаз"
- 
-+# хмм... нешто овде не ваља :)
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
--msgstr "Сензор — у дну"
-+msgid "Sigmoid characteristic"
-+msgstr "Сигмоидна одлика"
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
--msgstr "Сензор — лево"
-+msgid "Saturation characteristic"
-+msgstr "Одлика за�ићења"
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
--msgstr "Сензор — де�но"
-+msgid "Relay characteristic (sigma)"
-+msgstr "Одлика релеја (�игма)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
--msgstr "Сензор — на врху"
-+msgid "Half wave rectifier or ramp input"
-+msgstr "Полутала�ни и�прављач или улазна рампа"
- 
--# хмм... нешто овде не ваља :)
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
--msgstr "Сигмоидна карактери�тика"
-+msgid "Full wave rectifier (absolute value)"
-+msgstr "Пунотала�ни и�прављач (ап�олутна вредно�т)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
--msgstr "Сину�на карактери�тика или улаз"
-+msgid "Constant positive shift on the y-axis"
-+msgstr "Стални позитиван померај дуж у�правне о�е"
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--msgid "Sum"
--msgstr "Збир"
-+msgid "Constant negative shift on the y-axis"
-+msgstr "Стални негативан померај дуж у�правне о�е"
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
--msgstr "Збир, одузима доњи улаз"
-+msgid "Constant factor greater 1"
-+msgstr "Стални чинилац већи од 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
--msgstr "Збир, одузима леви улаз"
-+msgid "Constant factor between 0 and 1"
-+msgstr "Стални чинилац између 0 и 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
--msgstr "Збир, одузима де�ни улаз"
-+msgid "Constant factor between 0 and -1"
-+msgstr "Стални чинилац између 0 и -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
--msgstr "Збир, одузима горњи улаз"
-+msgid "Constant factor below -1"
-+msgstr "Стални чинилац и�под -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
- msgid "Template for custom characteristics"
--msgstr "Шаблон за произвољне карактери�тике"
-+msgstr "Шаблон за произвољне одлике"
- 
- #: ../sheets/Cybernetics.sheet.in.h:32
- msgid "Time delay"
--msgstr "Кашњење"
-+msgstr "Времен�ки за�тој"
- 
--#: ../sheets/ER.sheet.in.h:2
-+#: ../sheets/Database.sheet.in.h:1
-+msgid "Database"
-+msgstr "База података"
-+
-+#: ../sheets/Database.sheet.in.h:2
-+msgid "Editor for Database Table Relation Diagrams"
-+msgstr "Уређивач за дијаграме одно�а табеле базе података"
-+
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr "Сложеник атрибута"
-+
-+#: ../sheets/ER.sheet.in.h:1
- msgid "ER"
--msgstr "ER"
-+msgstr "ЕР"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
--msgstr "Уређивач за дијаграме одно�а ентитета (ER)"
-+msgstr "Уређивач за дијаграме одно�а ентитета"
- 
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Суделовање"
--
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr "Слаб ентитет"
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Уче�твовање"
-+
- #: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Енергетика"
-+
-+#: ../sheets/Electric.sheet.in.h:2
- msgid "Components for electric circuits"
- msgstr "Делови електричних кола"
- 
--#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "Чвор"
--
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Електрични"
-+msgid "Normally open contact (horizontal)"
-+msgstr "Уобичајено отворена веза (водоравно)"
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
--msgstr "Сијалица или �ветло�ни индикатор (водоровано)"
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Уобичајено �појена веза (водоравно)"
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
--msgstr "Сијалица или �ветло�ни индикатор (у�правно)"
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Уобичајено отворен прекидач (водоравно)"
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
--msgstr "Уобичајено кратко-�појена веза (водоравно)"
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Уобичајено укључен прекидач (водоравно)"
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
--msgstr "Уобичајено кратко-�појена веза (у�правно)"
-+msgid "Normally open contact (vertical)"
-+msgstr "Уобичајено отворена веза (у�правно)"
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
--msgstr "Уобичајено укључен прекидач (водоравно)"
-+msgid "Normally closed contact (vertical)"
-+msgstr "Уобичајено �појена веза (у�правно)"
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
--msgstr "Уобичајено укључен прекидач (у�правно)"
-+msgid "Normally open position switch (vertical)"
-+msgstr "Уобичајено отворен прекидач (у�правно)"
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
--msgstr "Уобичајено отворена веза (водоравно)"
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Уобичајено укључен прекидач (у�правно)"
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
--msgstr "Уобичајено отворена веза (у�правно)"
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "Управљачка јединица једног релеја (водоравно)"
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
--msgstr "Уобичајено отворен прекидач (водоравно)"
-+msgid "Relay (horizontal)"
-+msgstr "Релеј (водоравно)"
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
--msgstr "Уобичајено отворен прекидач (у�правно)"
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Сијалица или �ветло�ни индикатор (водоровано)"
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
--msgstr "Релеј (водоравно)"
-+msgid "The command organ of a relay (vertical)"
-+msgstr "Управљачка јединица једног релеја (у�правно)"
- 
- #: ../sheets/Electric.sheet.in.h:15
- msgid "Relay (vertical)"
- msgstr "Релеј (у�правно)"
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
--msgstr "Управљачка јединица једног релеја (водоравно)"
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Сијалица или �ветло�ни индикатор (у�правно)"
- 
--#: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr "Управљачка јединица једног релеја (у�правно)"
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "Чвор"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Уређивач за дијаграме �труктуре функција."
-+msgid "FS"
-+msgstr "ФС"
- 
- #: ../sheets/FS.sheet.in.h:2
--msgid "FS"
--msgstr "FS"
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Уређивач за дијаграме �труктуре функција."
- 
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr "Ток"
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Функција"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr "Ток управне изломљене линије"
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Функција"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Уреди"
-+msgid "Objects to draw flowcharts"
-+msgstr "Објекти за цртање дијаграма тока"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "Повезивач"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Допун�ка/проце�на операција"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--#, fuzzy
--msgid "Data source"
--msgstr "Подаци о бојама"
-+msgid "Input/Output"
-+msgstr "Улаз/излаз"
- 
--#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Одлука"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Кашњење"
-+msgid "Connector"
-+msgstr "Повезивач"
- 
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Документ"
-+msgid "Transaction file"
-+msgstr "Датотека прено�а"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:10
--msgid "Flowchart"
--msgstr "Дијаграм тока"
-+msgid "Off page connector"
-+msgstr "Повезивач без �тране"
- 
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Улаз/излаз"
-+msgid "Document"
-+msgstr "Документ"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Унутрашњи �мештај"
-+msgid "Manual operation"
-+msgstr "Ручна операција"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Магнетни ди�к"
-+msgid "Preparation"
-+msgstr "Припрема"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Магнетни добош"
-+msgid "Manual input"
-+msgstr "Ручни уно�"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Магнетна трака"
-+msgid "Predefined process"
-+msgstr "Предодређени проце�"
- 
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Ручни уно�"
-+msgid "Terminal Interrupt"
-+msgstr "Прекид терминала"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Ручна операција"
-+msgid "Magnetic disk"
-+msgstr "Магнетни ди�к"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "Споји"
-+msgid "Magnetic drum"
-+msgstr "Магнетни добош"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Објекти за цртање дијаграма тока"
-+msgid "Magnetic tape"
-+msgstr "Магнетна трака"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Повезивач без �тране"
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Унутрашњи �мештај"
- 
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "И�кључени �мештај"
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Споји"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Или"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Предодређени проце�"
-+msgid "Delay"
-+msgstr "Кашњење"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Припрема"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Допун�ка/проце�на операција"
-+msgid "Summing junction"
-+msgstr "Збирна тачка"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Бушена картица"
-+msgid "Collate"
-+msgstr "Слагач"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Бушена трака"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Уреди"
- 
--#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Или"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Бушена картица"
-+
- #: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Збирна тачка"
-+msgid "Punched tape"
-+msgstr "Бушена трака"
- 
- #: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "Прекид терминала"
-+msgid "Transmittal tape"
-+msgstr "Трака за прено�"
- 
- #: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Датотека �а тран�акцијама"
-+msgid "Offline storage"
-+msgstr "И�кључени �мештај"
- 
- #: ../sheets/Flowchart.sheet.in.h:34
--msgid "Transmittal tape"
--msgstr "Трака за прено�"
-+msgid "Data source"
-+msgstr "Извор података"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
--msgid "Alternate external entity"
--msgstr ""
-+#: ../sheets/GRAFCET.sheet.in.h:1
-+msgid "GRAFCET"
-+msgstr "ГР�ФЦЕТ"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:2
--#, fuzzy
--msgid "Data store"
--msgstr "Подаци о бојама"
-+#: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Објекти за израду ГР�ФЦЕТ графикона"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:3
--#, fuzzy
--msgid "External entity"
--msgstr "Слаб ентитет"
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Корак позива макро подпрограма"
- 
--#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
--#: ../sheets/Gane_and_Sarson.sheet.in.h:5
--msgid "Gane and Sarson"
--msgstr ""
-+#: ../sheets/GRAFCET.sheet.in.h:9
-+msgid "Action to associate to a step"
-+msgstr "Радња за додељивање кораку"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:6
--msgid "Gane and Sarson DFD"
--msgstr ""
-+#: ../sheets/GRAFCET.sheet.in.h:10
-+msgid "Condition (of an action)"
-+msgstr "У�лов (за радњу)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr "И ивица"
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "Прелаз"
- 
--#: ../sheets/GRAFCET.sheet.in.h:2
--msgid "Action to associate to a step"
--msgstr "�кција коју доделити кораку"
-+#: ../sheets/GRAFCET.sheet.in.h:12
-+msgid "OR vergent"
-+msgstr "ИЛИ теме"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "И теме"
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
-+#: ../sheets/GRAFCET.sheet.in.h:14
- msgid "Arc (upward)"
- msgstr "Лук (нагоре)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:4
--msgid "Condition (of an action)"
--msgstr "У�лов (за акцију)"
--
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr "Корак позива макро подпрограма"
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+msgid "Gane and Sarson"
-+msgstr "Гејн и Сар�он"
- 
--#: ../sheets/GRAFCET.sheet.in.h:11
--msgid "OR vergent"
--msgstr "ИЛИ ивица"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+msgid "Gane and Sarson DFD"
-+msgstr "Гејн и Сар�он ДФД"
- 
--#: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Објекти за израду GRAFCET графикона"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
-+msgid "Alternate external entity"
-+msgstr "Мењање �пољног ентитета"
- 
--#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
--msgid "Transition"
--msgstr "Прелаз"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-+msgid "Data store"
-+msgstr "Складиште података"
- 
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
--msgstr "Блок 1, 2:4"
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+msgid "External entity"
-+msgstr "Спољни ентитет"
- 
-+#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
--msgstr "Блок 2, 2:8"
--
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
--msgstr "Блок 3, 4:4"
-+msgid "Map, Isometric"
-+msgstr "Мапа, изометриј�ка"
- 
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
--msgstr "Блок 4, 4:8"
-+msgid "Isometric Directional Map Shapes"
-+msgstr "Изометриј�ки облици за у�мерене мапе"
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
--msgstr "Блок 5, 3:3"
-+msgid "Road Section"
-+msgstr "Деоница пута"
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
--msgstr "Блок 6, 4:6"
-+msgid "Long Straight Road Section"
-+msgstr "Одељак дугог правог пута"
- 
- #: ../sheets/IsometricMap.sheet.in.h:7
--msgid "Block 7"
--msgstr "Блок 7"
-+msgid "Crossroads"
-+msgstr "Ра�кр�ница"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
--msgstr "�уто 1, поглед �преда"
-+msgid "T-Junction"
-+msgstr "Т-ра�кр�ница"
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
--msgstr "�уто 1, поглед отпозади"
-+msgid "Elevated Road"
-+msgstr "�адвожњак"
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
- msgid "Corner 1"
-@@ -6898,1216 +7972,1478 @@ msgid "Corner 2"
- msgstr "Ћошак 2"
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--msgid "Crossroads"
--msgstr "Ра�кр�ница"
-+msgid "River"
-+msgstr "Река"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
--msgstr "�адвожњак"
-+msgid "Roof1"
-+msgstr "Кров 1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--msgid "Factory"
--msgstr "Фабрика"
-+msgid "Block 1, 2:4"
-+msgstr "Блок 1, 2:4"
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
--msgstr "Мо�т за пешаке"
-+msgid "Block 2, 2:8"
-+msgstr "Блок 2, 2:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
-+msgstr "Блок 3, 4:4"
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
--msgstr "Изометриј�ки облици за у�мерене мапе"
-+msgid "Block 4, 4:8"
-+msgstr "Блок 4, 4:8"
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
--msgstr "Одељак дугог правог пута"
-+msgid "Block 5, 3:3"
-+msgstr "Блок 5, 3:3"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
-+msgstr "Блок 6, 4:6"
- 
--#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
--msgstr "Мапа, изометриј�ка"
-+msgid "Block 7"
-+msgstr "Блок 7"
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
--msgstr "Знак за једно�мерну улицу"
-+msgid "Factory"
-+msgstr "Фабрика"
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--msgid "River"
--msgstr "Река"
-+msgid "Car 1, Front View"
-+msgstr "�уто 1, поглед �преда"
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--msgid "Road Section"
--msgstr "Деоница пута"
-+msgid "Car 2, Rear View"
-+msgstr "�уто 2, поглед отпозади"
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--msgid "Roof1"
--msgstr "Кров1"
-+msgid "Train 1, angled downward"
-+msgstr "Воз 1, угао надоле"
- 
- #: ../sheets/IsometricMap.sheet.in.h:25
--msgid "T-Junction"
--msgstr "Т-ра�кр�ница"
-+msgid "Train 2, angled upward"
-+msgstr "Воз 2, угао нагоре"
- 
- #: ../sheets/IsometricMap.sheet.in.h:26
--msgid "Train 1, angled downward"
--msgstr "Воз 1, угао надоле"
-+msgid "Tree 1"
-+msgstr "Дрво 1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:27
--msgid "Train 2, angled upward"
--msgstr "Воз 1, угао нагоре"
-+msgid "Footbridge, Pedestrian Bridge"
-+msgstr "Мо�т за пешаке"
- 
- #: ../sheets/IsometricMap.sheet.in.h:28
--msgid "Tree 1"
--msgstr "Дрво 1"
-+msgid "One Way Road Sign"
-+msgstr "Знак за једно�мерну улицу"
- 
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
--msgstr ""
-+msgid "RE-i*"
-+msgstr "РЕ-i*"
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr ""
-+msgid "Objects to design i* diagrams"
-+msgstr "Објекти за цртање i* дијаграма"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
--msgstr ""
-+msgid "An i* softgoal"
-+msgstr "i* меки циљ"
- 
- #: ../sheets/Istar.sheet.in.h:4
- msgid "An i* goal"
--msgstr ""
-+msgstr "i* циљ"
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
--msgstr ""
-+msgid "An i* resource"
-+msgstr "i* извор"
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
--msgstr ""
-+msgid "An i* task"
-+msgstr "i* задатак"
- 
- #: ../sheets/Istar.sheet.in.h:7
--#, fuzzy
--msgid "An i* position"
--msgstr "Слагање"
-+msgid "An i* unspecified actor"
-+msgstr "i* неодређени чинилац"
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
--msgstr ""
-+msgid "An i* agent"
-+msgstr "i* агент"
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
--msgstr ""
-+msgid "An i* position"
-+msgstr "i* положај"
- 
- #: ../sheets/Istar.sheet.in.h:10
- msgid "An i* role"
--msgstr ""
-+msgstr "i* улога"
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
--msgstr ""
-+msgid "An i* unspecified link"
-+msgstr "i* неодређена веза"
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
--msgstr ""
-+msgid "An i* positive contribution"
-+msgstr "i* позитиван доприно�"
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
--msgstr ""
-+msgid "An i* negative contribution"
-+msgstr "i* негатван доприно�"
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
--msgstr ""
-+msgid "An i* dependency link"
-+msgstr "i* веза зави�но�ти"
- 
- #: ../sheets/Istar.sheet.in.h:15
--#, fuzzy
--msgid "Objects to design i* diagrams"
--msgstr "Објекти за израду SADT дијаграма"
-+msgid "An i* decomposition link"
-+msgstr "i* веза ра�тављања"
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
--msgstr ""
-+msgid "An i* means-ends link"
-+msgstr "i* веза �ред�тава-завршетака"
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
--msgstr "Један �ек�онов циљни домен"
-+msgid "RE-Jackson"
-+msgstr "�ек�онови дијаграми"
- 
- #: ../sheets/Jackson.sheet.in.h:2
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Објекти за израду �ек�онових дијаграма"
-+
-+#: ../sheets/Jackson.sheet.in.h:3
- msgid "A Jackson given domain"
- msgstr "�ек�онов дати домен"
- 
--#: ../sheets/Jackson.sheet.in.h:3
--msgid "A Jackson machine domain"
--msgstr "�ек�онов машин�ки домен"
--
- #: ../sheets/Jackson.sheet.in.h:4
--msgid "A Jackson requirement"
--msgstr "�ек�онов потребан у�лов"
-+msgid "A Jackson designed domain"
-+msgstr "�ек�онов циљни домен"
- 
- #: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
--msgstr ""
-+msgid "A Jackson machine domain"
-+msgstr "�ек�онов машин�ки домен"
- 
- #: ../sheets/Jackson.sheet.in.h:6
--msgid "A Jackson shared phenomenon"
--msgstr ""
-+msgid "A Jackson requirement"
-+msgstr "�ек�онов потребан у�лов"
- 
- #: ../sheets/Jackson.sheet.in.h:7
--msgid "Objects to design Jackson diagrams"
--msgstr "Објекти за израду �ек�онових дијаграма"
-+msgid "A Jackson shared phenomenon"
-+msgstr "�ек�онов дељени феномен"
- 
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
--msgstr "�ек�онови дијаграми"
-+msgid "A Jackson requirement phenomenon"
-+msgstr "�ек�онов потребан феномен"
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
--msgstr ""
-+msgid "RE-KAOS"
-+msgstr "РЕ-К�ОС"
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr ""
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Објекти за израду KAOS дијаграма"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--#, fuzzy
--msgid "A KAOS agent"
--msgstr "Додај Сегмент"
-+msgid "A KAOS softgoal"
-+msgstr "KAOS меки циљ"
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
--msgstr ""
-+msgid "A KAOS goal"
-+msgstr "KAOS циљ"
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
--msgstr ""
-+msgid "A KAOS requirement"
-+msgstr "К�ОС потраживање"
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
--msgstr ""
-+msgid "A KAOS assumption"
-+msgstr "К�ОС претпо�тавка"
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
--msgstr ""
-+msgid "A KAOS obstacle"
-+msgstr "К�ОС препрека"
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
--msgstr ""
-+msgid "A KAOS AND refinement"
-+msgstr "К�ОС И пречишћавање"
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
--msgstr ""
-+msgid "A KAOS complete AND refinement"
-+msgstr "К�ОС потпуно И пречишћавање"
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
--msgstr ""
-+msgid "A KAOS OR refinement"
-+msgstr "К�ОС ИЛИ пречишћавање"
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
--msgstr ""
-+msgid "A KAOS complete OR refinement"
-+msgstr "К�ОС потпуно ИЛИ пречишћавање"
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
--msgstr ""
-+msgid "A KAOS operationalization"
-+msgstr "К�ОС операционализација"
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
--msgstr ""
-+msgid "A KAOS contribution"
-+msgstr "К�ОС доприно�"
- 
- #: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
--msgstr ""
-+msgid "A KAOS obstruction"
-+msgstr "К�ОС загушење"
- 
- #: ../sheets/KAOS.sheet.in.h:15
--msgid "A KAOS obstruction"
--msgstr ""
-+msgid "A KAOS binary conflict"
-+msgstr "К�ОС �укоб извршних"
- 
--#  Operations page:
- #: ../sheets/KAOS.sheet.in.h:16
--#, fuzzy
--msgid "A KAOS operation"
--msgstr "Операције"
-+msgid "A KAOS agent"
-+msgstr "К�ОС агент"
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
--msgstr ""
-+msgid "A KAOS responsibility"
-+msgstr "К�ОС одговорно�т"
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
--msgstr ""
-+msgid "A KAOS monitor link"
-+msgstr "К�ОС веза надгледања"
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
--msgstr ""
-+msgid "A KAOS control link"
-+msgstr "К�ОС веза управљања"
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
--msgstr ""
-+msgid "A KAOS capable-of"
-+msgstr "К�ОС �по�обно�т"
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
--msgstr ""
-+msgid "A KAOS performs"
-+msgstr "К�ОС извршавања"
- 
-+#  Operations page:
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
--msgstr ""
-+msgid "A KAOS operation"
-+msgstr "К�ОС операција"
- 
- #: ../sheets/KAOS.sheet.in.h:23
--msgid "Objects to design KAOS diagrams"
--msgstr "Објекти за израду KAOS дијаграма"
-+msgid "A KAOS input"
-+msgstr "К�ОС улаз"
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
--msgstr ""
-+msgid "A KAOS output"
-+msgstr "К�ОС излаз"
-+
-+#: ../sheets/Lights.sheet.in.h:1
-+msgid "Lights"
-+msgstr "Светла"
-+
-+#: ../sheets/Lights.sheet.in.h:2
-+msgid "Objects to design simple lighting plots"
-+msgstr "Објекти за цртање једно�тавних планова о�ветљења"
-+
-+#: ../sheets/Lights.sheet.in.h:3
-+msgid "PAR"
-+msgstr "П�Р"
-+
-+#: ../sheets/Lights.sheet.in.h:4
-+msgid "PAR on the floor"
-+msgstr "П�Р на поду"
-+
-+#: ../sheets/Lights.sheet.in.h:5
-+msgid "ACL"
-+msgstr "�ЦЛ"
-+
-+#: ../sheets/Lights.sheet.in.h:6
-+msgid "Pebble Convex lantern"
-+msgstr "И�пупчена лампа �а облуцима"
-+
-+#: ../sheets/Lights.sheet.in.h:7
-+msgid "Fresel lantern"
-+msgstr "Фрезел лампа"
-+
-+#: ../sheets/Lights.sheet.in.h:8
-+msgid "Striplight"
-+msgstr "Пруга�то �ветло"
-+
-+#: ../sheets/Lights.sheet.in.h:9
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr "Елип�оидни рефлектор �ветла претраге"
-+
-+#: ../sheets/Lights.sheet.in.h:10
-+msgid "Blinders"
-+msgstr "�аочњаци"
-+
-+#: ../sheets/Lights.sheet.in.h:11
-+msgid "Black light"
-+msgstr "Црно �ветло"
-+
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr "Стробо�коп�ко �ветло"
-+
-+#: ../sheets/Lights.sheet.in.h:13
-+msgid "Moving head"
-+msgstr "Покретна глава"
-+
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Скенер"
-+
-+#  Translators: Menu item Verb/Support/Secure
-+#: ../sheets/Lights.sheet.in.h:15
-+msgid "Structure"
-+msgstr "Структура"
- 
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "И коло"
-+msgid "Logic"
-+msgstr "Логичка кола"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Булова логика"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr "Укр�ни повезивач"
-+msgid "OR gate"
-+msgstr "ИЛИ коло"
- 
- #: ../sheets/Logic.sheet.in.h:4
--msgid "Inverter"
--msgstr "Инвертор"
-+msgid "AND gate"
-+msgstr "И коло"
- 
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Логичка кола"
-+msgid "XOR gate"
-+msgstr "ИЛИ-ИЛИ коло"
- 
- #: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Једно�тавни бафер"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Инвертор"
-+
-+#: ../sheets/Logic.sheet.in.h:8
- msgid "NAND gate"
- msgstr "�И коло"
- 
--#: ../sheets/Logic.sheet.in.h:7
-+#: ../sheets/Logic.sheet.in.h:9
- msgid "NOR gate"
- msgstr "�ИЛИ коло"
- 
--#: ../sheets/Logic.sheet.in.h:8
-+#: ../sheets/Logic.sheet.in.h:10
- msgid "NOT"
- msgstr "�Е"
- 
--#: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "ИЛИ коло"
--
--#: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Једно�тавни бафер"
--
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "ИЛИ-ИЛИ коло"
-+msgid "Crossconnector"
-+msgstr "Унакр�ни �пајач"
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Демултиплек�ер"
-+msgid "MSE"
-+msgstr "МСЕ"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Велики продужни чвор"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "Делови опреме мобилних претплатника америчке вој�ке"
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr "Средиште чвора"
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "мултиплек�ер"
-+msgid "Large extension node"
-+msgstr "Велики продужни чвор"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr "Средиште чвора"
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Мали продужни чвор"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Земаљ�ка �ателит�ка �таница"
- 
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Мултиплек�ер"
-+
- #: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr "Делови опреме за мобилне претплатнике америчке вој�ке"
-+msgid "Demultiplexer"
-+msgstr "Демултиплек�ер"
- 
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Фа�цикла"
-+#: ../sheets/Misc.sheet.in.h:1
-+msgid "Misc"
-+msgstr "Разно"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Разни облици"
- 
--#: ../sheets/Misc.sheet.in.h:5
--msgid "New-style group object, for testing"
--msgstr ""
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Дрво"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Фа�цикла"
- 
- #: ../sheets/Misc.sheet.in.h:6
-+msgid "expensible node"
-+msgstr "продужив чвор"
-+
-+#: ../sheets/Misc.sheet.in.h:7
-+msgid "expended node"
-+msgstr "продужени чвор"
-+
-+#: ../sheets/Misc.sheet.in.h:8
- msgid "Traditional clock"
- msgstr "Обичан ча�овник"
- 
-+#: ../sheets/Misc.sheet.in.h:9
-+msgid "Measure distance"
-+msgstr "Ра�тојање мерења"
-+
-+#: ../sheets/Misc.sheet.in.h:10
-+msgid "Resizable grid"
-+msgstr "Мрежа променљиве величине"
-+
-+#: ../sheets/Misc.sheet.in.h:11
-+msgid "New-style group object, for testing"
-+msgstr "Група објекта новог �тила, за и�пробавање"
-+
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "2/2 ра�подељивач"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Пнеуматика/хидраулика"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "3/2 ра�подељивач"
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Делови за пнеумат�ка и хидраулична кола"
- 
- #: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "4/2 ра�подељивач"
-+msgid "Double-effect jack"
-+msgstr "Утичница дво�труког утицаја"
- 
- #: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "5/2 ра�подељивач"
-+msgid "Normally-in simple-effect jack"
-+msgstr "Обично-укључено гнездо једно�тавног-утицаја"
- 
- #: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Отвор за издувавање ваздуха"
-+msgid "Normally-out simple-effect jack"
-+msgstr "Обично-и�кључено гнездо једно�тавног-утицаја"
- 
- #: ../sheets/Pneumatic.sheet.in.h:6
--msgid "Components for pneumatic and hydraulic circuits"
--msgstr "Делови за пнеумат�ка и хидраулична кола"
-+msgid "Generic pressure source"
-+msgstr "Општи извор прити�ка"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Хидраулички извор прити�ка"
- 
- #: ../sheets/Pneumatic.sheet.in.h:8
--msgid "Double-effect jack"
--msgstr "Утичница �а дво�труким утицајем"
-+msgid "Pneumatic pressure source"
-+msgstr "Пнеумат�ки извор прити�ка"
- 
- #: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Електрични и�прављач (дво�труки калем)"
-+msgid "Air exhaust orifice"
-+msgstr "Отвор за издувавање ваздуха"
- 
- #: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Електрични и�прављач (један калем)"
-+msgid "2/2 distributor"
-+msgstr "2/2 ра�подељивач"
- 
- #: ../sheets/Pneumatic.sheet.in.h:11
--msgid "Generic pressure source"
--msgstr "Створени извор прити�ка"
-+msgid "3/2 distributor"
-+msgstr "3/2 ра�подељивач"
- 
- #: ../sheets/Pneumatic.sheet.in.h:12
--msgid "Hydraulic pressure source"
--msgstr "Извор хидрауличког прити�ка"
-+msgid "4/2 distributor"
-+msgstr "4/2 ра�подељивач"
- 
- #: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "�епо�редна наредба од хидрауличког покретача"
-+msgid "5/2 distributor"
-+msgstr "5/2 ра�подељивач"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "�епо�редна наредба од пнеумат�ког покретача"
-+msgid "Muscular command"
-+msgstr "Мишићна наредба"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Механичка наредба помоћу опруге"
-+msgid "Push-button command"
-+msgstr "�аредба прити�ка дугмета"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
--msgstr "Механичка наредба помоћу подизача"
-+msgstr "Механичка наредба подизачем"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Мишићна наредба"
-+msgid "Mechanical command by spring"
-+msgstr "Механичка наредба опругом"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Обично-укључено гнездо једно�тавног-утицаја"
-+msgid "Electric command (single coil)"
-+msgstr "Електрични и�прављач (један калем)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Обично-и�кључено гнездо једно�тавног-утицаја"
-+msgid "Electric command (double coil)"
-+msgstr "Електрични и�прављач (дво�труки калем)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Пнеумат�ки извор прити�ка"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "�епо�редна наредба хидрауличким покретачем"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Пнеумат�ки/хидраулички"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Прити�ни--дугме команда"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "�епо�редна наредба пнеумат�ким покретачем"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Кућица за активно�т/подаци"
-+msgid "SADT/IDEF0"
-+msgstr "С�ДТ/ИДЕФ0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Стрелица тока за активно�т/подаци"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Објекти за израду С�ДТ дијаграма"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Ознака тока"
-+msgid "Activity/data flow arrow"
-+msgstr "Стрелица тока активно�ти/података"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Објекти за израду SADT дијаграма"
-+msgid "Activity/data box"
-+msgstr "Кућица активно�ти/података"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT/IDEF0"
-+msgid "Flow label"
-+msgstr "�атпи� тока"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Радња извршена"
-+msgid "SDL"
-+msgstr "СДЛ"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Језик за одређивање и опи� (SDL)."
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
--msgstr "Референца блоков�ког типа"
-+msgstr "Референца вр�те блока"
-+
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Референца вр�те у�луге"
- 
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Позив функције"
-+msgid "Process type reference"
-+msgstr "Референца вр�те проце�а"
- 
--#: ../sheets/SDL.sheet.in.h:6
--msgid "Function header"
--msgstr "Заглавље функције"
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Стање"
- 
- #: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "Обична тек�туална белешка"
-+msgid "Function header"
-+msgstr "Заглавље функције"
- 
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "Улаз/излаз прикључница"
-+msgid "Send message"
-+msgstr "Пошаљи поруку"
- 
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Повратак процедуре"
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Примљена порука"
- 
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Референца проце�ног типа"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Позив функције"
- 
- #: ../sheets/SDL.sheet.in.h:12
--msgid "Receive message"
--msgstr "Примљена порука"
-+msgid "Action being executed"
-+msgstr "Радња је извршена"
- 
- #: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
--
--#: ../sheets/SDL.sheet.in.h:14
- msgid "Save state"
--msgstr "Сними текуће �тање"
-+msgstr "Сачувај �тање"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Пошаљи поруку"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Референца у�лужног типа"
-+msgid "In/Out connector"
-+msgstr "Улазни/излазни прикључак"
- 
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "Језик за �пецификацију и опи� (SDL)."
-+msgid "Procedure return"
-+msgstr "Повратак по�тупка"
- 
--#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "Стање"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Обична тек�туална белешка"
- 
--#: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Радња"
-+#: ../sheets/SISSI.sheet.in.h:1
-+msgid "Objects to design sissi diagrams"
-+msgstr "Објекти за израду �и��и дијаграма"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "�грегација, једна кла�а чини део друге"
-+#: ../sheets/SISSI.sheet.in.h:2
-+msgid "Workstation"
-+msgstr "Радна �таница"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "��оцијација, две кла�е �у у вези"
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Одно�на база података"
- 
--#: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr "Икона �тереотипа кла�а"
-+#  Translators: Menu item Verb/Channel/Guide/Guide/Steer
-+#: ../sheets/SISSI.sheet.in.h:4
-+msgid "Server"
-+msgstr "Сервер"
- 
--#: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr "Део"
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Прено�ни рачунар"
- 
--#: ../sheets/UML.sheet.in.h:9
--msgid "Constraint, place a constraint on something"
--msgstr "Ограничење, по�тавите ограничење на нешто"
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "ПД�"
- 
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "Уређивач UML �татичких �труктурних дијаграма"
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Смештајни низ"
- 
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Ра�тави/�једини"
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "У�меривач"
- 
--#: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Уопштавање, на�леђивање кла�а"
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Мрежни облак"
- 
--#: ../sheets/UML.sheet.in.h:17
--msgid "Implements, class implements a specific interface"
--msgstr "Изводи, кла�а изводи нарочиту �прегу"
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Телефон"
- 
--#: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr "Почетно/крајње �тање"
-+#: ../sheets/SISSI.sheet.in.h:11
-+msgid "Cell phone"
-+msgstr "Мобилни телефон"
- 
--#: ../sheets/UML.sheet.in.h:19
--msgid "Large package"
--msgstr "Велики пакет"
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Разводник"
- 
--#: ../sheets/UML.sheet.in.h:20
--msgid "Lifeline"
--msgstr "Животна линија"
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Модем"
- 
--#: ../sheets/UML.sheet.in.h:21
--msgid "Message"
--msgstr "Порука"
-+#: ../sheets/SISSI.sheet.in.h:14
-+msgid "Cipher machine"
-+msgstr "Шифрер�ки апарат"
- 
--#: ../sheets/UML.sheet.in.h:22
--msgid "Node"
--msgstr "Чвор"
-+#: ../sheets/SISSI.sheet.in.h:15
-+msgid "Magnetic storage"
-+msgstr "Магнетно �кладиштење"
- 
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "�апомена"
-+#: ../sheets/SISSI.sheet.in.h:16
-+msgid "Paper storage"
-+msgstr "Папирни �мештај"
- 
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Објекат"
-+#: ../sheets/SISSI.sheet.in.h:17
-+msgid "Person"
-+msgstr "О�оба"
- 
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "О�тварује, обезбеђује нарочиту �прегу"
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
-+msgid "File cabinet"
-+msgstr "Орман за документа"
- 
--#: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Мали пакет"
-+#: ../sheets/SISSI.sheet.in.h:19
-+msgid "Safe"
-+msgstr "Безбедно�т"
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
-+msgstr "Резерва"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr "Кори�ти мала и велика �лова"
-+#: ../sheets/SISSI.sheet.in.h:22
-+msgid "Log analysis"
-+msgstr "�нализа дневника"
- 
--#: ../sheets/chronogram.sheet.in.h:1
--msgid "Chronogram"
--msgstr "Хронограм"
-+#: ../sheets/SISSI.sheet.in.h:23
-+msgid "Information system"
-+msgstr "Информациони �и�тем"
- 
--#: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr "Линије �а подацима"
-+#: ../sheets/SISSI.sheet.in.h:24
-+msgid "Information"
-+msgstr "Информације"
- 
--#: ../sheets/chronogram.sheet.in.h:3
--msgid "Objects to design chronogram charts"
--msgstr "Објекти за израду хронограм�ких графикона"
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Соба"
- 
--#: ../sheets/chronogram.sheet.in.h:4
--msgid "Time scale"
--msgstr "Времен�ка размера"
-+#: ../sheets/SISSI.sheet.in.h:26
-+msgid "Faraday cage"
-+msgstr "Фарадејев кавез"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--#, fuzzy
--msgid "BBS"
--msgstr "BBSM"
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "Безбедоно�на обла�т"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
--msgid "Cisco - Computer"
--msgstr "Cisco — рачунар"
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr "Географ�ко налазиште"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "Cisco CA"
-+#: ../sheets/SISSI.sheet.in.h:29
-+msgid "Gate"
-+msgstr "Пролаз"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "CiscoSecurity"
-+#: ../sheets/SISSI.sheet.in.h:30
-+msgid "Video camera"
-+msgstr "Видео камера"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr "CiscoWorks радна �таница"
-+#: ../sheets/SISSI.sheet.in.h:31
-+msgid "Glass-break sensor"
-+msgstr "О�етник ломљења �такла"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Облици рачунара из Cisco-а"
-+#: ../sheets/SISSI.sheet.in.h:32
-+msgid "Sensor beam"
-+msgstr "Светло�ни �ноп �ензора"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr "Ди�к под�и�тем"
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Кондензатор"
- 
--#  Translators: Menu item Verb/Branch/Distribute
--#: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Ди�кета"
-+#  Translators: Menu item Verb/Channel/Import/Form Entrance
-+#  Translators: Menu item Verb/Channel/Import/Form Entrance
-+#: ../sheets/SISSI.sheet.in.h:34
-+msgid "Power transducer"
-+msgstr "Претварач �наге"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:9
--#, fuzzy
--msgid "EtherClient"
--msgstr "Етернет маги�трала"
-+#: ../sheets/SISSI.sheet.in.h:35
-+msgid "Current transducer"
-+msgstr "Струјни претварач"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:10
--msgid "FC Storage"
--msgstr "FC �мештај"
-+#: ../sheets/SISSI.sheet.in.h:36
-+msgid "Enthalpy transducer"
-+msgstr "Енталпни претварач"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Сервер за дељење датотека"
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Откривач дима"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:12
--#, fuzzy
--msgid "Front End Processor"
--msgstr "Проце�ор за улаз"
-+#: ../sheets/SISSI.sheet.in.h:38
-+msgid "Moisture sensor"
-+msgstr "Откривач влаге"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP мини"
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Откривач �ветла"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
--msgstr "Ручни рачунар"
-+#: ../sheets/SISSI.sheet.in.h:40
-+msgid "Movement detector"
-+msgstr "Откривач покрета"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Домаћин"
-+#: ../sheets/SISSI.sheet.in.h:41
-+msgid "Video movement detector"
-+msgstr "Видео откривач покрета"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "ИБМ мини (AS400)"
-+#: ../sheets/SISSI.sheet.in.h:42
-+msgid "Level detector"
-+msgstr "Откривач нивоа"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "ИБМ tower"
-+#: ../sheets/SISSI.sheet.in.h:43
-+msgid "Pressure transducer"
-+msgstr "Претварач прити�ка"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "ИБМ мејнфрејм"
-+#: ../sheets/SISSI.sheet.in.h:44
-+msgid "Air quality detector"
-+msgstr "Откривач квалитета ваздуха"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:19
--#, fuzzy
--msgid "IBM mainframe with FEP"
--msgstr "ИБМ мејнфрејм"
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Откривач напона"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:46
-+msgid "Vehicle detector"
-+msgstr "Откривач возила"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Прено�ни рачунар"
-+#  Translators: Menu item Noun/Energy/Mechanical/Vibration
-+#: ../sheets/SISSI.sheet.in.h:47
-+msgid "Vibration sensor"
-+msgstr "О�етник вибрација"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Мекинтош"
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Дигитална шифра"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "МикроВеб�ервер"
-+#: ../sheets/SISSI.sheet.in.h:49
-+msgid "Moisture extractor"
-+msgstr "И�црпник влаге"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Мини VAX"
-+#: ../sheets/SISSI.sheet.in.h:50
-+msgid "Air filter"
-+msgstr "Ваздушни филтер"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Модем"
-+#: ../sheets/SISSI.sheet.in.h:51
-+msgid "Badge reader/keyboard"
-+msgstr "Читач беџа/та�татура"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Монитор"
-+#: ../sheets/SISSI.sheet.in.h:52
-+msgid "Badge reader"
-+msgstr "Читач беџа"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:27
--#, fuzzy
--msgid "Newton"
--msgstr "�ово"
-+#: ../sheets/SISSI.sheet.in.h:53
-+msgid "Biometric reader"
-+msgstr "Биометриј�ки читач"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "Лични рачунар"
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "Пумпа"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:29
--#, fuzzy
--msgid "PC Adapter Card"
--msgstr "PC картица за прикључење"
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr "Проточна пумпа"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:30
--#, fuzzy
--msgid "PC Card"
--msgstr "Мушкарац уз лични рачунар "
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr "Обртна врата"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:31
--#, fuzzy
--msgid "PC Router Card"
--msgstr "PC картица рутера"
-+#: ../sheets/SISSI.sheet.in.h:57
-+msgid "Axial Ventilator"
-+msgstr "О�овин�ки вентилатор"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:32
--msgid "PC Software"
--msgstr "Софтвер за лични рачунар"
-+#: ../sheets/SISSI.sheet.in.h:58
-+msgid "Centrifugal Ventilator"
-+msgstr "Центрифугални вентилатор"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "Лични рачунар за видео"
-+#: ../sheets/SISSI.sheet.in.h:59
-+msgid "Ventilator"
-+msgstr "Вентилатор"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
--msgstr ""
-+#: ../sheets/SISSI.sheet.in.h:60
-+msgid "Extinguisher"
-+msgstr "Противпожарни апарат"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "Лични дигитални помоћник (PDA)"
-+#: ../sheets/SISSI.sheet.in.h:62
-+msgid "Airconditioner"
-+msgstr "Ваздушни кондиционатор"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr "Релациона база података"
-+#: ../sheets/SISSI.sheet.in.h:63
-+msgid "Alarm center"
-+msgstr "�лармни центар"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "Sun радна �таница"
-+#: ../sheets/UML.sheet.in.h:1
-+msgid "UML"
-+msgstr "УМЛ"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Скенер"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Уређивач УМЛ �татичких �труктурних дијаграма"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Сервер �а рутером"
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "�апомена"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:41
--#, fuzzy
--msgid "Software-Based Router on File Server"
--msgstr "Софтвер�ки за�нован �ервер"
-+#: ../sheets/UML.sheet.in.h:7
-+msgid "Realizes, implements a specific interface"
-+msgstr "О�тварује, примењује нарочиту �прегу"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Скуп за �мештај"
-+#: ../sheets/UML.sheet.in.h:8
-+msgid "Generalization, class inheritance"
-+msgstr "Уопштавање, на�леђивање кла�а"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Суперрачунар"
-+#: ../sheets/UML.sheet.in.h:9
-+msgid "Association, two classes are associated"
-+msgstr "Удруживање, две кла�е �у удружене"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr "Таблет"
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Сједињавање, једна кла�а чини део друге"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:45
--#, fuzzy
--msgid "Tape array"
--msgstr "Скуп за �мештај"
-+#: ../sheets/UML.sheet.in.h:11
-+msgid "Implements, class implements a specific interface"
-+msgstr "Изводи, кла�а изводи нарочиту �прегу"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:46
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Ограничење, по�тавите ограничење на нешто"
-+
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Мали пакет"
-+
-+#: ../sheets/UML.sheet.in.h:14
-+msgid "Large package"
-+msgstr "Велики пакет"
-+
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Кори�ти мала и велика �лова"
-+
-+#: ../sheets/UML.sheet.in.h:17
-+msgid "Lifeline"
-+msgstr "Животна линија"
-+
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Објекат"
-+
-+#: ../sheets/UML.sheet.in.h:19
-+msgid "Message"
-+msgstr "Порука"
-+
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Део"
-+
-+#: ../sheets/UML.sheet.in.h:25
-+msgid "Node"
-+msgstr "Чвор"
-+
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "Укалупљена иконица кла�е"
-+
-+#: ../sheets/UML.sheet.in.h:27
-+msgid "Initial/end state"
-+msgstr "Почетно/крајње �тање"
-+
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Радња"
-+
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Ра�тави/�једини"
-+
-+#: ../sheets/chronogram.sheet.in.h:1
-+msgid "Chronogram"
-+msgstr "Хронограм"
-+
-+#: ../sheets/chronogram.sheet.in.h:2
-+msgid "Objects to design chronogram charts"
-+msgstr "Објекти за израду хронограм�ких графикона"
-+
-+#: ../sheets/chronogram.sheet.in.h:3
-+msgid "Time scale"
-+msgstr "Времен�ка размера"
-+
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Линије �а подацима"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:1
-+msgid "Cisco - Computer"
-+msgstr "Ци�ко — Рачунар"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Облици рачунара из Ци�коа"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:3
-+msgid "PC"
-+msgstr "Лични рачунар"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:4
-+msgid "Macintosh"
-+msgstr "Мекинтош"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:5
- msgid "Terminal"
- msgstr "Терминал"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:47
-+#: ../sheets/ciscocomputer.sheet.in.h:6
-+msgid "SUN workstation"
-+msgstr "С��-ова радна �таница"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:7
-+msgid "CiscoWorks workstation"
-+msgstr "Радна �таница Ци�ко радова"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:8
-+msgid "PC Router Card"
-+msgstr "У�меривачка картица личног рачунара"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:9
-+msgid "PC Software"
-+msgstr "Софтвер личног рачунара"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:10
-+msgid "PC with Router-Based Software"
-+msgstr "Лични рачунар �а �офтвером за�нованом на у�меривачу"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:11
-+msgid "Workgroup director"
-+msgstr "Управљач радне групе"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:12
-+msgid "CiscoSecurity"
-+msgstr "Ци�ко безбедно�т"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:13
-+msgid "Cisco CA"
-+msgstr "Ци�ко Ц�"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:14
- msgid "WWW server"
- msgstr "Веб �ервер"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:48
-+#: ../sheets/ciscocomputer.sheet.in.h:15
- msgid "Web browser"
--msgstr "Читач веба"
-+msgstr "Веб прегледник"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:16
-+msgid "File Server"
-+msgstr "Сервер датотека"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:17
-+msgid "Software-Based Router on File Server"
-+msgstr "Софтвер�ки за�нован у�меривач на �ерверу датотека"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:18
-+msgid "Server with PC Router"
-+msgstr "Сервер �а у�меривачем личног рачунара"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:19
-+msgid "IBM Tower"
-+msgstr "ИБМ торањ"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:20
-+msgid "IBM Mini (AS400)"
-+msgstr "ИБМ мини (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr "Проце�ор за улаз"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:22
-+msgid "IBM mainframe"
-+msgstr "ИБМ мејнфрејм"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:23
-+msgid "IBM mainframe with FEP"
-+msgstr "ИБМ мејнфрејм �а ФЕП-ом"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:24
-+msgid "HP Mini"
-+msgstr "ХП мини"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Супер рачунар"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:49
-+#: ../sheets/ciscocomputer.sheet.in.h:26
- msgid "Web cluster"
- msgstr "Веб кла�тер"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:50
-+#: ../sheets/ciscocomputer.sheet.in.h:27
-+msgid "Mini VAX"
-+msgstr "Мини В�Ик�"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:28
-+msgid "PC Card"
-+msgstr "Картица личног рачунара"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Таблица"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:31
-+msgid "EtherClient"
-+msgstr "Етернет маги�трала"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:32
-+msgid "Handheld"
-+msgstr "Ручни рачунар"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:33
- msgid "Wireless"
- msgstr "Бежична"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Њутн"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Монитор"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "Видео личног рачунара"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:41
-+msgid "BBS"
-+msgstr "ББС"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "Микро веб�ервер"
-+
-+#  Translators: Menu item Verb/Branch/Distribute
-+#: ../sheets/ciscocomputer.sheet.in.h:44
-+msgid "Diskette"
-+msgstr "Ди�кета"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:45
-+msgid "Host"
-+msgstr "Домаћин"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:46
-+msgid "Tape array"
-+msgstr "�из трака"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:47
-+msgid "Disk subsystem"
-+msgstr "Ди�к под�и�тем"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:48
-+msgid "JBOD"
-+msgstr "ЈБОД"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:50
-+msgid "FC Storage"
-+msgstr "ФЦ �кладиштење"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr "У�меривач радне групе"
-+msgid "PC Adapter Card"
-+msgstr "Прилагођивачка картица личног рачунара"
- 
- #: ../sheets/ciscohub.sheet.in.h:1
--msgid "100BaseT Hub"
--msgstr "100BaseT разводник"
-+msgid "Cisco - Switch"
-+msgstr "Ци�ко — Пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:2
--msgid "7500ARS (7513) Router"
--msgstr "7500ARS (7513) у�меривач"
--
--#: ../sheets/ciscohub.sheet.in.h:3
--msgid "7505 Router"
--msgstr "7505 у�меривач"
-+msgid "Router and switch shapes by Cisco"
-+msgstr "Облици у�меривача и пребацивача од Ци�коа"
- 
- #: ../sheets/ciscohub.sheet.in.h:4
--msgid "7507 Router"
--msgstr "7507 у�меривач"
-+msgid "Router subdued"
-+msgstr "У�меривач, бледо"
- 
- #: ../sheets/ciscohub.sheet.in.h:5
--msgid "ASIC Processor"
--msgstr "ASIC проце�ор"
-+msgid "Router with Silicon Switch"
-+msgstr "У�меривач �а �иликон�ким пребацивачем"
- 
- #: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+msgid "NetFlow router"
-+msgstr "У�меривач мрежног протока"
- 
- #: ../sheets/ciscohub.sheet.in.h:7
--#, fuzzy
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "�ТМ брзи гигабитни етер�вич"
-+msgid "Broadband router"
-+msgstr "Широкопоја�ни у�меривач"
- 
- #: ../sheets/ciscohub.sheet.in.h:8
--#, fuzzy
--msgid "ATM Switch"
--msgstr "�ТМ �вич"
-+msgid "Wavelength router"
-+msgstr "У�меривач тала�не дужине"
- 
- #: ../sheets/ciscohub.sheet.in.h:9
--#, fuzzy
--msgid "ATM Tag Switch Router"
--msgstr "ATM tag switch router"
-+msgid "Wireless router"
-+msgstr "Бежични у�меривач"
- 
- #: ../sheets/ciscohub.sheet.in.h:10
--msgid "Access Gateway"
--msgstr "При�тупни уређај за мрежни пролаз"
-+msgid "7507 Router"
-+msgstr "7507 у�меривач"
- 
- #: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+msgid "7505 Router"
-+msgstr "7505 у�меривач"
- 
- #: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Широкопоја�ни у�меривач"
-+msgid "7500ARS (7513) Router"
-+msgstr "7500�РС (7513) у�меривач"
- 
- #: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr "CSM-S"
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr "У�меривач пребацивача крајњег натпи�а �а мрежним протоком"
- 
- #: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr ""
-+msgid "Edge Label Switch Router"
-+msgstr "У�меривач пребацивача крајњег натпи�а"
- 
- #: ../sheets/ciscohub.sheet.in.h:15
--#, fuzzy
--msgid "Cisco - Switch"
--msgstr "Cisco — разно"
-+msgid "Router with Firewall"
-+msgstr "У�меривач �а мрежном баријером"
- 
- #: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+msgid "Optical Services Router"
-+msgstr "У�меривач оптичких у�луга"
- 
- #: ../sheets/ciscohub.sheet.in.h:17
--msgid "Cisco Hub"
--msgstr "Cisco — разводник"
--
--#: ../sheets/ciscohub.sheet.in.h:18
- msgid "Content Router"
- msgstr "У�меривач �адржаја"
- 
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Си�тем у�меравања но�ача"
-+
- #: ../sheets/ciscohub.sheet.in.h:19
--msgid "Content Service Module"
--msgstr "Модул у�луживања �адржаја"
-+msgid "Storage Router"
-+msgstr "У�меривач �кладиштења"
- 
- #: ../sheets/ciscohub.sheet.in.h:20
--#, fuzzy
--msgid "Content Service Switch 1100"
--msgstr "Свич 1100 за у�луживање �адржаја"
--
--#: ../sheets/ciscohub.sheet.in.h:21
--#, fuzzy
--msgid "Content Switch"
--msgstr "Свич за �адржај"
-+msgid "NetSonar"
-+msgstr "Мрежани �онар"
- 
- #: ../sheets/ciscohub.sheet.in.h:22
--#, fuzzy
--msgid "Data Center Switch"
--msgstr "Ширина линије �а подацима"
-+msgid "Hub subdued"
-+msgstr "Потчињени разводник"
- 
- #: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr ""
-+msgid "Cisco Hub"
-+msgstr "Ци�ко разводник"
- 
- #: ../sheets/ciscohub.sheet.in.h:24
--#, fuzzy
--msgid "Data Switch Processor"
--msgstr "Обрађивач рутирајућег �вича"
-+msgid "Small Hub"
-+msgstr "Мали разводник"
- 
- #: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr ""
-+msgid "100BaseT Hub"
-+msgstr "100БејзТ разводник"
- 
- #: ../sheets/ciscohub.sheet.in.h:26
--#, fuzzy
--msgid "Edge Label Switch Router"
--msgstr "Сервер �а рутером"
-+msgid "Workgroup switch"
-+msgstr "Пребацивач радне групе"
- 
- #: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
--msgstr ""
-+msgid "Workgroup switch Subdued"
-+msgstr "Птчињени пребацивач радне групе"
- 
- #: ../sheets/ciscohub.sheet.in.h:28
--msgid "Generic Processor"
--msgstr "Обични проце�ор"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Пребацивач радне групе укључен гла�ом"
- 
- #: ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "У�меривач"
-+msgid "BBSM"
-+msgstr "ББСМ"
- 
- #: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr "У�меривач, бледо"
-+msgid "ATM Tag Switch Router"
-+msgstr "�ТМ у�меривач пребацивача ознаке"
- 
- #: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "ИСД� �вич"
-+msgid "Switch Processor"
-+msgstr "Обрађивач пребацивача"
- 
- #: ../sheets/ciscohub.sheet.in.h:32
--#, fuzzy
--msgid "LAN2LAN Switch"
--msgstr "Пребацити"
-+msgid "Route Switch Processor"
-+msgstr "Обрађивач пребацивача у�мерења"
- 
- #: ../sheets/ciscohub.sheet.in.h:33
--#, fuzzy
--msgid "Label Switch Router"
--msgstr "Сервер �а рутером"
-+msgid "Route Switch Processor with Si"
-+msgstr "Обрађивач пребацивача у�мерења �а �и�ликоном"
- 
- #: ../sheets/ciscohub.sheet.in.h:34
--#, fuzzy
--msgid "Layer 2 Remote Switch"
--msgstr "Свич 3. нивоа"
-+msgid "PXF"
-+msgstr "ПИк�Ф"
- 
- #: ../sheets/ciscohub.sheet.in.h:35
--msgid "MGX 8220"
--msgstr "MGX 8220"
-+msgid "ASIC Processor"
-+msgstr "�СИЦ проце�ор"
- 
- #: ../sheets/ciscohub.sheet.in.h:36
--msgid "MGX 8240"
--msgstr "MGX 8240"
-+msgid "Generic Processor"
-+msgstr "Обичан проце�ор"
- 
- #: ../sheets/ciscohub.sheet.in.h:37
--msgid "MGX 8260"
--msgstr "MGX 8260"
-+msgid "Data Center Switch"
-+msgstr "Пребацивач центра података"
- 
- #: ../sheets/ciscohub.sheet.in.h:38
--#, fuzzy
--msgid "Multi-Fabric Server Switch"
--msgstr "Више�лојни �вич"
-+msgid "Data Center Switch Reversed"
-+msgstr "Преокренути пребацивач центра података"
- 
- #: ../sheets/ciscohub.sheet.in.h:39
--#, fuzzy
--msgid "MultiSwitch Device"
--msgstr "MultiSwitch уређај"
-+msgid "Data Switch Processor"
-+msgstr "Обрађивач пребацивача података"
- 
- #: ../sheets/ciscohub.sheet.in.h:40
--#, fuzzy
--msgid "Multilayer Remote Switch"
--msgstr "Више�лојни �вич"
-+msgid "Content Switch"
-+msgstr "Пребацивач �адржаја"
- 
- #: ../sheets/ciscohub.sheet.in.h:41
--#, fuzzy
--msgid "Multilayer Switch"
--msgstr "Више�лојни �вич"
-+msgid "Content Service Module"
-+msgstr "Модул у�луге �адржаја"
- 
- #: ../sheets/ciscohub.sheet.in.h:42
--#, fuzzy
--msgid "Multilayer Switch with Silicon"
--msgstr "Више�лојни �вич"
-+msgid "CSM-S"
-+msgstr "ЦСМ-С"
- 
- #: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
--msgstr ""
-+msgid "Access Gateway"
-+msgstr "При�тупни мрежни пролаз"
- 
- #: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr "NetFlow у�меривач"
-+msgid "ATM Switch"
-+msgstr "�ТМ пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr ""
-+msgid "ATM 3800"
-+msgstr "�ТМ 3800"
- 
- #: ../sheets/ciscohub.sheet.in.h:46
--#, fuzzy
--msgid "NetSonar"
--msgstr "Мрежа"
-+msgid "Cisco 1000"
-+msgstr "Ци�ко 1000"
- 
- #: ../sheets/ciscohub.sheet.in.h:47
--#, fuzzy
--msgid "Optical Services Router"
--msgstr "Рутер оптичких у�луга"
-+msgid "ISDN switch"
-+msgstr "ИСД� пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
--msgstr "PXF"
-+msgid "Label Switch Router"
-+msgstr "У�меривач пребацивача натпи�а"
- 
- #: ../sheets/ciscohub.sheet.in.h:49
--#, fuzzy
--msgid "Programmable Switch"
--msgstr "Свич који �е програмира"
-+msgid "MultiSwitch Device"
-+msgstr "Вишепребацивачки уређај"
- 
- #: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr "RateMUX"
-+msgid "LAN2LAN Switch"
-+msgstr "Л��2Л�� пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:51
--#, fuzzy
--msgid "Route Switch Processor"
--msgstr "Обрађивач рутирајућег �вича"
-+msgid "Multilayer Switch"
-+msgstr "Више�лојни пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:52
--#, fuzzy
--msgid "Route Switch Processor with Si"
--msgstr "Обрађивач рутирајућег �вича"
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Више�лојни пребацивач �а �иликоном"
- 
- #: ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "У�меривач"
-+msgid "Multilayer Switch with Silicon subdued"
-+msgstr "Више�лојни пребацивач �а потчињеним �иликоном"
- 
- #: ../sheets/ciscohub.sheet.in.h:54
--#, fuzzy
--msgid "Router and switch shapes by Cisco"
--msgstr "Облици у�меривача и �вичева из Cisco-а"
-+msgid "Programmable Switch"
-+msgstr "Програмљив пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:55
--msgid "Router subdued"
--msgstr "У�меривач, бледо"
-+msgid "Content Service Switch 1100"
-+msgstr "Пребацивач у�луге �адржаја 1100"
- 
- #: ../sheets/ciscohub.sheet.in.h:56
--msgid "Router with Firewall"
--msgstr "У�меривач �а штитом"
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "�ТМ брзи гигабитни мрежни пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:57
--#, fuzzy
--msgid "Router with Silicon Switch"
--msgstr "У�меривач �а �иликон�ким �вичом"
-+msgid "RateMUX"
-+msgstr "ПроточниМУК�"
- 
- #: ../sheets/ciscohub.sheet.in.h:58
--#, fuzzy
--msgid "Server Switch"
--msgstr "Сервер �а рутером"
-+msgid "Workgroup 5500"
-+msgstr "Радна група 5500"
- 
- #: ../sheets/ciscohub.sheet.in.h:59
--msgid "Small Hub"
--msgstr "Мали разводник"
-+msgid "Workgroup 5000"
-+msgstr "Радна група 5000"
- 
- #: ../sheets/ciscohub.sheet.in.h:60
--msgid "Storage Router"
--msgstr "У�меривач за �мештај"
-+msgid "Workgroup 5002"
-+msgstr "Радна група 5002"
- 
- #: ../sheets/ciscohub.sheet.in.h:61
--#, fuzzy
--msgid "Switch Processor"
--msgstr "Обрађивач рутирајућег �вича"
-+msgid "NetRanger"
-+msgstr "Мрежни оп�ежник"
- 
- #: ../sheets/ciscohub.sheet.in.h:62
--msgid "Universal Gateway"
--msgstr "Универзални уређај за мрежни пролаз"
-+msgid "MGX 8220"
-+msgstr "МГИк� 8220"
- 
- #: ../sheets/ciscohub.sheet.in.h:63
--#, fuzzy
--msgid "Virtual Layer Switch"
--msgstr "Више�лојни �вич"
-+msgid "MGX 8240"
-+msgstr "МГИк� 8240"
- 
- #: ../sheets/ciscohub.sheet.in.h:64
--msgid "Wavelength router"
--msgstr "У�меривач тала�не дужине"
-+msgid "MGX 8260"
-+msgstr "МГИк� 8260"
- 
- #: ../sheets/ciscohub.sheet.in.h:65
--msgid "Wireless router"
--msgstr "Бежични у�меривач"
-+msgid "Universal Gateway"
-+msgstr "Универзални мрежни пролаз"
- 
- #: ../sheets/ciscohub.sheet.in.h:66
--msgid "Workgroup 5000"
--msgstr "Радна група 5000"
-+msgid "iSCSI switch"
-+msgstr "иСЦСИ пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:67
--msgid "Workgroup 5002"
--msgstr "Радна група 5002"
-+msgid "Workgroup Fibre Channel intelligent switch"
-+msgstr "Паметни пребацивач радне групе оптичког влакна"
- 
- #: ../sheets/ciscohub.sheet.in.h:68
--msgid "Workgroup 5500"
--msgstr "Радна група 5500"
-+msgid "Director-class Fibre Channel intelligent switch"
-+msgstr "Паметни пребацивач управљачке кла�е оптичког влакна"
- 
- #: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
--msgstr ""
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Вишефабрички пребацивач �ервера"
- 
- #: ../sheets/ciscohub.sheet.in.h:70
--#, fuzzy
--msgid "Workgroup Switch Voice-Enabled"
--msgstr "Свич за радне групе"
-+msgid "Server Switch"
-+msgstr "Пребацивач �ервера"
- 
- #: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
--msgstr "Свич за радне групе"
-+msgid "Multilayer Remote Switch"
-+msgstr "Више�лојни удаљени пребацивач"
- 
- #: ../sheets/ciscohub.sheet.in.h:72
--#, fuzzy
--msgid "Workgroup switch Subdued"
--msgstr "Свич за радне групе"
-+msgid "Layer 2 Remote Switch"
-+msgstr "Удаљени пребацивач �лоја 2"
- 
- #: ../sheets/ciscohub.sheet.in.h:73
--#, fuzzy
--msgid "iSCSI switch"
--msgstr "ИСД� �вич"
-+msgid "Virtual Layer Switch"
-+msgstr "Пребацивач виртуелног �лоја"
- 
- #: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
--msgstr ""
-+msgid "Cisco - Misc"
-+msgstr "Ци�ко — Рзно"
- 
- #: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr "�нтена"
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Разновр�ни облици од Ци�коа"
- 
--#  Translators: Menu item Verb/Branch
- #: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Филијала"
-+msgid "Government Building"
-+msgstr "Зграда владе"
- 
--#  Translators: Menu item Verb/Branch
- #: ../sheets/ciscomisc.sheet.in.h:4
--msgid "Branch office blue"
--msgstr "Филијала, плаво"
-+msgid "University"
-+msgstr "Универзитет"
- 
--#  Translators: Menu item Verb/Branch
- #: ../sheets/ciscomisc.sheet.in.h:5
--msgid "Branch office subdued"
--msgstr "Филијала, бледо"
-+msgid "Small Business"
-+msgstr "Мало предузеће"
- 
- #: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr "Кола"
-+msgid "Home office"
-+msgstr "Кућна канцеларија"
- 
-+#  Translators: Menu item Verb/Branch
- #: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Cisco — разно"
-+msgid "Branch office"
-+msgstr "Филијала"
- 
-+#  Translators: Menu item Verb/Branch
- #: ../sheets/ciscomisc.sheet.in.h:8
--#, fuzzy
--msgid "CiscoWorks Man"
--msgstr "CiscoWorks радна �таница"
-+msgid "Branch office subdued"
-+msgstr "Филијала, бледо"
- 
-+#  Translators: Menu item Verb/Branch
- #: ../sheets/ciscomisc.sheet.in.h:9
--msgid "File cabinet"
--msgstr "Орман за документа"
-+msgid "Branch office blue"
-+msgstr "Филијала, плаво"
- 
- #: ../sheets/ciscomisc.sheet.in.h:10
- msgid "Generic Building"
- msgstr "Обична зграда"
- 
- #: ../sheets/ciscomisc.sheet.in.h:11
--msgid "Generic Building blue"
--msgstr "Обична плава зграда"
--
--#: ../sheets/ciscomisc.sheet.in.h:12
- msgid "Generic Building subdued"
- msgstr "Обична зграда, бледо"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:12
-+msgid "Generic Building blue"
-+msgstr "Обична плава зграда"
-+
- #: ../sheets/ciscomisc.sheet.in.h:13
--msgid "Government Building"
--msgstr "Зграда владе"
-+msgid "Medium Building"
-+msgstr "Зграда �редње величине"
- 
- #: ../sheets/ciscomisc.sheet.in.h:14
--msgid "Headphones"
--msgstr "Слушалице"
-+msgid "Medium Building subdued"
-+msgstr "Бледа зграда �редње величине"
- 
- #: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr "Кућна канцеларија"
-+msgid "Medium Building blue"
-+msgstr "Плава зграда �редње величине"
- 
- #: ../sheets/ciscomisc.sheet.in.h:16
- msgid "House"
-@@ -8118,1820 +9454,1126 @@ msgid "House blue"
- msgstr "Плава кућа"
- 
- #: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Кључ"
-+msgid "Telecommuter house"
-+msgstr "Кућа телекомјутера"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr "Бледа кућа телекомјутера"
- 
- #: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
--msgstr "Катанац и кључ"
-+msgid "MDU"
-+msgstr "МДУ"
- 
- #: ../sheets/ciscomisc.sheet.in.h:21
--msgid "MDU"
--msgstr "MDU"
-+msgid "Man"
-+msgstr "Човек"
- 
- #: ../sheets/ciscomisc.sheet.in.h:22
--#, fuzzy
--msgid "Mac Woman"
--msgstr "Мек жена"
-+msgid "Man red"
-+msgstr "Црвени човек"
- 
- #: ../sheets/ciscomisc.sheet.in.h:23
--msgid "Man"
--msgstr "Човек"
-+msgid "Man gold"
-+msgstr "Златни човек"
- 
- #: ../sheets/ciscomisc.sheet.in.h:24
- msgid "Man blue"
- msgstr "Плави човек"
- 
- #: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
--msgstr "Златни човек"
-+msgid "Standing Man"
-+msgstr "Човек који �тоји"
- 
- #: ../sheets/ciscomisc.sheet.in.h:26
--msgid "Man red"
--msgstr "Црвени човек"
-+msgid "Standing woman"
-+msgstr "Жена која �тоји"
- 
- #: ../sheets/ciscomisc.sheet.in.h:27
--msgid "Medium Building"
--msgstr "Зграда �редње величине"
-+msgid "Woman"
-+msgstr "Жена"
- 
- #: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr "Плава зграда �редње величине"
-+msgid "Woman red"
-+msgstr "Жена у црвеном"
- 
- #: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr "Зграда �редње величине, бледо"
-+msgid "Woman gold"
-+msgstr "Жена у златном"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Жена у плавом"
- 
- #: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Разни облици од �тране Cisco-а"
-+msgid "Running man"
-+msgstr "Човек који трчи"
- 
- #: ../sheets/ciscomisc.sheet.in.h:32
--msgid "PC Man"
--msgstr "Мушкарац уз лични рачунар "
-+msgid "Running man subdued"
-+msgstr "Бледи мушкарац који трчи"
- 
- #: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
--msgstr "Мушкарац уз лични рачунар �лева из профила"
-+msgid "Telecommuter"
-+msgstr "Телекомјутер"
- 
- #: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
--msgstr "Трчећи човек"
-+msgid "Running woman"
-+msgstr "Жена која трчи"
- 
- #: ../sheets/ciscomisc.sheet.in.h:35
--msgid "Running man subdued"
--msgstr "Мушкарац који трчи"
-+msgid "CiscoWorks Man"
-+msgstr "Мушкарац Ци�ко рада"
- 
- #: ../sheets/ciscomisc.sheet.in.h:36
--msgid "Running woman"
--msgstr "Жена која трчи"
-+msgid "PC Man left"
-+msgstr "Мушкарац уз лични рачунар �лева из профила"
- 
- #: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Сателит"
-+msgid "PC Man"
-+msgstr "Мушкарац уз лични рачунар"
- 
- #: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
--msgstr "Сателит�ки тањир"
-+msgid "Sitting Woman"
-+msgstr "Жена која �еди"
- 
- #: ../sheets/ciscomisc.sheet.in.h:39
--msgid "Sitting Woman"
--msgstr "Жена у �едећем положају"
-+msgid "Sitting Woman right"
-+msgstr "Жена која �еди �а де�на"
- 
- #: ../sheets/ciscomisc.sheet.in.h:40
--msgid "Sitting Woman right"
--msgstr "Жена у �едећем положају �лева у профилу"
-+msgid "Mac Woman"
-+msgstr "Мек жена"
- 
- #: ../sheets/ciscomisc.sheet.in.h:41
--msgid "Small Business"
--msgstr "Мало предузеће"
-+msgid "Androgynous Person"
-+msgstr "Двополна о�оба"
- 
- #: ../sheets/ciscomisc.sheet.in.h:43
--msgid "Standing Man"
--msgstr "Човек у �тојећем положају"
--
-+msgid "Key"
-+msgstr "Кључ"
-+
- #: ../sheets/ciscomisc.sheet.in.h:44
--msgid "Standing woman"
--msgstr "Жена у �тојећем положају"
-+msgid "Lock and Key"
-+msgstr "Катанац и кључ"
- 
- #: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
--msgstr "Телекомјутер"
-+msgid "Satellite dish"
-+msgstr "Сателит�ки тањир"
- 
- #: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr "Кућа телекомјутера"
-+msgid "Satellite"
-+msgstr "Сателит"
- 
- #: ../sheets/ciscomisc.sheet.in.h:47
--#, fuzzy
--msgid "Telecommuter house subdued"
--msgstr "Кућа телекомјутера"
--
--#: ../sheets/ciscomisc.sheet.in.h:48
--msgid "Truck"
--msgstr "Камион"
-+msgid "Antenna"
-+msgstr "�нтена"
- 
- #: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Универзитет"
-+msgid "Car"
-+msgstr "Кола"
- 
- #: ../sheets/ciscomisc.sheet.in.h:50
-+msgid "Truck"
-+msgstr "Камион"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:51
- msgid "Video Camera"
- msgstr "Видео камера"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscomisc.sheet.in.h:52
- msgid "Video Camera right"
- msgstr "Видео камера из профила на де�но"
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
--msgid "Woman"
--msgstr "Жена"
--
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr "Жена у плавом"
--
- #: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr "Жена у златном"
--
--#: ../sheets/ciscomisc.sheet.in.h:55
--msgid "Woman red"
--msgstr "Жена у црвеном"
-+msgid "Headphones"
-+msgstr "Слушалице"
- 
- #: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr "10700"
-+msgid "Cisco - Network"
-+msgstr "Ци�ко — Мрежа"
- 
- #: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr "15200"
-+msgid "Network shapes by Cisco"
-+msgstr "Мрежни облици од Ци�коа"
- 
- #: ../sheets/cisconetwork.sheet.in.h:3
--msgid "15800"
--msgstr "15800"
-+msgid "Network Management"
-+msgstr "Управљање мрежом"
- 
- #: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr "3174 (�тони) контролер кла�тера"
-+msgid "Detector"
-+msgstr "Откривач"
- 
- #: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
--msgstr "3174 (�пратни) контролер кла�тера"
-+msgid "Protocol Translator"
-+msgstr "Преводилац протокола"
- 
- #: ../sheets/cisconetwork.sheet.in.h:6
--msgid "Access Server"
--msgstr "При�тупни �ервер"
-+msgid "IP"
-+msgstr "ИП"
- 
- #: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
--msgstr "При�тупна тачка (AP)"
-+msgid "IP Old-style"
-+msgstr "ИП �тари �тил"
- 
- #: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
--msgstr ""
-+msgid "NAT"
-+msgstr "��Т"
- 
- #: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
-+msgid "VIP"
-+msgstr "ВИП"
- 
- #: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "BBFW медиј"
-+msgid "Terminal Server"
-+msgstr "Сервер терминала"
- 
- #: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
--msgstr "Кутија за и�какање"
-+msgid "Access Server"
-+msgstr "При�тупни �ервер"
- 
- #: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Мо�т"
-+msgid "System controller"
-+msgstr "Си�тем�ки контролер"
- 
- #: ../sheets/cisconetwork.sheet.in.h:13
--#, fuzzy
--msgid "CDDI/FDDI Concentrator"
--msgstr "VPN �акупљач"
-+msgid "Directory Server"
-+msgstr "Сервер директоријума"
- 
- #: ../sheets/cisconetwork.sheet.in.h:14
--#, fuzzy
--msgid "CDM Content Distribution Manager"
--msgstr "CDM управник ра�поделом �адржаја"
-+msgid "Firewall"
-+msgstr "Мрежна баријера"
- 
- #: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr "CSU/DSU"
-+msgid "Firewall subdued"
-+msgstr "Бледа мрежна баријера"
- 
- #: ../sheets/cisconetwork.sheet.in.h:16
--msgid "Cable Modem"
--msgstr "Каблов�ки модем"
-+msgid "Firewall horizontal"
-+msgstr "Водоравна мрежна баријера"
- 
- #: ../sheets/cisconetwork.sheet.in.h:17
--#, fuzzy
--msgid "Catalyst Access Gateway"
--msgstr "Catalyst при�тупни рачунар"
-+msgid "Firewall Service Module"
-+msgstr "Модул у�луге мрежне баријере"
- 
- #: ../sheets/cisconetwork.sheet.in.h:18
--#, fuzzy
--msgid "Centri Firewall"
--msgstr "Centri штит"
-+msgid "IOS Firewall"
-+msgstr "ИОС мрежна баријера"
- 
- #: ../sheets/cisconetwork.sheet.in.h:19
--#, fuzzy
--msgid "Channelized Pipe"
--msgstr "Канал"
-+msgid "PIX Firewall"
-+msgstr "ПИК� мрежна баријера"
- 
- #: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Cisco — мрежа"
-+msgid "PIX Firewall Left"
-+msgstr "ПИК� мрежна баријера �а лева"
- 
- #: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Облак"
--
--#: ../sheets/cisconetwork.sheet.in.h:22
--msgid "Cloud Dark"
--msgstr "Тамни облак"
-+msgid "Centri Firewall"
-+msgstr "Средишња мрежна баријера"
- 
- #: ../sheets/cisconetwork.sheet.in.h:23
--msgid "Cloud Gold"
--msgstr "Златни облак"
-+msgid "Security appliance"
-+msgstr "Безбедно�на направа"
- 
- #: ../sheets/cisconetwork.sheet.in.h:24
--msgid "Cloud White"
--msgstr "Бели облак"
-+msgid "VPN Concentrator"
-+msgstr "ВП� �акупљач"
- 
- #: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
--msgstr ""
-+msgid "VPN Gateway"
-+msgstr "ВП� мрежни пролаз"
- 
- #: ../sheets/cisconetwork.sheet.in.h:26
--#, fuzzy
--msgid "Content Engine (Cache Director)"
--msgstr "Си�тем за �адржај (управљање о�тавом)"
-+msgid "LAN to LAN"
-+msgstr "Л�� на Л��"
- 
- #: ../sheets/cisconetwork.sheet.in.h:27
--#, fuzzy
--msgid "Content Transformation Engine (CTE)"
--msgstr "Си�тем за преиначење �адржаја (CTE)"
-+msgid "SSL Terminator"
-+msgstr "ССЛ окончавач"
- 
- #: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr "DSLAM"
-+msgid "IP DSL Switch"
-+msgstr "ИП ДСЛ пребацивач"
- 
- #: ../sheets/cisconetwork.sheet.in.h:29
--msgid "DWDM Filter"
--msgstr "DWDM филтер"
-+msgid "DSLAM"
-+msgstr "ДСЛ�М"
- 
- #: ../sheets/cisconetwork.sheet.in.h:30
--#, fuzzy
--msgid "Detector"
--msgstr "Глумац"
-+msgid "Cable Modem"
-+msgstr "Каблов�ки модем"
- 
- #: ../sheets/cisconetwork.sheet.in.h:31
--#, fuzzy
--msgid "Digital Cross-Connect"
--msgstr "Укр�ни повезивач"
-+msgid "Wireless Connectivity"
-+msgstr "Бежично повезивање"
- 
- #: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr "Сервер директоријума"
--
--#  Translators: Menu item Verb/Branch/Distribute
--#: ../sheets/cisconetwork.sheet.in.h:33
--#, fuzzy
--msgid "Distributed Director"
--msgstr "Ра�подељени у�меривач"
--
--#: ../sheets/cisconetwork.sheet.in.h:34
--msgid "Dual Mode AccessPoint"
--msgstr "При�тупна тачка (AP) за два режима"
--
--#: ../sheets/cisconetwork.sheet.in.h:35
--msgid "FDDI Ring"
--msgstr "FDDI пр�тен"
--
--#: ../sheets/cisconetwork.sheet.in.h:36
--#, fuzzy
--msgid "File Engine"
--msgstr "Орман за документа"
--
--#: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
--msgstr "Штит"
--
--#: ../sheets/cisconetwork.sheet.in.h:38
--msgid "Firewall Service Module"
--msgstr "Модул штит у�луге"
--
--#: ../sheets/cisconetwork.sheet.in.h:39
--msgid "Firewall horizontal"
--msgstr "Штит водоравно"
--
--#: ../sheets/cisconetwork.sheet.in.h:40
--msgid "Firewall subdued"
--msgstr "Штит, бледо"
--
--#: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
--msgstr "Општи уређај"
--
--#: ../sheets/cisconetwork.sheet.in.h:42
--msgid "Generic Gateway"
--msgstr "Обични у�меравач"
--
--#: ../sheets/cisconetwork.sheet.in.h:44
--msgid "IOS Firewall"
--msgstr "IOS штит"
--
--#: ../sheets/cisconetwork.sheet.in.h:45
--#, fuzzy
--msgid "IOS SLB"
--msgstr "IP DSL"
--
--#: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
--
--#: ../sheets/cisconetwork.sheet.in.h:47
--#, fuzzy
--msgid "IP DSL Switch"
--msgstr "ИСД� �вич"
--
--#: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:49
--#, fuzzy
--msgid "IP Transport Concentrator"
--msgstr "VPN �акупљач"
--
--#: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
--msgstr "IPTV �ервер емитовања"
--
--#: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
--msgstr "IPTV управљач �адржајом"
--
--#: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr "LAN на LAN"
--
--#: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "ЛокалниУ�меривач"
--
--#: ../sheets/cisconetwork.sheet.in.h:55
--#, fuzzy
--msgid "Location server"
--msgstr "Сервер за везу"
--
--#: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
--msgstr "LongReach CPE"
--
--#: ../sheets/cisconetwork.sheet.in.h:57
--#, fuzzy
--msgid "MAS Gateway"
--msgstr "MAS пролаз"
--
--#: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
--
--#: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME 1100"
--
--#: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
--
--#: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
--
--#: ../sheets/cisconetwork.sheet.in.h:62
--msgid "NAT"
--msgstr "�дре�ни преводилац (NAT)"
--
--#: ../sheets/cisconetwork.sheet.in.h:63
--msgid "Network Management"
--msgstr "Управљање мрежом"
--
--#: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Мрежни облици Cisco компаније"
--
--#: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
--msgstr "ONS15104"
--
--#: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
--msgstr "ONS15540"
--
--#: ../sheets/cisconetwork.sheet.in.h:67
--msgid "Optical Amplifier"
--msgstr "Оптички појачивач"
--
--#: ../sheets/cisconetwork.sheet.in.h:68
--#, fuzzy
--msgid "Optical Cross-Connect"
--msgstr "Оптички прено�"
--
--#: ../sheets/cisconetwork.sheet.in.h:69
--#, fuzzy
--msgid "Optical Fiber"
--msgstr "Оптичка енергија"
--
--#: ../sheets/cisconetwork.sheet.in.h:70
--msgid "Optical Transport"
--msgstr "Оптички прено�"
-+msgid "Wireless Transport"
-+msgstr "Бежични прено�"
- 
--#: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
--
--#: ../sheets/cisconetwork.sheet.in.h:72
--msgid "PIX Firewall"
--msgstr "PIX штит"
--
--#: ../sheets/cisconetwork.sheet.in.h:73
--msgid "PIX Firewall Left"
--msgstr "PIX штит из левог профила"
--
--#: ../sheets/cisconetwork.sheet.in.h:74
--msgid "Protocol Translator"
--msgstr "Преводилац протокола"
--
--#: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
--
--#: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr "Понављач"
--
--#: ../sheets/cisconetwork.sheet.in.h:77
--#, fuzzy
--msgid "SSL Terminator"
--msgstr "Терминал"
--
--#: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr "STB (set top box)"
--
--#: ../sheets/cisconetwork.sheet.in.h:79
--msgid "Security appliance"
--msgstr "Сигурно�на направа"
--
--#: ../sheets/cisconetwork.sheet.in.h:80
--msgid "Service Control"
--msgstr "Контрола у�луга"
--
--#: ../sheets/cisconetwork.sheet.in.h:81
--#, fuzzy
--msgid "Storage Solution Engine"
--msgstr "Рутер за �мештај"
--
--#: ../sheets/cisconetwork.sheet.in.h:82
--msgid "System controller"
--msgstr "Си�тем�ки контролер"
--
--#: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "TV"
--
--#: ../sheets/cisconetwork.sheet.in.h:84
--msgid "Terminal Server"
--msgstr "Сервер терминала"
--
--#: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "TokenRing"
--
--#: ../sheets/cisconetwork.sheet.in.h:86
--#, fuzzy
--msgid "TransPath"
--msgstr "Путања прено�а"
--
--#: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "Извор непрекидног напајања"
--
--#: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
--msgid "VN2900"
--msgstr "VN2900"
--
--#: ../sheets/cisconetwork.sheet.in.h:90
--msgid "VN5900"
--msgstr "VN5900"
--
--#: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr "VN5902"
--
--#: ../sheets/cisconetwork.sheet.in.h:92
--#, fuzzy
--msgid "VPN Concentrator"
--msgstr "VPN �акупљач"
--
--#: ../sheets/cisconetwork.sheet.in.h:93
--msgid "VPN Gateway"
--msgstr "VPN уређај за мрежни пролаз"
--
--#: ../sheets/cisconetwork.sheet.in.h:94
--msgid "WAN"
--msgstr "Мрежа на широком подручју (WAN)"
--
--#: ../sheets/cisconetwork.sheet.in.h:95
--#, fuzzy
--msgid "WDM"
--msgstr "ADM"
--
--#: ../sheets/cisconetwork.sheet.in.h:96
--#, fuzzy
--msgid "WLAN controller"
--msgstr "Си�тем�ки контролер"
--
--#: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:98
--msgid "Wireless Bridge"
--msgstr "Бежични мо�т"
--
--#: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr "Бежично повезивање"
--
--#: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
--msgstr ""
--
--#: ../sheets/cisconetwork.sheet.in.h:101
--msgid "Wireless Transport"
--msgstr "Бежични прено�"
--
--#: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
--
--#: ../sheets/ciscotelephony.sheet.in.h:2
--msgid "6705"
--msgstr "6705"
--
--#: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr "6732"
--
--#: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
--
--#: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
--
--#: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
--msgstr "УправљачПозивом"
--
--#: ../sheets/ciscotelephony.sheet.in.h:8
--msgid "Cellular Phone"
--msgstr "Мобилни телефон"
--
--#: ../sheets/ciscotelephony.sheet.in.h:9
--msgid "Cisco - Telephony"
--msgstr "Cisco — Телефонија"
--
--#: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr "Свич кла�е 4/5"
--
--#: ../sheets/ciscotelephony.sheet.in.h:11
--msgid "End Office"
--msgstr "Крајња канцеларија"
--
--#: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
--msgstr "Фак�"
--
--#: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
--msgstr "Обичан �офтвер�ки �вич"
--
--#: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
--
--#: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
--msgstr "HootPhone"
--
--#: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "IAD у�меривач"
--
--#: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
--
--#: ../sheets/ciscotelephony.sheet.in.h:20
--msgid "IP Phone"
--msgstr "ИП телефон"
--
--#: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "ИП �офтвер�ки телефон"
--
--#: ../sheets/ciscotelephony.sheet.in.h:22
--msgid "IP Telephony Router"
--msgstr "У�меривач за ИП телефонију"
--
--#: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
--
--#: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:25
--msgid "MCU"
--msgstr "MCU"
--
--#: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
--msgstr "MoH �ервер (музика задржана)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:28
--#, fuzzy
--msgid "Mobile Access IP Phone"
--msgstr "Мобилни телефон"
--
--#: ../sheets/ciscotelephony.sheet.in.h:29
--#, fuzzy
--msgid "Mobile Access Router"
--msgstr "Рутер гла�а"
--
--#: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr "Octel"
--
--#: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "Телефон�ка централа"
--
--#: ../sheets/ciscotelephony.sheet.in.h:32
--msgid "PBX Switch"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:33
--#, fuzzy
--msgid "Pager"
--msgstr "Преломи �траница"
--
--#: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Телефон"
--
--#: ../sheets/ciscotelephony.sheet.in.h:35
--msgid "Phone 2"
--msgstr "Телефон 2"
--
--#: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr "Телефон�ка �права"
--
--#: ../sheets/ciscotelephony.sheet.in.h:37
--#, fuzzy
--msgid "Phone Ethernet"
--msgstr "Етернет маги�трала"
--
--#: ../sheets/ciscotelephony.sheet.in.h:38
--msgid "Phone Feature"
--msgstr "У�луга телефонирања"
--
--#: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr "Телефон/фак�"
--
--#: ../sheets/ciscotelephony.sheet.in.h:40
--msgid "Radio Tower"
--msgstr "Радио торањ"
--
--#: ../sheets/ciscotelephony.sheet.in.h:41
--msgid "SC2200 (Signalling Controller)"
--msgstr "SC2200 (�игнализирајући контролер)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:42
--msgid "SC2200/VSC3000 host"
--msgstr "SC2200/VSC3000 рачунар"
--
--#: ../sheets/ciscotelephony.sheet.in.h:43
--msgid "SIP Proxy Server"
--msgstr "SIP �ервер-по�редник"
--
--#: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
--msgstr ""
--
--#: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
--msgstr "STP"
--
--#: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr "Софтвер�ки телефон"
--
--#: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr "TDM у�меривач"
--
--#: ../sheets/ciscotelephony.sheet.in.h:48
--msgid "Telephony shapes by Cisco"
--msgstr "Cisco облици за телефонију"
--
--#: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr "Торањ"
--
--#: ../sheets/ciscotelephony.sheet.in.h:50
--#, fuzzy
--msgid "Unity Express"
--msgstr "Unity �ервер"
--
--#: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr "Unity �ервер"
--
--#: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
--msgstr "Виртуелни �вич контролер (VSC 3000)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:53
--#, fuzzy
--msgid "Voice-Enabled ATM Switch"
--msgstr "Свич за гла�овни ATM"
--
--#: ../sheets/ciscotelephony.sheet.in.h:54
--msgid "Voice-Enabled Access Server"
--msgstr "Гла�овни при�тупни �ервер"
--
--#: ../sheets/ciscotelephony.sheet.in.h:55
--msgid "Voice-Enabled Router"
--msgstr "Гла�овни у�меравач"
--
--#: ../sheets/ciscotelephony.sheet.in.h:56
--msgid "uMG series"
--msgstr ""
--
--#: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr "Вентилација �а мехурима"
--
--#: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr "Спречавање тока уназад"
--
--#: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Корито"
--
--#: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Бивалентни вертикални на�лон"
--
--#: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Грађевинар�тво"
--
--#: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Справе у грађевинар�тву"
--
--#: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Садржалац"
--
--#: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Коначно-�таложено корито"
--
--#: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Претварач фреквенције"
--
--#: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Га�на боца"
--
--#: ../sheets/civil.sheet.in.h:11
--msgid "Horizontal limiting line"
--msgstr "Водоравна ограничавајућа линија"
--
--#: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Водоравни на�лон"
--
--#: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Водоравно поравната �трелица"
--
--#: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Водоравно поравнат компре�ор"
--
--#: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Водоравно поравната пумпа"
--
--#: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Водоравно поравнат вентил"
--
--#: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Мотор"
--
--#: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Пробни танк за пречишћавање"
--
--#: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Референтна линија"
--
--#: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Ротор"
--
--#: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Земља"
--
--#: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "У�правна ограничавајућа линија"
--
--#: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "У�правни на�лон"
--
--#: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "У�правно поравната �трелица"
--
--#: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "У�правно поравнат компре�ор"
--
--#: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "У�правно поравнат пропелер"
--
--#: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "У�правно поравната пумпа"
--
--#: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "У�правно поравнат вентил"
--
--#: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "�иво воде"
--
--#: ../sheets/jigsaw.sheet.in.h:1
--msgid "Jigsaw"
--msgstr "Те�тера"
--
--#: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Те�тера — део_iiii"
--
--#: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Те�тера — део_iiio"
--
--#: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Те�тера — део_iioi"
--
--#: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Те�тера — део_iioo"
--
--#: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Те�тера — део_ioii"
--
--#: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Те�тера — део_ioio"
--
--#: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Те�тера — део_iooi"
--
--#: ../sheets/jigsaw.sheet.in.h:9
--msgid "Jigsaw - part_iooo"
--msgstr "Те�тера — део_iooo"
--
--#: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Те�тера — део_oiii"
--
--#: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Те�тера — део_oiio"
--
--#: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Те�тера — део_oioi"
--
--#: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Те�тера — део_oioo"
--
--#: ../sheets/jigsaw.sheet.in.h:14
--msgid "Jigsaw - part_ooii"
--msgstr "Те�тера — део_ooii"
--
--#: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Те�тера — део_ooio"
--
--#: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Те�тера — део_oooi"
--
--#: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Те�тера — део_oooo"
--
--#: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Делови те�тере"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr ""
--
--#: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "3,5 инчна ди�кета"
--
--#: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "Симбол за ATM �вич"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "�нтена за бежични прено�"
--
--#: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "Лични рачунар у ви�оком кућишту"
--
--#: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Рачунар"
--
--#: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "Стони лични рачунар"
--
--#: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Табла за дигитализацију"
--
--#: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Етернет маги�трала"
--
--#: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Спољашњи DAT уређај"
--
--#: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Штит-рутер"
--
--#: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "Прено�ни рачунар"
--
--#: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "Лични рачунар у �редњем кућишту"
--
--#: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "Лични рачунар у малом кућишту"
--
--#: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Мобилни телефон"
--
--#: ../sheets/network.sheet.in.h:16
--msgid "Mobile telephony base station"
--msgstr "Базна �таница мобилне телефоније"
--
--#: ../sheets/network.sheet.in.h:17
--msgid "Mobile telephony cell"
--msgstr "Јединица мобилне телефоније"
--
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Модуларни �и�тем пребацивања"
--
--#: ../sheets/network.sheet.in.h:20
--msgid "Network"
--msgstr "Мрежа"
--
--#: ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Мрежни облак"
--
--#: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Објекти �а којима �е израђују мрежни дијаграми"
--
--#: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Плотер"
--
--#: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "RJ45 зидна утичница"
--
--#: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Симбол рутера"
--
--#: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Једно�таван модем"
--
--#: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Једно�таван  штампач"
--
--#: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Звучник �а уграђеним појачалом"
--
--#: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Звучник без појачала"
--
--#: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Хаб или �вич за ормане"
--
--#: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Складиштење"
--
--#: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Симбол за �вич"
--
--#: ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Телефон"
--
--#: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "UNIX радна �таница"
--
--#: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "WAN веза"
--
--#: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "WAN везица"
--
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Зидна утичница за scEAD каблов�ки �и�тем"
--
--#: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Праћење радне �танице"
--
--#: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "ZIP ди�к"
--
--#: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr "Прати управника прено�ом или пред�тавника"
--
--#: ../sheets/sybase.sheet.in.h:2
--msgid "Objects to design Sybase replication domain diagrams with"
--msgstr "Објекти за израду графикона за Sybase-ов репликациони домен "
--
--#: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Управник репликационим �ервером"
-+#: ../sheets/cisconetwork.sheet.in.h:33
-+msgid "AccessPoint"
-+msgstr "При�тупна тачка"
- 
--#: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Стабилни уређај за податке"
-+#: ../sheets/cisconetwork.sheet.in.h:34
-+msgid "Wireless Bridge"
-+msgstr "Бежични мо�т"
- 
--#: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+#: ../sheets/cisconetwork.sheet.in.h:35
-+msgid "Dual Mode AccessPoint"
-+msgstr "Дворежим�ка тачка при�тупа"
- 
--#: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Sybase програм клијента"
-+#: ../sheets/cisconetwork.sheet.in.h:36
-+msgid "Wi-Fi Tag"
-+msgstr "Бежична ознака"
- 
--#: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Sybase �рвер података"
-+#: ../sheets/cisconetwork.sheet.in.h:37
-+msgid "Wireless Location Appliance"
-+msgstr "�аправа бежичног ме�та"
- 
--#: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Sybase репликациони �ервер"
-+#: ../sheets/cisconetwork.sheet.in.h:38
-+msgid "Location server"
-+msgstr "Сервер локације"
- 
--#~ msgid "Dia"
--#~ msgstr "Диа"
-+#: ../sheets/cisconetwork.sheet.in.h:39
-+msgid "Lightweight AP"
-+msgstr "Лагани �П"
- 
--#~ msgid "Copyright (C) 1998-2005 The Free Software Foundation and the authors"
--#~ msgstr "Сва права задржана, 1998-2005 Задужбина �лободног �офтвера и аутори"
-+#: ../sheets/cisconetwork.sheet.in.h:40
-+msgid "WLAN controller"
-+msgstr "ВЛ�� контролер"
- 
--#~ msgid ""
--#~ "Dia is a program for drawing structured diagrams.\n"
--#~ "Please visit http://www.gnome.org/projects/dia for more information."
--#~ msgstr ""
--#~ "Диа је један програм за цртање �труктуираних дијаграма.\n"
--#~ "За више информација молим по�етите http://www.gnome.org/projects/dia."
-+#: ../sheets/cisconetwork.sheet.in.h:41
-+msgid "BBFW"
-+msgstr "ББФВ"
- 
--#~ msgid "About Dia"
--#~ msgstr "О програму Диа"
-+#: ../sheets/cisconetwork.sheet.in.h:42
-+msgid "BBFW media"
-+msgstr "ББФВ медиј"
- 
--#~ msgid "Dia v %s by Alexander Larsson"
--#~ msgstr "Диа %s од �лек�андра Лар�она (Alexander Larsson)"
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
-+msgstr "Канали�ана �појка"
- 
--#~ msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
--#~ msgstr ""
--#~ "Одржавају: Лар� Клау�ен (Lars Clausen) и Ћирил Чепелов (Cyrille Chepelov)"
-+#: ../sheets/cisconetwork.sheet.in.h:44
-+msgid "Concatenated Payload"
-+msgstr "�адовезани утоваривач"
- 
--#~ msgid "Please visit http://www.gnome.org/projects/dia for more information"
--#~ msgstr ""
--#~ "За више информација молим по�етите http://www.gnome.org/projects/dia"
-+#: ../sheets/cisconetwork.sheet.in.h:45
-+msgid "Optical Cross-Connect"
-+msgstr "Оптички укр�ни �пајач"
- 
--#~ msgid "Contributors:"
--#~ msgstr "Допринели:"
-+#: ../sheets/cisconetwork.sheet.in.h:46
-+msgid "Optical Transport"
-+msgstr "Оптички прено�"
- 
--#~ msgid "Diagram tree"
--#~ msgstr "Дрво дијаграма"
-+#: ../sheets/cisconetwork.sheet.in.h:47
-+msgid "Optical Fiber"
-+msgstr "Оптичко влакно"
- 
--#~ msgid "Modify object(s)"
--#~ msgstr "Измени објекат(е)"
-+#: ../sheets/cisconetwork.sheet.in.h:48
-+msgid "Optical Amplifier"
-+msgstr "Оптички појачивач"
- 
--#~ msgid "Failed to save file '%s'.\n"
--#~ msgstr "�еможе да �ними датотеку '%s'.\n"
-+#: ../sheets/cisconetwork.sheet.in.h:49
-+msgid "Digital Cross-Connect"
-+msgstr "Дигитални укр�ни �пајач"
- 
--#~ msgid "/File/_New"
--#~ msgstr "/Датотека/�ово"
-+#: ../sheets/cisconetwork.sheet.in.h:50
-+msgid "IP Transport Concentrator"
-+msgstr "Сакупљач ИП прено�а"
- 
--#~ msgid "/File/_Open..."
--#~ msgstr "/Датотека/Отворено..."
-+#: ../sheets/cisconetwork.sheet.in.h:51
-+msgid "DWDM Filter"
-+msgstr "ДВДМ филтер"
- 
--#  recent file list is dynamically inserted here
--#~ msgid "/File/---"
--#~ msgstr "/Датотека/---"
-+#: ../sheets/cisconetwork.sheet.in.h:52
-+msgid "WDM"
-+msgstr "ВДМ"
- 
--#~ msgid "/File/_Diagram tree"
--#~ msgstr "/Датотека/Стабло дијаграма"
-+#: ../sheets/cisconetwork.sheet.in.h:53
-+msgid "15200"
-+msgstr "15200"
- 
--#~ msgid "/File/Sheets and Objects..."
--#~ msgstr "/Датотека/Стране и објекти..."
-+#: ../sheets/cisconetwork.sheet.in.h:54
-+msgid "15800"
-+msgstr "15800"
- 
--#~ msgid "/File/_Preferences..."
--#~ msgstr "/Датотека/По�тавке..."
-+#: ../sheets/cisconetwork.sheet.in.h:55
-+msgid "ONS15104"
-+msgstr "О�С15104"
- 
--#~ msgid "/File/P_lugins..."
--#~ msgstr "/Датотека/Додаци..."
-+#: ../sheets/cisconetwork.sheet.in.h:56
-+msgid "10700"
-+msgstr "10700"
- 
--#~ msgid "/File/_Quit"
--#~ msgstr "/Датотека/Изађи"
-+#: ../sheets/cisconetwork.sheet.in.h:57
-+msgid "Metro 1500"
-+msgstr "Метро 1500"
- 
--#~ msgid "/_Help"
--#~ msgstr "/Помоћ"
-+#: ../sheets/cisconetwork.sheet.in.h:58
-+msgid "ONS15540"
-+msgstr "О�С15540"
- 
--#~ msgid "/Help/_Contents"
--#~ msgstr "/Помоћ/Сад_ржај"
-+#: ../sheets/cisconetwork.sheet.in.h:59
-+msgid "Automatic Protection Switching"
-+msgstr "Само�тално пребацивање заштите"
- 
--#~ msgid "/Help/---"
--#~ msgstr "/Помоћ/---"
-+#: ../sheets/cisconetwork.sheet.in.h:60
-+msgid "RPS"
-+msgstr "РПС"
- 
--#~ msgid "/Help/_About..."
--#~ msgstr "/Помоћ/О програму..."
-+#: ../sheets/cisconetwork.sheet.in.h:61
-+msgid "UPS"
-+msgstr "Извор непрекидног напајања"
- 
--#~ msgid "/File/_Save"
--#~ msgstr "/Датотека/Сними"
-+#: ../sheets/cisconetwork.sheet.in.h:62
-+msgid "LongReach CPE"
-+msgstr "Дугодометни ЦПЕ"
- 
--#~ msgid "/File/Save _As..."
--#~ msgstr "/Датотека/Сними као..."
-+#: ../sheets/cisconetwork.sheet.in.h:63
-+msgid "3X74 (floor) cluster controller"
-+msgstr "3Х74 (�пратни) контролер кла�тера"
- 
--#~ msgid "/File/_Export..."
--#~ msgstr "/Датотека/Извоз..."
-+#: ../sheets/cisconetwork.sheet.in.h:64
-+msgid "3174 (desktop) cluster controller"
-+msgstr "3174 (�тони) контролер кла�тера"
- 
--#~ msgid "/File/Page Set_up..."
--#~ msgstr "/Датотека/Подешавање �транице..."
-+#: ../sheets/cisconetwork.sheet.in.h:65
-+msgid "CSU/DSU"
-+msgstr "ЦСУ/ДСУ"
- 
--#~ msgid "/File/_Print Diagram..."
--#~ msgstr "/Датотека/Одштампај дијаграм..."
-+#: ../sheets/cisconetwork.sheet.in.h:66
-+msgid "WAN"
-+msgstr "��"
- 
--#~ msgid "/File/_Close"
--#~ msgstr "/Датотека/Затвори"
-+#: ../sheets/cisconetwork.sheet.in.h:67
-+msgid "Cloud"
-+msgstr "Облак"
- 
--#~ msgid "/_Edit"
--#~ msgstr "/_Уређивање"
-+#: ../sheets/cisconetwork.sheet.in.h:68
-+msgid "Cloud Gold"
-+msgstr "Златни облак"
- 
--#~ msgid "/Edit/_Undo"
--#~ msgstr "/Уређивање/Поништи"
-+#: ../sheets/cisconetwork.sheet.in.h:69
-+msgid "Cloud White"
-+msgstr "Бели облак"
- 
--#~ msgid "/Edit/_Redo"
--#~ msgstr "/Уређивање/Врати"
-+#: ../sheets/cisconetwork.sheet.in.h:70
-+msgid "Cloud Dark"
-+msgstr "Тамни облак"
- 
--#~ msgid "/Edit/---"
--#~ msgstr "/Уређивање/---"
-+#  Translators: Menu item Verb/Branch/Distribute
-+#: ../sheets/cisconetwork.sheet.in.h:71
-+msgid "Distributed Director"
-+msgstr "Ра�подељени директор"
- 
--#~ msgid "/Edit/_Copy"
--#~ msgstr "/Уређивање/Копирај"
-+#: ../sheets/cisconetwork.sheet.in.h:72
-+msgid "LocalDirector"
-+msgstr "Локални у�меривач"
- 
--#~ msgid "/Edit/C_ut"
--#~ msgstr "/Уређивање/И�еци"
-+#: ../sheets/cisconetwork.sheet.in.h:73
-+msgid "IOS SLB"
-+msgstr "ИОС СЛБ"
- 
--#~ msgid "/Edit/_Paste"
--#~ msgstr "/Уређивање/Убаци"
-+#: ../sheets/cisconetwork.sheet.in.h:74
-+msgid "MUX"
-+msgstr "МУК�"
- 
--#~ msgid "/Edit/_Duplicate"
--#~ msgstr "/Уређивање/У_дво�тручи"
-+#: ../sheets/cisconetwork.sheet.in.h:75
-+msgid "General Appliance"
-+msgstr "Општа направа"
- 
--#~ msgid "/Edit/_Delete"
--#~ msgstr "/Уређивање/Обриши"
-+#: ../sheets/cisconetwork.sheet.in.h:76
-+msgid "PAD"
-+msgstr "П�Д"
- 
--#~ msgid "/Edit/Copy Text"
--#~ msgstr "/Уређивање/Копирај тек�т"
-+#: ../sheets/cisconetwork.sheet.in.h:77
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "ЦДДИ/ФДДИ �акупљач"
- 
--#~ msgid "/Edit/Cut Text"
--#~ msgstr "/Уређивање/И�еци тек�т"
-+#: ../sheets/cisconetwork.sheet.in.h:78
-+msgid "FDDI Ring"
-+msgstr "ФДДИ пр�тен"
- 
--#~ msgid "/Edit/Paste _Text"
--#~ msgstr "/Уређивање/Убаци тек�т"
-+#: ../sheets/cisconetwork.sheet.in.h:79
-+msgid "TokenRing"
-+msgstr "Пр�тен парице"
- 
--#~ msgid "/Diagram/_Properties..."
--#~ msgstr "/Дијаграм/_О�обине..."
-+#: ../sheets/cisconetwork.sheet.in.h:80
-+msgid "MAU"
-+msgstr "М�У"
- 
--#~ msgid "/Diagram/_Layers..."
--#~ msgstr "/Дијаграм/С_лојеви..."
-+#: ../sheets/cisconetwork.sheet.in.h:81
-+msgid "Repeater"
-+msgstr "Понављач"
- 
--#~ msgid "/View/Zoom _In"
--#~ msgstr "/Преглед/Увећај"
-+#: ../sheets/cisconetwork.sheet.in.h:82
-+msgid "Bridge"
-+msgstr "Мо�т"
- 
--#~ msgid "/View/Zoom _Out"
--#~ msgstr "/Преглед/Удаљи"
-+#: ../sheets/cisconetwork.sheet.in.h:83
-+msgid "Breakout box"
-+msgstr "Кутија за и�какање"
- 
--#~ msgid "/View/_Zoom"
--#~ msgstr "/Преглед/Увећање"
-+#: ../sheets/cisconetwork.sheet.in.h:84
-+msgid "STB (set top box)"
-+msgstr "СТБ (�куп горњих кутија)"
- 
--#~ msgid "/View/Zoom/1600%"
--#~ msgstr "/Преглед/Увећање/1600%"
-+#: ../sheets/cisconetwork.sheet.in.h:85
-+msgid "TV"
-+msgstr "ТВ"
- 
--#~ msgid "/View/Zoom/800%"
--#~ msgstr "/Преглед/Увећање/800%"
-+#: ../sheets/cisconetwork.sheet.in.h:86
-+msgid "IPTV broadcast server"
-+msgstr "Сервер ИПТВ емитовања"
- 
--#~ msgid "/View/Zoom/400%"
--#~ msgstr "/Преглед/Увећање/400%"
-+#: ../sheets/cisconetwork.sheet.in.h:87
-+msgid "IPTV content manager"
-+msgstr "Управљач ИПТВ �адржајем"
- 
--#~ msgid "/View/Zoom/283%"
--#~ msgstr "/Преглед/Увећање/283%"
-+#: ../sheets/cisconetwork.sheet.in.h:88
-+msgid "VN2900"
-+msgstr "В�2900"
- 
--#~ msgid "/View/Zoom/200%"
--#~ msgstr "/Преглед/Увећање/200%"
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "В�5902"
- 
--#~ msgid "/View/Zoom/141%"
--#~ msgstr "/Преглед/Увећање/141%"
-+#: ../sheets/cisconetwork.sheet.in.h:90
-+msgid "VN5900"
-+msgstr "В�5900"
- 
--#~ msgid "/View/Zoom/100%"
--#~ msgstr "/Преглед/Увећање/100%"
-+#: ../sheets/cisconetwork.sheet.in.h:91
-+msgid "Catalyst Access Gateway"
-+msgstr "Катали�тички мрежни пролаз при�тупа"
- 
--#~ msgid "/View/Zoom/85%"
--#~ msgstr "/Преглед/Увећање/85%"
-+#: ../sheets/cisconetwork.sheet.in.h:92
-+msgid "Generic Gateway"
-+msgstr "Општи мрежни пролаз"
- 
--#~ msgid "/View/Zoom/70.7%"
--#~ msgstr "/Преглед/Увећање/70.7%"
-+#: ../sheets/cisconetwork.sheet.in.h:93
-+msgid "TransPath"
-+msgstr "Путања прено�а"
- 
--#~ msgid "/View/Zoom/50%"
--#~ msgstr "/Преглед/Увећање/50%"
-+#: ../sheets/cisconetwork.sheet.in.h:94
-+msgid "uBR910 Cable DSU"
-+msgstr "уБР910 кабал ДСУ"
- 
--#~ msgid "/View/Zoom/35.4%"
--#~ msgstr "/Преглед/Увећање/35.4%"
-+#: ../sheets/cisconetwork.sheet.in.h:95
-+msgid "Storage Solution Engine"
-+msgstr "Склоп решења �кладиштења"
- 
--#~ msgid "/View/Zoom/25%"
--#~ msgstr "/Преглед/Увећање/25%"
-+#: ../sheets/cisconetwork.sheet.in.h:96
-+msgid "Content Engine (Cache Director)"
-+msgstr "Си�тем �адржаја (управљање о�тавом)"
- 
--#~ msgid "/View/---"
--#~ msgstr "/Преглед/---"
-+#: ../sheets/cisconetwork.sheet.in.h:97
-+msgid "CDM Content Distribution Manager"
-+msgstr "ЦДМ управник ра�поделе �адржаја"
- 
--#~ msgid "/View/_AntiAliased"
--#~ msgstr "/Преглед/_Омекшано"
-+#: ../sheets/cisconetwork.sheet.in.h:98
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "Си�тем прображаја �адржаја (ЦТЕ)"
- 
--#~ msgid "/View/Show _Grid"
--#~ msgstr "/Преглед/По_кажи мрежу"
-+#: ../sheets/cisconetwork.sheet.in.h:99
-+msgid "ME 1100"
-+msgstr "МЕ 1100"
- 
--#~ msgid "/View/_Snap To Grid"
--#~ msgstr "/Преглед/Уравнај на мрежу"
-+#: ../sheets/cisconetwork.sheet.in.h:100
-+msgid "MAS Gateway"
-+msgstr "М�С мрежни пролаз"
- 
--#~ msgid "/View/Show _Rulers"
--#~ msgstr "/Преглед/Покажи лењире"
-+#: ../sheets/cisconetwork.sheet.in.h:101
-+msgid "File Engine"
-+msgstr "Погон датотеке"
- 
--#~ msgid "/View/Show _Connection Points"
--#~ msgstr "/Прикажи/Покажи тачке везе"
-+#: ../sheets/cisconetwork.sheet.in.h:102
-+msgid "Service Control"
-+msgstr "Контрола у�луга"
- 
--#~ msgid "/View/New _View"
--#~ msgstr "/Преглед/�ови поглед"
-+#: ../sheets/ciscotelephony.sheet.in.h:1
-+msgid "Cisco - Telephony"
-+msgstr "Ци�ко — Телефонија"
- 
--#~ msgid "/View/Show _All"
--#~ msgstr "/Изглед/Прикажи �ве"
-+#: ../sheets/ciscotelephony.sheet.in.h:2
-+msgid "Telephony shapes by Cisco"
-+msgstr "Облици за телефонију од Ци�коа"
- 
--#~ msgid "/View/Re_draw"
--#~ msgstr "/Преглед/Поново и�цртај"
-+#: ../sheets/ciscotelephony.sheet.in.h:3
-+msgid "Phone"
-+msgstr "Телефон"
- 
--#~ msgid "/_Objects"
--#~ msgstr "/Објекти"
-+#: ../sheets/ciscotelephony.sheet.in.h:4
-+msgid "Phone 2"
-+msgstr "Телефон 2"
- 
--#~ msgid "/Objects/Send to _Back"
--#~ msgstr "/Објекти/Преме�ти на крај"
-+#: ../sheets/ciscotelephony.sheet.in.h:5
-+msgid "Phone Ethernet"
-+msgstr "Етернет маги�трала"
- 
--#~ msgid "/Objects/Bring to _Front"
--#~ msgstr "/Објекти/Добаци на Површину"
-+#: ../sheets/ciscotelephony.sheet.in.h:6
-+msgid "Phone Appliance"
-+msgstr "Телефон�ка �права"
- 
--#~ msgid "/Objects/Send Backwards"
--#~ msgstr "/Објекти/Преме�ти уназад"
-+#: ../sheets/ciscotelephony.sheet.in.h:7
-+msgid "Phone Feature"
-+msgstr "У�луга телефонирања"
- 
--#~ msgid "/Objects/Bring Forwards"
--#~ msgstr "/Објекти/Преме�ти унапред"
-+#: ../sheets/ciscotelephony.sheet.in.h:8
-+msgid "Phone/Fax"
-+msgstr "Телефон/фак�"
- 
--#~ msgid "/Objects/---"
--#~ msgstr "/Објекти/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:9
-+msgid "HootPhone"
-+msgstr "Хут телефон"
- 
--#~ msgid "/Objects/_Group"
--#~ msgstr "/Објекти/Група"
-+#: ../sheets/ciscotelephony.sheet.in.h:10
-+msgid "IP Phone"
-+msgstr "ИП телефон"
- 
--#~ msgid "/Objects/_Ungroup"
--#~ msgstr "/Објекти/Одгрупи�ано"
-+#: ../sheets/ciscotelephony.sheet.in.h:11
-+msgid "IP Softphone"
-+msgstr "ИП �офтвер�ки телефон"
- 
--#~ msgid "/Objects/_Parent"
--#~ msgstr "/Објекти/_Садржалац"
-+#: ../sheets/ciscotelephony.sheet.in.h:12
-+msgid "Softphone"
-+msgstr "Софтвер�ки телефон"
- 
--#~ msgid "/Objects/_Unparent"
--#~ msgstr "/Објекти/�е_�адржалац"
-+#: ../sheets/ciscotelephony.sheet.in.h:13
-+msgid "Cellular Phone"
-+msgstr "Мобилни телефон"
- 
--#~ msgid "/Objects/_Unparent Children"
--#~ msgstr "/Објекти/Из_баци из �адржаоца"
-+#: ../sheets/ciscotelephony.sheet.in.h:14
-+msgid "Mobile Access IP Phone"
-+msgstr "ИП телефон покретног при�тупа"
- 
--#~ msgid "/Objects/Align"
--#~ msgstr "/Објекти/Поравнање"
-+#: ../sheets/ciscotelephony.sheet.in.h:15
-+msgid "Pager"
-+msgstr "Пејџер"
- 
--#~ msgid "/Objects/Align/Left"
--#~ msgstr "/Објекти/Поравнање/Лево"
-+#: ../sheets/ciscotelephony.sheet.in.h:16
-+msgid "Fax"
-+msgstr "Фак�"
- 
--#~ msgid "/Objects/Align/Center"
--#~ msgstr "/Објекти/Поравнање/Центар"
-+#: ../sheets/ciscotelephony.sheet.in.h:17
-+msgid "Turret"
-+msgstr "Кула"
- 
--#~ msgid "/Objects/Align/Right"
--#~ msgstr "/Објекти/Поравнање/Де�но"
-+#: ../sheets/ciscotelephony.sheet.in.h:18
-+msgid "Octel"
-+msgstr "Октел"
- 
--#~ msgid "/Objects/Align/---"
--#~ msgstr "/Објекти/Поравнање/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:19
-+msgid "Radio Tower"
-+msgstr "Радио торањ"
- 
--#~ msgid "/Objects/Align/Top"
--#~ msgstr "/Објекти/Поравнање/Горе"
-+#: ../sheets/ciscotelephony.sheet.in.h:20
-+msgid "PBX"
-+msgstr "Телефон�ка централа"
- 
--#~ msgid "/Objects/Align/Middle"
--#~ msgstr "/Објекти/Поравнање/Средина"
-+#: ../sheets/ciscotelephony.sheet.in.h:21
-+msgid "PBX Switch"
-+msgstr "ПБИк� пребацивач"
- 
--#~ msgid "/Objects/Align/Bottom"
--#~ msgstr "/Објекти/Поравнање/Доле"
-+#: ../sheets/ciscotelephony.sheet.in.h:22
-+msgid "Class 4/5 switch"
-+msgstr "Пребацивач 4/5 разреда"
- 
--#~ msgid "/Objects/Align/Adjacent"
--#~ msgstr "/Објекти/Поравнање/Су�едно"
-+#: ../sheets/ciscotelephony.sheet.in.h:23
-+msgid "SONET MUX"
-+msgstr "СО�ЕТ МУК�"
- 
--#~ msgid "/Objects/Align/Stacked"
--#~ msgstr "/Објекти/Поравнање/�аређано"
-+#: ../sheets/ciscotelephony.sheet.in.h:24
-+msgid "ADM"
-+msgstr "�ДМ"
- 
--#~ msgid "/Objects/_Properties..."
--#~ msgstr "/Објекти/_О�обине..."
-+#: ../sheets/ciscotelephony.sheet.in.h:25
-+msgid "ITP"
-+msgstr "ИТП"
- 
--#~ msgid "/Select/All"
--#~ msgstr "/Изабери/Све"
-+#: ../sheets/ciscotelephony.sheet.in.h:26
-+msgid "ATA"
-+msgstr "�Т�"
- 
--#~ msgid "/Select/None"
--#~ msgstr "/Изабери/�ишта"
-+#: ../sheets/ciscotelephony.sheet.in.h:27
-+msgid "SIP Proxy Server"
-+msgstr "СИП �ервер по�редник"
- 
--#~ msgid "/Select/Invert"
--#~ msgstr "/Изабери/Преокренуто"
-+#: ../sheets/ciscotelephony.sheet.in.h:28
-+msgid "Gatekeeper"
-+msgstr "Чувар капије"
- 
--#~ msgid "/Select/---"
--#~ msgstr "/Изабери/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:29
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr "Гла�овни мрежни пролаз МГИк� 8000 �ерије"
- 
--#~ msgid "/Select/Transitive"
--#~ msgstr "/Одабери/Прелазни"
-+#: ../sheets/ciscotelephony.sheet.in.h:30
-+msgid "End Office"
-+msgstr "Крајња канцеларија"
- 
--#~ msgid "/Select/Connected"
--#~ msgstr "/Изабери/Повезано�т"
-+#: ../sheets/ciscotelephony.sheet.in.h:31
-+msgid "Voice-Enabled Access Server"
-+msgstr "Гла�овни �ервер при�тупа"
- 
--#~ msgid "/Select/Replace"
--#~ msgstr "/Изабери/Замени"
-+#: ../sheets/ciscotelephony.sheet.in.h:32
-+msgid "Voice-Enabled Router"
-+msgstr "Гла�овни у�меравач"
- 
--#~ msgid "/Select/Union"
--#~ msgstr "/Изабери/Уједини"
-+#: ../sheets/ciscotelephony.sheet.in.h:33
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Гла�овни �ТМ пребацивач"
- 
--#~ msgid "/Select/Intersection"
--#~ msgstr "/Изабери/Пре�ек"
-+#: ../sheets/ciscotelephony.sheet.in.h:34
-+msgid "CallManager"
-+msgstr "Управљач позивом"
- 
--#~ msgid "/Select/Remove"
--#~ msgstr "/Изабери/Уклони"
-+#: ../sheets/ciscotelephony.sheet.in.h:35
-+msgid "IP Telephony Router"
-+msgstr "У�меривач за ИП телефонију"
- 
--#, fuzzy
--#~ msgid "/Select/Inverse"
--#~ msgstr "/Изабери/Преокренуто"
-+#: ../sheets/ciscotelephony.sheet.in.h:36
-+msgid "Mobile Access Router"
-+msgstr "У�меривач покретног при�тупа"
- 
--#~ msgid "/_Tools"
--#~ msgstr "/�лати"
-+#: ../sheets/ciscotelephony.sheet.in.h:37
-+msgid "H.323"
-+msgstr "Ð¥.323"
- 
--#~ msgid "/Tools/Modify"
--#~ msgstr "/�лати/Измени"
-+#: ../sheets/ciscotelephony.sheet.in.h:38
-+msgid "STP"
-+msgstr "СТП"
- 
--#~ msgid "/Tools/Magnify"
--#~ msgstr "/�лати/Увеличај"
-+#: ../sheets/ciscotelephony.sheet.in.h:39
-+msgid "BTS 10200"
-+msgstr "БТС 10200"
- 
--#~ msgid "/Tools/Scroll"
--#~ msgstr "/�лати/У�правно померање"
-+#: ../sheets/ciscotelephony.sheet.in.h:40
-+msgid "Generic softswitch"
-+msgstr "Обичан �офтвер�ки пребацивач"
- 
--#~ msgid "/Tools/Text"
--#~ msgstr "/�лати/Тек�т"
-+#: ../sheets/ciscotelephony.sheet.in.h:41
-+msgid "SC2200/VSC3000 host"
-+msgstr "СЦ2200/ВСЦ3000 рачунар"
- 
--#~ msgid "/Tools/Box"
--#~ msgstr "/�лати/Кућица"
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Управљач виртуелног пребацивача (ВСЦ 3000)"
- 
--#~ msgid "/Tools/Ellipse"
--#~ msgstr "/�лати/Елип�а"
-+#: ../sheets/ciscotelephony.sheet.in.h:43
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "СЦ2200 (�игнализирајући контролер)"
- 
--#~ msgid "/Tools/Polygon"
--#~ msgstr "/�лати/Полигон"
-+#: ../sheets/ciscotelephony.sheet.in.h:44
-+msgid "MoH server (Music on Hold)"
-+msgstr "МоХ �ервер (музика задржана)"
- 
--#~ msgid "/Tools/Beziergon"
--#~ msgstr "/�лати/Безиеров полигон"
-+#: ../sheets/ciscotelephony.sheet.in.h:45
-+msgid "TDM router"
-+msgstr "ТДМ у�меривач"
- 
--#~ msgid "/Tools/---"
--#~ msgstr "/�лати/---"
-+#: ../sheets/ciscotelephony.sheet.in.h:46
-+msgid "6701"
-+msgstr "6701"
- 
--#~ msgid "/Tools/Line"
--#~ msgstr "/�лати/Линије"
-+#: ../sheets/ciscotelephony.sheet.in.h:47
-+msgid "6705"
-+msgstr "6705"
- 
--#~ msgid "/Tools/Arc"
--#~ msgstr "/�лати/Лук"
-+#: ../sheets/ciscotelephony.sheet.in.h:48
-+msgid "6732"
-+msgstr "6732"
- 
--#~ msgid "/Tools/Zigzagline"
--#~ msgstr "/�лати/Цик-цак линија"
-+#: ../sheets/ciscotelephony.sheet.in.h:49
-+msgid "IAD router"
-+msgstr "И�Д у�меривач"
- 
--#~ msgid "/Tools/Polyline"
--#~ msgstr "/�лати/Полигон�ка линија"
-+#: ../sheets/ciscotelephony.sheet.in.h:50
-+msgid "ICS"
-+msgstr "ИЦС"
- 
--#~ msgid "/Tools/Bezierline"
--#~ msgstr "/�лати/Безијерова линија"
-+#: ../sheets/ciscotelephony.sheet.in.h:51
-+msgid "ICM"
-+msgstr "ИЦМ"
- 
--#~ msgid "/Tools/Image"
--#~ msgstr "/�лати/Слика"
-+#: ../sheets/ciscotelephony.sheet.in.h:52
-+msgid "IntelliSwitch Stack"
-+msgstr "Стек паметног пребацивача"
- 
--#~ msgid "/_Input Methods"
--#~ msgstr "/_�ачини уно�а"
-+#: ../sheets/ciscotelephony.sheet.in.h:53
-+msgid "Unity server"
-+msgstr "Јунити �ервер"
- 
--#~ msgid "Diagram Menu"
--#~ msgstr "Мени Дијаграма"
-+#: ../sheets/ciscotelephony.sheet.in.h:54
-+msgid "Unity Express"
-+msgstr "Јунити ек�пре�"
- 
--#~ msgid ""
--#~ "Can't find menu entry '%s'!\n"
--#~ "This is probably a i18n problem (try LANG=C)."
--#~ msgstr ""
--#~ "�е могу да нађем �тавку менија „%s“!\n"
--#~ "Ово је вероватно проблем превода (пробајте LANG=C)."
-+#: ../sheets/ciscotelephony.sheet.in.h:55
-+msgid "MCU"
-+msgstr "МЦУ"
- 
--#~ msgid "<Toolbox>/File/Plugins..."
--#~ msgstr "<Кутија за алат>/Датотека/Додаци..."
-+#: ../sheets/ciscotelephony.sheet.in.h:56
-+msgid "uMG series"
-+msgstr "уМГ �ерија"
- 
--#~ msgid "<Toolbox>/File/Quit"
--#~ msgstr "<Кутија за алат>/Датотека/Заврши..."
-+#: ../sheets/civil.sheet.in.h:1
-+msgid "Civil"
-+msgstr "Грађевинар�тво"
- 
--#, fuzzy
--#~ msgid "Macro Cell"
--#~ msgstr "Позив макроа"
-+#: ../sheets/civil.sheet.in.h:2
-+msgid "Civil Engineering Components"
-+msgstr "Справе у грађевинар�тву"
- 
--#, fuzzy
--#~ msgid "Micro Cell"
--#~ msgstr "Позив макроа"
-+#: ../sheets/civil.sheet.in.h:3
-+msgid "Vertical rest"
-+msgstr "У�правни на�лон"
- 
--#~ msgid "Cell Type:"
--#~ msgstr "Вр�та ћелије:"
-+#: ../sheets/civil.sheet.in.h:4
-+msgid "Horizontal rest"
-+msgstr "Водораван на�лон"
- 
--#~ msgid "Subscribers"
--#~ msgstr "Претплатници"
-+#: ../sheets/civil.sheet.in.h:5
-+msgid "Bivalent vertical rest"
-+msgstr "Бивалентни у�правни на�лон"
- 
--#~ msgid "EML"
--#~ msgstr "EML"
-+#: ../sheets/civil.sheet.in.h:6
-+msgid "Reference line"
-+msgstr "Референтна линија"
- 
--#~ msgid "Editor for EML Static Structure Diagrams."
--#~ msgstr "Уређивач за EML �татичне �труктурне дијаграме."
-+#: ../sheets/civil.sheet.in.h:7
-+msgid "Water level"
-+msgstr "�иво воде"
- 
--#~ msgid "Instantiation. One process create others"
--#~ msgstr "Образовање. Један проце� образује друге"
-+#: ../sheets/civil.sheet.in.h:8
-+msgid "Soil"
-+msgstr "Тло"
- 
--#~ msgid "Interaction between processes."
--#~ msgstr "Међуделовање проце�а."
-+#: ../sheets/civil.sheet.in.h:9
-+msgid "Horizontally aligned arrow"
-+msgstr "Водоравно по�тављена �трелица"
- 
--#~ msgid "3/3 distributor"
--#~ msgstr "3/3 ра�подељивач"
-+#: ../sheets/civil.sheet.in.h:10
-+msgid "Vertically aligned arrow"
-+msgstr "У�правно по�тављена �трелица"
- 
--#~ msgid "5/3 distributor"
--#~ msgstr "5/3 ра�подељивач"
-+#: ../sheets/civil.sheet.in.h:11
-+msgid "Horizontal limiting line"
-+msgstr "Водоравна ограничавајућа линија"
- 
--#~ msgid "Fill colour"
--#~ msgstr "Боја и�пуне"
-+#: ../sheets/civil.sheet.in.h:12
-+msgid "Vertical limiting line"
-+msgstr "У�правна ограничавајућа линија"
- 
--#~ msgid "Line colour"
--#~ msgstr "Боја линије"
-+#: ../sheets/civil.sheet.in.h:13
-+msgid "Horizontally aligned pump"
-+msgstr "Водоравно по�тављена пумпа"
- 
--#~ msgid "Text colour"
--#~ msgstr "Боја Тек�та"
-+#: ../sheets/civil.sheet.in.h:14
-+msgid "Vertically aligned pump"
-+msgstr "У�правно по�тављена пумпа"
- 
--#, fuzzy
--#~ msgid "Implmentation"
--#~ msgstr "Изведба"
-+#: ../sheets/civil.sheet.in.h:15
-+msgid "Horizontally aligned compressor"
-+msgstr "Водоравно по�тављен компре�ор"
- 
--#~ msgid "Workstation"
--#~ msgstr "Радна �таница"
-+#: ../sheets/civil.sheet.in.h:16
-+msgid "Vertically aligned compressor"
-+msgstr "У�правно по�тављен компре�ор"
- 
--#~ msgid "Cisco hub"
--#~ msgstr "Cisco хаб"
-+#: ../sheets/civil.sheet.in.h:17
-+msgid "Vertically aligned valve"
-+msgstr "У�правно по�тављен вентил"
- 
--#~ msgid "Content switch module"
--#~ msgstr "Модул �вича за �адржај"
-+#: ../sheets/civil.sheet.in.h:18
-+msgid "Horizontally aligned valve"
-+msgstr "Водоравно по�тављен вентил"
- 
--#~ msgid "Voice switch"
--#~ msgstr "Гла�овни �вич"
-+#: ../sheets/civil.sheet.in.h:19
-+msgid "Backflow preventer"
-+msgstr "Спречавач тока уназад"
- 
--#~ msgid "Voice switch 2"
--#~ msgstr "Гла�овни �вич 2"
-+#: ../sheets/civil.sheet.in.h:20
-+msgid "Motor"
-+msgstr "Мотор"
- 
--#~ msgid "Dot-Dot"
--#~ msgstr "Тачка-Тачка"
-+#: ../sheets/civil.sheet.in.h:21
-+msgid "Gas bottle"
-+msgstr "Га�на боца"
- 
--#~ msgid "SVX (interchangeable with End office)"
--#~ msgstr "SVX (измењиво �а Крајем канцеларије)"
-+#: ../sheets/civil.sheet.in.h:22
-+msgid "Frequency converter"
-+msgstr "Претварач уче�тано�ти"
- 
--#~ msgid "Telecommuter house/router"
--#~ msgstr "Кућа/рутер телекомјутера"
-+#: ../sheets/civil.sheet.in.h:23
-+msgid "Vertically aligned propeller"
-+msgstr "У�правно по�тављен пропелер"
- 
--#~ msgid "6705 Integrated access device"
--#~ msgstr "6705 интегри�ани при�тупни уређај"
-+#: ../sheets/civil.sheet.in.h:24
-+msgid "Aerator with bubbles"
-+msgstr "Вентилација �а мехурима"
- 
--#~ msgid "6732 Multiservice access platform"
--#~ msgstr "6732 вишеу�лужна при�тупна платформа"
-+#: ../sheets/civil.sheet.in.h:25
-+msgid "Rotor"
-+msgstr "Ротор"
- 
--#~ msgid "CDDI-FDDI"
--#~ msgstr "CDDI-FDDI"
-+#: ../sheets/civil.sheet.in.h:26
-+msgid "Final-settling basin"
-+msgstr "Коначно-таложно корито"
- 
--#~ msgid "DPT"
--#~ msgstr "DPT"
-+#: ../sheets/civil.sheet.in.h:27
-+msgid "Preliminary clarification tank"
-+msgstr "Пробни �уд за пречишћавање"
- 
--#~ msgid "IPTC"
--#~ msgstr "IPTC"
-+#: ../sheets/civil.sheet.in.h:28
-+msgid "Basin"
-+msgstr "Корито"
- 
--#~ msgid "NetRanger intrusion detection system"
--#~ msgstr "NetRanger �и�тем за примећивање уљеза"
-+#: ../sheets/civil.sheet.in.h:29
-+msgid "Container"
-+msgstr "Садржалац"
- 
--#~ msgid "NetSonar security scanner"
--#~ msgstr "NetSonar безбедно�ни �кенер"
-+#: ../sheets/jigsaw.sheet.in.h:1
-+msgid "Jigsaw"
-+msgstr "Слагалица"
- 
--#~ msgid "ONS15500 DWDM platform"
--#~ msgstr "ONS15500 DWDM платформа"
-+#: ../sheets/jigsaw.sheet.in.h:2
-+msgid "Pieces of a jigsaw"
-+msgstr "Делови �лагалице"
- 
--#~ msgid "PAD X.28"
--#~ msgstr "PAD X.28"
-+#: ../sheets/jigsaw.sheet.in.h:3
-+msgid "Jigsaw - part_oioi"
-+msgstr "Слагалица — део_oioi"
- 
--#~ msgid "7505"
--#~ msgstr "7505"
-+#: ../sheets/jigsaw.sheet.in.h:4
-+msgid "Jigsaw - part_ioio"
-+msgstr "Слагалица — део_ioio"
- 
--#~ msgid "ATM router"
--#~ msgstr "ATM рутер"
-+#: ../sheets/jigsaw.sheet.in.h:5
-+msgid "Jigsaw - part_iiii"
-+msgstr "Слагалица — део_iiii"
- 
--#~ msgid "ATM tag sw gigabit router"
--#~ msgstr "ATM tag �офтвер�ки гигабитни рутер"
-+#: ../sheets/jigsaw.sheet.in.h:6
-+msgid "Jigsaw - part_oooo"
-+msgstr "Слагалица — део_oooo"
- 
--#~ msgid "Cisco - Router"
--#~ msgstr "Cisco — рутер"
-+#: ../sheets/jigsaw.sheet.in.h:7
-+msgid "Jigsaw - part_oooi"
-+msgstr "Слагалица — део_oooi"
- 
--#~ msgid "Gigabit switch router (ATM tag)"
--#~ msgstr "Гигабитни �вич рутер (ATM ознака)"
-+#: ../sheets/jigsaw.sheet.in.h:8
-+msgid "Jigsaw - part_iooo"
-+msgstr "Слагалица — део_iooo"
- 
--#~ msgid "Router in building"
--#~ msgstr "Рутер у згради"
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Слагалица — део_oioo"
- 
--#~ msgid "Router shapes by Cisco"
--#~ msgstr "Облици рутера од �тране Cisco-а"
-+#: ../sheets/jigsaw.sheet.in.h:10
-+msgid "Jigsaw - part_ooio"
-+msgstr "Слагалица — део_ooio"
- 
--#~ msgid "Workgroup 5000 multilayer switch"
--#~ msgstr "Workgroup 5000 више�лојни �вич"
-+#: ../sheets/jigsaw.sheet.in.h:11
-+msgid "Jigsaw - part_iioo"
-+msgstr "Слагалица — део_iioo"
- 
--#~ msgid "Workgroup 5002 multilayer switch"
--#~ msgstr "Workgroup 5002 више�лојни �вич"
-+#: ../sheets/jigsaw.sheet.in.h:12
-+msgid "Jigsaw - part_oiio"
-+msgstr "Слагалица — део_oiio"
- 
--#~ msgid "Workgroup 5500 multilayer switch"
--#~ msgstr "Workgroup 5500 више�лојни �вич"
-+#: ../sheets/jigsaw.sheet.in.h:13
-+msgid "Jigsaw - part_ooii"
-+msgstr "Слагалица — део_ooii"
- 
--#~ msgid "uBR910"
--#~ msgstr "uBR910"
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Слагалица — део_iooi"
- 
--#~ msgid "Export to file format and exit.  Supported formats are: %s"
--#~ msgstr "Извези у вр�ту датотеке и изађи. Подржане вр�те �у: %s"
-+#: ../sheets/jigsaw.sheet.in.h:15
-+msgid "Jigsaw - part_oiii"
-+msgstr "Слагалица — део_oiii"
- 
--#~ msgid "FORMAT"
--#~ msgstr "ВРСТ�"
-+#: ../sheets/jigsaw.sheet.in.h:16
-+msgid "Jigsaw - part_ioii"
-+msgstr "Слагалица — део_ioii"
- 
--#~ msgid "Close"
--#~ msgstr "Затвори"
-+#: ../sheets/jigsaw.sheet.in.h:17
-+msgid "Jigsaw - part_iioi"
-+msgstr "Слагалица — део_iioi"
- 
--#~ msgid "/Help/_Manual"
--#~ msgstr "/Помоћ/Приручник"
-+#: ../sheets/jigsaw.sheet.in.h:18
-+msgid "Jigsaw - part_iiio"
-+msgstr "Слагалица — део_iiio"
- 
--#~ msgid "Could not open `%s' for writing"
--#~ msgstr "�е може да отвори '%s' ради упи�а"
-+#: ../sheets/network.sheet.in.h:2
-+msgid "Objects to design network diagrams with"
-+msgstr "Објекти �а којима �е израђују мрежни дијаграми"
- 
--#~ msgid "Can't open history file for writing."
--#~ msgstr "�е може да отвори датотеку и�торије за пи�ање."
-+#: ../sheets/network.sheet.in.h:3
-+msgid "Computer"
-+msgstr "Рачунар"
- 
--#~ msgid "Diagram editor"
--#~ msgstr "Уређивач дијаграма"
-+#: ../sheets/network.sheet.in.h:5
-+msgid "Storage"
-+msgstr "Складиштење"
- 
--#~ msgid "Select font"
--#~ msgstr "Изаберите фонт"
-+#: ../sheets/network.sheet.in.h:6
-+msgid "Ethernet bus"
-+msgstr "Етернет маги�трала"
- 
--#~ msgid "Helvetica"
--#~ msgstr "Helvetica"
-+#: ../sheets/network.sheet.in.h:7
-+msgid "Simple printer"
-+msgstr "Једно�таван штампач"
- 
--#~ msgid "GdkPixbuf bitmap"
--#~ msgstr "GdkPixbuf битмапа"
-+#: ../sheets/network.sheet.in.h:8
-+msgid "WAN connection"
-+msgstr "В�� веза"
- 
--#~ msgid "Unexpected SVG path element"
--#~ msgstr "�еочекивани елемент СВГ путање"
-+#: ../sheets/network.sheet.in.h:9
-+msgid "WAN link"
-+msgstr "В�� везица"
- 
--#~ msgid "Courier"
--#~ msgstr "Пошиљка"
-+#: ../sheets/network.sheet.in.h:10
-+msgid "Stackable hub or switch"
-+msgstr "Откачив разводник или пребацивач"
- 
--#~ msgid "Could not find SVG namespace."
--#~ msgstr "�е могу да нађе SVG про�тор имена."
-+#: ../sheets/network.sheet.in.h:11
-+msgid "Modular switching system"
-+msgstr "Модуларни �и�тем пребацивања"
- 
--#~ msgid "Error occured while printing"
--#~ msgstr "Дошло је до грешке приликом штампања"
-+#: ../sheets/network.sheet.in.h:12
-+msgid "24 Port Patch Panel"
-+msgstr "Панел уметка �а 24 прикључака"
- 
--#~ msgid "Show diagram tree"
--#~ msgstr "Прикажи �табло дијаграма"
-+#: ../sheets/network.sheet.in.h:13
-+msgid "RJ45 wall-plug"
-+msgstr "РЈ45 зидна утичница"
- 
--#~ msgid "Modify sheets and their objects"
--#~ msgstr "Измени �транице и њихове објекте"
-+#: ../sheets/network.sheet.in.h:14
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Зидна утичница за �цЕ�Д каблов�ки �и�тем"
- 
--#~ msgid "_Print Diagram..."
--#~ msgstr "Одштампај дијаграм..."
-+#: ../sheets/network.sheet.in.h:15
-+msgid "Simple modem"
-+msgstr "Једно�таван модем"
- 
--#~ msgid "Zoom _In"
--#~ msgstr "Увећај"
-+#: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "�нтена за бежични прено�"
- 
--#~ msgid "Zoom in 50%"
--#~ msgstr "Увећај 50%"
-+#: ../sheets/network.sheet.in.h:17
-+msgid "Mobile telephony base station"
-+msgstr "Базна �таница мобилне телефоније"
- 
--#~ msgid "Zoom _Out"
--#~ msgstr "Умањи"
-+#: ../sheets/network.sheet.in.h:19
-+msgid "Mobile telephony cell"
-+msgstr "Јединица мобилне телефоније"
- 
--#~ msgid "Zoom out 50%"
--#~ msgstr "Умањи 50%"
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Симбол у�меривача"
- 
--#~ msgid "Diagram Properties..."
--#~ msgstr "О�обине дијаграма..."
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Симбол пребацивача"
- 
--#~ msgid "Show _All"
--#~ msgstr "Прикажи �ве"
-+#: ../sheets/network.sheet.in.h:22
-+msgid "ATM switch symbol"
-+msgstr "Симбол �ТМ пребацивача"
- 
--#~ msgid "Redraw"
--#~ msgstr "Поново и�цртај"
-+#: ../sheets/network.sheet.in.h:23
-+msgid "Firewall router"
-+msgstr "У�меривач мрежне баријере"
- 
--#~ msgid "Equal Distance"
--#~ msgstr "Једнака удаљено�т"
-+#: ../sheets/network.sheet.in.h:24
-+msgid "Workstation monitor"
-+msgstr "Праћење радне �танице"
- 
--#~ msgid "Align _Horizontal"
--#~ msgstr "Водоравно поравнање"
-+#: ../sheets/network.sheet.in.h:25
-+msgid "UNIX workstation"
-+msgstr "ЈУ�ИКС радна �таница"
- 
--#~ msgid "Align _Vertical"
--#~ msgstr "У�правно поравнање"
-+#: ../sheets/network.sheet.in.h:26
-+msgid "Desktop PC"
-+msgstr "Стони лични рачунар"
- 
--#~ msgid "_Properties..."
--#~ msgstr "О�о_бине..."
-+#: ../sheets/network.sheet.in.h:27
-+msgid "Laptop PC"
-+msgstr "Прено�ни рачунар"
- 
--#~ msgid "Length: "
--#~ msgstr "Дужина:"
-+#: ../sheets/network.sheet.in.h:28
-+msgid "Bigtower PC"
-+msgstr "Лични рачунар у ви�оком кућишту"
- 
--#~ msgid "Width: "
--#~ msgstr "Ширина:"
-+#: ../sheets/network.sheet.in.h:29
-+msgid "Miditower PC"
-+msgstr "Лични рачунар у �редњем кућишту"
- 
--#~ msgid "Delete"
--#~ msgstr "Обриши"
-+#: ../sheets/network.sheet.in.h:30
-+msgid "Minitower PC"
-+msgstr "Лични рачунар у малом кућишту"
- 
--#~ msgid "Relay"
--#~ msgstr "Релеј"
-+#: ../sheets/network.sheet.in.h:31
-+msgid "Speaker with integrated amplifier"
-+msgstr "Звучник �а уграђеним појачалом"
- 
--#~ msgid "/View/Diagram Properties..."
--#~ msgstr "/Преглед/По�тавке дијаграма..."
-+#: ../sheets/network.sheet.in.h:32
-+msgid "Speaker without amplifier"
-+msgstr "Звучник без појачала"
- 
--#~ msgid "/Objects/Align Horizontal/---"
--#~ msgstr "/Објекти/Водоравно Поравнање/---"
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "3,5 инчна ди�кета"
- 
--#~ msgid "/Objects/Align Horizontal/Equal Distance"
--#~ msgstr "/Објекти/Поде�и Водоравно/Једнака удаљено�т"
-+#: ../sheets/network.sheet.in.h:34
-+msgid "ZIP disk"
-+msgstr "ЗИП ди�к"
- 
--#~ msgid "/Objects/Align Horizontal/Adjacent"
--#~ msgstr "/Објекти/Водоравно Поравнање/Подешавање"
-+#: ../sheets/network.sheet.in.h:35
-+msgid "External DAT drive"
-+msgstr "Спољни Д�Т уређај"
- 
--#~ msgid "/Objects/Align Vertical/---"
--#~ msgstr "/Објекти/У�правно Поравнање/---"
-+#: ../sheets/network.sheet.in.h:36
-+msgid "Mobile phone"
-+msgstr "Мобилни телефон"
- 
--#~ msgid "/Objects/Align Vertical/Equal Distance"
--#~ msgstr "/Објекти/Поде�и У�правно/Једнака удаљено�т"
-+#: ../sheets/network.sheet.in.h:38
-+msgid "Plotter"
-+msgstr "Цртач"
- 
--#~ msgid "/_Dialogs"
--#~ msgstr "/_Прозори"
-+#: ../sheets/network.sheet.in.h:39
-+msgid "Digitizing board"
-+msgstr "Табла за дигитализацију"
- 
--#~ msgid "No object menu"
--#~ msgstr "�ема менија објекта"
-+#: ../sheets/sybase.sheet.in.h:1
-+msgid "Sybase"
-+msgstr "Сибејз"
- 
--#~ msgid "Arrow type none -- shouldn't happen\n"
--#~ msgstr "Вр�та �трелице је ништа — не �ме �е догодити\n"
-+#: ../sheets/sybase.sheet.in.h:2
-+msgid "Objects to design Sybase replication domain diagrams with"
-+msgstr "Објекти за израду графикона за репликациони домен Сибејза"
- 
--#~ msgid "fig, mp, plt, hpgl, "
--#~ msgstr "fig, mp, plt, hpgl, "
-+#: ../sheets/sybase.sheet.in.h:3
-+msgid "Sybase dataserver"
-+msgstr "Сибејзов �ервер података"
- 
--#~ msgid "shape, svg, tex, "
--#~ msgstr "shape, svg, tex, "
-+#: ../sheets/sybase.sheet.in.h:4
-+msgid "Sybase replication server"
-+msgstr "Сибејзов репликациони �ервер"
- 
--#~ msgid "wpg"
--#~ msgstr "wpg"
-+#: ../sheets/sybase.sheet.in.h:5
-+msgid "Log transfer manager or rep agent"
-+msgstr "Прати управника прено�ом или пред�тавника"
- 
--#  &export_file_format
--#~ msgid "Export to file format and exit"
--#~ msgstr "Извези у нови формат и изађи"
-+#: ../sheets/sybase.sheet.in.h:6
-+msgid "Stable storage device"
-+msgstr "Стабилни уређај за �кладиштење"
- 
--#~ msgid "%s error: can specify only one of -f or -o."
--#~ msgstr "%s грешка: може да одреди �амо једно од -f или -o."
-+#: ../sheets/sybase.sheet.in.h:7
-+msgid "Sybase client application"
-+msgstr "Сибејзов програм клијента"
- 
--#~ msgid "Encapsulated Postscript (using builtin PS fonts)"
--#~ msgstr "Угњеждени По�т�крипт (EPS — кори�ти уграђене По�т�крипт фонтове)"
-+#: ../sheets/sybase.sheet.in.h:8
-+msgid "Replication server manager"
-+msgstr "Управник репликационим �ервером"
-diff --git a/po/sr@latin.po b/po/sr@latin.po
-new file mode 100644
-index 0000000..3144b5b
---- /dev/null
-+++ b/po/sr@latin.po
-@@ -0,0 +1,10579 @@
-+# Serbian translation of dia
-+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
-+# This file is distributed under the same license as the dia package.
-+# Maintainer: Dejan Matijević <dmax@neobee.net>
-+# Reviewed on 2004-03-24 by: Danilo Å egan <danilo@prevod.org>
-+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2012, 2013.
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: dia\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dia&ke"
-+"ywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2013-02-10 17:29+0000\n"
-+"PO-Revision-Date: 2013-04-09 21:10+0200\n"
-+"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
-+"Language-Team: Serbian <gnom@prevod.org>\n"
-+"Language: sr\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-+"X-Project-Style: gnome\n"
-+
-+#. This is not an errror
-+#: ../app/app_procs.c:209
-+#, c-format
-+msgid "Warning: invalid layer range %lu - %lu\n"
-+msgstr "Upozorenje: neispravni opseg sloja %lu — %lu\n"
-+
-+#: ../app/app_procs.c:221
-+#, c-format
-+msgid "Warning: Layer %lu (%s) selected more than once.\n"
-+msgstr "Upozorenje: Sloj %lu (%s) je izabran više od jednom.\n"
-+
-+#: ../app/app_procs.c:247
-+#, c-format
-+msgid "Warning: Layer %d (%s) selected more than once.\n"
-+msgstr "Upozorenje: Sloj %d (%s) je izabran više od jednom.\n"
-+
-+#: ../app/app_procs.c:256
-+#, c-format
-+msgid "Warning: There is no layer named %s\n"
-+msgstr "Upozorenje: Ne postoji sloj pod nazivom %s\n"
-+
-+#: ../app/app_procs.c:338
-+#, c-format
-+msgid "%s error: don't know how to export into %s\n"
-+msgstr "%s greška: ne znam kako da izvezem u %s\n"
-+
-+#: ../app/app_procs.c:347
-+#, c-format
-+msgid "%s error: input and output file name is identical: %s"
-+msgstr "%s greška: nazivi ulazne i izlazne datoteke su isti: %s"
-+
-+#: ../app/app_procs.c:355
-+#, c-format
-+msgid "%s error: need valid input file %s\n"
-+msgstr "%s graška: potrebna je ispravna ulazna datoteka %s\n"
-+
-+#. if (!quiet)
-+#: ../app/app_procs.c:383
-+#, c-format
-+msgid "%s --> %s\n"
-+msgstr "%s ——> %s\n"
-+
-+#: ../app/app_procs.c:558
-+#, c-format
-+msgid "Can't find output format/filter %s\n"
-+msgstr "Ne mogu da nađem izlazni oblik/filter %s\n"
-+
-+#: ../app/app_procs.c:628
-+#, c-format
-+msgid "Input-directory '%s' must exist!\n"
-+msgstr "Ulazni direktorijum „%s“ mora da postoji!\n"
-+
-+#: ../app/app_procs.c:645
-+#, c-format
-+msgid "Output-directory '%s' must exist!\n"
-+msgstr "Izlazni direktorijum „%s“ mora da postoji!\n"
-+
-+#. Translators:  The argument is a list of options, not to be translated
-+#: ../app/app_procs.c:702
-+#, c-format
-+msgid "Select the filter/format out of: %s"
-+msgstr "Izaberite filter/oblik iz sledećih: %s"
-+
-+#. &export_file_name
-+#: ../app/app_procs.c:720
-+msgid "Export loaded file and exit"
-+msgstr "Izvozi u�itanu datoteku i izlazi"
-+
-+#: ../app/app_procs.c:720
-+msgid "OUTPUT"
-+msgstr "IZLAZ"
-+
-+#. &export_file_format
-+#. &export_format_string
-+#: ../app/app_procs.c:722
-+msgid "TYPE"
-+msgstr "VRSTA"
-+
-+#: ../app/app_procs.c:724
-+msgid "Export graphics size"
-+msgstr "Veli�ina izveženog grafika"
-+
-+#: ../app/app_procs.c:724
-+msgid "WxH"
-+msgstr "Å xV"
-+
-+#: ../app/app_procs.c:726
-+msgid ""
-+"Show only specified layers (e.g. when exporting). Can be either the layer "
-+"name or a range of layer numbers (X-Y)"
-+msgstr ""
-+"Prikazuje samonazna�ene slojeve (npr. prilikom izvoženja). Može biti bilo "
-+"naziv sloja ili opseg brojeva sloja (X-Y)"
-+
-+#: ../app/app_procs.c:727
-+msgid "LAYER,LAYER,..."
-+msgstr "SLOJ,SLOJ,..."
-+
-+#: ../app/app_procs.c:729
-+msgid "Don't show the splash screen"
-+msgstr "Ne prikazuje pozdravni ekran"
-+
-+#: ../app/app_procs.c:731
-+msgid "Don't create empty diagram"
-+msgstr "Neće praviti prazan dijagram"
-+
-+#: ../app/app_procs.c:733
-+msgid "Start integrated user interface (diagrams in tabs)"
-+msgstr "Pokreće objedinjeno korisni�ko su�elje (dijagrami u jezi�cima)"
-+
-+#: ../app/app_procs.c:735
-+msgid "Send error messages to stderr instead of showing dialogs."
-+msgstr ""
-+"Šalje poruke grešaka na standardni izlaz grešaka umesto da prikaže prozor�iće."
-+
-+#: ../app/app_procs.c:737
-+msgid "Directory containing input files"
-+msgstr "Direktorijum koji sadrži ulazne datoteke"
-+
-+#: ../app/app_procs.c:737 ../app/app_procs.c:739
-+msgid "DIRECTORY"
-+msgstr "DIREKTORIJUM"
-+
-+#: ../app/app_procs.c:739
-+msgid "Directory containing output files"
-+msgstr "Direktorijum koji sadrži izlazne datoteke"
-+
-+#: ../app/app_procs.c:741
-+msgid "Display credits list and exit"
-+msgstr "Prikazuje spisak zasluga i izlazi"
-+
-+#: ../app/app_procs.c:743
-+msgid "Generate verbose output"
-+msgstr "Stvara opširan izlaz"
-+
-+#: ../app/app_procs.c:745
-+msgid "Display version and exit"
-+msgstr "Prikazuje broj izdanja i izlazi"
-+
-+#: ../app/app_procs.c:768
-+msgid "[FILE...]"
-+msgstr "[DATOTEKA...]"
-+
-+#: ../app/app_procs.c:780
-+#, c-format
-+msgid "Invalid option?"
-+msgstr "Neispravna opcija?"
-+
-+#: ../app/app_procs.c:803
-+#, c-format
-+msgid "Filename conversion failed: %s\n"
-+msgstr "Nije uspelo pretvaranje naziva datoteke: %s\n"
-+
-+#: ../app/app_procs.c:816
-+#, c-format
-+msgid "Missing input: %s\n"
-+msgstr "Nedostaje ulaz: %s\n"
-+
-+#: ../app/app_procs.c:841
-+msgid "Can't connect to session manager!\n"
-+msgstr "Ne mogu da se povežem sa upravnikom sesije!\n"
-+
-+#. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-+#: ../app/app_procs.c:881
-+#, c-format
-+msgid "Dia version %s, compiled %s %s\n"
-+msgstr "Dia izdanje %s, prevedena %s %s\n"
-+
-+#: ../app/app_procs.c:883
-+#, c-format
-+msgid "Dia version %s\n"
-+msgstr "Dia izdanje %s\n"
-+
-+#: ../app/app_procs.c:921
-+msgid ""
-+"Couldn't find standard objects when looking for object-libs; exiting...\n"
-+msgstr ""
-+"Ne mogu da pronađem standardane objekte kada tražim biblioteke objekata; "
-+"izlazim...\n"
-+
-+#: ../app/app_procs.c:923
-+#, c-format
-+msgid ""
-+"Couldn't find standard objects when looking for object-libs in '%s'; "
-+"exiting...\n"
-+msgstr ""
-+"Ne mogu da pronađem standardane objekte kada tražim biblioteke objekata u "
-+"„%s“; izlazim...\n"
-+
-+#: ../app/app_procs.c:990
-+msgid "Diagram1.dia"
-+msgstr "Dijagram1.dia"
-+
-+#: ../app/app_procs.c:1025
-+msgid ""
-+"This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
-+"describing how you can cause this message to appear.\n"
-+msgstr ""
-+"Ovo nije trebalo da se desi.  Prijavite grešku na „bugzilla.gnome.org“\n"
-+"opisujući šta ste radili te je došlo do greške.\n"
-+
-+#: ../app/app_procs.c:1040
-+msgid "Exiting Dia"
-+msgstr "Izlazim iz Die"
-+
-+#. no standard buttons
-+#: ../app/app_procs.c:1104
-+msgid "Quitting without saving modified diagrams"
-+msgstr "Prekidam bez �uvanja izmenjenih dijagrama"
-+
-+#: ../app/app_procs.c:1106
-+msgid ""
-+"Modified diagrams exist. Are you sure you want to quit Dia without saving "
-+"them?"
-+msgstr ""
-+"Postoje izmenjeni dijagrami. Da li ste sigurni da želite da prekinete Diu bez "
-+"njihovog �uvanja?"
-+
-+#: ../app/app_procs.c:1110
-+msgid "Quit Dia"
-+msgstr "Prekini Diu"
-+
-+#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
-+msgid "Could not create per-user Dia config directory"
-+msgstr "Ne mogu da napravim direktorijum podešavanja Die za korisnika"
-+
-+#: ../app/app_procs.c:1189
-+msgid ""
-+"Could not create per-user Dia config directory. Please make sure that the "
-+"environment variable HOME points to an existing directory."
-+msgstr ""
-+"Ne mogu da napravim direktorijum podešavanja Die za korisnika. Proverite da "
-+"li promenljiva okruženja „HOME“ ukazuje na postojeći direktorijum."
-+
-+#: ../app/app_procs.c:1212
-+msgid "Objects and filters internal to dia"
-+msgstr "Objekti i filteri unutrašnji za Diu"
-+
-+#: ../app/app_procs.c:1268
-+#, c-format
-+msgid ""
-+"The original author of Dia was:\n"
-+"\n"
-+msgstr ""
-+"Originalni autor Die je bio:\n"
-+"\n"
-+
-+#: ../app/app_procs.c:1273
-+#, c-format
-+msgid ""
-+"\n"
-+"The current maintainers of Dia are:\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"Sadšnji održavaoci Die su:\n"
-+"\n"
-+
-+#: ../app/app_procs.c:1278
-+#, c-format
-+msgid ""
-+"\n"
-+"Other authors are:\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"Ostali autori su:\n"
-+"\n"
-+
-+#: ../app/app_procs.c:1283
-+#, c-format
-+msgid ""
-+"\n"
-+"Dia is documented by:\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"Dokumentaciju su napisali:\n"
-+"\n"
-+
-+#: ../app/autosave.c:90
-+msgid "Recovering autosaved diagrams"
-+msgstr "Oporaviti automatski snimljene dijagrame"
-+
-+#: ../app/autosave.c:98
-+msgid ""
-+"Autosaved files exist.\n"
-+"Please select those you wish to recover."
-+msgstr ""
-+"Postoje samozapamćene datoteke.\n"
-+"Molim izaberite one koje želite da vratite."
-+
-+#: ../app/color_area.c:317 ../app/color_area.c:360
-+msgid "Select foreground color"
-+msgstr "Izaberite boju prvog plana"
-+
-+#: ../app/color_area.c:318 ../app/color_area.c:361
-+msgid "Select background color"
-+msgstr "Izaberite boju pozadine"
-+
-+#: ../app/commands.c:130
-+msgid "No print plug-in found!"
-+msgstr "Nije pronađen priklju�ak za štampanje!"
-+
-+#: ../app/commands.c:150
-+#, c-format
-+msgid "Diagram%d.dia"
-+msgstr "Dijagram %d.dia"
-+
-+#: ../app/commands.c:344
-+msgid "No existing object to paste.\n"
-+msgstr "Ne postoji objekat za ubacivanje.\n"
-+
-+#: ../app/commands.c:653 ../app/commands.c:691
-+msgid "Could not find help directory"
-+msgstr "Ne mogu da pronađem direktorijum pomoći"
-+
-+#: ../app/commands.c:660
-+#, c-format
-+msgid ""
-+"Could not open help directory:\n"
-+"%s"
-+msgstr ""
-+"Ne mogu da otvorim direktorijum pomoći:\n"
-+"%s"
-+
-+#: ../app/commands.c:727
-+msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
-+msgstr ""
-+"Dejan Matijević <dmax@neobee.net>\n"
-+"Danilo Å egan <danilo@prevod.org>\n"
-+"Filip Miletić <f.miletic@ewi.tudelft.nl>\n"
-+"\n"
-+"Prevod.org — prevod na srpski jezik."
-+
-+#: ../app/commands.c:729
-+msgid ""
-+"This program is free software; you can redistribute it and/or modify\n"
-+"it under the terms of the GNU General Public License as published by\n"
-+"the Free Software Foundation; either version 2 of the License, or\n"
-+"(at your option) any later version.\n"
-+"\n"
-+"This program is distributed in the hope that it will be useful,\n"
-+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-+"GNU General Public License for more details.\n"
-+"\n"
-+"You should have received a copy of the GNU General Public License\n"
-+"along with this program; if not, write to the Free Software\n"
-+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-+msgstr ""
-+"Ovaj program je slobodan softver; možete ga prosleđivati\n"
-+"i/ili menjati pod uslovima GNU Opšte javne licence koju je\n"
-+"objavila Zadužbina slobodnog softvera; verzije 2 licence\n"
-+"ili (po vašem izboru) bilo koje novije verzije.\n"
-+"\n"
-+"Ovaj program se raspodeljuje u nadi da će biti koristan,\n"
-+"ali BEZ IKAKVE GARANCIJE; �ak i bez primenjene garancije\n"
-+"TRŽIŠNE VREDNOSTI ili PRILAGO�ENOSTI ODRE�ENOJ NAMENI.\n"
-+"Pogledajte GNU Opštu javnu licencu za više detalja.\n"
-+"\n"
-+"Trebali ste da primite primerak GNU Opšte javne licence\n"
-+"uz ovaj program; ako niste, pišite Zadužbini slobodnog\n"
-+"softvera na adresu: „Free Software Foundation, Inc.,\n"
-+"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA“.\n"
-+
-+#: ../app/commands.c:752
-+msgid "A program for drawing structured diagrams."
-+msgstr "Program za crtanje strukturnih dijagrama."
-+
-+#: ../app/confirm.c:69
-+#, c-format
-+msgid "You are about to print a diagram with %d pages."
-+msgstr "Hoćete da štampate dijagram sa %d stranica."
-+
-+#: ../app/confirm.c:71
-+#, c-format
-+msgid "You are about to export a diagram with %d pages."
-+msgstr "Hoćete da izvezete dijagram sa %d stranica."
-+
-+#: ../app/confirm.c:73
-+#, c-format
-+msgid ""
-+"You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgstr ""
-+"Hoćete da izvezete dijagram koji može da zahteva %s memorije. (br. stranica "
-+"— %d)."
-+
-+#: ../app/confirm.c:81
-+msgid ""
-+"You can adjust the size of the diagram by changing the 'Scaling' in the "
-+"'Page Setup' dialog.\n"
-+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-+"the intended bounds."
-+msgstr ""
-+"Možete da podesite veli�inu dijagrama tako što ćete izmeniti „Razmera“ u "
-+"prozor�etu „Podešavanje stranice“.\n"
-+"Ili koristite „Izaberi sve“ i „Najbolje ispunjenje“ da premestite objekte/"
-+"ru�ice unutar željenih granica."
-+
-+#: ../app/confirm.c:85
-+msgid "Confirm Diagram Size"
-+msgstr "Potvrdi veli�inu dijagrama"
-+
-+#: ../app/create_object.c:71
-+#, c-format
-+msgid "'%s' creation failed"
-+msgstr "Stvaranje „%s“ nije uspelo"
-+
-+#: ../app/defaults.c:43 ../app/defaults.c:150
-+msgid "Object defaults"
-+msgstr "Osnovno objekta"
-+
-+#: ../app/defaults.c:61
-+msgid "This object has no defaults."
-+msgstr "Ovaj objekat nema osnovnih."
-+
-+#: ../app/defaults.c:115
-+msgid "Defaults: "
-+msgstr "Osnovno: "
-+
-+#: ../app/dia-props.c:85
-+msgid "Diagram Properties"
-+msgstr "Osobine dijagrama"
-+
-+#: ../app/dia-props.c:119
-+msgid "Dynamic grid"
-+msgstr "Dinami�ka mreža"
-+
-+#: ../app/dia-props.c:127
-+msgid "x"
-+msgstr "x"
-+
-+# Question for autor: Is this Y like YES?
-+#: ../app/dia-props.c:131
-+msgid "y"
-+msgstr "y"
-+
-+#: ../app/dia-props.c:136
-+msgid "Spacing"
-+msgstr "Razmaci"
-+
-+#: ../app/dia-props.c:156
-+msgid "Visible spacing"
-+msgstr "Vidljivi razmak"
-+
-+#. Hexes!
-+#: ../app/dia-props.c:177 ../app/preferences.c:242
-+msgid "Hex grid"
-+msgstr "Heks mreža"
-+
-+#: ../app/dia-props.c:185
-+msgid "Hex grid size"
-+msgstr "Veli�ina heks mreže"
-+
-+#: ../app/dia-props.c:198
-+msgid "Grid"
-+msgstr "Mreža"
-+
-+#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
-+msgid "Background"
-+msgstr "Pozadina"
-+
-+#: ../app/dia-props.c:220 ../app/preferences.c:122
-+msgid "Grid Lines"
-+msgstr "Linije mreže"
-+
-+#: ../app/dia-props.c:231
-+msgid "Page Breaks"
-+msgstr "Prelomi stranice"
-+
-+#: ../app/dia-props.c:242
-+msgid "Colors"
-+msgstr "Boje"
-+
-+#. Can we be sure that the filename is the 'proper title'?
-+#: ../app/dia-props.c:263
-+#, c-format
-+msgid "Diagram Properties: %s"
-+msgstr "Osobine dijagrama: %s"
-+
-+#: ../app/dia_embedd.c:348
-+msgid "Could not initialize Bonobo!"
-+msgstr "Ne može da pokrene Bonobo!"
-+
-+#: ../app/diacanvas.c:121
-+msgid "X position"
-+msgstr "Vodoravni položaj"
-+
-+#: ../app/diacanvas.c:122
-+msgid "X position of child widget"
-+msgstr "Vodoravni položaj sadržanog elementa"
-+
-+#: ../app/diacanvas.c:131
-+msgid "Y position"
-+msgstr "Uspravni položaj"
-+
-+#: ../app/diacanvas.c:132
-+msgid "Y position of child widget"
-+msgstr "Uspravni položaj sadržanog elementa"
-+
-+#: ../app/diagram.c:222
-+#, c-format
-+msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
-+msgstr "Ne mogu da pretvorim naziv datoteke „%s“ u UTF-8: %s\n"
-+
-+#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
-+msgid "Error"
-+msgstr "Greška"
-+
-+#: ../app/diagram.c:1209
-+msgid "Trying to group with no selected objects."
-+msgstr "Pokušavam da grupišem bez izabranih objekata."
-+
-+#: ../app/diagram.c:1219
-+msgid ""
-+"You cannot group objects that belong to different groups or have different "
-+"parents"
-+msgstr ""
-+"Ne možete da grupišete objekte koji pripadaju razli�itim grupama ili imaju "
-+"razli�ite roditelje"
-+
-+#: ../app/diagram_tree_menu.c:47
-+msgid "/_Sort objects"
-+msgstr "/_Sortiraj objekte"
-+
-+#: ../app/diagram_tree_menu.c:48
-+msgid "/Sort objects/by _name"
-+msgstr "/Sortiraj objekte/po _nazivu"
-+
-+#: ../app/diagram_tree_menu.c:50
-+msgid "/Sort objects/by _type"
-+msgstr "/Sortiraj objekte/po _vrsti"
-+
-+#: ../app/diagram_tree_menu.c:52
-+msgid "/Sort objects/as _inserted"
-+msgstr "/Sortiraj objekte/po _unosu"
-+
-+#: ../app/diagram_tree_menu.c:55
-+msgid "/Sort objects/All by name"
-+msgstr "/Sortiraj objekte/Sve po imenu"
-+
-+#: ../app/diagram_tree_menu.c:57
-+msgid "/Sort objects/All by type"
-+msgstr "/Sortiraj objekte/Sve po tipu"
-+
-+#: ../app/diagram_tree_menu.c:59
-+msgid "/Sort objects/All as inserted"
-+msgstr "/Sortiraj objekte/Sve po unosu"
-+
-+#: ../app/diagram_tree_menu.c:61
-+msgid "/Sort objects/_Default"
-+msgstr "/Sortiraj objekte/_Podrazumevano"
-+
-+#: ../app/diagram_tree_menu.c:62
-+msgid "/Sort objects/Default/by _name"
-+msgstr "/Sortiraj objekte/Podrazumevano/po _nazivu"
-+
-+#: ../app/diagram_tree_menu.c:64
-+msgid "/Sort objects/Default/by _type"
-+msgstr "/Sortiraj objekte/Podrazumevano/po _vrsti"
-+
-+#: ../app/diagram_tree_menu.c:66
-+msgid "/Sort objects/Default/as _inserted"
-+msgstr "/Sortiraj objekte/Podrazumevano/po _unosu"
-+
-+#: ../app/diagram_tree_menu.c:68
-+msgid "/Sort _diagrams"
-+msgstr "/Sortiraj _dijagrame"
-+
-+#: ../app/diagram_tree_menu.c:69
-+msgid "/Sort _diagrams/by _name"
-+msgstr "/Sortiraj _dijagrame/po _nazivu"
-+
-+#: ../app/diagram_tree_menu.c:71
-+msgid "/Sort _diagrams/as _inserted"
-+msgstr "/Sortiraj _dijagrame/po _unosu"
-+
-+#: ../app/diagram_tree_menu.c:73
-+msgid "/Sort diagrams/_Default"
-+msgstr "/Sortiraj dijagrame/_Podrazumevano"
-+
-+#: ../app/diagram_tree_menu.c:74
-+msgid "/Sort diagrams/Default/by _name"
-+msgstr "/Sortiraj dijagrame/Podrazumevano/po _nazivu"
-+
-+#: ../app/diagram_tree_menu.c:76
-+msgid "/Sort diagrams/Default/as _inserted"
-+msgstr "/Sortiraj dijagrame/Podrazumevano/po _unosu"
-+
-+#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
-+msgid "/_Locate"
-+msgstr "/_Lociraj"
-+
-+#: ../app/diagram_tree_menu.c:85
-+msgid "/_Properties"
-+msgstr "/_Svojstva"
-+
-+#: ../app/diagram_tree_menu.c:86
-+msgid "/_Hide this type"
-+msgstr "/_Sakrij ovu vrstu"
-+
-+#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
-+msgid "Diagram Tree"
-+msgstr "Stablo dijagrama"
-+
-+#  paper size
-+#. paper size
-+#: ../app/diapagelayout.c:153
-+msgid "Paper Size"
-+msgstr "Veli�ina papira"
-+
-+#. orientation
-+#: ../app/diapagelayout.c:186
-+msgid "Orientation"
-+msgstr "Usmerenje"
-+
-+#. margins
-+#: ../app/diapagelayout.c:224
-+msgid "Margins"
-+msgstr "Margine"
-+
-+#: ../app/diapagelayout.c:236
-+msgid "Top:"
-+msgstr "Gornja:"
-+
-+#: ../app/diapagelayout.c:249
-+msgid "Bottom:"
-+msgstr "Donja:"
-+
-+#: ../app/diapagelayout.c:262
-+msgid "Left:"
-+msgstr "Leva:"
-+
-+#: ../app/diapagelayout.c:275
-+msgid "Right:"
-+msgstr "Desna:"
-+
-+#. Scaling
-+#: ../app/diapagelayout.c:289
-+msgid "Scaling"
-+msgstr "Razmera"
-+
-+#: ../app/diapagelayout.c:300
-+msgid "Scale:"
-+msgstr "Razmera:"
-+
-+#: ../app/diapagelayout.c:312
-+msgid "Fit to:"
-+msgstr "Ispuni do:"
-+
-+#: ../app/diapagelayout.c:324
-+msgid "by"
-+msgstr "sa"
-+
-+#: ../app/diapagelayout.c:741
-+#, c-format
-+msgid "%0.3gcm x %0.3gcm"
-+msgstr "%0.3gcm x %0.3gcm"
-+
-+#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
-+msgid "Page Setup"
-+msgstr "Podešavanje strane"
-+
-+#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
-+msgid ""
-+"This object doesn't support Undo/Redo.\n"
-+"Undo information erased."
-+msgstr ""
-+"Ovaj objekat ne podržava Opozovi/Ponovi.\n"
-+"Podaci za opozivanje su obrisani."
-+
-+#: ../app/disp_callbacks.c:130
-+msgid "Properties..."
-+msgstr "Osobine..."
-+
-+#: ../app/disp_callbacks.c:248
-+msgid "Selection"
-+msgstr "Izbor"
-+
-+#: ../app/disp_callbacks.c:1075
-+msgid ""
-+"The object you dropped cannot fit into its parent. \n"
-+"Either expand the parent object, or drop the object elsewhere."
-+msgstr ""
-+"Objekat koji ste spustili ne može da stane u svog sadržaoca. \n"
-+"Ili raširite sadržaoca, ili objekat spustite negde drugde."
-+
-+# bug(slobo): plural forms
-+#. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
-+#. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
-+#.
-+#: ../app/display.c:115
-+#, c-format
-+msgid "Selection of %d object"
-+msgid_plural "Selection of %d objects"
-+msgstr[0] "Izbor %d objekta"
-+msgstr[1] "Izbor %d objekta"
-+msgstr[2] "Izbor %d objekata"
-+msgstr[3] "Izbor jednog objekta"
-+
-+#: ../app/display.c:125
-+#, c-format
-+msgid "Selected '%s'"
-+msgstr "Izabrano je „%s“"
-+
-+#. we really should not come here but instead disable the menu command earlier
-+#: ../app/display.c:1121
-+msgid "No anti-aliased renderer found"
-+msgstr "Nije pronađen iscrtava� umekšavanja"
-+
-+#: ../app/display.c:1259
-+msgid "<unnamed>"
-+msgstr "<neimenovan>"
-+
-+#. no standard buttons
-+#: ../app/display.c:1265
-+msgid "Closing diagram without saving"
-+msgstr "Zatvaram dijagram bez �uvanja"
-+
-+#: ../app/display.c:1267
-+#, c-format
-+msgid ""
-+"The diagram '%s'\n"
-+"has not been saved. Save changes now?"
-+msgstr ""
-+"Dijagram „%s“\n"
-+"nije sa�uvan. Da sa�uvam izmene sada?"
-+
-+#: ../app/display.c:1269
-+msgid "Close Diagram"
-+msgstr "Zatvori dijagram"
-+
-+#: ../app/display.c:1274
-+msgid "_Discard Changes"
-+msgstr "_Odbaci izmene"
-+
-+#: ../app/exit_dialog.c:77
-+msgid "Do Not Exit"
-+msgstr "Nemoj izaći"
-+
-+#: ../app/exit_dialog.c:79
-+msgid "Exit Without Save"
-+msgstr "Izađi bez �uvanja"
-+
-+#: ../app/exit_dialog.c:81
-+msgid "Save Selected"
-+msgstr "Sa�uvaj izabrano"
-+
-+#: ../app/exit_dialog.c:87
-+msgid "The following are not saved:"
-+msgstr "Sledeće nije sa�uvano:"
-+
-+#: ../app/exit_dialog.c:113
-+msgid "Save"
-+msgstr "Sa�uvaj"
-+
-+#. *** board of value **************
-+#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
-+#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
-+#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
-+#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
-+#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-+#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-+msgid "Name"
-+msgstr "Naziv"
-+
-+#: ../app/exit_dialog.c:129
-+msgid "Path"
-+msgstr "Putanja"
-+
-+#: ../app/exit_dialog.c:142
-+msgid "Select All"
-+msgstr "Sve"
-+
-+#: ../app/exit_dialog.c:150
-+msgid "Select None"
-+msgstr "Ništa"
-+
-+#: ../app/exit_dialog.c:236
-+msgid "Nothing selected for saving.  Would you like to try again?"
-+msgstr "Ništa nije izabrano za �uvanje.  Da li želite da pokušate opet?"
-+
-+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-+#: ../app/filedlg.c:746 ../lib/widgets.c:1488
-+msgid "Supported Formats"
-+msgstr "Podržani zapisi"
-+
-+#: ../app/filedlg.c:192 ../app/filedlg.c:604
-+msgid "By extension"
-+msgstr "Prema proširenju"
-+
-+#: ../app/filedlg.c:281
-+msgid "Open Diagram"
-+msgstr "Otvorite dijagram"
-+
-+#: ../app/filedlg.c:309
-+msgid "Open Options"
-+msgstr "Opcije otvaranja"
-+
-+#: ../app/filedlg.c:317 ../app/filedlg.c:728
-+msgid "Determine file type:"
-+msgstr "Vrsta datoteke:"
-+
-+#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
-+msgid "All Files"
-+msgstr "Sve datoteke"
-+
-+#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
-+msgid ""
-+"Some characters in the filename are neither UTF-8\n"
-+"nor your local encoding.\n"
-+"Some things will break."
-+msgstr ""
-+"Neki znaci u nazivu datoteke nisu ni u UTF-8\n"
-+"ni u vašem lokalnom kodiranju.\n"
-+"Neke stvari će se narušiti."
-+
-+#: ../app/filedlg.c:380 ../app/filedlg.c:651
-+#: ../plug-ins/postscript/paginate_psprint.c:422
-+msgid "File already exists"
-+msgstr "Datoteka već postoji"
-+
-+#: ../app/filedlg.c:382 ../app/filedlg.c:653
-+#: ../plug-ins/postscript/paginate_psprint.c:418
-+#, c-format
-+msgid ""
-+"The file '%s' already exists.\n"
-+"Do you want to overwrite it?"
-+msgstr ""
-+"Datoteka „%s“ već postoji.\n"
-+"Da li želite da je presnimite?"
-+
-+#: ../app/filedlg.c:436
-+msgid "Save Diagram"
-+msgstr "Sa�uvajte dijagram"
-+
-+#. Need better way to make it a reasonable size.  Isn't there some
-+#. standard look for them (or is that just Gnome?)
-+#: ../app/filedlg.c:447
-+msgid "Compress diagram files"
-+msgstr "Datoteke sažetih dijagrama"
-+
-+#: ../app/filedlg.c:457 ../app/filedlg.c:462
-+msgid ""
-+"Compression reduces file size to less than 1/10th size and speeds up loading "
-+"and saving.  Some text programs cannot manipulate compressed files."
-+msgstr ""
-+"Sažimanje umanjuje veli�inu datoteke na manje od desetog dela veli�ine i "
-+"ubrzava u�itavanje i �uvanje. Neki tekstualni programi ne mogu da rade sa "
-+"sažetim datotekama."
-+
-+#: ../app/filedlg.c:677
-+#, c-format
-+msgid ""
-+"Could not determine which export filter\n"
-+"to use to save '%s'"
-+msgstr ""
-+"Ne mogu da odredim koji filter izvoženja\n"
-+"da koristim da sa�uvam „%s“"
-+
-+#: ../app/filedlg.c:704
-+msgid "Export Diagram"
-+msgstr "Izvezite dijagram"
-+
-+#: ../app/filedlg.c:720
-+msgid "Export Options"
-+msgstr "Opcije izvoza"
-+
-+#: ../app/find-and-replace.c:454
-+msgid "_Search for:"
-+msgstr "_Potraži:"
-+
-+#: ../app/find-and-replace.c:467
-+msgid "Replace _with:"
-+msgstr "_Zameni sa:"
-+
-+#: ../app/find-and-replace.c:477
-+msgid "_Match case"
-+msgstr "_Uporedi veli�inu slova"
-+
-+#: ../app/find-and-replace.c:481
-+msgid "Match _entire word only"
-+msgstr "Upor_edi samo cele re�i"
-+
-+#: ../app/find-and-replace.c:485
-+msgid "Match _all properties (not just object name)"
-+msgstr "Uporedi _sva svojstva (ne samo naziv objekta)"
-+
-+#: ../app/find-and-replace.c:513
-+msgid "Find"
-+msgstr "Nađi"
-+
-+#: ../app/find-and-replace.c:545 ../app/menus.c:267
-+msgid "Replace"
-+msgstr "Zameni"
-+
-+#: ../app/find-and-replace.c:548
-+msgid "Replace _All"
-+msgstr "Zameni _sve"
-+
-+#. not adding the button in the list above to modify it's text;
-+#. * the default "Find and Replace" is just too long for my taste ;)
-+#.
-+#: ../app/find-and-replace.c:553
-+msgid "_Replace"
-+msgstr "_Zameni"
-+
-+#: ../app/interface.c:153
-+msgid ""
-+"Modify object(s)\n"
-+"Use <Space> to toggle between this and other tools"
-+msgstr ""
-+"Izmenite objekat\n"
-+"Koristite <Razmak> da prelazite sa ovog na ostale alate"
-+
-+#: ../app/interface.c:159
-+msgid ""
-+"Text edit(s)\n"
-+"Use <Esc> to leave this tool"
-+msgstr ""
-+"Uređivanje teksta\n"
-+"Koristite <Esc> da napustite ovaj alat"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-+#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
-+msgid "Magnify"
-+msgstr "Uveli�aj"
-+
-+#: ../app/interface.c:171
-+msgid "Scroll around the diagram"
-+msgstr "Krećite se oko dijagrama"
-+
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule
-+#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
-+#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
-+#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
-+#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
-+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
-+#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-+#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
-+#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
-+#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
-+#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
-+msgid "Text"
-+msgstr "Tekst"
-+
-+#: ../app/interface.c:183 ../app/menus.c:233
-+msgid "Box"
-+msgstr "Kvadrat"
-+
-+#: ../app/interface.c:189 ../app/menus.c:234
-+msgid "Ellipse"
-+msgstr "Elipsa"
-+
-+#: ../app/interface.c:195 ../app/menus.c:235
-+msgid "Polygon"
-+msgstr "Poligon"
-+
-+# Ovo je sklop od „bezierov“ i „poligon“, pa može i kod nas
-+#: ../app/interface.c:201 ../app/menus.c:236
-+msgid "Beziergon"
-+msgstr "Beziergon"
-+
-+#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
-+msgid "Line"
-+msgstr "Linija"
-+
-+#: ../app/interface.c:213 ../app/menus.c:239
-+msgid "Arc"
-+msgstr "Luk"
-+
-+#: ../app/interface.c:219 ../app/menus.c:240
-+msgid "Zigzagline"
-+msgstr "Cik-cak linija"
-+
-+#: ../app/interface.c:225 ../app/menus.c:241
-+msgid "Polyline"
-+msgstr "Izlomljena linija"
-+
-+#: ../app/interface.c:231 ../app/menus.c:242
-+msgid "Bezierline"
-+msgstr "Bezierova linija"
-+
-+#: ../app/interface.c:237 ../app/menus.c:245
-+msgid "Image"
-+msgstr "Slika"
-+
-+#: ../app/interface.c:244 ../app/menus.c:243
-+msgid "Outline"
-+msgstr "Kontura"
-+
-+#: ../app/interface.c:621 ../app/interface.c:857
-+msgid "Pops up the Navigation window."
-+msgstr "Izbacite prozor za kretanje."
-+
-+#: ../app/interface.c:819
-+msgid "Diagram menu."
-+msgstr "Izbornik dijagrama."
-+
-+#: ../app/interface.c:922
-+msgid "Zoom"
-+msgstr "Uvećaj"
-+
-+#: ../app/interface.c:937
-+msgid "Toggles snap-to-grid for this window."
-+msgstr "Prebacite prijanjanje uz mrežu za ovaj prozor."
-+
-+#: ../app/interface.c:948
-+msgid "Toggles object snapping for this window."
-+msgstr "Prebacite prijanjanje objekta za ovaj prozor."
-+
-+#: ../app/interface.c:1338
-+#, c-format
-+msgid "No sheet named %s"
-+msgstr "Nema lista pod nazivom %s"
-+
-+#: ../app/interface.c:1376
-+msgid "Other sheets"
-+msgstr "Ostali listovi"
-+
-+#: ../app/interface.c:1436 ../sheets/Flowchart.sheet.in.h:1
-+msgid "Flowchart"
-+msgstr "Dijagram toka"
-+
-+#: ../app/interface.c:1496
-+msgid ""
-+"Foreground & background colors for new objects.  The small black and white "
-+"squares reset colors.  The small arrows swap colors.  Double click to change "
-+"colors."
-+msgstr ""
-+"Boja lica i pozadine za nove objekte.  Mali crni i beli kvadrati vraćaju "
-+"stare boje.  Male strelice razmenjuju boje.  Dvostrukim klikom menjate boje."
-+
-+#: ../app/interface.c:1511
-+msgid ""
-+"Line widths.  Click on a line to set the default line width for new "
-+"objects.  Double-click to set the line width more precisely."
-+msgstr ""
-+"Debljine linija. Kliknite na liniju da postavite podrazumevanu debljinu linija "
-+"novih objekata. Kliknite dva puta da postavite debljinu linije malo ta�nije."
-+
-+#: ../app/interface.c:1554
-+msgid ""
-+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-+"arrow parameters with Details..."
-+msgstr ""
-+"Stil strelica na po�etku novih linija.  Kliknite da izaberete strelicu, ili "
-+"postavite osobine strelice pomoću „Detalja“..."
-+
-+#: ../app/interface.c:1559
-+msgid ""
-+"Line style for new lines.  Click to pick a line style, or set line style "
-+"parameters with Details..."
-+msgstr ""
-+"Stil linija za nove linije. Kliknite da izaberete stil linija, ili postavite "
-+"osobine stila linija pomoću „Detalja“..."
-+
-+#: ../app/interface.c:1575
-+msgid ""
-+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-+"parameters with Details..."
-+msgstr ""
-+"Stil strelica za krajeve linija. Kliknite da izaberete strelicu, ili "
-+"postavite osobine strelica pomoću „Detalja“..."
-+
-+#: ../app/interface.c:1635 ../app/interface.c:1762
-+msgid "Diagram Editor"
-+msgstr "Uređivać dijagrama"
-+
-+#: ../app/layer_dialog.c:159
-+msgid "New Layer"
-+msgstr "Novi sloj"
-+
-+#: ../app/layer_dialog.c:160
-+msgid "Raise Layer"
-+msgstr "Izdigni sloj"
-+
-+#: ../app/layer_dialog.c:161
-+msgid "Lower Layer"
-+msgstr "Spusti sloj"
-+
-+#: ../app/layer_dialog.c:162
-+msgid "Delete Layer"
-+msgstr "Izbriši sloj"
-+
-+#: ../app/layer_dialog.c:306
-+msgid "Layers:"
-+msgstr "Slojevi:"
-+
-+#: ../app/layer_dialog.c:386
-+msgid "Layers"
-+msgstr "Slojevi"
-+
-+#: ../app/layer_dialog.c:400
-+msgid "Diagram:"
-+msgstr "Dijagram:"
-+
-+#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
-+#, c-format
-+msgid "New layer %d"
-+msgstr "Novi sloj %d"
-+
-+#: ../app/layer_dialog.c:729
-+msgid "none"
-+msgstr "ništa"
-+
-+#: ../app/layer_dialog.c:1196
-+msgid "Edit Layer"
-+msgstr "Uredite sloj"
-+
-+#: ../app/layer_dialog.c:1196
-+msgid "Add Layer"
-+msgstr "Dodajte sloj"
-+
-+#: ../app/layer_dialog.c:1215
-+msgid "Layer name:"
-+msgstr "Naziv sloja:"
-+
-+#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
-+#: ../objects/chronogram/chronoline.c:183
-+#: ../objects/chronogram/chronoref.c:162
-+msgid "Line width"
-+msgstr "Å irina linije"
-+
-+#: ../app/linewidth_area.c:258
-+msgid "Line width:"
-+msgstr "Å irina linije:"
-+
-+#: ../app/load_save.c:301
-+msgid ""
-+"Error loading diagram.\n"
-+"Linked object not found in document."
-+msgstr ""
-+"Greška u�itavanja dijagrama.\n"
-+"Vezani objekat nije nađen u dokumentu."
-+
-+#: ../app/load_save.c:305
-+#, c-format
-+msgid ""
-+"Error loading diagram.\n"
-+"connection handle %d does not exist on '%s'."
-+msgstr ""
-+"Greška u�itavanja dijagrama.\n"
-+"Ru�ka veze %d ne postoji na „%s“."
-+
-+#: ../app/load_save.c:333
-+#, c-format
-+msgid ""
-+"Error loading diagram.\n"
-+"connection point %d does not exist on '%s'."
-+msgstr ""
-+"Greška u�itavanja dijagrama.\n"
-+"Ta�ka veze %d ne postoji na „%s“."
-+
-+#: ../app/load_save.c:373
-+#, c-format
-+msgid "Can't find parent %s of %s object\n"
-+msgstr "Ne mogu da nađem sadržaoca %s za objekat %s\n"
-+
-+#: ../app/load_save.c:422
-+msgid "You must specify a file, not a directory.\n"
-+msgstr "Treba da navedete datoteku, a ne direktorijum.\n"
-+
-+#: ../app/load_save.c:429 ../plug-ins/dxf/dxf-import.c:1309
-+#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
-+#: ../plug-ins/xslt/xslt.c:91
-+#, c-format
-+msgid "Couldn't open: '%s' for reading.\n"
-+msgstr "Ne mogu da otvorim „%s“ za �itanje.\n"
-+
-+#: ../app/load_save.c:447 ../app/load_save.c:453
-+#, c-format
-+msgid ""
-+"Error loading diagram %s.\n"
-+"Unknown file type."
-+msgstr ""
-+"Greška u�itavanja dijagrama %s.\n"
-+"Nepoznata vrsta datoteke."
-+
-+#: ../app/load_save.c:461
-+#, c-format
-+msgid ""
-+"Error loading diagram %s.\n"
-+"Not a Dia file."
-+msgstr ""
-+"Greška u�itavanja dijagrama %s.\n"
-+"Nije datoteka Die."
-+
-+#: ../app/load_save.c:678
-+#, c-format
-+msgid ""
-+"Error loading diagram:\n"
-+"%s.\n"
-+"A valid Dia file defines at least one layer."
-+msgstr ""
-+"Greška u�itavanja dijagrama:\n"
-+"%s.\n"
-+"Ispravna datoteka Die određuje barem jedan sloj."
-+
-+#: ../app/load_save.c:1001
-+#, c-format
-+msgid "Not allowed to write to output file %s\n"
-+msgstr "Nije mi dopušteno da pišem u izlaznu datoteku %s\n"
-+
-+#: ../app/load_save.c:1033
-+#, c-format
-+msgid "Not allowed to write temporary files in %s\n"
-+msgstr "Nije mi dopušteno da zapišem privremenu datoteku u %s\n"
-+
-+#: ../app/load_save.c:1055 ../plug-ins/cairo/diacairo.c:121
-+#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
-+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
-+#: ../plug-ins/libart/export_png.c:159
-+#: ../plug-ins/metapost/render_metapost.c:1177
-+#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
-+#: ../plug-ins/pstricks/render_pstricks.c:916
-+#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
-+#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
-+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
-+#, c-format
-+msgid "Can't open output file %s: %s\n"
-+msgstr "Ne mogu da otvorim izlaznu datoteku %s: %s\n"
-+
-+#. Save failed; we clean our stuff up, without touching the file named
-+#. "filename" if it existed.
-+#: ../app/load_save.c:1066
-+#, c-format
-+msgid "Internal error %d writing file %s\n"
-+msgstr "Unutrašnja greška %d zapisivanja datoteke %s\n"
-+
-+#: ../app/load_save.c:1077
-+#, c-format
-+msgid "Can't rename %s to final output file %s: %s\n"
-+msgstr "Ne mogu da preimenujem %s u krajnju izlaznu datoteku %s: %s\n"
-+
-+#: ../app/load_save.c:1168 ../app/load_save.c:1173
-+msgid "Dia Diagram File"
-+msgstr "Datoteka dijagrama Die"
-+
-+#: ../app/menus.c:63
-+msgid "Fit"
-+msgstr "Ispuni"
-+
-+#
-+#: ../app/menus.c:81
-+msgid "_File"
-+msgstr "_Datoteka"
-+
-+#: ../app/menus.c:85
-+msgid "_Help"
-+msgstr "_Pomoć"
-+
-+#: ../app/menus.c:93
-+msgid "Sheets and Objects..."
-+msgstr "Listovi i objekti..."
-+
-+#: ../app/menus.c:95
-+msgid "Plugins..."
-+msgstr "Priklju�ci..."
-+
-+#: ../app/menus.c:101
-+msgid "_Diagram tree..."
-+msgstr "Stablo _dijagrama..."
-+
-+#: ../app/menus.c:107
-+msgid "Show Toolbar"
-+msgstr "Prikaži liniju alata"
-+
-+#: ../app/menus.c:108
-+msgid "Show Statusbar"
-+msgstr "Prikaži liniju stanja"
-+
-+#: ../app/menus.c:109
-+msgid "Show Layers"
-+msgstr "Prikaži slojeve"
-+
-+#: ../app/menus.c:117
-+msgid "_Export ..."
-+msgstr "_Izvezi ..."
-+
-+#: ../app/menus.c:118
-+msgid "_Diagram Properties"
-+msgstr "Svojstva _dijagrama"
-+
-+#: ../app/menus.c:119
-+msgid "Page Set_up..."
-+msgstr "Podesi _stranicu..."
-+
-+#: ../app/menus.c:123 ../app/sheets_dialog.c:236
-+msgid "_Edit"
-+msgstr "_Uređivanje"
-+
-+# ispari pa kondenzuj u �vrsto stanje
-+#: ../app/menus.c:130
-+msgid "_Duplicate"
-+msgstr "_Udvostru�i"
-+
-+#. the following used to bind to <control><shift>C which collides with Unicode input.
-+#. * <control>>alt> doesn't work either
-+#: ../app/menus.c:138
-+msgid "Copy Text"
-+msgstr "Umnoži tekst"
-+
-+#: ../app/menus.c:139
-+msgid "Cut Text"
-+msgstr "Iseci tekst"
-+
-+#: ../app/menus.c:140
-+msgid "Paste _Text"
-+msgstr "Ubaci _tekst"
-+
-+#: ../app/menus.c:142
-+msgid "_Layers"
-+msgstr "_Slojevi"
-+
-+#: ../app/menus.c:143
-+msgid "Add Layer..."
-+msgstr "Dodaj sloj..."
-+
-+#: ../app/menus.c:144
-+msgid "Rename Layer..."
-+msgstr "Preimenuj sloj..."
-+
-+#: ../app/menus.c:145
-+msgid "Move selection to layer above"
-+msgstr "Premesti izbor na gornji sloj"
-+
-+#: ../app/menus.c:146
-+msgid "Move selection to layer below"
-+msgstr "Premesti izbor na donji sloj"
-+
-+#: ../app/menus.c:147
-+msgid "_Layers..."
-+msgstr "_Slojevi..."
-+
-+#
-+#: ../app/menus.c:149
-+msgid "_View"
-+msgstr "P_regled"
-+
-+#: ../app/menus.c:152
-+msgid "_Zoom"
-+msgstr "_Povećaj"
-+
-+#: ../app/menus.c:153
-+msgid "1600%"
-+msgstr "1600%"
-+
-+#: ../app/menus.c:154 ../app/menus.c:573
-+msgid "800%"
-+msgstr "800%"
-+
-+#: ../app/menus.c:155 ../app/menus.c:574
-+msgid "400%"
-+msgstr "400%"
-+
-+#: ../app/menus.c:156
-+msgid "283"
-+msgstr "283"
-+
-+#: ../app/menus.c:157
-+msgid "200"
-+msgstr "200"
-+
-+#: ../app/menus.c:158
-+msgid "141"
-+msgstr "141"
-+
-+#: ../app/menus.c:160
-+msgid "85"
-+msgstr "85"
-+
-+#: ../app/menus.c:161
-+msgid "70.7"
-+msgstr "70.7"
-+
-+#: ../app/menus.c:162
-+msgid "50"
-+msgstr "50"
-+
-+#: ../app/menus.c:163
-+msgid "35.4"
-+msgstr "35.4"
-+
-+#: ../app/menus.c:164
-+msgid "25"
-+msgstr "25"
-+
-+#. "display_toggle_entries" items go here
-+#: ../app/menus.c:170
-+msgid "New _View"
-+msgstr "Novi _pregled"
-+
-+#: ../app/menus.c:171
-+msgid "C_lone View"
-+msgstr "_Kloniraj pregled"
-+
-+#: ../app/menus.c:174
-+msgid "_Objects"
-+msgstr "_Objekti"
-+
-+#: ../app/menus.c:175
-+msgid "Send to _Back"
-+msgstr "Pošalji na _kraj"
-+
-+#: ../app/menus.c:176
-+msgid "Bring to _Front"
-+msgstr "Iznesi na _površinu"
-+
-+#: ../app/menus.c:177
-+msgid "Send Backwards"
-+msgstr "Pošalji u pozadinu"
-+
-+#: ../app/menus.c:178
-+msgid "Bring Forwards"
-+msgstr "Iznesi na površinu"
-+
-+#: ../app/menus.c:180
-+msgid "_Group"
-+msgstr "_Grupiši"
-+
-+#. deliberately not using Ctrl+U for Ungroup
-+#: ../app/menus.c:182
-+msgid "_Ungroup"
-+msgstr "_Razgrupiši"
-+
-+#: ../app/menus.c:184
-+msgid "_Parent"
-+msgstr "_Sadržalac"
-+
-+#: ../app/menus.c:185
-+msgid "_Unparent"
-+msgstr "_Nesadržalac"
-+
-+#: ../app/menus.c:186
-+msgid "_Unparent Children"
-+msgstr "Iz_baci iz sadržaoca"
-+
-+#. Translators: Menu item Verb/Support/Position/Align
-+#: ../app/menus.c:188 ../objects/FS/function.c:808
-+msgid "Align"
-+msgstr "Poravnaj"
-+
-+#: ../app/menus.c:193 ../objects/standard/textobj.c:137
-+msgid "Top"
-+msgstr "Vrh"
-+
-+#: ../app/menus.c:194
-+msgid "Middle"
-+msgstr "Sredina"
-+
-+#: ../app/menus.c:195 ../objects/standard/textobj.c:136
-+msgid "Bottom"
-+msgstr "Dno"
-+
-+#
-+#: ../app/menus.c:197
-+msgid "Spread Out Horizontally"
-+msgstr "Raširi vodoravno"
-+
-+#
-+#: ../app/menus.c:198
-+msgid "Spread Out Vertically"
-+msgstr "Raširi uspravno"
-+
-+#: ../app/menus.c:199
-+msgid "Adjacent"
-+msgstr "Pripijeno"
-+
-+#: ../app/menus.c:200
-+msgid "Stacked"
-+msgstr "Naslagano"
-+
-+#
-+#: ../app/menus.c:204
-+msgid "_Select"
-+msgstr "_Izaberi"
-+
-+#: ../app/menus.c:205
-+msgid "All"
-+msgstr "Sve"
-+
-+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
-+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
-+msgid "None"
-+msgstr "Ništa"
-+
-+#: ../app/menus.c:207
-+msgid "Invert"
-+msgstr "Preokreni"
-+
-+#: ../app/menus.c:209
-+msgid "Transitive"
-+msgstr "Prelazne"
-+
-+#: ../app/menus.c:210
-+msgid "Connected"
-+msgstr "Povezane"
-+
-+#
-+#: ../app/menus.c:211
-+msgid "Same Type"
-+msgstr "Iste vrste"
-+
-+#
-+#. display_select_radio_entries go here
-+#: ../app/menus.c:215
-+msgid "Select By"
-+msgstr "Izaberi prema"
-+
-+#: ../app/menus.c:217
-+msgid "_Input Methods"
-+msgstr "_Na�ini unosa"
-+
-+#: ../app/menus.c:219
-+msgid "D_ialogs"
-+msgstr "_Prozor�ići"
-+
-+#: ../app/menus.c:221
-+msgid "D_ebug"
-+msgstr "_Uklanjanje grešaka"
-+
-+#: ../app/menus.c:227
-+msgid "_Tools"
-+msgstr "_Alati"
-+
-+#: ../app/menus.c:228
-+msgid "Modify"
-+msgstr "Izmeni"
-+
-+#: ../app/menus.c:230
-+msgid "Edit text"
-+msgstr "Uredite tekst"
-+
-+#: ../app/menus.c:231
-+msgid "Scroll"
-+msgstr "Pomeranje"
-+
-+#: ../app/menus.c:254
-+msgid "Fullscr_een"
-+msgstr "Preko _celog ekrana"
-+
-+#: ../app/menus.c:256
-+msgid "_AntiAliased"
-+msgstr "_Umekšano"
-+
-+#: ../app/menus.c:257
-+msgid "Show _Grid"
-+msgstr "Prikaži _mrežu"
-+
-+#: ../app/menus.c:258
-+msgid "_Snap To Grid"
-+msgstr "Prioni na _mrežu"
-+
-+#
-+#: ../app/menus.c:259
-+msgid "Snap To _Objects"
-+msgstr "Prioni na _objekte"
-+
-+#: ../app/menus.c:260
-+msgid "Show _Rulers"
-+msgstr "Prikaži _lenjire"
-+
-+#: ../app/menus.c:261
-+msgid "Show _Connection Points"
-+msgstr "Prikaži ta�ke _veze"
-+
-+#: ../app/menus.c:268
-+msgid "Union"
-+msgstr "Unija"
-+
-+#: ../app/menus.c:269
-+msgid "Intersection"
-+msgstr "Presek"
-+
-+#. Translators: Menu item Verb/Channel/Export/Remove
-+#. Translators: Menu item Verb/Branch/Separate/Remove
-+#. Translators: Menu item Verb/Branch/Separate/Remove/Remove
-+#: ../app/menus.c:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
-+#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
-+msgid "Remove"
-+msgstr "Ukloni"
-+
-+#. Cannot also be called Invert, duplicate names caused keybinding problems
-+#: ../app/menus.c:272
-+msgid "Inverse"
-+msgstr "Izvrnuto"
-+
-+#: ../app/menus.c:336
-+msgid "NULL tooldata in tool_menu_select"
-+msgstr "NIÅ TAVNI podaci alata u izboru_izbornika_alata"
-+
-+#: ../app/menus.c:575
-+msgid "300%"
-+msgstr "300%"
-+
-+#: ../app/menus.c:576
-+msgid "200%"
-+msgstr "200%"
-+
-+#: ../app/menus.c:577
-+msgid "150%"
-+msgstr "150%"
-+
-+#: ../app/menus.c:578
-+msgid "100%"
-+msgstr "100%"
-+
-+#: ../app/menus.c:579
-+msgid "75%"
-+msgstr "75%"
-+
-+#: ../app/menus.c:580
-+msgid "50%"
-+msgstr "50%"
-+
-+#: ../app/menus.c:581
-+msgid "25%"
-+msgstr "25%"
-+
-+#: ../app/menus.c:582
-+msgid "10%"
-+msgstr "10%"
-+
-+#: ../app/menus.c:608
-+msgid "Toggles snap-to-grid."
-+msgstr "Prebacite prijanjanje uz mrežu."
-+
-+#: ../app/menus.c:620
-+msgid "Toggles object snapping."
-+msgstr "Prebacite prijanjanje objekta."
-+
-+#: ../app/modify_tool.c:392
-+msgid "Couldn't get GTK settings"
-+msgstr "Ne mogu da dobavim GTK podešavanja"
-+
-+#: ../app/plugin-manager.c:200
-+msgid "Plug-ins"
-+msgstr "Priklju�ci"
-+
-+#: ../app/plugin-manager.c:255
-+msgid "Loaded"
-+msgstr "U�itan"
-+
-+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-+#: ../objects/SISSI/sissi_dialog.c:882
-+msgid "Description"
-+msgstr "Opis"
-+
-+#: ../app/plugin-manager.c:277
-+msgid "Load at Startup"
-+msgstr "U�itan pri pokretanju"
-+
-+#: ../app/plugin-manager.c:284
-+msgid "File Name"
-+msgstr "Naziv datoteke"
-+
-+#: ../app/preferences.c:99 ../app/preferences.c:144
-+msgid "any"
-+msgstr "bilo koji"
-+
-+#: ../app/preferences.c:118
-+msgid "User Interface"
-+msgstr "Korisni�ko su�elje"
-+
-+#: ../app/preferences.c:119
-+msgid "Diagram Defaults"
-+msgstr "Osnovno dijagrama"
-+
-+#: ../app/preferences.c:120
-+msgid "View Defaults"
-+msgstr "Osnovno pregleda"
-+
-+#: ../app/preferences.c:121
-+msgid "Favorites"
-+msgstr "Omiljeno"
-+
-+#: ../app/preferences.c:165
-+msgid "Reset tools after create"
-+msgstr "Ponovo postavi alate posle pravljenja"
-+
-+#: ../app/preferences.c:168
-+msgid "Number of undo levels:"
-+msgstr "Broj nivoa poništavanja:"
-+
-+#: ../app/preferences.c:171
-+msgid ""
-+"Reverse dragging selects\n"
-+"intersecting objects"
-+msgstr ""
-+"Obrnuto prevla�enje bira\n"
-+"prese�ne objekte"
-+
-+#: ../app/preferences.c:174
-+msgid "Recent documents list size:"
-+msgstr "Broj nedavno otvaranih datoteka:"
-+
-+#: ../app/preferences.c:177
-+msgid "Use menu bar"
-+msgstr "Koristi liniju izbornika"
-+
-+#: ../app/preferences.c:180
-+msgid "Keep tool box on top of diagram windows"
-+msgstr "Zadrži alate iznad prozora dijagrama"
-+
-+#: ../app/preferences.c:183
-+msgid "Length unit:"
-+msgstr "Jedinica dužine:"
-+
-+#: ../app/preferences.c:186
-+msgid "Font-size unit:"
-+msgstr "Veli�ina pisma:"
-+
-+#: ../app/preferences.c:189
-+msgid "New diagram:"
-+msgstr "Novi dijagram:"
-+
-+#: ../app/preferences.c:190
-+msgid "Portrait"
-+msgstr "Portret"
-+
-+#: ../app/preferences.c:192
-+msgid "Paper type:"
-+msgstr "Vrsta papira:"
-+
-+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1078
-+msgid "Background Color:"
-+msgstr "Boja pozadine:"
-+
-+#: ../app/preferences.c:196
-+msgid "Compress saved files"
-+msgstr "Sažmi sa�uvane datoteke"
-+
-+#: ../app/preferences.c:199
-+msgid "Connection Points:"
-+msgstr "Ta�ke veze:"
-+
-+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-+#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
-+msgid "Visible"
-+msgstr "Vidljivo"
-+
-+#
-+#: ../app/preferences.c:201
-+msgid "Snap to object"
-+msgstr "Prioni na objekat"
-+
-+#: ../app/preferences.c:204
-+msgid "New window:"
-+msgstr "Novi prozor:"
-+
-+#: ../app/preferences.c:205
-+msgid "Width:"
-+msgstr "Å irina:"
-+
-+#: ../app/preferences.c:206
-+msgid "Height:"
-+msgstr "Visina:"
-+
-+#: ../app/preferences.c:207
-+msgid "Magnify:"
-+msgstr "Uveli�anje:"
-+
-+#: ../app/preferences.c:210
-+msgid "Page breaks:"
-+msgstr "Prelomi stranica:"
-+
-+#: ../app/preferences.c:212 ../app/preferences.c:240
-+msgid "Color:"
-+msgstr "Boja:"
-+
-+#: ../app/preferences.c:213
-+msgid "Solid lines"
-+msgstr "Pune linije"
-+
-+#: ../app/preferences.c:216
-+msgid "Antialias:"
-+msgstr "Umekšavanje:"
-+
-+#: ../app/preferences.c:217
-+msgid "view antialised"
-+msgstr "Prikaži umekšano"
-+
-+#. Favored Filter
-+#. Translators: Menu item Verb/Channel/Export
-+#. Translators: Menu item Verb/Channel/Export/Export
-+#: ../app/preferences.c:221 ../objects/FS/function.c:698
-+#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
-+msgid "Export"
-+msgstr "Izvoz"
-+
-+#: ../app/preferences.c:223
-+msgid "Portable Network Graphics"
-+msgstr "Prenosna mrežna grafika"
-+
-+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
-+#: ../plug-ins/svg/svg-import.c:884
-+msgid "Scalable Vector Graphics"
-+msgstr "Promenljiva vektorska grafika"
-+
-+#: ../app/preferences.c:227
-+msgid "PostScript"
-+msgstr "Postskript"
-+
-+#: ../app/preferences.c:229
-+msgid "Windows MetaFile"
-+msgstr "Vindouz meta-datoteka"
-+
-+#: ../app/preferences.c:231
-+msgid "Enhanced MetaFile"
-+msgstr "Poboljšana meta-datoteka"
-+
-+#: ../app/preferences.c:236
-+msgid "Snap to"
-+msgstr "Prioni na"
-+
-+#: ../app/preferences.c:237
-+msgid "Dynamic grid resizing"
-+msgstr "Dinami�ka promena veli�ine mreže"
-+
-+#: ../app/preferences.c:238
-+msgid "X Size:"
-+msgstr "Vodoravna veli�ina:"
-+
-+#: ../app/preferences.c:239
-+msgid "Y Size:"
-+msgstr "Uspravna veli�ina:"
-+
-+#: ../app/preferences.c:241
-+msgid "Lines per major line"
-+msgstr "Linija po glavnoj liniji"
-+
-+#: ../app/preferences.c:243
-+msgid "Hex Size:"
-+msgstr "Heks veli�ina:"
-+
-+#. There's really no reason to not pretty format it, and allowing non-pretty
-+#. can lead to problems with long lines, CVS etc.
-+#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
-+#. &default_true,0,"pretty formated xml",NULL, TRUE},
-+#.
-+#: ../app/preferences.c:255
-+msgid "Diagram tree window:"
-+msgstr "Prozor stabla dijagrama:"
-+
-+#: ../app/preferences.c:257
-+msgid "Save hidden object types"
-+msgstr "Snimi tipove sakrivenih objekata"
-+
-+#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
-+msgid "Yes"
-+msgstr "Da"
-+
-+#: ../app/preferences.c:485 ../app/preferences.c:496
-+#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
-+msgid "No"
-+msgstr "Ne"
-+
-+#: ../app/preferences.c:591
-+msgid "Preferences"
-+msgstr "Postavke"
-+
-+#: ../app/properties-dialog.c:56
-+msgid "Object properties"
-+msgstr "Svojstva objekta"
-+
-+#: ../app/properties-dialog.c:81
-+msgid "This object has no properties."
-+msgstr "Ovaj objekat nema svojstva."
-+
-+#: ../app/properties-dialog.c:245
-+msgid "Properties: "
-+msgstr "Svojstva: "
-+
-+#: ../app/properties-dialog.c:249
-+msgid "Object properties:"
-+msgstr "Svojstva objekta:"
-+
-+#: ../app/sheets.c:162
-+#, c-format
-+msgid ""
-+"%s\n"
-+"System sheet"
-+msgstr ""
-+"%s\n"
-+"Sistemski list"
-+
-+#: ../app/sheets.c:164
-+#, c-format
-+msgid ""
-+"%s\n"
-+"User sheet"
-+msgstr ""
-+"%s\n"
-+"Korisni�ki list"
-+
-+#: ../app/sheets.c:279
-+msgid ""
-+"Can't get symbol 'custom_type' from any module.\n"
-+"Editing shapes is disabled."
-+msgstr ""
-+"Ne mogu da nađe simbol „custom_type“ ni u jednom modulu.\n"
-+"Uređivanje oblika je isklju�eno."
-+
-+#: ../app/sheets.c:399
-+#, c-format
-+msgid "Widget not found: %s"
-+msgstr "Element nije nađen: %s"
-+
-+#: ../app/sheets.c:474
-+msgid "SVG Shape"
-+msgstr "SVG oblik"
-+
-+#: ../app/sheets.c:476
-+msgid "Programmed DiaObject"
-+msgstr "Programirani objekat Die"
-+
-+#: ../app/sheets_dialog.c:84
-+msgid "Sheets and Objects"
-+msgstr "Listovi i objekti"
-+
-+#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
-+msgid "<- Copy"
-+msgstr "<— Umnoži"
-+
-+#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
-+msgid "<- Copy All"
-+msgstr "<— Umnoži sve"
-+
-+#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
-+msgid "<- Move"
-+msgstr "<— Premesti"
-+
-+#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
-+msgid "<- Move All"
-+msgstr "<— Premesti sve"
-+
-+#: ../app/sheets_dialog.c:234
-+msgid "Edit"
-+msgstr "Uredi"
-+
-+#: ../app/sheets_dialog.c:267
-+msgid "Revert"
-+msgstr "Povrati"
-+
-+#: ../app/sheets_dialog.c:355
-+msgid "New"
-+msgstr "Novo"
-+
-+#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
-+#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
-+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
-+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-+msgid "Type"
-+msgstr "Vrsta"
-+
-+#: ../app/sheets_dialog.c:378
-+msgid "Browse..."
-+msgstr "Pretraži..."
-+
-+#: ../app/sheets_dialog.c:387
-+msgid "SVG Shape:"
-+msgstr "SVG oblik:"
-+
-+#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
-+msgid "description:"
-+msgstr "opis:"
-+
-+#: ../app/sheets_dialog.c:426
-+msgid "Sheet name:"
-+msgstr "Ime strane:"
-+
-+#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
-+#: ../app/sheets_dialog_callbacks.c:1109
-+msgid "Line Break"
-+msgstr "Prelom linije"
-+
-+#: ../app/sheets_dialog.c:569
-+msgid "Edit Attributes"
-+msgstr "Uredi svojstva"
-+
-+#: ../app/sheets_dialog.c:584
-+msgid "DiaObject"
-+msgstr "Dia Objekat"
-+
-+#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
-+msgid "Description:"
-+msgstr "Opis:"
-+
-+#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:695
-+#: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
-+#: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
-+#: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
-+#: ../objects/UML/class_dialog.c:1159 ../objects/UML/class_dialog.c:2025
-+#: ../objects/UML/class_dialog.c:2261 ../objects/UML/class_dialog.c:2864
-+msgid "Type:"
-+msgstr "Vrsta:"
-+
-+#: ../app/sheets_dialog.c:657
-+msgid "Sheet"
-+msgstr "Strana"
-+
-+#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
-+#: ../objects/Database/table_dialog.c:1046 ../objects/ER/attribute.c:155
-+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-+#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
-+#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
-+#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-+#: ../objects/UML/realizes.c:134
-+msgid "Name:"
-+msgstr "Naziv:"
-+
-+#: ../app/sheets_dialog.c:810
-+msgid "DiaObject:"
-+msgstr "Dia objekat:"
-+
-+#: ../app/sheets_dialog.c:837
-+msgid "Sheet:"
-+msgstr "Strana:"
-+
-+#: ../app/sheets_dialog.c:921
-+msgid "Select SVG Shape File"
-+msgstr "Izaberite datoteku SVG oblika"
-+
-+#: ../app/sheets_dialog_callbacks.c:167
-+msgid "Copy ->"
-+msgstr "Umnoži —>"
-+
-+#: ../app/sheets_dialog_callbacks.c:169
-+msgid "Copy All ->"
-+msgstr "Umnoži sve —>"
-+
-+#: ../app/sheets_dialog_callbacks.c:171
-+msgid "Move ->"
-+msgstr "Premesti —>"
-+
-+#: ../app/sheets_dialog_callbacks.c:173
-+msgid "Move All ->"
-+msgstr "Premesti sve —>"
-+
-+#: ../app/sheets_dialog_callbacks.c:306
-+#, c-format
-+msgid ""
-+"%s\n"
-+"Shape"
-+msgstr ""
-+"%s\n"
-+"Oblik"
-+
-+#: ../app/sheets_dialog_callbacks.c:309
-+#, c-format
-+msgid ""
-+"%s\n"
-+"Object"
-+msgstr ""
-+"%s\n"
-+"Objekat"
-+
-+#: ../app/sheets_dialog_callbacks.c:312
-+#, c-format
-+msgid ""
-+"%s\n"
-+"Unassigned type"
-+msgstr ""
-+"%s\n"
-+"Nedodeljena vrsta"
-+
-+#: ../app/sheets_dialog_callbacks.c:803
-+#, c-format
-+msgid "Filename must end with '%s': '%s'"
-+msgstr "Datoteka mora da se završi na „%s“: „%s“"
-+
-+#: ../app/sheets_dialog_callbacks.c:811
-+#, c-format
-+msgid "Error examining %s: %s"
-+msgstr "Greška ispitujući %s: %s"
-+
-+#: ../app/sheets_dialog_callbacks.c:842
-+msgid "Please export the diagram as a shape."
-+msgstr "Molim izvezite dijagram kao oblik."
-+
-+#: ../app/sheets_dialog_callbacks.c:845
-+#, c-format
-+msgid "Could not interpret shape file: '%s'"
-+msgstr "Ne mogu da prevedem datoteku oblika: „%s“"
-+
-+#: ../app/sheets_dialog_callbacks.c:916
-+msgid "Sheet must have a Name"
-+msgstr "List mora imati naziv"
-+
-+#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
-+#, c-format
-+msgid "Couldn't open '%s': %s"
-+msgstr "Ne mogu da otvorim „%s“: %s"
-+
-+#: ../app/sheets_dialog_callbacks.c:1680
-+#, c-format
-+msgid "Couldn't open: '%s' for writing"
-+msgstr "Ne mogu da otvorim: „%s“ za pisanje"
-+
-+#: ../app/sheets_dialog_callbacks.c:1690
-+msgid "a user"
-+msgstr "korisnik"
-+
-+#: ../app/sheets_dialog_callbacks.c:1703
-+#, c-format
-+msgid "File: %s"
-+msgstr "Datoteka: %s"
-+
-+#: ../app/sheets_dialog_callbacks.c:1706
-+#, c-format
-+msgid "Date: %s"
-+msgstr "Datum: %s"
-+
-+#: ../app/sheets_dialog_callbacks.c:1710
-+#, c-format
-+msgid "For: %s"
-+msgstr "Za: %s"
-+
-+#: ../app/sheets_dialog_callbacks.c:1727
-+msgid "add shapes here"
-+msgstr "dodaj oblik ovde"
-+
-+#: ../app/splash.c:57
-+msgid "Loading ..."
-+msgstr "U�itavam ..."
-+
-+#: ../app/splash.c:75
-+#, c-format
-+msgid "Dia v %s"
-+msgstr "Dia v %s"
-+
-+#: ../dia.desktop.in.in.h:1
-+msgid "Dia Diagram Editor"
-+msgstr "Dia uređiva� dijagrama"
-+
-+#: ../dia.desktop.in.in.h:2
-+msgid "Edit your Diagrams"
-+msgstr "Uređujte vaše dijagrame"
-+
-+#: ../lib/arrows.c:1899
-+msgid "Lines"
-+msgstr "Linije"
-+
-+#: ../lib/arrows.c:1900
-+msgid "Hollow Triangle"
-+msgstr "Uokvireni trougao"
-+
-+#: ../lib/arrows.c:1901
-+msgid "Filled Triangle"
-+msgstr "Ispunjeni trougao"
-+
-+#: ../lib/arrows.c:1902
-+msgid "Unfilled Triangle"
-+msgstr "Neispunjeni trougao"
-+
-+#: ../lib/arrows.c:1903
-+msgid "Hollow Diamond"
-+msgstr "Uokvireni romb"
-+
-+#: ../lib/arrows.c:1904
-+msgid "Filled Diamond"
-+msgstr "Ispunjeni romb"
-+
-+#: ../lib/arrows.c:1905
-+msgid "Half Diamond"
-+msgstr "Poluromb"
-+
-+#: ../lib/arrows.c:1906
-+msgid "Half Head"
-+msgstr "Pola vrha"
-+
-+#: ../lib/arrows.c:1907
-+msgid "Slashed Cross"
-+msgstr "Precrtani krst"
-+
-+#: ../lib/arrows.c:1908
-+msgid "Filled Ellipse"
-+msgstr "Ispunjena elipsa"
-+
-+#: ../lib/arrows.c:1909
-+msgid "Hollow Ellipse"
-+msgstr "Uokvirena elipsa"
-+
-+#: ../lib/arrows.c:1910
-+msgid "Filled Dot"
-+msgstr "Ispunjena ta�ka"
-+
-+#: ../lib/arrows.c:1911
-+msgid "Dimension Origin"
-+msgstr "Poreklo dimenzije"
-+
-+#: ../lib/arrows.c:1912
-+msgid "Blanked Dot"
-+msgstr "Prazna ta�ka"
-+
-+#: ../lib/arrows.c:1913
-+msgid "Double Hollow Triangle"
-+msgstr "Dvostruki uokvireni trougao"
-+
-+#: ../lib/arrows.c:1914
-+msgid "Double Filled Triangle"
-+msgstr "Dvostruki ispunjeni trougao"
-+
-+#: ../lib/arrows.c:1915
-+msgid "Filled Dot and Triangle"
-+msgstr "Ispunjena ta�ka i trougao"
-+
-+#: ../lib/arrows.c:1916
-+msgid "Filled Box"
-+msgstr "Ispunjen kvadratić"
-+
-+#: ../lib/arrows.c:1917
-+msgid "Blanked Box"
-+msgstr "Prazan kvadratić"
-+
-+#: ../lib/arrows.c:1918
-+msgid "Slashed"
-+msgstr "Precrtano"
-+
-+#: ../lib/arrows.c:1919
-+msgid "Integral Symbol"
-+msgstr "Simbol integrala"
-+
-+#: ../lib/arrows.c:1920
-+msgid "Crow Foot"
-+msgstr "Noga vrane"
-+
-+#: ../lib/arrows.c:1921
-+msgid "Cross"
-+msgstr "Unakrst"
-+
-+#: ../lib/arrows.c:1922
-+msgid "1-or-many"
-+msgstr "1-ili-više"
-+
-+#: ../lib/arrows.c:1923
-+msgid "0-or-many"
-+msgstr "0-ili-više"
-+
-+#: ../lib/arrows.c:1924
-+msgid "1-or-0"
-+msgstr "1-ili-0"
-+
-+#: ../lib/arrows.c:1925
-+msgid "1 exactly"
-+msgstr "Ta�no 1"
-+
-+#: ../lib/arrows.c:1926
-+msgid "Filled Concave"
-+msgstr "Ispunjeno udubljenje"
-+
-+#: ../lib/arrows.c:1927
-+msgid "Blanked Concave"
-+msgstr "Ispražnjeno udubljenje"
-+
-+#: ../lib/arrows.c:1928
-+msgid "Round"
-+msgstr "Okruglo"
-+
-+#: ../lib/arrows.c:1929
-+msgid "Open Round"
-+msgstr "Okruglo otvoreno"
-+
-+#: ../lib/arrows.c:1930
-+msgid "Backslash"
-+msgstr "Kontra kosa crta"
-+
-+#: ../lib/arrows.c:1931
-+msgid "Infinite Line"
-+msgstr "Beskona�na linija"
-+
-+#: ../lib/arrows.c:2059
-+msgid "Arrow head of unknown type"
-+msgstr "Vrh strelice nepoznate vrste"
-+
-+#: ../lib/arrows.c:2067
-+#, c-format
-+msgid "Arrow head of type %s has too small dimensions, removing.\n"
-+msgstr "Vrh strelice vrste „%s“ ima isuviše male dimenzije; uklanjam je.\n"
-+
-+#: ../lib/arrows.c:2200
-+msgid "unknown arrow"
-+msgstr "nepoznata strelica"
-+
-+#: ../lib/bezier_conn.c:636
-+msgid "Internal error: Setting corner type of endpoint of bezier"
-+msgstr ""
-+"Unutrašnja greška: Postavljanje ugaone vrste krajnje ta�ke bezijerove krive"
-+
-+#: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
-+#: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
-+#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-+#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
-+msgid "Can't find standard object"
-+msgstr "Ne mogu da nađem uobi�ajeni objekat"
-+
-+#: ../lib/dia_dirs.c:242
-+#, c-format
-+msgid "%s<illegal characters>..."
-+msgstr "%s<nedozvoljeni znaci>..."
-+
-+#: ../lib/dia_dirs.c:273
-+#, c-format
-+msgid "Too many ..'s in filename %s\n"
-+msgstr "Previše „..“ u nazivu datoteke %s\n"
-+
-+#: ../lib/dia_xml.c:192
-+#, c-format
-+msgid ""
-+"The file %s has no encoding specification;\n"
-+"assuming it is encoded in %s"
-+msgstr ""
-+"Datoteka „%s“ ne sadrži navod kodiranja;\n"
-+"pretpostavljam da je kodirana pomoću %s"
-+
-+#: ../lib/dia_xml.c:597
-+msgid "Taking point value of non-point node."
-+msgstr "Uzimam vrednost ta�ke za �vor koji nije ta�ka."
-+
-+#: ../lib/dia_xml.c:608
-+#, c-format
-+msgid "Incorrect x Point value \"%s\" %f; discarding it."
-+msgstr "Neispravna x-vrednost ta�ke „%s“ %f; zanemarujem je."
-+
-+#: ../lib/dia_xml.c:615
-+msgid "Error parsing point."
-+msgstr "Greška raš�lanjivanja ta�ke."
-+
-+#. don't bother with useless warnings (see above)
-+#: ../lib/dia_xml.c:623
-+#, c-format
-+msgid "Incorrect y Point value \"%s\" %f; discarding it."
-+msgstr "Neispravna y-vrednost ta�ke „%s“ %f; zanemarujem je."
-+
-+#: ../lib/dia_xml.c:640
-+msgid "Taking bezpoint value of non-point node."
-+msgstr "Uzimam vrednost bezier ta�ke za �vor koji nije ta�ka."
-+
-+#: ../lib/dia_xml.c:658
-+msgid "Error parsing bezpoint p1."
-+msgstr "Greška raš�lanjivanja bezier ta�ke t1."
-+
-+#: ../lib/dia_xml.c:672
-+msgid "Error parsing bezpoint p2."
-+msgstr "Greška raš�lanjivanja bezier ta�ke t2."
-+
-+#: ../lib/dia_xml.c:686
-+msgid "Error parsing bezpoint p3."
-+msgstr "Greška raš�lanjivanja bezier ta�ke t3."
-+
-+#: ../lib/diaarrowchooser.c:361
-+msgid "Arrow Properties"
-+msgstr "Svojstva strelice"
-+
-+#: ../lib/dialinechooser.c:297
-+msgid "Line Style Properties"
-+msgstr "Svojstva stila linije"
-+
-+#: ../lib/dialinechooser.c:339
-+msgid "Details..."
-+msgstr "Detalji..."
-+
-+#: ../lib/dialogs.c:51
-+msgid "Ok"
-+msgstr "U redu"
-+
-+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
-+msgid "Cancel"
-+msgstr "Poništi"
-+
-+#: ../lib/filter.c:177
-+#, c-format
-+msgid "Multiple export filters with unique name %s"
-+msgstr "Više filtera izvoženja sa jedinstvenim nazivom %s"
-+
-+#: ../lib/font.c:84
-+#, c-format
-+msgid "Can't load font %s.\n"
-+msgstr "Ne mogu da u�itam pismo %s.\n"
-+
-+#: ../lib/message.c:92 ../lib/message.c:278
-+msgid "Warning"
-+msgstr "Upozorenje"
-+
-+#: ../lib/message.c:119
-+msgid "There is one similar message."
-+msgstr "Postoji jedna ista poruka."
-+
-+#: ../lib/message.c:124
-+msgid "Show repeated messages"
-+msgstr "Prikaži ponovljene poruke"
-+
-+#: ../lib/message.c:145
-+msgid "Don't show this message again"
-+msgstr "Ne prikazuj više ovu poruku"
-+
-+#: ../lib/message.c:203
-+#, c-format
-+msgid "There are %d similar messages."
-+msgstr "Postoje %d iste poruke."
-+
-+#: ../lib/message.c:262
-+msgid "Notice"
-+msgstr "Napomena"
-+
-+#: ../lib/newgroup.c:124
-+msgid "Open group"
-+msgstr "Otvorena grupa"
-+
-+#: ../lib/object_defaults.c:128
-+#, c-format
-+msgid ""
-+"Error loading defaults '%s'.\n"
-+"Not a Dia diagram file."
-+msgstr ""
-+"Greška u�itavanja podrazumevanih „%s“.\n"
-+"Nije datoteka dijagrama Die."
-+
-+#: ../lib/plug-ins.c:111
-+msgid "???"
-+msgstr "???"
-+
-+#: ../lib/plug-ins.c:186
-+#, c-format
-+msgid "Missing dependencies for '%s'?"
-+msgstr "Nedostaju zavisnosti za „%s“?"
-+
-+#: ../lib/plug-ins.c:197
-+msgid "Missing symbol 'dia_plugin_init'"
-+msgstr "Nedostaje simbol „dia_plugin_init“"
-+
-+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
-+msgid "dia_plugin_init() call failed"
-+msgstr "Nije uspeo poziv funkcije „dia_plugin_init()“"
-+
-+#: ../lib/plug-ins.c:232
-+#, c-format
-+msgid "%s Plugin could not be unloaded"
-+msgstr "Ne mogu da ugasim priklju�ak „%s“"
-+
-+#: ../lib/plug-ins.c:303
-+#, c-format
-+msgid ""
-+"Could not open `%s'\n"
-+"`%s'"
-+msgstr ""
-+"Ne mogu da otvorim „%s“\n"
-+"„%s“"
-+
-+#: ../lib/prop_dict.c:43
-+msgid "Author"
-+msgstr "Autor"
-+
-+#: ../lib/prop_dict.c:44
-+msgid "Identifier"
-+msgstr "Identifikator"
-+
-+#: ../lib/prop_dict.c:45
-+msgid "Creation date"
-+msgstr "Vreme stvaranja"
-+
-+#: ../lib/prop_dict.c:46
-+msgid "Modification date"
-+msgstr "Vreme izmene"
-+
-+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
-+msgid "URL"
-+msgstr "Adresa"
-+
-+#: ../lib/prop_inttypes.c:558
-+msgid "Property cast from int to enum out of range"
-+msgstr "Oblikovanje svojstva iz „int“ u „enum“ je van opsega"
-+
-+#: ../lib/prop_text.c:469
-+#, c-format
-+msgid "Group with %d objects"
-+msgstr "Grupa od %d objekta"
-+
-+#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
-+msgid "Left"
-+msgstr "Levo"
-+
-+#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
-+#: ../objects/standard/textobj.c:138
-+msgid "Center"
-+msgstr "Sredina"
-+
-+#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
-+msgid "Right"
-+msgstr "Desno"
-+
-+#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
-+#: ../objects/chronogram/chronoline.c:181
-+#: ../objects/chronogram/chronoref.c:160
-+msgid "Line color"
-+msgstr "Boja linije"
-+
-+#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
-+msgid "Line style"
-+msgstr "Stil linije"
-+
-+#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
-+msgid "Fill color"
-+msgstr "Boja ispunjavanja"
-+
-+#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
-+msgid "Draw background"
-+msgstr "Iscrtaj pozadinu"
-+
-+#: ../lib/properties.c:78 ../lib/properties.h:523
-+msgid "Start arrow"
-+msgstr "Po�etna strelica"
-+
-+#: ../lib/properties.c:79 ../lib/properties.h:526
-+msgid "End arrow"
-+msgstr "Krajnja strelica"
-+
-+#: ../lib/properties.c:81 ../lib/properties.h:536
-+msgid "Text alignment"
-+msgstr "Poravnanje teksta"
-+
-+#. all this just to make the defaults selectable ...
-+#: ../lib/properties.c:82 ../lib/properties.h:541
-+#: ../objects/Database/table_dialog.c:1036 ../objects/Database/reference.c:117
-+#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
-+#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
-+#: ../objects/chronogram/chronoref.c:166
-+msgid "Font"
-+msgstr "Pismo"
-+
-+#: ../lib/properties.c:83 ../lib/properties.h:549
-+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
-+#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
-+#: ../objects/chronogram/chronoref.c:168
-+msgid "Font size"
-+msgstr "Veli�ina pisma"
-+
-+#: ../lib/properties.c:84 ../lib/properties.h:555
-+#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-+#: ../objects/chronogram/chronoref.c:170
-+msgid "Text color"
-+msgstr "Boja teksta"
-+
-+#: ../lib/proplist.c:163
-+#, c-format
-+msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
-+msgstr "Nema atributa „%s“ (%p) ili nema podataka (%p) u ovom atributu"
-+
-+#: ../lib/sheet.c:69 ../lib/sheet.c:84
-+#, c-format
-+msgid ""
-+"DiaObject '%s' needed in sheet '%s' was not found.\n"
-+"It will not be available for use."
-+msgstr ""
-+"Objekat Die „%s“ potreban u listu „%s“ nije pronađen.\n"
-+"Neće biti dostupan za korišćenje."
-+
-+#: ../lib/sheet.c:314
-+#, c-format
-+msgid ""
-+"The system sheet '%s' appears to be more recent than your custom\n"
-+"version and has been loaded as '%s' for this session.\n"
-+"\n"
-+"Move new objects (if any) from '%s' into your custom sheet\n"
-+"or remove '%s', using the 'Sheets and Objects' dialog."
-+msgstr ""
-+"Sistemski list „%s“ izgleda da je skoriji od vašeg proizvoljnog\n"
-+"izdanja i u�itan je kao „%s“ za ovu sesiju.\n"
-+"\n"
-+"Premestite nove objekte (ako ih ima) iz „%s“ u vaš proizvoljni list\n"
-+"ili uklonite „%s“, koristeći prozor�e „Listovi i objekti“."
-+
-+#: ../lib/sheet.c:371
-+#, c-format
-+msgid "%s: you should use object tags rather than shape tags now"
-+msgstr ""
-+"%s: sada biste trebali da koristite oznake objekta umesto oznaka oblika"
-+
-+#: ../lib/widgets.c:441
-+msgid "Other fonts"
-+msgstr "Ostala pisma"
-+
-+#: ../lib/widgets.c:513
-+#, c-format
-+msgid "Couldn't find font family for %s\n"
-+msgstr "Ne mogu da nađem porodicu pisma za %s\n"
-+
-+# bug: "Solid material" is waaay different from "solid line" in Serbian
-+#. Translators: Menu item Noun/Material/Solid
-+#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
-+msgid "Solid"
-+msgstr "Puna"
-+
-+#: ../lib/widgets.c:902
-+msgid "Dashed"
-+msgstr "Isprekidana"
-+
-+#: ../lib/widgets.c:908
-+msgid "Dash-Dot"
-+msgstr "Crta-Ta�ka"
-+
-+#: ../lib/widgets.c:914
-+msgid "Dash-Dot-Dot"
-+msgstr "Crta-Ta�ka-Ta�ka"
-+
-+#: ../lib/widgets.c:920
-+msgid "Dotted"
-+msgstr "Ta�kasta"
-+
-+#. fs->sizebox = GTK_HBOX(box);
-+#: ../lib/widgets.c:938
-+msgid "Dash length: "
-+msgstr "Dužina crte: "
-+
-+#: ../lib/widgets.c:1066
-+msgid "Select color"
-+msgstr "Izaberite boju"
-+
-+#: ../lib/widgets.c:1132
-+msgid "More colors..."
-+msgstr "Još boja..."
-+
-+#: ../lib/widgets.c:1280
-+msgid "More arrows"
-+msgstr "Još strelica"
-+
-+#: ../lib/widgets.c:1297
-+msgid "Size: "
-+msgstr "Veli�ina: "
-+
-+#: ../lib/widgets.c:1475
-+msgid "Select image file"
-+msgstr "Izaberite datoteku slike"
-+
-+#: ../lib/widgets.c:1523
-+msgid "Browse"
-+msgstr "Pretraži"
-+
-+#: ../lib/widgets.c:2087
-+msgid "Reset menu"
-+msgstr "Povrati izbornik"
-+
-+#. Installer message if no GTK+ was found
-+#: ../installer/win32/gennsh.c:39
-+msgid ""
-+"GTK+ is not installed. Please use the full installer. It is available from "
-+"http://dia-installer.de."
-+msgstr ""
-+"GTK+ nije instaliran. Molim koristite potpun instalacioni program. Dostupan "
-+"je sa „http://dia-installer.de“."
-+
-+#. Installer message: Don't install over pre 0.95 versions
-+#: ../installer/win32/gennsh.c:42
-+msgid ""
-+"Please remove old Dia installations completely or install Dia to a different "
-+"location."
-+msgstr ""
-+"Uklonite staru instalaciju Die u potpunosti ili je instalirajte na drugo "
-+"mesto."
-+
-+#. Installer message:  License Page
-+#: ../installer/win32/gennsh.c:45
-+msgid "Next >"
-+msgstr "Dalje >"
-+
-+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-+#: ../installer/win32/gennsh.c:48
-+msgid ""
-+"$(^Name) is released under the GPL license. The license is provided here for "
-+"information purposes only. $_CLICK"
-+msgstr ""
-+"$(^Name) je izdata pod OJL licencom. Licenca je ovde obezbeđena samo zarad "
-+"obaveštavanja. $_CLICK"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:51
-+msgid "Dia Diagram Editor (required)"
-+msgstr "Dia uređiva� dijagrama (potrebno)"
-+
-+#. Installer message: Components page
-+#: ../installer/win32/gennsh.c:54
-+msgid "Translations"
-+msgstr "Prevod"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:57
-+msgid "Optional translations of the Dia user interface"
-+msgstr "Dodatni prevodi korisni�kog su�elja Die"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:60
-+msgid "Core Dia files and dlls"
-+msgstr "Klju�ne datoteke Die i dlls"
-+
-+#. Installer message: Component name
-+#: ../installer/win32/gennsh.c:63
-+msgid "Python plug-in"
-+msgstr "Pitonov priklju�ak"
-+
-+#. Installer message: Component description
-+#: ../installer/win32/gennsh.c:66
-+msgid ""
-+"Support for the Python Scripting Language 2.3. Do not select this if Python "
-+"is not installed."
-+msgstr ""
-+"Podrška za Pitonov jezik skripte 2.3. Nemojte ovo da izaberete ako Piton "
-+"nije instaliran."
-+
-+#. Installer message: hyperlink text on finish page
-+#: ../installer/win32/gennsh.c:69
-+msgid "Visit the Dia for Windows Web Page"
-+msgstr "Posetite Diu za Vindouz veb stranicu"
-+
-+#. Installer message: Dia uninstaller entry in Control Panel
-+#: ../installer/win32/gennsh.c:72
-+msgid "Dia (remove only)"
-+msgstr "Dia (uklanjanje samo)"
-+
-+#. Installer message: confirmation question. Keep $\r
-+#: ../installer/win32/gennsh.c:75
-+msgid ""
-+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-+"$\rNote: Any non-standard plugins that you may have installed will be "
-+"deleted.$\rDia user settings will not be affected."
-+msgstr ""
-+"Stari direktorijum Die će sada biti obrisan. Da li želite da nastavite?$\n"
-+"$\n"
-+"Napomena: Bilo koji nestandardni priklju�ak koji ste instalirali biće "
-+"obrisan.$\n"
-+"Korisni�ka podešavanja Die biće ostavljena."
-+
-+#. Installer message: confirmatin question. Keep $\r
-+#: ../installer/win32/gennsh.c:78
-+msgid ""
-+"The installation directory you specified already exists. Any contents$\rwill "
-+"be deleted. Would you like to continue?"
-+msgstr ""
-+"Instalacioni direktorijum koji ste naveli već postoji. Sav sadržaj$\n"
-+"će biti obrisan. Da li želite da nastavite?"
-+
-+#. Installer message: Uninstall Section Prompts. Keep $\r
-+#: ../installer/win32/gennsh.c:81
-+msgid ""
-+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-+"another user installed this application."
-+msgstr ""
-+"Program za uklanjanje ne može da pronađe stavke registra za Diu.$\n"
-+"Najverovatnije da je drugi korisnik instalirao ovaj program."
-+
-+#. Installer message: Uninstall error message
-+#: ../installer/win32/gennsh.c:84
-+msgid "You do not have permission to uninstall this application."
-+msgstr "Nemate ovlašćenja da uklonite ovaj program."
-+
-+#. Installer message: Uninstallation warning. Keep $INSTDIR
-+#: ../installer/win32/gennsh.c:87
-+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-+msgstr ""
-+"Ovo će u potpunosti da obriše $INSTDIR i sve sadržane direktorijume. Da "
-+"nastavim?"
-+
-+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-+#: ../installer/win32/gennsh.c:90
-+msgid ""
-+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+msgstr ""
-+"Ovo će u potpunosti da obriše $PROFILE\\.dia i sve sadržane direktorijume. "
-+"Da nastavim?"
-+
-+#: ../objects/AADL/aadl.c:52
-+msgid "Architecture Analysis & Design Language diagram objects"
-+msgstr "Objekti dijagrama arhitekturne analize i jezika crtanja"
-+
-+#: ../objects/AADL/aadlbox.c:147
-+msgid "Declaration"
-+msgstr "Proglas"
-+
-+#: ../objects/AADL/aadlbox.c:358
-+msgid "Add Access Provider"
-+msgstr "Dodaj dostavlja�a pristupa"
-+
-+#: ../objects/AADL/aadlbox.c:360
-+msgid "Add Access Requirer"
-+msgstr "Dodaj potražioca pristupa"
-+
-+#: ../objects/AADL/aadlbox.c:362
-+msgid "Add In Data Port"
-+msgstr "Dodaj u priklju�ak podataka"
-+
-+#: ../objects/AADL/aadlbox.c:364
-+msgid "Add In Event Port"
-+msgstr "Dodaj u priklju�ak događaja"
-+
-+#: ../objects/AADL/aadlbox.c:366
-+msgid "Add In Event Data Port"
-+msgstr "Dodaj u priklju�ak podataka događaja"
-+
-+#: ../objects/AADL/aadlbox.c:368
-+msgid "Add Out Data Port"
-+msgstr "Dodaj iz priklju�ka podataka"
-+
-+#: ../objects/AADL/aadlbox.c:370
-+msgid "Add Out Event Port"
-+msgstr "Dodaj iz priklju�ka događaja"
-+
-+#: ../objects/AADL/aadlbox.c:372
-+msgid "Add Out Event Data Port"
-+msgstr "Dodaj iz priklju�ka podataka događaja"
-+
-+#: ../objects/AADL/aadlbox.c:374
-+msgid "Add In Out Data Port"
-+msgstr "Dodaj u priklju�ak spoljnih podataka"
-+
-+#: ../objects/AADL/aadlbox.c:376
-+msgid "Add In Out Event Port"
-+msgstr "Dodaj u priklju�ak spoljnih događaja"
-+
-+#: ../objects/AADL/aadlbox.c:378
-+msgid "Add In Out Event Data Port"
-+msgstr "Dodaj u priklju�ak spoljnih podataka događaja"
-+
-+#: ../objects/AADL/aadlbox.c:380
-+msgid "Add Port Group"
-+msgstr "Dodaj grupu priklju�ka"
-+
-+#: ../objects/AADL/aadlbox.c:382
-+msgid "Add Connection Point"
-+msgstr "Dodaj ta�ku veze"
-+
-+#: ../objects/AADL/aadlbox.c:386
-+msgid "Delete Port"
-+msgstr "Obriši priklju�ak"
-+
-+#: ../objects/AADL/aadlbox.c:387
-+msgid "Edit Port Declaration"
-+msgstr "Uredi proglas priklju�ka"
-+
-+#: ../objects/AADL/aadlbox.c:391
-+msgid "Delete Connection Point"
-+msgstr "Obriši ta�ku veze"
-+
-+#: ../objects/Database/compound.c:198
-+msgid "Number of arms"
-+msgstr "Broj naoružanja"
-+
-+#: ../objects/Database/compound.c:221
-+msgid "Flip arms verticaly"
-+msgstr "Izvrni naoružanja uspravno"
-+
-+#: ../objects/Database/compound.c:223
-+msgid "Flip arms horizontaly"
-+msgstr "Izvrni naoružanja vodoravno"
-+
-+#: ../objects/Database/compound.c:225
-+msgid "Center mount point verticaly"
-+msgstr "Usredišti ta�ku ka�enja uspravno"
-+
-+#: ../objects/Database/compound.c:227
-+msgid "Center mount point horizontaly"
-+msgstr "Usredišti ta�ku ka�enja vodoravno"
-+
-+#: ../objects/Database/compound.c:229
-+msgid "Center mount point"
-+msgstr "Usredišti ta�ku ka�enja"
-+
-+#: ../objects/Database/compound.c:234
-+msgid "Compound"
-+msgstr "Kompleks"
-+
-+#: ../objects/Database/database.c:39
-+msgid "Entity/Relationship table diagram objects"
-+msgstr "Objekti tabele dijagrama entiteta/odnosa"
-+
-+#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
-+#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
-+#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
-+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
-+msgid "Comment"
-+msgstr "Napomena"
-+
-+#: ../objects/Database/table.c:144
-+msgid "Primary key"
-+msgstr "Primarni klju�"
-+
-+#: ../objects/Database/table.c:146
-+msgid "Nullable"
-+msgstr "Ništavno"
-+
-+#: ../objects/Database/table.c:148
-+msgid "Unique"
-+msgstr "Jedinstveno"
-+
-+#: ../objects/Database/table.c:185
-+msgid "Visible comments"
-+msgstr "Vidljive napomene"
-+
-+#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
-+msgid "Comment tagging"
-+msgstr "Ozna�avanje napomene"
-+
-+#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
-+msgid "Underline primary keys"
-+msgstr "Podvuci primarne klju�eve"
-+
-+#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:981
-+msgid "Use bold font for primary keys"
-+msgstr "Koristi podebljano pismo za primarne klju�eve"
-+
-+#. property rows
-+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
-+#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
-+msgid "Normal"
-+msgstr "Obi�an"
-+
-+#: ../objects/Database/table.c:198
-+msgid "Tablename"
-+msgstr "Naziv tabele"
-+
-+#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
-+#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
-+#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-+#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
-+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-+#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
-+#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
-+#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
-+msgid " "
-+msgstr " "
-+
-+#  Attributes page:
-+#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
-+#: ../objects/UML/object.c:157
-+msgid "Attributes"
-+msgstr "Osobine"
-+
-+#: ../objects/Database/table.c:248
-+msgid "Show comments"
-+msgstr "Prikaži napomene"
-+
-+#. init data
-+#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
-+#: ../sheets/Database.sheet.in.h:3
-+msgid "Table"
-+msgstr "Tabela"
-+
-+#  Attributes page:
-+#. Attributes page:
-+#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1081
-+msgid "_Attributes"
-+msgstr "_Osobine"
-+
-+#. the "new" button
-+#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
-+#: ../objects/SISSI/sissi_dialog.c:871
-+msgid "_New"
-+msgstr "_Novo"
-+
-+#. the "delete" button
-+#: ../objects/Database/table_dialog.c:647
-+msgid "_Delete"
-+msgstr "_Obriši"
-+
-+#. the "Move up" button
-+#: ../objects/Database/table_dialog.c:655
-+msgid "Move up"
-+msgstr "Pomeri naviše"
-+
-+#. the "Move down" button
-+#: ../objects/Database/table_dialog.c:663
-+msgid "Move down"
-+msgstr "Pomeri naniže"
-+
-+#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1138
-+msgid "Attribute data"
-+msgstr "Podaci osobina"
-+
-+#: ../objects/Database/table_dialog.c:707
-+#: ../objects/Database/table_dialog.c:946
-+#: ../objects/Database/table_dialog.c:1051 ../objects/UML/class_dialog.c:452
-+#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
-+#: ../objects/UML/class_dialog.c:2283
-+msgid "Comment:"
-+msgstr "Napomena:"
-+
-+#: ../objects/Database/table_dialog.c:726
-+msgid "_Primary key"
-+msgstr "_Primarni klju�"
-+
-+#: ../objects/Database/table_dialog.c:733
-+msgid "N_ullable"
-+msgstr "_Ništavno"
-+
-+#: ../objects/Database/table_dialog.c:740
-+msgid "Uni_que"
-+msgstr "_Jedinstveno"
-+
-+#: ../objects/Database/table_dialog.c:928
-+msgid "_Table"
-+msgstr "_Tabela"
-+
-+#: ../objects/Database/table_dialog.c:936
-+msgid "Table name:"
-+msgstr "Naziv tabele:"
-+
-+#. XXX create a handler and disable the 'show documentation tag' checkbox
-+#. if 'comment visible' is not active.
-+#: ../objects/Database/table_dialog.c:966
-+msgid "Comment visible"
-+msgstr "Napomena je prikazana"
-+
-+#: ../objects/Database/table_dialog.c:971 ../objects/UML/class_dialog.c:522
-+msgid "Show documentation tag"
-+msgstr "Prikaži oznaku dokumentacije"
-+
-+#. * Fonts and Colors selection *
-+#: ../objects/Database/table_dialog.c:1010 ../objects/UML/class_dialog.c:551
-+msgid "_Style"
-+msgstr "_Stil"
-+
-+#: ../objects/Database/table_dialog.c:1021
-+msgid "Border width:"
-+msgstr "Å irina ivice:"
-+
-+#. head line
-+#: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
-+#: ../objects/UML/umlparameter.c:51
-+msgid "Kind"
-+msgstr "Vrsta"
-+
-+#: ../objects/Database/table_dialog.c:1038 ../objects/UML/class_dialog.c:566
-+msgid "Size"
-+msgstr "Veli�ina"
-+
-+#: ../objects/Database/table_dialog.c:1041
-+msgid "Normal:"
-+msgstr "Obi�an:"
-+
-+#: ../objects/Database/table_dialog.c:1062
-+msgid "Text Color:"
-+msgstr "Boja teksta:"
-+
-+#: ../objects/Database/table_dialog.c:1070
-+msgid "Foreground Color:"
-+msgstr "Boja iscrtavanja:"
-+
-+#. two chars at the beginning
-+#: ../objects/Database/table_dialog.c:1383
-+msgid "not null"
-+msgstr "nije ništa"
-+
-+#: ../objects/Database/table_dialog.c:1384
-+msgid "null"
-+msgstr "ništa"
-+
-+#: ../objects/Database/table_dialog.c:1385
-+msgid "unique"
-+msgstr "jedinstven"
-+
-+#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
-+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
-+#: ../objects/standard/zigzagline.c:132
-+msgid "Corner radius"
-+msgstr "Polupre�nik ugla"
-+
-+#: ../objects/Database/reference.c:111
-+msgid "Start description"
-+msgstr "Zapo�nite opis"
-+
-+#: ../objects/Database/reference.c:113
-+msgid "End description"
-+msgstr "Završite opis"
-+
-+#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
-+#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
-+#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
-+#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
-+#: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
-+#: ../objects/standard/beziergon.c:495 ../objects/standard/zigzagline.c:380
-+msgid "Add segment"
-+msgstr "Dodaj deo"
-+
-+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
-+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
-+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
-+#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
-+#: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
-+#: ../objects/standard/beziergon.c:496 ../objects/standard/zigzagline.c:381
-+msgid "Delete segment"
-+msgstr "Obriši deo"
-+
-+#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
-+msgid "Reference"
-+msgstr "Reference"
-+
-+#: ../objects/ER/attribute.c:157
-+msgid "Key:"
-+msgstr "Klju�:"
-+
-+#: ../objects/ER/attribute.c:159
-+msgid "Weak key:"
-+msgstr "Slab klju�:"
-+
-+#: ../objects/ER/attribute.c:161
-+msgid "Derived:"
-+msgstr "Izveden:"
-+
-+#: ../objects/ER/attribute.c:163
-+msgid "Multivalue:"
-+msgstr "Viševrednosni:"
-+
-+# note(slobo): proveri?
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
-+msgid "Attribute"
-+msgstr "Osobine"
-+
-+#: ../objects/ER/entity.c:139
-+msgid "Weak:"
-+msgstr "Slab:"
-+
-+# Povezujuće? Povezano? Vezujuće?
-+#: ../objects/ER/entity.c:141
-+msgid "Associative:"
-+msgstr "Pridruživo:"
-+
-+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
-+#: ../sheets/ER.sheet.in.h:3
-+msgid "Entity"
-+msgstr "Entitet"
-+
-+#: ../objects/ER/er.c:44
-+msgid "Entity/Relationship diagram objects"
-+msgstr "Objekti dijagrama entiteta/odnosa"
-+
-+#: ../objects/ER/participation.c:118
-+msgid "Total:"
-+msgstr "Ukupno:"
-+
-+# možda „prebrojivost“?
-+#: ../objects/ER/relationship.c:144
-+msgid "Left Cardinality:"
-+msgstr "Leva osnovnost:"
-+
-+#: ../objects/ER/relationship.c:146
-+msgid "Right Cardinality:"
-+msgstr "Desna osnovnost:"
-+
-+#: ../objects/ER/relationship.c:148
-+msgid "Rotate:"
-+msgstr "Zaokreni:"
-+
-+#: ../objects/ER/relationship.c:150
-+msgid "Identifying:"
-+msgstr "Prepoznaje:"
-+
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
-+msgid "Relationship"
-+msgstr "Odnos"
-+
-+#. Translators: Menu item Noun/Energy
-+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
-+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
-+#: ../objects/FS/function.c:1098
-+msgid "Energy"
-+msgstr "Energija"
-+
-+#. Translators: Menu item Noun/Material
-+#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
-+#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
-+#: ../objects/FS/function.c:1074
-+msgid "Material"
-+msgstr "Materijal"
-+
-+#. Translators: Menu item Verb/Signal
-+#. Translators: Menu item Verb/Signal/Signal
-+#. Translators: Menu item Noun/Signal
-+#. Translators: Menu item Noun/Signal/Signal
-+#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
-+#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
-+#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
-+#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
-+msgid "Signal"
-+msgstr "Signal"
-+
-+#: ../objects/FS/fs.c:43
-+msgid "Function structure diagram objects"
-+msgstr "Objekti dijagrama funkcionalne strukture"
-+
-+#: ../objects/FS/function.c:144
-+msgid "Wish function"
-+msgstr "Funkcija želje"
-+
-+#: ../objects/FS/function.c:146
-+msgid "User function"
-+msgstr "Funkcija korisnika"
-+
-+#. Translators: Menu item Verb
-+#: ../objects/FS/function.c:678
-+msgid "Verb"
-+msgstr "Glagol"
-+
-+#. Translators: Menu item Verb/Channel
-+#. Translators: Menu item Verb/Channel/Channel
-+#. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-+#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
-+#: ../objects/FS/function.c:722
-+msgid "Channel"
-+msgstr "Kanal"
-+
-+#. Translators: Menu item Verb/Channel/Import
-+#. Translators: Menu item Verb/Channel/Import/Import
-+#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
-+msgid "Import"
-+msgstr "Uvezi"
-+
-+#. Translators: Menu item Verb/Channel/Import/Input
-+#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
-+msgid "Input"
-+msgstr "Unesi"
-+
-+#. Translators: Menu item Verb/Channel/Import/Receive
-+#: ../objects/FS/function.c:690
-+msgid "Receive"
-+msgstr "Primi"
-+
-+#. Translators: Menu item Verb/Channel/Import/Allow
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-+#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
-+msgid "Allow"
-+msgstr "Odobri"
-+
-+#  Translators: Menu item Verb/Channel/Import/Form Entrance
-+#  Translators: Menu item Verb/Channel/Import/Form Entrance
-+#. Translators: Menu item Verb/Channel/Import/Form Entrance
-+#: ../objects/FS/function.c:694
-+msgid "Form Entrance"
-+msgstr "Oblikuj ulaz"
-+
-+#. Translators: Menu item Verb/Channel/Import/Capture
-+#. Translators: Menu item Verb/Provision/Store/Capture
-+#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
-+msgid "Capture"
-+msgstr "Snimi"
-+
-+#. Translators: Menu item Verb/Channel/Export/Discharge
-+#: ../objects/FS/function.c:702
-+msgid "Discharge"
-+msgstr "Isprazni"
-+
-+#. Translators: Menu item Verb/Channel/Export/Eject
-+#: ../objects/FS/function.c:704
-+msgid "Eject"
-+msgstr "Izbaci"
-+
-+#  Translators: Menu item Verb/Channel/Export/Dispose
-+#. Translators: Menu item Verb/Channel/Export/Dispose
-+#: ../objects/FS/function.c:706
-+msgid "Dispose"
-+msgstr "Ostavi"
-+
-+#. Translators: Menu item Verb/Channel/Transfer
-+#. Translators: Menu item Verb/Channel/Transfer/Transfer
-+#. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
-+#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
-+#: ../objects/FS/function.c:730
-+msgid "Transfer"
-+msgstr "Prebaci"
-+
-+#. Translators: Menu item Verb/Channel/Transfer/Transport
-+#. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-+#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
-+msgid "Transport"
-+msgstr "Prenesi"
-+
-+#. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-+#: ../objects/FS/function.c:718
-+msgid "Lift"
-+msgstr "Podigni"
-+
-+#. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-+#: ../objects/FS/function.c:720
-+msgid "Move"
-+msgstr "Pomeri"
-+
-+#. Translators: Menu item Verb/Channel/Transfer/Transmit
-+#. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-+#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
-+msgid "Transmit"
-+msgstr "Prenesi"
-+
-+#. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-+#: ../objects/FS/function.c:728
-+msgid "Conduct"
-+msgstr "Provedi"
-+
-+#. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-+#: ../objects/FS/function.c:732
-+msgid "Convey"
-+msgstr "Prenosi"
-+
-+#. Translators: Menu item Verb/Channel/Guide
-+#. Translators: Menu item Verb/Channel/Guide/Guide
-+#. Translators: Menu item Verb/Channel/Guide/Guide/Guide
-+#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
-+#: ../objects/FS/function.c:738
-+msgid "Guide"
-+msgstr "Uputi"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-+#: ../objects/FS/function.c:740
-+msgid "Direct"
-+msgstr "Usmeri"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-+#: ../objects/FS/function.c:742
-+msgid "Straighten"
-+msgstr "Ispravi"
-+
-+#  Translators: Menu item Verb/Channel/Guide/Guide/Steer
-+#. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-+#: ../objects/FS/function.c:744
-+msgid "Steer"
-+msgstr "Izmuti"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Translate
-+#: ../objects/FS/function.c:746
-+msgid "Translate"
-+msgstr "Prevedi"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Rotate
-+#. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-+#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
-+msgid "Rotate"
-+msgstr "Zaokreni"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-+#: ../objects/FS/function.c:752
-+msgid "Turn"
-+msgstr "Okreni"
-+
-+#  Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-+#. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-+#: ../objects/FS/function.c:754
-+msgid "Spin"
-+msgstr "Zavrti"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Allow DOF
-+#. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-+#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
-+msgid "Allow DOF"
-+msgstr "Dozvoli DOF"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-+#: ../objects/FS/function.c:760
-+msgid "Constrain"
-+msgstr "Ograni�i"
-+
-+#. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-+#: ../objects/FS/function.c:762
-+msgid "Unlock"
-+msgstr "Otklju�aj"
-+
-+#. Translators: Menu item Verb/Support
-+#. Translators: Menu item Verb/Support/Support
-+#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
-+msgid "Support"
-+msgstr "Podrži"
-+
-+#. Translators: Menu item Verb/Support/Stop
-+#. Translators: Menu item Verb/Support/Stop/Stop
-+#: ../objects/FS/function.c:768 ../objects/FS/function.c:770
-+#: ../sheets/SDL.sheet.in.h:16
-+msgid "Stop"
-+msgstr "Zaustavi"
-+
-+#. Translators: Menu item Verb/Support/Stop/Insulate
-+#: ../objects/FS/function.c:772
-+msgid "Insulate"
-+msgstr "Oklopi"
-+
-+#. Translators: Menu item Verb/Support/Stop/Protect
-+#: ../objects/FS/function.c:774
-+msgid "Protect"
-+msgstr "Zaštiti"
-+
-+#. Translators: Menu item Verb/Support/Stop/Prevent
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-+#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
-+msgid "Prevent"
-+msgstr "Spre�i"
-+
-+#  Translators: Menu item Verb/Support/Stop/Shield
-+#. Translators: Menu item Verb/Support/Stop/Shield
-+#: ../objects/FS/function.c:778
-+msgid "Shield"
-+msgstr "Oklopi"
-+
-+#. Translators: Menu item Verb/Support/Stop/Inhibit
-+#: ../objects/FS/function.c:780
-+msgid "Inhibit"
-+msgstr "Nasledi"
-+
-+#. Translators: Menu item Verb/Support/Stabilize
-+#. Translators: Menu item Verb/Support/Stabilize/Stabilize
-+#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
-+msgid "Stabilize"
-+msgstr "Stabiliši"
-+
-+#. Translators: Menu item Verb/Support/Stabilize/Steady
-+#: ../objects/FS/function.c:786
-+msgid "Steady"
-+msgstr "Umiri"
-+
-+#  Translators: Menu item Verb/Support/Secure
-+#. Translators: Menu item Verb/Support/Secure
-+#. Translators: Menu item Verb/Support/Secure/Secure
-+#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
-+msgid "Secure"
-+msgstr "Obezbedi"
-+
-+#. Translators: Menu item Verb/Support/Secure/Attach
-+#. Translators: Menu item Verb/Connect/Couple/Attach
-+#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
-+msgid "Attach"
-+msgstr "Dodaj"
-+
-+#. Translators: Menu item Verb/Support/Secure/Mount
-+#: ../objects/FS/function.c:794
-+msgid "Mount"
-+msgstr "Prika�i"
-+
-+#. Translators: Menu item Verb/Support/Secure/Lock
-+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
-+msgid "Lock"
-+msgstr "Zaklju�aj"
-+
-+#. Translators: Menu item Verb/Support/Secure/Fasten
-+#: ../objects/FS/function.c:798
-+msgid "Fasten"
-+msgstr "Ubrzaj"
-+
-+#  Translators: Menu item Verb/Support/Secure/Hold
-+#. Translators: Menu item Verb/Support/Secure/Hold
-+#: ../objects/FS/function.c:800
-+msgid "Hold"
-+msgstr "Zadrži"
-+
-+#. Translators: Menu item Verb/Support/Position
-+#. Translators: Menu item Verb/Support/Position/Position
-+#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
-+#: ../objects/Istar/actor.c:70
-+msgid "Position"
-+msgstr "Postavi"
-+
-+#. Translators: Menu item Verb/Support/Position/Orient
-+#: ../objects/FS/function.c:806
-+msgid "Orient"
-+msgstr "Usmeri"
-+
-+#. Translators: Menu item Verb/Support/Position/Locate
-+#. Translators: Menu item Verb/Signal/Sense/Locate
-+#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
-+msgid "Locate"
-+msgstr "Pronađi"
-+
-+#. Translators: Menu item Verb/Connect
-+#. Translators: Menu item Verb/Connect/Connect
-+#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
-+msgid "Connect"
-+msgstr "Poveži"
-+
-+#. Translators: Menu item Verb/Connect/Couple
-+#. Translators: Menu item Verb/Connect/Couple/Couple
-+#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
-+msgid "Couple"
-+msgstr "Upari"
-+
-+#. Translators: Menu item Verb/Connect/Couple/Join
-+#: ../objects/FS/function.c:820
-+msgid "Join"
-+msgstr "Pridruži"
-+
-+#  Translators: Menu item Verb/Connect/Couple/Assemble
-+#. Translators: Menu item Verb/Connect/Couple/Assemble
-+#: ../objects/FS/function.c:822
-+msgid "Assemble"
-+msgstr "Spoji"
-+
-+#. Translators: Menu item Verb/Connect/Mix
-+#. Translators: Menu item Verb/Connect/Mix/Mix
-+#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
-+msgid "Mix"
-+msgstr "Izmešaj"
-+
-+#. Translators: Menu item Verb/Connect/Mix/Combine
-+#: ../objects/FS/function.c:830
-+msgid "Combine"
-+msgstr "Objedini"
-+
-+#. Translators: Menu item Verb/Connect/Mix/Blend
-+#: ../objects/FS/function.c:832
-+msgid "Blend"
-+msgstr "Stapaj"
-+
-+#. Translators: Menu item Verb/Connect/Mix/Add
-+#: ../objects/FS/function.c:834
-+msgid "Add"
-+msgstr "Dodaj"
-+
-+#. Translators: Menu item Verb/Connect/Mix/Pack
-+#: ../objects/FS/function.c:836
-+msgid "Pack"
-+msgstr "Smesti"
-+
-+#. Translators: Menu item Verb/Connect/Mix/Coalesce
-+#: ../objects/FS/function.c:838
-+msgid "Coalesce"
-+msgstr "Sastavi"
-+
-+#. Translators: Menu item Verb/Branch
-+#. Translators: Menu item Verb/Branch/Branch
-+#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
-+#: ../sheets/UML.sheet.in.h:30
-+msgid "Branch"
-+msgstr "Granaj"
-+
-+#. Translators: Menu item Verb/Branch/Separate
-+#. Translators: Menu item Verb/Branch/Separate/Separate
-+#. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-+#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
-+#: ../objects/FS/function.c:848
-+msgid "Separate"
-+msgstr "Razdvoj"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-+#: ../objects/FS/function.c:850
-+msgid "Switch"
-+msgstr "Prebaci"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-+#: ../objects/FS/function.c:852
-+msgid "Divide"
-+msgstr "Podeli"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Separate/Release
-+#: ../objects/FS/function.c:854
-+msgid "Release"
-+msgstr "Otpusti"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-+#: ../objects/FS/function.c:856
-+msgid "Detach"
-+msgstr "Odvoj"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-+#: ../objects/FS/function.c:858
-+msgid "Disconnect"
-+msgstr "Prekini vezu"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-+#: ../objects/FS/function.c:864
-+msgid "Cut"
-+msgstr "Iseci"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-+#: ../objects/FS/function.c:866
-+msgid "Polish"
-+msgstr "Poljski"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-+#: ../objects/FS/function.c:868
-+msgid "Sand"
-+msgstr "Pesak"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-+#: ../objects/FS/function.c:870
-+msgid "Drill"
-+msgstr "Izbuši"
-+
-+#. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-+#: ../objects/FS/function.c:872
-+msgid "Lathe"
-+msgstr "Strug"
-+
-+#. Translators: Menu item Verb/Branch/Refine
-+#. Translators: Menu item Verb/Branch/Refine/Refine
-+#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
-+msgid "Refine"
-+msgstr "Rafiniši"
-+
-+#. Translators: Menu item Verb/Branch/Refine/Purify
-+#: ../objects/FS/function.c:878
-+msgid "Purify"
-+msgstr "Pro�isti"
-+
-+#. Translators: Menu item Verb/Branch/Refine/Strain
-+#: ../objects/FS/function.c:880
-+msgid "Strain"
-+msgstr "Nategni"
-+
-+#. Translators: Menu item Verb/Branch/Refine/Filter
-+#: ../objects/FS/function.c:882
-+msgid "Filter"
-+msgstr "Filtriraj"
-+
-+#. Translators: Menu item Verb/Branch/Refine/Percolate
-+#: ../objects/FS/function.c:884
-+msgid "Percolate"
-+msgstr "Procedi"
-+
-+#. Translators: Menu item Verb/Branch/Refine/Clear
-+#: ../objects/FS/function.c:886
-+msgid "Clear"
-+msgstr "O�istiti"
-+
-+#  Translators: Menu item Verb/Branch/Distribute
-+#. Translators: Menu item Verb/Branch/Distribute
-+#. Translators: Menu item Verb/Branch/Distribute/Distribute
-+#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
-+msgid "Distribute"
-+msgstr "Distribuiši"
-+
-+#. Translators: Menu item Verb/Branch/Distribute/Diverge
-+#: ../objects/FS/function.c:892
-+msgid "Diverge"
-+msgstr "Divergiraj"
-+
-+#. Translators: Menu item Verb/Branch/Distribute/Scatter
-+#: ../objects/FS/function.c:894
-+msgid "Scatter"
-+msgstr "Razbacaj"
-+
-+#. Translators: Menu item Verb/Branch/Distribute/Disperse
-+#: ../objects/FS/function.c:896
-+msgid "Disperse"
-+msgstr "Raziđi"
-+
-+#. Translators: Menu item Verb/Branch/Distribute/Diffuse
-+#. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-+#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
-+msgid "Diffuse"
-+msgstr "Istekni"
-+
-+#. Translators: Menu item Verb/Branch/Distribute/Empty
-+#: ../objects/FS/function.c:900
-+msgid "Empty"
-+msgstr "Prazniti"
-+
-+#. Translators: Menu item Verb/Branch/Dissipate
-+#. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-+#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
-+msgid "Dissipate"
-+msgstr "Raspi"
-+
-+#. Translators: Menu item Verb/Branch/Dissipate/Absorb
-+#: ../objects/FS/function.c:906
-+msgid "Absorb"
-+msgstr "Upij"
-+
-+#. Translators: Menu item Verb/Branch/Dissipate/Dampen
-+#: ../objects/FS/function.c:908
-+msgid "Dampen"
-+msgstr "Udubi"
-+
-+#. Translators: Menu item Verb/Branch/Dissipate/Dispel
-+#: ../objects/FS/function.c:910
-+msgid "Dispel"
-+msgstr "Rasturi"
-+
-+#. Translators: Menu item Verb/Branch/Dissipate/Resist
-+#: ../objects/FS/function.c:914
-+msgid "Resist"
-+msgstr "Izdrži"
-+
-+#. Translators: Menu item Verb/Provision
-+#. Translators: Menu item Verb/Provision/Provision
-+#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
-+msgid "Provision"
-+msgstr "Provizija"
-+
-+#. Translators: Menu item Verb/Provision/Store
-+#. Translators: Menu item Verb/Provision/Store/Store
-+#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
-+msgid "Store"
-+msgstr "Smestiti"
-+
-+#. Translators: Menu item Verb/Provision/Store/Contain
-+#: ../objects/FS/function.c:924
-+msgid "Contain"
-+msgstr "Sadržati"
-+
-+#. Translators: Menu item Verb/Provision/Store/Collect
-+#: ../objects/FS/function.c:926
-+msgid "Collect"
-+msgstr "Sakupi"
-+
-+#. Translators: Menu item Verb/Provision/Store/Reserve
-+#: ../objects/FS/function.c:928
-+msgid "Reserve"
-+msgstr "Rezervisati"
-+
-+#. Translators: Menu item Verb/Provision/Supply
-+#. Translators: Menu item Verb/Provision/Supply/Supply
-+#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
-+msgid "Supply"
-+msgstr "Namiri"
-+
-+#. Translators: Menu item Verb/Provision/Supply/Fill
-+#: ../objects/FS/function.c:936
-+msgid "Fill"
-+msgstr "Ispuniti"
-+
-+#. Translators: Menu item Verb/Provision/Supply/Provide
-+#: ../objects/FS/function.c:938
-+msgid "Provide"
-+msgstr "Obezbedi"
-+
-+#. Translators: Menu item Verb/Provision/Supply/Replenish
-+#: ../objects/FS/function.c:940
-+msgid "Replenish"
-+msgstr "Popuni"
-+
-+#. Translators: Menu item Verb/Provision/Supply/Expose
-+#: ../objects/FS/function.c:942
-+msgid "Expose"
-+msgstr "Izloži"
-+
-+#. Translators: Menu item Verb/Provision/Extract
-+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
-+msgid "Extract"
-+msgstr "Izvuci"
-+
-+#. Translators: Menu item Verb/Control Magnitude
-+#. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-+#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
-+msgid "Control Magnitude"
-+msgstr "Kontroliši magnitudu"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Actuate
-+#. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-+#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
-+msgid "Actuate"
-+msgstr "Dejstvuj"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-+#: ../objects/FS/function.c:954
-+msgid "Start"
-+msgstr "Po�ni"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-+#: ../objects/FS/function.c:956
-+msgid "Initiate"
-+msgstr "Pokreni"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Regulate
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-+#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
-+msgid "Regulate"
-+msgstr "Reguliši"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Control
-+#. Translators: Menu item Noun/Signal/Control
-+#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
-+#: ../objects/UML/classicon.c:129
-+msgid "Control"
-+msgstr "Kontroliši"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-+#: ../objects/FS/function.c:968
-+msgid "Enable"
-+msgstr "Omogući"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-+#: ../objects/FS/function.c:970
-+msgid "Disable"
-+msgstr "Onemogući"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-+#: ../objects/FS/function.c:972
-+msgid "Limit"
-+msgstr "Ograni�i"
-+
-+#  Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-+#. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-+#: ../objects/FS/function.c:974
-+msgid "Interrupt"
-+msgstr "Prekini"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change
-+#. Translators: Menu item Verb/Control Magnitude/Change/Change
-+#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
-+msgid "Change"
-+msgstr "Izmenuti"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Increase
-+#: ../objects/FS/function.c:980
-+msgid "Increase"
-+msgstr "Povećati"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-+#: ../objects/FS/function.c:982
-+msgid "Decrease"
-+msgstr "Smanjiti"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-+#: ../objects/FS/function.c:984
-+msgid "Amplify"
-+msgstr "Poja�aj"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-+#: ../objects/FS/function.c:986
-+msgid "Reduce"
-+msgstr "Umanji"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-+#: ../objects/FS/function.c:990
-+msgid "Normalize"
-+msgstr "Normalizuj"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-+#: ../objects/FS/function.c:992
-+msgid "Multiply"
-+msgstr "Pomnoži"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Scale
-+#. FIXME: mark read-only
-+#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:186
-+msgid "Scale"
-+msgstr "Razmeri"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-+#: ../objects/FS/function.c:996
-+msgid "Rectify"
-+msgstr "Poravnaj"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-+#: ../objects/FS/function.c:998
-+msgid "Adjust"
-+msgstr "Podesi"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Form
-+#. Translators: Menu item Verb/Control Magnitude/Form/Form
-+#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
-+msgid "Form"
-+msgstr "Oblikuj"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Form/Compact
-+#: ../objects/FS/function.c:1004
-+msgid "Compact"
-+msgstr "Sabij"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Form/Crush
-+#: ../objects/FS/function.c:1006
-+msgid "Crush"
-+msgstr "Zdrobi"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Form/Shape
-+#: ../objects/FS/function.c:1008
-+msgid "Shape"
-+msgstr "Oblikuj"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Form/Compress
-+#: ../objects/FS/function.c:1010
-+msgid "Compress"
-+msgstr "Sažmi"
-+
-+#. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-+#: ../objects/FS/function.c:1012
-+msgid "Pierce"
-+msgstr "Izbodi"
-+
-+#. Translators: Menu item Verb/Convert
-+#. Translators: Menu item Verb/Convert/Convert
-+#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
-+msgid "Convert"
-+msgstr "Pretvori"
-+
-+#. Translators: Menu item Verb/Convert/Transform
-+#: ../objects/FS/function.c:1018
-+msgid "Transform"
-+msgstr "Trasformiši"
-+
-+#. Translators: Menu item Verb/Convert/Liquefy
-+#: ../objects/FS/function.c:1020
-+msgid "Liquefy"
-+msgstr "Istopi"
-+
-+#. Translators: Menu item Verb/Convert/Solidify
-+#: ../objects/FS/function.c:1022
-+msgid "Solidify"
-+msgstr "O�vrsni"
-+
-+#. Translators: Menu item Verb/Convert/Evaporate
-+#: ../objects/FS/function.c:1024
-+msgid "Evaporate"
-+msgstr "Ispari"
-+
-+# ispari pa kondenzuj u �vrsto stanje
-+#. Translators: Menu item Verb/Convert/Sublimate
-+#: ../objects/FS/function.c:1026
-+msgid "Sublimate"
-+msgstr "Sublimiraj"
-+
-+#. Translators: Menu item Verb/Convert/Condense
-+#: ../objects/FS/function.c:1028
-+msgid "Condense"
-+msgstr "Kondenzuj"
-+
-+#. Translators: Menu item Verb/Convert/Integrate
-+#: ../objects/FS/function.c:1030
-+msgid "Integrate"
-+msgstr "Integriši"
-+
-+#. Translators: Menu item Verb/Convert/Differentiate
-+#: ../objects/FS/function.c:1032
-+msgid "Differentiate"
-+msgstr "Razdvoji"
-+
-+#. Translators: Menu item Verb/Convert/Process
-+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:7
-+msgid "Process"
-+msgstr "Obrada"
-+
-+#. Translators: Menu item Verb/Signal/Sense
-+#. Translators: Menu item Verb/Signal/Sense/Sense
-+#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
-+msgid "Sense"
-+msgstr "Oseti"
-+
-+#. Translators: Menu item Verb/Signal/Sense/Perceive
-+#: ../objects/FS/function.c:1044
-+msgid "Perceive"
-+msgstr "Spoznaj"
-+
-+#. Translators: Menu item Verb/Signal/Sense/Recognize
-+#: ../objects/FS/function.c:1046
-+msgid "Recognize"
-+msgstr "Prepoznaj"
-+
-+#. Translators: Menu item Verb/Signal/Sense/Discern
-+#: ../objects/FS/function.c:1048
-+msgid "Discern"
-+msgstr "Razlu�i"
-+
-+#. Translators: Menu item Verb/Signal/Sense/Check
-+#: ../objects/FS/function.c:1050
-+msgid "Check"
-+msgstr "Ispitaj"
-+
-+#. Translators: Menu item Verb/Signal/Sense/Verify
-+#: ../objects/FS/function.c:1054
-+msgid "Verify"
-+msgstr "Proveri"
-+
-+#. Translators: Menu item Verb/Signal/Indicate
-+#. Translators: Menu item Verb/Signal/Indicate/Indicate
-+#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
-+msgid "Indicate"
-+msgstr "Ukaži"
-+
-+#  Translators: Menu item Verb/Signal/Indicate/Mark
-+#  Translators: Menu item Verb/Signal/Indicate/Mark
-+#. Translators: Menu item Verb/Signal/Indicate/Mark
-+#: ../objects/FS/function.c:1060
-+msgid "Mark"
-+msgstr "Ozna�i"
-+
-+#. Translators: Menu item Verb/Signal/Display
-+#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
-+msgid "Display"
-+msgstr "Prikaži"
-+
-+#. Translators: Menu item Verb/Signal/Measure
-+#. Translators: Menu item Verb/Signal/Measure/Measure
-+#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
-+msgid "Measure"
-+msgstr "Izmeri"
-+
-+#. Translators: Menu item Verb/Signal/Measure/Calculate
-+#: ../objects/FS/function.c:1068
-+msgid "Calculate"
-+msgstr "Izra�unaj"
-+
-+#. Translators: Menu item Verb/Signal/Represent
-+#: ../objects/FS/function.c:1070
-+msgid "Represent"
-+msgstr "Predstavi"
-+
-+#. Translators: Menu item Noun
-+#: ../objects/FS/function.c:1072
-+msgid "Noun"
-+msgstr "Imenica"
-+
-+#. Translators: Menu item Noun/Material/Liquid
-+#: ../objects/FS/function.c:1078
-+msgid "Liquid"
-+msgstr "Te�nost"
-+
-+#. Translators: Menu item Noun/Material/Gas
-+#: ../objects/FS/function.c:1080
-+msgid "Gas"
-+msgstr "Gas"
-+
-+#. Translators: Menu item Noun/Material/Human
-+#. Translators: Menu item Noun/Material/Human/Human
-+#. Translators: Menu item Noun/Energy/Human
-+#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
-+#: ../objects/FS/function.c:1168
-+msgid "Human"
-+msgstr "ÄŒovek"
-+
-+#. Translators: Menu item Noun/Material/Human/Hand
-+#: ../objects/FS/function.c:1086
-+msgid "Hand"
-+msgstr "Ruka"
-+
-+#. Translators: Menu item Noun/Material/Human/Foot
-+#: ../objects/FS/function.c:1088
-+msgid "Foot"
-+msgstr "Stopalo"
-+
-+#. Translators: Menu item Noun/Material/Human/Head
-+#: ../objects/FS/function.c:1090
-+msgid "Head"
-+msgstr "Glava"
-+
-+#. Translators: Menu item Noun/Material/Human/Finger
-+#: ../objects/FS/function.c:1092
-+msgid "Finger"
-+msgstr "Prst"
-+
-+#. Translators: Menu item Noun/Material/Human/Toe
-+#: ../objects/FS/function.c:1094
-+msgid "Toe"
-+msgstr "Nožni palac"
-+
-+#. Translators: Menu item Noun/Material/Biological
-+#: ../objects/FS/function.c:1096
-+msgid "Biological"
-+msgstr "Biološki"
-+
-+#  Translators: Menu item Noun/Energy/Mechanical
-+#  Translators: Menu item Noun/Energy/Mechanical
-+#. Translators: Menu item Noun/Energy/Mechanical
-+#: ../objects/FS/function.c:1100
-+msgid "Mechanical"
-+msgstr "Mehani�ki"
-+
-+#. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-+#: ../objects/FS/function.c:1102
-+msgid "Mech. Energy"
-+msgstr "Meh. eanergija"
-+
-+#. Translators: Menu item Noun/Energy/Mechanical/Translation
-+#: ../objects/FS/function.c:1104
-+msgid "Translation"
-+msgstr "Prevod"
-+
-+#. Translators: Menu item Noun/Energy/Mechanical/Force
-+#: ../objects/FS/function.c:1106
-+msgid "Force"
-+msgstr "Sila"
-+
-+#  Translators: Menu item Noun/Energy/Mechanical/Rotation
-+#. Translators: Menu item Noun/Energy/Mechanical/Rotation
-+#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
-+msgid "Rotation"
-+msgstr "Rotacija"
-+
-+#. Translators: Menu item Noun/Energy/Mechanical/Torque
-+#: ../objects/FS/function.c:1110
-+msgid "Torque"
-+msgstr "Zaokret"
-+
-+#  Translators: Menu item Noun/Energy/Mechanical/Random Motion
-+#. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-+#: ../objects/FS/function.c:1112
-+msgid "Random Motion"
-+msgstr "Slu�ajno kretanje"
-+
-+#  Translators: Menu item Noun/Energy/Mechanical/Vibration
-+#. Translators: Menu item Noun/Energy/Mechanical/Vibration
-+#: ../objects/FS/function.c:1114
-+msgid "Vibration"
-+msgstr "Vibracija"
-+
-+#. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-+#: ../objects/FS/function.c:1116
-+msgid "Rotational Energy"
-+msgstr "Energija rotacije"
-+
-+#. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-+#: ../objects/FS/function.c:1118
-+msgid "Translational Energy"
-+msgstr "Energija prenosa"
-+
-+#. Translators: Menu item Noun/Energy/Electricity
-+#: ../objects/FS/function.c:1120
-+msgid "Electrical"
-+msgstr "Elektrika"
-+
-+#. Translators: Menu item Noun/Energy/Electricity/Electricity
-+#: ../objects/FS/function.c:1122
-+msgid "Electricity"
-+msgstr "Elektricitet"
-+
-+#. Translators: Menu item Noun/Energy/Electricity/Voltage
-+#: ../objects/FS/function.c:1124
-+msgid "Voltage"
-+msgstr "Voltaža"
-+
-+#  Translators: Menu item Noun/Energy/Electricity/Current
-+#. Translators: Menu item Noun/Energy/Electricity/Current
-+#: ../objects/FS/function.c:1126
-+msgid "Current"
-+msgstr "Struja"
-+
-+#. Translators: Menu item Noun/Energy/Hydraulic
-+#: ../objects/FS/function.c:1128
-+msgid "Hydraulic"
-+msgstr "Hidraulika"
-+
-+#. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-+#: ../objects/FS/function.c:1130
-+msgid "Pressure"
-+msgstr "Pritisak"
-+
-+#  Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-+#. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-+#: ../objects/FS/function.c:1132
-+msgid "Volumetric Flow"
-+msgstr "Protok koli�ina"
-+
-+#. Translators: Menu item Noun/Energy/Thermal
-+#: ../objects/FS/function.c:1134
-+msgid "Thermal"
-+msgstr "Termalni"
-+
-+#. Translators: Menu item Noun/Energy/Thermal/Heat
-+#: ../objects/FS/function.c:1136
-+msgid "Heat"
-+msgstr "Toplota"
-+
-+#  Translators: Menu item Noun/Energy/Thermal/Conduction
-+#. Translators: Menu item Noun/Energy/Thermal/Conduction
-+#: ../objects/FS/function.c:1138
-+msgid "Conduction"
-+msgstr "Provodljivost"
-+
-+#  Translators: Menu item Noun/Energy/Thermal/Convection
-+#. Translators: Menu item Noun/Energy/Thermal/Convection
-+#: ../objects/FS/function.c:1140
-+msgid "Convection"
-+msgstr "Pretvaranje"
-+
-+#  Translators: Menu item Noun/Energy/Thermal/Radiation
-+#. Translators: Menu item Noun/Energy/Thermal/Radiation
-+#. Translators: Menu item Noun/Energy/Radioactive/Radiation
-+#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
-+msgid "Radiation"
-+msgstr "Radijacija"
-+
-+#  Translators: Menu item Noun/Energy/Pneumatic
-+#. Translators: Menu item Noun/Energy/Pneumatic
-+#: ../objects/FS/function.c:1144
-+msgid "Pneumatic"
-+msgstr "Pneumatika"
-+
-+#. Translators: Menu item Noun/Energy/Chemical
-+#: ../objects/FS/function.c:1146
-+msgid "Chemical"
-+msgstr "Hemija"
-+
-+#. Translators: Menu item Noun/Energy/Radioactive
-+#: ../objects/FS/function.c:1148
-+msgid "Radioactive"
-+msgstr "Radioaktivno"
-+
-+#. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-+#: ../objects/FS/function.c:1152
-+msgid "Microwaves"
-+msgstr "Mikro talasi"
-+
-+#. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-+#: ../objects/FS/function.c:1154
-+msgid "Radio waves"
-+msgstr "Radio talasi"
-+
-+#. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-+#: ../objects/FS/function.c:1156
-+msgid "X-Rays"
-+msgstr "Iks zraci"
-+
-+#. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-+#: ../objects/FS/function.c:1158
-+msgid "Gamma Rays"
-+msgstr "Gama Zraci"
-+
-+#. Translators: Menu item Noun/Energy/Acoustic Energy
-+#: ../objects/FS/function.c:1160
-+msgid "Acoustic Energy"
-+msgstr "Zvu�na energija"
-+
-+#. Translators: Menu item Noun/Energy/Optical Energy
-+#: ../objects/FS/function.c:1162
-+msgid "Optical Energy"
-+msgstr "Opti�ka energija"
-+
-+#. Translators: Menu item Noun/Energy/Solar Energy
-+#: ../objects/FS/function.c:1164
-+msgid "Solar Energy"
-+msgstr "Solarna energija"
-+
-+#. Translators: Menu item Noun/Energy/Magnetic Energy
-+#: ../objects/FS/function.c:1166
-+msgid "Magnetic Energy"
-+msgstr "Magnetna energija"
-+
-+#  Translators: Menu item Noun/Energy/Human/Human Motion
-+#. Translators: Menu item Noun/Energy/Human/Human Motion
-+#: ../objects/FS/function.c:1170
-+msgid "Human Motion"
-+msgstr "Ljudsko kretanje"
-+
-+#. Translators: Menu item Noun/Energy/Human/Human Force
-+#: ../objects/FS/function.c:1172
-+msgid "Human Force"
-+msgstr "Ljudska sila"
-+
-+#. Translators: Menu item Noun/Signal/Status
-+#: ../objects/FS/function.c:1178
-+msgid "Status"
-+msgstr "Stanje"
-+
-+#: ../objects/FS/function.c:1182
-+msgid "User/Device Fn"
-+msgstr "Funkcija korisnika/uređaja"
-+
-+#: ../objects/FS/function.c:1183
-+msgid "Wish Fn"
-+msgstr "Funkcija želja"
-+
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
-+msgid "Macro call"
-+msgstr "Poziv makroa"
-+
-+#: ../objects/GRAFCET/action.c:137
-+msgid "This action is a call to a macro-step"
-+msgstr "Ova akcija je poziv makro-koraka"
-+
-+#: ../objects/GRAFCET/condition.c:132
-+msgid "Condition"
-+msgstr "Uslov"
-+
-+#: ../objects/GRAFCET/condition.c:132
-+msgid "The boolean equation of the condition"
-+msgstr "Logi�ka jedna�ina uslova"
-+
-+#: ../objects/GRAFCET/condition.c:134
-+msgid "The condition's font"
-+msgstr "Pismo uslova"
-+
-+#: ../objects/GRAFCET/condition.c:136
-+msgid "The condition's font size"
-+msgstr "Veli�ina pisma uslova"
-+
-+#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
-+msgid "Color"
-+msgstr "Boja"
-+
-+#: ../objects/GRAFCET/condition.c:139
-+msgid "The condition's color"
-+msgstr "Boja uslova"
-+
-+#: ../objects/GRAFCET/grafcet.c:45
-+msgid "GRAFCET diagram objects"
-+msgstr "Objekti GRAFCET dijagrama"
-+
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
-+msgid "Regular step"
-+msgstr "Obi�an korak"
-+
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
-+msgid "Initial step"
-+msgstr "Po�etni korak"
-+
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
-+msgid "Macro entry step"
-+msgstr "Korak ulaza u makro"
-+
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
-+msgid "Macro exit step"
-+msgstr "Korak izlaza iz makroa"
-+
-+#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
-+msgid "Macro call step"
-+msgstr "Korak poziva makroa"
-+
-+#: ../objects/GRAFCET/step.c:153
-+msgid "Subprogram call step"
-+msgstr "Poziv koraka podprograma"
-+
-+#: ../objects/GRAFCET/step.c:160
-+msgid "Step name"
-+msgstr "Naziv koraka"
-+
-+#: ../objects/GRAFCET/step.c:160
-+msgid "The name of the step"
-+msgstr "Naziv koraka"
-+
-+#: ../objects/GRAFCET/step.c:163
-+msgid "Step type"
-+msgstr "Vrsta koraka"
-+
-+#: ../objects/GRAFCET/step.c:163
-+msgid "The kind of step"
-+msgstr "Vrsta koraka"
-+
-+#: ../objects/GRAFCET/step.c:165
-+msgid "Active"
-+msgstr "Aktivno"
-+
-+#: ../objects/GRAFCET/step.c:165
-+msgid "Shows a red dot to figure the step's activity"
-+msgstr "Prikazuje crvenu ta�ku da oslika aktivnost koraka"
-+
-+#: ../objects/GRAFCET/transition.c:142
-+msgid "Receptivity"
-+msgstr "Prijem"
-+
-+#: ../objects/GRAFCET/transition.c:142
-+msgid "The boolean equation of the receptivity"
-+msgstr "Logi�ka jedna�ina za prijem"
-+
-+#: ../objects/GRAFCET/transition.c:144
-+msgid "The receptivity's font"
-+msgstr "Pismo prijema"
-+
-+#: ../objects/GRAFCET/transition.c:146
-+msgid "The receptivity's font size"
-+msgstr "Veli�ina pisma za prijem"
-+
-+#: ../objects/GRAFCET/transition.c:149
-+msgid "The receptivity's color"
-+msgstr "Boja prijema"
-+
-+#: ../objects/GRAFCET/transition.c:150
-+msgid "North point"
-+msgstr "Severna ta�ka"
-+
-+#: ../objects/GRAFCET/transition.c:151
-+msgid "South point"
-+msgstr "Južna ta�ka"
-+
-+#: ../objects/GRAFCET/vector.c:131
-+msgid "Draw arrow heads on upward arcs:"
-+msgstr "Crta strelice na lukovima usmerenim na gore:"
-+
-+#: ../objects/GRAFCET/vergent.c:124
-+msgid "OR"
-+msgstr "ILI"
-+
-+#: ../objects/GRAFCET/vergent.c:125
-+msgid "AND"
-+msgstr "I"
-+
-+# Ovo sam izmislio na brzinu ;-)
-+#: ../objects/GRAFCET/vergent.c:136
-+msgid "Vergent type:"
-+msgstr "Vrsta temena:"
-+
-+#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
-+#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
-+#: ../objects/standard/line.c:223
-+msgid "Add connection point"
-+msgstr "Dodaj ta�ku veze"
-+
-+#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
-+#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
-+#: ../objects/standard/line.c:224
-+msgid "Delete connection point"
-+msgstr "Obriši ta�ku veze"
-+
-+#: ../objects/GRAFCET/vergent.c:412
-+msgid "GRAFCET OR/AND vergent"
-+msgstr "GRAFCET ILI/I teme"
-+
-+#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
-+msgid "Unspecified"
-+msgstr "Neodređeno"
-+
-+#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
-+msgid "Agent"
-+msgstr "Zastupnik"
-+
-+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
-+msgid "Role"
-+msgstr "Uloga"
-+
-+#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
-+msgid "Softgoal"
-+msgstr "Blaži cilj"
-+
-+#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
-+msgid "Goal"
-+msgstr "Cilj"
-+
-+#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-+#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
-+msgid "Goal Type"
-+msgstr "Vrsta cilja"
-+
-+#: ../objects/Istar/istar.c:46
-+msgid "Istar diagram"
-+msgstr "Istar dijagram"
-+
-+#: ../objects/Istar/link.c:151
-+msgid "Positive contrib"
-+msgstr "Pozitivni doprinos"
-+
-+#: ../objects/Istar/link.c:152
-+msgid "Negative contrib"
-+msgstr "Negativni doprinos"
-+
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
-+msgid "Dependency"
-+msgstr "Zavisnost"
-+
-+#: ../objects/Istar/link.c:154
-+msgid "Decomposition"
-+msgstr "Razlaganje"
-+
-+#: ../objects/Istar/link.c:155
-+msgid "Means-Ends"
-+msgstr "Sredstva-završeci"
-+
-+#: ../objects/Istar/other.c:73
-+msgid "Resource"
-+msgstr "Resurs"
-+
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
-+msgid "Task"
-+msgstr "Zadatak"
-+
-+#: ../objects/Istar/other.c:477
-+msgid "i* other"
-+msgstr "i* drugi"
-+
-+#: ../objects/Jackson/domain.c:79
-+msgid "Given Domain"
-+msgstr "Zadani domen"
-+
-+#: ../objects/Jackson/domain.c:80
-+msgid "Designed Domain"
-+msgstr "Zacrtani domen"
-+
-+#: ../objects/Jackson/domain.c:81
-+msgid "Machine Domain"
-+msgstr "Mašinski domen"
-+
-+#: ../objects/Jackson/domain.c:97
-+msgid "Causal"
-+msgstr "Uzro�ni"
-+
-+#: ../objects/Jackson/domain.c:98
-+msgid "Biddable"
-+msgstr "Izraziv"
-+
-+#: ../objects/Jackson/domain.c:99
-+msgid "Lexical"
-+msgstr "Leksi�ki"
-+
-+#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
-+msgid "Domain Type"
-+msgstr "Tip domena"
-+
-+#: ../objects/Jackson/domain.c:183
-+msgid "Domain Kind"
-+msgstr "Vrsta domena"
-+
-+#: ../objects/Jackson/domain.c:184
-+msgid "Optional kind which appears in the lower right corner of the Domain"
-+msgstr "Neobavezna vrsta koja se pojavljuje u donjem desnom uglu domena"
-+
-+#: ../objects/Jackson/domain.c:539
-+msgid "Jackson domain"
-+msgstr "Džeksonov domen"
-+
-+#: ../objects/Jackson/jackson.c:47
-+msgid "Jackson diagram"
-+msgstr "Džeksonov dijagram"
-+
-+#: ../objects/Jackson/phenomenon.c:136
-+msgid "Shared"
-+msgstr "Deljen"
-+
-+#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
-+msgid "Requirement"
-+msgstr "Zahtev"
-+
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule
-+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
-+#: ../objects/UML/message.c:155
-+msgid "Message:"
-+msgstr "Poruka:"
-+
-+#: ../objects/KAOS/goal.c:82
-+msgid "Assumption"
-+msgstr "Pretpostavka"
-+
-+#: ../objects/KAOS/goal.c:83
-+msgid "Obstacle"
-+msgstr "Prepreka"
-+
-+#: ../objects/KAOS/goal.c:580
-+msgid "KAOS goal"
-+msgstr "Cilj KAOS"
-+
-+#: ../objects/KAOS/kaos.c:49
-+msgid "KAOS diagram"
-+msgstr "Dijagram KAOS"
-+
-+#: ../objects/KAOS/metaandorrel.c:153
-+msgid "AND Refinement"
-+msgstr "I pro�išćavanje"
-+
-+#: ../objects/KAOS/metaandorrel.c:154
-+msgid "Complete AND Refinement"
-+msgstr "Potpuno I pro�išćavanje"
-+
-+#: ../objects/KAOS/metaandorrel.c:155
-+msgid "OR Refinement"
-+msgstr "ILI proćišćavanje"
-+
-+#: ../objects/KAOS/metaandorrel.c:156
-+msgid "Operationalization"
-+msgstr "Operacionalizacija"
-+
-+#: ../objects/KAOS/metaandorrel.c:163
-+msgid "Text:"
-+msgstr "Tekst:"
-+
-+#: ../objects/KAOS/metabinrel.c:157
-+msgid "Contributes"
-+msgstr "Doprinosi"
-+
-+#: ../objects/KAOS/metabinrel.c:158
-+msgid "Obstructs"
-+msgstr "Ometa"
-+
-+#: ../objects/KAOS/metabinrel.c:159
-+msgid "Conflicts"
-+msgstr "Sukobljava se"
-+
-+#: ../objects/KAOS/metabinrel.c:160
-+msgid "Responsibility"
-+msgstr "Odgovornost"
-+
-+#: ../objects/KAOS/metabinrel.c:161
-+msgid "Monitors"
-+msgstr "Nadgleda"
-+
-+#: ../objects/KAOS/metabinrel.c:162
-+msgid "Controls"
-+msgstr "Kontroliše"
-+
-+#: ../objects/KAOS/metabinrel.c:163
-+msgid "CapableOf"
-+msgstr "Sposoban da"
-+
-+#: ../objects/KAOS/metabinrel.c:164
-+msgid "Performs"
-+msgstr "Obavlja"
-+
-+#: ../objects/KAOS/metabinrel.c:166
-+msgid "Output"
-+msgstr "Izlaz"
-+
-+#: ../objects/KAOS/other.c:533
-+msgid "KAOS other"
-+msgstr "KAOS drugi"
-+
-+#: ../objects/Misc/analog_clock.c:139
-+msgid "Arrow color"
-+msgstr "Boja kazaljke"
-+
-+#: ../objects/Misc/analog_clock.c:141
-+msgid "Arrow line width"
-+msgstr "Å irina kazaljke"
-+
-+#: ../objects/Misc/analog_clock.c:143
-+msgid "Seconds arrow color"
-+msgstr "Boja sekundare"
-+
-+#: ../objects/Misc/analog_clock.c:145
-+msgid "Seconds arrow line width"
-+msgstr "Å irina sekundare"
-+
-+#: ../objects/Misc/analog_clock.c:147
-+msgid "Show hours"
-+msgstr "Prikaži sate"
-+
-+#: ../objects/Misc/grid_object.c:140
-+msgid "Rows"
-+msgstr "Redovi"
-+
-+#: ../objects/Misc/grid_object.c:142
-+msgid "Columns"
-+msgstr "Stupci"
-+
-+#: ../objects/Misc/grid_object.c:144
-+msgid "Gridline color"
-+msgstr "Boja linije mreže"
-+
-+#: ../objects/Misc/grid_object.c:146
-+msgid "Gridline width"
-+msgstr "Širina linije mreže"
-+
-+#: ../objects/Misc/libmisc.c:41
-+msgid "Miscellaneous objects"
-+msgstr "Razni objekti"
-+
-+#: ../objects/Misc/measure.c:169
-+msgid "cm"
-+msgstr "cm"
-+
-+#: ../objects/Misc/measure.c:170
-+msgid "dm"
-+msgstr "dm"
-+
-+#: ../objects/Misc/measure.c:171
-+msgid "ft"
-+msgstr "stopa"
-+
-+#: ../objects/Misc/measure.c:172
-+msgid "in"
-+msgstr "in�i"
-+
-+#: ../objects/Misc/measure.c:173
-+msgid "m"
-+msgstr "m"
-+
-+#: ../objects/Misc/measure.c:174
-+msgid "mm"
-+msgstr "mm"
-+
-+#: ../objects/Misc/measure.c:175
-+msgid "pt"
-+msgstr "ta�aka"
-+
-+#  Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-+#: ../objects/Misc/measure.c:176
-+msgid "pi"
-+msgstr "pi"
-+
-+#. PROP_FLAG_VISIBLE|
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
-+msgid "Measurement"
-+msgstr "Merenje"
-+
-+#: ../objects/Misc/measure.c:187
-+msgid "Unit"
-+msgstr "Jedinica"
-+
-+#: ../objects/Misc/measure.c:188
-+msgid "Precision"
-+msgstr "Ta�nost"
-+
-+#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
-+msgid "Add Handle"
-+msgstr "Dodaj ru�ku"
-+
-+#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
-+msgid "Delete Handle"
-+msgstr "Obriši ru�ku"
-+
-+#: ../objects/SADT/arrow.c:138
-+msgid "Import resource (not shown upstairs)"
-+msgstr "Uvezi resurs (nije prikazan gore)"
-+
-+#: ../objects/SADT/arrow.c:139
-+msgid "Imply resource (not shown downstairs)"
-+msgstr "Podrazumevaj resurs (nije prikazan dole)"
-+
-+#: ../objects/SADT/arrow.c:140
-+msgid "Dotted arrow"
-+msgstr "Ta�kasta strelica"
-+
-+#: ../objects/SADT/arrow.c:141
-+msgid "disable arrow heads"
-+msgstr "isklju�i vrhove strelica"
-+
-+#: ../objects/SADT/arrow.c:148
-+msgid "Flow style:"
-+msgstr "Stil protoka:"
-+
-+#: ../objects/SADT/arrow.c:150
-+msgid "Automatically gray vertical flows:"
-+msgstr "Samostalno zasivi uspravni protok:"
-+
-+#: ../objects/SADT/arrow.c:151
-+msgid ""
-+"To improve the ease of reading, flows which begin and end vertically can be "
-+"rendered gray"
-+msgstr ""
-+"Zarad olakšavanja �itanja, tokovi koji po�inju i završavaju se uspravno mogu "
-+"biti iscrtani sivom bojom"
-+
-+#: ../objects/SADT/arrow.c:470
-+msgid "SADT Arrow"
-+msgstr "SADT strelica"
-+
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
-+#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
-+#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
-+msgid "Text padding"
-+msgstr "Popunjavanje teksta"
-+
-+#: ../objects/SADT/box.c:149
-+msgid "Activity/Data identifier"
-+msgstr "Identifikator aktivnosti/podataka"
-+
-+#: ../objects/SADT/box.c:150
-+msgid "The identifier which appears in the lower right corner of the Box"
-+msgstr "Identifikator koji se pojavljuje u donjem desnom uglu kvadratića"
-+
-+#: ../objects/SADT/box.c:460
-+msgid "SADT box"
-+msgstr "SADT kvadratić"
-+
-+#: ../objects/SADT/sadt.c:41
-+msgid "SADT diagram objects"
-+msgstr "Objekti SADT dijagrama"
-+
-+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-+msgid "No Protection"
-+msgstr "Bez zaštite"
-+
-+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-+msgid "Restricted Diffusion"
-+msgstr "Ograni�eno prostiranje"
-+
-+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-+msgid "Special Country Confidential"
-+msgstr "Posebna državna poverljivost"
-+
-+#: ../objects/SISSI/classification.h:41
-+msgid "Confidential"
-+msgstr "Poverljivo"
-+
-+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-+msgid "NATO Confidential"
-+msgstr "Poverljivost NATO-a"
-+
-+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-+msgid "Personal Confidential"
-+msgstr "Li�na poverljivost"
-+
-+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-+msgid "Medical Confidential"
-+msgstr "Poverljivost medicine"
-+
-+#: ../objects/SISSI/classification.h:45
-+msgid "Industrie Confidential"
-+msgstr "Industrijska poverljivost"
-+
-+#: ../objects/SISSI/classification.h:46
-+msgid "Defense Confidential"
-+msgstr "Poverljivost odbrane"
-+
-+#  Translators: Menu item Verb/Support/Secure
-+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-+msgid "Secret"
-+msgstr "Tajno"
-+
-+#: ../objects/SISSI/classification.h:48
-+msgid "Defense Secret"
-+msgstr "Tajna odbrane"
-+
-+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-+msgid "Secret special country"
-+msgstr "Tajna posebna zemlja"
-+
-+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-+msgid "NATO Secret"
-+msgstr "NATO tajna"
-+
-+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-+msgid "Very Secret"
-+msgstr "Strogo poverljivo"
-+
-+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-+msgid "NATO Very Secret"
-+msgstr "NATO strogo poverljivo"
-+
-+#: ../objects/SISSI/sissi.c:66
-+msgid "SISSI diagram"
-+msgstr "SISSI dijagram"
-+
-+#: ../objects/SISSI/sissi.c:923
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Not a regular file: %s"
-+msgstr ""
-+"Greška u�itavanja objekta.\n"
-+"Nije obi�na datoteka: %s"
-+
-+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Incorrect file type: %s"
-+msgstr ""
-+"Greška u�itavanja objekta.\n"
-+"Neispravna vrsta datoteke: %s"
-+
-+#: ../objects/SISSI/sissi.c:940
-+#, c-format
-+msgid ""
-+"Error loading object.\n"
-+"Not a Dia file: %s"
-+msgstr ""
-+"Greška u�itavanja objekta.\n"
-+"Nije datoteka Die: %s"
-+
-+#: ../objects/SISSI/sissi_dialog.c:48
-+msgid "Industrial Confidential"
-+msgstr "Industrijska poverljivost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:58
-+msgid "No integrity"
-+msgstr "Bez celovitosti"
-+
-+#: ../objects/SISSI/sissi_dialog.c:59
-+msgid "Low integrity"
-+msgstr "Niska celovitost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:60
-+msgid "Average software integrity"
-+msgstr "Prose�na softverska celovitost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:61
-+msgid "High software integrity"
-+msgstr "Visoka softverska celovitost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:62
-+msgid "Average hardware integrity"
-+msgstr "Prose�na hardverska celovitost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:63
-+msgid "High hardware integrity"
-+msgstr "Visoka hardverska celovitost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:68
-+msgid "Millisecond"
-+msgstr "Milisekunda"
-+
-+#: ../objects/SISSI/sissi_dialog.c:69
-+msgid "Second"
-+msgstr "Sekunda"
-+
-+#: ../objects/SISSI/sissi_dialog.c:70
-+msgid "Minute"
-+msgstr "Minut"
-+
-+#: ../objects/SISSI/sissi_dialog.c:71
-+msgid "Hour"
-+msgstr "Sat"
-+
-+#: ../objects/SISSI/sissi_dialog.c:72
-+msgid "Day"
-+msgstr "Dan"
-+
-+#: ../objects/SISSI/sissi_dialog.c:73
-+msgid "Week"
-+msgstr "Sedmica"
-+
-+#: ../objects/SISSI/sissi_dialog.c:78
-+msgid "SYSTEM"
-+msgstr "SISTEM"
-+
-+#: ../objects/SISSI/sissi_dialog.c:79
-+msgid "Internet access device"
-+msgstr "Uređaj pristupa internetu"
-+
-+#: ../objects/SISSI/sissi_dialog.c:80
-+msgid "Electronic messaging"
-+msgstr "Elektronsko dopisivanje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:81
-+msgid "Intranet"
-+msgstr "Intranet"
-+
-+#: ../objects/SISSI/sissi_dialog.c:82
-+msgid "Company directory"
-+msgstr "Registar preduzeća"
-+
-+#: ../objects/SISSI/sissi_dialog.c:83
-+msgid "External portal"
-+msgstr "Spoljni portal"
-+
-+#: ../objects/SISSI/sissi_dialog.c:88
-+msgid "ORGANISATION"
-+msgstr "ORGANIZACIJA"
-+
-+#: ../objects/SISSI/sissi_dialog.c:89
-+msgid "Higher-tier organisation"
-+msgstr "Organizacija visokog nivoa"
-+
-+#: ../objects/SISSI/sissi_dialog.c:90
-+msgid "Structure of the organisation"
-+msgstr "Struktura organizacije"
-+
-+#: ../objects/SISSI/sissi_dialog.c:91
-+msgid "Project or system organisation"
-+msgstr "Organizacija projekta ili sistema"
-+
-+#: ../objects/SISSI/sissi_dialog.c:92
-+msgid "Subcontractors / Suppliers / Manufacturers"
-+msgstr "Podizvođa�i / Dobavlja�i / Proizvođa�i"
-+
-+#: ../objects/SISSI/sissi_dialog.c:97
-+msgid "SITE"
-+msgstr "SAJT"
-+
-+#: ../objects/SISSI/sissi_dialog.c:98
-+msgid "Places"
-+msgstr "Mesta"
-+
-+#: ../objects/SISSI/sissi_dialog.c:99
-+msgid "External environment"
-+msgstr "Spoljno okruženje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:100
-+msgid "Premises"
-+msgstr "Prostorije"
-+
-+#: ../objects/SISSI/sissi_dialog.c:101
-+msgid "Zone"
-+msgstr "Zona"
-+
-+#: ../objects/SISSI/sissi_dialog.c:102
-+msgid "Essential Services"
-+msgstr "Suštinske usluge"
-+
-+#: ../objects/SISSI/sissi_dialog.c:103
-+msgid "Communication"
-+msgstr "Komunikacija"
-+
-+#: ../objects/SISSI/sissi_dialog.c:104
-+msgid "Power"
-+msgstr "Napajanje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:105
-+msgid "Cooling / Pollution"
-+msgstr "Hlađenje / Zagađenje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:109
-+msgid "Thermal detection"
-+msgstr "Otkrivanje toplote"
-+
-+#: ../objects/SISSI/sissi_dialog.c:113
-+msgid "Fire detection"
-+msgstr "Otkrivanje vatre"
-+
-+#: ../objects/SISSI/sissi_dialog.c:117
-+msgid "Water detection"
-+msgstr "Otkrivanje vode"
-+
-+#: ../objects/SISSI/sissi_dialog.c:121
-+msgid "Air detection"
-+msgstr "Otkrivanje vazduha"
-+
-+#: ../objects/SISSI/sissi_dialog.c:125
-+msgid "Energy detection"
-+msgstr "Otkrivanje energije"
-+
-+#: ../objects/SISSI/sissi_dialog.c:129
-+msgid "Intrusion detection"
-+msgstr "Otkrivanje upada"
-+
-+#: ../objects/SISSI/sissi_dialog.c:133
-+msgid "Thermal action"
-+msgstr "Radnja toplote"
-+
-+#: ../objects/SISSI/sissi_dialog.c:137
-+msgid "Fire action"
-+msgstr "Radnja vatre"
-+
-+#: ../objects/SISSI/sissi_dialog.c:141
-+msgid "Water action"
-+msgstr "Radnja vode"
-+
-+#: ../objects/SISSI/sissi_dialog.c:145
-+msgid "Air action"
-+msgstr "Radnja vazduha"
-+
-+#: ../objects/SISSI/sissi_dialog.c:149
-+msgid "Energy action"
-+msgstr "Radnja energije"
-+
-+#: ../objects/SISSI/sissi_dialog.c:153
-+msgid "Intrusion action"
-+msgstr "Radnja upada"
-+
-+#: ../objects/SISSI/sissi_dialog.c:158
-+msgid "Personal"
-+msgstr "Li�no"
-+
-+#: ../objects/SISSI/sissi_dialog.c:159
-+msgid "Decision maker"
-+msgstr "Donosilac odluke"
-+
-+#: ../objects/SISSI/sissi_dialog.c:160
-+msgid "SSI Responsible"
-+msgstr "SSI odgovoran"
-+
-+#: ../objects/SISSI/sissi_dialog.c:161
-+msgid "Users"
-+msgstr "Korisnici"
-+
-+#: ../objects/SISSI/sissi_dialog.c:162
-+msgid "Functional administrator"
-+msgstr "Funkcionalni administrator"
-+
-+#: ../objects/SISSI/sissi_dialog.c:163
-+msgid "Technical administrator"
-+msgstr "Tehni�ki administrator"
-+
-+#: ../objects/SISSI/sissi_dialog.c:164
-+msgid "SSI administrator"
-+msgstr "SSI administrator"
-+
-+#: ../objects/SISSI/sissi_dialog.c:165
-+msgid "Developer"
-+msgstr "Programer"
-+
-+#: ../objects/SISSI/sissi_dialog.c:166
-+msgid "Operator / Maintenance"
-+msgstr "Izvršilac / Održavanje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
-+msgid "Network"
-+msgstr "Mreža"
-+
-+#: ../objects/SISSI/sissi_dialog.c:172
-+msgid "Medium and support"
-+msgstr "Medijum i podrška"
-+
-+#: ../objects/SISSI/sissi_dialog.c:173
-+msgid "Passive or active relay"
-+msgstr "Pasivan ili aktivan prenos"
-+
-+#: ../objects/SISSI/sissi_dialog.c:174
-+msgid "Communication interface"
-+msgstr "Su�elje komunikacije"
-+
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
-+msgid "Software"
-+msgstr "Softver"
-+
-+#  Operations page:
-+#: ../objects/SISSI/sissi_dialog.c:180
-+msgid "Operating System"
-+msgstr "Operativni sistem"
-+
-+#: ../objects/SISSI/sissi_dialog.c:181
-+msgid "Service - maintenance or administration software"
-+msgstr "Usluga — softver održavanja ili administracije"
-+
-+#: ../objects/SISSI/sissi_dialog.c:182
-+msgid "Packaged software or standard software"
-+msgstr "Zapakovani ili uobi�ajeni softver"
-+
-+#: ../objects/SISSI/sissi_dialog.c:183
-+msgid "Business application"
-+msgstr "Poslovni program"
-+
-+#: ../objects/SISSI/sissi_dialog.c:184
-+msgid "Standard business application"
-+msgstr "Uobi�ajen poslovni program"
-+
-+#: ../objects/SISSI/sissi_dialog.c:185
-+msgid "Specific business application"
-+msgstr "Poseban poslovni program"
-+
-+#: ../objects/SISSI/sissi_dialog.c:190
-+msgid "HARDWARE"
-+msgstr "HARDVER"
-+
-+#: ../objects/SISSI/sissi_dialog.c:191
-+msgid "Data-processing equipment (active)"
-+msgstr "Oprema za obradu podataka (radna)"
-+
-+#: ../objects/SISSI/sissi_dialog.c:192
-+msgid "Mobile equipment"
-+msgstr "Pokretna oprema"
-+
-+#: ../objects/SISSI/sissi_dialog.c:193
-+msgid "Fixed equipment"
-+msgstr "Stalna oprema"
-+
-+#: ../objects/SISSI/sissi_dialog.c:194
-+msgid "Peripheral processing"
-+msgstr "Spoljno obrađivanje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:195
-+msgid "Electronic medium"
-+msgstr "Elektronski medij"
-+
-+#: ../objects/SISSI/sissi_dialog.c:196
-+msgid "Other media"
-+msgstr "Ostali mediji"
-+
-+#: ../objects/SISSI/sissi_dialog.c:197
-+msgid "Data medium (passive)"
-+msgstr "Medij podataka (pasivan)"
-+
-+#. Class page:
-+#: ../objects/SISSI/sissi_dialog.c:301
-+msgid "_Menace"
-+msgstr "_Opasnost"
-+
-+#. ********* label of board *********
-+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-+msgid "Menace"
-+msgstr "Opasnost"
-+
-+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-+msgid "P Action"
-+msgstr "P radnja"
-+
-+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-+msgid "P Detection"
-+msgstr "P otkrivanje"
-+
-+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-+msgid "Vulnerability"
-+msgstr "Ranjivost"
-+
-+#. Other properties of page:
-+#: ../objects/SISSI/sissi_dialog.c:488
-+msgid "Other properties"
-+msgstr "Ostala svojstva"
-+
-+#. ********* selection menu of entity ********
-+#. ********* Label of board *********
-+#: ../objects/SISSI/sissi_dialog.c:726
-+msgid "Label"
-+msgstr "Natpis"
-+
-+#: ../objects/SISSI/sissi_dialog.c:728
-+msgid "value"
-+msgstr "vrednost"
-+
-+#. Other properties of page
-+#: ../objects/SISSI/sissi_dialog.c:862
-+msgid "Documents"
-+msgstr "Dokumenti"
-+
-+#: ../objects/SISSI/sissi_dialog.c:878
-+msgid "Document title"
-+msgstr "Naslov dokumenta"
-+
-+#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
-+#: ../sheets/UML.sheet.in.h:15
-+msgid "Actor"
-+msgstr "Glumac"
-+
-+#: ../objects/UML/association.c:222
-+msgid "From A to B"
-+msgstr "Od A do B"
-+
-+#: ../objects/UML/association.c:223
-+msgid "From B to A"
-+msgstr "Od B do A"
-+
-+#: ../objects/UML/association.c:228
-+msgid "Aggregation"
-+msgstr "Prikupljanje"
-+
-+#: ../objects/UML/association.c:229
-+msgid "Composition"
-+msgstr "Slaganje"
-+
-+#: ../objects/UML/association.c:236
-+msgid "Direction"
-+msgstr "Smer"
-+
-+#: ../objects/UML/association.c:238
-+msgid "Show direction"
-+msgstr "Prikaži smer"
-+
-+#: ../objects/UML/association.c:238
-+msgid "Show the small arrow denoting the reading direction"
-+msgstr "Prikazuje malu strelicu ozna�avajući smer �itanja"
-+
-+#: ../objects/UML/association.c:245
-+msgid "Side A"
-+msgstr "Strana A"
-+
-+#: ../objects/UML/association.c:249
-+msgid "Multiplicity"
-+msgstr "Višestrukost"
-+
-+#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
-+#: ../objects/UML/umloperation.c:71
-+msgid "Visibility"
-+msgstr "Vidljivost"
-+
-+#: ../objects/UML/association.c:253
-+msgid "Show arrow"
-+msgstr "Prikaži strelice"
-+
-+#: ../objects/UML/association.c:256
-+msgid "Side B"
-+msgstr "Strana B"
-+
-+#  Class page:
-+#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
-+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
-+msgid "Class"
-+msgstr "Razred"
-+
-+#. how it used to be before 0.96+SVN
-+#. one name, one type: but breaks forward-compatibiliy so kind of reverted
-+#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
-+#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
-+#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
-+#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
-+msgid "Stereotype"
-+msgstr "Stereotip"
-+
-+#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
-+#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
-+#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
-+msgid "Abstract"
-+msgstr "Apstrakt"
-+
-+#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
-+msgid "Template"
-+msgstr "Å ablon"
-+
-+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
-+msgid "Suppress Attributes"
-+msgstr "Zanemari atribute"
-+
-+#: ../objects/UML/class.c:157
-+msgid "Suppress Operations"
-+msgstr "Zanemari operacije"
-+
-+#: ../objects/UML/class.c:159
-+msgid "Visible Attributes"
-+msgstr "Vidljive osobine"
-+
-+#: ../objects/UML/class.c:161
-+msgid "Visible Operations"
-+msgstr "Vidljive operacije"
-+
-+#: ../objects/UML/class.c:163
-+msgid "Visible Comments"
-+msgstr "Vidljive primedbe"
-+
-+#  Operations page:
-+#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
-+msgid "Wrap Operations"
-+msgstr "Operacije preloma"
-+
-+#: ../objects/UML/class.c:167
-+msgid "Wrap after char"
-+msgstr "Prelomi nakon znaka"
-+
-+#: ../objects/UML/class.c:169
-+msgid "Comment line length"
-+msgstr "Dužina napomene"
-+
-+#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
-+msgid "Polymorphic"
-+msgstr "Polimorfna"
-+
-+#: ../objects/UML/class.c:185
-+msgid "Classname"
-+msgstr "Naziv klase"
-+
-+#: ../objects/UML/class.c:187
-+msgid "Abstract Classname"
-+msgstr "Apstraktni naziv razreda"
-+
-+#  Operations page:
-+#: ../objects/UML/class.c:211
-+msgid "Operations"
-+msgstr "Operacije"
-+
-+#: ../objects/UML/class.c:214
-+msgid "Template Parameters"
-+msgstr "Parametri Å¡ablona"
-+
-+#: ../objects/UML/class.c:320
-+msgid "Show Comments"
-+msgstr "Prikaži napomene"
-+
-+#  Class page:
-+#. Class page:
-+#: ../objects/UML/class_dialog.c:429
-+msgid "_Class"
-+msgstr "_Razred"
-+
-+#: ../objects/UML/class_dialog.c:437
-+msgid "Class name:"
-+msgstr "Naziv razreda:"
-+
-+#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
-+#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
-+#: ../objects/UML/realizes.c:136
-+msgid "Stereotype:"
-+msgstr "Stereotip:"
-+
-+#: ../objects/UML/class_dialog.c:474
-+msgid "Attributes visible"
-+msgstr "Osobine su vidljive"
-+
-+#: ../objects/UML/class_dialog.c:483
-+msgid "Operations visible"
-+msgstr "Operacije su vidljive"
-+
-+#: ../objects/UML/class_dialog.c:486
-+msgid "Suppress operations"
-+msgstr "Potisni operacije"
-+
-+#: ../objects/UML/class_dialog.c:500
-+msgid "Wrap after this length: "
-+msgstr "Prelomi nakon ove dužine: "
-+
-+#: ../objects/UML/class_dialog.c:508
-+msgid "Comments visible"
-+msgstr "Napomene su vidljive"
-+
-+#: ../objects/UML/class_dialog.c:515
-+msgid "Wrap comment after this length: "
-+msgstr "Prelomi napomene nakon ove dužine: "
-+
-+#: ../objects/UML/class_dialog.c:585
-+msgid "Class Name"
-+msgstr "Naziv razreda"
-+
-+#: ../objects/UML/class_dialog.c:590
-+msgid "Abstract Class"
-+msgstr "Apstraktni razred"
-+
-+#. should probably be refactored too.
-+#: ../objects/UML/class_dialog.c:607
-+msgid "Line Width"
-+msgstr "Å irina linije"
-+
-+#: ../objects/UML/class_dialog.c:616
-+msgid "Text Color"
-+msgstr "Boja teksta"
-+
-+#: ../objects/UML/class_dialog.c:624
-+msgid "Foreground Color"
-+msgstr "Boja iscrtavanja"
-+
-+#: ../objects/UML/class_dialog.c:632
-+msgid "Background Color"
-+msgstr "Boja pozadine"
-+
-+#: ../objects/UML/class_dialog.c:1170
-+msgid "Value:"
-+msgstr "Vrednost:"
-+
-+#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
-+msgid "Visibility:"
-+msgstr "Vidljivost:"
-+
-+#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
-+#: ../objects/UML/uml.c:102
-+msgid "Public"
-+msgstr "Javno"
-+
-+#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
-+#: ../objects/UML/uml.c:103
-+msgid "Private"
-+msgstr "Privatno"
-+
-+#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
-+#: ../objects/UML/uml.c:104
-+msgid "Protected"
-+msgstr "Zaštićen"
-+
-+#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
-+#: ../objects/UML/uml.c:105
-+msgid "Implementation"
-+msgstr "Izvedba"
-+
-+#. end: Inheritance type
-+#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
-+msgid "Class scope"
-+msgstr "Domet razreda"
-+
-+#. end: Visibility
-+#: ../objects/UML/class_dialog.c:2078
-+msgid "Inheritance type:"
-+msgstr "Vrsta nasleđivanja:"
-+
-+#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
-+msgid "Polymorphic (virtual)"
-+msgstr "Polimorfna (virtuelna)"
-+
-+#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
-+msgid "Leaf (final)"
-+msgstr "List (krajnji)"
-+
-+#: ../objects/UML/class_dialog.c:2107
-+msgid "Query"
-+msgstr "Upit"
-+
-+#: ../objects/UML/class_dialog.c:2154
-+msgid "Parameters:"
-+msgstr "Parametri:"
-+
-+#: ../objects/UML/class_dialog.c:2239
-+msgid "Parameter data"
-+msgstr "Podaci parametra"
-+
-+#: ../objects/UML/class_dialog.c:2272
-+msgid "Def. value:"
-+msgstr "Osn. vrednost:"
-+
-+#: ../objects/UML/class_dialog.c:2306
-+msgid "Direction:"
-+msgstr "Smer:"
-+
-+#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
-+msgid "Undefined"
-+msgstr "Neodređeno"
-+
-+#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
-+msgid "In"
-+msgstr "Unutra"
-+
-+#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
-+msgid "Out"
-+msgstr "Napolje"
-+
-+#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
-+msgid "In & Out"
-+msgstr "Unutra i napolje"
-+
-+#  Operations page:
-+#. Operations page:
-+#: ../objects/UML/class_dialog.c:2359
-+msgid "_Operations"
-+msgstr "_Operacije"
-+
-+#: ../objects/UML/class_dialog.c:2417
-+msgid "Operation data"
-+msgstr "Podaci operacije"
-+
-+#. Templates page:
-+#: ../objects/UML/class_dialog.c:2780
-+msgid "_Templates"
-+msgstr "_Å abloni"
-+
-+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
-+msgid "Template class"
-+msgstr "Razred Å¡ablona"
-+
-+#: ../objects/UML/class_dialog.c:2843
-+msgid "Formal parameter data"
-+msgstr "Formalni podaci parametra"
-+
-+#: ../objects/UML/classicon.c:130
-+msgid "Boundary"
-+msgstr "Ograni�enje"
-+
-+#: ../objects/UML/classicon.c:145
-+msgid "Is object"
-+msgstr "Objekat je"
-+
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
-+msgid "Facet"
-+msgstr "Pljosan"
-+
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
-+msgid "Receptacle"
-+msgstr "Priklju�ak"
-+
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
-+msgid "Event Source"
-+msgstr "Izvor događaja"
-+
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
-+msgid "Event Sink"
-+msgstr "Odredište događaja"
-+
-+#: ../objects/UML/constraint.c:127
-+msgid "Constraint:"
-+msgstr "Ograni�enje:"
-+
-+#: ../objects/UML/dependency.c:141
-+msgid "Show arrow:"
-+msgstr "Pokaži strelice:"
-+
-+#. how it used to be before 0.96+SVN
-+#. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-+#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
-+msgid "Interface:"
-+msgstr "Su�elje:"
-+
-+#: ../objects/UML/lifeline.c:152
-+msgid "Draw focus of control:"
-+msgstr "Iscrtaj fokus elementa:"
-+
-+#: ../objects/UML/lifeline.c:154
-+msgid "Draw destruction mark:"
-+msgstr "Iscrtaj oznaku uništenja:"
-+
-+#: ../objects/UML/lifeline.c:505
-+msgid "Add connection points"
-+msgstr "Dodaj ta�ke veze"
-+
-+#: ../objects/UML/lifeline.c:506
-+msgid "Remove connection points"
-+msgstr "Obriši ta�ke veze"
-+
-+#: ../objects/UML/lifeline.c:507
-+msgid "Increase connection points distance"
-+msgstr "Povećaj rastojanje ta�aka veze"
-+
-+#: ../objects/UML/lifeline.c:508
-+msgid "Decrease connection points distance"
-+msgstr "Umanji rastojanje ta�aka veze"
-+
-+#: ../objects/UML/lifeline.c:509
-+msgid "Set default connection points distance"
-+msgstr "Podesi osnovno rastojanje ta�aka veze"
-+
-+#: ../objects/UML/lifeline.c:513
-+msgid "UML Lifeline"
-+msgstr "UML linija života"
-+
-+#: ../objects/UML/message.c:137
-+msgid "Call"
-+msgstr "Poziv"
-+
-+#: ../objects/UML/message.c:138
-+msgid "Create"
-+msgstr "Napravi"
-+
-+#: ../objects/UML/message.c:139
-+msgid "Destroy"
-+msgstr "Uništi"
-+
-+#: ../objects/UML/message.c:140
-+msgid "Simple"
-+msgstr "Jednostavno"
-+
-+#: ../objects/UML/message.c:141
-+msgid "Return"
-+msgstr "Povrati"
-+
-+#: ../objects/UML/message.c:142
-+msgid "Send"
-+msgstr "Pošalji"
-+
-+#: ../objects/UML/message.c:143
-+msgid "Recursive"
-+msgstr "Rekurzivno"
-+
-+#: ../objects/UML/message.c:158
-+msgid "Message type:"
-+msgstr "Vrsta poruke:"
-+
-+#: ../objects/UML/object.c:155
-+msgid "Explicit state"
-+msgstr "Izri�ito stanje"
-+
-+#: ../objects/UML/object.c:160
-+msgid "Active object"
-+msgstr "Aktivni objekat"
-+
-+#: ../objects/UML/object.c:162
-+msgid "Show attributes"
-+msgstr "Prikaži osobine"
-+
-+#: ../objects/UML/object.c:164
-+msgid "Multiple instance"
-+msgstr "Višestruke instance"
-+
-+#: ../objects/UML/state.c:155
-+msgid "Entry action"
-+msgstr "Radnja stavke"
-+
-+#  Translators: Menu item Noun/Energy/Mechanical/Rotation
-+#: ../objects/UML/state.c:156
-+msgid "Do action"
-+msgstr "Izvrši radnju"
-+
-+#: ../objects/UML/state.c:157
-+msgid "Exit action"
-+msgstr "Napusti radnju"
-+
-+#. Would like to create a state_term instead, but making the connections
-+#. * is a pain
-+#: ../objects/UML/state.c:479
-+msgid ""
-+"This diagram uses the State object for initial/final states.\n"
-+"That option will go away in future versions.\n"
-+"Please use the Initial/Final State object instead\n"
-+msgstr ""
-+"Ovaj dijagram koristi objekat stanja za po�etna/završna stanja.\n"
-+"Ova opcija će biti uklonjena u budućim izdanjima.\n"
-+"Molim umesto njega koristite objekte za po�etna/završna stanja\n"
-+
-+#: ../objects/UML/state_term.c:127
-+msgid "Is final"
-+msgstr "Jeste završno"
-+
-+#: ../objects/UML/transition.c:141
-+msgid "Trigger"
-+msgstr "Okida�"
-+
-+#: ../objects/UML/transition.c:142
-+msgid "The event that causes this transition to be taken"
-+msgstr "Događaj koji uzrokuje da se dogodi ovaj prelaz"
-+
-+#: ../objects/UML/transition.c:143
-+msgid "Action"
-+msgstr "Radnja"
-+
-+#: ../objects/UML/transition.c:144
-+msgid "Action to perform when this transition is taken"
-+msgstr "Radnja koju treba obaviti kada se dogodi ovaj prelaz"
-+
-+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
-+msgid "Guard"
-+msgstr "ÄŒuvar"
-+
-+#: ../objects/UML/transition.c:146
-+msgid "Condition for taking this transition when the event is fired"
-+msgstr "Uslov za ovaj prelaz kada se desi događaj"
-+
-+#: ../objects/UML/uml.c:66
-+msgid "Unified Modelling Language diagram objects UML 1.3"
-+msgstr "Dijagramski objekti Objedinjenog jezika modelisanja UML 1.3"
-+
-+#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-+msgid "Value"
-+msgstr "Vrednost"
-+
-+#: ../objects/UML/umlattribute.c:47
-+msgid "Abstract (?)"
-+msgstr "Apstraktno (?)"
-+
-+#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
-+msgid "Class scope (static)"
-+msgstr "Domet razreda (stati�ki)"
-+
-+#: ../objects/UML/umloperation.c:73
-+msgid "Inheritance type"
-+msgstr "Vrsta nasleđa"
-+
-+#: ../objects/UML/umloperation.c:75
-+msgid "Query (const)"
-+msgstr "Upit (konstanta)"
-+
-+#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
-+msgid "Parameters"
-+msgstr "Parametri"
-+
-+#: ../objects/UML/usecase.c:136
-+msgid "Text outside"
-+msgstr "Tekst napolju"
-+
-+#: ../objects/UML/usecase.c:138
-+msgid "Collaboration"
-+msgstr "Saradnja"
-+
-+#: ../objects/chronogram/chronogram.c:40
-+msgid "Chronogram diagram objects"
-+msgstr "Hronogramski dijagramski objekti"
-+
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
-+msgid "Data"
-+msgstr "Podaci"
-+
-+#: ../objects/chronogram/chronoline.c:152
-+msgid "Data name"
-+msgstr "Naziv podataka"
-+
-+#: ../objects/chronogram/chronoline.c:154
-+msgid "Events"
-+msgstr "Događaji"
-+
-+#: ../objects/chronogram/chronoline.c:157
-+msgid "Event specification"
-+msgstr "Odrednice događaja"
-+
-+#: ../objects/chronogram/chronoline.c:158
-+msgid ""
-+"@ time    set the pointer at an absolute time.\n"
-+"( duration  sets the signal up, then wait 'duration'.\n"
-+") duration  sets the signal down, then wait 'duration'.\n"
-+"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-+"example : @ 1.0 (2.0)1.0(2.0)\n"
-+msgstr ""
-+"@ vreme     postavlja pokaziva�a na apsolutno vreme.\n"
-+"( trajanje   postavlja signal gore, a zatim �eka „trajanje“.\n"
-+") trajanje   postavlja signal dole, a zatim �eka „trajanje“.\n"
-+"u trajanje   postavlja signal na „nepoznato“ stanje, a zatim �eka „trajanje“.\n"
-+"primer : @ 1.0 (2.0)1.0(2.0)\n"
-+
-+#: ../objects/chronogram/chronoline.c:166
-+#: ../objects/chronogram/chronoref.c:148
-+msgid "Start time"
-+msgstr "Po�etno vreme"
-+
-+#: ../objects/chronogram/chronoline.c:168
-+#: ../objects/chronogram/chronoref.c:150
-+msgid "End time"
-+msgstr "Krajnje vreme"
-+
-+#: ../objects/chronogram/chronoline.c:170
-+msgid "Rise time"
-+msgstr "Vreme izdizanja"
-+
-+#: ../objects/chronogram/chronoline.c:172
-+msgid "Fall time"
-+msgstr "Vreme opadanja"
-+
-+#: ../objects/chronogram/chronoline.c:173
-+msgid "Multi-bit data"
-+msgstr "Više-bitni podaci"
-+
-+#: ../objects/chronogram/chronoline.c:175
-+#: ../objects/chronogram/chronoref.c:158
-+msgid "Aspect"
-+msgstr "Izgled"
-+
-+#: ../objects/chronogram/chronoline.c:177
-+msgid "Data color"
-+msgstr "Podaci o bojama"
-+
-+#: ../objects/chronogram/chronoline.c:179
-+msgid "Data line width"
-+msgstr "Å irina linije sa podacima"
-+
-+#: ../objects/chronogram/chronoref.c:146
-+msgid "Time data"
-+msgstr "Podaci o vremenu"
-+
-+#: ../objects/chronogram/chronoref.c:152
-+msgid "Major time step"
-+msgstr "Glavni vremenski korak"
-+
-+#: ../objects/chronogram/chronoref.c:154
-+msgid "Minor time step"
-+msgstr "Manjinski vremenski korak"
-+
-+#: ../objects/chronogram/chronoref.c:164
-+msgid "Minor step line width"
-+msgstr "Å irina linije manjinskog koraka"
-+
-+#: ../objects/custom/custom.c:140
-+msgid "Custom"
-+msgstr "Proizvoljno"
-+
-+#: ../objects/custom/custom.c:140
-+msgid "Custom XML shapes loader"
-+msgstr "U�itava� proizvoljnih IksML oblika"
-+
-+#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
-+#: ../objects/custom/custom_object.c:1782
-+msgid "Flip horizontal"
-+msgstr "Izvrnite vodoravno"
-+
-+#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
-+#: ../objects/custom/custom_object.c:1783
-+msgid "Flip vertical"
-+msgstr "Izvrnite uspravno"
-+
-+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
-+msgid "Scale of the subshapes"
-+msgstr "Razmera sadržanih oblika"
-+
-+#: ../objects/custom/custom_object.c:1820
-+#: ../objects/custom_lines/custom_linetypes.c:263
-+#, c-format
-+msgid "Cannot open icon file %s for object type '%s'."
-+msgstr "Ne mogu da otvorim datoteku ikonice „%s“s za vrstu objekta „%s“."
-+
-+#: ../objects/custom_lines/custom_lines.c:160
-+msgid "CustomLines"
-+msgstr "Proizvoljne linije"
-+
-+#: ../objects/custom_lines/custom_lines.c:160
-+msgid "Custom XML lines loader"
-+msgstr "U�itava� proizvoljnih IksML linija"
-+
-+#: ../objects/custom_lines/custom_linetypes.c:226
-+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
-+msgstr ""
-+"UNUTRAÅ NJE: Proizvoljne linije: Neispravna vrsta linije u objektu podataka "
-+"linije."
-+
-+#: ../objects/custom_lines/custom_linetypes.c:251
-+#, c-format
-+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
-+msgstr ""
-+"UNUTRAÅ NJE: Proizvoljne linije: Neispravna vrsta linije u objektu podataka "
-+"linije %s."
-+
-+#: ../objects/custom/shape_info.c:162
-+#, c-format
-+msgid ""
-+"The file '%s' has invalid path data.\n"
-+"svg:path data must start with moveto."
-+msgstr ""
-+"Datoteka „%s“ ima neispravne podatke o putanji.\n"
-+"podaci svg:putanje moraju po�eti sa premesti u."
-+
-+#: ../objects/flowchart/flowchart.c:37
-+msgid "Flowchart objects"
-+msgstr "Objekti dijagrama toka"
-+
-+#: ../objects/flowchart/parallelogram.c:154
-+msgid "Shear angle"
-+msgstr "OÅ¡tar ugao"
-+
-+#: ../objects/network/basestation.c:137
-+msgid "Sectors"
-+msgstr "Sektori"
-+
-+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
-+msgid "Base Station"
-+msgstr "Bazna stanica"
-+
-+#: ../objects/network/network.c:43
-+msgid "Network diagram objects"
-+msgstr "Objekti dijagrama mreže"
-+
-+#: ../objects/network/radiocell.c:121
-+msgid "Radius"
-+msgstr "Polupre�nik"
-+
-+#: ../objects/network/wanlink.c:119
-+msgid "Width"
-+msgstr "Å irina"
-+
-+#: ../objects/standard/arc.c:141
-+msgid "Curve distance"
-+msgstr "Rastojanje krive"
-+
-+#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
-+#: ../objects/standard/polyline.c:137
-+msgid "Line gaps"
-+msgstr "Praznine linije"
-+
-+#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
-+#: ../objects/standard/polyline.c:139
-+msgid "Absolute start gap"
-+msgstr "Apsolutna praznina po�etka"
-+
-+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
-+#: ../objects/standard/polyline.c:141
-+msgid "Absolute end gap"
-+msgstr "Apsolutna praznina kraja"
-+
-+#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
-+msgid "Symmetric control"
-+msgstr "Kontrola jednakosti"
-+
-+#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
-+msgid "Smooth control"
-+msgstr "Kontrola glatkosti"
-+
-+# Ovo nisam siguran imamo li mi bolji naziv
-+#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
-+msgid "Cusp control"
-+msgstr "Kontrola Å¡iljka"
-+
-+#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
-+msgid "Free"
-+msgstr "Slobodno"
-+
-+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
-+msgid "Fixed"
-+msgstr "Vezano"
-+
-+#  Translators: Menu item Verb/Support/Secure
-+#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
-+msgid "Square"
-+msgstr "Kvadrat"
-+
-+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
-+msgid "Aspect ratio"
-+msgstr "Odnos razmere"
-+
-+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
-+msgid "Free aspect"
-+msgstr "Slobodan odnos"
-+
-+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
-+msgid "Fixed aspect"
-+msgstr "Utvrđen odnos"
-+
-+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
-+msgid "Circle"
-+msgstr "Krug"
-+
-+#: ../objects/standard/image.c:139
-+msgid "Image file"
-+msgstr "Datoteka slike"
-+
-+#: ../objects/standard/image.c:141
-+msgid "Draw border"
-+msgstr "Iscrtaj granicu"
-+
-+#: ../objects/standard/image.c:143
-+msgid "Keep aspect ratio"
-+msgstr "Zadrži odnos razmere"
-+
-+#. Found file in same dir as diagram.
-+#. Found file in current dir.
-+#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
-+#, c-format
-+msgid ""
-+"The image file '%s' was not found in that directory.\n"
-+"Using the file '%s' instead\n"
-+msgstr ""
-+"Datoteka slike „%s“ nije nađena u tom direktorijumu.\n"
-+"Umesto toga koristim datoteku „%s“\n"
-+
-+#  Didn't find file in current dir.
-+#. Didn't find file in current dir.
-+#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
-+#, c-format
-+msgid "The image file '%s' was not found.\n"
-+msgstr "Datoteka slike „%s“ nije pronađena.\n"
-+
-+#: ../objects/standard/line.c:134
-+msgid "Arrows"
-+msgstr "Strelice"
-+
-+#: ../objects/standard/line.c:139
-+msgid "Start point"
-+msgstr "Po�etna ta�ka"
-+
-+#: ../objects/standard/line.c:141
-+msgid "End point"
-+msgstr "Krajnja ta�ka"
-+
-+#: ../objects/standard/outline.c:204
-+msgid "Text content"
-+msgstr "Sadržaj teksta"
-+
-+#: ../objects/standard/outline.c:206
-+msgid "Angle to rotate the outline"
-+msgstr "Ugao za zaokretanje konture"
-+
-+#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
-+msgid "Add Corner"
-+msgstr "Dodaj ugao"
-+
-+#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
-+msgid "Delete Corner"
-+msgstr "Obriši ugao"
-+
-+#: ../objects/standard/standard.c:46
-+msgid "Standard objects"
-+msgstr "Standardni objekti"
-+
-+#: ../objects/standard/textobj.c:139
-+msgid "First Line"
-+msgstr "Prva linija"
-+
-+#: ../objects/standard/textobj.c:146
-+msgid "Vertical text alignment"
-+msgstr "Uspravno poravnanje teksta"
-+
-+#: ../plug-ins/cairo/diacairo-interactive.c:263
-+#: ../plug-ins/cairo/diacairo-interactive.c:264
-+msgid "Zoom pointer"
-+msgstr "Pokaziva� uvećanja"
-+
-+#: ../plug-ins/cairo/diacairo-interactive.c:270
-+#: ../plug-ins/cairo/diacairo-interactive.c:271
-+msgid "Visible rect pointer"
-+msgstr "Vidljiv pravougaoni pokaziva�"
-+
-+#: ../plug-ins/cairo/diacairo.c:129
-+#, c-format
-+msgid ""
-+"Can't convert output filename '%s' to locale encoding.\n"
-+"Please choose a different name to save with cairo.\n"
-+msgstr ""
-+"Ne mogu da pretvorim naziv izlazne datoteke „%s“ u lokalno kodiranje.\n"
-+"Molim izaberite druga�iji naziv za �uvanje sa kairom.\n"
-+
-+#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
-+#, c-format
-+msgid "Can't write %d bytes to %s"
-+msgstr "Ne mogu da zapišem %d bajta u %s"
-+
-+#: ../plug-ins/cairo/diacairo.c:285
-+msgid "Clipboard copy failed"
-+msgstr "Umnožavanje u ostavu nije uspelo"
-+
-+#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
-+#: ../plug-ins/wmf/wmf.cpp:1381
-+msgid "Nothing to print"
-+msgstr "Ništa za štampanje"
-+
-+#: ../plug-ins/cairo/diacairo.c:322
-+msgid "Printing with Gtk+(cairo) requires at least version 2.10."
-+msgstr "Å tampanje sa Gtk+(kairo)-om zahteva najmanje izdanje 2.10."
-+
-+#: ../plug-ins/cairo/diacairo.c:329
-+msgid "Cairo PostScript"
-+msgstr "Kairo Post skript"
-+
-+#: ../plug-ins/cairo/diacairo.c:340
-+msgid "Cairo Portable Document Format"
-+msgstr "Kairo PDF"
-+
-+#: ../plug-ins/cairo/diacairo.c:355
-+msgid "Cairo Scalable Vector Graphics"
-+msgstr "Kairo srazmerna vektorska grafika"
-+
-+#: ../plug-ins/cairo/diacairo.c:366
-+msgid "Cairo PNG"
-+msgstr "Kairo PNG"
-+
-+#: ../plug-ins/cairo/diacairo.c:374
-+msgid "Cairo PNG (with alpha)"
-+msgstr "Kairo PNG (sa alfom)"
-+
-+#: ../plug-ins/cairo/diacairo.c:384
-+msgid "Cairo EMF"
-+msgstr "Kairo EMF"
-+
-+#: ../plug-ins/cairo/diacairo.c:394
-+msgid "Cairo WMF"
-+msgstr "Kairo VMF"
-+
-+#: ../plug-ins/cairo/diacairo.c:416
-+msgid "Copy _Diagram"
-+msgstr "Umnoži _dijagram"
-+
-+#: ../plug-ins/cairo/diacairo.c:426
-+msgid "Print (GTK) ..."
-+msgstr "Å tampaj (GDK) ..."
-+
-+#: ../plug-ins/cairo/diacairo.c:471
-+msgid "Cairo based Rendering"
-+msgstr "Iscrtavanje zasnovano na Kairu"
-+
-+#: ../plug-ins/cgm/cgm.c:1106
-+msgid ""
-+"Image row length larger than maximum cell array.\n"
-+"Image not exported to CGM."
-+msgstr ""
-+"Dužina reda slike je veća od najvećeg niza ćelije.\n"
-+"Slika nije izvežena u CGM."
-+
-+#: ../plug-ins/cgm/cgm.c:1362
-+msgid "Computer Graphics Metafile"
-+msgstr "Ra�unarska grafi�ka metadatoteka"
-+
-+#: ../plug-ins/cgm/cgm.c:1387
-+msgid "Computer Graphics Metafile export filter"
-+msgstr "Propusnik za izvoz CGM datoteka"
-+
-+#: ../plug-ins/drs/dia-render-script.c:153
-+msgid "DiaRenderScript"
-+msgstr "Skripta iscrtavanja Die"
-+
-+#: ../plug-ins/drs/dia-render-script.c:164
-+msgid "DiaRenderScript filter"
-+msgstr "Propusnik skripte iscrtavanja Die"
-+
-+#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
-+msgid "Drawing Interchange File"
-+msgstr "Datoteka za razmenu crteža"
-+
-+#: ../plug-ins/dxf/dxf-import.c:1319
-+#, c-format
-+msgid "read_dxf_codes failed on '%s'\n"
-+msgstr "nije uspelo „read_dxf_codes“ nad „%s“\n"
-+
-+#: ../plug-ins/dxf/dxf-import.c:1326
-+#, c-format
-+msgid "Binary DXF from '%s' not supported\n"
-+msgstr "Nije podržana izvršna DHF iz „%s“\n"
-+
-+#: ../plug-ins/dxf/dxf.c:50
-+msgid "Drawing Interchange File import and export filters"
-+msgstr "Propusnici za uvoz i izvoz DIF datoteka"
-+
-+#: ../plug-ins/hpgl/hpgl.c:751
-+msgid "HP Graphics Language"
-+msgstr "Hevlet-Pakard grafi�ki jezik"
-+
-+#: ../plug-ins/hpgl/hpgl.c:776
-+msgid "HP Graphics Language export filter"
-+msgstr "Propusnik izvoza HP grafi�kog jezika"
-+
-+#: ../plug-ins/libart/dialibart.c:59
-+msgid "Libart based rendering"
-+msgstr "Iscrtavanje zasnovano na Libartu"
-+
-+#: ../plug-ins/libart/export_png.c:167
-+msgid "Could not create PNG write structure"
-+msgstr "Ne mogu da napravim strukturu PNG upisa"
-+
-+#: ../plug-ins/libart/export_png.c:176
-+msgid "Could not create PNG header info structure"
-+msgstr "Ne mogu da napravim strukturu obaveštenja PNG zaglavlja"
-+
-+#: ../plug-ins/libart/export_png.c:184
-+msgid "Error occurred while writing PNG"
-+msgstr "Došlo je do greške prilikom zapisivanja PNG-a"
-+
-+#. Create a dialog
-+#: ../plug-ins/libart/export_png.c:327
-+msgid "PNG Export Options"
-+msgstr "Opcije izvoženja PNG-a"
-+
-+#: ../plug-ins/libart/export_png.c:333
-+msgid "Image width:"
-+msgstr "Å irina slike:"
-+
-+#: ../plug-ins/libart/export_png.c:336
-+msgid "Image height:"
-+msgstr "Visina slike:"
-+
-+#: ../plug-ins/libart/export_png.c:382
-+msgid "PNG (anti-aliased)"
-+msgstr "PNG (umekšano)"
-+
-+#: ../plug-ins/libart/dialibartrenderer.c:295
-+msgid "gdk_renderer: Unsupported fill mode specified!\n"
-+msgstr "gdk_iscrtava�: Naveden je nepodržani režim ispunjavanja!\n"
-+
-+#: ../plug-ins/libart/dialibartrenderer.c:1476
-+msgid "Renderer transformation"
-+msgstr "Preobražaj iscrtava�a"
-+
-+#: ../plug-ins/libart/dialibartrenderer.c:1477
-+msgid "Transform pointer"
-+msgstr "Preobrazi pokaziva�"
-+
-+#: ../plug-ins/metapost/metapost.c:46
-+msgid "TeX Metapost export filter"
-+msgstr "Propusnik izvoza TeKs metaposta"
-+
-+#: ../plug-ins/metapost/render_metapost.c:1262
-+msgid "TeX Metapost macros"
-+msgstr "TeKs metapost makroi"
-+
-+#: ../plug-ins/pgf/pgf.c:26
-+msgid "LaTeX PGF export filter"
-+msgstr "Propusnik izvoza LaTeKs PGF-a"
-+
-+#: ../plug-ins/pgf/render_pgf.c:1112
-+#: ../plug-ins/pstricks/render_pstricks.c:733
-+msgid "Not valid UTF8"
-+msgstr "Nije ispravan UTF8"
-+
-+#: ../plug-ins/pgf/render_pgf.c:1277
-+msgid "LaTeX PGF macros"
-+msgstr "LaTeKs PGF makroi"
-+
-+#: ../plug-ins/pixbuf/pixbuf.c:93
-+#, c-format
-+msgid ""
-+"Could not save file:\n"
-+"%s\n"
-+"%s"
-+msgstr ""
-+"Ne mogu da sa�uvam datoteku:\n"
-+"%s\n"
-+"%s"
-+
-+#: ../plug-ins/pixbuf/pixbuf.c:199
-+msgid "gdk-pixbuf based bitmap export/import"
-+msgstr "Izvoz/uvoz bitmapa zasnovan na gdk-sli�ici"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:273
-+msgid "Select Printer"
-+msgstr "Izaberi štampa�"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:285
-+#: ../sheets/ciscocomputer.sheet.in.h:37
-+msgid "Printer"
-+msgstr "Štampa�"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
-+msgid "File"
-+msgstr "Datoteka"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:314
-+msgid "OK"
-+msgstr "U redu"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:456
-+#, c-format
-+msgid "Could not run command '%s': %s"
-+msgstr "Ne mogu da pokrenem naredbu „%s“: %s"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:459
-+#, c-format
-+msgid "Could not open '%s' for writing: %s"
-+msgstr "Ne mogu da otvorim „%s“ za upisivanje: %s"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:481
-+#, c-format
-+msgid "Printing error: command '%s' returned %d\n"
-+msgstr "Greška štampanja: naredba „%s“ je vratila %d\n"
-+
-+#: ../plug-ins/postscript/paginate_psprint.c:492
-+#, c-format
-+msgid "Printing error: command '%s' caused sigpipe."
-+msgstr "Greška štampanja: naredba „%s“ je izazvala procesni lanac signala."
-+
-+#: ../plug-ins/postscript/render_eps.c:150
-+msgid "Encapsulated Postscript (using Pango fonts)"
-+msgstr "Ugneždeni Postskript (koristi Pango pisma)"
-+
-+#: ../plug-ins/postscript/render_eps.c:159
-+msgid "Encapsulated Postscript with preview (using Pango fonts)"
-+msgstr "Ugneždeni Postskript sa pregledom (koristi Pango pisma)"
-+
-+#: ../plug-ins/postscript/render_eps.c:169
-+msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-+msgstr "Ugneždeni Postskript (koristi Post skript latinska-1 pisma)"
-+
-+#: ../plug-ins/postscript/postscript.c:46
-+msgid "Print (PS)"
-+msgstr "Å tampaj (PS)"
-+
-+#: ../plug-ins/postscript/postscript.c:70
-+msgid "Postscript Rendering"
-+msgstr "Iscrtavanje Post skripta"
-+
-+#: ../plug-ins/pstricks/pstricks.c:26
-+msgid "TeX Pstricks export filter"
-+msgstr "Propusnik izvoza TeKs Pstriksa"
-+
-+#: ../plug-ins/pstricks/render_pstricks.c:987
-+msgid "TeX PSTricks macros"
-+msgstr "TeKs PSTriks makroi"
-+
-+# bug: ":" is not needed
-+#: ../plug-ins/python/pydia-render.c:779
-+#, c-format
-+msgid "Couldn't open '%s' for writing.\n"
-+msgstr "Ne mogu da otvorim „%s“ radi upisa.\n"
-+
-+#: ../plug-ins/python/python.c:96
-+msgid "Python scripting support"
-+msgstr "Podrška za Pitonove skripte"
-+
-+#: ../plug-ins/shape/shape-export.c:474
-+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
-+msgstr ""
-+"Datoteke oblika moraju da se završavaju na „.shape“, ili Dia neće moći da ih "
-+"u�ita"
-+
-+#: ../plug-ins/shape/shape-export.c:488
-+msgid "Can't export png icon without export plug-in!"
-+msgstr "Ne mogu da izvezem png ikonicu bez priklju�ka za izvoz!"
-+
-+#: ../plug-ins/shape/shape-export.c:512
-+msgid "Dia Shape File"
-+msgstr "Datoteka Dia oblika"
-+
-+#: ../plug-ins/shape/shape.c:36
-+msgid "dia shape export filter"
-+msgstr "Propusnik izvoza Dia oblika"
-+
-+#: ../plug-ins/svg/svg-import.c:258
-+msgid ""
-+"Invalid path data.\n"
-+"svg:path data must start with moveto."
-+msgstr ""
-+"Neispravni podaci o putanji.\n"
-+"podaci svg:putanje moraju po�eti sa premesti u."
-+
-+#: ../plug-ins/svg/svg-import.c:806
-+msgid "Expected SVG Namespace not found in file"
-+msgstr "O�ekivani razmak naziva SVG-a nije pronađen u datoteci"
-+
-+#: ../plug-ins/svg/svg-import.c:826
-+#, c-format
-+msgid "root element was '%s' -- expecting 'svg'."
-+msgstr "koreni element beše „%s“ — o�ekivah „svg“."
-+
-+#: ../plug-ins/svg/svg.c:50
-+msgid "Scalable Vector Graphics import and export filters"
-+msgstr "Propusnici za uvoz i izvoz SVG-a"
-+
-+#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
-+#, c-format
-+msgid "Couldn't read file %s"
-+msgstr "Ne mogu da �itam datoteku %s"
-+
-+#: ../plug-ins/vdx/vdx-export.c:1912
-+msgid "Visio XML format"
-+msgstr "IksML zapis Vizia"
-+
-+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
-+#, c-format
-+msgid "Couldn't read color: %s\n"
-+msgstr "Ne mogu da �itam boju: %s\n"
-+
-+#: ../plug-ins/vdx/vdx-import.c:541
-+#, c-format
-+msgid "Couldn't find shape %d\n"
-+msgstr "Ne mogu da pronađem oblik %d\n"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1047
-+#, c-format
-+msgid "Unexpected Ellipse object: %s\n"
-+msgstr "Neo�ekivani objekat Elipse: %s\n"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1061
-+msgid "Can't rotate ellipse\n"
-+msgstr "Ne mogu da zaokrenem elipsu\n"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1392
-+msgid "MoveTo not at start of Bezier\n"
-+msgstr "„Premesti u“ nije na po�etku Bezjera\n"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1740
-+msgid "Invalid NURBS formula"
-+msgstr "Neispravna NURBS formula"
-+
-+#: ../plug-ins/vdx/vdx-import.c:1984
-+#, c-format
-+msgid "Couldn't write file %s"
-+msgstr "Ne mogu da zapišem datoteku %s"
-+
-+#: ../plug-ins/vdx/vdx-import.c:2069 ../plug-ins/vdx/vdx-import.c:2082
-+#, c-format
-+msgid "Couldn't handle foreign object type %s"
-+msgstr "Ne mogu da rukujrm stranom vrstom objekta %s"
-+
-+#: ../plug-ins/vdx/vdx-import.c:2110
-+#, c-format
-+msgid "Couldn't make object dir %s"
-+msgstr "Ne mogu da napravim direktorijum objekta %s"
-+
-+#: ../plug-ins/vdx/vdx-import.c:3100
-+msgid "Visio XML File Format"
-+msgstr "Zapis Vizio IksML datoteke"
-+
-+#: ../plug-ins/vdx/vdx-xml.c:3344
-+#, c-format
-+msgid "Can't decode object %s"
-+msgstr "Ne mogu da dekodiram objekat %s"
-+
-+#: ../plug-ins/vdx/vdx-xml.c:5125
-+#, c-format
-+msgid "Can't write object %u"
-+msgstr "Ne mogu da zapišem objekat %u"
-+
-+#: ../plug-ins/vdx/vdx.c:53
-+msgid "Visio XML Format import and export filter"
-+msgstr "Propusnik za uvoz i izvoz Vizio IksML zapisa"
-+
-+#: ../plug-ins/wmf/wmf.cpp:499
-+#, c-format
-+msgid ""
-+"Can not render unknown font:\n"
-+"%s"
-+msgstr ""
-+"Ne mogu da iscrtam nepoznato pismo:\n"
-+"%s"
-+
-+# bug: ":" is not needed
-+#: ../plug-ins/wmf/wmf.cpp:1258
-+#, c-format
-+msgid "Couldn't open: '%s' for writing.\n"
-+msgstr "Ne mogu da otvorim „%s“ radi upisa.\n"
-+
-+#: ../plug-ins/wmf/wmf.cpp:1357
-+msgid "Windows Meta File"
-+msgstr "Vindouz meta-datoteka"
-+
-+#: ../plug-ins/wmf/wmf.cpp:1366
-+msgid "Enhanced Meta File"
-+msgstr "Poboljšana meta-datoteka"
-+
-+#: ../plug-ins/wmf/wmf.cpp:1388
-+msgid "Print (GDI) ..."
-+msgstr "Å tampaj (GDI) ..."
-+
-+#: ../plug-ins/wmf/wmf.cpp:1403
-+msgid "WMF export filter"
-+msgstr "Propusnik izvoza VMF-a"
-+
-+#: ../plug-ins/wpg/wpg.c:1190
-+#, c-format
-+msgid "File: %s type/version unsupported.\n"
-+msgstr "Datoteka: %s vrsta/izdanje nisu podržani.\n"
-+
-+#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
-+msgid "WPG"
-+msgstr "VPG"
-+
-+#: ../plug-ins/wpg/wpg.c:1356
-+msgid "WordPerfect Graphics export filter"
-+msgstr "Propusnik izvoza grafike savršenih re�i"
-+
-+#: ../plug-ins/xfig/xfig-export.c:463
-+#, c-format
-+msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-+msgstr "FIG zapis nema odgovarajući stil strelice %s; koristim obi�nu strelicu.\n"
-+
-+#: ../plug-ins/xfig/xfig-export.c:486
-+msgid "No more user-definable colors - using black"
-+msgstr "Nema više boja koje je postavio korisnik — koristim crnu"
-+
-+#: ../plug-ins/xfig/xfig-export.c:1207
-+msgid "XFig format"
-+msgstr "IksFig zapis"
-+
-+#: ../plug-ins/xfig/xfig-import.c:111
-+#, c-format
-+msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-+msgstr "Indeks boje %d je previsok, dopušteno je samo 512 boja. Koristiću crnu."
-+
-+#: ../plug-ins/xfig/xfig-import.c:138
-+msgid "Patterns are not supported by Dia"
-+msgstr "Dia ne podržava šablone"
-+
-+#: ../plug-ins/xfig/xfig-import.c:166
-+msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-+msgstr "Dia ne podržava trota�kaste linije, koristiću dvota�kaste"
-+
-+#: ../plug-ins/xfig/xfig-import.c:170
-+#, c-format
-+msgid "Line style %d should not appear\n"
-+msgstr "Stil linije „%d“ ne treba da se pojavi\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:238
-+#, c-format
-+msgid "Error while reading %dth of %d points: %s\n"
-+msgstr "Greška �itanja %d. od %d ta�aka: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:266
-+msgid "Error while reading arrowhead\n"
-+msgstr "Greška �itanja glave strelice\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:288
-+#, c-format
-+msgid "Unknown arrow type %d\n"
-+msgstr "Nepoznata vrsta strelice %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:379
-+#, c-format
-+msgid "Depth %d of of range, only 0-%d allowed.\n"
-+msgstr "Dubina %d izvan opsega, dopušteno je samo 0-%d.\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:426
-+#, c-format
-+msgid "Couldn't read ellipse info: %s\n"
-+msgstr "Ne mogu da pro�itam podatke elipse: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:494
-+#, c-format
-+msgid "Couldn't read polyline info: %s\n"
-+msgstr "Ne mogu da pro�itam podatke o poliliniji: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:509
-+#, c-format
-+msgid "Couldn't read flipped bit: %s\n"
-+msgstr "Ne mogu da pro�itam izvrnuti bit: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:527
-+msgid "Negative corner radius, negating"
-+msgstr "Negativni polupre�nik ćoška, negiram"
-+
-+#: ../plug-ins/xfig/xfig-import.c:570
-+#, c-format
-+msgid "Unknown polyline subtype: %d\n"
-+msgstr "Nepoznata podvrsta polilinije: %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
-+#, c-format
-+msgid "Couldn't read spline info: %s\n"
-+msgstr "Ne mogu da pro�itam podatke o krivoj: %s\n"
-+
-+#. Open approximated spline
-+#. Closed approximated spline
-+#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
-+msgid "Cannot convert approximated spline yet."
-+msgstr "Još uvek ne mogu da pretvorim približnu krivu."
-+
-+#: ../plug-ins/xfig/xfig-import.c:795
-+#, c-format
-+msgid "Unknown spline subtype: %d\n"
-+msgstr "Nepoznata podvrsta krive: %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:860
-+#, c-format
-+msgid "Couldn't read arc info: %s\n"
-+msgstr "Ne mogu da pro�itam podatke o luku: %s\n"
-+
-+#. set new fill property on arc?
-+#: ../plug-ins/xfig/xfig-import.c:889
-+msgid "Filled arc treated as unfilled"
-+msgstr "Ispunjen luk se smatra kao neispunjen"
-+
-+#: ../plug-ins/xfig/xfig-import.c:893
-+#, c-format
-+msgid "Unknown polyline arc: %d\n"
-+msgstr "Nepoznat luk polilinije: %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:957
-+#, c-format
-+msgid "Couldn't read text info: %s\n"
-+msgstr "Ne mogu da pro�itam tekstualne podatke: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1019
-+#, c-format
-+msgid "Couldn't identify FIG object: %s\n"
-+msgstr "Ne mogu da prepoznam FIG objekat: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1027
-+msgid "Compound end outside compound\n"
-+msgstr "Složeni završava spoljni složeni\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1051
-+#, c-format
-+msgid "Color number %d out of range 0..%d.  Discarding color.\n"
-+msgstr "Broj boje %d je van opsega 0..%d.  Odbacujem boju.\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1097
-+#, c-format
-+msgid "Couldn't read group extend: %s\n"
-+msgstr "Ne mogu da pro�itam produženje grupe: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1108
-+#, c-format
-+msgid "Unknown object type %d\n"
-+msgstr "Nepoznata vrsta objekta %d\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1132
-+#, c-format
-+msgid "`%s' is not one of `%s' or `%s'\n"
-+msgstr "„%s“ nije jedno od „%s“ ili „%s“\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1142
-+#, c-format
-+msgid "Error reading paper size: %s\n"
-+msgstr "Greška �itanja veli�ine papira: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1153
-+#, c-format
-+msgid "Unknown paper size `%s', using default\n"
-+msgstr "Nepoznata veli�ina papira „%s“, koristim osnovno\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1165
-+#, c-format
-+msgid "Error reading paper orientation: %s\n"
-+msgstr "Greška �itanja usmerenja papira: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1175
-+#, c-format
-+msgid "Error reading justification: %s\n"
-+msgstr "Greška �itanja poravnanja: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1185
-+#, c-format
-+msgid "Error reading units: %s\n"
-+msgstr "Greška �itanja jedinica: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1201
-+#, c-format
-+msgid "Error reading magnification: %s\n"
-+msgstr "Greška �itanja uveli�anja: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1214
-+#, c-format
-+msgid "Error reading multipage indicator: %s\n"
-+msgstr "Greška �itanja ukaziva�a više-stranica: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1225
-+#, c-format
-+msgid "Error reading transparent color: %s\n"
-+msgstr "Greška �itanja providnih boja: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
-+#: ../plug-ins/xfig/xfig-import.c:1308
-+#, c-format
-+msgid "Error reading FIG file: %s\n"
-+msgstr "Greška �itanja FIG datoteke: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
-+msgid "Premature end of FIG file\n"
-+msgstr "Prevremen kraj FIG datoteke\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1245
-+#, c-format
-+msgid "Error reading resolution: %s\n"
-+msgstr "Greška �itanja rezolucije: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1277
-+#, c-format
-+msgid "Doesn't look like a Fig file: %s\n"
-+msgstr "Ne izgleda kao Fig datoteka: %s\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1283
-+#, c-format
-+msgid "This is a FIG version %d.%d file, I may not understand it\n"
-+msgstr "Ovo je datoteka FIG izdanja %d.%d., možda je neću razumeti\n"
-+
-+#: ../plug-ins/xfig/xfig-import.c:1331
-+msgid "XFig File Format"
-+msgstr "Zapis Iksfig datoteke"
-+
-+#: ../plug-ins/xfig/xfig.c:51
-+msgid "Fig Format import and export filter"
-+msgstr "Propusnik za uvoz i izvoz Fig zapisa"
-+
-+#: ../plug-ins/xslt/xslt.c:108
-+#, c-format
-+msgid "Error while parsing %s\n"
-+msgstr "Greška prilikom obrade %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:117
-+#, c-format
-+msgid "Error while parsing stylesheet %s\n"
-+msgstr "Greška prilikom obrade stilova %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:124
-+#, c-format
-+msgid "Error while applying stylesheet %s\n"
-+msgstr "Greška prilikom primene stilova %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:133
-+#, c-format
-+msgid "Error while parsing stylesheet: %s\n"
-+msgstr "Greška prilikom obrade stilova: %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:142
-+#, c-format
-+msgid "Error while applying stylesheet: %s\n"
-+msgstr "Greška prilikom primene stilova: %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:150
-+#, c-format
-+msgid "Error while saving result: %s\n"
-+msgstr "Greška prilikom �uvanja rezultata: %s\n"
-+
-+#: ../plug-ins/xslt/xslt.c:335
-+msgid "XSL Transformation filter"
-+msgstr "Propusnik IksSL preobražaja"
-+
-+#: ../plug-ins/xslt/xslt.c:362
-+msgid "No valid configuration files found for the XSLT plugin, not loading."
-+msgstr ""
-+"Nisu pronađene ispravne datoteke podešavanja za IksSLT priklju�ak, ne "
-+"u�itavam."
-+
-+#: ../plug-ins/xslt/xsltdialog.c:97
-+msgid "Export through XSLT"
-+msgstr "Izvezi kroz IksSLT"
-+
-+#: ../plug-ins/xslt/xsltdialog.c:112
-+msgid "From:"
-+msgstr "Od:"
-+
-+#: ../plug-ins/xslt/xsltdialog.c:147
-+msgid "To:"
-+msgstr "Do:"
-+
-+#: ../sheets/AADL.sheet.in.h:1
-+msgid "AADL"
-+msgstr "AADL"
-+
-+#: ../sheets/AADL.sheet.in.h:2
-+msgid "AADL Shapes"
-+msgstr "AADL oblici"
-+
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
-+msgstr "Nit"
-+
-+#: ../sheets/AADL.sheet.in.h:6
-+msgid "Processor"
-+msgstr "Procesor"
-+
-+#: ../sheets/AADL.sheet.in.h:7
-+msgid "Memory"
-+msgstr "Memorija"
-+
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Magistrala"
-+
-+#: ../sheets/AADL.sheet.in.h:9
-+msgid "System"
-+msgstr "Sistem"
-+
-+#: ../sheets/AADL.sheet.in.h:10
-+msgid "Subprogram"
-+msgstr "Podprogram"
-+
-+#: ../sheets/AADL.sheet.in.h:11
-+msgid "Thread Group"
-+msgstr "Grupa niti"
-+
-+#: ../sheets/AADL.sheet.in.h:12
-+msgid "Device"
-+msgstr "Uređaj"
-+
-+#: ../sheets/AADL.sheet.in.h:13
-+msgid "Package"
-+msgstr "Paket"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Razvrstan"
-+
-+#. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
-+#. Leave as is for now, renaming too much hassle.
-+#. Will probably need to split into seperate sheets soon anyway.
-+#: ../sheets/Assorted.sheet.in.h:6
-+msgid ""
-+"An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
-+"Geometric Shapes"
-+msgstr ""
-+"Razvrstan skup poligona, bezijerogona i drugih raznih geometrijskih oblika"
-+
-+#: ../sheets/Assorted.sheet.in.h:7
-+msgid "Right angle triangle"
-+msgstr "Trougao desnog ugla"
-+
-+# ili je ovo jednakostrani�ni?
-+#: ../sheets/Assorted.sheet.in.h:8
-+msgid "Isoceles triangle"
-+msgstr "Jednakokraki trougao"
-+
-+#: ../sheets/Assorted.sheet.in.h:9
-+msgid "Perfect square, height equals width"
-+msgstr "Savršen kvadrat, visina jednaka širini"
-+
-+#: ../sheets/Assorted.sheet.in.h:10
-+msgid "Perfect circle"
-+msgstr "Savršen krug"
-+
-+#: ../sheets/Assorted.sheet.in.h:11
-+msgid "Quarter circle"
-+msgstr "ÄŒetvrt kruga"
-+
-+#: ../sheets/Assorted.sheet.in.h:12
-+msgid "Diamond"
-+msgstr "Romb"
-+
-+#: ../sheets/Assorted.sheet.in.h:13
-+msgid "Pentagon. Five sided shape"
-+msgstr "Pentagon. Petougaonik"
-+
-+#: ../sheets/Assorted.sheet.in.h:14
-+msgid "Hexagon. Six sided shape"
-+msgstr "Heksagon. Å estougaonik"
-+
-+#: ../sheets/Assorted.sheet.in.h:15
-+msgid "Heptagon. Seven sided shape"
-+msgstr "Heptagon. Sedmougaonik"
-+
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Oktogon. Osmougaonik"
-+
-+#: ../sheets/Assorted.sheet.in.h:17
-+msgid "Horizontal parallelogram"
-+msgstr "Vodoravni paralelogram"
-+
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Uspravni paralelogram"
-+
-+#: ../sheets/Assorted.sheet.in.h:19
-+msgid "Trapezoid"
-+msgstr "Trapezoid"
-+
-+#: ../sheets/Assorted.sheet.in.h:20
-+msgid "Four point star"
-+msgstr "ÄŒetvorokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:21
-+msgid "Curved four point star"
-+msgstr "Zakrivljena �etvorokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:22
-+msgid "Five point star"
-+msgstr "Petokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:23
-+msgid "Six point star"
-+msgstr "Å estokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:24
-+msgid "Seven point star"
-+msgstr "Sedmokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:25
-+msgid "Eight point star"
-+msgstr "Osmokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:26
-+msgid "Sharp eight point star"
-+msgstr "OÅ¡tra osmokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:27
-+msgid "Curved eight point star"
-+msgstr "Zakrivljena osmokraka zvezda"
-+
-+#: ../sheets/Assorted.sheet.in.h:28
-+msgid "Swiss cross"
-+msgstr "Å vajcarski krst"
-+
-+#: ../sheets/Assorted.sheet.in.h:29
-+msgid "Maltese cross"
-+msgstr "Malteški krst"
-+
-+#: ../sheets/Assorted.sheet.in.h:30
-+msgid "Down arrow"
-+msgstr "Strelica na dole"
-+
-+#: ../sheets/Assorted.sheet.in.h:31
-+msgid "Up arrow"
-+msgstr "Strelica na gore"
-+
-+#: ../sheets/Assorted.sheet.in.h:32
-+msgid "Left arrow"
-+msgstr "Strelica na levo"
-+
-+#: ../sheets/Assorted.sheet.in.h:33
-+msgid "Right arrow"
-+msgstr "Strelica na desno"
-+
-+#: ../sheets/Assorted.sheet.in.h:34
-+msgid "Notched left arrow"
-+msgstr "Zase�ena strelica nalevo"
-+
-+#: ../sheets/Assorted.sheet.in.h:35
-+msgid "Notched right arrow"
-+msgstr "Zase�ena strelica nadesno"
-+
-+#: ../sheets/Assorted.sheet.in.h:36
-+msgid "Left-up arrow"
-+msgstr "Levo–gore strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:37
-+msgid "Turn-up arrow"
-+msgstr "Okreni-gore strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:38
-+msgid "Left-right arrow"
-+msgstr "Leva–desna strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:39
-+msgid "Up-down arrow"
-+msgstr "Gore–dole strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:40
-+msgid "Quad arrow"
-+msgstr "ÄŒetvorostruka strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:41
-+msgid "Left-right-up arrow"
-+msgstr "Leva–desna–gore strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:42
-+msgid "Up-down-left arrow"
-+msgstr "Gore–dole–levo strelica"
-+
-+#: ../sheets/Assorted.sheet.in.h:43
-+msgid "Pentagon block arrow"
-+msgstr "Ispunjena petouglasta strelica"
-+
-+# Hmmmm...
-+#: ../sheets/Assorted.sheet.in.h:44
-+msgid "Chevron"
-+msgstr "Epoleta"
-+
-+#: ../sheets/Assorted.sheet.in.h:45
-+msgid "Heart"
-+msgstr "Srce"
-+
-+#: ../sheets/Assorted.sheet.in.h:46
-+msgid "Sun"
-+msgstr "Sunce"
-+
-+#: ../sheets/Assorted.sheet.in.h:47
-+msgid "Quarter moon"
-+msgstr "ÄŒetvrt meseca"
-+
-+#. For: anthonym
-+#: ../sheets/BPMN.sheet.in.h:2
-+msgid "BPMN"
-+msgstr "BPMN"
-+
-+#: ../sheets/BPMN.sheet.in.h:3
-+msgid "Business Process Modeling Notation"
-+msgstr "Beleženje modelisanja poslovnog procesa"
-+
-+#: ../sheets/BPMN.sheet.in.h:4
-+msgid "Start Event"
-+msgstr "Po�etni događaj"
-+
-+#: ../sheets/BPMN.sheet.in.h:5
-+msgid "Start Event - Message"
-+msgstr "Po�etni događaj — Poruka"
-+
-+#: ../sheets/BPMN.sheet.in.h:6
-+msgid "Start Event - Timer"
-+msgstr "Po�etni događaj — Vremenik"
-+
-+#: ../sheets/BPMN.sheet.in.h:7
-+msgid "Start Event - Rule"
-+msgstr "Po�etni događaj — Pravilo"
-+
-+#: ../sheets/BPMN.sheet.in.h:8
-+msgid "Start Event - Link"
-+msgstr "Po�etni događaj — Veza"
-+
-+#: ../sheets/BPMN.sheet.in.h:9
-+msgid "Start Event - Multiple"
-+msgstr "Po�etni događaj — Mnoštvo"
-+
-+#: ../sheets/BPMN.sheet.in.h:10
-+msgid "Intermediate Event"
-+msgstr "Središnji događaj"
-+
-+#: ../sheets/BPMN.sheet.in.h:11
-+msgid "Intermediate Event - Message"
-+msgstr "Središnji događaj — Poruka"
-+
-+#: ../sheets/BPMN.sheet.in.h:12
-+msgid "Intermediate Event - Timer"
-+msgstr "Središnji događaj — Vremenik"
-+
-+#: ../sheets/BPMN.sheet.in.h:13
-+msgid "Intermediate Event - Error"
-+msgstr "Središnji događaj — Greška"
-+
-+#: ../sheets/BPMN.sheet.in.h:14
-+msgid "Intermediate Event - Cancel"
-+msgstr "Središnji događaj — Brisanje"
-+
-+#: ../sheets/BPMN.sheet.in.h:15
-+msgid "Intermediate Event - Compensation"
-+msgstr "Središnji događaj — Popravka"
-+
-+#: ../sheets/BPMN.sheet.in.h:16
-+msgid "Intermediate Event - Rule"
-+msgstr "Središnji događaj — Pravilo"
-+
-+#: ../sheets/BPMN.sheet.in.h:17
-+msgid "Intermediate Event - Link"
-+msgstr "Središnji događaj — Veza"
-+
-+#: ../sheets/BPMN.sheet.in.h:18
-+msgid "Intermediate Event - Multiple"
-+msgstr "Središnji događaj — Mnoštvo"
-+
-+#: ../sheets/BPMN.sheet.in.h:19
-+msgid "End Event"
-+msgstr "Završni događaj"
-+
-+#: ../sheets/BPMN.sheet.in.h:20
-+msgid "End Event - Message"
-+msgstr "Završni događaj — Poruka"
-+
-+#: ../sheets/BPMN.sheet.in.h:21
-+msgid "End Event - Error"
-+msgstr "Završni događaj — Greška"
-+
-+#: ../sheets/BPMN.sheet.in.h:22
-+msgid "End Event - Cancel"
-+msgstr "Završni događaj — Otkaži"
-+
-+#: ../sheets/BPMN.sheet.in.h:23
-+msgid "End Event - Compensation"
-+msgstr "Završni događaj — Popravka"
-+
-+#: ../sheets/BPMN.sheet.in.h:24
-+msgid "End Event - Link"
-+msgstr "Završni događaj — Veza"
-+
-+#: ../sheets/BPMN.sheet.in.h:25
-+msgid "End Event - Multiple"
-+msgstr "Završni događaj — Mnoštvo"
-+
-+#: ../sheets/BPMN.sheet.in.h:26
-+msgid "End Event - Terminate"
-+msgstr "Završni događaj — Okon�aj"
-+
-+#: ../sheets/BPMN.sheet.in.h:27
-+msgid "Gateway"
-+msgstr "Mrežni prolaz"
-+
-+#: ../sheets/BPMN.sheet.in.h:28
-+msgid "Exclusive (XOR) Data Based"
-+msgstr "Isklju�ivo (ILLI) na osnovu podataka"
-+
-+#: ../sheets/BPMN.sheet.in.h:29
-+msgid "Exclusive (XOR) Event Based"
-+msgstr "Isklju�ivo (ILLI) na osnovu događaja"
-+
-+#: ../sheets/BPMN.sheet.in.h:30
-+msgid "Inclusive (OR)"
-+msgstr "Uklju�ivo (ILI)"
-+
-+#: ../sheets/BPMN.sheet.in.h:31
-+msgid "Complex"
-+msgstr "Skupina"
-+
-+#: ../sheets/BPMN.sheet.in.h:32
-+msgid "Parallel (AND)"
-+msgstr "Paralelni (I)"
-+
-+#: ../sheets/BPMN.sheet.in.h:34
-+msgid "Activity Looping"
-+msgstr "Ponavljanje aktivnosti"
-+
-+#: ../sheets/BPMN.sheet.in.h:35
-+msgid "Multiple Instance Task"
-+msgstr "Zadatak više primeraka"
-+
-+#: ../sheets/BPMN.sheet.in.h:36
-+msgid "Compensation Task"
-+msgstr "Zadatak popravke"
-+
-+#: ../sheets/BPMN.sheet.in.h:37
-+msgid "Collapsed Sub-Process"
-+msgstr "Uronuli pod-proces"
-+
-+#: ../sheets/BPMN.sheet.in.h:38
-+msgid "Looping Collapsed Sub-Process"
-+msgstr "Ponavljanje uronulog pod-procesa"
-+
-+#: ../sheets/BPMN.sheet.in.h:39
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr "Uronuli pod-proces više primeraka"
-+
-+#: ../sheets/BPMN.sheet.in.h:40
-+msgid "Ad-Hoc Collapsed Sub-Process"
-+msgstr "Ad-hok uronuli pod-proces"
-+
-+#: ../sheets/BPMN.sheet.in.h:41
-+msgid "Compensation Collapsed Sub-Process"
-+msgstr "Popravka uronulog pod-procesa"
-+
-+#: ../sheets/BPMN.sheet.in.h:42
-+msgid "Group"
-+msgstr "Grupa"
-+
-+#: ../sheets/BPMN.sheet.in.h:43
-+msgid "Transaction"
-+msgstr "Prenos"
-+
-+#: ../sheets/BPMN.sheet.in.h:44
-+msgid "Data Object"
-+msgstr "Objekat podataka"
-+
-+#: ../sheets/BPMN.sheet.in.h:45
-+msgid "Text Annotation"
-+msgstr "Zabeleška teksta"
-+
-+#. For: zenith
-+#: ../sheets/ChemEng.sheet.in.h:2
-+msgid "ChemEng"
-+msgstr "Tehnološki procesi"
-+
-+#: ../sheets/ChemEng.sheet.in.h:3
-+msgid "Collection for chemical engineering"
-+msgstr "Zbirka tehnoloških procesa"
-+
-+# bug(slobo): treba dopuniti
-+#: ../sheets/ChemEng.sheet.in.h:4
-+msgid "Fan or Stirrer"
-+msgstr "Ventilator ili mešalica"
-+
-+#: ../sheets/ChemEng.sheet.in.h:5
-+msgid "Spraying Device"
-+msgstr "Prskalica"
-+
-+#  Translators: Menu item Noun/Energy/Pneumatic
-+#: ../sheets/ChemEng.sheet.in.h:6
-+msgid "Pneumatic Line"
-+msgstr "Pneumatska linija"
-+
-+#: ../sheets/ChemEng.sheet.in.h:7
-+msgid "Pneumatic Line, vertical"
-+msgstr "Pneumatska linija, uspravna"
-+
-+#: ../sheets/ChemEng.sheet.in.h:9
-+msgid "Simple Heat Exchanger"
-+msgstr "Jednostavan razmenjiva� toplote"
-+
-+#: ../sheets/ChemEng.sheet.in.h:10
-+msgid "Simple Heat Exchanger, vertical"
-+msgstr "Jednostavan razmenjiva� toplote, uspravan"
-+
-+#: ../sheets/ChemEng.sheet.in.h:11
-+msgid "Water Cooler"
-+msgstr "Vodeno hlađenje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:12
-+msgid "Water Cooler, vertical"
-+msgstr "Vodeno hlađenje, uspravno"
-+
-+#: ../sheets/ChemEng.sheet.in.h:13
-+msgid "Fixed-Sheet Exchanger"
-+msgstr "Razmenjiva� stalnog lista"
-+
-+#: ../sheets/ChemEng.sheet.in.h:14
-+msgid "Floating-Head or U-Tube Exchanger"
-+msgstr "Razmenjiva� pokretne glave ili U-cevke"
-+
-+#: ../sheets/ChemEng.sheet.in.h:15
-+msgid "Kettle Reboiler"
-+msgstr "Kotlić za podgrevanje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:16
-+msgid "Air Cooler"
-+msgstr "Vazdušno hlađenje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:17
-+msgid "Forced-Flow Air Cooler"
-+msgstr "Usmereno vazdušno hlađenje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:18
-+msgid "Induced-Flow Air Cooler"
-+msgstr "Rashladnik indukovanog protoka vazduha"
-+
-+#: ../sheets/ChemEng.sheet.in.h:19
-+msgid "Plate Exchanger"
-+msgstr "Plo�asti razmenjiva�"
-+
-+# bug(slobo): treba proveriti
-+#: ../sheets/ChemEng.sheet.in.h:20
-+msgid "Double-Pipe Exchanger"
-+msgstr "Dvocevni razmenjiva�"
-+
-+#: ../sheets/ChemEng.sheet.in.h:21
-+msgid "Heating/Cooling Coil"
-+msgstr "Namotaj za grejanje/hlađenje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:22
-+msgid "Heating/Cooling Coil, vertical"
-+msgstr "Namotaj za grejanje/hlađenje, uspravni"
-+
-+#: ../sheets/ChemEng.sheet.in.h:23
-+msgid "Simple Furnace"
-+msgstr "Jednostavna pećnica"
-+
-+#: ../sheets/ChemEng.sheet.in.h:24
-+msgid "Simple Vessel"
-+msgstr "Obi�na posuda"
-+
-+#: ../sheets/ChemEng.sheet.in.h:25
-+msgid "Knock-out Drum (with demister pad)"
-+msgstr "Udarni doboš (sa umetkom odmagljiva�a)"
-+
-+#: ../sheets/ChemEng.sheet.in.h:26
-+msgid "Tray Column, simple"
-+msgstr "Stubac tacni, jednostavan"
-+
-+#: ../sheets/ChemEng.sheet.in.h:27
-+msgid "Tray Column, detailed"
-+msgstr "Stubac tacni, detaljan"
-+
-+#: ../sheets/ChemEng.sheet.in.h:28
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr "Posuda za dodirivanje te�nosti, jednostavna"
-+
-+#: ../sheets/ChemEng.sheet.in.h:29
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr "Reaktor ili upijajuća posuda, jednostavan"
-+
-+#: ../sheets/ChemEng.sheet.in.h:30
-+msgid "Autoclave"
-+msgstr "Sterilizator"
-+
-+#: ../sheets/ChemEng.sheet.in.h:31
-+msgid "Open Tank"
-+msgstr "Otvoreni sud"
-+
-+#: ../sheets/ChemEng.sheet.in.h:32
-+msgid "Clarifier or Settling Tank"
-+msgstr "Pre�išćava� ili sud za taloženje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:33
-+msgid "Sealed Tank"
-+msgstr "Zape�aćen sud"
-+
-+#: ../sheets/ChemEng.sheet.in.h:34
-+msgid "Covered tank"
-+msgstr "Zatvoreni sud"
-+
-+#: ../sheets/ChemEng.sheet.in.h:35
-+msgid "Tank with Fixed Roof"
-+msgstr "Posuda sa nepokretnim poklopcem"
-+
-+#: ../sheets/ChemEng.sheet.in.h:36
-+msgid "Tank with Floating Roof"
-+msgstr "Posuda sa pokretnim poklopcem"
-+
-+#: ../sheets/ChemEng.sheet.in.h:37
-+msgid "Storage Sphere"
-+msgstr "Skladišna sfera"
-+
-+#: ../sheets/ChemEng.sheet.in.h:38
-+msgid "Gas Holder, basic"
-+msgstr "Boca sa gasom, osnovna"
-+
-+#: ../sheets/ChemEng.sheet.in.h:39
-+msgid "Centrifugal Pump or Fan"
-+msgstr "Centrifugalna pumpa ili ventilator"
-+
-+#: ../sheets/ChemEng.sheet.in.h:40
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr "Rotaciona pumpa pozitivnog premeštanja ili kompresor"
-+
-+#: ../sheets/ChemEng.sheet.in.h:41
-+msgid "Reciprocating Compressor or Pump"
-+msgstr "Klipni kompresor ili pumpa"
-+
-+#: ../sheets/ChemEng.sheet.in.h:42
-+msgid "Axial Flow Fan"
-+msgstr "Osovinski proto�ni ventilator"
-+
-+#: ../sheets/ChemEng.sheet.in.h:43
-+msgid "Compressor or Turbine"
-+msgstr "Kompresor ili turbina"
-+
-+#: ../sheets/ChemEng.sheet.in.h:44
-+msgid "Ejector or Injector"
-+msgstr "Izbaciva� ili ubaciva�"
-+
-+#: ../sheets/ChemEng.sheet.in.h:45
-+msgid "AC Generator"
-+msgstr "Izvor naizmene struje"
-+
-+#: ../sheets/ChemEng.sheet.in.h:46
-+msgid "Valve"
-+msgstr "Ventil"
-+
-+#: ../sheets/ChemEng.sheet.in.h:47
-+msgid "Valve, vertical"
-+msgstr "Ventil, uspravan"
-+
-+#: ../sheets/ChemEng.sheet.in.h:48
-+msgid "Regulable Valve"
-+msgstr "Regulacioni ventil"
-+
-+#: ../sheets/ChemEng.sheet.in.h:49
-+msgid "Regulable Valve, vertical"
-+msgstr "Regulacioni ventil, uspravni"
-+
-+#: ../sheets/ChemEng.sheet.in.h:50
-+msgid "Basic Filter"
-+msgstr "Obi�an filter"
-+
-+#: ../sheets/ChemEng.sheet.in.h:51
-+msgid "Mixer"
-+msgstr "Mešalica"
-+
-+#: ../sheets/ChemEng.sheet.in.h:52
-+msgid "Cyclone and hydrocyclone"
-+msgstr "Ciklon ili hidrociklon"
-+
-+#: ../sheets/ChemEng.sheet.in.h:53
-+msgid "Spray Drier"
-+msgstr "Sušilica"
-+
-+#: ../sheets/ChemEng.sheet.in.h:54
-+msgid "Centrifuge"
-+msgstr "Centrifuga"
-+
-+#: ../sheets/ChemEng.sheet.in.h:55
-+msgid "Pressure Relief Valve"
-+msgstr "Ventil za rasterećenje pritiska"
-+
-+#: ../sheets/Circuit.sheet.in.h:1
-+msgid "Circuit"
-+msgstr "Kolo"
-+
-+#: ../sheets/Circuit.sheet.in.h:2
-+msgid "Components for circuit diagrams"
-+msgstr "Delovi dijagrama integrisanih kôla"
-+
-+#: ../sheets/Circuit.sheet.in.h:3
-+msgid "Vertically aligned resistor"
-+msgstr "Uspravno postavljen otpornik"
-+
-+#: ../sheets/Circuit.sheet.in.h:4
-+msgid "Horizontally aligned inductor"
-+msgstr "Vodoravno postavljen kalem"
-+
-+#: ../sheets/Circuit.sheet.in.h:5
-+msgid "Vertically aligned inductor"
-+msgstr "Uspravno postavljen kalem"
-+
-+#: ../sheets/Circuit.sheet.in.h:6
-+msgid "Horizontally aligned resistor"
-+msgstr "Vodoravno postavljen otpornik"
-+
-+#: ../sheets/Circuit.sheet.in.h:7
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Uspravno postavljen otpornik (evropski)"
-+
-+#: ../sheets/Circuit.sheet.in.h:8
-+msgid "Horizontally aligned inductor (European)"
-+msgstr "Vodoravno postavljen kalem (evropski)"
-+
-+#: ../sheets/Circuit.sheet.in.h:9
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Uspravno postavljen kalem (evropski)"
-+
-+#: ../sheets/Circuit.sheet.in.h:10
-+msgid "Horizontally aligned resistor (European)"
-+msgstr "Vodoravno postavljen otpornik (evropski)"
-+
-+#: ../sheets/Circuit.sheet.in.h:11
-+msgid "Horizontally aligned capacitor"
-+msgstr "Vodoravno postavljen kondenzator"
-+
-+#: ../sheets/Circuit.sheet.in.h:12
-+msgid "Vertically aligned capacitor"
-+msgstr "Uspravno postavljen kondenzator"
-+
-+#.
-+#.
-+#: ../sheets/Circuit.sheet.in.h:15
-+msgid "NPN bipolar transistor"
-+msgstr "NPN bipolarni tranzistor"
-+
-+#.
-+#.
-+#: ../sheets/Circuit.sheet.in.h:18
-+msgid "PNP bipolar transistor"
-+msgstr "PNP bipolarni tranzistor"
-+
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Vodoravno postavljena dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:20
-+msgid "Vertically aligned diode"
-+msgstr "Uspravno postavljena dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:21
-+msgid "Horizontally aligned zener diode"
-+msgstr "Vodoravno postavljena cener dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:22
-+msgid "Vertically aligned zener diode"
-+msgstr "Uspravno postavljena cener dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "Uzemljenje"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Operacioni poja�ava�"
-+
-+#: ../sheets/Circuit.sheet.in.h:25
-+msgid "Horizontally aligned fuse"
-+msgstr "Vodoravno postavljen osigura�"
-+
-+#: ../sheets/Circuit.sheet.in.h:26
-+msgid "Vertically aligned fuse"
-+msgstr "Uspravno postavljen osigura�"
-+
-+#: ../sheets/Circuit.sheet.in.h:27
-+msgid "Horizontally aligned powersource"
-+msgstr "Vodoravno postavljen naponski izvor"
-+
-+#: ../sheets/Circuit.sheet.in.h:28
-+msgid "Vertically aligned powersource"
-+msgstr "Uspravno postavljen naponski izvor"
-+
-+#: ../sheets/Circuit.sheet.in.h:29
-+msgid "Lamp"
-+msgstr "Sijalica"
-+
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Zvu�nik"
-+
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Mikrofon"
-+
-+#: ../sheets/Circuit.sheet.in.h:32
-+msgid "Horizontally aligned LED"
-+msgstr "Vodoravno postavljena LED"
-+
-+#: ../sheets/Circuit.sheet.in.h:33
-+msgid "Vertically aligned LED"
-+msgstr "Uspravno postavljena LED"
-+
-+#: ../sheets/Circuit.sheet.in.h:34
-+msgid "NMOS transistor"
-+msgstr "NMOS tranzistor"
-+
-+#: ../sheets/Circuit.sheet.in.h:35
-+msgid "PMOS transistor"
-+msgstr "PMOS tranzistor"
-+
-+#: ../sheets/Circuit.sheet.in.h:36
-+msgid "Horizontal jumper"
-+msgstr "Vodoravna spojnica"
-+
-+#: ../sheets/Contact.sheet.in.h:1
-+msgid "Ladder"
-+msgstr "Lestvice"
-+
-+#: ../sheets/Contact.sheet.in.h:2
-+msgid "Components for LADDER circuits"
-+msgstr "Sastojci za LADDER kola"
-+
-+#: ../sheets/Contact.sheet.in.h:3
-+msgid "'if' (normally open) ladder contact"
-+msgstr "„ako je“ (obi�no otvoren) prekida�"
-+
-+#: ../sheets/Contact.sheet.in.h:4
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "„ako nije“ (obi�no zatvoren) prekida�"
-+
-+#: ../sheets/Contact.sheet.in.h:5
-+msgid "Simple output variable"
-+msgstr "Jednostavna izlazna promenjiva"
-+
-+#: ../sheets/Contact.sheet.in.h:6
-+msgid "Negative output variable"
-+msgstr "Negativna izlazna promenjiva"
-+
-+#: ../sheets/Contact.sheet.in.h:7
-+msgid "'set' output variable"
-+msgstr "„postavi“ izlaznu promenjivu"
-+
-+#: ../sheets/Contact.sheet.in.h:8
-+msgid "'reset' output variable"
-+msgstr "„ponovo podesi“ izlaznu promenjivu"
-+
-+#: ../sheets/Contact.sheet.in.h:9
-+msgid "'jump' output variable"
-+msgstr "„podigni“ izlaznu promenjivu"
-+
-+#: ../sheets/Contact.sheet.in.h:10
-+msgid "Receptivity output variable"
-+msgstr "Prijemna izlazna promenljiva"
-+
-+#: ../sheets/Contact.sheet.in.h:11
-+msgid "Power-saved simple output variable"
-+msgstr "Izlazna jednostavna promenljiva sa Å¡tednjom struje"
-+
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Izlazna negativna promenljiva sa Å¡tednjom struje"
-+
-+#: ../sheets/Contact.sheet.in.h:13
-+msgid "Power-saved 'set' output variable"
-+msgstr "Izlazna promenljiva „postavi“ sa štednjom struje"
-+
-+#: ../sheets/Contact.sheet.in.h:14
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Izlazna promenljiva „resetuj“ sa štednjom struje"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:1
-+msgid "Cybernetics"
-+msgstr "Kibernetika"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:2
-+msgid "Elements of cybernetic circuits"
-+msgstr "Delovi kiberneti�kih kola"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:3
-+msgid "Sensor - left"
-+msgstr "Senzor — levi"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:4
-+msgid "Sensor - right"
-+msgstr "Senzor — desni"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:5
-+msgid "Sensor - bottom"
-+msgstr "Senzor — donji"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:6
-+msgid "Sensor - top"
-+msgstr "Senzor — gornji"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:7
-+msgid "Sum, subtracting left input"
-+msgstr "Zbir, oduzimajući levi ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:8
-+msgid "Sum, subtracting right input"
-+msgstr "Zbir, oduzimajući desni ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:9
-+msgid "Sum, subtracting bottom input"
-+msgstr "Zbir, oduzimajući donji ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:10
-+msgid "Sum, subtracting top input"
-+msgstr "Zbir, oduzimajući gornji ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:11
-+msgid "Integrator - input left"
-+msgstr "Integrator — levi ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:12
-+msgid "Integrator - input right"
-+msgstr "Integrator — desni ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:13
-+msgid "Integrator - input bottom"
-+msgstr "Integrator — donji ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:14
-+msgid "Integrator - input top"
-+msgstr "Integrator — gornji ulaz"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:15
-+msgid "Sum"
-+msgstr "Zbir"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:16
-+msgid "Product"
-+msgstr "Proizvod"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:17
-+msgid "High pass filter"
-+msgstr "Visokopropusni poja�ava�"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:18
-+msgid "Low pass filter"
-+msgstr "Niskopropusni poja�ava�"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:19
-+msgid "Sine characteristic or input"
-+msgstr "Sinusna odlika ili ulaz"
-+
-+# hmm... nešto ovde ne valja :)
-+#: ../sheets/Cybernetics.sheet.in.h:20
-+msgid "Sigmoid characteristic"
-+msgstr "Sigmoidna odlika"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:21
-+msgid "Saturation characteristic"
-+msgstr "Odlika zasićenja"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:22
-+msgid "Relay characteristic (sigma)"
-+msgstr "Odlika releja (sigma)"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:23
-+msgid "Half wave rectifier or ramp input"
-+msgstr "Polutalasni ispravlja� ili ulazna rampa"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:24
-+msgid "Full wave rectifier (absolute value)"
-+msgstr "Punotalasni ispravlja� (apsolutna vrednost)"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:25
-+msgid "Constant positive shift on the y-axis"
-+msgstr "Stalni pozitivan pomeraj duž uspravne ose"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:26
-+msgid "Constant negative shift on the y-axis"
-+msgstr "Stalni negativan pomeraj duž uspravne ose"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:27
-+msgid "Constant factor greater 1"
-+msgstr "Stalni �inilac veći od 1"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:28
-+msgid "Constant factor between 0 and 1"
-+msgstr "Stalni �inilac između 0 i 1"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:29
-+msgid "Constant factor between 0 and -1"
-+msgstr "Stalni �inilac između 0 i -1"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:30
-+msgid "Constant factor below -1"
-+msgstr "Stalni �inilac ispod -1"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:31
-+msgid "Template for custom characteristics"
-+msgstr "Å ablon za proizvoljne odlike"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:32
-+msgid "Time delay"
-+msgstr "Vremenski zastoj"
-+
-+#: ../sheets/Database.sheet.in.h:1
-+msgid "Database"
-+msgstr "Baza podataka"
-+
-+#: ../sheets/Database.sheet.in.h:2
-+msgid "Editor for Database Table Relation Diagrams"
-+msgstr "Uređiva� za dijagrame odnosa tabele baze podataka"
-+
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr "Složenik atributa"
-+
-+#: ../sheets/ER.sheet.in.h:1
-+msgid "ER"
-+msgstr "ER"
-+
-+#: ../sheets/ER.sheet.in.h:2
-+msgid "Editor for Entity Relations Diagrams"
-+msgstr "Uređiva� za dijagrame odnosa entiteta"
-+
-+#: ../sheets/ER.sheet.in.h:4
-+msgid "Weak entity"
-+msgstr "Slab entitet"
-+
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "U�estvovanje"
-+
-+#: ../sheets/Electric.sheet.in.h:1
-+msgid "Electric"
-+msgstr "Energetika"
-+
-+#: ../sheets/Electric.sheet.in.h:2
-+msgid "Components for electric circuits"
-+msgstr "Delovi elektri�nih kola"
-+
-+#: ../sheets/Electric.sheet.in.h:3
-+msgid "Normally open contact (horizontal)"
-+msgstr "Uobi�ajeno otvorena veza (vodoravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:4
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Uobi�ajeno spojena veza (vodoravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:5
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Uobi�ajeno otvoren prekida� (vodoravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:6
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Uobi�ajeno uklju�en prekida� (vodoravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:7
-+msgid "Normally open contact (vertical)"
-+msgstr "Uobi�ajeno otvorena veza (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:8
-+msgid "Normally closed contact (vertical)"
-+msgstr "Uobi�ajeno spojena veza (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:9
-+msgid "Normally open position switch (vertical)"
-+msgstr "Uobi�ajeno otvoren prekida� (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:10
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Uobi�ajeno uklju�en prekida� (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:11
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "Upravlja�ka jedinica jednog releja (vodoravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:12
-+msgid "Relay (horizontal)"
-+msgstr "Relej (vodoravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:13
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Sijalica ili svetlosni indikator (vodorovano)"
-+
-+#: ../sheets/Electric.sheet.in.h:14
-+msgid "The command organ of a relay (vertical)"
-+msgstr "Upravlja�ka jedinica jednog releja (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:15
-+msgid "Relay (vertical)"
-+msgstr "Relej (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:16
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Sijalica ili svetlosni indikator (uspravno)"
-+
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "ÄŒvor"
-+
-+#: ../sheets/FS.sheet.in.h:1
-+msgid "FS"
-+msgstr "FS"
-+
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Uređiva� za dijagrame strukture funkcija."
-+
-+#: ../sheets/FS.sheet.in.h:3
-+msgid "Flow"
-+msgstr "Tok"
-+
-+#: ../sheets/FS.sheet.in.h:4
-+msgid "Orthogonal polyline flow"
-+msgstr "Tok upravne izlomljene linije"
-+
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Funkcija"
-+
-+#: ../sheets/Flowchart.sheet.in.h:2
-+msgid "Objects to draw flowcharts"
-+msgstr "Objekti za crtanje dijagrama toka"
-+
-+#: ../sheets/Flowchart.sheet.in.h:3
-+msgid "Process/Auxiliary Operation"
-+msgstr "Dopunska/procesna operacija"
-+
-+#: ../sheets/Flowchart.sheet.in.h:4
-+msgid "Input/Output"
-+msgstr "Ulaz/izlaz"
-+
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
-+msgid "Decision"
-+msgstr "Odluka"
-+
-+#: ../sheets/Flowchart.sheet.in.h:6
-+msgid "Connector"
-+msgstr "Poveziva�"
-+
-+#: ../sheets/Flowchart.sheet.in.h:8
-+msgid "Transaction file"
-+msgstr "Datoteka prenosa"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:10
-+msgid "Off page connector"
-+msgstr "Poveziva� bez strane"
-+
-+#: ../sheets/Flowchart.sheet.in.h:11
-+msgid "Document"
-+msgstr "Dokument"
-+
-+#: ../sheets/Flowchart.sheet.in.h:12
-+msgid "Manual operation"
-+msgstr "Ru�na operacija"
-+
-+#: ../sheets/Flowchart.sheet.in.h:13
-+msgid "Preparation"
-+msgstr "Priprema"
-+
-+#: ../sheets/Flowchart.sheet.in.h:14
-+msgid "Manual input"
-+msgstr "Ru�ni unos"
-+
-+#: ../sheets/Flowchart.sheet.in.h:15
-+msgid "Predefined process"
-+msgstr "Predodređeni proces"
-+
-+#: ../sheets/Flowchart.sheet.in.h:16
-+msgid "Terminal Interrupt"
-+msgstr "Prekid terminala"
-+
-+#: ../sheets/Flowchart.sheet.in.h:17
-+msgid "Magnetic disk"
-+msgstr "Magnetni disk"
-+
-+#: ../sheets/Flowchart.sheet.in.h:18
-+msgid "Magnetic drum"
-+msgstr "Magnetni doboš"
-+
-+#: ../sheets/Flowchart.sheet.in.h:19
-+msgid "Magnetic tape"
-+msgstr "Magnetna traka"
-+
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Unutrašnji smeštaj"
-+
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Spoji"
-+
-+#: ../sheets/Flowchart.sheet.in.h:23
-+msgid "Delay"
-+msgstr "Kašnjenje"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:25
-+msgid "Summing junction"
-+msgstr "Zbirna ta�ka"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:27
-+msgid "Collate"
-+msgstr "Slaga�"
-+
-+#: ../sheets/Flowchart.sheet.in.h:28
-+msgid "Sort"
-+msgstr "Uredi"
-+
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Ili"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Bušena kartica"
-+
-+#: ../sheets/Flowchart.sheet.in.h:31
-+msgid "Punched tape"
-+msgstr "Bušena traka"
-+
-+#: ../sheets/Flowchart.sheet.in.h:32
-+msgid "Transmittal tape"
-+msgstr "Traka za prenos"
-+
-+#: ../sheets/Flowchart.sheet.in.h:33
-+msgid "Offline storage"
-+msgstr "Isklju�eni smeštaj"
-+
-+#: ../sheets/Flowchart.sheet.in.h:34
-+msgid "Data source"
-+msgstr "Izvor podataka"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:1
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Objekti za izradu GRAFCET grafikona"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Korak poziva makro podprograma"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:9
-+msgid "Action to associate to a step"
-+msgstr "Radnja za dodeljivanje koraku"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:10
-+msgid "Condition (of an action)"
-+msgstr "Uslov (za radnju)"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "Prelaz"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:12
-+msgid "OR vergent"
-+msgstr "ILI teme"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "I teme"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:14
-+msgid "Arc (upward)"
-+msgstr "Luk (nagore)"
-+
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+msgid "Gane and Sarson"
-+msgstr "Gejn i Sarson"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+msgid "Gane and Sarson DFD"
-+msgstr "Gejn i Sarson DFD"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
-+msgid "Alternate external entity"
-+msgstr "Menjanje spoljnog entiteta"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-+msgid "Data store"
-+msgstr "Skladište podataka"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-+msgid "External entity"
-+msgstr "Spoljni entitet"
-+
-+#. use dc:title instead?
-+#: ../sheets/IsometricMap.sheet.in.h:2
-+msgid "Map, Isometric"
-+msgstr "Mapa, izometrijska"
-+
-+#. use dc:description instead?
-+#: ../sheets/IsometricMap.sheet.in.h:4
-+msgid "Isometric Directional Map Shapes"
-+msgstr "Izometrijski oblici za usmerene mape"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:5
-+msgid "Road Section"
-+msgstr "Deonica puta"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:6
-+msgid "Long Straight Road Section"
-+msgstr "Odeljak dugog pravog puta"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:7
-+msgid "Crossroads"
-+msgstr "Raskrsnica"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:8
-+msgid "T-Junction"
-+msgstr "T-raskrsnica"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:9
-+msgid "Elevated Road"
-+msgstr "Nadvožnjak"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:10
-+msgid "Corner 1"
-+msgstr "Ćošak 1"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:11
-+msgid "Corner 2"
-+msgstr "Ćošak 2"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:12
-+msgid "River"
-+msgstr "Reka"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:13
-+msgid "Roof1"
-+msgstr "Krov 1"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:14
-+msgid "Block 1, 2:4"
-+msgstr "Blok 1, 2:4"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:15
-+msgid "Block 2, 2:8"
-+msgstr "Blok 2, 2:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
-+msgstr "Blok 3, 4:4"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:17
-+msgid "Block 4, 4:8"
-+msgstr "Blok 4, 4:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:18
-+msgid "Block 5, 3:3"
-+msgstr "Blok 5, 3:3"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
-+msgstr "Blok 6, 4:6"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:20
-+msgid "Block 7"
-+msgstr "Blok 7"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:21
-+msgid "Factory"
-+msgstr "Fabrika"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:22
-+msgid "Car 1, Front View"
-+msgstr "Auto 1, pogled spreda"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:23
-+msgid "Car 2, Rear View"
-+msgstr "Auto 2, pogled otpozadi"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:24
-+msgid "Train 1, angled downward"
-+msgstr "Voz 1, ugao nadole"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:25
-+msgid "Train 2, angled upward"
-+msgstr "Voz 2, ugao nagore"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:26
-+msgid "Tree 1"
-+msgstr "Drvo 1"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:27
-+msgid "Footbridge, Pedestrian Bridge"
-+msgstr "Most za pešake"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:28
-+msgid "One Way Road Sign"
-+msgstr "Znak za jednosmernu ulicu"
-+
-+#: ../sheets/Istar.sheet.in.h:1
-+msgid "RE-i*"
-+msgstr "RE-i*"
-+
-+#: ../sheets/Istar.sheet.in.h:2
-+msgid "Objects to design i* diagrams"
-+msgstr "Objekti za crtanje i* dijagrama"
-+
-+#: ../sheets/Istar.sheet.in.h:3
-+msgid "An i* softgoal"
-+msgstr "i* meki cilj"
-+
-+#: ../sheets/Istar.sheet.in.h:4
-+msgid "An i* goal"
-+msgstr "i* cilj"
-+
-+#: ../sheets/Istar.sheet.in.h:5
-+msgid "An i* resource"
-+msgstr "i* izvor"
-+
-+#: ../sheets/Istar.sheet.in.h:6
-+msgid "An i* task"
-+msgstr "i* zadatak"
-+
-+#: ../sheets/Istar.sheet.in.h:7
-+msgid "An i* unspecified actor"
-+msgstr "i* neodređeni �inilac"
-+
-+#: ../sheets/Istar.sheet.in.h:8
-+msgid "An i* agent"
-+msgstr "i* agent"
-+
-+#: ../sheets/Istar.sheet.in.h:9
-+msgid "An i* position"
-+msgstr "i* položaj"
-+
-+#: ../sheets/Istar.sheet.in.h:10
-+msgid "An i* role"
-+msgstr "i* uloga"
-+
-+#: ../sheets/Istar.sheet.in.h:11
-+msgid "An i* unspecified link"
-+msgstr "i* neodređena veza"
-+
-+#: ../sheets/Istar.sheet.in.h:12
-+msgid "An i* positive contribution"
-+msgstr "i* pozitivan doprinos"
-+
-+#: ../sheets/Istar.sheet.in.h:13
-+msgid "An i* negative contribution"
-+msgstr "i* negatvan doprinos"
-+
-+#: ../sheets/Istar.sheet.in.h:14
-+msgid "An i* dependency link"
-+msgstr "i* veza zavisnosti"
-+
-+#: ../sheets/Istar.sheet.in.h:15
-+msgid "An i* decomposition link"
-+msgstr "i* veza rastavljanja"
-+
-+#: ../sheets/Istar.sheet.in.h:16
-+msgid "An i* means-ends link"
-+msgstr "i* veza sredstava-završetaka"
-+
-+#: ../sheets/Jackson.sheet.in.h:1
-+msgid "RE-Jackson"
-+msgstr "Džeksonovi dijagrami"
-+
-+#: ../sheets/Jackson.sheet.in.h:2
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Objekti za izradu Džeksonovih dijagrama"
-+
-+#: ../sheets/Jackson.sheet.in.h:3
-+msgid "A Jackson given domain"
-+msgstr "Džeksonov dati domen"
-+
-+#: ../sheets/Jackson.sheet.in.h:4
-+msgid "A Jackson designed domain"
-+msgstr "Džeksonov ciljni domen"
-+
-+#: ../sheets/Jackson.sheet.in.h:5
-+msgid "A Jackson machine domain"
-+msgstr "Džeksonov mašinski domen"
-+
-+#: ../sheets/Jackson.sheet.in.h:6
-+msgid "A Jackson requirement"
-+msgstr "Džeksonov potreban uslov"
-+
-+#: ../sheets/Jackson.sheet.in.h:7
-+msgid "A Jackson shared phenomenon"
-+msgstr "Džeksonov deljeni fenomen"
-+
-+#: ../sheets/Jackson.sheet.in.h:8
-+msgid "A Jackson requirement phenomenon"
-+msgstr "Džeksonov potreban fenomen"
-+
-+#: ../sheets/KAOS.sheet.in.h:1
-+msgid "RE-KAOS"
-+msgstr "RE-KAOS"
-+
-+#: ../sheets/KAOS.sheet.in.h:2
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Objekti za izradu KAOS dijagrama"
-+
-+#: ../sheets/KAOS.sheet.in.h:3
-+msgid "A KAOS softgoal"
-+msgstr "KAOS meki cilj"
-+
-+#: ../sheets/KAOS.sheet.in.h:4
-+msgid "A KAOS goal"
-+msgstr "KAOS cilj"
-+
-+#: ../sheets/KAOS.sheet.in.h:5
-+msgid "A KAOS requirement"
-+msgstr "KAOS potraživanje"
-+
-+#: ../sheets/KAOS.sheet.in.h:6
-+msgid "A KAOS assumption"
-+msgstr "KAOS pretpostavka"
-+
-+#: ../sheets/KAOS.sheet.in.h:7
-+msgid "A KAOS obstacle"
-+msgstr "KAOS prepreka"
-+
-+#: ../sheets/KAOS.sheet.in.h:8
-+msgid "A KAOS AND refinement"
-+msgstr "KAOS I pre�išćavanje"
-+
-+#: ../sheets/KAOS.sheet.in.h:9
-+msgid "A KAOS complete AND refinement"
-+msgstr "KAOS potpuno I pre�išćavanje"
-+
-+#: ../sheets/KAOS.sheet.in.h:10
-+msgid "A KAOS OR refinement"
-+msgstr "KAOS ILI pre�išćavanje"
-+
-+#: ../sheets/KAOS.sheet.in.h:11
-+msgid "A KAOS complete OR refinement"
-+msgstr "KAOS potpuno ILI pre�išćavanje"
-+
-+#: ../sheets/KAOS.sheet.in.h:12
-+msgid "A KAOS operationalization"
-+msgstr "KAOS operacionalizacija"
-+
-+#: ../sheets/KAOS.sheet.in.h:13
-+msgid "A KAOS contribution"
-+msgstr "KAOS doprinos"
-+
-+#: ../sheets/KAOS.sheet.in.h:14
-+msgid "A KAOS obstruction"
-+msgstr "KAOS zagušenje"
-+
-+#: ../sheets/KAOS.sheet.in.h:15
-+msgid "A KAOS binary conflict"
-+msgstr "KAOS sukob izvršnih"
-+
-+#: ../sheets/KAOS.sheet.in.h:16
-+msgid "A KAOS agent"
-+msgstr "KAOS agent"
-+
-+#: ../sheets/KAOS.sheet.in.h:17
-+msgid "A KAOS responsibility"
-+msgstr "KAOS odgovornost"
-+
-+#: ../sheets/KAOS.sheet.in.h:18
-+msgid "A KAOS monitor link"
-+msgstr "KAOS veza nadgledanja"
-+
-+#: ../sheets/KAOS.sheet.in.h:19
-+msgid "A KAOS control link"
-+msgstr "KAOS veza upravljanja"
-+
-+#: ../sheets/KAOS.sheet.in.h:20
-+msgid "A KAOS capable-of"
-+msgstr "KAOS sposobnost"
-+
-+#: ../sheets/KAOS.sheet.in.h:21
-+msgid "A KAOS performs"
-+msgstr "KAOS izvršavanja"
-+
-+#  Operations page:
-+#: ../sheets/KAOS.sheet.in.h:22
-+msgid "A KAOS operation"
-+msgstr "KAOS operacija"
-+
-+#: ../sheets/KAOS.sheet.in.h:23
-+msgid "A KAOS input"
-+msgstr "KAOS ulaz"
-+
-+#: ../sheets/KAOS.sheet.in.h:24
-+msgid "A KAOS output"
-+msgstr "KAOS izlaz"
-+
-+#: ../sheets/Lights.sheet.in.h:1
-+msgid "Lights"
-+msgstr "Svetla"
-+
-+#: ../sheets/Lights.sheet.in.h:2
-+msgid "Objects to design simple lighting plots"
-+msgstr "Objekti za crtanje jednostavnih planova osvetljenja"
-+
-+#: ../sheets/Lights.sheet.in.h:3
-+msgid "PAR"
-+msgstr "PAR"
-+
-+#: ../sheets/Lights.sheet.in.h:4
-+msgid "PAR on the floor"
-+msgstr "PAR na podu"
-+
-+#: ../sheets/Lights.sheet.in.h:5
-+msgid "ACL"
-+msgstr "ACL"
-+
-+#: ../sheets/Lights.sheet.in.h:6
-+msgid "Pebble Convex lantern"
-+msgstr "Ispup�ena lampa sa oblucima"
-+
-+#: ../sheets/Lights.sheet.in.h:7
-+msgid "Fresel lantern"
-+msgstr "Frezel lampa"
-+
-+#: ../sheets/Lights.sheet.in.h:8
-+msgid "Striplight"
-+msgstr "Prugasto svetlo"
-+
-+#: ../sheets/Lights.sheet.in.h:9
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr "Elipsoidni reflektor svetla pretrage"
-+
-+#: ../sheets/Lights.sheet.in.h:10
-+msgid "Blinders"
-+msgstr "Nao�njaci"
-+
-+#: ../sheets/Lights.sheet.in.h:11
-+msgid "Black light"
-+msgstr "Crno svetlo"
-+
-+#: ../sheets/Lights.sheet.in.h:12
-+msgid "Stroboscope light"
-+msgstr "Stroboskopsko svetlo"
-+
-+#: ../sheets/Lights.sheet.in.h:13
-+msgid "Moving head"
-+msgstr "Pokretna glava"
-+
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Skener"
-+
-+#  Translators: Menu item Verb/Support/Secure
-+#: ../sheets/Lights.sheet.in.h:15
-+msgid "Structure"
-+msgstr "Struktura"
-+
-+#: ../sheets/Logic.sheet.in.h:1
-+msgid "Logic"
-+msgstr "Logi�ka kola"
-+
-+#: ../sheets/Logic.sheet.in.h:2
-+msgid "Boolean Logic"
-+msgstr "Bulova logika"
-+
-+#: ../sheets/Logic.sheet.in.h:3
-+msgid "OR gate"
-+msgstr "ILI kolo"
-+
-+#: ../sheets/Logic.sheet.in.h:4
-+msgid "AND gate"
-+msgstr "I kolo"
-+
-+#: ../sheets/Logic.sheet.in.h:5
-+msgid "XOR gate"
-+msgstr "ILI-ILI kolo"
-+
-+#: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Jednostavni bafer"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Invertor"
-+
-+#: ../sheets/Logic.sheet.in.h:8
-+msgid "NAND gate"
-+msgstr "NI kolo"
-+
-+#: ../sheets/Logic.sheet.in.h:9
-+msgid "NOR gate"
-+msgstr "NILI kolo"
-+
-+#: ../sheets/Logic.sheet.in.h:10
-+msgid "NOT"
-+msgstr "NE"
-+
-+#: ../sheets/Logic.sheet.in.h:11
-+msgid "Crossconnector"
-+msgstr "Unakrsni spaja�"
-+
-+#: ../sheets/MSE.sheet.in.h:1
-+msgid "MSE"
-+msgstr "MSE"
-+
-+#: ../sheets/MSE.sheet.in.h:2
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "Delovi opreme mobilnih pretplatnika ameri�ke vojske"
-+
-+#: ../sheets/MSE.sheet.in.h:3
-+msgid "Node center"
-+msgstr "Središte �vora"
-+
-+#: ../sheets/MSE.sheet.in.h:4
-+msgid "Large extension node"
-+msgstr "Veliki produžni �vor"
-+
-+#: ../sheets/MSE.sheet.in.h:5
-+msgid "Small extension node"
-+msgstr "Mali produžni �vor"
-+
-+#: ../sheets/MSE.sheet.in.h:6
-+msgid "Tactical satellite communications terminal"
-+msgstr "Zemaljska satelitska stanica"
-+
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplekser"
-+
-+#: ../sheets/MSE.sheet.in.h:8
-+msgid "Demultiplexer"
-+msgstr "Demultiplekser"
-+
-+#: ../sheets/Misc.sheet.in.h:1
-+msgid "Misc"
-+msgstr "Razno"
-+
-+#: ../sheets/Misc.sheet.in.h:2
-+msgid "Miscellaneous Shapes"
-+msgstr "Razni oblici"
-+
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Drvo"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Fascikla"
-+
-+#: ../sheets/Misc.sheet.in.h:6
-+msgid "expensible node"
-+msgstr "produživ �vor"
-+
-+#: ../sheets/Misc.sheet.in.h:7
-+msgid "expended node"
-+msgstr "produženi �vor"
-+
-+#: ../sheets/Misc.sheet.in.h:8
-+msgid "Traditional clock"
-+msgstr "Obi�an �asovnik"
-+
-+#: ../sheets/Misc.sheet.in.h:9
-+msgid "Measure distance"
-+msgstr "Rastojanje merenja"
-+
-+#: ../sheets/Misc.sheet.in.h:10
-+msgid "Resizable grid"
-+msgstr "Mreža promenljive veli�ine"
-+
-+#: ../sheets/Misc.sheet.in.h:11
-+msgid "New-style group object, for testing"
-+msgstr "Grupa objekta novog stila, za isprobavanje"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:1
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pneumatika/hidraulika"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:2
-+msgid "Components for pneumatic and hydraulic circuits"
-+msgstr "Delovi za pneumatska i hidrauli�na kola"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:3
-+msgid "Double-effect jack"
-+msgstr "Uti�nica dvostrukog uticaja"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:4
-+msgid "Normally-in simple-effect jack"
-+msgstr "Obi�no-uklju�eno gnezdo jednostavnog-uticaja"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:5
-+msgid "Normally-out simple-effect jack"
-+msgstr "Obi�no-isklju�eno gnezdo jednostavnog-uticaja"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:6
-+msgid "Generic pressure source"
-+msgstr "Opšti izvor pritiska"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:7
-+msgid "Hydraulic pressure source"
-+msgstr "Hidrauli�ki izvor pritiska"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:8
-+msgid "Pneumatic pressure source"
-+msgstr "Pneumatski izvor pritiska"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:9
-+msgid "Air exhaust orifice"
-+msgstr "Otvor za izduvavanje vazduha"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:10
-+msgid "2/2 distributor"
-+msgstr "2/2 raspodeljiva�"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:11
-+msgid "3/2 distributor"
-+msgstr "3/2 raspodeljiva�"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:12
-+msgid "4/2 distributor"
-+msgstr "4/2 raspodeljiva�"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:13
-+msgid "5/2 distributor"
-+msgstr "5/2 raspodeljiva�"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:14
-+msgid "Muscular command"
-+msgstr "Mišićna naredba"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:15
-+msgid "Push-button command"
-+msgstr "Naredba pritiska dugmeta"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:16
-+msgid "Mechanical command by tappet"
-+msgstr "Mehani�ka naredba podiza�em"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:17
-+msgid "Mechanical command by spring"
-+msgstr "Mehani�ka naredba oprugom"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:18
-+msgid "Electric command (single coil)"
-+msgstr "Elektri�ni ispravlja� (jedan kalem)"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:19
-+msgid "Electric command (double coil)"
-+msgstr "Elektri�ni ispravlja� (dvostruki kalem)"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:20
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Neposredna naredba hidrauli�kim pokreta�em"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:21
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Neposredna naredba pneumatskim pokreta�em"
-+
-+#: ../sheets/SADT.sheet.in.h:1
-+msgid "SADT/IDEF0"
-+msgstr "SADT/IDEF0"
-+
-+#: ../sheets/SADT.sheet.in.h:2
-+msgid "Objects to design SADT diagrams"
-+msgstr "Objekti za izradu SADT dijagrama"
-+
-+#: ../sheets/SADT.sheet.in.h:3
-+msgid "Activity/data flow arrow"
-+msgstr "Strelica toka aktivnosti/podataka"
-+
-+#: ../sheets/SADT.sheet.in.h:4
-+msgid "Activity/data box"
-+msgstr "Kućica aktivnosti/podataka"
-+
-+#: ../sheets/SADT.sheet.in.h:5
-+msgid "Flow label"
-+msgstr "Natpis toka"
-+
-+#: ../sheets/SDL.sheet.in.h:1
-+msgid "SDL"
-+msgstr "SDL"
-+
-+#: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Jezik za određivanje i opis (SDL)."
-+
-+#: ../sheets/SDL.sheet.in.h:3
-+msgid "Block type reference"
-+msgstr "Referenca vrste bloka"
-+
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Referenca vrste usluge"
-+
-+#: ../sheets/SDL.sheet.in.h:5
-+msgid "Process type reference"
-+msgstr "Referenca vrste procesa"
-+
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Stanje"
-+
-+#: ../sheets/SDL.sheet.in.h:7
-+msgid "Function header"
-+msgstr "Zaglavlje funkcije"
-+
-+#: ../sheets/SDL.sheet.in.h:8
-+msgid "Send message"
-+msgstr "Pošalji poruku"
-+
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Primljena poruka"
-+
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Poziv funkcije"
-+
-+#: ../sheets/SDL.sheet.in.h:12
-+msgid "Action being executed"
-+msgstr "Radnja je izvršena"
-+
-+#: ../sheets/SDL.sheet.in.h:13
-+msgid "Save state"
-+msgstr "Sa�uvaj stanje"
-+
-+#: ../sheets/SDL.sheet.in.h:15
-+msgid "In/Out connector"
-+msgstr "Ulazni/izlazni priklju�ak"
-+
-+#: ../sheets/SDL.sheet.in.h:17
-+msgid "Procedure return"
-+msgstr "Povratak postupka"
-+
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Obi�na tekstualna beleška"
-+
-+#: ../sheets/SISSI.sheet.in.h:1
-+msgid "Objects to design sissi diagrams"
-+msgstr "Objekti za izradu sissi dijagrama"
-+
-+#: ../sheets/SISSI.sheet.in.h:2
-+msgid "Workstation"
-+msgstr "Radna stanica"
-+
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Odnosna baza podataka"
-+
-+#  Translators: Menu item Verb/Channel/Guide/Guide/Steer
-+#: ../sheets/SISSI.sheet.in.h:4
-+msgid "Server"
-+msgstr "Server"
-+
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Prenosni ra�unar"
-+
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "PDA"
-+
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Smeštajni niz"
-+
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Usmeriva�"
-+
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Mrežni oblak"
-+
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefon"
-+
-+#: ../sheets/SISSI.sheet.in.h:11
-+msgid "Cell phone"
-+msgstr "Mobilni telefon"
-+
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Razvodnik"
-+
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
-+
-+#: ../sheets/SISSI.sheet.in.h:14
-+msgid "Cipher machine"
-+msgstr "Å ifrerski aparat"
-+
-+#: ../sheets/SISSI.sheet.in.h:15
-+msgid "Magnetic storage"
-+msgstr "Magnetno skladištenje"
-+
-+#: ../sheets/SISSI.sheet.in.h:16
-+msgid "Paper storage"
-+msgstr "Papirni smeštaj"
-+
-+#: ../sheets/SISSI.sheet.in.h:17
-+msgid "Person"
-+msgstr "Osoba"
-+
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
-+msgid "File cabinet"
-+msgstr "Orman za dokumenta"
-+
-+#: ../sheets/SISSI.sheet.in.h:19
-+msgid "Safe"
-+msgstr "Bezbednost"
-+
-+#: ../sheets/SISSI.sheet.in.h:20
-+msgid "Backup"
-+msgstr "Rezerva"
-+
-+#: ../sheets/SISSI.sheet.in.h:22
-+msgid "Log analysis"
-+msgstr "Analiza dnevnika"
-+
-+#: ../sheets/SISSI.sheet.in.h:23
-+msgid "Information system"
-+msgstr "Informacioni sistem"
-+
-+#: ../sheets/SISSI.sheet.in.h:24
-+msgid "Information"
-+msgstr "Informacije"
-+
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Soba"
-+
-+#: ../sheets/SISSI.sheet.in.h:26
-+msgid "Faraday cage"
-+msgstr "Faradejev kavez"
-+
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "Bezbedonosna oblast"
-+
-+#: ../sheets/SISSI.sheet.in.h:28
-+msgid "Geographic site"
-+msgstr "Geografsko nalazište"
-+
-+#: ../sheets/SISSI.sheet.in.h:29
-+msgid "Gate"
-+msgstr "Prolaz"
-+
-+#: ../sheets/SISSI.sheet.in.h:30
-+msgid "Video camera"
-+msgstr "Video kamera"
-+
-+#: ../sheets/SISSI.sheet.in.h:31
-+msgid "Glass-break sensor"
-+msgstr "Osetnik lomljenja stakla"
-+
-+#: ../sheets/SISSI.sheet.in.h:32
-+msgid "Sensor beam"
-+msgstr "Svetlosni snop senzora"
-+
-+#: ../sheets/SISSI.sheet.in.h:33
-+msgid "Condensator"
-+msgstr "Kondenzator"
-+
-+#  Translators: Menu item Verb/Channel/Import/Form Entrance
-+#  Translators: Menu item Verb/Channel/Import/Form Entrance
-+#: ../sheets/SISSI.sheet.in.h:34
-+msgid "Power transducer"
-+msgstr "Pretvara� snage"
-+
-+#: ../sheets/SISSI.sheet.in.h:35
-+msgid "Current transducer"
-+msgstr "Strujni pretvara�"
-+
-+#: ../sheets/SISSI.sheet.in.h:36
-+msgid "Enthalpy transducer"
-+msgstr "Entalpni pretvara�"
-+
-+#: ../sheets/SISSI.sheet.in.h:37
-+msgid "Smoke detector"
-+msgstr "Otkriva� dima"
-+
-+#: ../sheets/SISSI.sheet.in.h:38
-+msgid "Moisture sensor"
-+msgstr "Otkriva� vlage"
-+
-+#: ../sheets/SISSI.sheet.in.h:39
-+msgid "Light detector"
-+msgstr "Otkriva� svetla"
-+
-+#: ../sheets/SISSI.sheet.in.h:40
-+msgid "Movement detector"
-+msgstr "Otkriva� pokreta"
-+
-+#: ../sheets/SISSI.sheet.in.h:41
-+msgid "Video movement detector"
-+msgstr "Video otkriva� pokreta"
-+
-+#: ../sheets/SISSI.sheet.in.h:42
-+msgid "Level detector"
-+msgstr "Otkriva� nivoa"
-+
-+#: ../sheets/SISSI.sheet.in.h:43
-+msgid "Pressure transducer"
-+msgstr "Pretvara� pritiska"
-+
-+#: ../sheets/SISSI.sheet.in.h:44
-+msgid "Air quality detector"
-+msgstr "Otkriva� kvaliteta vazduha"
-+
-+#: ../sheets/SISSI.sheet.in.h:45
-+msgid "Voltage detector"
-+msgstr "Otkriva� napona"
-+
-+#: ../sheets/SISSI.sheet.in.h:46
-+msgid "Vehicle detector"
-+msgstr "Otkriva� vozila"
-+
-+#  Translators: Menu item Noun/Energy/Mechanical/Vibration
-+#: ../sheets/SISSI.sheet.in.h:47
-+msgid "Vibration sensor"
-+msgstr "Osetnik vibracija"
-+
-+#: ../sheets/SISSI.sheet.in.h:48
-+msgid "Digital code"
-+msgstr "Digitalna Å¡ifra"
-+
-+#: ../sheets/SISSI.sheet.in.h:49
-+msgid "Moisture extractor"
-+msgstr "Iscrpnik vlage"
-+
-+#: ../sheets/SISSI.sheet.in.h:50
-+msgid "Air filter"
-+msgstr "Vazdušni filter"
-+
-+#: ../sheets/SISSI.sheet.in.h:51
-+msgid "Badge reader/keyboard"
-+msgstr "Čita� bedža/tastatura"
-+
-+#: ../sheets/SISSI.sheet.in.h:52
-+msgid "Badge reader"
-+msgstr "Čita� bedža"
-+
-+#: ../sheets/SISSI.sheet.in.h:53
-+msgid "Biometric reader"
-+msgstr "Biometrijski �ita�"
-+
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "Pumpa"
-+
-+#: ../sheets/SISSI.sheet.in.h:55
-+msgid "Circulation pump"
-+msgstr "Proto�na pumpa"
-+
-+#: ../sheets/SISSI.sheet.in.h:56
-+msgid "Revolving door"
-+msgstr "Obrtna vrata"
-+
-+#: ../sheets/SISSI.sheet.in.h:57
-+msgid "Axial Ventilator"
-+msgstr "Osovinski ventilator"
-+
-+#: ../sheets/SISSI.sheet.in.h:58
-+msgid "Centrifugal Ventilator"
-+msgstr "Centrifugalni ventilator"
-+
-+#: ../sheets/SISSI.sheet.in.h:59
-+msgid "Ventilator"
-+msgstr "Ventilator"
-+
-+#: ../sheets/SISSI.sheet.in.h:60
-+msgid "Extinguisher"
-+msgstr "Protivpožarni aparat"
-+
-+#: ../sheets/SISSI.sheet.in.h:62
-+msgid "Airconditioner"
-+msgstr "Vazdušni kondicionator"
-+
-+#: ../sheets/SISSI.sheet.in.h:63
-+msgid "Alarm center"
-+msgstr "Alarmni centar"
-+
-+#: ../sheets/UML.sheet.in.h:1
-+msgid "UML"
-+msgstr "UML"
-+
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Uređiva� UML stati�kih strukturnih dijagrama"
-+
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Napomena"
-+
-+#: ../sheets/UML.sheet.in.h:7
-+msgid "Realizes, implements a specific interface"
-+msgstr "Ostvaruje, primenjuje naro�itu spregu"
-+
-+#: ../sheets/UML.sheet.in.h:8
-+msgid "Generalization, class inheritance"
-+msgstr "Uopštavanje, nasleđivanje klasa"
-+
-+#: ../sheets/UML.sheet.in.h:9
-+msgid "Association, two classes are associated"
-+msgstr "Udruživanje, dve klase su udružene"
-+
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Sjedinjavanje, jedna klasa �ini deo druge"
-+
-+#: ../sheets/UML.sheet.in.h:11
-+msgid "Implements, class implements a specific interface"
-+msgstr "Izvodi, klasa izvodi naro�itu spregu"
-+
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Ograni�enje, postavite ograni�enje na nešto"
-+
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Mali paket"
-+
-+#: ../sheets/UML.sheet.in.h:14
-+msgid "Large package"
-+msgstr "Veliki paket"
-+
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Koristi mala i velika slova"
-+
-+#: ../sheets/UML.sheet.in.h:17
-+msgid "Lifeline"
-+msgstr "Životna linija"
-+
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Objekat"
-+
-+#: ../sheets/UML.sheet.in.h:19
-+msgid "Message"
-+msgstr "Poruka"
-+
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Deo"
-+
-+#: ../sheets/UML.sheet.in.h:25
-+msgid "Node"
-+msgstr "ÄŒvor"
-+
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "Ukalupljena ikonica klase"
-+
-+#: ../sheets/UML.sheet.in.h:27
-+msgid "Initial/end state"
-+msgstr "Po�etno/krajnje stanje"
-+
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Radnja"
-+
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Rastavi/sjedini"
-+
-+#: ../sheets/chronogram.sheet.in.h:1
-+msgid "Chronogram"
-+msgstr "Hronogram"
-+
-+#: ../sheets/chronogram.sheet.in.h:2
-+msgid "Objects to design chronogram charts"
-+msgstr "Objekti za izradu hronogramskih grafikona"
-+
-+#: ../sheets/chronogram.sheet.in.h:3
-+msgid "Time scale"
-+msgstr "Vremenska razmera"
-+
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Linije sa podacima"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:1
-+msgid "Cisco - Computer"
-+msgstr "Cisko — Ra�unar"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Oblici ra�unara iz Ciskoa"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:3
-+msgid "PC"
-+msgstr "Li�ni ra�unar"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:4
-+msgid "Macintosh"
-+msgstr "Mekintoš"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:5
-+msgid "Terminal"
-+msgstr "Terminal"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:6
-+msgid "SUN workstation"
-+msgstr "SAN-ova radna stanica"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:7
-+msgid "CiscoWorks workstation"
-+msgstr "Radna stanica Cisko radova"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:8
-+msgid "PC Router Card"
-+msgstr "Usmeriva�ka kartica li�nog ra�unara"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:9
-+msgid "PC Software"
-+msgstr "Softver li�nog ra�unara"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:10
-+msgid "PC with Router-Based Software"
-+msgstr "Li�ni ra�unar sa softverom zasnovanom na usmeriva�u"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:11
-+msgid "Workgroup director"
-+msgstr "Upravlja� radne grupe"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:12
-+msgid "CiscoSecurity"
-+msgstr "Cisko bezbednost"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:13
-+msgid "Cisco CA"
-+msgstr "Cisko CA"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:14
-+msgid "WWW server"
-+msgstr "Veb server"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:15
-+msgid "Web browser"
-+msgstr "Veb preglednik"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:16
-+msgid "File Server"
-+msgstr "Server datoteka"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:17
-+msgid "Software-Based Router on File Server"
-+msgstr "Softverski zasnovan usmeriva� na serveru datoteka"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:18
-+msgid "Server with PC Router"
-+msgstr "Server sa usmeriva�em li�nog ra�unara"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:19
-+msgid "IBM Tower"
-+msgstr "IBM toranj"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:20
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM mini (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr "Procesor za ulaz"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:22
-+msgid "IBM mainframe"
-+msgstr "IBM mejnfrejm"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:23
-+msgid "IBM mainframe with FEP"
-+msgstr "IBM mejnfrejm sa FEP-om"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:24
-+msgid "HP Mini"
-+msgstr "HP mini"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Super ra�unar"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:26
-+msgid "Web cluster"
-+msgstr "Veb klaster"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:27
-+msgid "Mini VAX"
-+msgstr "Mini VAIks"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:28
-+msgid "PC Card"
-+msgstr "Kartica li�nog ra�unara"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tablica"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:31
-+msgid "EtherClient"
-+msgstr "Eternet magistrala"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:32
-+msgid "Handheld"
-+msgstr "Ru�ni ra�unar"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:33
-+msgid "Wireless"
-+msgstr "Beži�na"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Njutn"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Monitor"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "Video li�nog ra�unara"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:41
-+msgid "BBS"
-+msgstr "BBS"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "Mikro vebserver"
-+
-+#  Translators: Menu item Verb/Branch/Distribute
-+#: ../sheets/ciscocomputer.sheet.in.h:44
-+msgid "Diskette"
-+msgstr "Disketa"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:45
-+msgid "Host"
-+msgstr "Domaćin"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:46
-+msgid "Tape array"
-+msgstr "Niz traka"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:47
-+msgid "Disk subsystem"
-+msgstr "Disk podsistem"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:48
-+msgid "JBOD"
-+msgstr "JBOD"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:50
-+msgid "FC Storage"
-+msgstr "FC skladištenje"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:51
-+msgid "PC Adapter Card"
-+msgstr "Prilagođiva�ka kartica li�nog ra�unara"
-+
-+#: ../sheets/ciscohub.sheet.in.h:1
-+msgid "Cisco - Switch"
-+msgstr "Cisko — Prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:2
-+msgid "Router and switch shapes by Cisco"
-+msgstr "Oblici usmeriva�a i prebaciva�a od Ciskoa"
-+
-+#: ../sheets/ciscohub.sheet.in.h:4
-+msgid "Router subdued"
-+msgstr "Usmeriva�, bledo"
-+
-+#: ../sheets/ciscohub.sheet.in.h:5
-+msgid "Router with Silicon Switch"
-+msgstr "Usmeriva� sa silikonskim prebaciva�em"
-+
-+#: ../sheets/ciscohub.sheet.in.h:6
-+msgid "NetFlow router"
-+msgstr "Usmeriva� mrežnog protoka"
-+
-+#: ../sheets/ciscohub.sheet.in.h:7
-+msgid "Broadband router"
-+msgstr "Širokopojasni usmeriva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:8
-+msgid "Wavelength router"
-+msgstr "Usmeriva� talasne dužine"
-+
-+#: ../sheets/ciscohub.sheet.in.h:9
-+msgid "Wireless router"
-+msgstr "Beži�ni usmeriva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:10
-+msgid "7507 Router"
-+msgstr "7507 usmeriva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:11
-+msgid "7505 Router"
-+msgstr "7505 usmeriva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:12
-+msgid "7500ARS (7513) Router"
-+msgstr "7500ARS (7513) usmeriva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:13
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr "Usmeriva� prebaciva�a krajnjeg natpisa sa mrežnim protokom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:14
-+msgid "Edge Label Switch Router"
-+msgstr "Usmeriva� prebaciva�a krajnjeg natpisa"
-+
-+#: ../sheets/ciscohub.sheet.in.h:15
-+msgid "Router with Firewall"
-+msgstr "Usmeriva� sa mrežnom barijerom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:16
-+msgid "Optical Services Router"
-+msgstr "Usmeriva� opti�kih usluga"
-+
-+#: ../sheets/ciscohub.sheet.in.h:17
-+msgid "Content Router"
-+msgstr "Usmeriva� sadržaja"
-+
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Sistem usmeravanja nosa�a"
-+
-+#: ../sheets/ciscohub.sheet.in.h:19
-+msgid "Storage Router"
-+msgstr "Usmeriva� skladištenja"
-+
-+#: ../sheets/ciscohub.sheet.in.h:20
-+msgid "NetSonar"
-+msgstr "Mrežani sonar"
-+
-+#: ../sheets/ciscohub.sheet.in.h:22
-+msgid "Hub subdued"
-+msgstr "Pot�injeni razvodnik"
-+
-+#: ../sheets/ciscohub.sheet.in.h:23
-+msgid "Cisco Hub"
-+msgstr "Cisko razvodnik"
-+
-+#: ../sheets/ciscohub.sheet.in.h:24
-+msgid "Small Hub"
-+msgstr "Mali razvodnik"
-+
-+#: ../sheets/ciscohub.sheet.in.h:25
-+msgid "100BaseT Hub"
-+msgstr "100BejzT razvodnik"
-+
-+#: ../sheets/ciscohub.sheet.in.h:26
-+msgid "Workgroup switch"
-+msgstr "Prebaciva� radne grupe"
-+
-+#: ../sheets/ciscohub.sheet.in.h:27
-+msgid "Workgroup switch Subdued"
-+msgstr "Pt�injeni prebaciva� radne grupe"
-+
-+#: ../sheets/ciscohub.sheet.in.h:28
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Prebaciva� radne grupe uklju�en glasom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
-+
-+#: ../sheets/ciscohub.sheet.in.h:30
-+msgid "ATM Tag Switch Router"
-+msgstr "ATM usmeriva� prebaciva�a oznake"
-+
-+#: ../sheets/ciscohub.sheet.in.h:31
-+msgid "Switch Processor"
-+msgstr "Obrađiva� prebaciva�a"
-+
-+#: ../sheets/ciscohub.sheet.in.h:32
-+msgid "Route Switch Processor"
-+msgstr "Obrađiva� prebaciva�a usmerenja"
-+
-+#: ../sheets/ciscohub.sheet.in.h:33
-+msgid "Route Switch Processor with Si"
-+msgstr "Obrađiva� prebaciva�a usmerenja sa sislikonom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:34
-+msgid "PXF"
-+msgstr "PIksF"
-+
-+#: ../sheets/ciscohub.sheet.in.h:35
-+msgid "ASIC Processor"
-+msgstr "ASIC procesor"
-+
-+#: ../sheets/ciscohub.sheet.in.h:36
-+msgid "Generic Processor"
-+msgstr "Obi�an procesor"
-+
-+#: ../sheets/ciscohub.sheet.in.h:37
-+msgid "Data Center Switch"
-+msgstr "Prebaciva� centra podataka"
-+
-+#: ../sheets/ciscohub.sheet.in.h:38
-+msgid "Data Center Switch Reversed"
-+msgstr "Preokrenuti prebaciva� centra podataka"
-+
-+#: ../sheets/ciscohub.sheet.in.h:39
-+msgid "Data Switch Processor"
-+msgstr "Obrađiva� prebaciva�a podataka"
-+
-+#: ../sheets/ciscohub.sheet.in.h:40
-+msgid "Content Switch"
-+msgstr "Prebaciva� sadržaja"
-+
-+#: ../sheets/ciscohub.sheet.in.h:41
-+msgid "Content Service Module"
-+msgstr "Modul usluge sadržaja"
-+
-+#: ../sheets/ciscohub.sheet.in.h:42
-+msgid "CSM-S"
-+msgstr "CSM-S"
-+
-+#: ../sheets/ciscohub.sheet.in.h:43
-+msgid "Access Gateway"
-+msgstr "Pristupni mrežni prolaz"
-+
-+#: ../sheets/ciscohub.sheet.in.h:44
-+msgid "ATM Switch"
-+msgstr "ATM prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:45
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
-+
-+#: ../sheets/ciscohub.sheet.in.h:46
-+msgid "Cisco 1000"
-+msgstr "Cisko 1000"
-+
-+#: ../sheets/ciscohub.sheet.in.h:47
-+msgid "ISDN switch"
-+msgstr "ISDN prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:48
-+msgid "Label Switch Router"
-+msgstr "Usmeriva� prebaciva�a natpisa"
-+
-+#: ../sheets/ciscohub.sheet.in.h:49
-+msgid "MultiSwitch Device"
-+msgstr "Višeprebaciva�ki uređaj"
-+
-+#: ../sheets/ciscohub.sheet.in.h:50
-+msgid "LAN2LAN Switch"
-+msgstr "LAN2LAN prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:51
-+msgid "Multilayer Switch"
-+msgstr "Višeslojni prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:52
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Višeslojni prebaciva� sa silikonom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
-+msgstr "Višeslojni prebaciva� sa pot�injenim silikonom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:54
-+msgid "Programmable Switch"
-+msgstr "Programljiv prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:55
-+msgid "Content Service Switch 1100"
-+msgstr "Prebaciva� usluge sadržaja 1100"
-+
-+#: ../sheets/ciscohub.sheet.in.h:56
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "ATM brzi gigabitni mrežni prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:57
-+msgid "RateMUX"
-+msgstr "Proto�niMUKs"
-+
-+#: ../sheets/ciscohub.sheet.in.h:58
-+msgid "Workgroup 5500"
-+msgstr "Radna grupa 5500"
-+
-+#: ../sheets/ciscohub.sheet.in.h:59
-+msgid "Workgroup 5000"
-+msgstr "Radna grupa 5000"
-+
-+#: ../sheets/ciscohub.sheet.in.h:60
-+msgid "Workgroup 5002"
-+msgstr "Radna grupa 5002"
-+
-+#: ../sheets/ciscohub.sheet.in.h:61
-+msgid "NetRanger"
-+msgstr "Mrežni opsežnik"
-+
-+#: ../sheets/ciscohub.sheet.in.h:62
-+msgid "MGX 8220"
-+msgstr "MGIks 8220"
-+
-+#: ../sheets/ciscohub.sheet.in.h:63
-+msgid "MGX 8240"
-+msgstr "MGIks 8240"
-+
-+#: ../sheets/ciscohub.sheet.in.h:64
-+msgid "MGX 8260"
-+msgstr "MGIks 8260"
-+
-+#: ../sheets/ciscohub.sheet.in.h:65
-+msgid "Universal Gateway"
-+msgstr "Univerzalni mrežni prolaz"
-+
-+#: ../sheets/ciscohub.sheet.in.h:66
-+msgid "iSCSI switch"
-+msgstr "iSCSI prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:67
-+msgid "Workgroup Fibre Channel intelligent switch"
-+msgstr "Pametni prebaciva� radne grupe opti�kog vlakna"
-+
-+#: ../sheets/ciscohub.sheet.in.h:68
-+msgid "Director-class Fibre Channel intelligent switch"
-+msgstr "Pametni prebaciva� upravlja�ke klase opti�kog vlakna"
-+
-+#: ../sheets/ciscohub.sheet.in.h:69
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Višefabri�ki prebaciva� servera"
-+
-+#: ../sheets/ciscohub.sheet.in.h:70
-+msgid "Server Switch"
-+msgstr "Prebaciva� servera"
-+
-+#: ../sheets/ciscohub.sheet.in.h:71
-+msgid "Multilayer Remote Switch"
-+msgstr "Višeslojni udaljeni prebaciva�"
-+
-+#: ../sheets/ciscohub.sheet.in.h:72
-+msgid "Layer 2 Remote Switch"
-+msgstr "Udaljeni prebaciva� sloja 2"
-+
-+#: ../sheets/ciscohub.sheet.in.h:73
-+msgid "Virtual Layer Switch"
-+msgstr "Prebaciva� virtuelnog sloja"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:1
-+msgid "Cisco - Misc"
-+msgstr "Cisko — Rzno"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:2
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Raznovrsni oblici od Ciskoa"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:3
-+msgid "Government Building"
-+msgstr "Zgrada vlade"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:4
-+msgid "University"
-+msgstr "Univerzitet"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:5
-+msgid "Small Business"
-+msgstr "Malo preduzeće"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:6
-+msgid "Home office"
-+msgstr "Kućna kancelarija"
-+
-+#  Translators: Menu item Verb/Branch
-+#: ../sheets/ciscomisc.sheet.in.h:7
-+msgid "Branch office"
-+msgstr "Filijala"
-+
-+#  Translators: Menu item Verb/Branch
-+#: ../sheets/ciscomisc.sheet.in.h:8
-+msgid "Branch office subdued"
-+msgstr "Filijala, bledo"
-+
-+#  Translators: Menu item Verb/Branch
-+#: ../sheets/ciscomisc.sheet.in.h:9
-+msgid "Branch office blue"
-+msgstr "Filijala, plavo"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:10
-+msgid "Generic Building"
-+msgstr "Obi�na zgrada"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:11
-+msgid "Generic Building subdued"
-+msgstr "Obi�na zgrada, bledo"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:12
-+msgid "Generic Building blue"
-+msgstr "Obi�na plava zgrada"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:13
-+msgid "Medium Building"
-+msgstr "Zgrada srednje veli�ine"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:14
-+msgid "Medium Building subdued"
-+msgstr "Bleda zgrada srednje veli�ine"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:15
-+msgid "Medium Building blue"
-+msgstr "Plava zgrada srednje veli�ine"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:16
-+msgid "House"
-+msgstr "Kuća"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:17
-+msgid "House blue"
-+msgstr "Plava kuća"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:18
-+msgid "Telecommuter house"
-+msgstr "Kuća telekomjutera"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr "Bleda kuća telekomjutera"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:20
-+msgid "MDU"
-+msgstr "MDU"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr "ÄŒovek"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:22
-+msgid "Man red"
-+msgstr "Crveni �ovek"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:23
-+msgid "Man gold"
-+msgstr "Zlatni �ovek"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:24
-+msgid "Man blue"
-+msgstr "Plavi �ovek"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:25
-+msgid "Standing Man"
-+msgstr "ÄŒovek koji stoji"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:26
-+msgid "Standing woman"
-+msgstr "Žena koja stoji"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:27
-+msgid "Woman"
-+msgstr "Žena"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:28
-+msgid "Woman red"
-+msgstr "Žena u crvenom"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:29
-+msgid "Woman gold"
-+msgstr "Žena u zlatnom"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Žena u plavom"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:31
-+msgid "Running man"
-+msgstr "Čovek koji tr�i"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:32
-+msgid "Running man subdued"
-+msgstr "Bledi muškarac koji tr�i"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:33
-+msgid "Telecommuter"
-+msgstr "Telekomjuter"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:34
-+msgid "Running woman"
-+msgstr "Žena koja tr�i"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:35
-+msgid "CiscoWorks Man"
-+msgstr "Muškarac Cisko rada"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:36
-+msgid "PC Man left"
-+msgstr "Muškarac uz li�ni ra�unar sleva iz profila"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:37
-+msgid "PC Man"
-+msgstr "Muškarac uz li�ni ra�unar"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:38
-+msgid "Sitting Woman"
-+msgstr "Žena koja sedi"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:39
-+msgid "Sitting Woman right"
-+msgstr "Žena koja sedi sa desna"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:40
-+msgid "Mac Woman"
-+msgstr "Mek žena"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:41
-+msgid "Androgynous Person"
-+msgstr "Dvopolna osoba"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:43
-+msgid "Key"
-+msgstr "Klju�"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:44
-+msgid "Lock and Key"
-+msgstr "Katanac i klju�"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:45
-+msgid "Satellite dish"
-+msgstr "Satelitski tanjir"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:46
-+msgid "Satellite"
-+msgstr "Satelit"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:47
-+msgid "Antenna"
-+msgstr "Antena"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:49
-+msgid "Car"
-+msgstr "Kola"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:50
-+msgid "Truck"
-+msgstr "Kamion"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:51
-+msgid "Video Camera"
-+msgstr "Video kamera"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:52
-+msgid "Video Camera right"
-+msgstr "Video kamera iz profila na desno"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:54
-+msgid "Headphones"
-+msgstr "Slušalice"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:1
-+msgid "Cisco - Network"
-+msgstr "Cisko — Mreža"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:2
-+msgid "Network shapes by Cisco"
-+msgstr "Mrežni oblici od Ciskoa"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:3
-+msgid "Network Management"
-+msgstr "Upravljanje mrežom"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:4
-+msgid "Detector"
-+msgstr "Otkriva�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:5
-+msgid "Protocol Translator"
-+msgstr "Prevodilac protokola"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:6
-+msgid "IP"
-+msgstr "IP"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:7
-+msgid "IP Old-style"
-+msgstr "IP stari stil"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:8
-+msgid "NAT"
-+msgstr "NAT"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:9
-+msgid "VIP"
-+msgstr "VIP"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:10
-+msgid "Terminal Server"
-+msgstr "Server terminala"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:11
-+msgid "Access Server"
-+msgstr "Pristupni server"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:12
-+msgid "System controller"
-+msgstr "Sistemski kontroler"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:13
-+msgid "Directory Server"
-+msgstr "Server direktorijuma"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:14
-+msgid "Firewall"
-+msgstr "Mrežna barijera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:15
-+msgid "Firewall subdued"
-+msgstr "Bleda mrežna barijera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:16
-+msgid "Firewall horizontal"
-+msgstr "Vodoravna mrežna barijera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:17
-+msgid "Firewall Service Module"
-+msgstr "Modul usluge mrežne barijere"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:18
-+msgid "IOS Firewall"
-+msgstr "IOS mrežna barijera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:19
-+msgid "PIX Firewall"
-+msgstr "PIKs mrežna barijera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:20
-+msgid "PIX Firewall Left"
-+msgstr "PIKs mrežna barijera sa leva"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:21
-+msgid "Centri Firewall"
-+msgstr "Središnja mrežna barijera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:23
-+msgid "Security appliance"
-+msgstr "Bezbednosna naprava"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:24
-+msgid "VPN Concentrator"
-+msgstr "VPN sakuplja�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:25
-+msgid "VPN Gateway"
-+msgstr "VPN mrežni prolaz"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:26
-+msgid "LAN to LAN"
-+msgstr "LAN na LAN"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:27
-+msgid "SSL Terminator"
-+msgstr "SSL okon�ava�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:28
-+msgid "IP DSL Switch"
-+msgstr "IP DSL prebaciva�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:29
-+msgid "DSLAM"
-+msgstr "DSLAM"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:30
-+msgid "Cable Modem"
-+msgstr "Kablovski modem"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:31
-+msgid "Wireless Connectivity"
-+msgstr "Beži�no povezivanje"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:32
-+msgid "Wireless Transport"
-+msgstr "Beži�ni prenos"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:33
-+msgid "AccessPoint"
-+msgstr "Pristupna ta�ka"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:34
-+msgid "Wireless Bridge"
-+msgstr "Beži�ni most"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:35
-+msgid "Dual Mode AccessPoint"
-+msgstr "Dvorežimska ta�ka pristupa"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:36
-+msgid "Wi-Fi Tag"
-+msgstr "Beži�na oznaka"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:37
-+msgid "Wireless Location Appliance"
-+msgstr "Naprava beži�nog mesta"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:38
-+msgid "Location server"
-+msgstr "Server lokacije"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:39
-+msgid "Lightweight AP"
-+msgstr "Lagani AP"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:40
-+msgid "WLAN controller"
-+msgstr "VLAN kontroler"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:41
-+msgid "BBFW"
-+msgstr "BBFV"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:42
-+msgid "BBFW media"
-+msgstr "BBFV medij"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
-+msgstr "Kanalisana spojka"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:44
-+msgid "Concatenated Payload"
-+msgstr "Nadovezani utovariva�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:45
-+msgid "Optical Cross-Connect"
-+msgstr "Opti�ki ukrsni spaja�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:46
-+msgid "Optical Transport"
-+msgstr "Opti�ki prenos"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:47
-+msgid "Optical Fiber"
-+msgstr "Opti�ko vlakno"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:48
-+msgid "Optical Amplifier"
-+msgstr "Opti�ki poja�iva�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:49
-+msgid "Digital Cross-Connect"
-+msgstr "Digitalni ukrsni spaja�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:50
-+msgid "IP Transport Concentrator"
-+msgstr "Sakuplja� IP prenosa"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:51
-+msgid "DWDM Filter"
-+msgstr "DVDM filter"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:52
-+msgid "WDM"
-+msgstr "VDM"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:53
-+msgid "15200"
-+msgstr "15200"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:54
-+msgid "15800"
-+msgstr "15800"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:55
-+msgid "ONS15104"
-+msgstr "ONS15104"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:56
-+msgid "10700"
-+msgstr "10700"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:57
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:58
-+msgid "ONS15540"
-+msgstr "ONS15540"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:59
-+msgid "Automatic Protection Switching"
-+msgstr "Samostalno prebacivanje zaštite"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:60
-+msgid "RPS"
-+msgstr "RPS"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:61
-+msgid "UPS"
-+msgstr "Izvor neprekidnog napajanja"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:62
-+msgid "LongReach CPE"
-+msgstr "Dugodometni CPE"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:63
-+msgid "3X74 (floor) cluster controller"
-+msgstr "3H74 (spratni) kontroler klastera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:64
-+msgid "3174 (desktop) cluster controller"
-+msgstr "3174 (stoni) kontroler klastera"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:65
-+msgid "CSU/DSU"
-+msgstr "CSU/DSU"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:66
-+msgid "WAN"
-+msgstr "VAN"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:67
-+msgid "Cloud"
-+msgstr "Oblak"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:68
-+msgid "Cloud Gold"
-+msgstr "Zlatni oblak"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:69
-+msgid "Cloud White"
-+msgstr "Beli oblak"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:70
-+msgid "Cloud Dark"
-+msgstr "Tamni oblak"
-+
-+#  Translators: Menu item Verb/Branch/Distribute
-+#: ../sheets/cisconetwork.sheet.in.h:71
-+msgid "Distributed Director"
-+msgstr "Raspodeljeni direktor"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:72
-+msgid "LocalDirector"
-+msgstr "Lokalni usmeriva�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:73
-+msgid "IOS SLB"
-+msgstr "IOS SLB"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:74
-+msgid "MUX"
-+msgstr "MUKs"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:75
-+msgid "General Appliance"
-+msgstr "Opšta naprava"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:76
-+msgid "PAD"
-+msgstr "PAD"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:77
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "CDDI/FDDI sakuplja�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:78
-+msgid "FDDI Ring"
-+msgstr "FDDI prsten"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:79
-+msgid "TokenRing"
-+msgstr "Prsten parice"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:80
-+msgid "MAU"
-+msgstr "MAU"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:81
-+msgid "Repeater"
-+msgstr "Ponavlja�"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:82
-+msgid "Bridge"
-+msgstr "Most"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:83
-+msgid "Breakout box"
-+msgstr "Kutija za iskakanje"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:84
-+msgid "STB (set top box)"
-+msgstr "STB (skup gornjih kutija)"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:85
-+msgid "TV"
-+msgstr "TV"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:86
-+msgid "IPTV broadcast server"
-+msgstr "Server IPTV emitovanja"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:87
-+msgid "IPTV content manager"
-+msgstr "Upravlja� IPTV sadržajem"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:88
-+msgid "VN2900"
-+msgstr "VN2900"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "VN5902"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:90
-+msgid "VN5900"
-+msgstr "VN5900"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:91
-+msgid "Catalyst Access Gateway"
-+msgstr "Katalisti�ki mrežni prolaz pristupa"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:92
-+msgid "Generic Gateway"
-+msgstr "Opšti mrežni prolaz"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:93
-+msgid "TransPath"
-+msgstr "Putanja prenosa"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:94
-+msgid "uBR910 Cable DSU"
-+msgstr "uBR910 kabal DSU"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:95
-+msgid "Storage Solution Engine"
-+msgstr "Sklop rešenja skladištenja"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:96
-+msgid "Content Engine (Cache Director)"
-+msgstr "Sistem sadržaja (upravljanje ostavom)"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:97
-+msgid "CDM Content Distribution Manager"
-+msgstr "CDM upravnik raspodele sadržaja"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:98
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "Sistem probražaja sadržaja (CTE)"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:99
-+msgid "ME 1100"
-+msgstr "ME 1100"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:100
-+msgid "MAS Gateway"
-+msgstr "MAS mrežni prolaz"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:101
-+msgid "File Engine"
-+msgstr "Pogon datoteke"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:102
-+msgid "Service Control"
-+msgstr "Kontrola usluga"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:1
-+msgid "Cisco - Telephony"
-+msgstr "Cisko — Telefonija"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:2
-+msgid "Telephony shapes by Cisco"
-+msgstr "Oblici za telefoniju od Ciskoa"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:3
-+msgid "Phone"
-+msgstr "Telefon"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:4
-+msgid "Phone 2"
-+msgstr "Telefon 2"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:5
-+msgid "Phone Ethernet"
-+msgstr "Eternet magistrala"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:6
-+msgid "Phone Appliance"
-+msgstr "Telefonska sprava"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:7
-+msgid "Phone Feature"
-+msgstr "Usluga telefoniranja"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:8
-+msgid "Phone/Fax"
-+msgstr "Telefon/faks"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:9
-+msgid "HootPhone"
-+msgstr "Hut telefon"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:10
-+msgid "IP Phone"
-+msgstr "IP telefon"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:11
-+msgid "IP Softphone"
-+msgstr "IP softverski telefon"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:12
-+msgid "Softphone"
-+msgstr "Softverski telefon"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:13
-+msgid "Cellular Phone"
-+msgstr "Mobilni telefon"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:14
-+msgid "Mobile Access IP Phone"
-+msgstr "IP telefon pokretnog pristupa"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:15
-+msgid "Pager"
-+msgstr "Pejdžer"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:16
-+msgid "Fax"
-+msgstr "Faks"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:17
-+msgid "Turret"
-+msgstr "Kula"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:18
-+msgid "Octel"
-+msgstr "Oktel"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:19
-+msgid "Radio Tower"
-+msgstr "Radio toranj"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:20
-+msgid "PBX"
-+msgstr "Telefonska centrala"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:21
-+msgid "PBX Switch"
-+msgstr "PBIks prebaciva�"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:22
-+msgid "Class 4/5 switch"
-+msgstr "Prebaciva� 4/5 razreda"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:23
-+msgid "SONET MUX"
-+msgstr "SONET MUKs"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:24
-+msgid "ADM"
-+msgstr "ADM"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:25
-+msgid "ITP"
-+msgstr "ITP"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:26
-+msgid "ATA"
-+msgstr "ATA"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:27
-+msgid "SIP Proxy Server"
-+msgstr "SIP server posrednik"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:28
-+msgid "Gatekeeper"
-+msgstr "ÄŒuvar kapije"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:29
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr "Glasovni mrežni prolaz MGIks 8000 serije"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:30
-+msgid "End Office"
-+msgstr "Krajnja kancelarija"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:31
-+msgid "Voice-Enabled Access Server"
-+msgstr "Glasovni server pristupa"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:32
-+msgid "Voice-Enabled Router"
-+msgstr "Glasovni usmerava�"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:33
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Glasovni ATM prebaciva�"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:34
-+msgid "CallManager"
-+msgstr "Upravlja� pozivom"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:35
-+msgid "IP Telephony Router"
-+msgstr "Usmeriva� za IP telefoniju"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:36
-+msgid "Mobile Access Router"
-+msgstr "Usmeriva� pokretnog pristupa"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:37
-+msgid "H.323"
-+msgstr "H.323"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:38
-+msgid "STP"
-+msgstr "STP"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:39
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:40
-+msgid "Generic softswitch"
-+msgstr "Obi�an softverski prebaciva�"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:41
-+msgid "SC2200/VSC3000 host"
-+msgstr "SC2200/VSC3000 ra�unar"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Upravlja� virtuelnog prebaciva�a (VSC 3000)"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:43
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "SC2200 (signalizirajući kontroler)"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:44
-+msgid "MoH server (Music on Hold)"
-+msgstr "MoH server (muzika zadržana)"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:45
-+msgid "TDM router"
-+msgstr "TDM usmeriva�"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:46
-+msgid "6701"
-+msgstr "6701"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:47
-+msgid "6705"
-+msgstr "6705"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:48
-+msgid "6732"
-+msgstr "6732"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:49
-+msgid "IAD router"
-+msgstr "IAD usmeriva�"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:50
-+msgid "ICS"
-+msgstr "ICS"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:51
-+msgid "ICM"
-+msgstr "ICM"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:52
-+msgid "IntelliSwitch Stack"
-+msgstr "Stek pametnog prebaciva�a"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:53
-+msgid "Unity server"
-+msgstr "Juniti server"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:54
-+msgid "Unity Express"
-+msgstr "Juniti ekspres"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:55
-+msgid "MCU"
-+msgstr "MCU"
-+
-+#: ../sheets/ciscotelephony.sheet.in.h:56
-+msgid "uMG series"
-+msgstr "uMG serija"
-+
-+#: ../sheets/civil.sheet.in.h:1
-+msgid "Civil"
-+msgstr "Građevinarstvo"
-+
-+#: ../sheets/civil.sheet.in.h:2
-+msgid "Civil Engineering Components"
-+msgstr "Sprave u građevinarstvu"
-+
-+#: ../sheets/civil.sheet.in.h:3
-+msgid "Vertical rest"
-+msgstr "Uspravni naslon"
-+
-+#: ../sheets/civil.sheet.in.h:4
-+msgid "Horizontal rest"
-+msgstr "Vodoravan naslon"
-+
-+#: ../sheets/civil.sheet.in.h:5
-+msgid "Bivalent vertical rest"
-+msgstr "Bivalentni uspravni naslon"
-+
-+#: ../sheets/civil.sheet.in.h:6
-+msgid "Reference line"
-+msgstr "Referentna linija"
-+
-+#: ../sheets/civil.sheet.in.h:7
-+msgid "Water level"
-+msgstr "Nivo vode"
-+
-+#: ../sheets/civil.sheet.in.h:8
-+msgid "Soil"
-+msgstr "Tlo"
-+
-+#: ../sheets/civil.sheet.in.h:9
-+msgid "Horizontally aligned arrow"
-+msgstr "Vodoravno postavljena strelica"
-+
-+#: ../sheets/civil.sheet.in.h:10
-+msgid "Vertically aligned arrow"
-+msgstr "Uspravno postavljena strelica"
-+
-+#: ../sheets/civil.sheet.in.h:11
-+msgid "Horizontal limiting line"
-+msgstr "Vodoravna ograni�avajuća linija"
-+
-+#: ../sheets/civil.sheet.in.h:12
-+msgid "Vertical limiting line"
-+msgstr "Uspravna ograni�avajuća linija"
-+
-+#: ../sheets/civil.sheet.in.h:13
-+msgid "Horizontally aligned pump"
-+msgstr "Vodoravno postavljena pumpa"
-+
-+#: ../sheets/civil.sheet.in.h:14
-+msgid "Vertically aligned pump"
-+msgstr "Uspravno postavljena pumpa"
-+
-+#: ../sheets/civil.sheet.in.h:15
-+msgid "Horizontally aligned compressor"
-+msgstr "Vodoravno postavljen kompresor"
-+
-+#: ../sheets/civil.sheet.in.h:16
-+msgid "Vertically aligned compressor"
-+msgstr "Uspravno postavljen kompresor"
-+
-+#: ../sheets/civil.sheet.in.h:17
-+msgid "Vertically aligned valve"
-+msgstr "Uspravno postavljen ventil"
-+
-+#: ../sheets/civil.sheet.in.h:18
-+msgid "Horizontally aligned valve"
-+msgstr "Vodoravno postavljen ventil"
-+
-+#: ../sheets/civil.sheet.in.h:19
-+msgid "Backflow preventer"
-+msgstr "Spre�ava� toka unazad"
-+
-+#: ../sheets/civil.sheet.in.h:20
-+msgid "Motor"
-+msgstr "Motor"
-+
-+#: ../sheets/civil.sheet.in.h:21
-+msgid "Gas bottle"
-+msgstr "Gasna boca"
-+
-+#: ../sheets/civil.sheet.in.h:22
-+msgid "Frequency converter"
-+msgstr "Pretvara� u�estanosti"
-+
-+#: ../sheets/civil.sheet.in.h:23
-+msgid "Vertically aligned propeller"
-+msgstr "Uspravno postavljen propeler"
-+
-+#: ../sheets/civil.sheet.in.h:24
-+msgid "Aerator with bubbles"
-+msgstr "Ventilacija sa mehurima"
-+
-+#: ../sheets/civil.sheet.in.h:25
-+msgid "Rotor"
-+msgstr "Rotor"
-+
-+#: ../sheets/civil.sheet.in.h:26
-+msgid "Final-settling basin"
-+msgstr "Kona�no-taložno korito"
-+
-+#: ../sheets/civil.sheet.in.h:27
-+msgid "Preliminary clarification tank"
-+msgstr "Probni sud za pre�išćavanje"
-+
-+#: ../sheets/civil.sheet.in.h:28
-+msgid "Basin"
-+msgstr "Korito"
-+
-+#: ../sheets/civil.sheet.in.h:29
-+msgid "Container"
-+msgstr "Sadržalac"
-+
-+#: ../sheets/jigsaw.sheet.in.h:1
-+msgid "Jigsaw"
-+msgstr "Slagalica"
-+
-+#: ../sheets/jigsaw.sheet.in.h:2
-+msgid "Pieces of a jigsaw"
-+msgstr "Delovi slagalice"
-+
-+#: ../sheets/jigsaw.sheet.in.h:3
-+msgid "Jigsaw - part_oioi"
-+msgstr "Slagalica — deo_oioi"
-+
-+#: ../sheets/jigsaw.sheet.in.h:4
-+msgid "Jigsaw - part_ioio"
-+msgstr "Slagalica — deo_ioio"
-+
-+#: ../sheets/jigsaw.sheet.in.h:5
-+msgid "Jigsaw - part_iiii"
-+msgstr "Slagalica — deo_iiii"
-+
-+#: ../sheets/jigsaw.sheet.in.h:6
-+msgid "Jigsaw - part_oooo"
-+msgstr "Slagalica — deo_oooo"
-+
-+#: ../sheets/jigsaw.sheet.in.h:7
-+msgid "Jigsaw - part_oooi"
-+msgstr "Slagalica — deo_oooi"
-+
-+#: ../sheets/jigsaw.sheet.in.h:8
-+msgid "Jigsaw - part_iooo"
-+msgstr "Slagalica — deo_iooo"
-+
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Slagalica — deo_oioo"
-+
-+#: ../sheets/jigsaw.sheet.in.h:10
-+msgid "Jigsaw - part_ooio"
-+msgstr "Slagalica — deo_ooio"
-+
-+#: ../sheets/jigsaw.sheet.in.h:11
-+msgid "Jigsaw - part_iioo"
-+msgstr "Slagalica — deo_iioo"
-+
-+#: ../sheets/jigsaw.sheet.in.h:12
-+msgid "Jigsaw - part_oiio"
-+msgstr "Slagalica — deo_oiio"
-+
-+#: ../sheets/jigsaw.sheet.in.h:13
-+msgid "Jigsaw - part_ooii"
-+msgstr "Slagalica — deo_ooii"
-+
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Slagalica — deo_iooi"
-+
-+#: ../sheets/jigsaw.sheet.in.h:15
-+msgid "Jigsaw - part_oiii"
-+msgstr "Slagalica — deo_oiii"
-+
-+#: ../sheets/jigsaw.sheet.in.h:16
-+msgid "Jigsaw - part_ioii"
-+msgstr "Slagalica — deo_ioii"
-+
-+#: ../sheets/jigsaw.sheet.in.h:17
-+msgid "Jigsaw - part_iioi"
-+msgstr "Slagalica — deo_iioi"
-+
-+#: ../sheets/jigsaw.sheet.in.h:18
-+msgid "Jigsaw - part_iiio"
-+msgstr "Slagalica — deo_iiio"
-+
-+#: ../sheets/network.sheet.in.h:2
-+msgid "Objects to design network diagrams with"
-+msgstr "Objekti sa kojima se izrađuju mrežni dijagrami"
-+
-+#: ../sheets/network.sheet.in.h:3
-+msgid "Computer"
-+msgstr "Ra�unar"
-+
-+#: ../sheets/network.sheet.in.h:5
-+msgid "Storage"
-+msgstr "Skladištenje"
-+
-+#: ../sheets/network.sheet.in.h:6
-+msgid "Ethernet bus"
-+msgstr "Eternet magistrala"
-+
-+#: ../sheets/network.sheet.in.h:7
-+msgid "Simple printer"
-+msgstr "Jednostavan štampa�"
-+
-+#: ../sheets/network.sheet.in.h:8
-+msgid "WAN connection"
-+msgstr "VAN veza"
-+
-+#: ../sheets/network.sheet.in.h:9
-+msgid "WAN link"
-+msgstr "VAN vezica"
-+
-+#: ../sheets/network.sheet.in.h:10
-+msgid "Stackable hub or switch"
-+msgstr "Otka�iv razvodnik ili prebaciva�"
-+
-+#: ../sheets/network.sheet.in.h:11
-+msgid "Modular switching system"
-+msgstr "Modularni sistem prebacivanja"
-+
-+#: ../sheets/network.sheet.in.h:12
-+msgid "24 Port Patch Panel"
-+msgstr "Panel umetka sa 24 priklju�aka"
-+
-+#: ../sheets/network.sheet.in.h:13
-+msgid "RJ45 wall-plug"
-+msgstr "RJ45 zidna uti�nica"
-+
-+#: ../sheets/network.sheet.in.h:14
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Zidna uti�nica za scEAD kablovski sistem"
-+
-+#: ../sheets/network.sheet.in.h:15
-+msgid "Simple modem"
-+msgstr "Jednostavan modem"
-+
-+#: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antena za beži�ni prenos"
-+
-+#: ../sheets/network.sheet.in.h:17
-+msgid "Mobile telephony base station"
-+msgstr "Bazna stanica mobilne telefonije"
-+
-+#: ../sheets/network.sheet.in.h:19
-+msgid "Mobile telephony cell"
-+msgstr "Jedinica mobilne telefonije"
-+
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Simbol usmeriva�a"
-+
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Simbol prebaciva�a"
-+
-+#: ../sheets/network.sheet.in.h:22
-+msgid "ATM switch symbol"
-+msgstr "Simbol ATM prebaciva�a"
-+
-+#: ../sheets/network.sheet.in.h:23
-+msgid "Firewall router"
-+msgstr "Usmeriva� mrežne barijere"
-+
-+#: ../sheets/network.sheet.in.h:24
-+msgid "Workstation monitor"
-+msgstr "Praćenje radne stanice"
-+
-+#: ../sheets/network.sheet.in.h:25
-+msgid "UNIX workstation"
-+msgstr "JUNIKS radna stanica"
-+
-+#: ../sheets/network.sheet.in.h:26
-+msgid "Desktop PC"
-+msgstr "Stoni li�ni ra�unar"
-+
-+#: ../sheets/network.sheet.in.h:27
-+msgid "Laptop PC"
-+msgstr "Prenosni ra�unar"
-+
-+#: ../sheets/network.sheet.in.h:28
-+msgid "Bigtower PC"
-+msgstr "Li�ni ra�unar u visokom kućištu"
-+
-+#: ../sheets/network.sheet.in.h:29
-+msgid "Miditower PC"
-+msgstr "Li�ni ra�unar u srednjem kućištu"
-+
-+#: ../sheets/network.sheet.in.h:30
-+msgid "Minitower PC"
-+msgstr "Li�ni ra�unar u malom kućištu"
-+
-+#: ../sheets/network.sheet.in.h:31
-+msgid "Speaker with integrated amplifier"
-+msgstr "Zvu�nik sa ugrađenim poja�alom"
-+
-+#: ../sheets/network.sheet.in.h:32
-+msgid "Speaker without amplifier"
-+msgstr "Zvu�nik bez poja�ala"
-+
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "3,5 in�na disketa"
-+
-+#: ../sheets/network.sheet.in.h:34
-+msgid "ZIP disk"
-+msgstr "ZIP disk"
-+
-+#: ../sheets/network.sheet.in.h:35
-+msgid "External DAT drive"
-+msgstr "Spoljni DAT uređaj"
-+
-+#: ../sheets/network.sheet.in.h:36
-+msgid "Mobile phone"
-+msgstr "Mobilni telefon"
-+
-+#: ../sheets/network.sheet.in.h:38
-+msgid "Plotter"
-+msgstr "Crta�"
-+
-+#: ../sheets/network.sheet.in.h:39
-+msgid "Digitizing board"
-+msgstr "Tabla za digitalizaciju"
-+
-+#: ../sheets/sybase.sheet.in.h:1
-+msgid "Sybase"
-+msgstr "Sibejz"
-+
-+#: ../sheets/sybase.sheet.in.h:2
-+msgid "Objects to design Sybase replication domain diagrams with"
-+msgstr "Objekti za izradu grafikona za replikacioni domen Sibejza"
-+
-+#: ../sheets/sybase.sheet.in.h:3
-+msgid "Sybase dataserver"
-+msgstr "Sibejzov server podataka"
-+
-+#: ../sheets/sybase.sheet.in.h:4
-+msgid "Sybase replication server"
-+msgstr "Sibejzov replikacioni server"
-+
-+#: ../sheets/sybase.sheet.in.h:5
-+msgid "Log transfer manager or rep agent"
-+msgstr "Prati upravnika prenosom ili predstavnika"
-+
-+#: ../sheets/sybase.sheet.in.h:6
-+msgid "Stable storage device"
-+msgstr "Stabilni uređaj za skladištenje"
-+
-+#: ../sheets/sybase.sheet.in.h:7
-+msgid "Sybase client application"
-+msgstr "Sibejzov program klijenta"
-+
-+#: ../sheets/sybase.sheet.in.h:8
-+msgid "Replication server manager"
-+msgstr "Upravnik replikacionim serverom"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0012-Cleanup-check-for-X11-forward-to-XQuartz-homepage-if.patch b/graphics/dia/patches/0012-Cleanup-check-for-X11-forward-to-XQuartz-homepage-if.patch
deleted file mode 100644
index 4faabf1dde..0000000000
--- a/graphics/dia/patches/0012-Cleanup-check-for-X11-forward-to-XQuartz-homepage-if.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 3651abfeed6a500dde7ce8ed389ff0c954faff99 Mon Sep 17 00:00:00 2001
-From: Steffen Macke <sdteffen@sdteffen.de>
-Date: Tue, 2 Jul 2013 12:35:44 +0200
-Subject: [PATCH 12/24] Cleanup, check for X11, forward to XQuartz homepage, if
- necessary.
-
----
- installer/macosx/dia | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 49 insertions(+), 1 deletion(-)
-
-diff --git a/installer/macosx/dia b/installer/macosx/dia
-index 2b5be21..5b27386 100755
---- a/installer/macosx/dia
-+++ b/installer/macosx/dia
-@@ -23,6 +23,17 @@ TOP="`dirname \"$CWD\"`"
- #	LaTeX distribution for Mac OS X
- #export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH"
- 
-+# Check for X11
-+if [[ "" == `which startx` ]]; then
-+ if [[ ! -e /opt/X11/bin/startx ]]; then
-+   osascript -e 'tell app "System Events" to display dialog "X11 (XQuartz) is not installed or not running. Would you like to visit xquartz.macosforge.org now in order to download and install XQuartz?" with icon 0'
-+   if [[ $? -eq 0 ]]; then
-+     open http://xquartz.macosforge.org
-+     exit
-+   fi
-+  fi
-+fi
-+
- # Setup PYTHONPATH to use python modules shipped with Dia
- ARCH=`arch`
- PYTHON_VERS=`python -V 2>&1 | cut -c 8-10`
-@@ -37,7 +48,8 @@ export DIA_LIB_PATH="$TOP/dia"
- export DIA_SHEET_PATH="$TOP/sheets"
- export DIA_SHAPE_PATH="$TOP/shapes"
- export DIA_XSLT_PATH="$TOP/xslt"
--export DIA_LOCALE_PATH="$TOP/locale"
-+export DIA_SHAREDIR="$TOP"
-+export DIA_LOCALE_PATH="$TOP/share/locale"
- 
- mkdir -p "${HOME}/.dia-etc"
- 
-@@ -54,6 +66,42 @@ export XDG_DATA_DIRS="$TOP/share"
- # various configuration files.
- ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
- 
-+# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
-+if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
-+	# Appearance setting
-+	aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant 2>/dev/null`
-+	# 1 for aqua, 6 for graphite, inexistant if the default color was never changed
-+	if [[ "$aquaStyle" == "" ]]; then
-+		aquaStyle=1		# set aqua as default
-+	fi
-+
-+	# Highlight Color setting
-+	hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor 2>/dev/null`
-+	# a RGB value, with components between 0 and 1, also inexistant if it was not changed
-+	if [[ "$hiliColor" == "" ]]; then
-+		hiliColor="0.709800 0.835300 1.000000"	# set blue as default
-+	fi
-+
-+	# Menu items color
-+	if [[ aquaStyle -eq 1 ]]; then
-+		menuColor="#4a76cd"	# blue
-+	else
-+		menuColor="#7c8da4"	# graphite
-+	fi
-+	# Format highlight color as a GTK rgb value
-+	hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'`
-+
-+	# echo $menuColor
-+	# echo $hiliColorFormated
-+
-+	# Modify the gtkrc
-+	#	- with the correct colors
-+	#	- to point to the correct scrollbars folder
-+	sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$DIA_SHAREDIR/themes/CL/gtk-2.0/pre_gtkrc" | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' | sed 's|${THEMEDIR}|'"$ESCAPEDTOP/themes/CL/gtk-2.0|g" > "${HOME}/.dia-etc/gtkrc"
-+
-+	export GTK2_RC_FILES="$HOME/.dia-etc/gtkrc"
-+fi
-+
- # If the AppleCollationOrder preference doesn't exist, we fall back to using
- # the AppleLocale preference.
- LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0013-Made-XQuartz-interaction-more-robust.patch b/graphics/dia/patches/0013-Made-XQuartz-interaction-more-robust.patch
deleted file mode 100644
index f6e94044d3..0000000000
--- a/graphics/dia/patches/0013-Made-XQuartz-interaction-more-robust.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5f85d269123d99d88a261d5dd775a80ef71ef76d Mon Sep 17 00:00:00 2001
-From: Steffen Macke <sdteffen@sdteffen.de>
-Date: Wed, 3 Jul 2013 09:19:26 +0200
-Subject: [PATCH 13/24] Made XQuartz interaction more robust.
-
----
- installer/macosx/dia | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/installer/macosx/dia b/installer/macosx/dia
-index 5b27386..61a676f 100755
---- a/installer/macosx/dia
-+++ b/installer/macosx/dia
-@@ -1,10 +1,10 @@
- #!/bin/sh
- #
- # Author: Aaron Voisine <aaron@voisine.org>
--# Dia Modifications:
-+# Modifications:
- #	Michael Wybrow <mjwybrow@users.sourceforge.net>
- #	Jean-Olivier Irisson <jo.irisson@gmail.com>
--#
-+#       Steffen Macke <sdteffen@sdteffen.de>
- 
- CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`"
- # e.g. /Applications/Dia.app/Contents/Resources/bin
-@@ -24,7 +24,11 @@ TOP="`dirname \"$CWD\"`"
- #export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH"
- 
- # Check for X11
--if [[ "" == `which startx` ]]; then
-+if [[ "" == $DISPLAY ]]; then
-+  export DISPLAY=:0
-+fi
-+startx=`which startx`
-+if [[ "" == $startx ]]; then
-  if [[ ! -e /opt/X11/bin/startx ]]; then
-    osascript -e 'tell app "System Events" to display dialog "X11 (XQuartz) is not installed or not running. Would you like to visit xquartz.macosforge.org now in order to download and install XQuartz?" with icon 0'
-    if [[ $? -eq 0 ]]; then
-@@ -33,6 +37,17 @@ if [[ "" == `which startx` ]]; then
-    fi
-   fi
- fi
-+osascript -e 'tell app "XQuartz" to launch'
-+for i in `seq 1 30`; do
-+  if [[ `ps aux | grep -v grep | grep startx | wc -l` -lt 1 ]]; then
-+    sleep 1
-+  fi
-+done
-+if [[ "$DISPLAY" =~ "/tmp" ]]; then
-+  if [[ ! -e $DISPLAY ]]; then
-+    export DISPLAY=:0
-+  fi
-+fi 
- 
- # Setup PYTHONPATH to use python modules shipped with Dia
- ARCH=`arch`
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0014-Bug-694025-GLib-drop-support-for-adding-interfaces-a.patch b/graphics/dia/patches/0014-Bug-694025-GLib-drop-support-for-adding-interfaces-a.patch
deleted file mode 100644
index 83121e3c8c..0000000000
--- a/graphics/dia/patches/0014-Bug-694025-GLib-drop-support-for-adding-interfaces-a.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Sat, 16 Mar 2013 17:56:58 +0100
-Subject: [PATCH 14/24] Bug 694025 - GLib drop support for adding interfaces
- after class_init
-
-Without this Dia crashes at startup with new GLib version and the
-DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which
-follows the pattern also used for DiaCairoInteraciveRenderer. This should
-be functional equivalent to what was there before and should work for all
-current GLib versions.
-
-(cherry picked from commit 213bdfe956bf8fe57c86316f68a09408fef1647e)
----
- app/render_gdk.c | 60 ++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 37 insertions(+), 23 deletions(-)
-
-diff --git a/app/render_gdk.c b/app/render_gdk.c
-index 60ccb7a..b1e7ba4 100644
---- a/app/render_gdk.c
-+++ b/app/render_gdk.c
-@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer *renderer,
-                 gpointer window,
-                 int x, int y, int width, int height);
- 
--static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-+typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
-+struct _DiaGdkInteractiveRenderer
-+{
-+  DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */
-+};
-+typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
-+struct _DiaGdkInteractiveRendererClass
-+{
-+  DiaGdkRendererClass parent_class; /*!< the base class */
-+};
-+#define DIA_TYPE_GDK_INTERACTIVE_RENDERER           (dia_gdk_interactive_renderer_get_type ())
-+#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
-+
-+static void
-+dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
- {
-   iface->clip_region_clear = clip_region_clear;
-   iface->clip_region_add_rect = clip_region_add_rect;
-@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-   iface->set_size = set_size;
- }
- 
-+G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
-+			 G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
-+
-+static void
-+dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
-+{
-+}
-+static void
-+dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
-+{
-+  DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object);
-+  DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
-+  DiaRenderer *dia_renderer = DIA_RENDERER(object);
-+  
-+  dia_renderer->is_interactive = 1;
-+
-+  renderer->gc = NULL;
-+  renderer->pixmap = NULL;
-+  renderer->clip_region = NULL;
-+}
-+
- DiaRenderer *
- new_gdk_renderer(DDisplay *ddisp)
- {
-   DiaGdkRenderer *renderer;
-   GType renderer_type = 0;
- 
--  renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
-+  renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
-   renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor);
--  if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
--    {
--      static const GInterfaceInfo irenderer_iface_info = 
--      {
--        (GInterfaceInitFunc) dia_gdk_renderer_iface_init,
--        NULL,           /* iface_finalize */
--        NULL            /* iface_data     */
--      };
--
--      renderer_type = DIA_TYPE_GDK_RENDERER;
--      /* register the interactive renderer interface */
--      g_type_add_interface_static (renderer_type,
--                                   DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
--                                   &irenderer_iface_info);
--
--    }
--  renderer->parent_instance.is_interactive = 1;
--  renderer->gc = NULL;
--
--  renderer->pixmap = NULL;
--  renderer->clip_region = NULL;
- 
-   return DIA_RENDERER(renderer);
- }
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0015-Fix-assumption-that-table-prop_dialog-is-always-vali.patch b/graphics/dia/patches/0015-Fix-assumption-that-table-prop_dialog-is-always-vali.patch
deleted file mode 100644
index 73694c7d7d..0000000000
--- a/graphics/dia/patches/0015-Fix-assumption-that-table-prop_dialog-is-always-vali.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8fd585ca493d7d52f2af866cd9ce6e064da6bf15 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Fri, 16 Aug 2013 13:33:42 +0200
-Subject: [PATCH 15/24] Fix assumption that table->prop_dialog is always valid
-
-Not sure how I made it crash, but this extra safety measure
-should not hurt in any case.
----
- objects/Database/table_dialog.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/objects/Database/table_dialog.c b/objects/Database/table_dialog.c
-index 038f8de..a17cead 100644
---- a/objects/Database/table_dialog.c
-+++ b/objects/Database/table_dialog.c
-@@ -269,7 +269,8 @@ table_state_set (TableState * state, Table * table)
-   table_compute_width_height (table);
-   table_update_positions (table);
- 
--  gtk_list_clear_items (table->prop_dialog->attributes_list, 0, -1);
-+  if (table->prop_dialog)
-+    gtk_list_clear_items (table->prop_dialog->attributes_list, 0, -1);
- }
- 
- static void
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0016-Bug-672190-Inputs-Methods-don-t-work-in-integrated-m.patch b/graphics/dia/patches/0016-Bug-672190-Inputs-Methods-don-t-work-in-integrated-m.patch
deleted file mode 100644
index f829608279..0000000000
--- a/graphics/dia/patches/0016-Bug-672190-Inputs-Methods-don-t-work-in-integrated-m.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2661a641b53899e994c15195057a8fe3c16becf4 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Fri, 16 Aug 2013 14:01:26 +0200
-Subject: [PATCH 16/24] Bug 672190 - Inputs Methods don't work in integrated
- mode
-
-Connect im-related signals also to the integrated UI canvas
----
- app/interface.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/app/interface.c b/app/interface.c
-index dc0bb63..36b9e15 100644
---- a/app/interface.c
-+++ b/app/interface.c
-@@ -561,6 +561,19 @@ use_integrated_ui_for_display_shell(DDisplay *ddisp, char *title)
-                          GDK_POINTER_MOTION_HINT_MASK |
-                          GDK_FOCUS_CHANGE_MASK);
- 
-+  g_signal_connect (GTK_OBJECT (ddisp->container), "focus_out_event",
-+		    G_CALLBACK (ddisplay_focus_out_event),
-+		      ddisp);
-+  g_signal_connect (GTK_OBJECT (ddisp->container), "focus_in_event",
-+		    G_CALLBACK (ddisplay_focus_in_event),
-+		      ddisp);
-+  g_signal_connect (GTK_OBJECT (ddisp->container), "realize",
-+		    G_CALLBACK (ddisplay_realize),
-+                      ddisp);
-+  g_signal_connect (GTK_OBJECT (ddisp->container), "unrealize",
-+		    G_CALLBACK (ddisplay_unrealize),
-+		      ddisp);
-+
-   notebook_page_index = gtk_notebook_append_page (GTK_NOTEBOOK(ui.diagram_notebook),
-                                                   ddisp->container,
-                                                   tab_label_container);
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0017-Bug-660574-Avoid-cairo-going-into-an-endless-loop-wi.patch b/graphics/dia/patches/0017-Bug-660574-Avoid-cairo-going-into-an-endless-loop-wi.patch
deleted file mode 100644
index 04090c267e..0000000000
--- a/graphics/dia/patches/0017-Bug-660574-Avoid-cairo-going-into-an-endless-loop-wi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From eb4e80afe3f25b1d91f00bdd8dbf67e38adad1f8 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Fri, 16 Aug 2013 15:21:16 +0200
-Subject: [PATCH 17/24] Bug 660574 - Avoid cairo going into an endless loop
- with too small arcs
-
-this should fix the issue with SADT flow arrow, although I could not reproduce it.
----
- plug-ins/cairo/diacairo-renderer.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/plug-ins/cairo/diacairo-renderer.c b/plug-ins/cairo/diacairo-renderer.c
-index cd13247..137411e 100644
---- a/plug-ins/cairo/diacairo-renderer.c
-+++ b/plug-ins/cairo/diacairo-renderer.c
-@@ -499,6 +499,7 @@ draw_arc(DiaRenderer *self,
-   DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (self);
-   Point start;
-   double a1, a2;
-+  real onedu = 0.0;
- 
-   DIAG_NOTE(g_message("draw_arc %fx%f <%f,<%f", 
-             width, height, angle1, angle2));
-@@ -515,9 +516,12 @@ draw_arc(DiaRenderer *self,
-   a1 = - (angle1 / 180.0) * G_PI;
-   a2 = - (angle2 / 180.0) * G_PI;
-   /* FIXME: to handle width != height some cairo_scale/cairo_translate would be needed */
--  cairo_arc_negative (renderer->cr, center->x, center->y, 
--                      width > height ? height / 2.0 : width / 2.0, /* FIXME 2nd radius */
--                      a1, a2);
-+  ensure_minimum_one_device_unit (renderer, &onedu);
-+  /* FIXME2: with too small arcs cairo goes into an endless loop */
-+  if (height/2.0 > onedu && width/2.0 > onedu)
-+    cairo_arc_negative (renderer->cr, center->x, center->y, 
-+                        width > height ? height / 2.0 : width / 2.0, /* FIXME 2nd radius */
-+                        a1, a2);
-   cairo_stroke (renderer->cr);
-   DIAG_STATE(renderer->cr)
- }
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0018-Bug-683700-vdx-full-of-errors.patch b/graphics/dia/patches/0018-Bug-683700-vdx-full-of-errors.patch
deleted file mode 100644
index 550bc62262..0000000000
--- a/graphics/dia/patches/0018-Bug-683700-vdx-full-of-errors.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 61431fec37ed855db7284c6737cb3777577cc904 Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Fri, 16 Aug 2013 20:54:12 +0200
-Subject: [PATCH 18/24] Bug 683700 - vdx full of errors
-
-Ensure message_error strings are linefeed-terminated.
-Plus fixes merged from master:
-
-cairo: don't screw cairo's matrix by scaling with 0
-Seen with the VDX attached to bug 683700 - maybe there is also something wrong with the import?
-
-vdx: UTF-8 safe variant to remove last newline
-With the VDX attached to bug 683700 scrambled text appeared. Now corrected with the UTF-8 safe variant to search and replace "\n".
----
- plug-ins/cairo/diacairo-renderer.c | 23 ++++++-----------------
- plug-ins/vdx/vdx-import.c          | 21 +++++++++++++++++++--
- plug-ins/vdx/vdx-xml.c             |  2 +-
- 3 files changed, 26 insertions(+), 20 deletions(-)
-
-diff --git a/plug-ins/cairo/diacairo-renderer.c b/plug-ins/cairo/diacairo-renderer.c
-index 137411e..57f6184 100644
---- a/plug-ins/cairo/diacairo-renderer.c
-+++ b/plug-ins/cairo/diacairo-renderer.c
-@@ -572,9 +572,14 @@ _ellipse(DiaRenderer *self,
-   DIAG_NOTE(g_message("%s_ellipse %fx%f center @ %f,%f", 
-             fill ? "fill" : "draw", width, height, center->x, center->y));
- 
-+  /* avoid screwing cairo context - I'd say restore should fix it again, but it doesn't
-+   * (dia.exe:3152): DiaCairo-WARNING **: diacairo-renderer.c:254, invalid matrix (not invertible)
-+   */
-+  if (!(width > 0. && height > 0.))
-+    return;
-+
-   cairo_set_source_rgba (renderer->cr, color->red, color->green, color->blue, 1.0);
-   
--#if 1
-   cairo_save (renderer->cr);
-   /* don't create a line from the current point to the beginning 
-    * of the ellipse */
-@@ -584,22 +589,6 @@ _ellipse(DiaRenderer *self,
-   cairo_scale (renderer->cr, width / 2., height / 2.);
-   cairo_arc (renderer->cr, 0., 0., 1., 0., 2 * G_PI);
-   cairo_restore (renderer->cr);
--#else
--  /* FIXME: how to make a perfect ellipse from a bezier ? */
--  co = sqrt(pow(width,2)/4 + pow(height,2)/4);
--
--  cairo_new_path (renderer->cr);
--  cairo_move_to (renderer->cr,
--                 center->x, center->y - height/2);
--  cairo_curve_to (renderer->cr,
--                  center->x + co, center->y - height/2,
--                  center->x + co, center->y + height/2,
--                  center->x, center->y + height/2);
--  cairo_curve_to (renderer->cr,
--                  center->x - co, center->y + height/2,
--                  center->x - co, center->y - height/2,
--                  center->x, center->y - height/2);
--#endif
- 
-   if (fill)
-     cairo_fill (renderer->cr);
-diff --git a/plug-ins/vdx/vdx-import.c b/plug-ins/vdx/vdx-import.c
-index ffefa58..7da0c05 100644
---- a/plug-ins/vdx/vdx-import.c
-+++ b/plug-ins/vdx/vdx-import.c
-@@ -1737,7 +1737,7 @@ plot_nurbs(const struct vdx_Geom *Geom, const struct vdx_XForm *XForm,
-         }
-         if (n % 4 || ! n)
-         {
--            message_error(_("Invalid NURBS formula"));
-+            message_error(_("Invalid NURBS formula\n"));
-             g_debug("Invalid NURBS formula");
-             return 0;
-         }
-@@ -2066,7 +2066,7 @@ plot_image(const struct vdx_Geom *Geom, const struct vdx_XForm *XForm,
-         }
-         else
-         {
--            message_error(_("Couldn't handle foreign object type %s"),
-+            message_error(_("Couldn't handle foreign object type %s\n"),
-                           ForeignData->ForeignType ? ForeignData->ForeignType
-                           : "Unknown");
-             return 0;
-@@ -2398,12 +2398,29 @@ plot_text(const struct vdx_Text *Text, const struct vdx_XForm *XForm,
-         }
-     }
- 
-+#if 0 /* this is not utf-8 safe - see bug 683700 */ 
-     /* Remove trailing line breaks */
-     while (tprop->text_data[0] &&
-            isspace(tprop->text_data[strlen(tprop->text_data)-1]))
-     {
-         tprop->text_data[strlen(tprop->text_data)-1] = 0;
-     }
-+#else
-+    {
-+        char *s = tprop->text_data;
-+        char *srep = NULL;
-+        while ( (s = g_utf8_strchr(s, -1, '\n')) != NULL ) {
-+            srep = s;
-+            s = g_utf8_next_char(s);
-+            if (*s)
-+                srep = NULL;
-+            else
-+                break;
-+        }
-+        if (srep)
-+            *srep = '\0';
-+    }
-+#endif
- 
-     /* Other standard text properties */
-     tprop->attr.alignment = alignment;
-diff --git a/plug-ins/vdx/vdx-xml.c b/plug-ins/vdx/vdx-xml.c
-index 1fdac65..1c9567d 100644
---- a/plug-ins/vdx/vdx-xml.c
-+++ b/plug-ins/vdx/vdx-xml.c
-@@ -3341,7 +3341,7 @@ vdx_read_object(xmlNodePtr cur, VDXDocument *theDoc, void *p)
-         return s;
-     }
- 
--    message_error(_("Can't decode object %s"), (char*)cur->name);
-+    message_error(_("Can't decode object %s\n"), (char*)cur->name);
-     return 0;
- }
- 
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch b/graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch
deleted file mode 100644
index 1389cb7659..0000000000
--- a/graphics/dia/patches/0019-Bug-667500-Avoid-r-syntax-for-NSIS-line-breaks-to-av.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 665c12145d6d236992d213c73b78e2f1846f6def Mon Sep 17 00:00:00 2001
-From: Steffen Macke <sdteffen@sdteffen.de>
-Date: Fri, 16 Aug 2013 21:50:50 +0200
-Subject: [PATCH 19/24] Bug #667500 - Avoid $\r syntax for NSIS line breaks to
- avoid POEdit confusion
-
----
- installer/win32/Makefile.am |  2 ++
- installer/win32/gennsh.c    | 24 ++++++++++++++++--------
- 2 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/installer/win32/Makefile.am b/installer/win32/Makefile.am
-index f715f7e..3335fb1 100644
---- a/installer/win32/Makefile.am
-+++ b/installer/win32/Makefile.am
-@@ -1,4 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-+## Manually build gennsh on Linux:
-+## gcc `pkg-config --cflags glib-2.0` -o gennsh gennsh.c
- 
- SUBDIRS = locale
- 
-diff --git a/installer/win32/gennsh.c b/installer/win32/gennsh.c
-index d6603b5..fa48d16 100755
---- a/installer/win32/gennsh.c
-+++ b/installer/win32/gennsh.c
-@@ -2,7 +2,7 @@
-  * Copyright (C) 1998 Alexander Larsson
-  *
-  * gennsh.c
-- * Copyright (C) 2009,2011 Steffen Macke <sdteffen@sdteffen.de>
-+ * Copyright (C) 2009,2011,2013 Steffen Macke <sdteffen@sdteffen.de>
-  *
-  * gennsh is a program that allows to generate locale file for the
-  * Dia for Windows installer
-@@ -71,14 +71,22 @@ int main(int argc, char *argv[])
-   /* Installer message: Dia uninstaller entry in Control Panel */
-   printf("!define DIA_UNINSTALL_DESC \"%s\"\n", _("Dia (remove only)"));
- 
--  /* Installer message: confirmation question. Keep $\r */
--  printf("!define DIA_PROMPT_WIPEOUT \"%s\"\n", g_strescape(_("Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."), ""));
-+  /* Installer message: directory delete confirmation line 1 */
-+  printf("!define DIA_PROMPT_WIPEOUT \"%s$\\r$\\r%s$\\r%s\"\n", _("Your old Dia directory is about to be deleted. Would you like to continue?"),
-+	/* Installer message: directory delete confirmation line 2 */
-+	 _("Note: Any non-standard plugins that you may have installed will be deleted."),
-+	/* Installer message: directory delete confirmation line 3*/
-+	_("Dia user settings will not be affected."));
- 
--  /* Installer message: confirmatin question. Keep $\r */
--  printf("!define DIA_PROMPT_DIR_EXISTS \"%s\"\n", g_strescape(_("The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"), ""));
-+  /* Installer message: DIA_PROMPT_DIR_EXISTS line 1 */
-+  printf("!define DIA_PROMPT_DIR_EXISTS \"%s$\\r%s\"\n", _("The installation directory you specified already exists. Any contents"),
-+	/* Installer message: DIA_PROMP_DIR_EXISTS line 2 */
-+	_("will be deleted. Would you like to continue?"));
- 
--  /* Installer message: Uninstall Section Prompts. Keep $\r */
--  printf("!define un.DIA_UNINSTALL_ERROR_1 \"%s\"\n", g_strescape(_("The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."), ""));
-+  /* Installer message: registry entries not found line 1 */
-+  printf("!define un.DIA_UNINSTALL_ERROR_1 \"%s$\\r%s\"\n", _("The uninstaller could not find registry entries for Dia."),
-+	/* Installer message: registry entries not found line 2 */
-+	_("It is likely that another user installed this application."));
- 
-   /* Installer message: Uninstall error message */
-   printf("!define un.DIA_UNINSTALL_ERROR_2 \"%s\"\n", _("You do not have permission to uninstall this application."));
-@@ -87,6 +95,6 @@ int main(int argc, char *argv[])
-   printf("!define un.DIA_UNINSTALLATION_WARNING \"%s\"\n", _("This will completely delete $INSTDIR and all subdirectories. Continue?"));
- 
-   /* Installer message: Uninstallation warning. Keep $\PROFILE\.dia */
--  printf("!define un.DIA_DOTDIA_WARNING \"%s\"\n", _("This will completely delete $PROFILE\.dia and all subdirectories. Continue?"));
-+  printf("!define un.DIA_DOTDIA_WARNING \"%s\"\n", _("This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"));
-   return 0;
- }
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0020-Fixed-black-light-shape-reference.patch b/graphics/dia/patches/0020-Fixed-black-light-shape-reference.patch
deleted file mode 100644
index ed5a5e0a8c..0000000000
--- a/graphics/dia/patches/0020-Fixed-black-light-shape-reference.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 82c2287bfc61012ac2fbba0a7c8d359048f09b92 Mon Sep 17 00:00:00 2001
-From: Steffen Macke <sdteffen@sdteffen.de>
-Date: Sun, 18 Aug 2013 13:22:35 +0200
-Subject: [PATCH 20/24] Fixed black light shape reference.
-
----
- sheets/Lights.sheet.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sheets/Lights.sheet.in b/sheets/Lights.sheet.in
-index a246043..4613fa1 100644
---- a/sheets/Lights.sheet.in
-+++ b/sheets/Lights.sheet.in
-@@ -28,7 +28,7 @@
-       <_description>Blinders</_description>
-     </object>
-     <br/>
--    <object name="Lights - Black light">
-+    <object name="Lights - Blacklight">
-       <_description>Black light</_description>
-     </object>
-     <object name="Lights - Stroboscope">
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0022-Updated-Slovenian-translation.patch b/graphics/dia/patches/0022-Updated-Slovenian-translation.patch
deleted file mode 100644
index f5edd1f97b..0000000000
--- a/graphics/dia/patches/0022-Updated-Slovenian-translation.patch
+++ /dev/null
@@ -1,9245 +0,0 @@
-From d04d20b8ced245b77ee5e9cac00d828950bab052 Mon Sep 17 00:00:00 2001
-From: Martin Srebotnjak <miles@filmsi.net>
-Date: Thu, 12 Sep 2013 20:30:02 +0200
-Subject: [PATCH 22/24] Updated Slovenian translation
-
----
- po/sl.po | 5494 +++++++++++++++++++++++++++++---------------------------------
- 1 file changed, 2610 insertions(+), 2884 deletions(-)
-
-diff --git a/po/sl.po b/po/sl.po
-index f058282..9be69ee 100644
---- a/po/sl.po
-+++ b/po/sl.po
-@@ -8,18 +8,20 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: dia\n"
--"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dia&keywords=I18N+L10N&component=general\n"
--"POT-Creation-Date: 2011-04-03 17:30+0000\n"
--"PO-Revision-Date: 2011-08-28 16:09+0100\n"
--"Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
-+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-+"product=dia&keywords=I18N+L10N&component=general\n"
-+"POT-Creation-Date: 2013-08-21 12:23+0000\n"
-+"PO-Revision-Date: 2013-09-11 23:26+0100\n"
-+"Last-Translator: filmsi <miles@filmsi.net>\n"
- "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
-+"Language: sl_SI\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
--"X-Poedit-Language: Slovenian\n"
--"X-Poedit-Country: SLOVENIA\n"
-+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-+"%100==4 ? 3 : 0);\n"
- "X-Poedit-SourceCharset: utf-8\n"
-+"X-Generator: Poedit 1.5.7\n"
- 
- #. This is not an errror
- #: ../app/app_procs.c:209
-@@ -108,8 +110,12 @@ msgid "WxH"
- msgstr "Å xV"
- 
- #: ../app/app_procs.c:726
--msgid "Show only specified layers (e.g. when exporting). Can be either the layer name or a range of layer numbers (X-Y)"
--msgstr "Pokaži le navedene plasti (npr. pri izvozu). To je lahko ime plasti ali obseg številk plasti (X-Y)"
-+msgid ""
-+"Show only specified layers (e.g. when exporting). Can be either the layer "
-+"name or a range of layer numbers (X-Y)"
-+msgstr ""
-+"Pokaži le navedene plasti (npr. pri izvozu). To je lahko ime plasti ali "
-+"obseg Å¡tevilk plasti (X-Y)"
- 
- #: ../app/app_procs.c:727
- msgid "LAYER,LAYER,..."
-@@ -129,14 +135,14 @@ msgstr "Zaženi integrirani uporabniški vmesnik (diagrami v zavihkih)"
- 
- #: ../app/app_procs.c:735
- msgid "Send error messages to stderr instead of showing dialogs."
--msgstr "Sporo�ila o napaki pošlji na stderr namesto prikaza v pogovornih oknih."
-+msgstr ""
-+"Sporo�ila o napaki pošlji na stderr namesto prikaza v pogovornih oknih."
- 
- #: ../app/app_procs.c:737
- msgid "Directory containing input files"
- msgstr "Mapa, ki vsebuje vhodne datoteke"
- 
--#: ../app/app_procs.c:737
--#: ../app/app_procs.c:739
-+#: ../app/app_procs.c:737 ../app/app_procs.c:739
- msgid "DIRECTORY"
- msgstr "MAPA"
- 
-@@ -191,13 +197,20 @@ msgid "Dia version %s\n"
- msgstr "Dia razli�ice %s\n"
- 
- #: ../app/app_procs.c:921
--msgid "Couldn't find standard objects when looking for object-libs; exiting...\n"
--msgstr "Pri iskanju knjižnic predmetov ni bilo mogo�e najti navadnih premetov; sledi izhod ...\n"
-+msgid ""
-+"Couldn't find standard objects when looking for object-libs; exiting...\n"
-+msgstr ""
-+"Pri iskanju knjižnic predmetov ni bilo mogo�e najti navadnih premetov; sledi "
-+"izhod ...\n"
- 
- #: ../app/app_procs.c:923
- #, c-format
--msgid "Couldn't find standard objects when looking for object-libs in '%s'; exiting...\n"
--msgstr "Pri iskanju knjižnic predmetov v '%s' ni bilo mogo�e najti navadnih premetov; sledi izhod ...\n"
-+msgid ""
-+"Couldn't find standard objects when looking for object-libs in '%s'; "
-+"exiting...\n"
-+msgstr ""
-+"Pri iskanju knjižnic predmetov v '%s' ni bilo mogo�e najti navadnih "
-+"premetov; sledi izhod ...\n"
- 
- #: ../app/app_procs.c:990
- msgid "Diagram1.dia"
-@@ -208,7 +221,8 @@ msgid ""
- "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
- "describing how you can cause this message to appear.\n"
- msgstr ""
--"To se ne bi smelo zgoditi.  Prosimo, vnesite poro�ilo o hroš�u na straneh bugzilla.gnome.org,\n"
-+"To se ne bi smelo zgoditi.  Prosimo, vnesite poro�ilo o hroš�u na straneh "
-+"bugzilla.gnome.org,\n"
- "kjer opišite, kako je prišlo do prikaza tega sporo�ila.\n"
- 
- #: ../app/app_procs.c:1040
-@@ -221,21 +235,28 @@ msgid "Quitting without saving modified diagrams"
- msgstr "Zapiranje brez shranjevanja spremenjenih diagramov"
- 
- #: ../app/app_procs.c:1106
--msgid "Modified diagrams exist. Are you sure you want to quit Dia without saving them?"
--msgstr "Obstajajo spremenjeni diagrami. Ste prepri�ani, da želite zapreti Dio, ne da bi jih stranili?"
-+msgid ""
-+"Modified diagrams exist. Are you sure you want to quit Dia without saving "
-+"them?"
-+msgstr ""
-+"Obstajajo spremenjeni diagrami. Ste prepri�ani, da želite zapreti Dio, ne da "
-+"bi jih stranili?"
- 
- #: ../app/app_procs.c:1110
- msgid "Quit Dia"
- msgstr "Izhod"
- 
--#: ../app/app_procs.c:1179
--#: ../app/app_procs.c:1186
-+#: ../app/app_procs.c:1179 ../app/app_procs.c:1186
- msgid "Could not create per-user Dia config directory"
- msgstr "Ni mogo�e ustvariti mape z nastavitvami Dia"
- 
- #: ../app/app_procs.c:1189
--msgid "Could not create per-user Dia config directory. Please make sure that the environment variable HOME points to an existing directory."
--msgstr "Map nastavitev uporabnikov ni mogo�e ustvariti. Prepri�ajte se, da okoljska spremenljivka HOME kaže na obstoje�o mapo."
-+msgid ""
-+"Could not create per-user Dia config directory. Please make sure that the "
-+"environment variable HOME points to an existing directory."
-+msgstr ""
-+"Map nastavitev uporabnikov ni mogo�e ustvariti. Prepri�ajte se, da okoljska "
-+"spremenljivka HOME kaže na obstoje�o mapo."
- 
- #: ../app/app_procs.c:1212
- msgid "Objects and filters internal to dia"
-@@ -295,13 +316,11 @@ msgstr ""
- "Obstajajo samodejno shranjene datoteke.\n"
- "Prosim, izberite tiste, ki jih želite povrniti."
- 
--#: ../app/color_area.c:317
--#: ../app/color_area.c:360
-+#: ../app/color_area.c:317 ../app/color_area.c:360
- msgid "Select foreground color"
- msgstr "Izberite barvo ospredja"
- 
--#: ../app/color_area.c:318
--#: ../app/color_area.c:361
-+#: ../app/color_area.c:318 ../app/color_area.c:361
- msgid "Select background color"
- msgstr "Izberite barvo ozadja"
- 
-@@ -314,16 +333,15 @@ msgstr "Vti�nika za tiskanje ni mogo�e najti!"
- msgid "Diagram%d.dia"
- msgstr "Diagram%d.dia"
- 
--#: ../app/commands.c:343
-+#: ../app/commands.c:344
- msgid "No existing object to paste.\n"
- msgstr "Obstoje�i predmet, ki naj se prilepi, ne obstaja.\n"
- 
--#: ../app/commands.c:646
--#: ../app/commands.c:684
-+#: ../app/commands.c:653 ../app/commands.c:691
- msgid "Could not find help directory"
- msgstr "Mape pomo�i ni mogo�e najti"
- 
--#: ../app/commands.c:653
-+#: ../app/commands.c:660
- #, c-format
- msgid ""
- "Could not open help directory:\n"
-@@ -332,11 +350,12 @@ msgstr ""
- "Mape pomo�i ni mogo�e najti:\n"
- "%s"
- 
--#: ../app/commands.c:720
-+#: ../app/commands.c:727
- msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
--msgstr "Andraž Tori <andraz.tori1@guest.arnes.si>Martin Srebotnjak <miles@filmsi.net>"
-+msgstr ""
-+"Andraž Tori <andraz.tori1@guest.arnes.si>Martin Srebotnjak <miles@filmsi.net>"
- 
--#: ../app/commands.c:722
-+#: ../app/commands.c:729
- msgid ""
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-@@ -366,7 +385,7 @@ msgstr ""
- "s tem programom; �e je niste, pišite na naslov: Free Software\n"
- "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- 
--#: ../app/commands.c:745
-+#: ../app/commands.c:752
- msgid "A program for drawing structured diagrams."
- msgstr "Program za risanje strukturiranih diagramov."
- 
-@@ -382,16 +401,21 @@ msgstr "Izvozili boste diagram s/z %d stranmi."
- 
- #: ../app/confirm.c:73
- #, c-format
--msgid "You are about to export a diagram which may require %s of memory.(%d pages)."
-+msgid ""
-+"You are about to export a diagram which may require %s of memory.(%d pages)."
- msgstr "Izvozili boste diagram, ki lahko zahteva %s pomnilnika (%d strani)."
- 
- #: ../app/confirm.c:81
- msgid ""
--"You can adjust the size of the diagram by changing the 'Scaling' in the 'Page Setup' dialog.\n"
--"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into the intended bounds."
-+"You can adjust the size of the diagram by changing the 'Scaling' in the "
-+"'Page Setup' dialog.\n"
-+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-+"the intended bounds."
- msgstr ""
--"Velikost diagrama lahko prilagodite tako, da spremenite 'Prilagajanje velikosti' v pogovornem oknu 'Nastavitev strani'.\n"
--"Sicer lahko uporabite tudi 'Izberi vse' in 'Najboljše ujemanje', da premaknete predmete/ro�ice v želene meje."
-+"Velikost diagrama lahko prilagodite tako, da spremenite 'Prilagajanje "
-+"velikosti' v pogovornem oknu 'Nastavitev strani'.\n"
-+"Sicer lahko uporabite tudi 'Izberi vse' in 'Najboljše ujemanje', da "
-+"premaknete predmete/ro�ice v želene meje."
- 
- #: ../app/confirm.c:85
- msgid "Confirm Diagram Size"
-@@ -402,8 +426,7 @@ msgstr "Potrditev mere diagrama"
- msgid "'%s' creation failed"
- msgstr "Ustvarjanje '%s' ni uspelo"
- 
--#: ../app/defaults.c:43
--#: ../app/defaults.c:150
-+#: ../app/defaults.c:43 ../app/defaults.c:150
- msgid "Object defaults"
- msgstr "Privzete vrednosti predmeta"
- 
-@@ -440,8 +463,7 @@ msgid "Visible spacing"
- msgstr "Vidni razmik"
- 
- #. Hexes!
--#: ../app/dia-props.c:177
--#: ../app/preferences.c:242
-+#: ../app/dia-props.c:177 ../app/preferences.c:242
- msgid "Hex grid"
- msgstr "Šestnajstiška mreža"
- 
-@@ -453,13 +475,11 @@ msgstr "Velikost šestnajstiške mreže"
- msgid "Grid"
- msgstr "Mreža"
- 
--#: ../app/dia-props.c:209
--#: ../lib/diagramdata.c:112
-+#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
- msgid "Background"
- msgstr "Ozadje"
- 
--#: ../app/dia-props.c:220
--#: ../app/preferences.c:122
-+#: ../app/dia-props.c:220 ../app/preferences.c:122
- msgid "Grid Lines"
- msgstr "Mrežne �rte"
- 
-@@ -502,9 +522,7 @@ msgstr "Položaj Y otroškega gradnika"
- msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
- msgstr "Ni mogo�e pretvoriti imena datoteke '%s' v UTF-8: %s\n"
- 
--#: ../app/diagram.c:225
--#: ../lib/message.c:90
--#: ../lib/message.c:293
-+#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
- msgid "Error"
- msgstr "Napaka"
- 
-@@ -513,8 +531,12 @@ msgid "Trying to group with no selected objects."
- msgstr "Poskušate združevati v skupino brez izbranih predmetov."
- 
- #: ../app/diagram.c:1219
--msgid "You cannot group objects that belong to different groups or have different parents"
--msgstr "V skupino ni mogo�e združiti predmetov, ki že sodijo v druge skupine ali imajo razli�ne nadrejene predmete."
-+msgid ""
-+"You cannot group objects that belong to different groups or have different "
-+"parents"
-+msgstr ""
-+"V skupino ni mogo�e združiti predmetov, ki že sodijo v druge skupine ali "
-+"imajo razli�ne nadrejene predmete."
- 
- #: ../app/diagram_tree_menu.c:47
- msgid "/_Sort objects"
-@@ -584,8 +606,7 @@ msgstr "/Razvrsti diagrame/Privzeto/po _imenu"
- msgid "/Sort diagrams/Default/as _inserted"
- msgstr "/Razvrsti diagrame/Privzeto/po zaporedju vs_tavljanja"
- 
--#: ../app/diagram_tree_menu.c:84
--#: ../app/diagram_tree_menu.c:95
-+#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
- msgid "/_Locate"
- msgstr "/Lo_ciraj"
- 
-@@ -597,8 +618,7 @@ msgstr "/_Lastnosti"
- msgid "/_Hide this type"
- msgstr "/_Skrij to vrsto"
- 
--#: ../app/diagram_tree_window.c:80
--#: ../app/preferences.c:123
-+#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
- msgid "Diagram Tree"
- msgstr "Drevo diagrama"
- 
-@@ -655,13 +675,11 @@ msgstr "od"
- msgid "%0.3gcm x %0.3gcm"
- msgstr "%0.3gcm x %0.3gcm"
- 
--#: ../app/diapagelayout.c:845
--#: ../app/pagesetup.c:76
-+#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
- msgid "Page Setup"
- msgstr "Nastavitev strani"
- 
--#: ../app/disp_callbacks.c:95
--#: ../app/properties-dialog.c:157
-+#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
- msgid ""
- "This object doesn't support Undo/Redo.\n"
- "Undo information erased."
-@@ -677,7 +695,7 @@ msgstr "Lastnosti ..."
- msgid "Selection"
- msgstr "Izbor"
- 
--#: ../app/disp_callbacks.c:1074
-+#: ../app/disp_callbacks.c:1075
- msgid ""
- "The object you dropped cannot fit into its parent. \n"
- "Either expand the parent object, or drop the object elsewhere."
-@@ -754,18 +772,12 @@ msgid "Save"
- msgstr "Shrani"
- 
- #. *** board of value **************
--#: ../app/exit_dialog.c:123
--#: ../app/plugin-manager.c:262
--#: ../objects/Database/table.c:138
--#: ../objects/Database/table.c:181
--#: ../objects/SISSI/sissi_dialog.c:734
--#: ../objects/UML/association.c:234
--#: ../objects/UML/class.c:144
--#: ../objects/UML/large_package.c:139
--#: ../objects/UML/umlattribute.c:37
--#: ../objects/UML/umlformalparameter.c:35
--#: ../objects/UML/umloperation.c:62
--#: ../objects/UML/umlparameter.c:43
-+#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
-+#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
-+#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
-+#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
-+#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-+#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
- msgid "Name"
- msgstr "Ime"
- 
-@@ -785,16 +797,12 @@ msgstr "Ne izberi ni�esar"
- msgid "Nothing selected for saving.  Would you like to try again?"
- msgstr "Ni� niste izbrali za shranjevanje. Želite poskusiti znova?"
- 
--#: ../app/filedlg.c:144
--#: ../app/filedlg.c:152
--#: ../app/filedlg.c:168
--#: ../app/filedlg.c:746
--#: ../lib/widgets.c:1488
-+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-+#: ../app/filedlg.c:746 ../lib/widgets.c:1488
- msgid "Supported Formats"
- msgstr "Podprte oblike"
- 
--#: ../app/filedlg.c:192
--#: ../app/filedlg.c:604
-+#: ../app/filedlg.c:192 ../app/filedlg.c:604
- msgid "By extension"
- msgstr "Po kon�nici"
- 
-@@ -806,19 +814,15 @@ msgstr "Odpri diagram"
- msgid "Open Options"
- msgstr "Odpri možnosti"
- 
--#: ../app/filedlg.c:317
--#: ../app/filedlg.c:728
-+#: ../app/filedlg.c:317 ../app/filedlg.c:728
- msgid "Determine file type:"
- msgstr "Dolo�i vrsto datoteke:"
- 
--#: ../app/filedlg.c:337
--#: ../app/filedlg.c:741
--#: ../lib/widgets.c:1493
-+#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
- msgid "All Files"
- msgstr "Vse datoteke"
- 
--#: ../app/filedlg.c:370
--#: ../plug-ins/postscript/paginate_psprint.c:408
-+#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
- msgid ""
- "Some characters in the filename are neither UTF-8\n"
- "nor your local encoding.\n"
-@@ -828,14 +832,12 @@ msgstr ""
- "niti vašemu krajevnemu naboru znakov.\n"
- "Dolo�ene stvari se bodo pokvarile."
- 
--#: ../app/filedlg.c:380
--#: ../app/filedlg.c:651
-+#: ../app/filedlg.c:380 ../app/filedlg.c:651
- #: ../plug-ins/postscript/paginate_psprint.c:422
- msgid "File already exists"
- msgstr "Datoteka že obstaja"
- 
--#: ../app/filedlg.c:382
--#: ../app/filedlg.c:653
-+#: ../app/filedlg.c:382 ../app/filedlg.c:653
- #: ../plug-ins/postscript/paginate_psprint.c:418
- #, c-format
- msgid ""
-@@ -855,10 +857,14 @@ msgstr "Shrani diagram"
- msgid "Compress diagram files"
- msgstr "Stisni datoteke diagramov"
- 
--#: ../app/filedlg.c:457
--#: ../app/filedlg.c:462
--msgid "Compression reduces file size to less than 1/10th size and speeds up loading and saving.  Some text programs cannot manipulate compressed files."
--msgstr "Stiskanje zmanjša velikost datotek na manj kot eno desetino in pospeši nalaganje in stranjevanje.  Nekateri terminalski programi ne znajo delati s stisnjenimi datotekami."
-+#: ../app/filedlg.c:457 ../app/filedlg.c:462
-+msgid ""
-+"Compression reduces file size to less than 1/10th size and speeds up loading "
-+"and saving.  Some text programs cannot manipulate compressed files."
-+msgstr ""
-+"Stiskanje zmanjša velikost datotek na manj kot eno desetino in pospeši "
-+"nalaganje in stranjevanje.  Nekateri terminalski programi ne znajo delati s "
-+"stisnjenimi datotekami."
- 
- #: ../app/filedlg.c:677
- #, c-format
-@@ -897,23 +903,22 @@ msgstr "Samo _cele besede"
- msgid "Match _all properties (not just object name)"
- msgstr "Ujemanje _vseh lastnosti (ne le imena predmeta)"
- 
--#: ../app/find-and-replace.c:510
-+#: ../app/find-and-replace.c:513
- msgid "Find"
- msgstr "Najdi"
- 
--#: ../app/find-and-replace.c:542
--#: ../app/menus.c:267
-+#: ../app/find-and-replace.c:545 ../app/menus.c:267
- msgid "Replace"
- msgstr "Zamenjaj"
- 
--#: ../app/find-and-replace.c:545
-+#: ../app/find-and-replace.c:548
- msgid "Replace _All"
- msgstr "Zamenjaj _vse"
- 
- #. not adding the button in the list above to modify it's text;
- #. * the default "Find and Replace" is just too long for my taste ;)
- #.
--#: ../app/find-and-replace.c:550
-+#: ../app/find-and-replace.c:553
- msgid "_Replace"
- msgstr "_Zamenjaj"
- 
-@@ -934,9 +939,7 @@ msgstr ""
- "Uporabite tipko <Esc> za izhod iz orodja."
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
--#: ../app/interface.c:165
--#: ../app/menus.c:229
--#: ../objects/FS/function.c:988
-+#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
- msgid "Magnify"
- msgstr "Pove�aj"
- 
-@@ -946,143 +949,139 @@ msgstr "Drsi po diagramu"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule
--#: ../app/interface.c:177
--#: ../app/menus.c:232
--#: ../lib/properties.c:80
--#: ../lib/properties.h:530
--#: ../objects/AADL/aadlbox.c:153
--#: ../objects/Jackson/requirement.c:144
--#: ../objects/UML/activity.c:129
--#: ../objects/UML/actor.c:126
--#: ../objects/UML/classicon.c:149
--#: ../objects/UML/component.c:130
--#: ../objects/UML/component_feature.c:161
--#: ../objects/UML/node.c:130
--#: ../objects/UML/node.c:132
--#: ../objects/UML/note.c:124
--#: ../objects/UML/object.c:151
--#: ../objects/UML/small_package.c:135
--#: ../objects/UML/state.c:154
--#: ../objects/UML/usecase.c:142
--#: ../objects/custom/custom_object.c:236
--#: ../objects/network/basestation.c:135
--#: ../objects/network/radiocell.c:127
-+#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
-+#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
-+#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
-+#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
-+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
-+#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-+#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
-+#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
-+#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
-+#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
- msgid "Text"
- msgstr "Besedilo"
- 
--#: ../app/interface.c:183
--#: ../app/menus.c:233
-+#: ../app/interface.c:183 ../app/menus.c:233
- msgid "Box"
- msgstr "Å katla"
- 
--#: ../app/interface.c:189
--#: ../app/menus.c:234
-+#: ../app/interface.c:189 ../app/menus.c:234
- msgid "Ellipse"
- msgstr "Elipsa"
- 
--#: ../app/interface.c:195
--#: ../app/menus.c:235
-+#: ../app/interface.c:195 ../app/menus.c:235
- msgid "Polygon"
- msgstr "Mnogokotnik"
- 
--#: ../app/interface.c:201
--#: ../app/menus.c:236
-+#: ../app/interface.c:201 ../app/menus.c:236
- msgid "Beziergon"
- msgstr "Bezierjev poligon"
- 
--#: ../app/interface.c:207
--#: ../app/menus.c:238
--#: ../objects/standard/line.c:229
-+#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
- msgid "Line"
- msgstr "ÄŒrta"
- 
--#: ../app/interface.c:213
--#: ../app/menus.c:239
-+#: ../app/interface.c:213 ../app/menus.c:239
- msgid "Arc"
- msgstr "Lok"
- 
--#: ../app/interface.c:219
--#: ../app/menus.c:240
-+#: ../app/interface.c:219 ../app/menus.c:240
- msgid "Zigzagline"
- msgstr "ÄŒrta cik-cak"
- 
--#: ../app/interface.c:225
--#: ../app/menus.c:241
-+#: ../app/interface.c:225 ../app/menus.c:241
- msgid "Polyline"
- msgstr "Lomljena �rta"
- 
--#: ../app/interface.c:231
--#: ../app/menus.c:242
-+#: ../app/interface.c:231 ../app/menus.c:242
- msgid "Bezierline"
- msgstr "Bezierjeva krivulja"
- 
--#: ../app/interface.c:237
--#: ../app/menus.c:245
-+#: ../app/interface.c:237 ../app/menus.c:245
- msgid "Image"
- msgstr "Slika"
- 
--#: ../app/interface.c:244
--#: ../app/menus.c:243
-+#: ../app/interface.c:244 ../app/menus.c:243
- msgid "Outline"
- msgstr "Oris"
- 
--#: ../app/interface.c:621
--#: ../app/interface.c:857
-+#: ../app/interface.c:634 ../app/interface.c:870
- msgid "Pops up the Navigation window."
- msgstr "Odpre okno Krmarja."
- 
--#: ../app/interface.c:819
-+#: ../app/interface.c:832
- msgid "Diagram menu."
- msgstr "Meni Diagram."
- 
--#: ../app/interface.c:922
-+#: ../app/interface.c:935
- msgid "Zoom"
- msgstr "Pove�ava"
- 
--#: ../app/interface.c:937
-+#: ../app/interface.c:950
- msgid "Toggles snap-to-grid for this window."
- msgstr "Vklju�i/izklju�i pripenjanje na mrežo v tem oknu."
- 
--#: ../app/interface.c:948
-+#: ../app/interface.c:961
- msgid "Toggles object snapping for this window."
- msgstr "Vklju�i/izklju�i pripenjanje predmetov v tem oknu."
- 
--#: ../app/interface.c:1338
-+#: ../app/interface.c:1351
- #, c-format
- msgid "No sheet named %s"
- msgstr "Ni lista z imenom %s"
- 
--#: ../app/interface.c:1376
-+#: ../app/interface.c:1389
- msgid "Other sheets"
- msgstr "Drugi listi"
- 
--#: ../app/interface.c:1436
--#: ../sheets/Flowchart.sheet.in.h:10
-+#: ../app/interface.c:1449 ../sheets/Flowchart.sheet.in.h:1
- msgid "Flowchart"
- msgstr "Diagram poteka"
- 
--#: ../app/interface.c:1496
--msgid "Foreground & background colors for new objects.  The small black and white squares reset colors.  The small arrows swap colors.  Double click to change colors."
--msgstr "Barve ozadja in pisave za nove predmete. Mali �rni in beli kvadrati ponastavijo barve. Majhne puš�ice zamenjajo barve. Dvojni kilk pa spremeni barve."
-+#: ../app/interface.c:1509
-+msgid ""
-+"Foreground & background colors for new objects.  The small black and white "
-+"squares reset colors.  The small arrows swap colors.  Double click to change "
-+"colors."
-+msgstr ""
-+"Barve ozadja in pisave za nove predmete. Mali �rni in beli kvadrati "
-+"ponastavijo barve. Majhne puš�ice zamenjajo barve. Dvojni kilk pa spremeni "
-+"barve."
- 
--#: ../app/interface.c:1511
--msgid "Line widths.  Click on a line to set the default line width for new objects.  Double-click to set the line width more precisely."
--msgstr "Širine �rt.  Kliknite �rto, da nastavite širino �rt za nove predmete.  Dvokliknite za natan�nejšo nastavitev širine �rte."
-+#: ../app/interface.c:1524
-+msgid ""
-+"Line widths.  Click on a line to set the default line width for new "
-+"objects.  Double-click to set the line width more precisely."
-+msgstr ""
-+"Širine �rt.  Kliknite �rto, da nastavite širino �rt za nove predmete.  "
-+"Dvokliknite za natan�nejšo nastavitev širine �rte."
- 
--#: ../app/interface.c:1554
--msgid "Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
--msgstr "Slog puš�ic na za�etku novih �rt.  Kliknite za izbor puš�ice ali nastavite parametre puš�ic s Podrobnostmi ..."
-+#: ../app/interface.c:1567
-+msgid ""
-+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-+"arrow parameters with Details..."
-+msgstr ""
-+"Slog puš�ic na za�etku novih �rt.  Kliknite za izbor puš�ice ali nastavite "
-+"parametre puš�ic s Podrobnostmi ..."
- 
--#: ../app/interface.c:1559
--msgid "Line style for new lines.  Click to pick a line style, or set line style parameters with Details..."
--msgstr "Slog �rte za nove �rte.  Kliknite za izbor sloga �rt ali nastavite parametre sloga �rt s Podrobnostmi ..."
-+#: ../app/interface.c:1572
-+msgid ""
-+"Line style for new lines.  Click to pick a line style, or set line style "
-+"parameters with Details..."
-+msgstr ""
-+"Slog �rte za nove �rte.  Kliknite za izbor sloga �rt ali nastavite parametre "
-+"sloga �rt s Podrobnostmi ..."
- 
--#: ../app/interface.c:1575
--msgid "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
--msgstr "Slog puš�ic na koncu novih �rt.  Kliknite za izbor puš�ice ali nastavite parametre puš�ic s Podrobnostmi ..."
-+#: ../app/interface.c:1588
-+msgid ""
-+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-+"parameters with Details..."
-+msgstr ""
-+"Slog puš�ic na koncu novih �rt.  Kliknite za izbor puš�ice ali nastavite "
-+"parametre puš�ic s Podrobnostmi ..."
- 
--#: ../app/interface.c:1635
--#: ../app/interface.c:1762
-+#: ../app/interface.c:1648 ../app/interface.c:1775
- msgid "Diagram Editor"
- msgstr "Urejevalnik diagrama"
- 
-@@ -1114,8 +1113,7 @@ msgstr "Plasti"
- msgid "Diagram:"
- msgstr "Diagram:"
- 
--#: ../app/layer_dialog.c:514
--#: ../app/layer_dialog.c:1225
-+#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
- #, c-format
- msgid "New layer %d"
- msgstr "Nova plast %d"
-@@ -1136,9 +1134,7 @@ msgstr "Dodaj plast"
- msgid "Layer name:"
- msgstr "Ime plasti:"
- 
--#: ../app/linewidth_area.c:246
--#: ../lib/properties.h:491
--#: ../lib/properties.h:494
-+#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
- #: ../objects/chronogram/chronoline.c:183
- #: ../objects/chronogram/chronoref.c:162
- msgid "Line width"
-@@ -1148,7 +1144,7 @@ msgstr "Debelina �rte"
- msgid "Line width:"
- msgstr "Debelina �rte:"
- 
--#: ../app/load_save.c:296
-+#: ../app/load_save.c:301
- msgid ""
- "Error loading diagram.\n"
- "Linked object not found in document."
-@@ -1156,7 +1152,7 @@ msgstr ""
- "Napaka ob nalaganju diagrama.\n"
- "Povezan predmet ni bil najden v dokumentu."
- 
--#: ../app/load_save.c:300
-+#: ../app/load_save.c:305
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1165,7 +1161,7 @@ msgstr ""
- "Napaka ob nalaganju diagrama.\n"
- "Ro�ica povezave %d ne obstaja na '%s'."
- 
--#: ../app/load_save.c:328
-+#: ../app/load_save.c:333
- #, c-format
- msgid ""
- "Error loading diagram.\n"
-@@ -1174,26 +1170,23 @@ msgstr ""
- "Napaka pri nalaganju diagrama.\n"
- "To�ka povezave %d ne obstaja na '%s'."
- 
--#: ../app/load_save.c:368
-+#: ../app/load_save.c:373
- #, c-format
- msgid "Can't find parent %s of %s object\n"
- msgstr "Ni mogo�e najti nadrejenega %s predmeta %s\n"
- 
--#: ../app/load_save.c:417
-+#: ../app/load_save.c:422
- msgid "You must specify a file, not a directory.\n"
- msgstr "Navesti morate datoteko, ne mape.\n"
- 
--#: ../app/load_save.c:424
--#: ../plug-ins/dxf/dxf-import.c:1309
--#: ../plug-ins/wpg/wpg.c:1177
--#: ../plug-ins/xfig/xfig-import.c:1270
-+#: ../app/load_save.c:429 ../plug-ins/dxf/dxf-import.c:1309
-+#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
- #: ../plug-ins/xslt/xslt.c:91
- #, c-format
- msgid "Couldn't open: '%s' for reading.\n"
- msgstr "Ni mogo�e odpreti: '%s' za branje.\n"
- 
--#: ../app/load_save.c:442
--#: ../app/load_save.c:448
-+#: ../app/load_save.c:447 ../app/load_save.c:453
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1202,7 +1195,7 @@ msgstr ""
- "Napaka ob nalaganju diagrama %s.\n"
- "Neznana vrsta datoteke."
- 
--#: ../app/load_save.c:456
-+#: ../app/load_save.c:461
- #, c-format
- msgid ""
- "Error loading diagram %s.\n"
-@@ -1211,7 +1204,7 @@ msgstr ""
- "Napaka ob nalaganju diagrama %s.\n"
- "To ni datoteka Dia."
- 
--#: ../app/load_save.c:673
-+#: ../app/load_save.c:678
- #, c-format
- msgid ""
- "Error loading diagram:\n"
-@@ -1222,51 +1215,43 @@ msgstr ""
- "%s.\n"
- "Veljavna datoteka Dia vsebuje vsaj en sloj."
- 
--#: ../app/load_save.c:996
-+#: ../app/load_save.c:1001
- #, c-format
- msgid "Not allowed to write to output file %s\n"
- msgstr "Pisanje v izhodno datoteko %s ni dovoljeno\n"
- 
--#: ../app/load_save.c:1028
-+#: ../app/load_save.c:1033
- #, c-format
- msgid "Not allowed to write temporary files in %s\n"
- msgstr "Pisanje v za�asne datoteke v %s ni dovoljeno\n"
- 
--#: ../app/load_save.c:1050
--#: ../plug-ins/cairo/diacairo.c:121
--#: ../plug-ins/cgm/cgm.c:1154
--#: ../plug-ins/drs/dia-render-script.c:121
--#: ../plug-ins/dxf/dxf-export.c:547
--#: ../plug-ins/hpgl/hpgl.c:710
-+#: ../app/load_save.c:1055 ../plug-ins/cairo/diacairo.c:121
-+#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
-+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
- #: ../plug-ins/libart/export_png.c:159
- #: ../plug-ins/metapost/render_metapost.c:1177
--#: ../plug-ins/pgf/render_pgf.c:1208
--#: ../plug-ins/postscript/render_eps.c:105
-+#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
- #: ../plug-ins/pstricks/render_pstricks.c:916
--#: ../plug-ins/shape/shape-export.c:137
--#: ../plug-ins/svg/render_svg.c:199
--#: ../plug-ins/vdx/vdx-export.c:1850
--#: ../plug-ins/wpg/wpg.c:1072
--#: ../plug-ins/xfig/xfig-export.c:1153
--#: ../plug-ins/xslt/xslt.c:99
-+#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
-+#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
-+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
- #, c-format
- msgid "Can't open output file %s: %s\n"
- msgstr "Ni mogo�e odpreti izhodne datoteke %s: %s\n"
- 
- #. Save failed; we clean our stuff up, without touching the file named
- #. "filename" if it existed.
--#: ../app/load_save.c:1061
-+#: ../app/load_save.c:1066
- #, c-format
- msgid "Internal error %d writing file %s\n"
- msgstr "Notranja napaka %d pri pisanju v datoteko %s\n"
- 
--#: ../app/load_save.c:1072
-+#: ../app/load_save.c:1077
- #, c-format
- msgid "Can't rename %s to final output file %s: %s\n"
- msgstr "Ni mogo�e preimenovati '%s' v kon�no izhodno datoteko %s: %s\n"
- 
--#: ../app/load_save.c:1163
--#: ../app/load_save.c:1168
-+#: ../app/load_save.c:1168 ../app/load_save.c:1173
- msgid "Dia Diagram File"
- msgstr "Datoteka diagrama Dia"
- 
-@@ -1320,8 +1305,7 @@ msgstr "Lastnosti _diagrama"
- msgid "Page Set_up..."
- msgstr "N_astavitev strani ..."
- 
--#: ../app/menus.c:123
--#: ../app/sheets_dialog.c:236
-+#: ../app/menus.c:123 ../app/sheets_dialog.c:236
- msgid "_Edit"
- msgstr "_Uredi"
- 
-@@ -1381,13 +1365,11 @@ msgstr "_Pove�ava"
- msgid "1600%"
- msgstr "1600%"
- 
--#: ../app/menus.c:154
--#: ../app/menus.c:573
-+#: ../app/menus.c:154 ../app/menus.c:573
- msgid "800%"
- msgstr "800%"
- 
--#: ../app/menus.c:155
--#: ../app/menus.c:574
-+#: ../app/menus.c:155 ../app/menus.c:574
- msgid "400%"
- msgstr "400%"
- 
-@@ -1475,13 +1457,11 @@ msgid "_Unparent Children"
- msgstr "Razlasti _podrejeni predmet"
- 
- #. Translators: Menu item Verb/Support/Position/Align
--#: ../app/menus.c:188
--#: ../objects/FS/function.c:808
-+#: ../app/menus.c:188 ../objects/FS/function.c:808
- msgid "Align"
- msgstr "Poravnaj"
- 
--#: ../app/menus.c:193
--#: ../objects/standard/textobj.c:137
-+#: ../app/menus.c:193 ../objects/standard/textobj.c:137
- msgid "Top"
- msgstr "na vrh"
- 
-@@ -1489,8 +1469,7 @@ msgstr "na vrh"
- msgid "Middle"
- msgstr "sredinsko"
- 
--#: ../app/menus.c:195
--#: ../objects/standard/textobj.c:136
-+#: ../app/menus.c:195 ../objects/standard/textobj.c:136
- msgid "Bottom"
- msgstr "na dno"
- 
-@@ -1521,11 +1500,8 @@ msgstr "_Izberi"
- msgid "All"
- msgstr "Vse"
- 
--#: ../app/menus.c:206
--#: ../lib/arrows.c:1898
--#: ../objects/Jackson/domain.c:96
--#: ../objects/UML/association.c:221
--#: ../objects/UML/association.c:227
-+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
-+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
- msgid "None"
- msgstr "Brez"
- 
-@@ -1619,11 +1595,8 @@ msgstr "Presek"
- #. Translators: Menu item Verb/Channel/Export/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove
- #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
--#: ../app/menus.c:270
--#: ../app/sheets_dialog.c:785
--#: ../objects/FS/function.c:708
--#: ../objects/FS/function.c:860
--#: ../objects/FS/function.c:862
-+#: ../app/menus.c:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
-+#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
- msgid "Remove"
- msgstr "Odstrani"
- 
-@@ -1688,8 +1661,7 @@ msgstr "Vti�niki"
- msgid "Loaded"
- msgstr "Naloženo"
- 
--#: ../app/plugin-manager.c:268
--#: ../objects/SISSI/sissi_dialog.c:730
-+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
- #: ../objects/SISSI/sissi_dialog.c:882
- msgid "Description"
- msgstr "Opis"
-@@ -1702,8 +1674,7 @@ msgstr "Naloži ob zagonu"
- msgid "File Name"
- msgstr "Ime datoteke"
- 
--#: ../app/preferences.c:99
--#: ../app/preferences.c:144
-+#: ../app/preferences.c:99 ../app/preferences.c:144
- msgid "any"
- msgstr "vse"
- 
-@@ -1771,8 +1742,7 @@ msgstr "Pokon�no"
- msgid "Paper type:"
- msgstr "Vrsta papirja:"
- 
--#: ../app/preferences.c:194
--#: ../objects/Database/table_dialog.c:1078
-+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1079
- msgid "Background Color:"
- msgstr "Barva ozadja:"
- 
-@@ -1785,9 +1755,7 @@ msgid "Connection Points:"
- msgstr "To�ke povezav:"
- 
- #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
--#: ../app/preferences.c:200
--#: ../app/preferences.c:211
--#: ../app/preferences.c:235
-+#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
- msgid "Visible"
- msgstr "Vidno"
- 
-@@ -1815,8 +1783,7 @@ msgstr "Pove�aj:"
- msgid "Page breaks:"
- msgstr "Prelomi strani:"
- 
--#: ../app/preferences.c:212
--#: ../app/preferences.c:240
-+#: ../app/preferences.c:212 ../app/preferences.c:240
- msgid "Color:"
- msgstr "Barva:"
- 
-@@ -1835,10 +1802,8 @@ msgstr "pokaži z zglajenimi robovi"
- #. Favored Filter
- #. Translators: Menu item Verb/Channel/Export
- #. Translators: Menu item Verb/Channel/Export/Export
--#: ../app/preferences.c:221
--#: ../objects/FS/function.c:698
--#: ../objects/FS/function.c:700
--#: ../plug-ins/libart/export_png.c:328
-+#: ../app/preferences.c:221 ../objects/FS/function.c:698
-+#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
- msgid "Export"
- msgstr "Izvozi"
- 
-@@ -1846,8 +1811,7 @@ msgstr "Izvozi"
- msgid "Portable Network Graphics"
- msgstr "PNG (Portable Network Graphics)"
- 
--#: ../app/preferences.c:225
--#: ../plug-ins/svg/render_svg.c:515
-+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
- #: ../plug-ins/svg/svg-import.c:884
- msgid "Scalable Vector Graphics"
- msgstr "SVG (Scalable Vector Graphics)"
-@@ -1901,15 +1865,12 @@ msgstr "Okno drevesa diagrama:"
- msgid "Save hidden object types"
- msgstr "Shrani vrste skritih predmetov"
- 
--#: ../app/preferences.c:485
--#: ../lib/prop_inttypes.c:158
-+#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
- msgid "Yes"
- msgstr "Da"
- 
--#: ../app/preferences.c:485
--#: ../app/preferences.c:496
--#: ../lib/prop_inttypes.c:160
--#: ../lib/prop_inttypes.c:186
-+#: ../app/preferences.c:485 ../app/preferences.c:496
-+#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
- msgid "No"
- msgstr "Ne"
- 
-@@ -1976,23 +1937,19 @@ msgstr "Programiran predmet DiaObject"
- msgid "Sheets and Objects"
- msgstr "Listi in predmeti"
- 
--#: ../app/sheets_dialog.c:110
--#: ../app/sheets_dialog_callbacks.c:180
-+#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
- msgid "<- Copy"
- msgstr "<- Kopiraj"
- 
--#: ../app/sheets_dialog.c:120
--#: ../app/sheets_dialog_callbacks.c:182
-+#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
- msgid "<- Copy All"
- msgstr "<- Kopiraj vse"
- 
--#: ../app/sheets_dialog.c:127
--#: ../app/sheets_dialog_callbacks.c:184
-+#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
- msgid "<- Move"
- msgstr "<- Premakni"
- 
--#: ../app/sheets_dialog.c:137
--#: ../app/sheets_dialog_callbacks.c:186
-+#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
- msgid "<- Move All"
- msgstr "<- Premakni vse"
- 
-@@ -2008,20 +1965,13 @@ msgstr "Povrni"
- msgid "New"
- msgstr "Nov"
- 
--#: ../app/sheets_dialog.c:363
--#: ../app/sheets_dialog.c:795
--#: ../objects/Database/table.c:140
--#: ../objects/Istar/actor.c:146
--#: ../objects/Istar/actor.c:147
--#: ../objects/Istar/other.c:150
--#: ../objects/Istar/other.c:151
--#: ../objects/KAOS/other.c:153
--#: ../objects/KAOS/other.c:154
--#: ../objects/UML/association.c:240
--#: ../objects/UML/umlattribute.c:39
--#: ../objects/UML/umlformalparameter.c:37
--#: ../objects/UML/umloperation.c:64
--#: ../objects/UML/umlparameter.c:45
-+#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
-+#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
-+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
-+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
- msgid "Type"
- msgstr "Vrsta"
- 
-@@ -2033,8 +1983,7 @@ msgstr "Prebrskaj ..."
- msgid "SVG Shape:"
- msgstr "Oblika SVG:"
- 
--#: ../app/sheets_dialog.c:414
--#: ../app/sheets_dialog.c:477
-+#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
- msgid "description:"
- msgstr "opis:"
- 
-@@ -2042,8 +1991,7 @@ msgstr "opis:"
- msgid "Sheet name:"
- msgstr "Ime lista:"
- 
--#: ../app/sheets_dialog.c:447
--#: ../app/sheets_dialog_callbacks.c:292
-+#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
- #: ../app/sheets_dialog_callbacks.c:1109
- msgid "Line Break"
- msgstr "Prelom vrstice"
-@@ -2056,23 +2004,16 @@ msgstr "Uredi atribute"
- msgid "DiaObject"
- msgstr "Predmet DiaObject"
- 
--#: ../app/sheets_dialog.c:600
--#: ../app/sheets_dialog.c:693
-+#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
- msgid "Description:"
- msgstr "Opis:"
- 
--#: ../app/sheets_dialog.c:619
--#: ../objects/Database/table_dialog.c:695
--#: ../objects/FS/flow-ortho.c:169
--#: ../objects/FS/flow.c:146
--#: ../objects/Istar/link.c:162
--#: ../objects/Jackson/phenomenon.c:146
--#: ../objects/KAOS/metaandorrel.c:166
--#: ../objects/KAOS/metabinrel.c:173
--#: ../objects/UML/class_dialog.c:1159
--#: ../objects/UML/class_dialog.c:2025
--#: ../objects/UML/class_dialog.c:2261
--#: ../objects/UML/class_dialog.c:2864
-+#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:696
-+#: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
-+#: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
-+#: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
-+#: ../objects/UML/class_dialog.c:1159 ../objects/UML/class_dialog.c:2025
-+#: ../objects/UML/class_dialog.c:2261 ../objects/UML/class_dialog.c:2864
- msgid "Type:"
- msgstr "Vrsta:"
- 
-@@ -2080,18 +2021,12 @@ msgstr "Vrsta:"
- msgid "Sheet"
- msgstr "List"
- 
--#: ../app/sheets_dialog.c:673
--#: ../objects/Database/table_dialog.c:683
--#: ../objects/Database/table_dialog.c:1046
--#: ../objects/ER/attribute.c:155
--#: ../objects/ER/entity.c:137
--#: ../objects/ER/relationship.c:142
--#: ../objects/UML/class_dialog.c:1148
--#: ../objects/UML/class_dialog.c:2014
--#: ../objects/UML/class_dialog.c:2250
--#: ../objects/UML/class_dialog.c:2853
--#: ../objects/UML/dependency.c:137
--#: ../objects/UML/generalization.c:133
-+#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:684
-+#: ../objects/Database/table_dialog.c:1047 ../objects/ER/attribute.c:155
-+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-+#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
-+#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
-+#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
- #: ../objects/UML/realizes.c:134
- msgid "Name:"
- msgstr "Ime:"
-@@ -2174,8 +2109,7 @@ msgstr "Ni mogo�e interpretirati datoteke oblike: '%s'"
- msgid "Sheet must have a Name"
- msgstr "List mora imeti ime"
- 
--#: ../app/sheets_dialog_callbacks.c:1621
--#: ../app/sheets_dialog_callbacks.c:1628
-+#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
- #, c-format
- msgid "Couldn't open '%s': %s"
- msgstr "Ni mogo�e odpreti '%s': %s"
-@@ -2372,19 +2306,13 @@ msgstr "neznana puš�ica"
- 
- #: ../lib/bezier_conn.c:636
- msgid "Internal error: Setting corner type of endpoint of bezier"
--msgstr "Notranja napaka: Nastavljanje vrste kota za kon�no to�ko bezierjeve krivulje"
--
--#: ../lib/create.c:50
--#: ../lib/create.c:100
--#: ../lib/create.c:127
--#: ../lib/create.c:161
--#: ../lib/create.c:197
--#: ../lib/create.c:224
--#: ../lib/create.c:260
--#: ../lib/create.c:295
--#: ../lib/create.c:338
--#: ../plug-ins/svg/svg-import.c:267
--#: ../plug-ins/vdx/vdx-import.c:145
-+msgstr ""
-+"Notranja napaka: Nastavljanje vrste kota za kon�no to�ko bezierjeve krivulje"
-+
-+#: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
-+#: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
-+#: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-+#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
- msgid "Can't find standard object"
- msgstr "Navadnega predmeta ni mogo�e najti"
- 
-@@ -2458,8 +2386,7 @@ msgstr "Podrobnosti ..."
- msgid "Ok"
- msgstr "V redu"
- 
--#: ../lib/dialogs.c:52
--#: ../plug-ins/postscript/paginate_psprint.c:322
-+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
- msgid "Cancel"
- msgstr "Prekli�i"
- 
-@@ -2473,8 +2400,7 @@ msgstr "Obstaja ve� izvoznih filtrov z istim imenom %s"
- msgid "Can't load font %s.\n"
- msgstr "Ni mogo�e naložiti pisave %s.\n"
- 
--#: ../lib/message.c:92
--#: ../lib/message.c:278
-+#: ../lib/message.c:92 ../lib/message.c:278
- msgid "Warning"
- msgstr "Opozorilo"
- 
-@@ -2525,8 +2451,7 @@ msgstr "Manjkajo odvisnosti za '%s'?"
- msgid "Missing symbol 'dia_plugin_init'"
- msgstr "Manjkajo� simbol 'dia_plugin_init'"
- 
--#: ../lib/plug-ins.c:205
--#: ../lib/plug-ins.c:213
-+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
- msgid "dia_plugin_init() call failed"
- msgstr "Klic dia_plugin_init() ni uspel"
- 
-@@ -2560,8 +2485,7 @@ msgstr "Datum nastanka"
- msgid "Modification date"
- msgstr "Datum spremembe"
- 
--#: ../lib/prop_dict.c:47
--#: ../objects/SISSI/sissi_dialog.c:880
-+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
- msgid "URL"
- msgstr "URL"
- 
-@@ -2574,95 +2498,68 @@ msgstr "Lastnost iz int v enum je zunaj obsega"
- msgid "Group with %d objects"
- msgstr "Skupina s %d predmeti"
- 
--#: ../lib/properties.c:65
--#: ../lib/properties.h:477
--#: ../lib/widgets.c:724
-+#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
- msgid "Left"
- msgstr "Levo"
- 
--#: ../lib/properties.c:66
--#: ../lib/properties.h:478
--#: ../lib/widgets.c:730
-+#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
- #: ../objects/standard/textobj.c:138
- msgid "Center"
- msgstr "Sredinsko"
- 
--#: ../lib/properties.c:67
--#: ../lib/properties.h:479
--#: ../lib/widgets.c:736
-+#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
- msgid "Right"
- msgstr "Desno"
- 
--#: ../lib/properties.c:74
--#: ../lib/properties.h:497
--#: ../lib/properties.h:500
-+#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
- #: ../objects/chronogram/chronoline.c:181
- #: ../objects/chronogram/chronoref.c:160
- msgid "Line color"
- msgstr "Barva �rte"
- 
--#: ../lib/properties.c:75
--#: ../lib/properties.h:503
--#: ../lib/properties.h:506
-+#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
- msgid "Line style"
- msgstr "Slog �rte"
- 
--#: ../lib/properties.c:76
--#: ../lib/properties.h:510
--#: ../lib/properties.h:513
-+#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
- msgid "Fill color"
- msgstr "Barva polnila"
- 
--#: ../lib/properties.c:77
--#: ../lib/properties.h:516
--#: ../lib/properties.h:519
-+#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
- msgid "Draw background"
- msgstr "Nariši ozadje"
- 
--#: ../lib/properties.c:78
--#: ../lib/properties.h:523
-+#: ../lib/properties.c:78 ../lib/properties.h:523
- msgid "Start arrow"
- msgstr "Puš�ica za�etka"
- 
--#: ../lib/properties.c:79
--#: ../lib/properties.h:526
-+#: ../lib/properties.c:79 ../lib/properties.h:526
- msgid "End arrow"
- msgstr "Puš�ica konca"
- 
--#: ../lib/properties.c:81
--#: ../lib/properties.h:536
-+#: ../lib/properties.c:81 ../lib/properties.h:536
- msgid "Text alignment"
- msgstr "Poravnava besedila"
- 
- #. all this just to make the defaults selectable ...
--#: ../lib/properties.c:82
--#: ../lib/properties.h:541
--#: ../objects/Database/table_dialog.c:1036
--#: ../objects/Database/reference.c:117
--#: ../objects/GRAFCET/condition.c:134
--#: ../objects/GRAFCET/step.c:167
--#: ../objects/GRAFCET/transition.c:144
--#: ../objects/UML/class.c:174
--#: ../objects/UML/class_dialog.c:564
--#: ../objects/chronogram/chronoline.c:185
-+#: ../lib/properties.c:82 ../lib/properties.h:541
-+#: ../objects/Database/table_dialog.c:1037 ../objects/Database/reference.c:117
-+#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
-+#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
- #: ../objects/chronogram/chronoref.c:166
- msgid "Font"
- msgstr "Pisava"
- 
--#: ../lib/properties.c:83
--#: ../lib/properties.h:549
--#: ../objects/GRAFCET/condition.c:136
--#: ../objects/GRAFCET/step.c:169
--#: ../objects/GRAFCET/transition.c:146
--#: ../objects/chronogram/chronoline.c:187
-+#: ../lib/properties.c:83 ../lib/properties.h:549
-+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
-+#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
- #: ../objects/chronogram/chronoref.c:168
- msgid "Font size"
- msgstr "Velikost pisave"
- 
--#: ../lib/properties.c:84
--#: ../lib/properties.h:555
--#: ../objects/GRAFCET/step.c:171
--#: ../objects/chronogram/chronoline.c:189
-+#: ../lib/properties.c:84 ../lib/properties.h:555
-+#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
- #: ../objects/chronogram/chronoref.c:170
- msgid "Text color"
- msgstr "Barva besedila"
-@@ -2672,8 +2569,7 @@ msgstr "Barva besedila"
- msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
- msgstr "Ni atributa '%s' (%p) ali podatkov (%p) za ta atribut"
- 
--#: ../lib/sheet.c:69
--#: ../lib/sheet.c:84
-+#: ../lib/sheet.c:69 ../lib/sheet.c:84
- #, c-format
- msgid ""
- "DiaObject '%s' needed in sheet '%s' was not found.\n"
-@@ -2712,8 +2608,7 @@ msgid "Couldn't find font family for %s\n"
- msgstr "Družine pisav za %s ni mogo�e najti\n"
- 
- #. Translators: Menu item Noun/Material/Solid
--#: ../lib/widgets.c:896
--#: ../objects/FS/function.c:1076
-+#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
- msgid "Solid"
- msgstr "polna"
- 
-@@ -2762,19 +2657,26 @@ msgstr "Izberite datoteko s sliko"
- msgid "Browse"
- msgstr "Prebrskaj"
- 
--#: ../lib/widgets.c:2076
-+#: ../lib/widgets.c:2087
- msgid "Reset menu"
- msgstr "Ponastavi meni"
- 
- #. Installer message if no GTK+ was found
- #: ../installer/win32/gennsh.c:39
--msgid "GTK+ is not installed. Please use the full installer. It is available from http://dia-installer.de."
--msgstr "GTK+ ni nameš�en. Uporabite polno namestitev. Na voljo je tukaj: from http://dia-installer.de."
-+msgid ""
-+"GTK+ is not installed. Please use the full installer. It is available from "
-+"http://dia-installer.de."
-+msgstr ""
-+"GTK+ ni nameš�en. Uporabite polno namestitev. Na voljo je tukaj: from http://"
-+"dia-installer.de."
- 
- #. Installer message: Don't install over pre 0.95 versions
- #: ../installer/win32/gennsh.c:42
--msgid "Please remove old Dia installations completely or install Dia to a different location."
--msgstr "Odstranite starejše namestitve Dia ali pa namestite Dia na drugo mesto."
-+msgid ""
-+"Please remove old Dia installations completely or install Dia to a different "
-+"location."
-+msgstr ""
-+"Odstranite starejše namestitve Dia ali pa namestite Dia na drugo mesto."
- 
- #. Installer message:  License Page
- #: ../installer/win32/gennsh.c:45
-@@ -2783,8 +2685,12 @@ msgstr "Naprej >"
- 
- #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
- #: ../installer/win32/gennsh.c:48
--msgid "$(^Name) is released under the GPL license. The license is provided here for information purposes only. $_CLICK"
--msgstr "$(^Name) je izdan pod licenco GPL. Licenca je tukaj podana zgolj v informativne namene. $_CLICK"
-+msgid ""
-+"$(^Name) is released under the GPL license. The license is provided here for "
-+"information purposes only. $_CLICK"
-+msgstr ""
-+"$(^Name) je izdan pod licenco GPL. Licenca je tukaj podana zgolj v "
-+"informativne namene. $_CLICK"
- 
- #. Installer message: Components page
- #: ../installer/win32/gennsh.c:51
-@@ -2813,8 +2719,12 @@ msgstr "Vti�nik za Python"
- 
- #. Installer message: Component description
- #: ../installer/win32/gennsh.c:66
--msgid "Support for the Python Scripting Language 2.3. Do not select this if Python is not installed."
--msgstr "Podpora za skriptni jezik Python 2.3. Tega ne izberite, �e Python ni nameš�en."
-+msgid ""
-+"Support for the Python Scripting Language 2.3. Do not select this if Python "
-+"is not installed."
-+msgstr ""
-+"Podpora za skriptni jezik Python 2.3. Tega ne izberite, �e Python ni "
-+"nameš�en."
- 
- #. Installer message: hyperlink text on finish page
- #: ../installer/win32/gennsh.c:69
-@@ -2826,35 +2736,73 @@ msgstr "Obiš�i spletno stran Dia za Windows"
- msgid "Dia (remove only)"
- msgstr "Dia (samo odstrani)"
- 
--#. Installer message: confirmation question. Keep $\r
-+#. Installer message: directory delete confirmation line 1
- #: ../installer/win32/gennsh.c:75
--msgid "Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."
--msgstr "Vaša stara mapa Dia bo izbrisana. Želite nadaljevati?$\r$\rOpomba: Vsi nestandardni vti�niki, ki ste jih namestili, bodo zdaj izbrisani.$\rUporabniške nastavitve Dia ne bodo prizadete."
-+#| msgid ""
-+#| "The installation directory you specified already exists. Any contents$"
-+#| "\rwill be deleted. Would you like to continue?"
-+msgid ""
-+"Your old Dia directory is about to be deleted. Would you like to continue?"
-+msgstr "Vsebina vaše stare mape Dia bo izbrisana. Želite nadaljevati?"
- 
--#. Installer message: confirmatin question. Keep $\r
--#: ../installer/win32/gennsh.c:78
--msgid "The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
--msgstr "Namestitvena mapa, ki ste jo navedli, že obstaja. Celotna vsebina$\rbo izbrisana. Želite nadaljevati?"
-+#. Installer message: directory delete confirmation line 2
-+#: ../installer/win32/gennsh.c:77
-+msgid ""
-+"Note: Any non-standard plugins that you may have installed will be deleted."
-+msgstr ""
-+"Opomba: vsi nestandardni vstavki, ki ste jih namestili, bodo izbrisani."
-+
-+#. Installer message: directory delete confirmation line 3
-+#: ../installer/win32/gennsh.c:79
-+msgid "Dia user settings will not be affected."
-+msgstr "Uporabniške nastavitve Dia ne bo"
-+
-+#. Installer message: DIA_PROMPT_DIR_EXISTS line 1
-+#: ../installer/win32/gennsh.c:82
-+#| msgid ""
-+#| "The installation directory you specified already exists. Any contents$"
-+#| "\rwill be deleted. Would you like to continue?"
-+msgid "The installation directory you specified already exists. Any contents"
-+msgstr "Namestitvena mapa, ki ste jo navedli, že obstaja. Celotna vsebina"
-+
-+#. Installer message: DIA_PROMP_DIR_EXISTS line 2
-+#: ../installer/win32/gennsh.c:84
-+#| msgid "Nothing selected for saving.  Would you like to try again?"
-+msgid "will be deleted. Would you like to continue?"
-+msgstr "bo izbrisana. Želite nadaljevati?"
- 
--#. Installer message: Uninstall Section Prompts. Keep $\r
--#: ../installer/win32/gennsh.c:81
--msgid "The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."
--msgstr "Odstranitveni program ne more najti vnosov v register za program Dia.$\rNajverjetneje je ta program namestil drug uporabnik."
-+#. Installer message: registry entries not found line 1
-+#: ../installer/win32/gennsh.c:87
-+#| msgid ""
-+#| "The uninstaller could not find registry entries for Dia.$\rIt is likely "
-+#| "that another user installed this application."
-+msgid "The uninstaller could not find registry entries for Dia."
-+msgstr "Odstranitveni program ne more najti vnosov v register za program Dia."
-+
-+#. Installer message: registry entries not found line 2
-+#: ../installer/win32/gennsh.c:89
-+#| msgid ""
-+#| "The uninstaller could not find registry entries for Dia.$\rIt is likely "
-+#| "that another user installed this application."
-+msgid "It is likely that another user installed this application."
-+msgstr "Najverjetneje je ta program namestil drug uporabnik."
- 
- #. Installer message: Uninstall error message
--#: ../installer/win32/gennsh.c:84
-+#: ../installer/win32/gennsh.c:92
- msgid "You do not have permission to uninstall this application."
- msgstr "Nimate pravic za odstranitev tega programa."
- 
- #. Installer message: Uninstallation warning. Keep $INSTDIR
--#: ../installer/win32/gennsh.c:87
-+#: ../installer/win32/gennsh.c:95
- msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
- msgstr "To bo povsem izbrisalo $INSTDIR in vse podmape. Želite nadaljevati?"
- 
- #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
--#: ../installer/win32/gennsh.c:90
--msgid "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
--msgstr "To bo povsem izbrisalo $PROFILE\\.dia in vse podmape. Želite nadaljevati?"
-+#: ../installer/win32/gennsh.c:98
-+msgid ""
-+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-+msgstr ""
-+"To bo povsem izbrisalo $PROFILE\\.dia in vse podmape. Želite nadaljevati?"
- 
- #: ../objects/AADL/aadl.c:52
- msgid "Architecture Analysis & Design Language diagram objects"
-@@ -2960,16 +2908,11 @@ msgstr "Komponenta"
- msgid "Entity/Relationship table diagram objects"
- msgstr "Predmeti diagrama tabele entitet/odnosov"
- 
--#: ../objects/Database/table.c:142
--#: ../objects/Database/table.c:183
--#: ../objects/Database/table.c:200
--#: ../objects/UML/class.c:148
--#: ../objects/UML/class.c:189
--#: ../objects/UML/class_dialog.c:595
--#: ../objects/UML/umlattribute.c:43
--#: ../objects/UML/umloperation.c:66
--#: ../objects/UML/umlparameter.c:49
--#: ../sheets/SDL.sheet.in.h:3
-+#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
-+#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
-+#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
-+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
- msgid "Comment"
- msgstr "Opomba"
- 
-@@ -2989,26 +2932,21 @@ msgstr "Enozna�no"
- msgid "Visible comments"
- msgstr "Vidne opombe"
- 
--#: ../objects/Database/table.c:187
--#: ../objects/UML/class.c:171
-+#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
- msgid "Comment tagging"
- msgstr "Ozna�evanje opomb"
- 
--#: ../objects/Database/table.c:189
--#: ../objects/Database/table_dialog.c:976
-+#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:977
- msgid "Underline primary keys"
- msgstr "Pod�rtaj osnovne klju�e"
- 
--#: ../objects/Database/table.c:191
--#: ../objects/Database/table_dialog.c:981
-+#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:982
- msgid "Use bold font for primary keys"
- msgstr "Uporabi odobeljeno pisavo za osnovne klju�e"
- 
- #. property rows
--#: ../objects/Database/table.c:196
--#: ../objects/SADT/arrow.c:137
--#: ../objects/UML/class.c:179
--#: ../objects/UML/class_dialog.c:570
-+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
-+#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
- msgid "Normal"
- msgstr "Obi�ajna"
- 
-@@ -3016,27 +2954,18 @@ msgstr "Obi�ajna"
- msgid "Tablename"
- msgstr "Ime razpredelnice"
- 
--#: ../objects/Database/table.c:203
--#: ../objects/Database/table.c:205
--#: ../objects/Database/table.c:207
--#: ../objects/Database/reference.c:120
--#: ../objects/UML/association.c:245
--#: ../objects/UML/association.c:256
--#: ../objects/UML/association.c:258
--#: ../objects/UML/association.c:260
--#: ../objects/UML/association.c:262
--#: ../objects/UML/association.c:264
--#: ../objects/UML/class.c:193
--#: ../objects/UML/class.c:195
--#: ../objects/UML/class.c:197
--#: ../objects/UML/class.c:199
--#: ../objects/UML/class.c:201
--#: ../objects/UML/class.c:203
-+#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
-+#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
-+#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-+#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
-+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-+#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
-+#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
-+#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
- msgid " "
- msgstr " "
- 
--#: ../objects/Database/table.c:211
--#: ../objects/UML/class.c:209
-+#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
- #: ../objects/UML/object.c:157
- msgid "Attributes"
- msgstr "Atributi"
-@@ -3046,137 +2975,125 @@ msgid "Show comments"
- msgstr "Pokaži opombe"
- 
- #. init data
--#: ../objects/Database/table.c:253
--#: ../objects/Database/table.c:356
--#: ../sheets/Database.sheet.in.h:5
-+#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
-+#: ../sheets/Database.sheet.in.h:3
- msgid "Table"
- msgstr "Razpredelnica"
- 
- #. Attributes page:
--#: ../objects/Database/table_dialog.c:611
--#: ../objects/UML/class_dialog.c:1081
-+#: ../objects/Database/table_dialog.c:612 ../objects/UML/class_dialog.c:1081
- msgid "_Attributes"
- msgstr "_Atributi"
- 
- #. the "new" button
--#: ../objects/Database/table_dialog.c:639
--#: ../objects/SISSI/sissi_dialog.c:739
-+#: ../objects/Database/table_dialog.c:640 ../objects/SISSI/sissi_dialog.c:739
- #: ../objects/SISSI/sissi_dialog.c:871
- msgid "_New"
- msgstr "_Nov"
- 
- #. the "delete" button
--#: ../objects/Database/table_dialog.c:647
-+#: ../objects/Database/table_dialog.c:648
- msgid "_Delete"
- msgstr "I_zbriši"
- 
- #. the "Move up" button
--#: ../objects/Database/table_dialog.c:655
-+#: ../objects/Database/table_dialog.c:656
- msgid "Move up"
- msgstr "Premakni navzgor"
- 
- #. the "Move down" button
--#: ../objects/Database/table_dialog.c:663
-+#: ../objects/Database/table_dialog.c:664
- msgid "Move down"
- msgstr "Premakni navzdol"
- 
--#: ../objects/Database/table_dialog.c:673
--#: ../objects/UML/class_dialog.c:1138
-+#: ../objects/Database/table_dialog.c:674 ../objects/UML/class_dialog.c:1138
- msgid "Attribute data"
- msgstr "Podatki atributa"
- 
--#: ../objects/Database/table_dialog.c:707
--#: ../objects/Database/table_dialog.c:946
--#: ../objects/Database/table_dialog.c:1051
--#: ../objects/UML/class_dialog.c:452
--#: ../objects/UML/class_dialog.c:1181
--#: ../objects/UML/class_dialog.c:2111
-+#: ../objects/Database/table_dialog.c:708
-+#: ../objects/Database/table_dialog.c:947
-+#: ../objects/Database/table_dialog.c:1052 ../objects/UML/class_dialog.c:452
-+#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
- #: ../objects/UML/class_dialog.c:2283
- msgid "Comment:"
- msgstr "Opomba:"
- 
--#: ../objects/Database/table_dialog.c:726
-+#: ../objects/Database/table_dialog.c:727
- msgid "_Primary key"
- msgstr "_Osnovni klju�"
- 
--#: ../objects/Database/table_dialog.c:733
-+#: ../objects/Database/table_dialog.c:734
- msgid "N_ullable"
- msgstr "N_i�elno"
- 
--#: ../objects/Database/table_dialog.c:740
-+#: ../objects/Database/table_dialog.c:741
- msgid "Uni_que"
- msgstr "_Enozna�no"
- 
--#: ../objects/Database/table_dialog.c:928
-+#: ../objects/Database/table_dialog.c:929
- msgid "_Table"
- msgstr "_Razpredelnica"
- 
--#: ../objects/Database/table_dialog.c:936
-+#: ../objects/Database/table_dialog.c:937
- msgid "Table name:"
- msgstr "Ime razpredelnice:"
- 
- #. XXX create a handler and disable the 'show documentation tag' checkbox
- #. if 'comment visible' is not active.
--#: ../objects/Database/table_dialog.c:966
-+#: ../objects/Database/table_dialog.c:967
- msgid "Comment visible"
- msgstr "Vidne opombe"
- 
--#: ../objects/Database/table_dialog.c:971
--#: ../objects/UML/class_dialog.c:522
-+#: ../objects/Database/table_dialog.c:972 ../objects/UML/class_dialog.c:522
- msgid "Show documentation tag"
- msgstr "Pokaži oznako dokumentacije"
- 
- #. * Fonts and Colors selection *
--#: ../objects/Database/table_dialog.c:1010
--#: ../objects/UML/class_dialog.c:551
-+#: ../objects/Database/table_dialog.c:1011 ../objects/UML/class_dialog.c:551
- msgid "_Style"
- msgstr "_Slog"
- 
--#: ../objects/Database/table_dialog.c:1021
-+#: ../objects/Database/table_dialog.c:1022
- msgid "Border width:"
- msgstr "Å irina robu:"
- 
- #. head line
--#: ../objects/Database/table_dialog.c:1034
--#: ../objects/UML/class_dialog.c:561
-+#: ../objects/Database/table_dialog.c:1035 ../objects/UML/class_dialog.c:561
- #: ../objects/UML/umlparameter.c:51
- msgid "Kind"
- msgstr "Vrsta"
- 
--#: ../objects/Database/table_dialog.c:1038
--#: ../objects/UML/class_dialog.c:566
-+#: ../objects/Database/table_dialog.c:1039 ../objects/UML/class_dialog.c:566
- msgid "Size"
- msgstr "Velikost"
- 
--#: ../objects/Database/table_dialog.c:1041
-+#: ../objects/Database/table_dialog.c:1042
- msgid "Normal:"
- msgstr "Obi�ajno:"
- 
--#: ../objects/Database/table_dialog.c:1062
-+#: ../objects/Database/table_dialog.c:1063
- msgid "Text Color:"
- msgstr "Barva besedila:"
- 
--#: ../objects/Database/table_dialog.c:1070
-+#: ../objects/Database/table_dialog.c:1071
- msgid "Foreground Color:"
- msgstr "Barva pisave:"
- 
- #. two chars at the beginning
--#: ../objects/Database/table_dialog.c:1383
-+#: ../objects/Database/table_dialog.c:1384
- msgid "not null"
- msgstr "ni null"
- 
--#: ../objects/Database/table_dialog.c:1384
-+#: ../objects/Database/table_dialog.c:1385
- msgid "null"
- msgstr "null"
- 
--#: ../objects/Database/table_dialog.c:1385
-+#: ../objects/Database/table_dialog.c:1386
- msgid "unique"
- msgstr "enozna�no"
- 
--#: ../objects/Database/reference.c:108
--#: ../objects/flowchart/box.c:152
--#: ../objects/standard/box.c:152
--#: ../objects/standard/polyline.c:136
-+#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
-+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
- #: ../objects/standard/zigzagline.c:132
- msgid "Corner radius"
- msgstr "Radij vogala"
-@@ -3189,42 +3106,27 @@ msgstr "Za�ni opis"
- msgid "End description"
- msgstr "Kon�aj opis"
- 
--#: ../objects/Database/reference.c:144
--#: ../objects/ER/participation.c:408
--#: ../objects/FS/flow-ortho.c:626
--#: ../objects/GRAFCET/vector.c:314
--#: ../objects/SADT/arrow.c:464
--#: ../objects/UML/association.c:854
--#: ../objects/UML/component_feature.c:190
--#: ../objects/UML/dependency.c:376
--#: ../objects/UML/generalization.c:372
--#: ../objects/UML/realizes.c:363
--#: ../objects/UML/transition.c:172
--#: ../objects/standard/bezier.c:731
--#: ../objects/standard/beziergon.c:495
--#: ../objects/standard/zigzagline.c:380
-+#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
-+#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
-+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
-+#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
-+#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
-+#: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
-+#: ../objects/standard/beziergon.c:495 ../objects/standard/zigzagline.c:380
- msgid "Add segment"
- msgstr "Dodaj odsek"
- 
--#: ../objects/Database/reference.c:145
--#: ../objects/ER/participation.c:409
--#: ../objects/FS/flow-ortho.c:627
--#: ../objects/GRAFCET/vector.c:315
--#: ../objects/SADT/arrow.c:465
--#: ../objects/UML/association.c:855
--#: ../objects/UML/component_feature.c:191
--#: ../objects/UML/dependency.c:377
--#: ../objects/UML/generalization.c:373
--#: ../objects/UML/realizes.c:364
--#: ../objects/UML/transition.c:173
--#: ../objects/standard/bezier.c:732
--#: ../objects/standard/beziergon.c:496
--#: ../objects/standard/zigzagline.c:381
-+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
-+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
-+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
-+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
-+#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
-+#: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
-+#: ../objects/standard/beziergon.c:496 ../objects/standard/zigzagline.c:381
- msgid "Delete segment"
- msgstr "Izbriši odsek"
- 
--#: ../objects/Database/reference.c:151
--#: ../sheets/Database.sheet.in.h:4
-+#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
- msgid "Reference"
- msgstr "Navezave"
- 
-@@ -3244,8 +3146,7 @@ msgstr "Izpeljan:"
- msgid "Multivalue:"
- msgstr "Ve� vrednosti:"
- 
--#: ../objects/ER/attribute.c:436
--#: ../sheets/ER.sheet.in.h:1
-+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:6
- msgid "Attribute"
- msgstr "Atribut"
- 
-@@ -3257,9 +3158,8 @@ msgstr "Å ibak:"
- msgid "Associative:"
- msgstr "Združevalen:"
- 
--#: ../objects/ER/entity.c:415
--#: ../objects/UML/classicon.c:131
--#: ../sheets/ER.sheet.in.h:4
-+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
-+#: ../sheets/ER.sheet.in.h:3
- msgid "Entity"
- msgstr "Entiteta"
- 
-@@ -3287,25 +3187,20 @@ msgstr "Zasukaj:"
- msgid "Identifying:"
- msgstr "Ozna�ujo�:"
- 
--#: ../objects/ER/relationship.c:459
--#: ../sheets/ER.sheet.in.h:6
-+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:5
- msgid "Relationship"
- msgstr "Relacija"
- 
- #. Translators: Menu item Noun/Energy
--#: ../objects/FS/flow-ortho.c:160
--#: ../objects/FS/flow-ortho.c:623
--#: ../objects/FS/flow.c:137
--#: ../objects/FS/flow.c:625
-+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
-+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
- #: ../objects/FS/function.c:1098
- msgid "Energy"
- msgstr "Energija"
- 
- #. Translators: Menu item Noun/Material
--#: ../objects/FS/flow-ortho.c:161
--#: ../objects/FS/flow-ortho.c:624
--#: ../objects/FS/flow.c:138
--#: ../objects/FS/flow.c:626
-+#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
-+#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
- #: ../objects/FS/function.c:1074
- msgid "Material"
- msgstr "Material"
-@@ -3314,14 +3209,10 @@ msgstr "Material"
- #. Translators: Menu item Verb/Signal/Signal
- #. Translators: Menu item Noun/Signal
- #. Translators: Menu item Noun/Signal/Signal
--#: ../objects/FS/flow-ortho.c:162
--#: ../objects/FS/flow-ortho.c:625
--#: ../objects/FS/flow.c:139
--#: ../objects/FS/flow.c:627
--#: ../objects/FS/function.c:1036
--#: ../objects/FS/function.c:1038
--#: ../objects/FS/function.c:1174
--#: ../objects/FS/function.c:1176
-+#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
-+#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
-+#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
-+#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
- msgid "Signal"
- msgstr "Signal"
- 
-@@ -3345,22 +3236,19 @@ msgstr "Glagol"
- #. Translators: Menu item Verb/Channel
- #. Translators: Menu item Verb/Channel/Channel
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
--#: ../objects/FS/function.c:680
--#: ../objects/FS/function.c:682
-+#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
- #: ../objects/FS/function.c:722
- msgid "Channel"
- msgstr "Kanaliziraj"
- 
- #. Translators: Menu item Verb/Channel/Import
- #. Translators: Menu item Verb/Channel/Import/Import
--#: ../objects/FS/function.c:684
--#: ../objects/FS/function.c:686
-+#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
- msgid "Import"
- msgstr "Uvozi"
- 
- #. Translators: Menu item Verb/Channel/Import/Input
--#: ../objects/FS/function.c:688
--#: ../objects/KAOS/metabinrel.c:165
-+#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
- msgid "Input"
- msgstr "Vnesi"
- 
-@@ -3371,8 +3259,7 @@ msgstr "Sprejmi"
- 
- #. Translators: Menu item Verb/Channel/Import/Allow
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
--#: ../objects/FS/function.c:692
--#: ../objects/FS/function.c:964
-+#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
- msgid "Allow"
- msgstr "Dovoli"
- 
-@@ -3383,8 +3270,7 @@ msgstr "Tvori vhod"
- 
- #. Translators: Menu item Verb/Channel/Import/Capture
- #. Translators: Menu item Verb/Provision/Store/Capture
--#: ../objects/FS/function.c:696
--#: ../objects/FS/function.c:930
-+#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
- msgid "Capture"
- msgstr "Zajemi"
- 
-@@ -3406,16 +3292,14 @@ msgstr "Odvrzi"
- #. Translators: Menu item Verb/Channel/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transfer
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
--#: ../objects/FS/function.c:710
--#: ../objects/FS/function.c:712
-+#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
- #: ../objects/FS/function.c:730
- msgid "Transfer"
- msgstr "Prenesi"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transport
- #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
--#: ../objects/FS/function.c:714
--#: ../objects/FS/function.c:716
-+#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
- msgid "Transport"
- msgstr "Transportiraj"
- 
-@@ -3431,8 +3315,7 @@ msgstr "Premakni"
- 
- #. Translators: Menu item Verb/Channel/Transfer/Transmit
- #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
--#: ../objects/FS/function.c:724
--#: ../objects/FS/function.c:726
-+#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
- msgid "Transmit"
- msgstr "Oddaj"
- 
-@@ -3449,8 +3332,7 @@ msgstr "Podaj"
- #. Translators: Menu item Verb/Channel/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide
- #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
--#: ../objects/FS/function.c:734
--#: ../objects/FS/function.c:736
-+#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
- #: ../objects/FS/function.c:738
- msgid "Guide"
- msgstr "Vodi"
-@@ -3477,8 +3359,7 @@ msgstr "Prevedi"
- 
- #. Translators: Menu item Verb/Channel/Guide/Rotate
- #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
--#: ../objects/FS/function.c:748
--#: ../objects/FS/function.c:750
-+#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
- msgid "Rotate"
- msgstr "Zasukaj"
- 
-@@ -3494,8 +3375,7 @@ msgstr "Zavrti"
- 
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF
- #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
--#: ../objects/FS/function.c:756
--#: ../objects/FS/function.c:758
-+#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
- msgid "Allow DOF"
- msgstr "Dovoli DOF"
- 
-@@ -3511,16 +3391,14 @@ msgstr "Odkleni"
- 
- #. Translators: Menu item Verb/Support
- #. Translators: Menu item Verb/Support/Support
--#: ../objects/FS/function.c:764
--#: ../objects/FS/function.c:766
-+#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
- msgid "Support"
- msgstr "Podpri"
- 
- #. Translators: Menu item Verb/Support/Stop
- #. Translators: Menu item Verb/Support/Stop/Stop
--#: ../objects/FS/function.c:768
--#: ../objects/FS/function.c:770
--#: ../sheets/SDL.sheet.in.h:19
-+#: ../objects/FS/function.c:768 ../objects/FS/function.c:770
-+#: ../sheets/SDL.sheet.in.h:16
- msgid "Stop"
- msgstr "Ustavi"
- 
-@@ -3536,8 +3414,7 @@ msgstr "Zaš�iti"
- 
- #. Translators: Menu item Verb/Support/Stop/Prevent
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
--#: ../objects/FS/function.c:776
--#: ../objects/FS/function.c:966
-+#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
- msgid "Prevent"
- msgstr "Prepre�i"
- 
-@@ -3553,8 +3430,7 @@ msgstr "Oviraj"
- 
- #. Translators: Menu item Verb/Support/Stabilize
- #. Translators: Menu item Verb/Support/Stabilize/Stabilize
--#: ../objects/FS/function.c:782
--#: ../objects/FS/function.c:784
-+#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
- msgid "Stabilize"
- msgstr "Stabiliziraj"
- 
-@@ -3565,15 +3441,13 @@ msgstr "Umiri"
- 
- #. Translators: Menu item Verb/Support/Secure
- #. Translators: Menu item Verb/Support/Secure/Secure
--#: ../objects/FS/function.c:788
--#: ../objects/FS/function.c:790
-+#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
- msgid "Secure"
- msgstr "Zavaruj"
- 
- #. Translators: Menu item Verb/Support/Secure/Attach
- #. Translators: Menu item Verb/Connect/Couple/Attach
--#: ../objects/FS/function.c:792
--#: ../objects/FS/function.c:824
-+#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
- msgid "Attach"
- msgstr "Pripni"
- 
-@@ -3583,8 +3457,7 @@ msgid "Mount"
- msgstr "Priklopi"
- 
- #. Translators: Menu item Verb/Support/Secure/Lock
--#: ../objects/FS/function.c:796
--#: ../sheets/ciscomisc.sheet.in.h:19
-+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
- msgid "Lock"
- msgstr "Zakleni"
- 
-@@ -3600,8 +3473,7 @@ msgstr "Drži"
- 
- #. Translators: Menu item Verb/Support/Position
- #. Translators: Menu item Verb/Support/Position/Position
--#: ../objects/FS/function.c:802
--#: ../objects/FS/function.c:804
-+#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
- #: ../objects/Istar/actor.c:70
- msgid "Position"
- msgstr "Pozicioniraj"
-@@ -3613,22 +3485,19 @@ msgstr "Orientiraj"
- 
- #. Translators: Menu item Verb/Support/Position/Locate
- #. Translators: Menu item Verb/Signal/Sense/Locate
--#: ../objects/FS/function.c:810
--#: ../objects/FS/function.c:1052
-+#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
- msgid "Locate"
- msgstr "Lociraj"
- 
- #. Translators: Menu item Verb/Connect
- #. Translators: Menu item Verb/Connect/Connect
--#: ../objects/FS/function.c:812
--#: ../objects/FS/function.c:814
-+#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
- msgid "Connect"
- msgstr "Poveži"
- 
- #. Translators: Menu item Verb/Connect/Couple
- #. Translators: Menu item Verb/Connect/Couple/Couple
--#: ../objects/FS/function.c:816
--#: ../objects/FS/function.c:818
-+#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
- msgid "Couple"
- msgstr "Popar�kaj"
- 
-@@ -3644,8 +3513,7 @@ msgstr "Sestavi"
- 
- #. Translators: Menu item Verb/Connect/Mix
- #. Translators: Menu item Verb/Connect/Mix/Mix
--#: ../objects/FS/function.c:826
--#: ../objects/FS/function.c:828
-+#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
- msgid "Mix"
- msgstr "Zmešaj"
- 
-@@ -3676,17 +3544,15 @@ msgstr "Zlij"
- 
- #. Translators: Menu item Verb/Branch
- #. Translators: Menu item Verb/Branch/Branch
--#: ../objects/FS/function.c:840
--#: ../objects/FS/function.c:842
--#: ../sheets/UML.sheet.in.h:5
-+#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
-+#: ../sheets/UML.sheet.in.h:30
- msgid "Branch"
- msgstr "Razvejaj"
- 
- #. Translators: Menu item Verb/Branch/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate
- #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
--#: ../objects/FS/function.c:844
--#: ../objects/FS/function.c:846
-+#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
- #: ../objects/FS/function.c:848
- msgid "Separate"
- msgstr "Lo�i"
-@@ -3743,8 +3609,7 @@ msgstr "Struži"
- 
- #. Translators: Menu item Verb/Branch/Refine
- #. Translators: Menu item Verb/Branch/Refine/Refine
--#: ../objects/FS/function.c:874
--#: ../objects/FS/function.c:876
-+#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
- msgid "Refine"
- msgstr "Izpili"
- 
-@@ -3775,8 +3640,7 @@ msgstr "Po�isti"
- 
- #. Translators: Menu item Verb/Branch/Distribute
- #. Translators: Menu item Verb/Branch/Distribute/Distribute
--#: ../objects/FS/function.c:888
--#: ../objects/FS/function.c:890
-+#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
- msgid "Distribute"
- msgstr "Porazdeli"
- 
-@@ -3797,8 +3661,7 @@ msgstr "Rakropi"
- 
- #. Translators: Menu item Verb/Branch/Distribute/Diffuse
- #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
--#: ../objects/FS/function.c:898
--#: ../objects/FS/function.c:912
-+#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
- msgid "Diffuse"
- msgstr "Razprši"
- 
-@@ -3809,8 +3672,7 @@ msgstr "Sprazni"
- 
- #. Translators: Menu item Verb/Branch/Dissipate
- #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
--#: ../objects/FS/function.c:902
--#: ../objects/FS/function.c:904
-+#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
- msgid "Dissipate"
- msgstr "Razprši"
- 
-@@ -3836,15 +3698,13 @@ msgstr "Upri"
- 
- #. Translators: Menu item Verb/Provision
- #. Translators: Menu item Verb/Provision/Provision
--#: ../objects/FS/function.c:916
--#: ../objects/FS/function.c:918
-+#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
- msgid "Provision"
- msgstr "Priprava"
- 
- #. Translators: Menu item Verb/Provision/Store
- #. Translators: Menu item Verb/Provision/Store/Store
--#: ../objects/FS/function.c:920
--#: ../objects/FS/function.c:922
-+#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
- msgid "Store"
- msgstr "Shrani"
- 
-@@ -3865,8 +3725,7 @@ msgstr "Rezerviraj"
- 
- #. Translators: Menu item Verb/Provision/Supply
- #. Translators: Menu item Verb/Provision/Supply/Supply
--#: ../objects/FS/function.c:932
--#: ../objects/FS/function.c:934
-+#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
- msgid "Supply"
- msgstr "Dostavi"
- 
-@@ -3891,22 +3750,19 @@ msgid "Expose"
- msgstr "Izpostavi"
- 
- #. Translators: Menu item Verb/Provision/Extract
--#: ../objects/FS/function.c:944
--#: ../sheets/Flowchart.sheet.in.h:9
-+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
- msgid "Extract"
- msgstr "Izvleci"
- 
- #. Translators: Menu item Verb/Control Magnitude
- #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
--#: ../objects/FS/function.c:946
--#: ../objects/FS/function.c:948
-+#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
- msgid "Control Magnitude"
- msgstr "Nadziraj pove�avo"
- 
- #. Translators: Menu item Verb/Control Magnitude/Actuate
- #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
--#: ../objects/FS/function.c:950
--#: ../objects/FS/function.c:952
-+#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
- msgid "Actuate"
- msgstr "Zagibaj"
- 
-@@ -3922,15 +3778,13 @@ msgstr "Iniciraj"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
--#: ../objects/FS/function.c:958
--#: ../objects/FS/function.c:960
-+#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
- msgid "Regulate"
- msgstr "Reguliraj"
- 
- #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
- #. Translators: Menu item Noun/Signal/Control
--#: ../objects/FS/function.c:962
--#: ../objects/FS/function.c:1180
-+#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
- #: ../objects/UML/classicon.c:129
- msgid "Control"
- msgstr "Nadziraj"
-@@ -3957,8 +3811,7 @@ msgstr "Prekini"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change
- #. Translators: Menu item Verb/Control Magnitude/Change/Change
--#: ../objects/FS/function.c:976
--#: ../objects/FS/function.c:978
-+#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
- msgid "Change"
- msgstr "Spremeni"
- 
-@@ -3994,8 +3847,7 @@ msgstr "Pomnoži"
- 
- #. Translators: Menu item Verb/Control Magnitude/Change/Scale
- #. FIXME: mark read-only
--#: ../objects/FS/function.c:994
--#: ../objects/Misc/measure.c:186
-+#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:186
- msgid "Scale"
- msgstr "Pove�aj/pomanjšaj"
- 
-@@ -4011,8 +3863,7 @@ msgstr "Prilagodi"
- 
- #. Translators: Menu item Verb/Control Magnitude/Form
- #. Translators: Menu item Verb/Control Magnitude/Form/Form
--#: ../objects/FS/function.c:1000
--#: ../objects/FS/function.c:1002
-+#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
- msgid "Form"
- msgstr "Oblikuj"
- 
-@@ -4043,8 +3894,7 @@ msgstr "Prebodi"
- 
- #. Translators: Menu item Verb/Convert
- #. Translators: Menu item Verb/Convert/Convert
--#: ../objects/FS/function.c:1014
--#: ../objects/FS/function.c:1016
-+#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
- msgid "Convert"
- msgstr "Pretvori"
- 
-@@ -4091,16 +3941,14 @@ msgstr "Diferenciraj"
- # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- # FIXME
- #. Translators: Menu item Verb/Convert/Process
--#: ../objects/FS/function.c:1034
--#: ../sheets/AADL.sheet.in.h:8
-+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
- #: ../sheets/Gane_and_Sarson.sheet.in.h:7
- msgid "Process"
- msgstr "Procesiraj"
- 
- #. Translators: Menu item Verb/Signal/Sense
- #. Translators: Menu item Verb/Signal/Sense/Sense
--#: ../objects/FS/function.c:1040
--#: ../objects/FS/function.c:1042
-+#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
- msgid "Sense"
- msgstr "Zaznaj"
- 
-@@ -4131,8 +3979,7 @@ msgstr "Preveri"
- 
- #. Translators: Menu item Verb/Signal/Indicate
- #. Translators: Menu item Verb/Signal/Indicate/Indicate
--#: ../objects/FS/function.c:1056
--#: ../objects/FS/function.c:1058
-+#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
- msgid "Indicate"
- msgstr "Nakaži"
- 
-@@ -4142,15 +3989,13 @@ msgid "Mark"
- msgstr "Ozna�i"
- 
- #. Translators: Menu item Verb/Signal/Display
--#: ../objects/FS/function.c:1062
--#: ../sheets/Flowchart.sheet.in.h:7
-+#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
- msgid "Display"
- msgstr "Pokaži"
- 
- #. Translators: Menu item Verb/Signal/Measure
- #. Translators: Menu item Verb/Signal/Measure/Measure
--#: ../objects/FS/function.c:1064
--#: ../objects/FS/function.c:1066
-+#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
- msgid "Measure"
- msgstr "Izmeri"
- 
-@@ -4182,8 +4027,7 @@ msgstr "Plin"
- #. Translators: Menu item Noun/Material/Human
- #. Translators: Menu item Noun/Material/Human/Human
- #. Translators: Menu item Noun/Energy/Human
--#: ../objects/FS/function.c:1082
--#: ../objects/FS/function.c:1084
-+#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
- #: ../objects/FS/function.c:1168
- msgid "Human"
- msgstr "ÄŒlovek"
-@@ -4239,8 +4083,7 @@ msgid "Force"
- msgstr "Sila"
- 
- #. Translators: Menu item Noun/Energy/Mechanical/Rotation
--#: ../objects/FS/function.c:1108
--#: ../objects/standard/outline.c:206
-+#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
- msgid "Rotation"
- msgstr "Rotacija"
- 
-@@ -4326,8 +4169,7 @@ msgstr "Konvekcija"
- 
- #. Translators: Menu item Noun/Energy/Thermal/Radiation
- #. Translators: Menu item Noun/Energy/Radioactive/Radiation
--#: ../objects/FS/function.c:1142
--#: ../objects/FS/function.c:1150
-+#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
- msgid "Radiation"
- msgstr "Sevanje"
- 
-@@ -4409,8 +4251,7 @@ msgstr "Funkcija uporabnika/naprave"
- msgid "Wish Fn"
- msgstr "Funkcija želje"
- 
--#: ../objects/GRAFCET/action.c:137
--#: ../sheets/SDL.sheet.in.h:9
-+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:11
- msgid "Macro call"
- msgstr "Klic makra"
- 
-@@ -4434,8 +4275,7 @@ msgstr "Pisava pogoja"
- msgid "The condition's font size"
- msgstr "Velikost pisave pogoja"
- 
--#: ../objects/GRAFCET/condition.c:139
--#: ../objects/GRAFCET/transition.c:149
-+#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
- msgid "Color"
- msgstr "Barva"
- 
-@@ -4447,28 +4287,23 @@ msgstr "Barva pogoja"
- msgid "GRAFCET diagram objects"
- msgstr "Diagramski predmeti GRAFCET"
- 
--#: ../objects/GRAFCET/step.c:148
--#: ../sheets/GRAFCET.sheet.in.h:13
-+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:3
- msgid "Regular step"
- msgstr "Obi�ajen korak"
- 
--#: ../objects/GRAFCET/step.c:149
--#: ../sheets/GRAFCET.sheet.in.h:6
-+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:4
- msgid "Initial step"
- msgstr "Za�etni korak"
- 
--#: ../objects/GRAFCET/step.c:150
--#: ../sheets/GRAFCET.sheet.in.h:8
-+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:5
- msgid "Macro entry step"
- msgstr "Korak vstopa v makro"
- 
--#: ../objects/GRAFCET/step.c:151
--#: ../sheets/GRAFCET.sheet.in.h:9
-+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:6
- msgid "Macro exit step"
- msgstr "Korak izstopa iz makra"
- 
--#: ../objects/GRAFCET/step.c:152
--#: ../sheets/GRAFCET.sheet.in.h:7
-+#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
- msgid "Macro call step"
- msgstr "Korak klica makra"
- 
-@@ -4544,22 +4379,16 @@ msgstr "IN"
- msgid "Vergent type:"
- msgstr "Vrsta Vergnet:"
- 
--#: ../objects/GRAFCET/vergent.c:407
--#: ../objects/Istar/other.c:471
--#: ../objects/Jackson/domain.c:533
--#: ../objects/KAOS/goal.c:574
--#: ../objects/KAOS/other.c:527
--#: ../objects/SADT/box.c:454
-+#: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
-+#: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
- #: ../objects/standard/line.c:223
- msgid "Add connection point"
- msgstr "Dodaj to�ko povezave"
- 
--#: ../objects/GRAFCET/vergent.c:408
--#: ../objects/Istar/other.c:472
--#: ../objects/Jackson/domain.c:534
--#: ../objects/KAOS/goal.c:575
--#: ../objects/KAOS/other.c:528
--#: ../objects/SADT/box.c:455
-+#: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
-+#: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
- #: ../objects/standard/line.c:224
- msgid "Delete connection point"
- msgstr "Izbriši to�ko povezave"
-@@ -4568,35 +4397,28 @@ msgstr "Izbriši to�ko povezave"
- msgid "GRAFCET OR/AND vergent"
- msgstr "GRAFCET ALI/IN vergent"
- 
--#: ../objects/Istar/actor.c:68
--#: ../objects/Istar/link.c:150
-+#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
- msgid "Unspecified"
- msgstr "Nedolo�eno"
- 
--#: ../objects/Istar/actor.c:69
--#: ../objects/KAOS/other.c:75
-+#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
- msgid "Agent"
- msgstr "Agent"
- 
--#: ../objects/Istar/actor.c:71
--#: ../objects/UML/association.c:247
-+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
- msgid "Role"
- msgstr "Vloga"
- 
--#: ../objects/Istar/goal.c:76
--#: ../objects/KAOS/goal.c:79
-+#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
- msgid "Softgoal"
- msgstr "Mehki cilj"
- 
--#: ../objects/Istar/goal.c:77
--#: ../objects/KAOS/goal.c:80
-+#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
- msgid "Goal"
- msgstr "Cilj"
- 
--#: ../objects/Istar/goal.c:156
--#: ../objects/Istar/goal.c:157
--#: ../objects/KAOS/goal.c:159
--#: ../objects/KAOS/goal.c:160
-+#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-+#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
- msgid "Goal Type"
- msgstr "Vrsta cilja"
- 
-@@ -4612,8 +4434,7 @@ msgstr "Pozitiven prispevek"
- msgid "Negative contrib"
- msgstr "Negativen prispevek"
- 
--#: ../objects/Istar/link.c:153
--#: ../sheets/UML.sheet.in.h:10
-+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:6
- msgid "Dependency"
- msgstr "Odvisnost"
- 
-@@ -4629,8 +4450,7 @@ msgstr "Sredstvo-cilj"
- msgid "Resource"
- msgstr "Vir"
- 
--#: ../objects/Istar/other.c:74
--#: ../sheets/BPMN.sheet.in.h:43
-+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:33
- msgid "Task"
- msgstr "Naloga"
- 
-@@ -4662,8 +4482,7 @@ msgstr "Pokoren"
- msgid "Lexical"
- msgstr "Slovarski"
- 
--#: ../objects/Jackson/domain.c:178
--#: ../objects/Jackson/domain.c:179
-+#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
- msgid "Domain Type"
- msgstr "Vrsta domene"
- 
-@@ -4687,15 +4506,13 @@ msgstr "Jacksonov diagram"
- msgid "Shared"
- msgstr "Deljeno"
- 
--#: ../objects/Jackson/phenomenon.c:137
--#: ../objects/KAOS/goal.c:81
-+#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
- msgid "Requirement"
- msgstr "Zahteva"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule
--#: ../objects/Jackson/phenomenon.c:144
--#: ../objects/UML/message.c:153
-+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
- #: ../objects/UML/message.c:155
- msgid "Message:"
- msgstr "Sporo�ilo:"
-@@ -4849,8 +4666,7 @@ msgid "pi"
- msgstr "pi"
- 
- #. PROP_FLAG_VISIBLE|
--#: ../objects/Misc/measure.c:185
--#: ../sheets/ChemEng.sheet.in.h:28
-+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
- msgid "Measurement"
- msgstr "Mera"
- 
-@@ -4862,13 +4678,11 @@ msgstr "Enota"
- msgid "Precision"
- msgstr "Natan�nost"
- 
--#: ../objects/Misc/tree.c:605
--#: ../objects/network/bus.c:613
-+#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
- msgid "Add Handle"
- msgstr "Dodaj ro�ico"
- 
--#: ../objects/Misc/tree.c:606
--#: ../objects/network/bus.c:614
-+#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
- msgid "Delete Handle"
- msgstr "Izbriši ro�ico"
- 
-@@ -4897,19 +4711,20 @@ msgid "Automatically gray vertical flows:"
- msgstr "Samodejno zasen�i navpi�ne tokove:"
- 
- #: ../objects/SADT/arrow.c:151
--msgid "To improve the ease of reading, flows which begin and end vertically can be rendered gray"
--msgstr "Za lažje branje so lahko tokovi, ki se za�nejo in kon�ajo navpi�no, narisani sivo"
-+msgid ""
-+"To improve the ease of reading, flows which begin and end vertically can be "
-+"rendered gray"
-+msgstr ""
-+"Za lažje branje so lahko tokovi, ki se za�nejo in kon�ajo navpi�no, narisani "
-+"sivo"
- 
- #: ../objects/SADT/arrow.c:470
- msgid "SADT Arrow"
- msgstr "Puš�ica SADT"
- 
--#: ../objects/SADT/box.c:140
--#: ../objects/custom/custom_object.c:226
--#: ../objects/flowchart/box.c:154
--#: ../objects/flowchart/diamond.c:152
--#: ../objects/flowchart/ellipse.c:151
--#: ../objects/flowchart/parallelogram.c:156
-+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
-+#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
-+#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
- msgid "Text padding"
- msgstr "Blazinjenje besedila"
- 
-@@ -4929,18 +4744,15 @@ msgstr "Å katla SADT"
- msgid "SADT diagram objects"
- msgstr "Diagramski predmeti SADT"
- 
--#: ../objects/SISSI/classification.h:38
--#: ../objects/SISSI/sissi_dialog.c:42
-+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
- msgid "No Protection"
- msgstr "Brez zaš�ite"
- 
--#: ../objects/SISSI/classification.h:39
--#: ../objects/SISSI/sissi_dialog.c:43
-+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
- msgid "Restricted Diffusion"
- msgstr "Omejeno razširjanje"
- 
--#: ../objects/SISSI/classification.h:40
--#: ../objects/SISSI/sissi_dialog.c:44
-+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
- msgid "Special Country Confidential"
- msgstr "Posebno državno zaupno"
- 
-@@ -4948,18 +4760,15 @@ msgstr "Posebno državno zaupno"
- msgid "Confidential"
- msgstr "Zaupno"
- 
--#: ../objects/SISSI/classification.h:42
--#: ../objects/SISSI/sissi_dialog.c:45
-+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
- msgid "NATO Confidential"
- msgstr "Zaupno NATO"
- 
--#: ../objects/SISSI/classification.h:43
--#: ../objects/SISSI/sissi_dialog.c:46
-+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
- msgid "Personal Confidential"
- msgstr "Osebno zaupno"
- 
--#: ../objects/SISSI/classification.h:44
--#: ../objects/SISSI/sissi_dialog.c:47
-+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
- msgid "Medical Confidential"
- msgstr "Medicinsko zaupno"
- 
-@@ -4971,8 +4780,7 @@ msgstr "Industrijsko zaupno"
- msgid "Defense Confidential"
- msgstr "Obrambno zaupno"
- 
--#: ../objects/SISSI/classification.h:47
--#: ../objects/SISSI/sissi_dialog.c:49
-+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
- msgid "Secret"
- msgstr "Skrivnost"
- 
-@@ -4980,23 +4788,19 @@ msgstr "Skrivnost"
- msgid "Defense Secret"
- msgstr "Obrambna skrivnost"
- 
--#: ../objects/SISSI/classification.h:49
--#: ../objects/SISSI/sissi_dialog.c:50
-+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
- msgid "Secret special country"
- msgstr "Posebna državna skrivnost"
- 
--#: ../objects/SISSI/classification.h:50
--#: ../objects/SISSI/sissi_dialog.c:51
-+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
- msgid "NATO Secret"
- msgstr "Skrivnost NATO"
- 
--#: ../objects/SISSI/classification.h:51
--#: ../objects/SISSI/sissi_dialog.c:52
-+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
- msgid "Very Secret"
- msgstr "Velika skrivnost"
- 
--#: ../objects/SISSI/classification.h:52
--#: ../objects/SISSI/sissi_dialog.c:53
-+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
- msgid "NATO Very Secret"
- msgstr "Velika skrivnost NATO"
- 
-@@ -5013,8 +4817,7 @@ msgstr ""
- "Napaka pri nalaganju predmeta.\n"
- "To ni pravilna datoteka: %s"
- 
--#: ../objects/SISSI/sissi.c:928
--#: ../objects/SISSI/sissi.c:932
-+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
- #, c-format
- msgid ""
- "Error loading object.\n"
-@@ -5250,8 +5053,7 @@ msgstr "Razvijalec"
- msgid "Operator / Maintenance"
- msgstr "Operater / vzdrževanje"
- 
--#: ../objects/SISSI/sissi_dialog.c:171
--#: ../sheets/network.sheet.in.h:20
-+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
- msgid "Network"
- msgstr "Omrežje"
- 
-@@ -5267,8 +5069,7 @@ msgstr "Pasivni ali aktivni rele"
- msgid "Communication interface"
- msgstr "Komunikacijski vmesnik"
- 
--#: ../objects/SISSI/sissi_dialog.c:179
--#: ../sheets/SISSI.sheet.in.h:54
-+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:21
- msgid "Software"
- msgstr "Programska oprema"
- 
-@@ -5334,23 +5135,19 @@ msgid "_Menace"
- msgstr "_Zgaga"
- 
- #. ********* label of board *********
--#: ../objects/SISSI/sissi_dialog.c:317
--#: ../objects/SISSI/sissi_dialog.c:326
-+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
- msgid "Menace"
- msgstr "Zgaga"
- 
--#: ../objects/SISSI/sissi_dialog.c:319
--#: ../objects/SISSI/sissi_dialog.c:328
-+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
- msgid "P Action"
- msgstr "Dejanje P"
- 
--#: ../objects/SISSI/sissi_dialog.c:321
--#: ../objects/SISSI/sissi_dialog.c:330
-+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
- msgid "P Detection"
- msgstr "Zaznava P"
- 
--#: ../objects/SISSI/sissi_dialog.c:323
--#: ../objects/SISSI/sissi_dialog.c:332
-+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
- msgid "Vulnerability"
- msgstr "Ranljivost"
- 
-@@ -5378,9 +5175,8 @@ msgstr "Dokumenti"
- msgid "Document title"
- msgstr "Naslov dokumenta"
- 
--#: ../objects/UML/actor.c:357
--#: ../objects/UML/actor.c:359
--#: ../sheets/UML.sheet.in.h:2
-+#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
-+#: ../sheets/UML.sheet.in.h:15
- msgid "Actor"
- msgstr "Igralec/vršilec"
- 
-@@ -5420,8 +5216,7 @@ msgstr "Stran A"
- msgid "Multiplicity"
- msgstr "Pomnoženost"
- 
--#: ../objects/UML/association.c:251
--#: ../objects/UML/umlattribute.c:45
-+#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
- #: ../objects/UML/umloperation.c:71
- msgid "Visibility"
- msgstr "Vidnost"
-@@ -5434,42 +5229,31 @@ msgstr "Kaži puš�ico"
- msgid "Side B"
- msgstr "Stran B"
- 
--#: ../objects/UML/class.c:142
--#: ../objects/UML/class.c:325
--#: ../objects/UML/class.c:1773
--#: ../sheets/UML.sheet.in.h:6
-+#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
-+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
- msgid "Class"
- msgstr "Razred"
- 
- #. how it used to be before 0.96+SVN
- #. one name, one type: but breaks forward-compatibiliy so kind of reverted
--#: ../objects/UML/class.c:146
--#: ../objects/UML/classicon.c:140
--#: ../objects/UML/classicon.c:142
--#: ../objects/UML/component.c:126
--#: ../objects/UML/large_package.c:137
--#: ../objects/UML/object.c:153
--#: ../objects/UML/small_package.c:131
--#: ../objects/UML/umloperation.c:68
-+#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
-+#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
-+#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
-+#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
- msgid "Stereotype"
- msgstr "Stereotip"
- 
--#: ../objects/UML/class.c:150
--#: ../objects/UML/class.c:183
--#: ../objects/UML/class_dialog.c:468
--#: ../objects/UML/class_dialog.c:580
--#: ../objects/UML/class_dialog.c:2087
--#: ../objects/UML/uml.c:110
-+#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
-+#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
-+#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
- msgid "Abstract"
- msgstr "Izvle�ek"
- 
--#: ../objects/UML/class.c:152
--#: ../objects/UML/class.c:1770
-+#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
- msgid "Template"
- msgstr "Predloga"
- 
--#: ../objects/UML/class.c:155
--#: ../objects/UML/class_dialog.c:477
-+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
- msgid "Suppress Attributes"
- msgstr "Prepre�i atribute"
- 
-@@ -5489,8 +5273,7 @@ msgstr "Vidne operacije"
- msgid "Visible Comments"
- msgstr "Vidne opombe"
- 
--#: ../objects/UML/class.c:165
--#: ../objects/UML/class_dialog.c:493
-+#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
- msgid "Wrap Operations"
- msgstr "Operacije preloma vrstic"
- 
-@@ -5502,8 +5285,7 @@ msgstr "Prelomi po znaku"
- msgid "Comment line length"
- msgstr "Dolžina vrstice opombe"
- 
--#: ../objects/UML/class.c:181
--#: ../objects/UML/class_dialog.c:575
-+#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
- msgid "Polymorphic"
- msgstr "Polimorfni"
- 
-@@ -5536,10 +5318,8 @@ msgstr "_Razred"
- msgid "Class name:"
- msgstr "Ime razreda:"
- 
--#: ../objects/UML/class_dialog.c:445
--#: ../objects/UML/class_dialog.c:2036
--#: ../objects/UML/dependency.c:139
--#: ../objects/UML/generalization.c:135
-+#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
-+#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
- #: ../objects/UML/realizes.c:136
- msgid "Stereotype:"
- msgstr "Stereotip:"
-@@ -5597,38 +5377,32 @@ msgstr "Barva ozadja"
- msgid "Value:"
- msgstr "Vrednost:"
- 
--#: ../objects/UML/class_dialog.c:1203
--#: ../objects/UML/class_dialog.c:2048
-+#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
- msgid "Visibility:"
- msgstr "Vidnost:"
- 
--#: ../objects/UML/class_dialog.c:1212
--#: ../objects/UML/class_dialog.c:2057
-+#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
- #: ../objects/UML/uml.c:102
- msgid "Public"
- msgstr "Javno"
- 
--#: ../objects/UML/class_dialog.c:1215
--#: ../objects/UML/class_dialog.c:2060
-+#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
- #: ../objects/UML/uml.c:103
- msgid "Private"
- msgstr "Zasebno"
- 
--#: ../objects/UML/class_dialog.c:1218
--#: ../objects/UML/class_dialog.c:2063
-+#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
- #: ../objects/UML/uml.c:104
- msgid "Protected"
- msgstr "Zaš�iteno"
- 
--#: ../objects/UML/class_dialog.c:1221
--#: ../objects/UML/class_dialog.c:2066
-+#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
- #: ../objects/UML/uml.c:105
- msgid "Implementation"
- msgstr "Izvedba"
- 
- #. end: Inheritance type
--#: ../objects/UML/class_dialog.c:1237
--#: ../objects/UML/class_dialog.c:2103
-+#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
- msgid "Class scope"
- msgstr "Podro�je razreda"
- 
-@@ -5637,13 +5411,11 @@ msgstr "Podro�je razreda"
- msgid "Inheritance type:"
- msgstr "Vrsta dedovanja:"
- 
--#: ../objects/UML/class_dialog.c:2090
--#: ../objects/UML/uml.c:111
-+#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
- msgid "Polymorphic (virtual)"
- msgstr "Polimorfni (navidezni)"
- 
--#: ../objects/UML/class_dialog.c:2093
--#: ../objects/UML/uml.c:112
-+#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
- msgid "Leaf (final)"
- msgstr "List (kon�ni)"
- 
-@@ -5667,23 +5439,19 @@ msgstr "Definirana vrednost:"
- msgid "Direction:"
- msgstr "Smer:"
- 
--#: ../objects/UML/class_dialog.c:2315
--#: ../objects/UML/umlparameter.c:34
-+#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
- msgid "Undefined"
- msgstr "Nedefinirano"
- 
--#: ../objects/UML/class_dialog.c:2318
--#: ../objects/UML/umlparameter.c:35
-+#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
- msgid "In"
- msgstr "Znotraj"
- 
--#: ../objects/UML/class_dialog.c:2321
--#: ../objects/UML/umlparameter.c:36
-+#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
- msgid "Out"
- msgstr "Zunaj"
- 
--#: ../objects/UML/class_dialog.c:2324
--#: ../objects/UML/umlparameter.c:37
-+#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
- msgid "In & Out"
- msgstr "Vhod & izhod"
- 
-@@ -5701,8 +5469,7 @@ msgstr "Podatki operacij"
- msgid "_Templates"
- msgstr "_Predloge"
- 
--#: ../objects/UML/class_dialog.c:2786
--#: ../sheets/UML.sheet.in.h:29
-+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
- msgid "Template class"
- msgstr "Razred predlog"
- 
-@@ -5718,23 +5485,19 @@ msgstr "Meja"
- msgid "Is object"
- msgstr "Je predmet"
- 
--#: ../objects/UML/component_feature.c:150
--#: ../sheets/UML.sheet.in.h:14
-+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:21
- msgid "Facet"
- msgstr "Faseta"
- 
--#: ../objects/UML/component_feature.c:151
--#: ../sheets/UML.sheet.in.h:26
-+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:22
- msgid "Receptacle"
- msgstr "Zbiralnik"
- 
--#: ../objects/UML/component_feature.c:152
--#: ../sheets/UML.sheet.in.h:13
-+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:23
- msgid "Event Source"
- msgstr "Vir dogodka"
- 
--#: ../objects/UML/component_feature.c:153
--#: ../sheets/UML.sheet.in.h:12
-+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:24
- msgid "Event Sink"
- msgstr "Dogodkovni odtok"
- 
-@@ -5748,8 +5511,7 @@ msgstr "Pokaži puš�ico:"
- 
- #. how it used to be before 0.96+SVN
- #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
--#: ../objects/UML/implements.c:131
--#: ../objects/UML/implements.c:133
-+#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
- msgid "Interface:"
- msgstr "Vmesnik:"
- 
-@@ -5877,8 +5639,7 @@ msgstr "Dejanje"
- msgid "Action to perform when this transition is taken"
- msgstr "Dejanje, ki se izvede, ko je izbran ta prehod"
- 
--#: ../objects/UML/transition.c:145
--#: ../sheets/cisconetwork.sheet.in.h:43
-+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
- msgid "Guard"
- msgstr "Varuh"
- 
-@@ -5890,8 +5651,7 @@ msgstr "Pogoj za izbor tega prehoda, ko je sprožen dogodek"
- msgid "Unified Modelling Language diagram objects UML 1.3"
- msgstr "Diagramski predmeti Poenotenega jezika za modeliranje 1.3 (UML 1.3)"
- 
--#: ../objects/UML/umlattribute.c:41
--#: ../objects/UML/umlparameter.c:47
-+#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
- msgid "Value"
- msgstr "Vrednost"
- 
-@@ -5899,8 +5659,7 @@ msgstr "Vrednost"
- msgid "Abstract (?)"
- msgstr "Izvle�ek (?)"
- 
--#: ../objects/UML/umlattribute.c:49
--#: ../objects/UML/umloperation.c:77
-+#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
- msgid "Class scope (static)"
- msgstr "Podro�je razreda (stati�no)"
- 
-@@ -5912,8 +5671,7 @@ msgstr "Vrsta dedovanja"
- msgid "Query (const)"
- msgstr "Povpraševanje (konst.)"
- 
--#: ../objects/UML/umloperation.c:79
--#: ../objects/chronogram/chronoline.c:164
-+#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
- msgid "Parameters"
- msgstr "Parametri"
- 
-@@ -5929,8 +5687,7 @@ msgstr "Sodelovanje"
- msgid "Chronogram diagram objects"
- msgstr "Predmeti kronogramskega diagrama"
- 
--#: ../objects/chronogram/chronoline.c:150
--#: ../sheets/AADL.sheet.in.h:4
-+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:5
- msgid "Data"
- msgstr "Podatek"
- 
-@@ -6019,20 +5776,17 @@ msgstr "Po meri"
- msgid "Custom XML shapes loader"
- msgstr "Nalagalnik oblik XML po meri"
- 
--#: ../objects/custom/custom_object.c:207
--#: ../objects/custom/custom_object.c:239
-+#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
- #: ../objects/custom/custom_object.c:1782
- msgid "Flip horizontal"
- msgstr "Prezrcali vodoravno"
- 
--#: ../objects/custom/custom_object.c:209
--#: ../objects/custom/custom_object.c:241
-+#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
- #: ../objects/custom/custom_object.c:1783
- msgid "Flip vertical"
- msgstr "Prezrcali navpi�no"
- 
--#: ../objects/custom/custom_object.c:212
--#: ../objects/custom/custom_object.c:244
-+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
- msgid "Scale of the subshapes"
- msgstr "Merilo podlikov"
- 
-@@ -6052,12 +5806,14 @@ msgstr "Nalagalnik �rt XML po meri"
- 
- #: ../objects/custom_lines/custom_linetypes.c:226
- msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
--msgstr "NOTRANJA NAPAKA: Črte po meri: neveljavna vrsta �rte v predmetu LineInfo"
-+msgstr ""
-+"NOTRANJA NAPAKA: Črte po meri: neveljavna vrsta �rte v predmetu LineInfo"
- 
- #: ../objects/custom_lines/custom_linetypes.c:251
- #, c-format
- msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
--msgstr "NOTRANJA NAPAKA: Črte po meri: neveljavna vrsta �rte v predmetu LineInfo %s."
-+msgstr ""
-+"NOTRANJA NAPAKA: Črte po meri: neveljavna vrsta �rte v predmetu LineInfo %s."
- 
- #: ../objects/custom/shape_info.c:162
- #, c-format
-@@ -6080,8 +5836,7 @@ msgstr "Kot rezanja"
- msgid "Sectors"
- msgstr "Sektorji"
- 
--#: ../objects/network/basestation.c:401
--#: ../objects/network/basestation.c:403
-+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
- msgid "Base Station"
- msgstr "Temeljna postaja"
- 
-@@ -6097,75 +5852,62 @@ msgstr "Radij"
- msgid "Width"
- msgstr "Å irina"
- 
--#: ../objects/standard/arc.c:143
-+#: ../objects/standard/arc.c:141
- msgid "Curve distance"
- msgstr "Razdalja krivulje"
- 
--#: ../objects/standard/bezier.c:139
--#: ../objects/standard/line.c:143
-+#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
- #: ../objects/standard/polyline.c:137
- msgid "Line gaps"
- msgstr "Razmiki �rt"
- 
--#: ../objects/standard/bezier.c:141
--#: ../objects/standard/line.c:145
-+#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
- #: ../objects/standard/polyline.c:139
- msgid "Absolute start gap"
- msgstr "Absolutni za�etni razmik"
- 
--#: ../objects/standard/bezier.c:143
--#: ../objects/standard/line.c:147
-+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
- #: ../objects/standard/polyline.c:141
- msgid "Absolute end gap"
- msgstr "Absolutni kon�ni razmik"
- 
--#: ../objects/standard/bezier.c:734
--#: ../objects/standard/beziergon.c:498
-+#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
- msgid "Symmetric control"
- msgstr "Simetri�ni nadzor"
- 
--#: ../objects/standard/bezier.c:736
--#: ../objects/standard/beziergon.c:500
-+#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
- msgid "Smooth control"
- msgstr "Mehki nadzor"
- 
--#: ../objects/standard/bezier.c:738
--#: ../objects/standard/beziergon.c:502
-+#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
- msgid "Cusp control"
- msgstr "Nadzor stika"
- 
--#: ../objects/standard/box.c:139
--#: ../objects/standard/ellipse.c:133
-+#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
- msgid "Free"
- msgstr "Prosto"
- 
--#: ../objects/standard/box.c:140
--#: ../objects/standard/ellipse.c:134
-+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
- msgid "Fixed"
- msgstr "Nespremenljivo"
- 
--#: ../objects/standard/box.c:141
--#: ../objects/standard/box.c:699
-+#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
- msgid "Square"
- msgstr "Kvadrat"
- 
--#: ../objects/standard/box.c:154
--#: ../objects/standard/ellipse.c:146
-+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
- msgid "Aspect ratio"
- msgstr "Razmerje stranic"
- 
--#: ../objects/standard/box.c:695
--#: ../objects/standard/ellipse.c:673
-+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
- msgid "Free aspect"
- msgstr "Poljubno razmerje"
- 
--#: ../objects/standard/box.c:697
--#: ../objects/standard/ellipse.c:675
-+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
- msgid "Fixed aspect"
- msgstr "Nespremenljivo razmerje"
- 
--#: ../objects/standard/ellipse.c:135
--#: ../objects/standard/ellipse.c:677
-+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
- msgid "Circle"
- msgstr "Krog"
- 
-@@ -6183,8 +5925,7 @@ msgstr "Ohrani razmerja"
- 
- #. Found file in same dir as diagram.
- #. Found file in current dir.
--#: ../objects/standard/image.c:697
--#: ../objects/standard/image.c:708
-+#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
- #, c-format
- msgid ""
- "The image file '%s' was not found in that directory.\n"
-@@ -6194,8 +5935,7 @@ msgstr ""
- "Namesto nje bo uporabljena datoteka '%s'\n"
- 
- #. Didn't find file in current dir.
--#: ../objects/standard/image.c:714
--#: ../objects/standard/image.c:736
-+#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
- #, c-format
- msgid "The image file '%s' was not found.\n"
- msgstr "Slikovne datoteke '%s' ni mogo�e najti.\n"
-@@ -6220,13 +5960,11 @@ msgstr "Vsebina besedila"
- msgid "Angle to rotate the outline"
- msgstr "Kot za sukanje orisa"
- 
--#: ../objects/standard/polygon.c:462
--#: ../objects/standard/polyline.c:616
-+#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
- msgid "Add Corner"
- msgstr "Dodaj kot"
- 
--#: ../objects/standard/polygon.c:463
--#: ../objects/standard/polyline.c:617
-+#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
- msgid "Delete Corner"
- msgstr "Izbriši kot"
- 
-@@ -6258,11 +5996,11 @@ msgid ""
- "Can't convert output filename '%s' to locale encoding.\n"
- "Please choose a different name to save with cairo.\n"
- msgstr ""
--"Imena izhodne datoteke '%s' ni mogo�e pretvoriti v kodno razpredelnico vmesnika.\n"
-+"Imena izhodne datoteke '%s' ni mogo�e pretvoriti v kodno razpredelnico "
-+"vmesnika.\n"
- "Prosim, izberite drugo ime za shranjevanje s cairom.\n"
- 
--#: ../plug-ins/cairo/diacairo.c:256
--#: ../plug-ins/cairo/diacairo.c:272
-+#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
- #, c-format
- msgid "Can't write %d bytes to %s"
- msgstr "Ni mogo�e zapisati %d bajtov v %s"
-@@ -6271,8 +6009,7 @@ msgstr "Ni mogo�e zapisati %d bajtov v %s"
- msgid "Clipboard copy failed"
- msgstr "Kopiranje na odložiš�e ni uspelo"
- 
--#: ../plug-ins/cairo/diacairo.c:311
--#: ../plug-ins/postscript/postscript.c:39
-+#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
- #: ../plug-ins/wmf/wmf.cpp:1381
- msgid "Nothing to print"
- msgstr "Ni� ni za natisniti"
-@@ -6345,8 +6082,7 @@ msgstr "DRS (DiaRenderScript)"
- msgid "DiaRenderScript filter"
- msgstr "Filter za upodobitveni skript Dia (DRS)"
- 
--#: ../plug-ins/dxf/dxf-export.c:598
--#: ../plug-ins/dxf/dxf-import.c:1402
-+#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
- msgid "Drawing Interchange File"
- msgstr "Datoteka za izmenjavo risb (DIF)"
- 
-@@ -6458,12 +6194,11 @@ msgid "Select Printer"
- msgstr "Izberi tiskalnik"
- 
- #: ../plug-ins/postscript/paginate_psprint.c:285
--#: ../sheets/ciscocomputer.sheet.in.h:36
-+#: ../sheets/ciscocomputer.sheet.in.h:37
- msgid "Printer"
- msgstr "Tiskalnik"
- 
--#: ../plug-ins/postscript/paginate_psprint.c:299
--#: ../sheets/Misc.sheet.in.h:1
-+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
- msgid "File"
- msgstr "Datoteka"
- 
-@@ -6530,7 +6265,8 @@ msgstr "Podpora skriptam Python"
- 
- #: ../plug-ins/shape/shape-export.c:474
- msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
--msgstr "Datoteke likov morajo imeti kon�nico .shape, sicer jih Dia ne more naložiti"
-+msgstr ""
-+"Datoteke likov morajo imeti kon�nico .shape, sicer jih Dia ne more naložiti"
- 
- #: ../plug-ins/shape/shape-export.c:488
- msgid "Can't export png icon without export plug-in!"
-@@ -6565,8 +6301,7 @@ msgstr "korenski element je bil '%s' -- pri�akovan je bil 'svg'."
- msgid "Scalable Vector Graphics import and export filters"
- msgstr "Izvozni in uvozni filter SVG"
- 
--#: ../plug-ins/vdx/vdx-export.c:1376
--#: ../plug-ins/vdx/vdx-export.c:1385
-+#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
- #, c-format
- msgid "Couldn't read file %s"
- msgstr "Datoteke ni mogo�e prebrati: %s"
-@@ -6575,8 +6310,7 @@ msgstr "Datoteke ni mogo�e prebrati: %s"
- msgid "Visio XML format"
- msgstr "Zapis Visio XML"
- 
--#: ../plug-ins/vdx/vdx-import.c:227
--#: ../plug-ins/xfig/xfig-import.c:1046
-+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
- #, c-format
- msgid "Couldn't read color: %s\n"
- msgstr "Ni mogo�e prebrati barve: %s\n"
-@@ -6600,8 +6334,9 @@ msgid "MoveTo not at start of Bezier\n"
- msgstr "MoveTo ni za�etek Bezierja\n"
- 
- #: ../plug-ins/vdx/vdx-import.c:1740
--msgid "Invalid NURBS formula"
--msgstr "Neveljavna formula NURBS"
-+#| msgid "Invalid NURBS formula"
-+msgid "Invalid NURBS formula\n"
-+msgstr "Neveljavna formula NURBS\n"
- 
- #: ../plug-ins/vdx/vdx-import.c:1984
- #, c-format
-@@ -6609,6 +6344,11 @@ msgid "Couldn't write file %s"
- msgstr "Datoteke ni mogo�e zapisati: %s"
- 
- #: ../plug-ins/vdx/vdx-import.c:2069
-+#, c-format
-+#| msgid "Couldn't handle foreign object type %s"
-+msgid "Couldn't handle foreign object type %s\n"
-+msgstr "Ni mogo�e ravnati s tujo vrsto predmeta %s\n"
-+
- #: ../plug-ins/vdx/vdx-import.c:2082
- #, c-format
- msgid "Couldn't handle foreign object type %s"
-@@ -6619,14 +6359,15 @@ msgstr "Ni mogo�e ravnati s tujo vrsto predmeta %s"
- msgid "Couldn't make object dir %s"
- msgstr "Ni mogo�e izdelati mape predmeta %s"
- 
--#: ../plug-ins/vdx/vdx-import.c:3100
-+#: ../plug-ins/vdx/vdx-import.c:3117
- msgid "Visio XML File Format"
- msgstr "Vrsta datotek Visio XML"
- 
- #: ../plug-ins/vdx/vdx-xml.c:3344
- #, c-format
--msgid "Can't decode object %s"
--msgstr "Ni mogo�e odkodirati predmeta %s"
-+#| msgid "Can't decode object %s"
-+msgid "Can't decode object %s\n"
-+msgstr "Ni mogo�e odkodirati predmeta %s\n"
- 
- #: ../plug-ins/vdx/vdx-xml.c:5125
- #, c-format
-@@ -6672,8 +6413,7 @@ msgstr "Izvozni filter za WMF"
- msgid "File: %s type/version unsupported.\n"
- msgstr "Datoteka: vrsta/razli�ica %s ni podprta.\n"
- 
--#: ../plug-ins/wpg/wpg.c:1321
--#: ../plug-ins/wpg/wpg.c:1328
-+#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
- msgid "WPG"
- msgstr "WPG"
- 
-@@ -6684,7 +6424,9 @@ msgstr "Izvozni filter za WordPerfect Graphics"
- #: ../plug-ins/xfig/xfig-export.c:463
- #, c-format
- msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
--msgstr "Zapis FIG nima ekvivalentnega sloga puš�ic %s, zato bo uporabljena enostavna puš�ica.\n"
-+msgstr ""
-+"Zapis FIG nima ekvivalentnega sloga puš�ic %s, zato bo uporabljena enostavna "
-+"puš�ica.\n"
- 
- #: ../plug-ins/xfig/xfig-export.c:486
- msgid "No more user-definable colors - using black"
-@@ -6697,7 +6439,9 @@ msgstr "Oblika zapisa XFig"
- #: ../plug-ins/xfig/xfig-import.c:111
- #, c-format
- msgid "Color index %d too high, only 512 colors allowed. Using black instead."
--msgstr "Barvni indeks %d je previsok, dovoljenih je le 512 barv. Namesto tega bo uporabljena �rna."
-+msgstr ""
-+"Barvni indeks %d je previsok, dovoljenih je le 512 barv. Namesto tega bo "
-+"uporabljena �rna."
- 
- #: ../plug-ins/xfig/xfig-import.c:138
- msgid "Patterns are not supported by Dia"
-@@ -6755,16 +6499,14 @@ msgstr "Negativna velikost kota, negirano"
- msgid "Unknown polyline subtype: %d\n"
- msgstr "Neznana podvrsta mnogokotne �rte: %d\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:720
--#: ../plug-ins/xfig/xfig-import.c:752
-+#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
- #, c-format
- msgid "Couldn't read spline info: %s\n"
- msgstr "Podatkov o zlepku ni mogo�e prebrati: %s\n"
- 
- #. Open approximated spline
- #. Closed approximated spline
--#: ../plug-ins/xfig/xfig-import.c:739
--#: ../plug-ins/xfig/xfig-import.c:757
-+#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
- msgid "Cannot convert approximated spline yet."
- msgstr "Zaenkrat še ni mogo�e pretvoriti približka zlepka."
- 
-@@ -6862,15 +6604,13 @@ msgstr "Napaka pri branju indikatorja ve� strani: %s\n"
- msgid "Error reading transparent color: %s\n"
- msgstr "Napaka pri branju prosojne barve: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1234
--#: ../plug-ins/xfig/xfig-import.c:1290
-+#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
- #: ../plug-ins/xfig/xfig-import.c:1308
- #, c-format
- msgid "Error reading FIG file: %s\n"
- msgstr "Napaka pri branju datoteke FIG: %s\n"
- 
--#: ../plug-ins/xfig/xfig-import.c:1236
--#: ../plug-ins/xfig/xfig-import.c:1292
-+#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
- msgid "Premature end of FIG file\n"
- msgstr "Pred�asen konec datoteke FIG\n"
- 
-@@ -6933,7 +6673,9 @@ msgstr "Filter transformacije XSL"
- 
- #: ../plug-ins/xslt/xslt.c:362
- msgid "No valid configuration files found for the XSLT plugin, not loading."
--msgstr "Za vti�nik XSLT ni najdenih veljavnih nastavitvenih datotek, zato ne bodo naložene."
-+msgstr ""
-+"Za vti�nik XSLT ni najdenih veljavnih nastavitvenih datotek, zato ne bodo "
-+"naložene."
- 
- #: ../plug-ins/xslt/xsltdialog.c:97
- msgid "Export through XSLT"
-@@ -6955,603 +6697,607 @@ msgstr "AADL"
- msgid "AADL Shapes"
- msgstr "Oblike AADL"
- 
--#: ../sheets/AADL.sheet.in.h:3
--msgid "Bus"
--msgstr "Vodilo"
--
--#: ../sheets/AADL.sheet.in.h:5
--msgid "Device"
--msgstr "Naprava"
-+#: ../sheets/AADL.sheet.in.h:4
-+msgid "Thread"
-+msgstr "Nit"
- 
- #: ../sheets/AADL.sheet.in.h:6
-+msgid "Processor"
-+msgstr "Procesor"
-+
-+#: ../sheets/AADL.sheet.in.h:7
- msgid "Memory"
- msgstr "Pomnilnik"
- 
--#: ../sheets/AADL.sheet.in.h:7
--msgid "Package"
--msgstr "Paket"
-+#: ../sheets/AADL.sheet.in.h:8
-+msgid "Bus"
-+msgstr "Vodilo"
- 
- #: ../sheets/AADL.sheet.in.h:9
--msgid "Processor"
--msgstr "Procesor"
-+msgid "System"
-+msgstr "Sistem"
- 
- #: ../sheets/AADL.sheet.in.h:10
- msgid "Subprogram"
- msgstr "Podprogram"
- 
- #: ../sheets/AADL.sheet.in.h:11
--msgid "System"
--msgstr "Sistem"
-+msgid "Thread Group"
-+msgstr "Skupina niti"
- 
- #: ../sheets/AADL.sheet.in.h:12
--msgid "Thread"
--msgstr "Nit"
-+msgid "Device"
-+msgstr "Naprava"
- 
- #: ../sheets/AADL.sheet.in.h:13
--msgid "Thread Group"
--msgstr "Skupina niti"
-+msgid "Package"
-+msgstr "Paket"
-+
-+#. Please talk to me before making any changes to this sheet
-+#: ../sheets/Assorted.sheet.in.h:2
-+msgid "Assorted"
-+msgstr "Izbrano"
- 
- #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
- #. Leave as is for now, renaming too much hassle.
- #. Will probably need to split into seperate sheets soon anyway.
--#: ../sheets/Assorted.sheet.in.h:4
--msgid "An Assorted Collection of Polygons, Beziergons and other Miscellaneous Geometric Shapes"
--msgstr "Neurejen nabor poligonov, bezierjevih poligonov in raznih drugih geometri�nih oblik"
--
--#. Please talk to me before making any changes to this sheet
- #: ../sheets/Assorted.sheet.in.h:6
--msgid "Assorted"
--msgstr "Izbrano"
-+msgid ""
-+"An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
-+"Geometric Shapes"
-+msgstr ""
-+"Neurejen nabor poligonov, bezierjevih poligonov in raznih drugih "
-+"geometri�nih oblik"
- 
- #: ../sheets/Assorted.sheet.in.h:7
--msgid "Chevron"
--msgstr "ÄŒin"
-+msgid "Right angle triangle"
-+msgstr "Desno kotni trikotnik"
- 
- #: ../sheets/Assorted.sheet.in.h:8
--msgid "Curved eight point star"
--msgstr "Ukrivljena osemkraka zveda"
-+msgid "Isoceles triangle"
-+msgstr "Enakokraki trikotnik"
- 
- #: ../sheets/Assorted.sheet.in.h:9
--msgid "Curved four point star"
--msgstr "Ukrivljena Å¡tirikraka zvezda"
-+msgid "Perfect square, height equals width"
-+msgstr "Popoln kvadrat, višina je enaka širini"
- 
- #: ../sheets/Assorted.sheet.in.h:10
--msgid "Diamond"
--msgstr "Karo"
-+msgid "Perfect circle"
-+msgstr "Popoln krog"
- 
- #: ../sheets/Assorted.sheet.in.h:11
--msgid "Down arrow"
--msgstr "Puš�ica navzdol"
-+msgid "Quarter circle"
-+msgstr "ÄŒetrtina kroga"
- 
- #: ../sheets/Assorted.sheet.in.h:12
--msgid "Eight point star"
--msgstr "Osemkraka zvezda"
-+msgid "Diamond"
-+msgstr "Karo"
- 
- #: ../sheets/Assorted.sheet.in.h:13
--msgid "Five point star"
--msgstr "Petkraka zvezda"
-+msgid "Pentagon. Five sided shape"
-+msgstr "Petkotnik. Petstrana oblika"
- 
- #: ../sheets/Assorted.sheet.in.h:14
--msgid "Four point star"
--msgstr "Å tirikraka zvezda"
-+msgid "Hexagon. Six sided shape"
-+msgstr "Šestkotnik. Šeststrani�na oblika"
- 
- #: ../sheets/Assorted.sheet.in.h:15
--msgid "Heart"
--msgstr "Srce"
--
--#: ../sheets/Assorted.sheet.in.h:16
- msgid "Heptagon. Seven sided shape"
- msgstr "Sedemkotnik. Sedemstrani�na oblika"
- 
--#: ../sheets/Assorted.sheet.in.h:17
--msgid "Hexagon. Six sided shape"
--msgstr "Šestkotnik. Šeststrani�na oblika"
-+#: ../sheets/Assorted.sheet.in.h:16
-+msgid "Octogon. Eight sided shape"
-+msgstr "Osemkotnik. Osemstrana oblika"
- 
--#: ../sheets/Assorted.sheet.in.h:18
-+#: ../sheets/Assorted.sheet.in.h:17
- msgid "Horizontal parallelogram"
- msgstr "Vodoravni paralelogram"
- 
-+#: ../sheets/Assorted.sheet.in.h:18
-+msgid "Vertical parallelogram"
-+msgstr "Navpi�ni paralelogram"
-+
- #: ../sheets/Assorted.sheet.in.h:19
--msgid "Isoceles triangle"
--msgstr "Enakokraki trikotnik"
-+msgid "Trapezoid"
-+msgstr "Trapez"
- 
- #: ../sheets/Assorted.sheet.in.h:20
--msgid "Left arrow"
--msgstr "Puš�ica levo"
-+msgid "Four point star"
-+msgstr "Å tirikraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:21
--msgid "Left-right arrow"
--msgstr "Puš�ica levo-desno"
-+msgid "Curved four point star"
-+msgstr "Ukrivljena Å¡tirikraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:22
--msgid "Left-right-up arrow"
--msgstr "Puš�ica levo-desno-navzgor"
-+msgid "Five point star"
-+msgstr "Petkraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:23
--msgid "Left-up arrow"
--msgstr "Puš�ica levo-navzgor"
-+msgid "Six point star"
-+msgstr "Å estkraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:24
--msgid "Maltese cross"
--msgstr "Malteški križ"
-+msgid "Seven point star"
-+msgstr "Sedemkraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:25
--msgid "Notched left arrow"
--msgstr "Črtkasta puš�ica levo"
-+msgid "Eight point star"
-+msgstr "Osemkraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:26
--msgid "Notched right arrow"
--msgstr "Črtkasta puš�ica desno"
-+msgid "Sharp eight point star"
-+msgstr "Ostra osemkraka zvezda"
- 
- #: ../sheets/Assorted.sheet.in.h:27
--msgid "Octogon. Eight sided shape"
--msgstr "Osemkotnik. Osemstrana oblika"
-+msgid "Curved eight point star"
-+msgstr "Ukrivljena osemkraka zveda"
- 
- #: ../sheets/Assorted.sheet.in.h:28
--msgid "Pentagon block arrow"
--msgstr "Petkotna blo�na puš�ica"
-+msgid "Swiss cross"
-+msgstr "Švicarski križ"
- 
- #: ../sheets/Assorted.sheet.in.h:29
--msgid "Pentagon. Five sided shape"
--msgstr "Petkotnik. Petstrana oblika"
-+msgid "Maltese cross"
-+msgstr "Malteški križ"
- 
- #: ../sheets/Assorted.sheet.in.h:30
--msgid "Perfect circle"
--msgstr "Popoln krog"
-+msgid "Down arrow"
-+msgstr "Puš�ica navzdol"
- 
- #: ../sheets/Assorted.sheet.in.h:31
--msgid "Perfect square, height equals width"
--msgstr "Popoln kvadrat, višina je enaka širini"
-+msgid "Up arrow"
-+msgstr "Puš�ica navzgor"
- 
- #: ../sheets/Assorted.sheet.in.h:32
--msgid "Quad arrow"
--msgstr "Štirikotna puš�ica"
-+msgid "Left arrow"
-+msgstr "Puš�ica levo"
- 
- #: ../sheets/Assorted.sheet.in.h:33
--msgid "Quarter circle"
--msgstr "ÄŒetrtina kroga"
--
-+msgid "Right arrow"
-+msgstr "Puš�ica desno"
-+
- #: ../sheets/Assorted.sheet.in.h:34
--msgid "Quarter moon"
--msgstr "ÄŒetrt lune"
-+msgid "Notched left arrow"
-+msgstr "Črtkasta puš�ica levo"
- 
- #: ../sheets/Assorted.sheet.in.h:35
--msgid "Right angle triangle"
--msgstr "Desno kotni trikotnik"
-+msgid "Notched right arrow"
-+msgstr "Črtkasta puš�ica desno"
- 
- #: ../sheets/Assorted.sheet.in.h:36
--msgid "Right arrow"
--msgstr "Puš�ica desno"
-+msgid "Left-up arrow"
-+msgstr "Puš�ica levo-navzgor"
- 
- #: ../sheets/Assorted.sheet.in.h:37
--msgid "Seven point star"
--msgstr "Sedemkraka zvezda"
-+msgid "Turn-up arrow"
-+msgstr "Puš�ica konca"
- 
- #: ../sheets/Assorted.sheet.in.h:38
--msgid "Sharp eight point star"
--msgstr "Ostra osemkraka zvezda"
-+msgid "Left-right arrow"
-+msgstr "Puš�ica levo-desno"
- 
- #: ../sheets/Assorted.sheet.in.h:39
--msgid "Six point star"
--msgstr "Å estkraka zvezda"
-+msgid "Up-down arrow"
-+msgstr "Puš�ica gor-dol"
- 
- #: ../sheets/Assorted.sheet.in.h:40
--msgid "Sun"
--msgstr "Sonce"
-+msgid "Quad arrow"
-+msgstr "Štirikotna puš�ica"
- 
- #: ../sheets/Assorted.sheet.in.h:41
--msgid "Swiss cross"
--msgstr "Švicarski križ"
-+msgid "Left-right-up arrow"
-+msgstr "Puš�ica levo-desno-navzgor"
- 
- #: ../sheets/Assorted.sheet.in.h:42
--msgid "Trapezoid"
--msgstr "Trapez"
-+msgid "Up-down-left arrow"
-+msgstr "Puš�ica gor-levo-navzdol"
- 
- #: ../sheets/Assorted.sheet.in.h:43
--msgid "Turn-up arrow"
--msgstr "Puš�ica konca"
-+msgid "Pentagon block arrow"
-+msgstr "Petkotna blo�na puš�ica"
- 
- #: ../sheets/Assorted.sheet.in.h:44
--msgid "Up arrow"
--msgstr "Puš�ica navzgor"
-+msgid "Chevron"
-+msgstr "ÄŒin"
- 
- #: ../sheets/Assorted.sheet.in.h:45
--msgid "Up-down arrow"
--msgstr "Puš�ica gor-dol"
-+msgid "Heart"
-+msgstr "Srce"
- 
- #: ../sheets/Assorted.sheet.in.h:46
--msgid "Up-down-left arrow"
--msgstr "Puš�ica gor-levo-navzdol"
-+msgid "Sun"
-+msgstr "Sonce"
- 
- #: ../sheets/Assorted.sheet.in.h:47
--msgid "Vertical parallelogram"
--msgstr "Navpi�ni paralelogram"
--
--#: ../sheets/BPMN.sheet.in.h:1
--msgid "Activity Looping"
--msgstr "Zankanje dejavnosti"
--
--#: ../sheets/BPMN.sheet.in.h:2
--msgid "Ad-Hoc Collapsed Sub-Process"
--msgstr "Improvizirano zrušen podproces"
-+msgid "Quarter moon"
-+msgstr "ÄŒetrt lune"
- 
- #. For: anthonym
--#: ../sheets/BPMN.sheet.in.h:4
-+#: ../sheets/BPMN.sheet.in.h:2
- msgid "BPMN"
- msgstr "BPMN"
- 
--#: ../sheets/BPMN.sheet.in.h:5
-+#: ../sheets/BPMN.sheet.in.h:3
- msgid "Business Process Modeling Notation"
- msgstr "Notacija modeliranja poslovnih procesov"
- 
-+#: ../sheets/BPMN.sheet.in.h:4
-+msgid "Start Event"
-+msgstr "Za�etni dogodek"
-+
-+#: ../sheets/BPMN.sheet.in.h:5
-+msgid "Start Event - Message"
-+msgstr "Za�etni dogodek - sporo�ilo"
-+
- #: ../sheets/BPMN.sheet.in.h:6
--msgid "Collapsed Sub-Process"
--msgstr "Zrušen podproces"
-+msgid "Start Event - Timer"
-+msgstr "Za�etni dogodek - štoparica"
- 
- #: ../sheets/BPMN.sheet.in.h:7
--msgid "Compensation Collapsed Sub-Process"
--msgstr "Kompenzacijsko zrušen podproces"
-+msgid "Start Event - Rule"
-+msgstr "Za�etni dogodek - Pravilo"
- 
- #: ../sheets/BPMN.sheet.in.h:8
--msgid "Compensation Task"
--msgstr "Kompenzacijsko opravilo"
-+msgid "Start Event - Link"
-+msgstr "Za�etni dogodek - povezava"
- 
- #: ../sheets/BPMN.sheet.in.h:9
--msgid "Complex"
--msgstr "Obsežek"
-+msgid "Start Event - Multiple"
-+msgstr "Za�etni dogodek - Ve� možnosti"
- 
- #: ../sheets/BPMN.sheet.in.h:10
--msgid "Data Object"
--msgstr "Podatkovni predmet"
-+msgid "Intermediate Event"
-+msgstr "Vmesni dogodek"
- 
- #: ../sheets/BPMN.sheet.in.h:11
--msgid "End Event"
--msgstr "Kon�ni dogodek"
-+msgid "Intermediate Event - Message"
-+msgstr "Vmesni dogodek - sporo�ilo"
- 
- #: ../sheets/BPMN.sheet.in.h:12
--msgid "End Event - Cancel"
--msgstr "Zaklju�ni dogodek - Preklic"
-+msgid "Intermediate Event - Timer"
-+msgstr "Vmesni dogodek - Å toparica"
- 
- #: ../sheets/BPMN.sheet.in.h:13
--msgid "End Event - Compensation"
--msgstr "Kon�ni dogodek - kompenzacija"
-+msgid "Intermediate Event - Error"
-+msgstr "Vmesni dogodek - Napaka"
- 
- #: ../sheets/BPMN.sheet.in.h:14
--msgid "End Event - Error"
--msgstr "Zaklju�ni dogodek - Napaka"
-+msgid "Intermediate Event - Cancel"
-+msgstr "Vmesni dogodek - Preklic"
- 
- #: ../sheets/BPMN.sheet.in.h:15
--msgid "End Event - Link"
--msgstr "Kon�ni dogodek - povezava"
-+msgid "Intermediate Event - Compensation"
-+msgstr "Vmesni dogodek - Kompenzacija"
- 
- #: ../sheets/BPMN.sheet.in.h:16
--msgid "End Event - Message"
--msgstr "Zaklju�ni dogodek - Sporo�ilo"
-+msgid "Intermediate Event - Rule"
-+msgstr "Vmesni dogodek - Pravilo"
- 
- #: ../sheets/BPMN.sheet.in.h:17
--msgid "End Event - Multiple"
--msgstr "Zaklju�ni dogodek - Ve� koncev"
-+msgid "Intermediate Event - Link"
-+msgstr "Vmesni dogodek - Povezava"
- 
- #: ../sheets/BPMN.sheet.in.h:18
--msgid "End Event - Terminate"
--msgstr "Zaklju�ni dogodek - Izhod"
-+msgid "Intermediate Event - Multiple"
-+msgstr "Vmesni dogodek - Ve� koncev"
- 
- #: ../sheets/BPMN.sheet.in.h:19
--msgid "Exclusive (XOR) Data Based"
--msgstr "XOR, temelje� na podatkih"
-+msgid "End Event"
-+msgstr "Kon�ni dogodek"
- 
- #: ../sheets/BPMN.sheet.in.h:20
--msgid "Exclusive (XOR) Event Based"
--msgstr "XOR, temelje� na dogodkih"
-+msgid "End Event - Message"
-+msgstr "Zaklju�ni dogodek - Sporo�ilo"
- 
- #: ../sheets/BPMN.sheet.in.h:21
--msgid "Gateway"
--msgstr "Prehod"
-+msgid "End Event - Error"
-+msgstr "Zaklju�ni dogodek - Napaka"
- 
- #: ../sheets/BPMN.sheet.in.h:22
--msgid "Group"
--msgstr "Združi"
-+msgid "End Event - Cancel"
-+msgstr "Zaklju�ni dogodek - Preklic"
- 
- #: ../sheets/BPMN.sheet.in.h:23
--msgid "Inclusive (OR)"
--msgstr "Vklju�no (OR, ALI)"
-+msgid "End Event - Compensation"
-+msgstr "Kon�ni dogodek - kompenzacija"
- 
- #: ../sheets/BPMN.sheet.in.h:24
--msgid "Intermediate Event"
--msgstr "Vmesni dogodek"
-+msgid "End Event - Link"
-+msgstr "Kon�ni dogodek - povezava"
- 
- #: ../sheets/BPMN.sheet.in.h:25
--msgid "Intermediate Event - Cancel"
--msgstr "Vmesni dogodek - Preklic"
-+msgid "End Event - Multiple"
-+msgstr "Zaklju�ni dogodek - Ve� koncev"
- 
- #: ../sheets/BPMN.sheet.in.h:26
--msgid "Intermediate Event - Compensation"
--msgstr "Vmesni dogodek - Kompenzacija"
-+msgid "End Event - Terminate"
-+msgstr "Zaklju�ni dogodek - Izhod"
- 
- #: ../sheets/BPMN.sheet.in.h:27
--msgid "Intermediate Event - Error"
--msgstr "Vmesni dogodek - Napaka"
-+msgid "Gateway"
-+msgstr "Prehod"
- 
- #: ../sheets/BPMN.sheet.in.h:28
--msgid "Intermediate Event - Link"
--msgstr "Vmesni dogodek - Povezava"
-+msgid "Exclusive (XOR) Data Based"
-+msgstr "XOR, temelje� na podatkih"
- 
- #: ../sheets/BPMN.sheet.in.h:29
--msgid "Intermediate Event - Message"
--msgstr "Vmesni dogodek - sporo�ilo"
-+msgid "Exclusive (XOR) Event Based"
-+msgstr "XOR, temelje� na dogodkih"
- 
- #: ../sheets/BPMN.sheet.in.h:30
--msgid "Intermediate Event - Multiple"
--msgstr "Vmesni dogodek - Ve� koncev"
-+msgid "Inclusive (OR)"
-+msgstr "Vklju�no (OR, ALI)"
- 
- #: ../sheets/BPMN.sheet.in.h:31
--msgid "Intermediate Event - Rule"
--msgstr "Vmesni dogodek - Pravilo"
-+msgid "Complex"
-+msgstr "Obsežek"
- 
- #: ../sheets/BPMN.sheet.in.h:32
--msgid "Intermediate Event - Timer"
--msgstr "Vmesni dogodek - Å toparica"
--
--#: ../sheets/BPMN.sheet.in.h:33
--msgid "Looping Collapsed Sub-Process"
--msgstr "Zankano zrušen podproces"
-+msgid "Parallel (AND)"
-+msgstr "Vzporedno (AND, IN)"
- 
- #: ../sheets/BPMN.sheet.in.h:34
--msgid "Multiple Instance Collapsed Sub-Process"
--msgstr "Ve�pojavno zrušen podproces"
-+msgid "Activity Looping"
-+msgstr "Zankanje dejavnosti"
- 
- #: ../sheets/BPMN.sheet.in.h:35
- msgid "Multiple Instance Task"
- msgstr "Opravilo z ve� pojavitvami"
- 
- #: ../sheets/BPMN.sheet.in.h:36
--msgid "Parallel (AND)"
--msgstr "Vzporedno (AND, IN)"
-+msgid "Compensation Task"
-+msgstr "Kompenzacijsko opravilo"
- 
- #: ../sheets/BPMN.sheet.in.h:37
--msgid "Start Event"
--msgstr "Za�etni dogodek"
-+msgid "Collapsed Sub-Process"
-+msgstr "Zrušen podproces"
- 
- #: ../sheets/BPMN.sheet.in.h:38
--msgid "Start Event - Link"
--msgstr "Za�etni dogodek - povezava"
-+msgid "Looping Collapsed Sub-Process"
-+msgstr "Zankano zrušen podproces"
- 
- #: ../sheets/BPMN.sheet.in.h:39
--msgid "Start Event - Message"
--msgstr "Za�etni dogodek - sporo�ilo"
-+msgid "Multiple Instance Collapsed Sub-Process"
-+msgstr "Ve�pojavno zrušen podproces"
- 
- #: ../sheets/BPMN.sheet.in.h:40
--msgid "Start Event - Multiple"
--msgstr "Za�etni dogodek - Ve� možnosti"
-+msgid "Ad-Hoc Collapsed Sub-Process"
-+msgstr "Improvizirano zrušen podproces"
- 
- #: ../sheets/BPMN.sheet.in.h:41
--msgid "Start Event - Rule"
--msgstr "Za�etni dogodek - Pravilo"
-+msgid "Compensation Collapsed Sub-Process"
-+msgstr "Kompenzacijsko zrušen podproces"
- 
- #: ../sheets/BPMN.sheet.in.h:42
--msgid "Start Event - Timer"
--msgstr "Za�etni dogodek - štoparica"
--
--#: ../sheets/BPMN.sheet.in.h:44
--msgid "Text Annotation"
--msgstr "Pripomba v besedilu"
-+msgid "Group"
-+msgstr "Združi"
- 
--#: ../sheets/BPMN.sheet.in.h:45
-+#: ../sheets/BPMN.sheet.in.h:43
- msgid "Transaction"
- msgstr "Transakcija"
- 
--#: ../sheets/ChemEng.sheet.in.h:1
--msgid "AC Generator"
--msgstr "Generator toka"
-+#: ../sheets/BPMN.sheet.in.h:44
-+msgid "Data Object"
-+msgstr "Podatkovni predmet"
-+
-+#: ../sheets/BPMN.sheet.in.h:45
-+msgid "Text Annotation"
-+msgstr "Pripomba v besedilu"
- 
-+#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:2
--msgid "Air Cooler"
--msgstr "Hladilnik zraka"
-+msgid "ChemEng"
-+msgstr "ChemEng"
- 
- #: ../sheets/ChemEng.sheet.in.h:3
--msgid "Autoclave"
--msgstr "Avtoklav"
-+msgid "Collection for chemical engineering"
-+msgstr "Zbirka za kemijski inženiring"
- 
- #: ../sheets/ChemEng.sheet.in.h:4
--msgid "Axial Flow Fan"
--msgstr "Ventilator z osnim pretokom"
-+msgid "Fan or Stirrer"
-+msgstr "Ventilator ali mešalec"
- 
- #: ../sheets/ChemEng.sheet.in.h:5
--msgid "Basic Filter"
--msgstr "Osnovni filter"
-+msgid "Spraying Device"
-+msgstr "Pršilna naprava"
- 
- #: ../sheets/ChemEng.sheet.in.h:6
--msgid "Centrifugal Pump or Fan"
--msgstr "ÄŒrpalka ali ventilator s centrifugo"
-+msgid "Pneumatic Line"
-+msgstr "Pnevmati�ni cevovod"
- 
- #: ../sheets/ChemEng.sheet.in.h:7
--msgid "Centrifuge"
--msgstr "Centrifuga"
-+msgid "Pneumatic Line, vertical"
-+msgstr "Pnevmati�ni cevovod, navpi�en"
- 
--#. For: zenith
- #: ../sheets/ChemEng.sheet.in.h:9
--msgid "ChemEng"
--msgstr "ChemEng"
-+msgid "Simple Heat Exchanger"
-+msgstr "Enostavni izmenjalnik toplote"
- 
- #: ../sheets/ChemEng.sheet.in.h:10
--msgid "Clarifier or Settling Tank"
--msgstr "Bistrilni ali usedlinski rezervoar"
-+msgid "Simple Heat Exchanger, vertical"
-+msgstr "Enostavni izmenjalnik toplote, navpi�en"
- 
- #: ../sheets/ChemEng.sheet.in.h:11
--msgid "Collection for chemical engineering"
--msgstr "Zbirka za kemijski inženiring"
-+msgid "Water Cooler"
-+msgstr "Vodni hladilnik"
- 
- #: ../sheets/ChemEng.sheet.in.h:12
--msgid "Compressor or Turbine"
--msgstr "Kompresor ali turbina"
-+msgid "Water Cooler, vertical"
-+msgstr "Vodni hladilnik, navpi�en"
- 
- #: ../sheets/ChemEng.sheet.in.h:13
--msgid "Covered tank"
--msgstr "Pokrit rezervoar"
-+msgid "Fixed-Sheet Exchanger"
-+msgstr "Izmenjevalnik fiksnih listov"
- 
- #: ../sheets/ChemEng.sheet.in.h:14
--msgid "Cyclone and hydrocyclone"
--msgstr "Ciklon in hidrociklon"
-+msgid "Floating-Head or U-Tube Exchanger"
-+msgstr "Izmenjevalnik plavajo�e glave ali U-cevi"
- 
- #: ../sheets/ChemEng.sheet.in.h:15
--msgid "Double-Pipe Exchanger"
--msgstr "Dvocevni izmenjevalnik"
-+msgid "Kettle Reboiler"
-+msgstr "Kotel za prekuhavanje"
- 
- #: ../sheets/ChemEng.sheet.in.h:16
--msgid "Ejector or Injector"
--msgstr "Ejektor ali injektor"
-+msgid "Air Cooler"
-+msgstr "Hladilnik zraka"
- 
- #: ../sheets/ChemEng.sheet.in.h:17
--msgid "Fan or Stirrer"
--msgstr "Ventilator ali mešalec"
-+msgid "Forced-Flow Air Cooler"
-+msgstr "Hladilnik zraka z vsiljenim tokom"
- 
- #: ../sheets/ChemEng.sheet.in.h:18
--msgid "Fixed-Sheet Exchanger"
--msgstr "Izmenjevalnik fiksnih listov"
-+msgid "Induced-Flow Air Cooler"
-+msgstr "Hladilnik zraka z induciranim tokom"
- 
- #: ../sheets/ChemEng.sheet.in.h:19
--msgid "Floating-Head or U-Tube Exchanger"
--msgstr "Izmenjevalnik plavajo�e glave ali U-cevi"
-+msgid "Plate Exchanger"
-+msgstr "Izmenjevalnik ploš�"
- 
- #: ../sheets/ChemEng.sheet.in.h:20
--msgid "Fluid Contacting Vessel, simple"
--msgstr "Plovilo v stiku s teko�ino, enostavno"
-+msgid "Double-Pipe Exchanger"
-+msgstr "Dvocevni izmenjevalnik"
- 
- #: ../sheets/ChemEng.sheet.in.h:21
--msgid "Forced-Flow Air Cooler"
--msgstr "Hladilnik zraka z vsiljenim tokom"
-+msgid "Heating/Cooling Coil"
-+msgstr "Grelno/hladilna tuljava"
- 
- #: ../sheets/ChemEng.sheet.in.h:22
--msgid "Gas Holder, basic"
--msgstr "Plinska jeklenka, osnovna"
-+msgid "Heating/Cooling Coil, vertical"
-+msgstr "Grelno/hladilna tuljava, navpi�na"
- 
- #: ../sheets/ChemEng.sheet.in.h:23
--msgid "Heating/Cooling Coil"
--msgstr "Grelno/hladilna tuljava"
-+msgid "Simple Furnace"
-+msgstr "Enostavna pe�"
- 
- #: ../sheets/ChemEng.sheet.in.h:24
--msgid "Heating/Cooling Coil, vertical"
--msgstr "Grelno/hladilna tuljava, navpi�na"
-+msgid "Simple Vessel"
-+msgstr "Enostavno plovilo"
- 
- #: ../sheets/ChemEng.sheet.in.h:25
--msgid "Induced-Flow Air Cooler"
--msgstr "Hladilnik zraka z induciranim tokom"
-+msgid "Knock-out Drum (with demister pad)"
-+msgstr "Lo�ilni boben (z blazinico za demistracijo)"
- 
- #: ../sheets/ChemEng.sheet.in.h:26
--msgid "Kettle Reboiler"
--msgstr "Kotel za prekuhavanje"
-+msgid "Tray Column, simple"
-+msgstr "Stolpec pladnja, enostaven"
- 
- #: ../sheets/ChemEng.sheet.in.h:27
--msgid "Knock-out Drum (with demister pad)"
--msgstr "Lo�ilni boben (z blazinico za demistracijo)"
-+msgid "Tray Column, detailed"
-+msgstr "Stolpec pladnja, podroben"
-+
-+#: ../sheets/ChemEng.sheet.in.h:28
-+msgid "Fluid Contacting Vessel, simple"
-+msgstr "Plovilo v stiku s teko�ino, enostavno"
- 
- #: ../sheets/ChemEng.sheet.in.h:29
--msgid "Mixer"
--msgstr "Mešalnik"
-+msgid "Reactor or Absorption Vessel, simple"
-+msgstr "Reaktorsko ali absorbcijsko plovilo, enostavno"
- 
- #: ../sheets/ChemEng.sheet.in.h:30
--msgid "Open Tank"
--msgstr "Odprti rezervoar"
-+msgid "Autoclave"
-+msgstr "Avtoklav"
- 
- #: ../sheets/ChemEng.sheet.in.h:31
--msgid "Plate Exchanger"
--msgstr "Izmenjevalnik ploš�"
-+msgid "Open Tank"
-+msgstr "Odprti rezervoar"
- 
- #: ../sheets/ChemEng.sheet.in.h:32
--msgid "Pneumatic Line"
--msgstr "Pnevmati�ni cevovod"
-+msgid "Clarifier or Settling Tank"
-+msgstr "Bistrilni ali usedlinski rezervoar"
- 
- #: ../sheets/ChemEng.sheet.in.h:33
--msgid "Pneumatic Line, vertical"
--msgstr "Pnevmati�ni cevovod, navpi�en"
-+msgid "Sealed Tank"
-+msgstr "Cisterna"
- 
- #: ../sheets/ChemEng.sheet.in.h:34
--msgid "Positive Displacement Rotary Pump or Compressor"
--msgstr "Krožna �rpalka ali kompresor s pozitivnim spodrivom"
-+msgid "Covered tank"
-+msgstr "Pokrit rezervoar"
- 
- #: ../sheets/ChemEng.sheet.in.h:35
--msgid "Pressure Relief Valve"
--msgstr "Ventil sprostitve pritiska"
-+msgid "Tank with Fixed Roof"
-+msgstr "Rezervoar z nepomi�no streho"
- 
- #: ../sheets/ChemEng.sheet.in.h:36
--msgid "Reactor or Absorption Vessel, simple"
--msgstr "Reaktorsko ali absorbcijsko plovilo, enostavno"
-+msgid "Tank with Floating Roof"
-+msgstr "Rezervoar s plavajo�o streho"
- 
- #: ../sheets/ChemEng.sheet.in.h:37
--msgid "Reciprocating Compressor or Pump"
--msgstr "Batni kompresor ali �rpalka"
-+msgid "Storage Sphere"
-+msgstr "Shrama, krogla"
- 
- #: ../sheets/ChemEng.sheet.in.h:38
--msgid "Regulable Valve"
--msgstr "Nastavljivi ventil"
-+msgid "Gas Holder, basic"
-+msgstr "Plinska jeklenka, osnovna"
- 
- #: ../sheets/ChemEng.sheet.in.h:39
--msgid "Regulable Valve, vertical"
--msgstr "Nastavljivi ventil, navpi�en"
-+msgid "Centrifugal Pump or Fan"
-+msgstr "ÄŒrpalka ali ventilator s centrifugo"
- 
- #: ../sheets/ChemEng.sheet.in.h:40
--msgid "Sealed Tank"
--msgstr "Cisterna"
-+msgid "Positive Displacement Rotary Pump or Compressor"
-+msgstr "Krožna �rpalka ali kompresor s pozitivnim spodrivom"
- 
- #: ../sheets/ChemEng.sheet.in.h:41
--msgid "Simple Furnace"
--msgstr "Enostavna pe�"
-+msgid "Reciprocating Compressor or Pump"
-+msgstr "Batni kompresor ali �rpalka"
- 
- #: ../sheets/ChemEng.sheet.in.h:42
--msgid "Simple Heat Exchanger"
--msgstr "Enostavni izmenjalnik toplote"
-+msgid "Axial Flow Fan"
-+msgstr "Ventilator z osnim pretokom"
- 
- #: ../sheets/ChemEng.sheet.in.h:43
--msgid "Simple Heat Exchanger, vertical"
--msgstr "Enostavni izmenjalnik toplote, navpi�en"
-+msgid "Compressor or Turbine"
-+msgstr "Kompresor ali turbina"
- 
- #: ../sheets/ChemEng.sheet.in.h:44
--msgid "Simple Vessel"
--msgstr "Enostavno plovilo"
-+msgid "Ejector or Injector"
-+msgstr "Ejektor ali injektor"
- 
- #: ../sheets/ChemEng.sheet.in.h:45
--msgid "Spray Drier"
--msgstr "Pršilnik barv"
-+msgid "AC Generator"
-+msgstr "Generator toka"
- 
- #: ../sheets/ChemEng.sheet.in.h:46
--msgid "Spraying Device"
--msgstr "Pršilna naprava"
-+msgid "Valve"
-+msgstr "Ventil"
- 
- #: ../sheets/ChemEng.sheet.in.h:47
--msgid "Storage Sphere"
--msgstr "Shrama, krogla"
-+msgid "Valve, vertical"
-+msgstr "Ventil, navpi�en"
- 
- #: ../sheets/ChemEng.sheet.in.h:48
--msgid "Tank with Fixed Roof"
--msgstr "Rezervoar z nepomi�no streho"
-+msgid "Regulable Valve"
-+msgstr "Nastavljivi ventil"
- 
- #: ../sheets/ChemEng.sheet.in.h:49
--msgid "Tank with Floating Roof"
--msgstr "Rezervoar s plavajo�o streho"
-+msgid "Regulable Valve, vertical"
-+msgstr "Nastavljivi ventil, navpi�en"
- 
- #: ../sheets/ChemEng.sheet.in.h:50
--msgid "Tray Column, detailed"
--msgstr "Stolpec pladnja, podroben"
-+msgid "Basic Filter"
-+msgstr "Osnovni filter"
- 
- #: ../sheets/ChemEng.sheet.in.h:51
--msgid "Tray Column, simple"
--msgstr "Stolpec pladnja, enostaven"
-+msgid "Mixer"
-+msgstr "Mešalnik"
- 
- #: ../sheets/ChemEng.sheet.in.h:52
--msgid "Valve"
--msgstr "Ventil"
-+msgid "Cyclone and hydrocyclone"
-+msgstr "Ciklon in hidrociklon"
- 
- #: ../sheets/ChemEng.sheet.in.h:53
--msgid "Valve, vertical"
--msgstr "Ventil, navpi�en"
-+msgid "Spray Drier"
-+msgstr "Pršilnik barv"
- 
- #: ../sheets/ChemEng.sheet.in.h:54
--msgid "Water Cooler"
--msgstr "Vodni hladilnik"
-+msgid "Centrifuge"
-+msgstr "Centrifuga"
- 
- #: ../sheets/ChemEng.sheet.in.h:55
--msgid "Water Cooler, vertical"
--msgstr "Vodni hladilnik, navpi�en"
-+msgid "Pressure Relief Valve"
-+msgstr "Ventil sprostitve pritiska"
- 
- #: ../sheets/Circuit.sheet.in.h:1
- msgid "Circuit"
-@@ -7562,306 +7308,304 @@ msgid "Components for circuit diagrams"
- msgstr "Komponente za diagrame vezij"
- 
- #: ../sheets/Circuit.sheet.in.h:3
--msgid "Ground point"
--msgstr "To�ka ozemljitve"
-+msgid "Vertically aligned resistor"
-+msgstr "Navpi�no postavljen upornik"
- 
- #: ../sheets/Circuit.sheet.in.h:4
--msgid "Horizontal jumper"
--msgstr "Vodoravni sko�nik"
-+msgid "Horizontally aligned inductor"
-+msgstr "Vodoravno postavljen induktor"
- 
- #: ../sheets/Circuit.sheet.in.h:5
--msgid "Horizontally aligned LED"
--msgstr "Vodoravno postavljena LED"
-+msgid "Vertically aligned inductor"
-+msgstr "Navpi�no postavljen induktor"
- 
- #: ../sheets/Circuit.sheet.in.h:6
--msgid "Horizontally aligned capacitor"
--msgstr "Vodoravno postavljen kondenzator"
-+msgid "Horizontally aligned resistor"
-+msgstr "Vodoravno postavljen upornik"
- 
- #: ../sheets/Circuit.sheet.in.h:7
--msgid "Horizontally aligned diode"
--msgstr "Vodoravno postavljena dioda"
-+msgid "Vertically aligned resistor (European)"
-+msgstr "Navpi�no postavljen upornik (evropski)"
- 
- #: ../sheets/Circuit.sheet.in.h:8
--msgid "Horizontally aligned fuse"
--msgstr "Vodoravno postavljena varovalka"
--
--#: ../sheets/Circuit.sheet.in.h:9
--msgid "Horizontally aligned inductor"
--msgstr "Vodoravno postavljen induktor"
--
--#: ../sheets/Circuit.sheet.in.h:10
- msgid "Horizontally aligned inductor (European)"
- msgstr "Vodoravno postavljen induktor (evropski)"
- 
--#: ../sheets/Circuit.sheet.in.h:11
--msgid "Horizontally aligned powersource"
--msgstr "Vodoravno postavljen izvor toka"
--
--#: ../sheets/Circuit.sheet.in.h:12
--msgid "Horizontally aligned resistor"
--msgstr "Vodoravno postavljen upornik"
-+#: ../sheets/Circuit.sheet.in.h:9
-+msgid "Vertically aligned inductor (European)"
-+msgstr "Navpi�no postavljen induktor (evropski)"
- 
--#: ../sheets/Circuit.sheet.in.h:13
-+#: ../sheets/Circuit.sheet.in.h:10
- msgid "Horizontally aligned resistor (European)"
- msgstr "Vodoravno postavljen upornik (evropski)"
- 
--#: ../sheets/Circuit.sheet.in.h:14
--msgid "Horizontally aligned zener diode"
--msgstr "Vodoravno postavljena zener dioda"
--
--#: ../sheets/Circuit.sheet.in.h:15
--msgid "Lamp"
--msgstr "Žarnica"
--
--#: ../sheets/Circuit.sheet.in.h:16
--#: ../sheets/ciscomisc.sheet.in.h:30
--msgid "Microphone"
--msgstr "Mikrofon"
-+#: ../sheets/Circuit.sheet.in.h:11
-+msgid "Horizontally aligned capacitor"
-+msgstr "Vodoravno postavljen kondenzator"
- 
--#: ../sheets/Circuit.sheet.in.h:17
--msgid "NMOS transistor"
--msgstr "Tranzistor NMOS"
-+#: ../sheets/Circuit.sheet.in.h:12
-+msgid "Vertically aligned capacitor"
-+msgstr "Navpi�no postavljen kondenzator"
- 
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:20
-+#: ../sheets/Circuit.sheet.in.h:15
- msgid "NPN bipolar transistor"
- msgstr "Bipolarni tranzistor NPN"
- 
--#: ../sheets/Circuit.sheet.in.h:21
--msgid "Operational amplifier"
--msgstr "Delujo� oja�evalnik"
--
--#: ../sheets/Circuit.sheet.in.h:22
--msgid "PMOS transistor"
--msgstr "Tranzistor PMOS"
--
- #.
- #.
--#: ../sheets/Circuit.sheet.in.h:25
-+#: ../sheets/Circuit.sheet.in.h:18
- msgid "PNP bipolar transistor"
- msgstr "Bipolarni tranzistor PNP"
- 
-+#: ../sheets/Circuit.sheet.in.h:19
-+msgid "Horizontally aligned diode"
-+msgstr "Vodoravno postavljena dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:20
-+msgid "Vertically aligned diode"
-+msgstr "Navpi�no postavljena dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:21
-+msgid "Horizontally aligned zener diode"
-+msgstr "Vodoravno postavljena zener dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:22
-+msgid "Vertically aligned zener diode"
-+msgstr "Navpi�no postavljena zener dioda"
-+
-+#: ../sheets/Circuit.sheet.in.h:23
-+msgid "Ground point"
-+msgstr "To�ka ozemljitve"
-+
-+#: ../sheets/Circuit.sheet.in.h:24
-+msgid "Operational amplifier"
-+msgstr "Delujo� oja�evalnik"
-+
-+#: ../sheets/Circuit.sheet.in.h:25
-+msgid "Horizontally aligned fuse"
-+msgstr "Vodoravno postavljena varovalka"
-+
- #: ../sheets/Circuit.sheet.in.h:26
--#: ../sheets/ciscomisc.sheet.in.h:42
--msgid "Speaker"
--msgstr "Zvo�nik"
-+msgid "Vertically aligned fuse"
-+msgstr "Navpi�no postavljena varovalka"
- 
- #: ../sheets/Circuit.sheet.in.h:27
--msgid "Vertically aligned LED"
--msgstr "Navpi�no postavljena LED"
-+msgid "Horizontally aligned powersource"
-+msgstr "Vodoravno postavljen izvor toka"
- 
- #: ../sheets/Circuit.sheet.in.h:28
--msgid "Vertically aligned capacitor"
--msgstr "Navpi�no postavljen kondenzator"
-+msgid "Vertically aligned powersource"
-+msgstr "Navpi�no postavljen izvor toka"
- 
- #: ../sheets/Circuit.sheet.in.h:29
--msgid "Vertically aligned diode"
--msgstr "Navpi�no postavljena dioda"
-+msgid "Lamp"
-+msgstr "Žarnica"
- 
--#: ../sheets/Circuit.sheet.in.h:30
--msgid "Vertically aligned fuse"
--msgstr "Navpi�no postavljena varovalka"
-+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
-+msgid "Speaker"
-+msgstr "Zvo�nik"
- 
--#: ../sheets/Circuit.sheet.in.h:31
--msgid "Vertically aligned inductor"
--msgstr "Navpi�no postavljen induktor"
-+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
-+msgid "Microphone"
-+msgstr "Mikrofon"
- 
- #: ../sheets/Circuit.sheet.in.h:32
--msgid "Vertically aligned inductor (European)"
--msgstr "Navpi�no postavljen induktor (evropski)"
-+msgid "Horizontally aligned LED"
-+msgstr "Vodoravno postavljena LED"
- 
- #: ../sheets/Circuit.sheet.in.h:33
--msgid "Vertically aligned powersource"
--msgstr "Navpi�no postavljen izvor toka"
-+msgid "Vertically aligned LED"
-+msgstr "Navpi�no postavljena LED"
- 
- #: ../sheets/Circuit.sheet.in.h:34
--msgid "Vertically aligned resistor"
--msgstr "Navpi�no postavljen upornik"
-+msgid "NMOS transistor"
-+msgstr "Tranzistor NMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:35
--msgid "Vertically aligned resistor (European)"
--msgstr "Navpi�no postavljen upornik (evropski)"
-+msgid "PMOS transistor"
-+msgstr "Tranzistor PMOS"
- 
- #: ../sheets/Circuit.sheet.in.h:36
--msgid "Vertically aligned zener diode"
--msgstr "Navpi�no postavljena zener dioda"
-+msgid "Horizontal jumper"
-+msgstr "Vodoravni sko�nik"
- 
- #: ../sheets/Contact.sheet.in.h:1
--msgid "'if not' (normally closed) ladder contact"
--msgstr "Obi�ajno sklenjen lestvi�ni stik 'if not' (�e ne)"
-+msgid "Ladder"
-+msgstr "Ladder"
- 
- #: ../sheets/Contact.sheet.in.h:2
--msgid "'if' (normally open) ladder contact"
--msgstr "Obi�ajno prekinjen lestvi�ni stik 'if' (�e)"
-+msgid "Components for LADDER circuits"
-+msgstr "Komponente vezij LADDER"
- 
- #: ../sheets/Contact.sheet.in.h:3
--msgid "'jump' output variable"
--msgstr "Izhodna spremenljivka 'jump' (skok)"
-+msgid "'if' (normally open) ladder contact"
-+msgstr "Obi�ajno prekinjen lestvi�ni stik 'if' (�e)"
- 
- #: ../sheets/Contact.sheet.in.h:4
--msgid "'reset' output variable"
--msgstr "Izhodna spremenljivka 'reset' (ponastavi)"
-+msgid "'if not' (normally closed) ladder contact"
-+msgstr "Obi�ajno sklenjen lestvi�ni stik 'if not' (�e ne)"
- 
- #: ../sheets/Contact.sheet.in.h:5
--msgid "'set' output variable"
--msgstr "Izhodna spremenljivka 'set' (nastavi)"
-+msgid "Simple output variable"
-+msgstr "Enostavna izhodna spremenljivka"
- 
- #: ../sheets/Contact.sheet.in.h:6
--msgid "Components for LADDER circuits"
--msgstr "Komponente vezij LADDER"
-+msgid "Negative output variable"
-+msgstr "Negativna izhodna spremenljivka"
- 
- #: ../sheets/Contact.sheet.in.h:7
--msgid "Ladder"
--msgstr "Ladder"
-+msgid "'set' output variable"
-+msgstr "Izhodna spremenljivka 'set' (nastavi)"
- 
- #: ../sheets/Contact.sheet.in.h:8
--msgid "Negative output variable"
--msgstr "Negativna izhodna spremenljivka"
-+msgid "'reset' output variable"
-+msgstr "Izhodna spremenljivka 'reset' (ponastavi)"
- 
- #: ../sheets/Contact.sheet.in.h:9
--msgid "Power-saved 'reset' output variable"
--msgstr "Shranjena izhodna spremenljivka 'reset' (ponastavi)"
-+msgid "'jump' output variable"
-+msgstr "Izhodna spremenljivka 'jump' (skok)"
- 
- #: ../sheets/Contact.sheet.in.h:10
--msgid "Power-saved 'set' output variable"
--msgstr "Shranjena izhodna spremenljivka 'set' (nastavi)"
-+msgid "Receptivity output variable"
-+msgstr "Izhodna spremenljivka receptivnosti"
- 
- #: ../sheets/Contact.sheet.in.h:11
--msgid "Power-saved negative output variable"
--msgstr "Shranjena negativna izhodna spremenljivka"
--
--#: ../sheets/Contact.sheet.in.h:12
- msgid "Power-saved simple output variable"
- msgstr "Shranjena enostavna izhodna spremenljivka"
- 
-+#: ../sheets/Contact.sheet.in.h:12
-+msgid "Power-saved negative output variable"
-+msgstr "Shranjena negativna izhodna spremenljivka"
-+
- #: ../sheets/Contact.sheet.in.h:13
--msgid "Receptivity output variable"
--msgstr "Izhodna spremenljivka receptivnosti"
-+msgid "Power-saved 'set' output variable"
-+msgstr "Shranjena izhodna spremenljivka 'set' (nastavi)"
- 
- #: ../sheets/Contact.sheet.in.h:14
--msgid "Simple output variable"
--msgstr "Enostavna izhodna spremenljivka"
-+msgid "Power-saved 'reset' output variable"
-+msgstr "Shranjena izhodna spremenljivka 'reset' (ponastavi)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:1
--msgid "Constant factor below -1"
--msgstr "Konstantni faktor pod -1"
-+msgid "Cybernetics"
-+msgstr "Kibernetika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:2
--msgid "Constant factor between 0 and -1"
--msgstr "Konstantni faktor med 0 in -1"
-+msgid "Elements of cybernetic circuits"
-+msgstr "Komponente za kiberneti�na vezja"
- 
- #: ../sheets/Cybernetics.sheet.in.h:3
--msgid "Constant factor between 0 and 1"
--msgstr "Konstantni faktor med 0 in 1"
-+msgid "Sensor - left"
-+msgstr "Tipalo - levo"
- 
- #: ../sheets/Cybernetics.sheet.in.h:4
--msgid "Constant factor greater 1"
--msgstr "Konstantni faktor nad 1"
-+msgid "Sensor - right"
-+msgstr "Tipalo - desno"
- 
- #: ../sheets/Cybernetics.sheet.in.h:5
--msgid "Constant negative shift on the y-axis"
--msgstr "Konstanten negativen zamik osi Y"
-+msgid "Sensor - bottom"
-+msgstr "Tipalo - spodnje"
- 
- #: ../sheets/Cybernetics.sheet.in.h:6
--msgid "Constant positive shift on the y-axis"
--msgstr "Konstanten pozitiven zamik osi Y"
-+msgid "Sensor - top"
-+msgstr "Tipalo - gornje"
- 
- #: ../sheets/Cybernetics.sheet.in.h:7
--msgid "Cybernetics"
--msgstr "Kibernetika"
-+msgid "Sum, subtracting left input"
-+msgstr "Vsota, odštet vhod levo"
- 
- #: ../sheets/Cybernetics.sheet.in.h:8
--msgid "Elements of cybernetic circuits"
--msgstr "Komponente za kiberneti�na vezja"
-+msgid "Sum, subtracting right input"
-+msgstr "Vsota, odštet vhod desno"
- 
- #: ../sheets/Cybernetics.sheet.in.h:9
--msgid "Full wave rectifier (absolute value)"
--msgstr "Destilacijski aparat s polnim valovanjem (absolutna vrednost)"
-+msgid "Sum, subtracting bottom input"
-+msgstr "Vsota, odštet vhod na dnu"
- 
- #: ../sheets/Cybernetics.sheet.in.h:10
--msgid "Half wave rectifier or ramp input"
--msgstr "Destilacijski aparat s polovi�nim valovanjem ali vhodnim nagibom"
-+msgid "Sum, subtracting top input"
-+msgstr "Vsota, odštet vhod z vrha"
- 
- #: ../sheets/Cybernetics.sheet.in.h:11
--msgid "High pass filter"
--msgstr "Visokopasovni filter"
--
--#: ../sheets/Cybernetics.sheet.in.h:12
--msgid "Integrator - input bottom"
--msgstr "Integrator - vhod na dnu"
--
--#: ../sheets/Cybernetics.sheet.in.h:13
- msgid "Integrator - input left"
- msgstr "Integrator - vhod levo"
- 
--#: ../sheets/Cybernetics.sheet.in.h:14
-+#: ../sheets/Cybernetics.sheet.in.h:12
- msgid "Integrator - input right"
- msgstr "Integrator - vhod desno"
- 
--#: ../sheets/Cybernetics.sheet.in.h:15
-+#: ../sheets/Cybernetics.sheet.in.h:13
-+msgid "Integrator - input bottom"
-+msgstr "Integrator - vhod na dnu"
-+
-+#: ../sheets/Cybernetics.sheet.in.h:14
- msgid "Integrator - input top"
- msgstr "Integrator - vhod na vrhu"
- 
--#: ../sheets/Cybernetics.sheet.in.h:16
--msgid "Low pass filter"
--msgstr "Nizkopasovni filter"
-+#: ../sheets/Cybernetics.sheet.in.h:15
-+msgid "Sum"
-+msgstr "Vsota"
- 
--#: ../sheets/Cybernetics.sheet.in.h:17
-+#: ../sheets/Cybernetics.sheet.in.h:16
- msgid "Product"
- msgstr "Zmnožek"
- 
-+#: ../sheets/Cybernetics.sheet.in.h:17
-+msgid "High pass filter"
-+msgstr "Visokopasovni filter"
-+
- #: ../sheets/Cybernetics.sheet.in.h:18
--msgid "Relay characteristic (sigma)"
--msgstr "Relejska karakteristika (sigma)"
-+msgid "Low pass filter"
-+msgstr "Nizkopasovni filter"
- 
- #: ../sheets/Cybernetics.sheet.in.h:19
--msgid "Saturation characteristic"
--msgstr "Zna�ilnost nasi�enosti"
-+msgid "Sine characteristic or input"
-+msgstr "Sinusna karakteristika ali vhod"
- 
- #: ../sheets/Cybernetics.sheet.in.h:20
--msgid "Sensor - bottom"
--msgstr "Tipalo - spodnje"
-+msgid "Sigmoid characteristic"
-+msgstr "Sigmoidna karakteristika"
- 
- #: ../sheets/Cybernetics.sheet.in.h:21
--msgid "Sensor - left"
--msgstr "Tipalo - levo"
-+msgid "Saturation characteristic"
-+msgstr "Zna�ilnost nasi�enosti"
- 
- #: ../sheets/Cybernetics.sheet.in.h:22
--msgid "Sensor - right"
--msgstr "Tipalo - desno"
-+msgid "Relay characteristic (sigma)"
-+msgstr "Relejska karakteristika (sigma)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:23
--msgid "Sensor - top"
--msgstr "Tipalo - gornje"
-+msgid "Half wave rectifier or ramp input"
-+msgstr "Destilacijski aparat s polovi�nim valovanjem ali vhodnim nagibom"
- 
- #: ../sheets/Cybernetics.sheet.in.h:24
--msgid "Sigmoid characteristic"
--msgstr "Sigmoidna karakteristika"
-+msgid "Full wave rectifier (absolute value)"
-+msgstr "Destilacijski aparat s polnim valovanjem (absolutna vrednost)"
- 
- #: ../sheets/Cybernetics.sheet.in.h:25
--msgid "Sine characteristic or input"
--msgstr "Sinusna karakteristika ali vhod"
-+msgid "Constant positive shift on the y-axis"
-+msgstr "Konstanten pozitiven zamik osi Y"
- 
- #: ../sheets/Cybernetics.sheet.in.h:26
--msgid "Sum"
--msgstr "Vsota"
-+msgid "Constant negative shift on the y-axis"
-+msgstr "Konstanten negativen zamik osi Y"
- 
- #: ../sheets/Cybernetics.sheet.in.h:27
--msgid "Sum, subtracting bottom input"
--msgstr "Vsota, odštet vhod na dnu"
-+msgid "Constant factor greater 1"
-+msgstr "Konstantni faktor nad 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:28
--msgid "Sum, subtracting left input"
--msgstr "Vsota, odštet vhod levo"
-+msgid "Constant factor between 0 and 1"
-+msgstr "Konstantni faktor med 0 in 1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:29
--msgid "Sum, subtracting right input"
--msgstr "Vsota, odštet vhod desno"
-+msgid "Constant factor between 0 and -1"
-+msgstr "Konstantni faktor med 0 in -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:30
--msgid "Sum, subtracting top input"
--msgstr "Vsota, odštet vhod z vrha"
-+msgid "Constant factor below -1"
-+msgstr "Konstantni faktor pod -1"
- 
- #: ../sheets/Cybernetics.sheet.in.h:31
- msgid "Template for custom characteristics"
-@@ -7872,331 +7616,322 @@ msgid "Time delay"
- msgstr "ÄŒasovna zakasnitev"
- 
- #: ../sheets/Database.sheet.in.h:1
--msgid "Attribute compound"
--msgstr "Komponenta atributa"
--
--#: ../sheets/Database.sheet.in.h:2
- msgid "Database"
- msgstr "Podatkovna zbirka"
- 
--#: ../sheets/Database.sheet.in.h:3
-+#: ../sheets/Database.sheet.in.h:2
- msgid "Editor for Database Table Relation Diagrams"
- msgstr "Urejevalnik diagramov povezav podatkovne zbirke"
- 
--#: ../sheets/ER.sheet.in.h:2
-+#: ../sheets/Database.sheet.in.h:5
-+msgid "Attribute compound"
-+msgstr "Komponenta atributa"
-+
-+#: ../sheets/ER.sheet.in.h:1
- msgid "ER"
- msgstr "Relacije med entitetami"
- 
--#: ../sheets/ER.sheet.in.h:3
-+#: ../sheets/ER.sheet.in.h:2
- msgid "Editor for Entity Relations Diagrams"
- msgstr "Urejevalnik diagramov relacij med entitetami"
- 
--#: ../sheets/ER.sheet.in.h:5
--msgid "Participation"
--msgstr "Sodelovanje"
--
--#: ../sheets/ER.sheet.in.h:7
-+#: ../sheets/ER.sheet.in.h:4
- msgid "Weak entity"
- msgstr "Å ibka entiteta"
- 
-+#: ../sheets/ER.sheet.in.h:7
-+msgid "Participation"
-+msgstr "Sodelovanje"
-+
- #: ../sheets/Electric.sheet.in.h:1
--msgid "Components for electric circuits"
--msgstr "Komponente za elektri�na vezja"
-+msgid "Electric"
-+msgstr "Elektrika"
- 
- #: ../sheets/Electric.sheet.in.h:2
--#: ../sheets/Pneumatic.sheet.in.h:7
--msgid "Connection point"
--msgstr "To�ka povezave"
-+msgid "Components for electric circuits"
-+msgstr "Komponente za elektri�na vezja"
- 
- #: ../sheets/Electric.sheet.in.h:3
--msgid "Electric"
--msgstr "Elektrika"
-+msgid "Normally open contact (horizontal)"
-+msgstr "Obi�ajno prekinjen stik (vodoraven)"
- 
- #: ../sheets/Electric.sheet.in.h:4
--msgid "Lamp or indicator light (horizontal)"
--msgstr "Žarnica ali lu� indikatorja (vodoravna)"
-+msgid "Normally closed contact (horizontal)"
-+msgstr "Obi�ajno sklenjen stik (vodoraven)"
- 
- #: ../sheets/Electric.sheet.in.h:5
--msgid "Lamp or indicator light (vertical)"
--msgstr "Žarnica ali lu� indikatorja (navpi�na)"
-+msgid "Normally open position switch (horizontal)"
-+msgstr "Obi�ajno prekinjen preklopnik položaja (vodoraven)"
- 
- #: ../sheets/Electric.sheet.in.h:6
--msgid "Normally closed contact (horizontal)"
--msgstr "Obi�ajno sklenjen stik (vodoraven)"
-+msgid "Normally closed position switch (horizontal)"
-+msgstr "Obi�ajno sklenjen preklopnik položaja (vodoraven)"
- 
- #: ../sheets/Electric.sheet.in.h:7
--msgid "Normally closed contact (vertical)"
--msgstr "Obi�ajno sklenjen stik (navpi�en)"
-+msgid "Normally open contact (vertical)"
-+msgstr "Obi�ajno prekinjen stik (navpi�en)"
- 
- #: ../sheets/Electric.sheet.in.h:8
--msgid "Normally closed position switch (horizontal)"
--msgstr "Obi�ajno sklenjen preklopnik položaja (vodoraven)"
-+msgid "Normally closed contact (vertical)"
-+msgstr "Obi�ajno sklenjen stik (navpi�en)"
- 
- #: ../sheets/Electric.sheet.in.h:9
--msgid "Normally closed position switch (vertical)"
--msgstr "Obi�ajno sklenjen preklopnik položaja (navpi�en)"
-+msgid "Normally open position switch (vertical)"
-+msgstr "Obi�ajno prekinjen preklopnik položaja (navpi�en)"
- 
- #: ../sheets/Electric.sheet.in.h:10
--msgid "Normally open contact (horizontal)"
--msgstr "Obi�ajno prekinjen stik (vodoraven)"
-+msgid "Normally closed position switch (vertical)"
-+msgstr "Obi�ajno sklenjen preklopnik položaja (navpi�en)"
- 
- #: ../sheets/Electric.sheet.in.h:11
--msgid "Normally open contact (vertical)"
--msgstr "Obi�ajno prekinjen stik (navpi�en)"
-+msgid "The command organ of a relay (horizontal)"
-+msgstr "Upravljalnik releja (vodoraven)"
- 
- #: ../sheets/Electric.sheet.in.h:12
--msgid "Normally open position switch (horizontal)"
--msgstr "Obi�ajno prekinjen preklopnik položaja (vodoraven)"
-+msgid "Relay (horizontal)"
-+msgstr "Rele (vodoraven)"
- 
- #: ../sheets/Electric.sheet.in.h:13
--msgid "Normally open position switch (vertical)"
--msgstr "Obi�ajno prekinjen preklopnik položaja (navpi�en)"
-+msgid "Lamp or indicator light (horizontal)"
-+msgstr "Žarnica ali lu� indikatorja (vodoravna)"
- 
- #: ../sheets/Electric.sheet.in.h:14
--msgid "Relay (horizontal)"
--msgstr "Rele (vodoraven)"
-+msgid "The command organ of a relay (vertical)"
-+msgstr "Upravljalnik releja (navpi�en)"
- 
- #: ../sheets/Electric.sheet.in.h:15
- msgid "Relay (vertical)"
- msgstr "Rele (navpi�en)"
- 
- #: ../sheets/Electric.sheet.in.h:16
--msgid "The command organ of a relay (horizontal)"
--msgstr "Upravljalnik releja (vodoraven)"
-+msgid "Lamp or indicator light (vertical)"
-+msgstr "Žarnica ali lu� indikatorja (navpi�na)"
- 
--#: ../sheets/Electric.sheet.in.h:17
--msgid "The command organ of a relay (vertical)"
--msgstr "Upravljalnik releja (navpi�en)"
-+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
-+msgid "Connection point"
-+msgstr "To�ka povezave"
- 
- #: ../sheets/FS.sheet.in.h:1
--msgid "Editor for Function Structure Diagrams."
--msgstr "Urejevalnik za diagrame funkcijskih struktur."
--
--#: ../sheets/FS.sheet.in.h:2
- msgid "FS"
- msgstr "Funkcijske strukture"
- 
-+#: ../sheets/FS.sheet.in.h:2
-+msgid "Editor for Function Structure Diagrams."
-+msgstr "Urejevalnik za diagrame funkcijskih struktur."
-+
- #: ../sheets/FS.sheet.in.h:3
- msgid "Flow"
- msgstr "Tok"
- 
- #: ../sheets/FS.sheet.in.h:4
--msgid "Function"
--msgstr "Funkcija"
--
--#: ../sheets/FS.sheet.in.h:5
- msgid "Orthogonal polyline flow"
- msgstr "Pravokotni lomljeni tok"
- 
--#. XXX
-+#: ../sheets/FS.sheet.in.h:5
-+msgid "Function"
-+msgstr "Funkcija"
-+
- #: ../sheets/Flowchart.sheet.in.h:2
--msgid "Collate"
--msgstr "Združi"
-+msgid "Objects to draw flowcharts"
-+msgstr "Predmeti za risanje diagramov poteka"
- 
- #: ../sheets/Flowchart.sheet.in.h:3
--msgid "Connector"
--msgstr "Konektor"
-+msgid "Process/Auxiliary Operation"
-+msgstr "Proces/pomožna operacija"
- 
- #: ../sheets/Flowchart.sheet.in.h:4
--msgid "Data source"
--msgstr "Vir podatkov"
-+msgid "Input/Output"
-+msgstr "Vhod/izhod"
- 
--#: ../sheets/Flowchart.sheet.in.h:5
--#: ../sheets/SDL.sheet.in.h:4
-+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
- msgid "Decision"
- msgstr "Odlo�itev"
- 
- #: ../sheets/Flowchart.sheet.in.h:6
--msgid "Delay"
--msgstr "Zakasnitev"
-+msgid "Connector"
-+msgstr "Konektor"
- 
- #: ../sheets/Flowchart.sheet.in.h:8
--msgid "Document"
--msgstr "Dokument"
-+msgid "Transaction file"
-+msgstr "Datoteka transakcij"
-+
-+#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:10
-+msgid "Off page connector"
-+msgstr "Stik izven strani"
- 
- #: ../sheets/Flowchart.sheet.in.h:11
--msgid "Input/Output"
--msgstr "Vhod/izhod"
-+msgid "Document"
-+msgstr "Dokument"
- 
- #: ../sheets/Flowchart.sheet.in.h:12
--msgid "Internal storage"
--msgstr "Notranja shramba"
-+msgid "Manual operation"
-+msgstr "Ro�no delovanje"
- 
- #: ../sheets/Flowchart.sheet.in.h:13
--msgid "Magnetic disk"
--msgstr "Magnetni disk"
-+msgid "Preparation"
-+msgstr "Priprava"
- 
- #: ../sheets/Flowchart.sheet.in.h:14
--msgid "Magnetic drum"
--msgstr "Magnetni boben"
-+msgid "Manual input"
-+msgstr "Ro�ni vnos"
- 
- #: ../sheets/Flowchart.sheet.in.h:15
--msgid "Magnetic tape"
--msgstr "Magnetni trak"
-+msgid "Predefined process"
-+msgstr "Vnaprej dolo�en proces"
- 
- #: ../sheets/Flowchart.sheet.in.h:16
--msgid "Manual input"
--msgstr "Ro�ni vnos"
-+msgid "Terminal Interrupt"
-+msgstr "Prekinitev terminala"
- 
- #: ../sheets/Flowchart.sheet.in.h:17
--msgid "Manual operation"
--msgstr "Ro�no delovanje"
-+msgid "Magnetic disk"
-+msgstr "Magnetni disk"
- 
- #: ../sheets/Flowchart.sheet.in.h:18
--msgid "Merge"
--msgstr "Spoji"
-+msgid "Magnetic drum"
-+msgstr "Magnetni boben"
- 
- #: ../sheets/Flowchart.sheet.in.h:19
--msgid "Objects to draw flowcharts"
--msgstr "Predmeti za risanje diagramov poteka"
-+msgid "Magnetic tape"
-+msgstr "Magnetni trak"
- 
--#. XXX
--#: ../sheets/Flowchart.sheet.in.h:21
--msgid "Off page connector"
--msgstr "Stik izven strani"
-+#: ../sheets/Flowchart.sheet.in.h:20
-+msgid "Internal storage"
-+msgstr "Notranja shramba"
- 
--#: ../sheets/Flowchart.sheet.in.h:22
--msgid "Offline storage"
--msgstr "Nepovezana shramba"
-+#: ../sheets/Flowchart.sheet.in.h:21
-+msgid "Merge"
-+msgstr "Spoji"
- 
- #: ../sheets/Flowchart.sheet.in.h:23
--msgid "Or"
--msgstr "Ali"
--
--#: ../sheets/Flowchart.sheet.in.h:24
--msgid "Predefined process"
--msgstr "Vnaprej dolo�en proces"
-+msgid "Delay"
-+msgstr "Zakasnitev"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:25
--msgid "Preparation"
--msgstr "Priprava"
--
--#: ../sheets/Flowchart.sheet.in.h:26
--msgid "Process/Auxiliary Operation"
--msgstr "Proces/pomožna operacija"
-+msgid "Summing junction"
-+msgstr "Združevalni spoj"
- 
-+#. XXX
- #: ../sheets/Flowchart.sheet.in.h:27
--msgid "Punched card"
--msgstr "Luknji�asta kartica"
-+msgid "Collate"
-+msgstr "Združi"
- 
- #: ../sheets/Flowchart.sheet.in.h:28
--msgid "Punched tape"
--msgstr "Luknji�asti trak"
--
--#: ../sheets/Flowchart.sheet.in.h:29
- msgid "Sort"
- msgstr "Razvrsti"
- 
--#. XXX
-+#: ../sheets/Flowchart.sheet.in.h:29
-+msgid "Or"
-+msgstr "Ali"
-+
-+#: ../sheets/Flowchart.sheet.in.h:30
-+msgid "Punched card"
-+msgstr "Luknji�asta kartica"
-+
- #: ../sheets/Flowchart.sheet.in.h:31
--msgid "Summing junction"
--msgstr "Združevalni spoj"
-+msgid "Punched tape"
-+msgstr "Luknji�asti trak"
- 
- #: ../sheets/Flowchart.sheet.in.h:32
--msgid "Terminal Interrupt"
--msgstr "Prekinitev terminala"
-+msgid "Transmittal tape"
-+msgstr "Oddajni trak"
- 
- #: ../sheets/Flowchart.sheet.in.h:33
--msgid "Transaction file"
--msgstr "Datoteka transakcij"
-+msgid "Offline storage"
-+msgstr "Nepovezana shramba"
- 
- #: ../sheets/Flowchart.sheet.in.h:34
--msgid "Transmittal tape"
--msgstr "Oddajni trak"
-+msgid "Data source"
-+msgstr "Vir podatkov"
- 
- #: ../sheets/GRAFCET.sheet.in.h:1
--msgid "AND vergent"
--msgstr "Vergent IN"
-+msgid "GRAFCET"
-+msgstr "GRAFCET"
- 
- #: ../sheets/GRAFCET.sheet.in.h:2
-+msgid "Objects to design GRAFCET charts"
-+msgstr "Predmeti za oblikovanje grafov GRAFCET"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:8
-+msgid "Macro sub-program call step"
-+msgstr "Korak makra - sklic na podprogram"
-+
-+#: ../sheets/GRAFCET.sheet.in.h:9
- msgid "Action to associate to a step"
- msgstr "Dejanje, povezano s korakom"
- 
--#: ../sheets/GRAFCET.sheet.in.h:3
--msgid "Arc (upward)"
--msgstr "Lok (navzgor)"
--
--#: ../sheets/GRAFCET.sheet.in.h:4
-+#: ../sheets/GRAFCET.sheet.in.h:10
- msgid "Condition (of an action)"
- msgstr "Pogoj (dejanja)"
- 
--#: ../sheets/GRAFCET.sheet.in.h:5
--msgid "GRAFCET"
--msgstr "GRAFCET"
--
--#: ../sheets/GRAFCET.sheet.in.h:10
--msgid "Macro sub-program call step"
--msgstr "Korak makra - sklic na podprogram"
-+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
-+msgid "Transition"
-+msgstr "Pretvorba"
- 
--#: ../sheets/GRAFCET.sheet.in.h:11
-+#: ../sheets/GRAFCET.sheet.in.h:12
- msgid "OR vergent"
- msgstr "Vergent ALI"
- 
--#: ../sheets/GRAFCET.sheet.in.h:12
--msgid "Objects to design GRAFCET charts"
--msgstr "Predmeti za oblikovanje grafov GRAFCET"
-+#: ../sheets/GRAFCET.sheet.in.h:13
-+msgid "AND vergent"
-+msgstr "Vergent IN"
- 
- #: ../sheets/GRAFCET.sheet.in.h:14
--#: ../sheets/UML.sheet.in.h:30
--msgid "Transition"
--msgstr "Pretvorba"
-+msgid "Arc (upward)"
-+msgstr "Lok (navzgor)"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-+#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+msgid "Gane and Sarson"
-+msgstr "Gane in Sarson"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+msgid "Gane and Sarson DFD"
-+msgstr "Gane in Sarson DFD"
-+
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
- msgid "Alternate external entity"
- msgstr "Izmenljiva zunanja entiteta"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
- msgid "Data store"
- msgstr "Shramba podatkov"
- 
--#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
- msgid "External entity"
- msgstr "Zunanja entiteta"
- 
--#. Author: Nicholas Moore, 2005. mailto: shiny.nickel@gmail.com
--#: ../sheets/Gane_and_Sarson.sheet.in.h:5
--msgid "Gane and Sarson"
--msgstr "Gane in Sarson"
--
--#: ../sheets/Gane_and_Sarson.sheet.in.h:6
--msgid "Gane and Sarson DFD"
--msgstr "Gane in Sarson DFD"
--
--#: ../sheets/IsometricMap.sheet.in.h:1
--msgid "Block 1, 2:4"
--msgstr "Blok 1, 2:4"
--
-+#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:2
--msgid "Block 2, 2:8"
--msgstr "Blok 2, 2:8"
--
--#: ../sheets/IsometricMap.sheet.in.h:3
--msgid "Block 3, 4:4"
--msgstr "Blok 3, 4:4"
-+msgid "Map, Isometric"
-+msgstr "Zemljevid, izometri�en"
- 
-+#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:4
--msgid "Block 4, 4:8"
--msgstr "Blok 4, 4:8"
-+msgid "Isometric Directional Map Shapes"
-+msgstr "Oblike za izometri�ne usmerjene zemljevide"
- 
- #: ../sheets/IsometricMap.sheet.in.h:5
--msgid "Block 5, 3:3"
--msgstr "Blok 5, 3:3"
-+msgid "Road Section"
-+msgstr "Cestni odsek"
- 
- #: ../sheets/IsometricMap.sheet.in.h:6
--msgid "Block 6, 4:6"
--msgstr "Blok 6, 4:6"
-+msgid "Long Straight Road Section"
-+msgstr "Dolg raven odsek ceste"
- 
- #: ../sheets/IsometricMap.sheet.in.h:7
--msgid "Block 7"
--msgstr "Blok 7"
-+msgid "Crossroads"
-+msgstr "Križiš�a"
- 
- #: ../sheets/IsometricMap.sheet.in.h:8
--msgid "Car 1, Front View"
--msgstr "Avto 1, pogled od spredaj"
-+msgid "T-Junction"
-+msgstr "T-križiš�e"
- 
- #: ../sheets/IsometricMap.sheet.in.h:9
--msgid "Car 2, Rear View"
--msgstr "Avto 2, pogled od zadaj"
-+msgid "Elevated Road"
-+msgstr "Dvignjena cesta"
- 
- #: ../sheets/IsometricMap.sheet.in.h:10
- msgid "Corner 1"
-@@ -8207,1472 +7942,1468 @@ msgid "Corner 2"
- msgstr "Kot 2"
- 
- #: ../sheets/IsometricMap.sheet.in.h:12
--msgid "Crossroads"
--msgstr "Križiš�a"
-+msgid "River"
-+msgstr "Reka"
- 
- #: ../sheets/IsometricMap.sheet.in.h:13
--msgid "Elevated Road"
--msgstr "Dvignjena cesta"
-+msgid "Roof1"
-+msgstr "Streha1"
- 
- #: ../sheets/IsometricMap.sheet.in.h:14
--msgid "Factory"
--msgstr "Tovarna"
-+msgid "Block 1, 2:4"
-+msgstr "Blok 1, 2:4"
- 
- #: ../sheets/IsometricMap.sheet.in.h:15
--msgid "Footbridge, Pedestrian Bridge"
--msgstr "Most za pešce"
-+msgid "Block 2, 2:8"
-+msgstr "Blok 2, 2:8"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:16
-+msgid "Block 3, 4:4"
-+msgstr "Blok 3, 4:4"
- 
--#. use dc:description instead?
- #: ../sheets/IsometricMap.sheet.in.h:17
--msgid "Isometric Directional Map Shapes"
--msgstr "Oblike za izometri�ne usmerjene zemljevide"
-+msgid "Block 4, 4:8"
-+msgstr "Blok 4, 4:8"
- 
- #: ../sheets/IsometricMap.sheet.in.h:18
--msgid "Long Straight Road Section"
--msgstr "Dolg raven odsek ceste"
-+msgid "Block 5, 3:3"
-+msgstr "Blok 5, 3:3"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:19
-+msgid "Block 6, 4:6"
-+msgstr "Blok 6, 4:6"
- 
--#. use dc:title instead?
- #: ../sheets/IsometricMap.sheet.in.h:20
--msgid "Map, Isometric"
--msgstr "Zemljevid, izometri�en"
-+msgid "Block 7"
-+msgstr "Blok 7"
- 
- #: ../sheets/IsometricMap.sheet.in.h:21
--msgid "One Way Road Sign"
--msgstr "Znak za enosmerno cesto"
-+msgid "Factory"
-+msgstr "Tovarna"
- 
- #: ../sheets/IsometricMap.sheet.in.h:22
--msgid "River"
--msgstr "Reka"
-+msgid "Car 1, Front View"
-+msgstr "Avto 1, pogled od spredaj"
- 
- #: ../sheets/IsometricMap.sheet.in.h:23
--msgid "Road Section"
--msgstr "Cestni odsek"
-+msgid "Car 2, Rear View"
-+msgstr "Avto 2, pogled od zadaj"
- 
- #: ../sheets/IsometricMap.sheet.in.h:24
--msgid "Roof1"
--msgstr "Streha1"
--
--#: ../sheets/IsometricMap.sheet.in.h:25
--msgid "T-Junction"
--msgstr "T-križiš�e"
--
--#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Train 1, angled downward"
- msgstr "Vlak 1, usmerjen navzdol"
- 
--#: ../sheets/IsometricMap.sheet.in.h:27
-+#: ../sheets/IsometricMap.sheet.in.h:25
- msgid "Train 2, angled upward"
- msgstr "Vlak 2, usmerjen navzgor"
- 
--#: ../sheets/IsometricMap.sheet.in.h:28
-+#: ../sheets/IsometricMap.sheet.in.h:26
- msgid "Tree 1"
- msgstr "Drevo 1"
- 
-+#: ../sheets/IsometricMap.sheet.in.h:27
-+msgid "Footbridge, Pedestrian Bridge"
-+msgstr "Most za pešce"
-+
-+#: ../sheets/IsometricMap.sheet.in.h:28
-+msgid "One Way Road Sign"
-+msgstr "Znak za enosmerno cesto"
-+
- #: ../sheets/Istar.sheet.in.h:1
--msgid "An i* agent"
--msgstr "i* - agent"
-+msgid "RE-i*"
-+msgstr "RE-i*"
- 
- #: ../sheets/Istar.sheet.in.h:2
--msgid "An i* decomposition link"
--msgstr "i* - povezava dekompozicije"
-+msgid "Objects to design i* diagrams"
-+msgstr "Predmeti za oblikovanje diagramov i*"
- 
- #: ../sheets/Istar.sheet.in.h:3
--msgid "An i* dependency link"
--msgstr "i* - povezava odvisnosti"
-+msgid "An i* softgoal"
-+msgstr "i* - mehki cilj"
- 
- #: ../sheets/Istar.sheet.in.h:4
- msgid "An i* goal"
- msgstr "i* - cilj"
- 
- #: ../sheets/Istar.sheet.in.h:5
--msgid "An i* means-ends link"
--msgstr "i* - povezava sredstvo-cilj"
-+msgid "An i* resource"
-+msgstr "i* - vir"
- 
- #: ../sheets/Istar.sheet.in.h:6
--msgid "An i* negative contribution"
--msgstr "i* - negativni prispevek"
-+msgid "An i* task"
-+msgstr "i* - opravek"
- 
- #: ../sheets/Istar.sheet.in.h:7
--msgid "An i* position"
--msgstr "i* - položaj"
-+msgid "An i* unspecified actor"
-+msgstr "i* - nedolo�en igralec"
- 
- #: ../sheets/Istar.sheet.in.h:8
--msgid "An i* positive contribution"
--msgstr "i* - pozitiven prispevek"
-+msgid "An i* agent"
-+msgstr "i* - agent"
- 
- #: ../sheets/Istar.sheet.in.h:9
--msgid "An i* resource"
--msgstr "i* - vir"
-+msgid "An i* position"
-+msgstr "i* - položaj"
- 
- #: ../sheets/Istar.sheet.in.h:10
- msgid "An i* role"
- msgstr "i* - vloga"
- 
- #: ../sheets/Istar.sheet.in.h:11
--msgid "An i* softgoal"
--msgstr "i* - mehki cilj"
-+msgid "An i* unspecified link"
-+msgstr "i* - nedolo�ena povezava"
- 
- #: ../sheets/Istar.sheet.in.h:12
--msgid "An i* task"
--msgstr "i* - opravek"
-+msgid "An i* positive contribution"
-+msgstr "i* - pozitiven prispevek"
- 
- #: ../sheets/Istar.sheet.in.h:13
--msgid "An i* unspecified actor"
--msgstr "i* - nedolo�en igralec"
-+msgid "An i* negative contribution"
-+msgstr "i* - negativni prispevek"
- 
- #: ../sheets/Istar.sheet.in.h:14
--msgid "An i* unspecified link"
--msgstr "i* - nedolo�ena povezava"
-+msgid "An i* dependency link"
-+msgstr "i* - povezava odvisnosti"
- 
- #: ../sheets/Istar.sheet.in.h:15
--msgid "Objects to design i* diagrams"
--msgstr "Predmeti za oblikovanje diagramov i*"
-+msgid "An i* decomposition link"
-+msgstr "i* - povezava dekompozicije"
- 
- #: ../sheets/Istar.sheet.in.h:16
--msgid "RE-i*"
--msgstr "RE-i*"
-+msgid "An i* means-ends link"
-+msgstr "i* - povezava sredstvo-cilj"
- 
- #: ../sheets/Jackson.sheet.in.h:1
--msgid "A Jackson designed domain"
--msgstr "Jackson - oblikovana domena"
-+msgid "RE-Jackson"
-+msgstr "RE-Jackson"
- 
- #: ../sheets/Jackson.sheet.in.h:2
-+msgid "Objects to design Jackson diagrams"
-+msgstr "Predmeti za oblikovanje Jacksonovih"
-+
-+#: ../sheets/Jackson.sheet.in.h:3
- msgid "A Jackson given domain"
- msgstr "Jackson - dana domena"
- 
--#: ../sheets/Jackson.sheet.in.h:3
-+#: ../sheets/Jackson.sheet.in.h:4
-+msgid "A Jackson designed domain"
-+msgstr "Jackson - oblikovana domena"
-+
-+#: ../sheets/Jackson.sheet.in.h:5
- msgid "A Jackson machine domain"
- msgstr "Jackson - strojna domena"
- 
--#: ../sheets/Jackson.sheet.in.h:4
-+#: ../sheets/Jackson.sheet.in.h:6
- msgid "A Jackson requirement"
- msgstr "Jackson - zahteva"
- 
--#: ../sheets/Jackson.sheet.in.h:5
--msgid "A Jackson requirement phenomenon"
--msgstr "Jackson - fenomen zahtev"
--
--#: ../sheets/Jackson.sheet.in.h:6
-+#: ../sheets/Jackson.sheet.in.h:7
- msgid "A Jackson shared phenomenon"
- msgstr "Jackson - deljeni fenomen"
- 
--#: ../sheets/Jackson.sheet.in.h:7
--msgid "Objects to design Jackson diagrams"
--msgstr "Predmeti za oblikovanje Jacksonovih"
--
- #: ../sheets/Jackson.sheet.in.h:8
--msgid "RE-Jackson"
--msgstr "RE-Jackson"
-+msgid "A Jackson requirement phenomenon"
-+msgstr "Jackson - fenomen zahtev"
- 
- #: ../sheets/KAOS.sheet.in.h:1
--msgid "A KAOS AND refinement"
--msgstr "KAOS - izboljšava IN (AND)"
-+msgid "RE-KAOS"
-+msgstr "RE-KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:2
--msgid "A KAOS OR refinement"
--msgstr "KAOS - izboljšava ALI (OR)"
-+msgid "Objects to design KAOS diagrams"
-+msgstr "Predmeti za oblikovanje diagramov KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:3
--msgid "A KAOS agent"
--msgstr "Agent KAOS"
-+msgid "A KAOS softgoal"
-+msgstr "Mehki cilj KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:4
--msgid "A KAOS assumption"
--msgstr "Domneva KAOS"
-+msgid "A KAOS goal"
-+msgstr "Cilj KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:5
--msgid "A KAOS binary conflict"
--msgstr "Dvojiški spor KAOS"
-+msgid "A KAOS requirement"
-+msgstr "Zahteva KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:6
--msgid "A KAOS capable-of"
--msgstr "Zmožen KAOS"
-+msgid "A KAOS assumption"
-+msgstr "Domneva KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:7
--msgid "A KAOS complete AND refinement"
--msgstr "KAOS - popolna izboljšava IN (AND)"
-+msgid "A KAOS obstacle"
-+msgstr "Ovira KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:8
--msgid "A KAOS complete OR refinement"
--msgstr "KAOS - popolna izboljšava ALI (OR)"
-+msgid "A KAOS AND refinement"
-+msgstr "KAOS - izboljšava IN (AND)"
- 
- #: ../sheets/KAOS.sheet.in.h:9
--msgid "A KAOS contribution"
--msgstr "Prispevek KAOS"
-+msgid "A KAOS complete AND refinement"
-+msgstr "KAOS - popolna izboljšava IN (AND)"
- 
- #: ../sheets/KAOS.sheet.in.h:10
--msgid "A KAOS control link"
--msgstr "Nadzorna povezava KAOS"
-+msgid "A KAOS OR refinement"
-+msgstr "KAOS - izboljšava ALI (OR)"
- 
- #: ../sheets/KAOS.sheet.in.h:11
--msgid "A KAOS goal"
--msgstr "Cilj KAOS"
-+msgid "A KAOS complete OR refinement"
-+msgstr "KAOS - popolna izboljšava ALI (OR)"
- 
- #: ../sheets/KAOS.sheet.in.h:12
--msgid "A KAOS input"
--msgstr "Vhod KAOS"
-+msgid "A KAOS operationalization"
-+msgstr "KAOS - operacionalizacija"
- 
- #: ../sheets/KAOS.sheet.in.h:13
--msgid "A KAOS monitor link"
--msgstr "KAOS - povezava opazovanja"
-+msgid "A KAOS contribution"
-+msgstr "Prispevek KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:14
--msgid "A KAOS obstacle"
--msgstr "Ovira KAOS"
--
--#: ../sheets/KAOS.sheet.in.h:15
- msgid "A KAOS obstruction"
- msgstr "Obstrukcija KAOS"
- 
-+#: ../sheets/KAOS.sheet.in.h:15
-+msgid "A KAOS binary conflict"
-+msgstr "Dvojiški spor KAOS"
-+
- #: ../sheets/KAOS.sheet.in.h:16
--msgid "A KAOS operation"
--msgstr "Operacija KAOS"
-+msgid "A KAOS agent"
-+msgstr "Agent KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:17
--msgid "A KAOS operationalization"
--msgstr "KAOS - operacionalizacija"
-+msgid "A KAOS responsibility"
-+msgstr "Odgovornost KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:18
--msgid "A KAOS output"
--msgstr "Izhod KAOS"
-+msgid "A KAOS monitor link"
-+msgstr "KAOS - povezava opazovanja"
- 
- #: ../sheets/KAOS.sheet.in.h:19
--msgid "A KAOS performs"
--msgstr "Deluje KAOS"
-+msgid "A KAOS control link"
-+msgstr "Nadzorna povezava KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:20
--msgid "A KAOS requirement"
--msgstr "Zahteva KAOS"
-+msgid "A KAOS capable-of"
-+msgstr "Zmožen KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:21
--msgid "A KAOS responsibility"
--msgstr "Odgovornost KAOS"
-+msgid "A KAOS performs"
-+msgstr "Deluje KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:22
--msgid "A KAOS softgoal"
--msgstr "Mehki cilj KAOS"
-+msgid "A KAOS operation"
-+msgstr "Operacija KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:23
--msgid "Objects to design KAOS diagrams"
--msgstr "Predmeti za oblikovanje diagramov KAOS"
-+msgid "A KAOS input"
-+msgstr "Vhod KAOS"
- 
- #: ../sheets/KAOS.sheet.in.h:24
--msgid "RE-KAOS"
--msgstr "RE-KAOS"
-+msgid "A KAOS output"
-+msgstr "Izhod KAOS"
- 
- #: ../sheets/Lights.sheet.in.h:1
--msgid "ACL"
--msgstr "ACL"
-+msgid "Lights"
-+msgstr "Lu�i"
- 
- #: ../sheets/Lights.sheet.in.h:2
--msgid "Black light"
--msgstr "Neonska �rna lu�"
-+msgid "Objects to design simple lighting plots"
-+msgstr "Predmeti za oblikovanje enostavnih svetlobnih namestitev"
- 
- #: ../sheets/Lights.sheet.in.h:3
--msgid "Blinders"
--msgstr "Rolete"
-+msgid "PAR"
-+msgstr "PAR"
- 
- #: ../sheets/Lights.sheet.in.h:4
--msgid "Ellipsoidal Reflector Spotlight"
--msgstr "Elipsoidni usmerjeni reflektor"
-+msgid "PAR on the floor"
-+msgstr "PAR na tleh"
- 
- #: ../sheets/Lights.sheet.in.h:5
--msgid "Fresel lantern"
--msgstr "Lu� Fresel"
-+msgid "ACL"
-+msgstr "ACL"
- 
- #: ../sheets/Lights.sheet.in.h:6
--msgid "Lights"
--msgstr "Lu�i"
-+msgid "Pebble Convex lantern"
-+msgstr "Udrta konveksna lu�"
- 
- #: ../sheets/Lights.sheet.in.h:7
--msgid "Moving head"
--msgstr "Nadaljevanje"
-+msgid "Fresel lantern"
-+msgstr "Lu� Fresel"
- 
- #: ../sheets/Lights.sheet.in.h:8
--msgid "Objects to design simple lighting plots"
--msgstr "Predmeti za oblikovanje enostavnih svetlobnih namestitev"
-+msgid "Striplight"
-+msgstr "Niz neonskih lu�i"
- 
- #: ../sheets/Lights.sheet.in.h:9
--msgid "PAR"
--msgstr "PAR"
-+msgid "Ellipsoidal Reflector Spotlight"
-+msgstr "Elipsoidni usmerjeni reflektor"
- 
- #: ../sheets/Lights.sheet.in.h:10
--msgid "PAR on the floor"
--msgstr "PAR na tleh"
-+msgid "Blinders"
-+msgstr "Rolete"
- 
- #: ../sheets/Lights.sheet.in.h:11
--msgid "Pebble Convex lantern"
--msgstr "Udrta konveksna lu�"
-+msgid "Black light"
-+msgstr "Neonska �rna lu�"
- 
- #: ../sheets/Lights.sheet.in.h:12
--#: ../sheets/ciscocomputer.sheet.in.h:39
--msgid "Scanner"
--msgstr "Opti�ni bralnik"
-+msgid "Stroboscope light"
-+msgstr "Stroboskopska lu�"
- 
- #: ../sheets/Lights.sheet.in.h:13
--msgid "Striplight"
--msgstr "Niz neonskih lu�i"
-+msgid "Moving head"
-+msgstr "Nadaljevanje"
- 
--#: ../sheets/Lights.sheet.in.h:14
--msgid "Stroboscope light"
--msgstr "Stroboskopska lu�"
-+#: ../sheets/Lights.sheet.in.h:14 ../sheets/ciscocomputer.sheet.in.h:29
-+msgid "Scanner"
-+msgstr "Opti�ni bralnik"
- 
- #: ../sheets/Lights.sheet.in.h:15
- msgid "Structure"
- msgstr "Struktura"
- 
- #: ../sheets/Logic.sheet.in.h:1
--msgid "AND gate"
--msgstr "Vrata AND"
-+msgid "Logic"
-+msgstr "Logika"
- 
- #: ../sheets/Logic.sheet.in.h:2
- msgid "Boolean Logic"
- msgstr "Dvojiška logika"
- 
- #: ../sheets/Logic.sheet.in.h:3
--msgid "Crossconnector"
--msgstr "Križna povezava"
-+msgid "OR gate"
-+msgstr "Vrata OR"
- 
- #: ../sheets/Logic.sheet.in.h:4
--#: ../sheets/SISSI.sheet.in.h:27
--msgid "Inverter"
--msgstr "Frekven�ni menjalnik"
-+msgid "AND gate"
-+msgstr "Vrata AND"
- 
- #: ../sheets/Logic.sheet.in.h:5
--msgid "Logic"
--msgstr "Logika"
-+msgid "XOR gate"
-+msgstr "Vrata XOR"
- 
- #: ../sheets/Logic.sheet.in.h:6
-+msgid "Simple buffer"
-+msgstr "Enostavni izravnalnik"
-+
-+#: ../sheets/Logic.sheet.in.h:7 ../sheets/SISSI.sheet.in.h:61
-+msgid "Inverter"
-+msgstr "Frekven�ni menjalnik"
-+
-+#: ../sheets/Logic.sheet.in.h:8
- msgid "NAND gate"
- msgstr "Vrata NAND"
- 
--#: ../sheets/Logic.sheet.in.h:7
-+#: ../sheets/Logic.sheet.in.h:9
- msgid "NOR gate"
- msgstr "Vrata NOR"
- 
--#: ../sheets/Logic.sheet.in.h:8
-+#: ../sheets/Logic.sheet.in.h:10
- msgid "NOT"
- msgstr "NOT (NI)"
- 
--#: ../sheets/Logic.sheet.in.h:9
--msgid "OR gate"
--msgstr "Vrata OR"
--
--#: ../sheets/Logic.sheet.in.h:10
--msgid "Simple buffer"
--msgstr "Enostavni izravnalnik"
--
- #: ../sheets/Logic.sheet.in.h:11
--msgid "XOR gate"
--msgstr "Vrata XOR"
-+msgid "Crossconnector"
-+msgstr "Križna povezava"
- 
- #: ../sheets/MSE.sheet.in.h:1
--msgid "Demultiplexer"
--msgstr "Demultiplekser"
-+msgid "MSE"
-+msgstr "MSE"
- 
- #: ../sheets/MSE.sheet.in.h:2
--msgid "Large extension node"
--msgstr "Veliko razširitveno vozliš�e"
-+msgid "U.S. Army Mobile Subscriber Equipment Components"
-+msgstr "Komponente naprav mobilnega naro�nika ameriške vojske"
- 
- #: ../sheets/MSE.sheet.in.h:3
--msgid "MSE"
--msgstr "MSE"
-+msgid "Node center"
-+msgstr "Osrednje vozliš�e"
- 
- #: ../sheets/MSE.sheet.in.h:4
--msgid "Multiplexer"
--msgstr "Multiplekser"
-+msgid "Large extension node"
-+msgstr "Veliko razširitveno vozliš�e"
- 
- #: ../sheets/MSE.sheet.in.h:5
--msgid "Node center"
--msgstr "Osrednje vozliš�e"
--
--#: ../sheets/MSE.sheet.in.h:6
- msgid "Small extension node"
- msgstr "Majhno razširitveno vozliš�e"
- 
--#: ../sheets/MSE.sheet.in.h:7
-+#: ../sheets/MSE.sheet.in.h:6
- msgid "Tactical satellite communications terminal"
- msgstr "Terminal takti�nih satelitskih zvez"
- 
--#: ../sheets/MSE.sheet.in.h:8
--msgid "U.S. Army Mobile Subscriber Equipment Components"
--msgstr "Komponente naprav mobilnega naro�nika ameriške vojske"
--
--#: ../sheets/Misc.sheet.in.h:2
--msgid "Folder"
--msgstr "Mapa"
-+#: ../sheets/MSE.sheet.in.h:7
-+msgid "Multiplexer"
-+msgstr "Multiplekser"
- 
--#: ../sheets/Misc.sheet.in.h:3
--msgid "Measure distance"
--msgstr "Meri razdaljo"
-+#: ../sheets/MSE.sheet.in.h:8
-+msgid "Demultiplexer"
-+msgstr "Demultiplekser"
- 
--#: ../sheets/Misc.sheet.in.h:4
-+#: ../sheets/Misc.sheet.in.h:1
- msgid "Misc"
- msgstr "Razno"
- 
--#: ../sheets/Misc.sheet.in.h:5
-+#: ../sheets/Misc.sheet.in.h:2
- msgid "Miscellaneous Shapes"
- msgstr "Razne oblike"
- 
-+#: ../sheets/Misc.sheet.in.h:3
-+msgid "Tree"
-+msgstr "Drevo"
-+
-+#: ../sheets/Misc.sheet.in.h:4
-+msgid "Folder"
-+msgstr "Mapa"
-+
- #: ../sheets/Misc.sheet.in.h:6
--msgid "New-style group object, for testing"
--msgstr "Skupinski predmet novega sloga, za preizkušanje"
-+msgid "expensible node"
-+msgstr "razširljivo vozliš�e"
- 
- #: ../sheets/Misc.sheet.in.h:7
--msgid "Resizable grid"
--msgstr "Prilagodljiva mreža"
-+msgid "expended node"
-+msgstr "razširnjeno vozliš�e"
- 
- #: ../sheets/Misc.sheet.in.h:8
- msgid "Traditional clock"
- msgstr "Obi�ajna ura"
- 
- #: ../sheets/Misc.sheet.in.h:9
--msgid "Tree"
--msgstr "Drevo"
-+msgid "Measure distance"
-+msgstr "Meri razdaljo"
- 
- #: ../sheets/Misc.sheet.in.h:10
--msgid "expended node"
--msgstr "razširnjeno vozliš�e"
-+msgid "Resizable grid"
-+msgstr "Prilagodljiva mreža"
- 
- #: ../sheets/Misc.sheet.in.h:11
--msgid "expensible node"
--msgstr "razširljivo vozliš�e"
-+msgid "New-style group object, for testing"
-+msgstr "Skupinski predmet novega sloga, za preizkušanje"
- 
- #: ../sheets/Pneumatic.sheet.in.h:1
--msgid "2/2 distributor"
--msgstr "2/2 razdelilnik"
-+msgid "Pneumatic/Hydraulic"
-+msgstr "Pnevmatika/hidravlika"
- 
- #: ../sheets/Pneumatic.sheet.in.h:2
--msgid "3/2 distributor"
--msgstr "3/2 razdelilnik"
--
--#: ../sheets/Pneumatic.sheet.in.h:3
--msgid "4/2 distributor"
--msgstr "4/2 razdelilnik"
--
--#: ../sheets/Pneumatic.sheet.in.h:4
--msgid "5/2 distributor"
--msgstr "5/2 razdelilnik"
--
--#: ../sheets/Pneumatic.sheet.in.h:5
--msgid "Air exhaust orifice"
--msgstr "Odprtina za zra�ni izpust"
--
--#: ../sheets/Pneumatic.sheet.in.h:6
- msgid "Components for pneumatic and hydraulic circuits"
- msgstr "Komponente pnevmati�nih in hidravli�nih vezij"
- 
--#: ../sheets/Pneumatic.sheet.in.h:8
-+#: ../sheets/Pneumatic.sheet.in.h:3
- msgid "Double-effect jack"
- msgstr "Priklju�ek z dvojnim u�inkom"
- 
--#: ../sheets/Pneumatic.sheet.in.h:9
--msgid "Electric command (double coil)"
--msgstr "Elektri�ni ukaz (dvojna tuljava)"
-+#: ../sheets/Pneumatic.sheet.in.h:4
-+msgid "Normally-in simple-effect jack"
-+msgstr "Priklju�ek enostavnega u�inka z navadnim vhodom"
- 
--#: ../sheets/Pneumatic.sheet.in.h:10
--msgid "Electric command (single coil)"
--msgstr "Elektri�ni ukaz (enojna tuljava)"
-+#: ../sheets/Pneumatic.sheet.in.h:5
-+msgid "Normally-out simple-effect jack"
-+msgstr "Priklju�ek enostavnega u�inka z navadnim izhodom"
- 
--#: ../sheets/Pneumatic.sheet.in.h:11
-+#: ../sheets/Pneumatic.sheet.in.h:6
- msgid "Generic pressure source"
- msgstr "Generi�en vir pritiska"
- 
--#: ../sheets/Pneumatic.sheet.in.h:12
-+#: ../sheets/Pneumatic.sheet.in.h:7
- msgid "Hydraulic pressure source"
- msgstr "Hidravli�ni vir pritiska"
- 
--#: ../sheets/Pneumatic.sheet.in.h:13
--msgid "Indirect command by hydraulic driver"
--msgstr "Neposreden ukaz hidravli�nega prenosnika"
-+#: ../sheets/Pneumatic.sheet.in.h:8
-+msgid "Pneumatic pressure source"
-+msgstr "Pnevmati�ni vir pritiska"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:9
-+msgid "Air exhaust orifice"
-+msgstr "Odprtina za zra�ni izpust"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:10
-+msgid "2/2 distributor"
-+msgstr "2/2 razdelilnik"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:11
-+msgid "3/2 distributor"
-+msgstr "3/2 razdelilnik"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:12
-+msgid "4/2 distributor"
-+msgstr "4/2 razdelilnik"
-+
-+#: ../sheets/Pneumatic.sheet.in.h:13
-+msgid "5/2 distributor"
-+msgstr "5/2 razdelilnik"
- 
- #: ../sheets/Pneumatic.sheet.in.h:14
--msgid "Indirect command by pneumatic driver"
--msgstr "Neposreden ukaz pnevmati�nega prenosnika"
-+msgid "Muscular command"
-+msgstr "Miši�ni ukaz"
- 
- #: ../sheets/Pneumatic.sheet.in.h:15
--msgid "Mechanical command by spring"
--msgstr "Mehanski ukaz vzmeti"
-+msgid "Push-button command"
-+msgstr "Ukaz z pritisnim gumbom"
- 
- #: ../sheets/Pneumatic.sheet.in.h:16
- msgid "Mechanical command by tappet"
- msgstr "Mehanski ukaz vzvoda"
- 
- #: ../sheets/Pneumatic.sheet.in.h:17
--msgid "Muscular command"
--msgstr "Miši�ni ukaz"
-+msgid "Mechanical command by spring"
-+msgstr "Mehanski ukaz vzmeti"
- 
- #: ../sheets/Pneumatic.sheet.in.h:18
--msgid "Normally-in simple-effect jack"
--msgstr "Priklju�ek enostavnega u�inka z navadnim vhodom"
-+msgid "Electric command (single coil)"
-+msgstr "Elektri�ni ukaz (enojna tuljava)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:19
--msgid "Normally-out simple-effect jack"
--msgstr "Priklju�ek enostavnega u�inka z navadnim izhodom"
-+msgid "Electric command (double coil)"
-+msgstr "Elektri�ni ukaz (dvojna tuljava)"
- 
- #: ../sheets/Pneumatic.sheet.in.h:20
--msgid "Pneumatic pressure source"
--msgstr "Pnevmati�ni vir pritiska"
-+msgid "Indirect command by hydraulic driver"
-+msgstr "Neposreden ukaz hidravli�nega prenosnika"
- 
- #: ../sheets/Pneumatic.sheet.in.h:21
--msgid "Pneumatic/Hydraulic"
--msgstr "Pnevmatika/hidravlika"
--
--#: ../sheets/Pneumatic.sheet.in.h:22
--msgid "Push-button command"
--msgstr "Ukaz z pritisnim gumbom"
-+msgid "Indirect command by pneumatic driver"
-+msgstr "Neposreden ukaz pnevmati�nega prenosnika"
- 
- #: ../sheets/SADT.sheet.in.h:1
--msgid "Activity/data box"
--msgstr "Å katla aktivnosti/podatkov"
-+msgid "SADT/IDEF0"
-+msgstr "SADT/IDEF0"
- 
- #: ../sheets/SADT.sheet.in.h:2
--msgid "Activity/data flow arrow"
--msgstr "Puš�ica aktivnosti/toka podatkov"
-+msgid "Objects to design SADT diagrams"
-+msgstr "Predmeti za oblikovanje diagramov SADT"
- 
- #: ../sheets/SADT.sheet.in.h:3
--msgid "Flow label"
--msgstr "Oznaka poteka"
-+msgid "Activity/data flow arrow"
-+msgstr "Puš�ica aktivnosti/toka podatkov"
- 
- #: ../sheets/SADT.sheet.in.h:4
--msgid "Objects to design SADT diagrams"
--msgstr "Predmeti za oblikovanje diagramov SADT"
-+msgid "Activity/data box"
-+msgstr "Å katla aktivnosti/podatkov"
- 
- #: ../sheets/SADT.sheet.in.h:5
--msgid "SADT/IDEF0"
--msgstr "SADT/IDEF0"
-+msgid "Flow label"
-+msgstr "Oznaka poteka"
- 
- #: ../sheets/SDL.sheet.in.h:1
--msgid "Action being executed"
--msgstr "Ukaz, ki se izvaja"
-+msgid "SDL"
-+msgstr "SDL"
- 
- #: ../sheets/SDL.sheet.in.h:2
-+msgid "Specification and Description Language."
-+msgstr "Jezik dolo�anja in opisovanja."
-+
-+#: ../sheets/SDL.sheet.in.h:3
- msgid "Block type reference"
- msgstr "Sklic na vrsto bloka"
- 
-+#: ../sheets/SDL.sheet.in.h:4
-+msgid "Service type reference"
-+msgstr "Sklic na vrsto storitve"
-+
- #: ../sheets/SDL.sheet.in.h:5
--msgid "Function call"
--msgstr "Funkcijski klic"
-+msgid "Process type reference"
-+msgstr "Sklic na vrsto procesa"
- 
--#: ../sheets/SDL.sheet.in.h:6
--msgid "Function header"
--msgstr "Glava funkcije"
-+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
-+msgid "State"
-+msgstr "Stanje"
- 
- #: ../sheets/SDL.sheet.in.h:7
--msgid "Generic text note"
--msgstr "Splošno besedilo opombe"
-+msgid "Function header"
-+msgstr "Glava funkcije"
- 
- #: ../sheets/SDL.sheet.in.h:8
--msgid "In/Out connector"
--msgstr "Vhodno/izhodni konektor"
-+msgid "Send message"
-+msgstr "Pošlji sporo�ilo"
- 
--#: ../sheets/SDL.sheet.in.h:10
--msgid "Procedure return"
--msgstr "Vrnitev iz procedure"
-+#: ../sheets/SDL.sheet.in.h:9
-+msgid "Receive message"
-+msgstr "Sprejmi sporo�ilo"
- 
--#: ../sheets/SDL.sheet.in.h:11
--msgid "Process type reference"
--msgstr "Sklic na vrsto procesa"
-+#: ../sheets/SDL.sheet.in.h:10
-+msgid "Function call"
-+msgstr "Funkcijski klic"
- 
- #: ../sheets/SDL.sheet.in.h:12
--msgid "Receive message"
--msgstr "Sprejmi sporo�ilo"
-+msgid "Action being executed"
-+msgstr "Ukaz, ki se izvaja"
- 
- #: ../sheets/SDL.sheet.in.h:13
--msgid "SDL"
--msgstr "SDL"
--
--#: ../sheets/SDL.sheet.in.h:14
- msgid "Save state"
- msgstr "Shrani stanje"
- 
- #: ../sheets/SDL.sheet.in.h:15
--msgid "Send message"
--msgstr "Pošlji sporo�ilo"
--
--#: ../sheets/SDL.sheet.in.h:16
--msgid "Service type reference"
--msgstr "Sklic na vrsto storitve"
-+msgid "In/Out connector"
-+msgstr "Vhodno/izhodni konektor"
- 
- #: ../sheets/SDL.sheet.in.h:17
--msgid "Specification and Description Language."
--msgstr "Jezik dolo�anja in opisovanja."
-+msgid "Procedure return"
-+msgstr "Vrnitev iz procedure"
- 
--#: ../sheets/SDL.sheet.in.h:18
--#: ../sheets/UML.sheet.in.h:28
--msgid "State"
--msgstr "Stanje"
-+#: ../sheets/SDL.sheet.in.h:19
-+msgid "Generic text note"
-+msgstr "Splošno besedilo opombe"
- 
- #: ../sheets/SISSI.sheet.in.h:1
--msgid "Air filter"
--msgstr "Zra�ni filter"
-+msgid "Objects to design sissi diagrams"
-+msgstr "Predmeti za oblikovanje diagramov SISSI"
- 
- #: ../sheets/SISSI.sheet.in.h:2
--msgid "Air quality detector"
--msgstr "Detektor kakovosti zraka"
-+msgid "Workstation"
-+msgstr "Delovna postaja"
- 
--#: ../sheets/SISSI.sheet.in.h:3
--msgid "Airconditioner"
--msgstr "Klimatska naprava"
-+#: ../sheets/SISSI.sheet.in.h:3 ../sheets/ciscocomputer.sheet.in.h:43
-+msgid "Relational Database"
-+msgstr "Relacijska zbirka podatkov"
- 
- #: ../sheets/SISSI.sheet.in.h:4
--msgid "Alarm center"
--msgstr "Središ�e za intervencije"
-+msgid "Server"
-+msgstr "Strežnik"
- 
--#: ../sheets/SISSI.sheet.in.h:5
--msgid "Axial Ventilator"
--msgstr "Osni ventilator"
-+#: ../sheets/SISSI.sheet.in.h:5 ../sheets/ciscocomputer.sheet.in.h:36
-+msgid "Laptop"
-+msgstr "Prenosni ra�unalnik"
- 
--#: ../sheets/SISSI.sheet.in.h:6
--msgid "Backup"
--msgstr "Varnostna kopija"
-+#: ../sheets/SISSI.sheet.in.h:6 ../sheets/ciscocomputer.sheet.in.h:34
-+msgid "PDA"
-+msgstr "Osebni organizator podatkov (PDA)"
- 
--#: ../sheets/SISSI.sheet.in.h:7
--msgid "Badge reader"
--msgstr "Bralnik priponk"
-+#: ../sheets/SISSI.sheet.in.h:7 ../sheets/ciscocomputer.sheet.in.h:49
-+msgid "Storage array"
-+msgstr "Polje shrambe"
- 
--#: ../sheets/SISSI.sheet.in.h:8
--msgid "Badge reader/keyboard"
--msgstr "Bralnik/tipkovnica priponk"
-+#: ../sheets/SISSI.sheet.in.h:8 ../sheets/ciscohub.sheet.in.h:3
-+msgid "Router"
-+msgstr "Usmerjevalnik"
- 
--#: ../sheets/SISSI.sheet.in.h:9
--msgid "Biometric reader"
--msgstr "Bralnik biometri�nih podatkov"
-+#: ../sheets/SISSI.sheet.in.h:9 ../sheets/network.sheet.in.h:18
-+msgid "Network cloud"
-+msgstr "Omrežni oblak"
- 
--#: ../sheets/SISSI.sheet.in.h:10
--msgid "Cell phone"
--msgstr "Mobilni telefon"
-+#: ../sheets/SISSI.sheet.in.h:10 ../sheets/network.sheet.in.h:37
-+msgid "Telephone"
-+msgstr "Telefon"
- 
- #: ../sheets/SISSI.sheet.in.h:11
--msgid "Centrifugal Ventilator"
--msgstr "Centrifugalni ventilator"
-+msgid "Cell phone"
-+msgstr "Mobilni telefon"
- 
--#: ../sheets/SISSI.sheet.in.h:12
--msgid "Cipher machine"
--msgstr "Stroj za Å¡ifriranje"
-+#: ../sheets/SISSI.sheet.in.h:12 ../sheets/ciscohub.sheet.in.h:21
-+msgid "Hub"
-+msgstr "Zvezdiš�e"
- 
--#: ../sheets/SISSI.sheet.in.h:13
--msgid "Circulation pump"
--msgstr "Krožna �rpalka"
-+#: ../sheets/SISSI.sheet.in.h:13 ../sheets/ciscocomputer.sheet.in.h:40
-+msgid "Modem"
-+msgstr "Modem"
- 
- #: ../sheets/SISSI.sheet.in.h:14
--msgid "Condensator"
--msgstr "Kondenzator"
-+msgid "Cipher machine"
-+msgstr "Stroj za Å¡ifriranje"
- 
- #: ../sheets/SISSI.sheet.in.h:15
--msgid "Current transducer"
--msgstr "Pretvornik toka"
-+msgid "Magnetic storage"
-+msgstr "Magnetna shramba"
- 
- #: ../sheets/SISSI.sheet.in.h:16
--msgid "Digital code"
--msgstr "Digitalna koda"
-+msgid "Paper storage"
-+msgstr "Shramba papirjev"
- 
- #: ../sheets/SISSI.sheet.in.h:17
--msgid "Enthalpy transducer"
--msgstr "Pretvornik entalpije"
-+msgid "Person"
-+msgstr "Oseba"
- 
--#: ../sheets/SISSI.sheet.in.h:18
--msgid "Extinguisher"
--msgstr "Gasilni aparat"
-+#: ../sheets/SISSI.sheet.in.h:18 ../sheets/ciscomisc.sheet.in.h:48
-+msgid "File cabinet"
-+msgstr "Datote�na omarica"
- 
- #: ../sheets/SISSI.sheet.in.h:19
--msgid "Faraday cage"
--msgstr "Faradayeva kletka"
-+msgid "Safe"
-+msgstr "Sef"
- 
- #: ../sheets/SISSI.sheet.in.h:20
--#: ../sheets/ciscomisc.sheet.in.h:9
--msgid "File cabinet"
--msgstr "Datote�na omarica"
--
--#: ../sheets/SISSI.sheet.in.h:21
--msgid "Gate"
--msgstr "Vhod"
-+msgid "Backup"
-+msgstr "Varnostna kopija"
- 
- #: ../sheets/SISSI.sheet.in.h:22
--msgid "Geographic site"
--msgstr "Geografsko mesto"
-+msgid "Log analysis"
-+msgstr "Analiza zapisnikov"
- 
- #: ../sheets/SISSI.sheet.in.h:23
--msgid "Glass-break sensor"
--msgstr "Tipalo razbitega stekla"
-+msgid "Information system"
-+msgstr "Informacijski sistem"
- 
- #: ../sheets/SISSI.sheet.in.h:24
--#: ../sheets/ciscohub.sheet.in.h:29
--msgid "Hub"
--msgstr "Zvezdiš�e"
--
--#: ../sheets/SISSI.sheet.in.h:25
- msgid "Information"
- msgstr "Informacije"
- 
-+#: ../sheets/SISSI.sheet.in.h:25
-+msgid "Room"
-+msgstr "Soba"
-+
- #: ../sheets/SISSI.sheet.in.h:26
--msgid "Information system"
--msgstr "Informacijski sistem"
-+msgid "Faraday cage"
-+msgstr "Faradayeva kletka"
-+
-+#: ../sheets/SISSI.sheet.in.h:27
-+msgid "Security area"
-+msgstr "Varnostno obmo�je"
- 
- #: ../sheets/SISSI.sheet.in.h:28
--#: ../sheets/ciscocomputer.sheet.in.h:21
--msgid "Laptop"
--msgstr "Prenosni ra�unalnik"
-+msgid "Geographic site"
-+msgstr "Geografsko mesto"
- 
- #: ../sheets/SISSI.sheet.in.h:29
--msgid "Level detector"
--msgstr "Detektor ravni"
-+msgid "Gate"
-+msgstr "Vhod"
- 
- #: ../sheets/SISSI.sheet.in.h:30
--msgid "Light detector"
--msgstr "Detektor svetlobe"
-+msgid "Video camera"
-+msgstr "Videokamera"
- 
- #: ../sheets/SISSI.sheet.in.h:31
--msgid "Log analysis"
--msgstr "Analiza zapisnikov"
-+msgid "Glass-break sensor"
-+msgstr "Tipalo razbitega stekla"
- 
- #: ../sheets/SISSI.sheet.in.h:32
--msgid "Magnetic storage"
--msgstr "Magnetna shramba"
-+msgid "Sensor beam"
-+msgstr "Žarek tipala"
- 
- #: ../sheets/SISSI.sheet.in.h:33
--#: ../sheets/ciscocomputer.sheet.in.h:25
--msgid "Modem"
--msgstr "Modem"
-+msgid "Condensator"
-+msgstr "Kondenzator"
- 
- #: ../sheets/SISSI.sheet.in.h:34
--msgid "Moisture extractor"
--msgstr "Odstranjevalec vlage"
-+msgid "Power transducer"
-+msgstr "Pretvornik napetosti"
- 
- #: ../sheets/SISSI.sheet.in.h:35
--msgid "Moisture sensor"
--msgstr "Tipalo vlage"
-+msgid "Current transducer"
-+msgstr "Pretvornik toka"
- 
- #: ../sheets/SISSI.sheet.in.h:36
--msgid "Movement detector"
--msgstr "Detektor gibanja"
-+msgid "Enthalpy transducer"
-+msgstr "Pretvornik entalpije"
- 
- #: ../sheets/SISSI.sheet.in.h:37
--#: ../sheets/network.sheet.in.h:21
--msgid "Network cloud"
--msgstr "Omrežni oblak"
-+msgid "Smoke detector"
-+msgstr "Detektor dima"
- 
- #: ../sheets/SISSI.sheet.in.h:38
--msgid "Objects to design sissi diagrams"
--msgstr "Predmeti za oblikovanje diagramov SISSI"
-+msgid "Moisture sensor"
-+msgstr "Tipalo vlage"
- 
- #: ../sheets/SISSI.sheet.in.h:39
--#: ../sheets/ciscocomputer.sheet.in.h:35
--msgid "PDA"
--msgstr "Osebni organizator podatkov (PDA)"
-+msgid "Light detector"
-+msgstr "Detektor svetlobe"
- 
- #: ../sheets/SISSI.sheet.in.h:40
--msgid "Paper storage"
--msgstr "Shramba papirjev"
-+msgid "Movement detector"
-+msgstr "Detektor gibanja"
- 
- #: ../sheets/SISSI.sheet.in.h:41
--msgid "Person"
--msgstr "Oseba"
-+msgid "Video movement detector"
-+msgstr "Video detektor gibanja"
- 
- #: ../sheets/SISSI.sheet.in.h:42
--msgid "Power transducer"
--msgstr "Pretvornik napetosti"
-+msgid "Level detector"
-+msgstr "Detektor ravni"
- 
- #: ../sheets/SISSI.sheet.in.h:43
- msgid "Pressure transducer"
- msgstr "Pretvornik pritiska"
- 
- #: ../sheets/SISSI.sheet.in.h:44
--msgid "Pump"
--msgstr "ÄŒrpalka"
-+msgid "Air quality detector"
-+msgstr "Detektor kakovosti zraka"
- 
- #: ../sheets/SISSI.sheet.in.h:45
--#: ../sheets/ciscocomputer.sheet.in.h:37
--msgid "Relational Database"
--msgstr "Relacijska zbirka podatkov"
-+msgid "Voltage detector"
-+msgstr "Detektor napetosti"
- 
- #: ../sheets/SISSI.sheet.in.h:46
--msgid "Revolving door"
--msgstr "Vrte�a vrata"
-+msgid "Vehicle detector"
-+msgstr "Detektor vozil"
- 
- #: ../sheets/SISSI.sheet.in.h:47
--msgid "Room"
--msgstr "Soba"
-+msgid "Vibration sensor"
-+msgstr "Tipalo vibracij"
- 
- #: ../sheets/SISSI.sheet.in.h:48
--#: ../sheets/ciscohub.sheet.in.h:53
--msgid "Router"
--msgstr "Usmerjevalnik"
-+msgid "Digital code"
-+msgstr "Digitalna koda"
- 
- #: ../sheets/SISSI.sheet.in.h:49
--msgid "Safe"
--msgstr "Sef"
-+msgid "Moisture extractor"
-+msgstr "Odstranjevalec vlage"
- 
- #: ../sheets/SISSI.sheet.in.h:50
--msgid "Security area"
--msgstr "Varnostno obmo�je"
-+msgid "Air filter"
-+msgstr "Zra�ni filter"
- 
- #: ../sheets/SISSI.sheet.in.h:51
--msgid "Sensor beam"
--msgstr "Žarek tipala"
-+msgid "Badge reader/keyboard"
-+msgstr "Bralnik/tipkovnica priponk"
- 
- #: ../sheets/SISSI.sheet.in.h:52
--msgid "Server"
--msgstr "Strežnik"
-+msgid "Badge reader"
-+msgstr "Bralnik priponk"
- 
- #: ../sheets/SISSI.sheet.in.h:53
--msgid "Smoke detector"
--msgstr "Detektor dima"
-+msgid "Biometric reader"
-+msgstr "Bralnik biometri�nih podatkov"
-+
-+#: ../sheets/SISSI.sheet.in.h:54
-+msgid "Pump"
-+msgstr "ÄŒrpalka"
- 
- #: ../sheets/SISSI.sheet.in.h:55
--#: ../sheets/ciscocomputer.sheet.in.h:42
--msgid "Storage array"
--msgstr "Polje shrambe"
-+msgid "Circulation pump"
-+msgstr "Krožna �rpalka"
- 
- #: ../sheets/SISSI.sheet.in.h:56
--#: ../sheets/network.sheet.in.h:33
--msgid "Telephone"
--msgstr "Telefon"
-+msgid "Revolving door"
-+msgstr "Vrte�a vrata"
- 
- #: ../sheets/SISSI.sheet.in.h:57
--msgid "Vehicle detector"
--msgstr "Detektor vozil"
-+msgid "Axial Ventilator"
-+msgstr "Osni ventilator"
- 
- #: ../sheets/SISSI.sheet.in.h:58
--msgid "Ventilator"
--msgstr "Ventilator"
-+msgid "Centrifugal Ventilator"
-+msgstr "Centrifugalni ventilator"
- 
- #: ../sheets/SISSI.sheet.in.h:59
--msgid "Vibration sensor"
--msgstr "Tipalo vibracij"
-+msgid "Ventilator"
-+msgstr "Ventilator"
- 
- #: ../sheets/SISSI.sheet.in.h:60
--msgid "Video camera"
--msgstr "Videokamera"
--
--#: ../sheets/SISSI.sheet.in.h:61
--msgid "Video movement detector"
--msgstr "Video detektor gibanja"
-+msgid "Extinguisher"
-+msgstr "Gasilni aparat"
- 
- #: ../sheets/SISSI.sheet.in.h:62
--msgid "Voltage detector"
--msgstr "Detektor napetosti"
-+msgid "Airconditioner"
-+msgstr "Klimatska naprava"
- 
- #: ../sheets/SISSI.sheet.in.h:63
--msgid "Workstation"
--msgstr "Delovna postaja"
-+msgid "Alarm center"
-+msgstr "Središ�e za intervencije"
- 
- #: ../sheets/UML.sheet.in.h:1
--msgid "Activity"
--msgstr "Aktivnost"
-+msgid "UML"
-+msgstr "UML"
- 
--#: ../sheets/UML.sheet.in.h:3
--msgid "Aggregation, one class is part of another"
--msgstr "Agregacija, en razred je del drugega"
-+#: ../sheets/UML.sheet.in.h:2
-+msgid "Editor for UML Static Structure Diagrams"
-+msgstr "Urejevalnik diagramov stati�nih struktur UML"
- 
--#: ../sheets/UML.sheet.in.h:4
--msgid "Association, two classes are associated"
--msgstr "Povezava, dva razreda sta povezana"
-+#: ../sheets/UML.sheet.in.h:5
-+msgid "Note"
-+msgstr "Opomba"
- 
- #: ../sheets/UML.sheet.in.h:7
--msgid "Class stereotype icon"
--msgstr "Ikona stereotipa razreda"
-+msgid "Realizes, implements a specific interface"
-+msgstr "Realizira, implementira dolo�en vmesnik"
- 
- #: ../sheets/UML.sheet.in.h:8
--msgid "Component"
--msgstr "Komponenta"
-+msgid "Generalization, class inheritance"
-+msgstr "Posplošenje, dedovanje razreda"
- 
- #: ../sheets/UML.sheet.in.h:9
--msgid "Constraint, place a constraint on something"
--msgstr "Omejitev, dodaj omejitev na nekaj"
--
--#: ../sheets/UML.sheet.in.h:11
--msgid "Editor for UML Static Structure Diagrams"
--msgstr "Urejevalnik diagramov stati�nih struktur UML"
--
--#: ../sheets/UML.sheet.in.h:15
--msgid "Fork/union"
--msgstr "Razvejaj/spoji"
-+msgid "Association, two classes are associated"
-+msgstr "Povezava, dva razreda sta povezana"
- 
--#: ../sheets/UML.sheet.in.h:16
--msgid "Generalization, class inheritance"
--msgstr "Posplošenje, dedovanje razreda"
-+#: ../sheets/UML.sheet.in.h:10
-+msgid "Aggregation, one class is part of another"
-+msgstr "Agregacija, en razred je del drugega"
- 
--#: ../sheets/UML.sheet.in.h:17
-+#: ../sheets/UML.sheet.in.h:11
- msgid "Implements, class implements a specific interface"
- msgstr "Implementira, razredno implementira dolo�en vmesnik"
- 
--#: ../sheets/UML.sheet.in.h:18
--msgid "Initial/end state"
--msgstr "Za�etno/kon�no stanje"
-+#: ../sheets/UML.sheet.in.h:12
-+msgid "Constraint, place a constraint on something"
-+msgstr "Omejitev, dodaj omejitev na nekaj"
- 
--#: ../sheets/UML.sheet.in.h:19
-+#: ../sheets/UML.sheet.in.h:13
-+msgid "Small package"
-+msgstr "Majhen paket"
-+
-+#: ../sheets/UML.sheet.in.h:14
- msgid "Large package"
- msgstr "Velik paket"
- 
--#: ../sheets/UML.sheet.in.h:20
-+#: ../sheets/UML.sheet.in.h:16
-+msgid "Use case"
-+msgstr "Primer uporabe"
-+
-+#: ../sheets/UML.sheet.in.h:17
- msgid "Lifeline"
- msgstr "ÄŒasovna linija UML"
- 
--#: ../sheets/UML.sheet.in.h:21
-+#: ../sheets/UML.sheet.in.h:18
-+msgid "Object"
-+msgstr "Predmet"
-+
-+#: ../sheets/UML.sheet.in.h:19
- msgid "Message"
- msgstr "Sporo�ilo"
- 
--#: ../sheets/UML.sheet.in.h:22
-+#: ../sheets/UML.sheet.in.h:20
-+msgid "Component"
-+msgstr "Komponenta"
-+
-+#: ../sheets/UML.sheet.in.h:25
- msgid "Node"
- msgstr "Vozliš�e"
- 
--#: ../sheets/UML.sheet.in.h:23
--msgid "Note"
--msgstr "Opomba"
--
--#: ../sheets/UML.sheet.in.h:24
--msgid "Object"
--msgstr "Predmet"
--
--#: ../sheets/UML.sheet.in.h:25
--msgid "Realizes, implements a specific interface"
--msgstr "Realizira, implementira dolo�en vmesnik"
-+#: ../sheets/UML.sheet.in.h:26
-+msgid "Class stereotype icon"
-+msgstr "Ikona stereotipa razreda"
- 
- #: ../sheets/UML.sheet.in.h:27
--msgid "Small package"
--msgstr "Majhen paket"
-+msgid "Initial/end state"
-+msgstr "Za�etno/kon�no stanje"
- 
--#: ../sheets/UML.sheet.in.h:31
--msgid "UML"
--msgstr "UML"
-+#: ../sheets/UML.sheet.in.h:29
-+msgid "Activity"
-+msgstr "Aktivnost"
- 
--#: ../sheets/UML.sheet.in.h:32
--msgid "Use case"
--msgstr "Primer uporabe"
-+#: ../sheets/UML.sheet.in.h:31
-+msgid "Fork/union"
-+msgstr "Razvejaj/spoji"
- 
- #: ../sheets/chronogram.sheet.in.h:1
- msgid "Chronogram"
- msgstr "Kronogram"
- 
- #: ../sheets/chronogram.sheet.in.h:2
--msgid "Data line"
--msgstr "Podatkovna �rta"
--
--#: ../sheets/chronogram.sheet.in.h:3
- msgid "Objects to design chronogram charts"
- msgstr "Predmeti za oblikovanje kronogramskih diagramov"
- 
--#: ../sheets/chronogram.sheet.in.h:4
-+#: ../sheets/chronogram.sheet.in.h:3
- msgid "Time scale"
- msgstr "ÄŒasovno merilo"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:1
--msgid "BBS"
--msgstr "BBS"
-+#: ../sheets/chronogram.sheet.in.h:4
-+msgid "Data line"
-+msgstr "Podatkovna �rta"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:2
-+#: ../sheets/ciscocomputer.sheet.in.h:1
- msgid "Cisco - Computer"
- msgstr "Cisco - Ra�unalnik"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:2
-+msgid "Computer shapes by Cisco"
-+msgstr "Ra�unalniške oblike - Cisco"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:3
--msgid "Cisco CA"
--msgstr "Cisco CA"
-+msgid "PC"
-+msgstr "Osebni ra�unalnik (PC)"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:4
--msgid "CiscoSecurity"
--msgstr "CiscoSecurity (Varnost)"
-+msgid "Macintosh"
-+msgstr "Macintosh"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:5
--msgid "CiscoWorks workstation"
--msgstr "Delovna postaja CiscoWorks"
-+msgid "Terminal"
-+msgstr "Terminal"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:6
--msgid "Computer shapes by Cisco"
--msgstr "Ra�unalniške oblike - Cisco"
-+msgid "SUN workstation"
-+msgstr "Delovna postaja SUN"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:7
--msgid "Disk subsystem"
--msgstr "Diskovni podsistem"
-+msgid "CiscoWorks workstation"
-+msgstr "Delovna postaja CiscoWorks"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:8
--msgid "Diskette"
--msgstr "Disketa"
-+msgid "PC Router Card"
-+msgstr "Usmerjevalna kartica za osebni ra�unalnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:9
--msgid "EtherClient"
--msgstr "EtherClient"
-+msgid "PC Software"
-+msgstr "Programska oprema za osebni ra�unalnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:10
--msgid "FC Storage"
--msgstr "Shramba FC"
-+msgid "PC with Router-Based Software"
-+msgstr "Osebni ra�unalnik z na usmerjevalniku temelje�o programsko opremo"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:11
--msgid "File Server"
--msgstr "Datote�ni strežnik"
-+msgid "Workgroup director"
-+msgstr "Upravitelj delovne skupine"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:12
--msgid "Front End Processor"
--msgstr "Procesor �elnega vmesnika"
-+msgid "CiscoSecurity"
-+msgstr "CiscoSecurity (Varnost)"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:13
--msgid "HP Mini"
--msgstr "HP Mini"
-+msgid "Cisco CA"
-+msgstr "Cisco CA"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:14
--msgid "Handheld"
--msgstr "Dlan�nik"
-+msgid "WWW server"
-+msgstr "Spletni strežnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:15
--msgid "Host"
--msgstr "Gostitelj"
-+msgid "Web browser"
-+msgstr "Spletni brskalnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:16
--msgid "IBM Mini (AS400)"
--msgstr "IBM Mini (AS400)"
-+msgid "File Server"
-+msgstr "Datote�ni strežnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:17
--msgid "IBM Tower"
--msgstr "IBM Tower"
-+msgid "Software-Based Router on File Server"
-+msgstr "Programski usmerjevalnik na datote�nem strežniku"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:18
--msgid "IBM mainframe"
--msgstr "Osrednji ra�unalnik IBM"
-+msgid "Server with PC Router"
-+msgstr "Strežnik z usmerjevalnikom"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:19
--msgid "IBM mainframe with FEP"
--msgstr "Osrednji ra�unalnik IBM s FEP"
-+msgid "IBM Tower"
-+msgstr "IBM Tower"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:20
--msgid "JBOD"
--msgstr "JBOD"
-+msgid "IBM Mini (AS400)"
-+msgstr "IBM Mini (AS400)"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:21
-+msgid "Front End Processor"
-+msgstr "Procesor �elnega vmesnika"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:22
--msgid "Macintosh"
--msgstr "Macintosh"
-+msgid "IBM mainframe"
-+msgstr "Osrednji ra�unalnik IBM"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:23
--msgid "MicroWebserver"
--msgstr "Mikro spletni strežnik"
-+msgid "IBM mainframe with FEP"
-+msgstr "Osrednji ra�unalnik IBM s FEP"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:24
--msgid "Mini VAX"
--msgstr "Mini VAX"
-+msgid "HP Mini"
-+msgstr "HP Mini"
-+
-+#: ../sheets/ciscocomputer.sheet.in.h:25
-+msgid "Supercomputer"
-+msgstr "Superra�unalnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:26
--#: ../sheets/network.sheet.in.h:19
--msgid "Monitor"
--msgstr "Zaslon"
-+msgid "Web cluster"
-+msgstr "Spletna gru�a"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:27
--msgid "Newton"
--msgstr "Newton"
--
--#: ../sheets/ciscocomputer.sheet.in.h:28
--msgid "PC"
--msgstr "Osebni ra�unalnik (PC)"
--
--#: ../sheets/ciscocomputer.sheet.in.h:29
--msgid "PC Adapter Card"
--msgstr "Vmesnik za osebni ra�unalnik"
-+msgid "Mini VAX"
-+msgstr "Mini VAX"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:30
-+#: ../sheets/ciscocomputer.sheet.in.h:28
- msgid "PC Card"
- msgstr "Kartica za osebni ra�unalnik"
- 
-+#: ../sheets/ciscocomputer.sheet.in.h:30
-+msgid "Tablet"
-+msgstr "Tabli�ni ra�unalnik"
-+
- #: ../sheets/ciscocomputer.sheet.in.h:31
--msgid "PC Router Card"
--msgstr "Usmerjevalna kartica za osebni ra�unalnik"
-+msgid "EtherClient"
-+msgstr "EtherClient"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:32
--msgid "PC Software"
--msgstr "Programska oprema za osebni ra�unalnik"
-+msgid "Handheld"
-+msgstr "Dlan�nik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:33
--msgid "PC Video"
--msgstr "Video za osebni ra�unalnik"
-+msgid "Wireless"
-+msgstr "Brezži�no"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:34
--msgid "PC with Router-Based Software"
--msgstr "Osebni ra�unalnik z na usmerjevalniku temelje�o programsko opremo"
-+#: ../sheets/ciscocomputer.sheet.in.h:35
-+msgid "Newton"
-+msgstr "Newton"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:38
--msgid "SUN workstation"
--msgstr "Delovna postaja SUN"
-+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
-+msgid "Monitor"
-+msgstr "Zaslon"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:40
--msgid "Server with PC Router"
--msgstr "Strežnik z usmerjevalnikom"
-+#: ../sheets/ciscocomputer.sheet.in.h:39
-+msgid "PC Video"
-+msgstr "Video za osebni ra�unalnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:41
--msgid "Software-Based Router on File Server"
--msgstr "Programski usmerjevalnik na datote�nem strežniku"
-+msgid "BBS"
-+msgstr "BBS"
- 
--#: ../sheets/ciscocomputer.sheet.in.h:43
--msgid "Supercomputer"
--msgstr "Superra�unalnik"
-+#: ../sheets/ciscocomputer.sheet.in.h:42
-+msgid "MicroWebserver"
-+msgstr "Mikro spletni strežnik"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:44
--msgid "Tablet"
--msgstr "Tabli�ni ra�unalnik"
-+msgid "Diskette"
-+msgstr "Disketa"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:45
--msgid "Tape array"
--msgstr "Tra�no polje"
-+msgid "Host"
-+msgstr "Gostitelj"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:46
--msgid "Terminal"
--msgstr "Terminal"
-+msgid "Tape array"
-+msgstr "Tra�no polje"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:47
--msgid "WWW server"
--msgstr "Spletni strežnik"
-+msgid "Disk subsystem"
-+msgstr "Diskovni podsistem"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:48
--msgid "Web browser"
--msgstr "Spletni brskalnik"
--
--#: ../sheets/ciscocomputer.sheet.in.h:49
--msgid "Web cluster"
--msgstr "Spletna gru�a"
-+msgid "JBOD"
-+msgstr "JBOD"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:50
--msgid "Wireless"
--msgstr "Brezži�no"
-+msgid "FC Storage"
-+msgstr "Shramba FC"
- 
- #: ../sheets/ciscocomputer.sheet.in.h:51
--msgid "Workgroup director"
--msgstr "Upravitelj delovne skupine"
-+msgid "PC Adapter Card"
-+msgstr "Vmesnik za osebni ra�unalnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:1
--msgid "100BaseT Hub"
--msgstr "Zvezdiš�e 100BaseT"
-+msgid "Cisco - Switch"
-+msgstr "Cisco - Preklopnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:2
--msgid "7500ARS (7513) Router"
--msgstr "Usmerjevalnik 7500ARS (7513)"
--
--#: ../sheets/ciscohub.sheet.in.h:3
--msgid "7505 Router"
--msgstr "Usmerjevalnik 7505"
-+msgid "Router and switch shapes by Cisco"
-+msgstr "Usmerjevalne in preklopne oblike - Cisco"
- 
- #: ../sheets/ciscohub.sheet.in.h:4
--msgid "7507 Router"
--msgstr "Usmerjevalnik 7507"
-+msgid "Router subdued"
-+msgstr "Usmerjevalnik, nepoudarjen"
- 
- #: ../sheets/ciscohub.sheet.in.h:5
--msgid "ASIC Processor"
--msgstr "Procesor ASIC"
-+msgid "Router with Silicon Switch"
-+msgstr "Usmerjevalnik s silikonskim preklopnikom"
- 
- #: ../sheets/ciscohub.sheet.in.h:6
--msgid "ATM 3800"
--msgstr "ATM 3800"
-+msgid "NetFlow router"
-+msgstr "Usmerjevalnik NetFlow"
- 
- #: ../sheets/ciscohub.sheet.in.h:7
--msgid "ATM Fast Gigabit Etherswitch"
--msgstr "ATM - hitri gigabitni ethernet preklopnik"
-+msgid "Broadband router"
-+msgstr "Å irokopasovni usmerjevalnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:8
--msgid "ATM Switch"
--msgstr "Preklopnik ATM"
-+msgid "Wavelength router"
-+msgstr "Usmerjevalnik valovne dolžine"
- 
- #: ../sheets/ciscohub.sheet.in.h:9
--msgid "ATM Tag Switch Router"
--msgstr "ATM - usmerjevalnik s preklopom oznak"
-+msgid "Wireless router"
-+msgstr "Brezži�ni usmerjevalnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:10
--msgid "Access Gateway"
--msgstr "Prehod za dostop"
-+msgid "7507 Router"
-+msgstr "Usmerjevalnik 7507"
- 
- #: ../sheets/ciscohub.sheet.in.h:11
--msgid "BBSM"
--msgstr "BBSM"
-+msgid "7505 Router"
-+msgstr "Usmerjevalnik 7505"
- 
- #: ../sheets/ciscohub.sheet.in.h:12
--msgid "Broadband router"
--msgstr "Å irokopasovni usmerjevalnik"
-+msgid "7500ARS (7513) Router"
-+msgstr "Usmerjevalnik 7500ARS (7513)"
- 
- #: ../sheets/ciscohub.sheet.in.h:13
--msgid "CSM-S"
--msgstr "CSM-S"
-+msgid "Edge Label Switch Router with NetFlow"
-+msgstr "Usmerjevalnik z ozna�enim preklopnikom Edge z NetFlow"
- 
- #: ../sheets/ciscohub.sheet.in.h:14
--msgid "Carrier Routing System"
--msgstr "Sistem preusmerjanja medija"
-+msgid "Edge Label Switch Router"
-+msgstr "Usmerjevalnik z ozna�enim preklopnikom Edge"
- 
- #: ../sheets/ciscohub.sheet.in.h:15
--msgid "Cisco - Switch"
--msgstr "Cisco - Preklopnik"
-+msgid "Router with Firewall"
-+msgstr "Usmerjevalnik s požarnim zidom"
- 
- #: ../sheets/ciscohub.sheet.in.h:16
--msgid "Cisco 1000"
--msgstr "Cisco 1000"
-+msgid "Optical Services Router"
-+msgstr "Usmerjevalnik opti�nih storitev"
- 
- #: ../sheets/ciscohub.sheet.in.h:17
--msgid "Cisco Hub"
--msgstr "Zvezdiš�e Cisco"
--
--#: ../sheets/ciscohub.sheet.in.h:18
- msgid "Content Router"
- msgstr "Usmerjevalnik vsebin"
- 
-+#: ../sheets/ciscohub.sheet.in.h:18
-+msgid "Carrier Routing System"
-+msgstr "Sistem preusmerjanja medija"
-+
- #: ../sheets/ciscohub.sheet.in.h:19
--msgid "Content Service Module"
--msgstr "Modul storitev vsebine"
-+msgid "Storage Router"
-+msgstr "Usmerjevalnik hrambe"
- 
- #: ../sheets/ciscohub.sheet.in.h:20
--msgid "Content Service Switch 1100"
--msgstr "Preklopnik storitev vsebine 1100"
--
--#: ../sheets/ciscohub.sheet.in.h:21
--msgid "Content Switch"
--msgstr "Preklopnik vsebin"
-+msgid "NetSonar"
-+msgstr "NetSonar"
- 
- #: ../sheets/ciscohub.sheet.in.h:22
--msgid "Data Center Switch"
--msgstr "Preklopnik podatkovnega središ�a"
-+msgid "Hub subdued"
-+msgstr "Zvezdiš�e, nepoudarjeno"
- 
- #: ../sheets/ciscohub.sheet.in.h:23
--msgid "Data Center Switch Reversed"
--msgstr "Preklopnik podatkovnega središ�a, preobrnjen"
-+msgid "Cisco Hub"
-+msgstr "Zvezdiš�e Cisco"
- 
- #: ../sheets/ciscohub.sheet.in.h:24
--msgid "Data Switch Processor"
--msgstr "Procesor preklopnika podatkov"
-+msgid "Small Hub"
-+msgstr "Majhno zvezdiš�e"
- 
- #: ../sheets/ciscohub.sheet.in.h:25
--msgid "Director-class Fibre Channel intelligent switch"
--msgstr "Vrhunski pametni preklopnik opti�nega vodila"
-+msgid "100BaseT Hub"
-+msgstr "Zvezdiš�e 100BaseT"
- 
- #: ../sheets/ciscohub.sheet.in.h:26
--msgid "Edge Label Switch Router"
--msgstr "Usmerjevalnik z ozna�enim preklopnikom Edge"
-+msgid "Workgroup switch"
-+msgstr "Preklopnik delovne skupine"
- 
- #: ../sheets/ciscohub.sheet.in.h:27
--msgid "Edge Label Switch Router with NetFlow"
--msgstr "Usmerjevalnik z ozna�enim preklopnikom Edge z NetFlow"
-+msgid "Workgroup switch Subdued"
-+msgstr "Preklopnik delovne skupine, nepoudarjen"
- 
- #: ../sheets/ciscohub.sheet.in.h:28
--msgid "Generic Processor"
--msgstr "Splošen procesor"
-+msgid "Workgroup Switch Voice-Enabled"
-+msgstr "Preklopnik delovne skupine z glasovno podporo"
-+
-+#: ../sheets/ciscohub.sheet.in.h:29
-+msgid "BBSM"
-+msgstr "BBSM"
- 
- #: ../sheets/ciscohub.sheet.in.h:30
--msgid "Hub subdued"
--msgstr "Zvezdiš�e, nepoudarjeno"
-+msgid "ATM Tag Switch Router"
-+msgstr "ATM - usmerjevalnik s preklopom oznak"
- 
- #: ../sheets/ciscohub.sheet.in.h:31
--msgid "ISDN switch"
--msgstr "Preklopnik ISDN"
-+msgid "Switch Processor"
-+msgstr "Preklopni procesor"
- 
- #: ../sheets/ciscohub.sheet.in.h:32
--msgid "LAN2LAN Switch"
--msgstr "Preklopnik LAN2LAN"
-+msgid "Route Switch Processor"
-+msgstr "Procesor preklopnika smeri"
- 
- #: ../sheets/ciscohub.sheet.in.h:33
--msgid "Label Switch Router"
--msgstr "Usmerjevalnik z ozna�enim preklopnikom"
-+msgid "Route Switch Processor with Si"
-+msgstr "Procesor usmerjevalnika preklopnika s silikonom"
- 
- #: ../sheets/ciscohub.sheet.in.h:34
--msgid "Layer 2 Remote Switch"
--msgstr "Oddaljeni preklopnik ravni 2"
-+msgid "PXF"
-+msgstr "PXF"
- 
- #: ../sheets/ciscohub.sheet.in.h:35
--msgid "MGX 8220"
--msgstr "MGX 8220"
-+msgid "ASIC Processor"
-+msgstr "Procesor ASIC"
- 
- #: ../sheets/ciscohub.sheet.in.h:36
--msgid "MGX 8240"
--msgstr "MGX 8240"
-+msgid "Generic Processor"
-+msgstr "Splošen procesor"
- 
- #: ../sheets/ciscohub.sheet.in.h:37
--msgid "MGX 8260"
--msgstr "MGX 8260"
-+msgid "Data Center Switch"
-+msgstr "Preklopnik podatkovnega središ�a"
- 
- #: ../sheets/ciscohub.sheet.in.h:38
--msgid "Multi-Fabric Server Switch"
--msgstr "Strežniški preklopnik iz ve� materialov"
-+msgid "Data Center Switch Reversed"
-+msgstr "Preklopnik podatkovnega središ�a, preobrnjen"
- 
- #: ../sheets/ciscohub.sheet.in.h:39
--msgid "MultiSwitch Device"
--msgstr "Ve�preklopna naprava"
-+msgid "Data Switch Processor"
-+msgstr "Procesor preklopnika podatkov"
- 
- #: ../sheets/ciscohub.sheet.in.h:40
--msgid "Multilayer Remote Switch"
--msgstr "Ve�plastni oddaljeni preklopnik"
-+msgid "Content Switch"
-+msgstr "Preklopnik vsebin"
- 
- #: ../sheets/ciscohub.sheet.in.h:41
--msgid "Multilayer Switch"
--msgstr "Ve�plastni preklopnik"
-+msgid "Content Service Module"
-+msgstr "Modul storitev vsebine"
- 
- #: ../sheets/ciscohub.sheet.in.h:42
--msgid "Multilayer Switch with Silicon"
--msgstr "Ve�plastni preklopnik s silikonom"
-+msgid "CSM-S"
-+msgstr "CSM-S"
- 
- #: ../sheets/ciscohub.sheet.in.h:43
--msgid "Multilayer Switch with Silicon subdued"
--msgstr "Ve�-ravenski preklopnik s silikonom, nepoudarjen"
-+msgid "Access Gateway"
-+msgstr "Prehod za dostop"
- 
- #: ../sheets/ciscohub.sheet.in.h:44
--msgid "NetFlow router"
--msgstr "Usmerjevalnik NetFlow"
-+msgid "ATM Switch"
-+msgstr "Preklopnik ATM"
- 
- #: ../sheets/ciscohub.sheet.in.h:45
--msgid "NetRanger"
--msgstr "NetRanger"
-+msgid "ATM 3800"
-+msgstr "ATM 3800"
- 
- #: ../sheets/ciscohub.sheet.in.h:46
--msgid "NetSonar"
--msgstr "NetSonar"
-+msgid "Cisco 1000"
-+msgstr "Cisco 1000"
- 
--#: ../sheets/ciscohub.sheet.in.h:47
--msgid "Optical Services Router"
--msgstr "Usmerjevalnik opti�nih storitev"
-+#: ../sheets/ciscohub.sheet.in.h:47
-+msgid "ISDN switch"
-+msgstr "Preklopnik ISDN"
- 
- #: ../sheets/ciscohub.sheet.in.h:48
--msgid "PXF"
--msgstr "PXF"
-+msgid "Label Switch Router"
-+msgstr "Usmerjevalnik z ozna�enim preklopnikom"
- 
- #: ../sheets/ciscohub.sheet.in.h:49
--msgid "Programmable Switch"
--msgstr "Programilni preklopnik"
-+msgid "MultiSwitch Device"
-+msgstr "Ve�preklopna naprava"
- 
- #: ../sheets/ciscohub.sheet.in.h:50
--msgid "RateMUX"
--msgstr "RateMUX"
-+msgid "LAN2LAN Switch"
-+msgstr "Preklopnik LAN2LAN"
- 
- #: ../sheets/ciscohub.sheet.in.h:51
--msgid "Route Switch Processor"
--msgstr "Procesor preklopnika smeri"
-+msgid "Multilayer Switch"
-+msgstr "Ve�plastni preklopnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:52
--msgid "Route Switch Processor with Si"
--msgstr "Procesor usmerjevalnika preklopnika s silikonom"
-+msgid "Multilayer Switch with Silicon"
-+msgstr "Ve�plastni preklopnik s silikonom"
-+
-+#: ../sheets/ciscohub.sheet.in.h:53
-+msgid "Multilayer Switch with Silicon subdued"
-+msgstr "Ve�-ravenski preklopnik s silikonom, nepoudarjen"
- 
- #: ../sheets/ciscohub.sheet.in.h:54
--msgid "Router and switch shapes by Cisco"
--msgstr "Usmerjevalne in preklopne oblike - Cisco"
-+msgid "Programmable Switch"
-+msgstr "Programilni preklopnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:55
--msgid "Router subdued"
--msgstr "Usmerjevalnik, nepoudarjen"
-+msgid "Content Service Switch 1100"
-+msgstr "Preklopnik storitev vsebine 1100"
- 
- #: ../sheets/ciscohub.sheet.in.h:56
--msgid "Router with Firewall"
--msgstr "Usmerjevalnik s požarnim zidom"
-+msgid "ATM Fast Gigabit Etherswitch"
-+msgstr "ATM - hitri gigabitni ethernet preklopnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:57
--msgid "Router with Silicon Switch"
--msgstr "Usmerjevalnik s silikonskim preklopnikom"
-+msgid "RateMUX"
-+msgstr "RateMUX"
- 
- #: ../sheets/ciscohub.sheet.in.h:58
--msgid "Server Switch"
--msgstr "Strežniški preklopnik"
-+msgid "Workgroup 5500"
-+msgstr "Delovna skupina 5500"
- 
- #: ../sheets/ciscohub.sheet.in.h:59
--msgid "Small Hub"
--msgstr "Majhno zvezdiš�e"
-+msgid "Workgroup 5000"
-+msgstr "Delovna skupina 5000"
- 
- #: ../sheets/ciscohub.sheet.in.h:60
--msgid "Storage Router"
--msgstr "Usmerjevalnik hrambe"
-+msgid "Workgroup 5002"
-+msgstr "Delovna skupina 5002"
- 
- #: ../sheets/ciscohub.sheet.in.h:61
--msgid "Switch Processor"
--msgstr "Preklopni procesor"
-+msgid "NetRanger"
-+msgstr "NetRanger"
- 
- #: ../sheets/ciscohub.sheet.in.h:62
--msgid "Universal Gateway"
--msgstr "Univerzalni prehod"
-+msgid "MGX 8220"
-+msgstr "MGX 8220"
- 
- #: ../sheets/ciscohub.sheet.in.h:63
--msgid "Virtual Layer Switch"
--msgstr "Preklopnik navideznih plasti"
-+msgid "MGX 8240"
-+msgstr "MGX 8240"
- 
- #: ../sheets/ciscohub.sheet.in.h:64
--msgid "Wavelength router"
--msgstr "Usmerjevalnik valovne dolžine"
-+msgid "MGX 8260"
-+msgstr "MGX 8260"
- 
- #: ../sheets/ciscohub.sheet.in.h:65
--msgid "Wireless router"
--msgstr "Brezži�ni usmerjevalnik"
-+msgid "Universal Gateway"
-+msgstr "Univerzalni prehod"
- 
- #: ../sheets/ciscohub.sheet.in.h:66
--msgid "Workgroup 5000"
--msgstr "Delovna skupina 5000"
-+msgid "iSCSI switch"
-+msgstr "Preklopnik iSCSI"
- 
- #: ../sheets/ciscohub.sheet.in.h:67
--msgid "Workgroup 5002"
--msgstr "Delovna skupina 5002"
-+msgid "Workgroup Fibre Channel intelligent switch"
-+msgstr "Pametni preklopnik opti�nega kanala delovne skupine"
- 
- #: ../sheets/ciscohub.sheet.in.h:68
--msgid "Workgroup 5500"
--msgstr "Delovna skupina 5500"
-+msgid "Director-class Fibre Channel intelligent switch"
-+msgstr "Vrhunski pametni preklopnik opti�nega vodila"
- 
- #: ../sheets/ciscohub.sheet.in.h:69
--msgid "Workgroup Fibre Channel intelligent switch"
--msgstr "Pametni preklopnik opti�nega kanala delovne skupine"
-+msgid "Multi-Fabric Server Switch"
-+msgstr "Strežniški preklopnik iz ve� materialov"
- 
- #: ../sheets/ciscohub.sheet.in.h:70
--msgid "Workgroup Switch Voice-Enabled"
--msgstr "Preklopnik delovne skupine z glasovno podporo"
-+msgid "Server Switch"
-+msgstr "Strežniški preklopnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:71
--msgid "Workgroup switch"
--msgstr "Preklopnik delovne skupine"
-+msgid "Multilayer Remote Switch"
-+msgstr "Ve�plastni oddaljeni preklopnik"
- 
- #: ../sheets/ciscohub.sheet.in.h:72
--msgid "Workgroup switch Subdued"
--msgstr "Preklopnik delovne skupine, nepoudarjen"
-+msgid "Layer 2 Remote Switch"
-+msgstr "Oddaljeni preklopnik ravni 2"
- 
- #: ../sheets/ciscohub.sheet.in.h:73
--msgid "iSCSI switch"
--msgstr "Preklopnik iSCSI"
-+msgid "Virtual Layer Switch"
-+msgstr "Preklopnik navideznih plasti"
- 
- #: ../sheets/ciscomisc.sheet.in.h:1
--msgid "Androgynous Person"
--msgstr "Androgena oseba"
-+msgid "Cisco - Misc"
-+msgstr "Cisco - Razno"
- 
- #: ../sheets/ciscomisc.sheet.in.h:2
--msgid "Antenna"
--msgstr "Antena"
-+msgid "Miscellaneous shapes by Cisco"
-+msgstr "Razne oblike - Cisco"
- 
- #: ../sheets/ciscomisc.sheet.in.h:3
--msgid "Branch office"
--msgstr "Poslovalnica"
-+msgid "Government Building"
-+msgstr "Vladna pala�a"
- 
- #: ../sheets/ciscomisc.sheet.in.h:4
--msgid "Branch office blue"
--msgstr "Poslovalnica, modra"
-+msgid "University"
-+msgstr "Univerza"
- 
- #: ../sheets/ciscomisc.sheet.in.h:5
--msgid "Branch office subdued"
--msgstr "Poslovalnica, nepoudarjeno"
-+msgid "Small Business"
-+msgstr "Malo podjetje"
- 
- #: ../sheets/ciscomisc.sheet.in.h:6
--msgid "Car"
--msgstr "Avtomobil"
-+msgid "Home office"
-+msgstr "Doma�a pisarna"
- 
- #: ../sheets/ciscomisc.sheet.in.h:7
--msgid "Cisco - Misc"
--msgstr "Cisco - Razno"
-+msgid "Branch office"
-+msgstr "Poslovalnica"
- 
- #: ../sheets/ciscomisc.sheet.in.h:8
--msgid "CiscoWorks Man"
--msgstr "Moški CiscoWorks"
-+msgid "Branch office subdued"
-+msgstr "Poslovalnica, nepoudarjeno"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:9
-+msgid "Branch office blue"
-+msgstr "Poslovalnica, modra"
- 
- #: ../sheets/ciscomisc.sheet.in.h:10
- msgid "Generic Building"
- msgstr "Splošna zgradba"
- 
- #: ../sheets/ciscomisc.sheet.in.h:11
--msgid "Generic Building blue"
--msgstr "Splošna zgradba, modra"
--
--#: ../sheets/ciscomisc.sheet.in.h:12
- msgid "Generic Building subdued"
- msgstr "Splošna zgradba, nepoudarjena"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:12
-+msgid "Generic Building blue"
-+msgstr "Splošna zgradba, modra"
-+
- #: ../sheets/ciscomisc.sheet.in.h:13
--msgid "Government Building"
--msgstr "Vladna pala�a"
-+msgid "Medium Building"
-+msgstr "Srednje velika zgradba"
- 
- #: ../sheets/ciscomisc.sheet.in.h:14
--msgid "Headphones"
--msgstr "Slušalke"
-+msgid "Medium Building subdued"
-+msgstr "Srednje velika zgradba, neizrazita"
- 
- #: ../sheets/ciscomisc.sheet.in.h:15
--msgid "Home office"
--msgstr "Doma�a pisarna"
-+msgid "Medium Building blue"
-+msgstr "Srednje velika zgradba, modra"
- 
- #: ../sheets/ciscomisc.sheet.in.h:16
- msgid "House"
-@@ -9683,1130 +9414,1125 @@ msgid "House blue"
- msgstr "Hiša, modra"
- 
- #: ../sheets/ciscomisc.sheet.in.h:18
--msgid "Key"
--msgstr "Klju�"
-+msgid "Telecommuter house"
-+msgstr "Hiša delavca na daljavo"
- 
--#: ../sheets/ciscomisc.sheet.in.h:20
--msgid "Lock and Key"
--msgstr "Klju�avnica s klju�em"
-+#: ../sheets/ciscomisc.sheet.in.h:19
-+msgid "Telecommuter house subdued"
-+msgstr "Hiša delavca na daljavo, nepoudarjena"
- 
--#: ../sheets/ciscomisc.sheet.in.h:21
-+#: ../sheets/ciscomisc.sheet.in.h:20
- msgid "MDU"
- msgstr "MDU"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:21
-+msgid "Man"
-+msgstr "Moški"
-+
- #: ../sheets/ciscomisc.sheet.in.h:22
--msgid "Mac Woman"
--msgstr "Ženska, Mac"
-+msgid "Man red"
-+msgstr "Moški, rde�"
- 
- #: ../sheets/ciscomisc.sheet.in.h:23
--msgid "Man"
--msgstr "Moški"
-+msgid "Man gold"
-+msgstr "Moški, zlat"
- 
- #: ../sheets/ciscomisc.sheet.in.h:24
- msgid "Man blue"
- msgstr "Moški, moder"
- 
- #: ../sheets/ciscomisc.sheet.in.h:25
--msgid "Man gold"
--msgstr "Moški, zlat"
-+msgid "Standing Man"
-+msgstr "Stoje�i moški"
- 
- #: ../sheets/ciscomisc.sheet.in.h:26
--msgid "Man red"
--msgstr "Moški, rde�"
-+msgid "Standing woman"
-+msgstr "Stoje�a ženska"
- 
- #: ../sheets/ciscomisc.sheet.in.h:27
--msgid "Medium Building"
--msgstr "Srednje velika zgradba"
-+msgid "Woman"
-+msgstr "Ženska"
- 
- #: ../sheets/ciscomisc.sheet.in.h:28
--msgid "Medium Building blue"
--msgstr "Srednje velika zgradba, modra"
-+msgid "Woman red"
-+msgstr "Ženska, rde�a"
- 
- #: ../sheets/ciscomisc.sheet.in.h:29
--msgid "Medium Building subdued"
--msgstr "Srednje velika zgradba, neizrazita"
-+msgid "Woman gold"
-+msgstr "Ženska, zlata"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:30
-+msgid "Woman blue"
-+msgstr "Ženska, modra"
- 
- #: ../sheets/ciscomisc.sheet.in.h:31
--msgid "Miscellaneous shapes by Cisco"
--msgstr "Razne oblike - Cisco"
-+msgid "Running man"
-+msgstr "Teka�"
- 
- #: ../sheets/ciscomisc.sheet.in.h:32
--msgid "PC Man"
--msgstr "Moški, osebni ra�unalnik"
-+msgid "Running man subdued"
-+msgstr "Teka�, neizrazit"
- 
- #: ../sheets/ciscomisc.sheet.in.h:33
--msgid "PC Man left"
--msgstr "Moški, osebni ra�unalnik, levo"
-+msgid "Telecommuter"
-+msgstr "Delavec na daljavo"
- 
- #: ../sheets/ciscomisc.sheet.in.h:34
--msgid "Running man"
--msgstr "Teka�"
-+msgid "Running woman"
-+msgstr "Teka�ica"
- 
- #: ../sheets/ciscomisc.sheet.in.h:35
--msgid "Running man subdued"
--msgstr "Teka�, neizrazit"
-+msgid "CiscoWorks Man"
-+msgstr "Moški CiscoWorks"
- 
- #: ../sheets/ciscomisc.sheet.in.h:36
--msgid "Running woman"
--msgstr "Teka�ica"
-+msgid "PC Man left"
-+msgstr "Moški, osebni ra�unalnik, levo"
- 
- #: ../sheets/ciscomisc.sheet.in.h:37
--msgid "Satellite"
--msgstr "Satelit"
-+msgid "PC Man"
-+msgstr "Moški, osebni ra�unalnik"
- 
- #: ../sheets/ciscomisc.sheet.in.h:38
--msgid "Satellite dish"
--msgstr "Satelitski krožnik"
--
--#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman"
- msgstr "Sede�a ženska"
- 
--#: ../sheets/ciscomisc.sheet.in.h:40
-+#: ../sheets/ciscomisc.sheet.in.h:39
- msgid "Sitting Woman right"
- msgstr "Sede�a ženska, desno"
- 
-+#: ../sheets/ciscomisc.sheet.in.h:40
-+msgid "Mac Woman"
-+msgstr "Ženska, Mac"
-+
- #: ../sheets/ciscomisc.sheet.in.h:41
--msgid "Small Business"
--msgstr "Malo podjetje"
-+msgid "Androgynous Person"
-+msgstr "Androgena oseba"
- 
--#: ../sheets/ciscomisc.sheet.in.h:43
--msgid "Standing Man"
--msgstr "Stoje�i moški"
-+#: ../sheets/ciscomisc.sheet.in.h:43
-+msgid "Key"
-+msgstr "Klju�"
- 
- #: ../sheets/ciscomisc.sheet.in.h:44
--msgid "Standing woman"
--msgstr "Stoje�a ženska"
-+msgid "Lock and Key"
-+msgstr "Klju�avnica s klju�em"
- 
- #: ../sheets/ciscomisc.sheet.in.h:45
--msgid "Telecommuter"
--msgstr "Delavec na daljavo"
-+msgid "Satellite dish"
-+msgstr "Satelitski krožnik"
- 
- #: ../sheets/ciscomisc.sheet.in.h:46
--msgid "Telecommuter house"
--msgstr "Hiša delavca na daljavo"
-+msgid "Satellite"
-+msgstr "Satelit"
- 
- #: ../sheets/ciscomisc.sheet.in.h:47
--msgid "Telecommuter house subdued"
--msgstr "Hiša delavca na daljavo, nepoudarjena"
--
--#: ../sheets/ciscomisc.sheet.in.h:48
--msgid "Truck"
--msgstr "Tovornjak"
-+msgid "Antenna"
-+msgstr "Antena"
- 
- #: ../sheets/ciscomisc.sheet.in.h:49
--msgid "University"
--msgstr "Univerza"
-+msgid "Car"
-+msgstr "Avtomobil"
- 
- #: ../sheets/ciscomisc.sheet.in.h:50
-+msgid "Truck"
-+msgstr "Tovornjak"
-+
-+#: ../sheets/ciscomisc.sheet.in.h:51
- msgid "Video Camera"
- msgstr "Videokamera"
- 
--#: ../sheets/ciscomisc.sheet.in.h:51
-+#: ../sheets/ciscomisc.sheet.in.h:52
- msgid "Video Camera right"
- msgstr "Videokamera, desno"
- 
--#: ../sheets/ciscomisc.sheet.in.h:52
--msgid "Woman"
--msgstr "Ženska"
--
--#: ../sheets/ciscomisc.sheet.in.h:53
--msgid "Woman blue"
--msgstr "Ženska, modra"
--
- #: ../sheets/ciscomisc.sheet.in.h:54
--msgid "Woman gold"
--msgstr "Ženska, zlata"
--
--#: ../sheets/ciscomisc.sheet.in.h:55
--msgid "Woman red"
--msgstr "Ženska, rde�a"
-+msgid "Headphones"
-+msgstr "Slušalke"
- 
- #: ../sheets/cisconetwork.sheet.in.h:1
--msgid "10700"
--msgstr "10700"
-+msgid "Cisco - Network"
-+msgstr "Cisco - Omrežje"
- 
- #: ../sheets/cisconetwork.sheet.in.h:2
--msgid "15200"
--msgstr "15200"
-+msgid "Network shapes by Cisco"
-+msgstr "Omrežne oblike - Cisco"
- 
- #: ../sheets/cisconetwork.sheet.in.h:3
--msgid "15800"
--msgstr "15800"
-+msgid "Network Management"
-+msgstr "Upravljanje omrežij"
- 
- #: ../sheets/cisconetwork.sheet.in.h:4
--msgid "3174 (desktop) cluster controller"
--msgstr "Nadzornik gru� 3174 (namizje)"
-+msgid "Detector"
-+msgstr "Detektor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:5
--msgid "3X74 (floor) cluster controller"
--msgstr "Nadzornik gru� 3X74 (temeljni)"
-+msgid "Protocol Translator"
-+msgstr "Pretvornik protokolov"
- 
- #: ../sheets/cisconetwork.sheet.in.h:6
--msgid "Access Server"
--msgstr "Strežnik dostopa"
-+msgid "IP"
-+msgstr "IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:7
--msgid "AccessPoint"
--msgstr "Dostopna to�ka"
-+msgid "IP Old-style"
-+msgstr "IP (stara oblika)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:8
--msgid "Automatic Protection Switching"
--msgstr "Samodejno varnostno preklapljanje"
-+msgid "NAT"
-+msgstr "NAT"
- 
- #: ../sheets/cisconetwork.sheet.in.h:9
--msgid "BBFW"
--msgstr "BBFW"
-+msgid "VIP"
-+msgstr "VIP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:10
--msgid "BBFW media"
--msgstr "Medij BBFW"
-+msgid "Terminal Server"
-+msgstr "Terminalski strežnik"
- 
- #: ../sheets/cisconetwork.sheet.in.h:11
--msgid "Breakout box"
--msgstr "Vmesniška škatla"
-+msgid "Access Server"
-+msgstr "Strežnik dostopa"
- 
- #: ../sheets/cisconetwork.sheet.in.h:12
--msgid "Bridge"
--msgstr "Most"
-+msgid "System controller"
-+msgstr "Sistemski nadzornik"
- 
- #: ../sheets/cisconetwork.sheet.in.h:13
--msgid "CDDI/FDDI Concentrator"
--msgstr "Koncentrator CDDI/FDDI"
-+msgid "Directory Server"
-+msgstr "Imeniški strežnik"
- 
- #: ../sheets/cisconetwork.sheet.in.h:14
--msgid "CDM Content Distribution Manager"
--msgstr "Upravitelj porazdeljenih vsebin CDM"
-+msgid "Firewall"
-+msgstr "Požarni zid"
- 
- #: ../sheets/cisconetwork.sheet.in.h:15
--msgid "CSU/DSU"
--msgstr "CSU/DSU"
-+msgid "Firewall subdued"
-+msgstr "Požarni zid, nepoudarjen"
- 
- #: ../sheets/cisconetwork.sheet.in.h:16
--msgid "Cable Modem"
--msgstr "Kabelski modem"
-+msgid "Firewall horizontal"
-+msgstr "Požarni zid, vodoravno"
- 
- #: ../sheets/cisconetwork.sheet.in.h:17
--msgid "Catalyst Access Gateway"
--msgstr "Prehod dostopa Catalyst"
-+msgid "Firewall Service Module"
-+msgstr "Storitveni modul požarnega zidu"
- 
- #: ../sheets/cisconetwork.sheet.in.h:18
--msgid "Centri Firewall"
--msgstr "Požarni zid Centri"
-+msgid "IOS Firewall"
-+msgstr "Požarni zid IOS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:19
--msgid "Channelized Pipe"
--msgstr "Kanelirana cev"
-+msgid "PIX Firewall"
-+msgstr "Požarni zid PIX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:20
--msgid "Cisco - Network"
--msgstr "Cisco - Omrežje"
-+msgid "PIX Firewall Left"
-+msgstr "Požarni zid PIX, lev"
- 
- #: ../sheets/cisconetwork.sheet.in.h:21
--msgid "Cloud"
--msgstr "Obla�ek"
--
--#: ../sheets/cisconetwork.sheet.in.h:22
--msgid "Cloud Dark"
--msgstr "Obla�ek, temen"
-+msgid "Centri Firewall"
-+msgstr "Požarni zid Centri"
- 
- #: ../sheets/cisconetwork.sheet.in.h:23
--msgid "Cloud Gold"
--msgstr "Obla�ek, zlat"
-+msgid "Security appliance"
-+msgstr "Varnostna naprava"
- 
- #: ../sheets/cisconetwork.sheet.in.h:24
--msgid "Cloud White"
--msgstr "Obla�ek, bel"
-+msgid "VPN Concentrator"
-+msgstr "Koncentrator VPN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:25
--msgid "Concatenated Payload"
--msgstr "Strnjen pla�ljiv tovor"
-+msgid "VPN Gateway"
-+msgstr "Prehod VPN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:26
--msgid "Content Engine (Cache Director)"
--msgstr "Pogon vsebine (upravitelj medpomnilnika)"
-+msgid "LAN to LAN"
-+msgstr "LAN v LAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:27
--msgid "Content Transformation Engine (CTE)"
--msgstr "CTE - Pogon preoblikovanja vsebine (Content Transformation Engine))"
-+msgid "SSL Terminator"
-+msgstr "Terminator SSL"
- 
- #: ../sheets/cisconetwork.sheet.in.h:28
--msgid "DSLAM"
--msgstr "DSLAM"
-+msgid "IP DSL Switch"
-+msgstr "Preklopnik IP DSL"
- 
- #: ../sheets/cisconetwork.sheet.in.h:29
--msgid "DWDM Filter"
--msgstr "Filter DWDM"
-+msgid "DSLAM"
-+msgstr "DSLAM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:30
--msgid "Detector"
--msgstr "Detektor"
-+msgid "Cable Modem"
-+msgstr "Kabelski modem"
- 
- #: ../sheets/cisconetwork.sheet.in.h:31
--msgid "Digital Cross-Connect"
--msgstr "Digitalna križna povezava"
-+msgid "Wireless Connectivity"
-+msgstr "Brezži�no povezovanje"
- 
- #: ../sheets/cisconetwork.sheet.in.h:32
--msgid "Directory Server"
--msgstr "Imeniški strežnik"
-+msgid "Wireless Transport"
-+msgstr "Brezži�ni prenos"
- 
- #: ../sheets/cisconetwork.sheet.in.h:33
--msgid "Distributed Director"
--msgstr "Porazdeljeni upravitelj"
-+msgid "AccessPoint"
-+msgstr "Dostopna to�ka"
- 
- #: ../sheets/cisconetwork.sheet.in.h:34
--msgid "Dual Mode AccessPoint"
--msgstr "Dvovrstna dostopna to�ka"
-+msgid "Wireless Bridge"
-+msgstr "Brezži�ni most"
- 
- #: ../sheets/cisconetwork.sheet.in.h:35
--msgid "FDDI Ring"
--msgstr "Obro� FDDI"
-+msgid "Dual Mode AccessPoint"
-+msgstr "Dvovrstna dostopna to�ka"
- 
- #: ../sheets/cisconetwork.sheet.in.h:36
--msgid "File Engine"
--msgstr "Datote�ni pogon"
-+msgid "Wi-Fi Tag"
-+msgstr "Oznaka Wi-Fi"
- 
- #: ../sheets/cisconetwork.sheet.in.h:37
--msgid "Firewall"
--msgstr "Požarni zid"
-+msgid "Wireless Location Appliance"
-+msgstr "Brezži�na krajevna naprava"
- 
- #: ../sheets/cisconetwork.sheet.in.h:38
--msgid "Firewall Service Module"
--msgstr "Storitveni modul požarnega zidu"
-+msgid "Location server"
-+msgstr "Krajevni strežnik"
- 
- #: ../sheets/cisconetwork.sheet.in.h:39
--msgid "Firewall horizontal"
--msgstr "Požarni zid, vodoravno"
-+msgid "Lightweight AP"
-+msgstr "Šibka dostopna to�ka"
- 
- #: ../sheets/cisconetwork.sheet.in.h:40
--msgid "Firewall subdued"
--msgstr "Požarni zid, nepoudarjen"
-+msgid "WLAN controller"
-+msgstr "Nadzornik WLAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:41
--msgid "General Appliance"
--msgstr "Splošna naprava"
-+msgid "BBFW"
-+msgstr "BBFW"
- 
- #: ../sheets/cisconetwork.sheet.in.h:42
--msgid "Generic Gateway"
--msgstr "Splošen prehod"
-+msgid "BBFW media"
-+msgstr "Medij BBFW"
-+
-+#: ../sheets/cisconetwork.sheet.in.h:43
-+msgid "Channelized Pipe"
-+msgstr "Kanelirana cev"
- 
- #: ../sheets/cisconetwork.sheet.in.h:44
--msgid "IOS Firewall"
--msgstr "Požarni zid IOS"
-+msgid "Concatenated Payload"
-+msgstr "Strnjen pla�ljiv tovor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:45
--msgid "IOS SLB"
--msgstr "IOS SLB"
-+msgid "Optical Cross-Connect"
-+msgstr "Opti�na navzkrižna povezava"
- 
- #: ../sheets/cisconetwork.sheet.in.h:46
--msgid "IP"
--msgstr "IP"
-+msgid "Optical Transport"
-+msgstr "Opti�ni prenos"
- 
- #: ../sheets/cisconetwork.sheet.in.h:47
--msgid "IP DSL Switch"
--msgstr "Preklopnik IP DSL"
-+msgid "Optical Fiber"
-+msgstr "Opti�na vlakna"
- 
- #: ../sheets/cisconetwork.sheet.in.h:48
--msgid "IP Old-style"
--msgstr "IP (stara oblika)"
-+msgid "Optical Amplifier"
-+msgstr "Opti�ni oja�evalnik"
- 
- #: ../sheets/cisconetwork.sheet.in.h:49
--msgid "IP Transport Concentrator"
--msgstr "Koncentrator prenosa IP"
-+msgid "Digital Cross-Connect"
-+msgstr "Digitalna križna povezava"
- 
- #: ../sheets/cisconetwork.sheet.in.h:50
--msgid "IPTV broadcast server"
--msgstr "Oddajni strežnik IPTV"
-+msgid "IP Transport Concentrator"
-+msgstr "Koncentrator prenosa IP"
- 
- #: ../sheets/cisconetwork.sheet.in.h:51
--msgid "IPTV content manager"
--msgstr "Upravitelj vsebina IPTV"
-+msgid "DWDM Filter"
-+msgstr "Filter DWDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:52
--msgid "LAN to LAN"
--msgstr "LAN v LAN"
-+msgid "WDM"
-+msgstr "WDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:53
--msgid "Lightweight AP"
--msgstr "Šibka dostopna to�ka"
-+msgid "15200"
-+msgstr "15200"
- 
- #: ../sheets/cisconetwork.sheet.in.h:54
--msgid "LocalDirector"
--msgstr "Krajevni upravitelj"
-+msgid "15800"
-+msgstr "15800"
- 
- #: ../sheets/cisconetwork.sheet.in.h:55
--msgid "Location server"
--msgstr "Krajevni strežnik"
-+msgid "ONS15104"
-+msgstr "ONS15104"
- 
- #: ../sheets/cisconetwork.sheet.in.h:56
--msgid "LongReach CPE"
--msgstr "Daljnosežni (LongReach) CPE"
-+msgid "10700"
-+msgstr "10700"
- 
- #: ../sheets/cisconetwork.sheet.in.h:57
--msgid "MAS Gateway"
--msgstr "Prehod MAS"
-+msgid "Metro 1500"
-+msgstr "Metro 1500"
- 
- #: ../sheets/cisconetwork.sheet.in.h:58
--msgid "MAU"
--msgstr "MAU"
-+msgid "ONS15540"
-+msgstr "ONS15540"
- 
- #: ../sheets/cisconetwork.sheet.in.h:59
--msgid "ME 1100"
--msgstr "ME 1100"
-+msgid "Automatic Protection Switching"
-+msgstr "Samodejno varnostno preklapljanje"
- 
- #: ../sheets/cisconetwork.sheet.in.h:60
--msgid "MUX"
--msgstr "MUX"
-+msgid "RPS"
-+msgstr "RPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:61
--msgid "Metro 1500"
--msgstr "Metro 1500"
-+msgid "UPS"
-+msgstr "UPS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:62
--msgid "NAT"
--msgstr "NAT"
-+msgid "LongReach CPE"
-+msgstr "Daljnosežni (LongReach) CPE"
- 
- #: ../sheets/cisconetwork.sheet.in.h:63
--msgid "Network Management"
--msgstr "Upravljanje omrežij"
-+msgid "3X74 (floor) cluster controller"
-+msgstr "Nadzornik gru� 3X74 (temeljni)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:64
--msgid "Network shapes by Cisco"
--msgstr "Omrežne oblike - Cisco"
-+msgid "3174 (desktop) cluster controller"
-+msgstr "Nadzornik gru� 3174 (namizje)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:65
--msgid "ONS15104"
--msgstr "ONS15104"
-+msgid "CSU/DSU"
-+msgstr "CSU/DSU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:66
--msgid "ONS15540"
--msgstr "ONS15540"
-+msgid "WAN"
-+msgstr "WAN"
- 
- #: ../sheets/cisconetwork.sheet.in.h:67
--msgid "Optical Amplifier"
--msgstr "Opti�ni oja�evalnik"
-+msgid "Cloud"
-+msgstr "Obla�ek"
- 
- #: ../sheets/cisconetwork.sheet.in.h:68
--msgid "Optical Cross-Connect"
--msgstr "Opti�na navzkrižna povezava"
-+msgid "Cloud Gold"
-+msgstr "Obla�ek, zlat"
- 
- #: ../sheets/cisconetwork.sheet.in.h:69
--msgid "Optical Fiber"
--msgstr "Opti�na vlakna"
-+msgid "Cloud White"
-+msgstr "Obla�ek, bel"
- 
- #: ../sheets/cisconetwork.sheet.in.h:70
--msgid "Optical Transport"
--msgstr "Opti�ni prenos"
-+msgid "Cloud Dark"
-+msgstr "Obla�ek, temen"
- 
- #: ../sheets/cisconetwork.sheet.in.h:71
--msgid "PAD"
--msgstr "PAD"
-+msgid "Distributed Director"
-+msgstr "Porazdeljeni upravitelj"
- 
- #: ../sheets/cisconetwork.sheet.in.h:72
--msgid "PIX Firewall"
--msgstr "Požarni zid PIX"
-+msgid "LocalDirector"
-+msgstr "Krajevni upravitelj"
- 
- #: ../sheets/cisconetwork.sheet.in.h:73
--msgid "PIX Firewall Left"
--msgstr "Požarni zid PIX, lev"
-+msgid "IOS SLB"
-+msgstr "IOS SLB"
- 
- #: ../sheets/cisconetwork.sheet.in.h:74
--msgid "Protocol Translator"
--msgstr "Pretvornik protokolov"
-+msgid "MUX"
-+msgstr "MUX"
- 
- #: ../sheets/cisconetwork.sheet.in.h:75
--msgid "RPS"
--msgstr "RPS"
-+msgid "General Appliance"
-+msgstr "Splošna naprava"
- 
- #: ../sheets/cisconetwork.sheet.in.h:76
--msgid "Repeater"
--msgstr "Repetitor"
-+msgid "PAD"
-+msgstr "PAD"
- 
- #: ../sheets/cisconetwork.sheet.in.h:77
--msgid "SSL Terminator"
--msgstr "Terminator SSL"
-+msgid "CDDI/FDDI Concentrator"
-+msgstr "Koncentrator CDDI/FDDI"
- 
- #: ../sheets/cisconetwork.sheet.in.h:78
--msgid "STB (set top box)"
--msgstr "Modem STB (Set Top Box)"
-+msgid "FDDI Ring"
-+msgstr "Obro� FDDI"
- 
- #: ../sheets/cisconetwork.sheet.in.h:79
--msgid "Security appliance"
--msgstr "Varnostna naprava"
-+msgid "TokenRing"
-+msgstr "TokenRing"
- 
- #: ../sheets/cisconetwork.sheet.in.h:80
--msgid "Service Control"
--msgstr "Nadzor storitev"
-+msgid "MAU"
-+msgstr "MAU"
- 
- #: ../sheets/cisconetwork.sheet.in.h:81
--msgid "Storage Solution Engine"
--msgstr "Pogon shrambe podatkov"
-+msgid "Repeater"
-+msgstr "Repetitor"
- 
- #: ../sheets/cisconetwork.sheet.in.h:82
--msgid "System controller"
--msgstr "Sistemski nadzornik"
-+msgid "Bridge"
-+msgstr "Most"
- 
- #: ../sheets/cisconetwork.sheet.in.h:83
--msgid "TV"
--msgstr "TV"
-+msgid "Breakout box"
-+msgstr "Vmesniška škatla"
- 
- #: ../sheets/cisconetwork.sheet.in.h:84
--msgid "Terminal Server"
--msgstr "Terminalski strežnik"
-+msgid "STB (set top box)"
-+msgstr "Modem STB (Set Top Box)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:85
--msgid "TokenRing"
--msgstr "TokenRing"
-+msgid "TV"
-+msgstr "TV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:86
--msgid "TransPath"
--msgstr "TransPath"
-+msgid "IPTV broadcast server"
-+msgstr "Oddajni strežnik IPTV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:87
--msgid "UPS"
--msgstr "UPS"
-+msgid "IPTV content manager"
-+msgstr "Upravitelj vsebina IPTV"
- 
- #: ../sheets/cisconetwork.sheet.in.h:88
--msgid "VIP"
--msgstr "VIP"
--
--#: ../sheets/cisconetwork.sheet.in.h:89
- msgid "VN2900"
- msgstr "VN2900"
- 
-+#: ../sheets/cisconetwork.sheet.in.h:89
-+msgid "VN5902"
-+msgstr "VN5902"
-+
- #: ../sheets/cisconetwork.sheet.in.h:90
- msgid "VN5900"
- msgstr "VN5900"
- 
- #: ../sheets/cisconetwork.sheet.in.h:91
--msgid "VN5902"
--msgstr "VN5902"
-+msgid "Catalyst Access Gateway"
-+msgstr "Prehod dostopa Catalyst"
- 
- #: ../sheets/cisconetwork.sheet.in.h:92
--msgid "VPN Concentrator"
--msgstr "Koncentrator VPN"
-+msgid "Generic Gateway"
-+msgstr "Splošen prehod"
- 
- #: ../sheets/cisconetwork.sheet.in.h:93
--msgid "VPN Gateway"
--msgstr "Prehod VPN"
-+msgid "TransPath"
-+msgstr "TransPath"
- 
- #: ../sheets/cisconetwork.sheet.in.h:94
--msgid "WAN"
--msgstr "WAN"
-+msgid "uBR910 Cable DSU"
-+msgstr "Kabelski DSU uBR910"
- 
- #: ../sheets/cisconetwork.sheet.in.h:95
--msgid "WDM"
--msgstr "WDM"
-+msgid "Storage Solution Engine"
-+msgstr "Pogon shrambe podatkov"
- 
- #: ../sheets/cisconetwork.sheet.in.h:96
--msgid "WLAN controller"
--msgstr "Nadzornik WLAN"
-+msgid "Content Engine (Cache Director)"
-+msgstr "Pogon vsebine (upravitelj medpomnilnika)"
- 
- #: ../sheets/cisconetwork.sheet.in.h:97
--msgid "Wi-Fi Tag"
--msgstr "Oznaka Wi-Fi"
-+msgid "CDM Content Distribution Manager"
-+msgstr "Upravitelj porazdeljenih vsebin CDM"
- 
- #: ../sheets/cisconetwork.sheet.in.h:98
--msgid "Wireless Bridge"
--msgstr "Brezži�ni most"
-+msgid "Content Transformation Engine (CTE)"
-+msgstr "CTE - Pogon preoblikovanja vsebine (Content Transformation Engine))"
- 
- #: ../sheets/cisconetwork.sheet.in.h:99
--msgid "Wireless Connectivity"
--msgstr "Brezži�no povezovanje"
-+msgid "ME 1100"
-+msgstr "ME 1100"
- 
- #: ../sheets/cisconetwork.sheet.in.h:100
--msgid "Wireless Location Appliance"
--msgstr "Brezži�na krajevna naprava"
-+msgid "MAS Gateway"
-+msgstr "Prehod MAS"
- 
- #: ../sheets/cisconetwork.sheet.in.h:101
--msgid "Wireless Transport"
--msgstr "Brezži�ni prenos"
-+msgid "File Engine"
-+msgstr "Datote�ni pogon"
- 
- #: ../sheets/cisconetwork.sheet.in.h:102
--msgid "uBR910 Cable DSU"
--msgstr "Kabelski DSU uBR910"
-+msgid "Service Control"
-+msgstr "Nadzor storitev"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:1
--msgid "6701"
--msgstr "6701"
-+msgid "Cisco - Telephony"
-+msgstr "Cisco - Telefonija"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:2
--msgid "6705"
--msgstr "6705"
-+msgid "Telephony shapes by Cisco"
-+msgstr "Telefonske oblike - Cisco"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:3
--msgid "6732"
--msgstr "6732"
-+msgid "Phone"
-+msgstr "Telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:4
--msgid "ADM"
--msgstr "ADM"
-+msgid "Phone 2"
-+msgstr "Telefon 2"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:5
--msgid "ATA"
--msgstr "ATA"
-+msgid "Phone Ethernet"
-+msgstr "Telefon Ethernet"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:6
--msgid "BTS 10200"
--msgstr "BTS 10200"
-+msgid "Phone Appliance"
-+msgstr "Telefonska naprava"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:7
--msgid "CallManager"
--msgstr "Upravitelj klicev (CallManager)"
-+msgid "Phone Feature"
-+msgstr "Lastnost telefona"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:8
--msgid "Cellular Phone"
--msgstr "Mobilni telefon"
-+msgid "Phone/Fax"
-+msgstr "Telefon/faks"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:9
--msgid "Cisco - Telephony"
--msgstr "Cisco - Telefonija"
-+msgid "HootPhone"
-+msgstr "Sirenski telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:10
--msgid "Class 4/5 switch"
--msgstr "Preklopnik razreda 4/5"
-+msgid "IP Phone"
-+msgstr "Telefon IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:11
--msgid "End Office"
--msgstr "Pisarna na koncu"
-+msgid "IP Softphone"
-+msgstr "Programski telefon IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:12
--msgid "Fax"
--msgstr "Faks"
-+msgid "Softphone"
-+msgstr "Programski telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:13
--msgid "Gatekeeper"
--msgstr "Vratar"
-+msgid "Cellular Phone"
-+msgstr "Mobilni telefon"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:14
--msgid "Generic softswitch"
--msgstr "Splošen programski preklopnik"
-+msgid "Mobile Access IP Phone"
-+msgstr "Mobilni telefon IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:15
--msgid "H.323"
--msgstr "H.323"
-+msgid "Pager"
-+msgstr "Osebni klicnik"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:16
--msgid "HootPhone"
--msgstr "Sirenski telefon"
-+msgid "Fax"
-+msgstr "Faks"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:17
--msgid "IAD router"
--msgstr "Usmerjevalnik IAD"
-+msgid "Turret"
-+msgstr "Toreta"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:18
--msgid "ICM"
--msgstr "ICM"
-+msgid "Octel"
-+msgstr "Octel"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:19
--msgid "ICS"
--msgstr "ICS"
-+msgid "Radio Tower"
-+msgstr "Radijski oddajnik"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:20
--msgid "IP Phone"
--msgstr "Telefon IP"
-+msgid "PBX"
-+msgstr "PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:21
--msgid "IP Softphone"
--msgstr "Programski telefon IP"
-+msgid "PBX Switch"
-+msgstr "Preklopnik PBX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:22
--msgid "IP Telephony Router"
--msgstr "Usmerjevalnik za telefone IP"
-+msgid "Class 4/5 switch"
-+msgstr "Preklopnik razreda 4/5"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:23
--msgid "ITP"
--msgstr "ITP"
-+msgid "SONET MUX"
-+msgstr "SONET MUX"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:24
--msgid "IntelliSwitch Stack"
--msgstr "Skladovnica IntelliSwitch"
-+msgid "ADM"
-+msgstr "ADM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:25
--msgid "MCU"
--msgstr "MCU"
-+msgid "ITP"
-+msgstr "ITP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:26
--msgid "MGX 8000 Series Voice Gateway"
--msgstr "Glasovni prehod MGX serije 8000"
-+msgid "ATA"
-+msgstr "ATA"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:27
--msgid "MoH server (Music on Hold)"
--msgstr "Strežnik MoH (glasba ob �akanju)"
-+msgid "SIP Proxy Server"
-+msgstr "Namestniški strežnik za telefonijo IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:28
--msgid "Mobile Access IP Phone"
--msgstr "Mobilni telefon IP"
-+msgid "Gatekeeper"
-+msgstr "Vratar"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:29
--msgid "Mobile Access Router"
--msgstr "Usmerjevalnik za mobilni dostop"
-+msgid "MGX 8000 Series Voice Gateway"
-+msgstr "Glasovni prehod MGX serije 8000"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:30
--msgid "Octel"
--msgstr "Octel"
-+msgid "End Office"
-+msgstr "Pisarna na koncu"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:31
--msgid "PBX"
--msgstr "PBX"
-+msgid "Voice-Enabled Access Server"
-+msgstr "Dostopni strežnik z glasovno podporo"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:32
--msgid "PBX Switch"
--msgstr "Preklopnik PBX"
-+msgid "Voice-Enabled Router"
-+msgstr "Usmerjevalnik z glasovno podporo"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:33
--msgid "Pager"
--msgstr "Osebni klicnik"
-+msgid "Voice-Enabled ATM Switch"
-+msgstr "Preklopnik ATM z glasovno podporo"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:34
--msgid "Phone"
--msgstr "Telefon"
-+msgid "CallManager"
-+msgstr "Upravitelj klicev (CallManager)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:35
--msgid "Phone 2"
--msgstr "Telefon 2"
-+msgid "IP Telephony Router"
-+msgstr "Usmerjevalnik za telefone IP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:36
--msgid "Phone Appliance"
--msgstr "Telefonska naprava"
-+msgid "Mobile Access Router"
-+msgstr "Usmerjevalnik za mobilni dostop"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:37
--msgid "Phone Ethernet"
--msgstr "Telefon Ethernet"
-+msgid "H.323"
-+msgstr "H.323"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:38
--msgid "Phone Feature"
--msgstr "Lastnost telefona"
-+msgid "STP"
-+msgstr "STP"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:39
--msgid "Phone/Fax"
--msgstr "Telefon/faks"
-+msgid "BTS 10200"
-+msgstr "BTS 10200"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:40
--msgid "Radio Tower"
--msgstr "Radijski oddajnik"
-+msgid "Generic softswitch"
-+msgstr "Splošen programski preklopnik"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:41
--msgid "SC2200 (Signalling Controller)"
--msgstr "SC2200 (signalni nadzornik)"
--
--#: ../sheets/ciscotelephony.sheet.in.h:42
- msgid "SC2200/VSC3000 host"
- msgstr "Gostitelj SC2200/VSC3000"
- 
-+#: ../sheets/ciscotelephony.sheet.in.h:42
-+msgid "Virtual switch controller (VSC 3000)"
-+msgstr "Navidezni preklopni nadzornik (VSC 3000)"
-+
- #: ../sheets/ciscotelephony.sheet.in.h:43
--msgid "SIP Proxy Server"
--msgstr "Namestniški strežnik za telefonijo IP"
-+msgid "SC2200 (Signalling Controller)"
-+msgstr "SC2200 (signalni nadzornik)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:44
--msgid "SONET MUX"
--msgstr "SONET MUX"
-+msgid "MoH server (Music on Hold)"
-+msgstr "Strežnik MoH (glasba ob �akanju)"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:45
--msgid "STP"
--msgstr "STP"
-+msgid "TDM router"
-+msgstr "Usmerjevalnik TDM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:46
--msgid "Softphone"
--msgstr "Programski telefon"
-+msgid "6701"
-+msgstr "6701"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:47
--msgid "TDM router"
--msgstr "Usmerjevalnik TDM"
-+msgid "6705"
-+msgstr "6705"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:48
--msgid "Telephony shapes by Cisco"
--msgstr "Telefonske oblike - Cisco"
-+msgid "6732"
-+msgstr "6732"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:49
--msgid "Turret"
--msgstr "Toreta"
-+msgid "IAD router"
-+msgstr "Usmerjevalnik IAD"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:50
--msgid "Unity Express"
--msgstr "Unity Express"
-+msgid "ICS"
-+msgstr "ICS"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:51
--msgid "Unity server"
--msgstr "Strežnik Unity"
-+msgid "ICM"
-+msgstr "ICM"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:52
--msgid "Virtual switch controller (VSC 3000)"
--msgstr "Navidezni preklopni nadzornik (VSC 3000)"
-+msgid "IntelliSwitch Stack"
-+msgstr "Skladovnica IntelliSwitch"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:53
--msgid "Voice-Enabled ATM Switch"
--msgstr "Preklopnik ATM z glasovno podporo"
-+msgid "Unity server"
-+msgstr "Strežnik Unity"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:54
--msgid "Voice-Enabled Access Server"
--msgstr "Dostopni strežnik z glasovno podporo"
-+msgid "Unity Express"
-+msgstr "Unity Express"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:55
--msgid "Voice-Enabled Router"
--msgstr "Usmerjevalnik z glasovno podporo"
-+msgid "MCU"
-+msgstr "MCU"
- 
- #: ../sheets/ciscotelephony.sheet.in.h:56
- msgid "uMG series"
- msgstr "Serija uMG"
- 
- #: ../sheets/civil.sheet.in.h:1
--msgid "Aerator with bubbles"
--msgstr "Zra�ilnik z mehur�ki"
-+msgid "Civil"
-+msgstr "Strojniško"
- 
- #: ../sheets/civil.sheet.in.h:2
--msgid "Backflow preventer"
--msgstr "Prepre�evalec povratnega toka"
-+msgid "Civil Engineering Components"
-+msgstr "Strojniške komponente"
- 
- #: ../sheets/civil.sheet.in.h:3
--msgid "Basin"
--msgstr "Struga"
-+msgid "Vertical rest"
-+msgstr "Navpi�ni mirovalnik"
- 
- #: ../sheets/civil.sheet.in.h:4
--msgid "Bivalent vertical rest"
--msgstr "Bivalentno navpi�no mirovanje"
-+msgid "Horizontal rest"
-+msgstr "Vodoravni mirovalnik"
- 
- #: ../sheets/civil.sheet.in.h:5
--msgid "Civil"
--msgstr "Strojniško"
-+msgid "Bivalent vertical rest"
-+msgstr "Bivalentno navpi�no mirovanje"
- 
- #: ../sheets/civil.sheet.in.h:6
--msgid "Civil Engineering Components"
--msgstr "Strojniške komponente"
-+msgid "Reference line"
-+msgstr "Referen�na �rta"
- 
- #: ../sheets/civil.sheet.in.h:7
--msgid "Container"
--msgstr "Vsebovalnik"
-+msgid "Water level"
-+msgstr "Raven vode"
- 
- #: ../sheets/civil.sheet.in.h:8
--msgid "Final-settling basin"
--msgstr "Kon�no umirjena struga"
-+msgid "Soil"
-+msgstr "Prst"
- 
- #: ../sheets/civil.sheet.in.h:9
--msgid "Frequency converter"
--msgstr "Pretvornik frekvence"
-+msgid "Horizontally aligned arrow"
-+msgstr "Vodoravno poravnana puš�ica"
- 
- #: ../sheets/civil.sheet.in.h:10
--msgid "Gas bottle"
--msgstr "Plinska jeklenka"
-+msgid "Vertically aligned arrow"
-+msgstr "Navpi�no obrnjena puš�ica"
- 
- #: ../sheets/civil.sheet.in.h:11
- msgid "Horizontal limiting line"
- msgstr "Vodoravna omejitvena �rta"
- 
- #: ../sheets/civil.sheet.in.h:12
--msgid "Horizontal rest"
--msgstr "Vodoravni mirovalnik"
-+msgid "Vertical limiting line"
-+msgstr "Navpi�na omejitvena �rta"
- 
- #: ../sheets/civil.sheet.in.h:13
--msgid "Horizontally aligned arrow"
--msgstr "Vodoravno poravnana puš�ica"
-+msgid "Horizontally aligned pump"
-+msgstr "Vodoravno obrnjena �rpalka"
- 
- #: ../sheets/civil.sheet.in.h:14
--msgid "Horizontally aligned compressor"
--msgstr "Vodoravno obrnjen kompresor"
-+msgid "Vertically aligned pump"
-+msgstr "Navpi�no obrnjena �rpalka"
- 
- #: ../sheets/civil.sheet.in.h:15
--msgid "Horizontally aligned pump"
--msgstr "Vodoravno obrnjena �rpalka"
-+msgid "Horizontally aligned compressor"
-+msgstr "Vodoravno obrnjen kompresor"
- 
- #: ../sheets/civil.sheet.in.h:16
--msgid "Horizontally aligned valve"
--msgstr "Vodoravno poravnan ventil"
-+msgid "Vertically aligned compressor"
-+msgstr "Navpi�no obrnjen kompresor"
- 
- #: ../sheets/civil.sheet.in.h:17
--msgid "Motor"
--msgstr "Motor"
-+msgid "Vertically aligned valve"
-+msgstr "Navpi�no obrnjen ventil"
- 
- #: ../sheets/civil.sheet.in.h:18
--msgid "Preliminary clarification tank"
--msgstr "Predo�iš�evalni rezervoar"
-+msgid "Horizontally aligned valve"
-+msgstr "Vodoravno poravnan ventil"
- 
- #: ../sheets/civil.sheet.in.h:19
--msgid "Reference line"
--msgstr "Referen�na �rta"
-+msgid "Backflow preventer"
-+msgstr "Prepre�evalec povratnega toka"
- 
- #: ../sheets/civil.sheet.in.h:20
--msgid "Rotor"
--msgstr "Rotor"
-+msgid "Motor"
-+msgstr "Motor"
- 
- #: ../sheets/civil.sheet.in.h:21
--msgid "Soil"
--msgstr "Prst"
-+msgid "Gas bottle"
-+msgstr "Plinska jeklenka"
- 
- #: ../sheets/civil.sheet.in.h:22
--msgid "Vertical limiting line"
--msgstr "Navpi�na omejitvena �rta"
-+msgid "Frequency converter"
-+msgstr "Pretvornik frekvence"
- 
- #: ../sheets/civil.sheet.in.h:23
--msgid "Vertical rest"
--msgstr "Navpi�ni mirovalnik"
-+msgid "Vertically aligned propeller"
-+msgstr "Navpi�no obrnjen propeler"
- 
- #: ../sheets/civil.sheet.in.h:24
--msgid "Vertically aligned arrow"
--msgstr "Navpi�no obrnjena puš�ica"
-+msgid "Aerator with bubbles"
-+msgstr "Zra�ilnik z mehur�ki"
- 
- #: ../sheets/civil.sheet.in.h:25
--msgid "Vertically aligned compressor"
--msgstr "Navpi�no obrnjen kompresor"
-+msgid "Rotor"
-+msgstr "Rotor"
- 
--#: ../sheets/civil.sheet.in.h:26
--msgid "Vertically aligned propeller"
--msgstr "Navpi�no obrnjen propeler"
-+#: ../sheets/civil.sheet.in.h:26
-+msgid "Final-settling basin"
-+msgstr "Kon�no umirjena struga"
- 
- #: ../sheets/civil.sheet.in.h:27
--msgid "Vertically aligned pump"
--msgstr "Navpi�no obrnjena �rpalka"
-+msgid "Preliminary clarification tank"
-+msgstr "Predo�iš�evalni rezervoar"
- 
- #: ../sheets/civil.sheet.in.h:28
--msgid "Vertically aligned valve"
--msgstr "Navpi�no obrnjen ventil"
-+msgid "Basin"
-+msgstr "Struga"
- 
- #: ../sheets/civil.sheet.in.h:29
--msgid "Water level"
--msgstr "Raven vode"
-+msgid "Container"
-+msgstr "Vsebovalnik"
- 
- #: ../sheets/jigsaw.sheet.in.h:1
- msgid "Jigsaw"
- msgstr "Sestavljanka"
- 
- #: ../sheets/jigsaw.sheet.in.h:2
--msgid "Jigsaw - part_iiii"
--msgstr "Sestavljanka - del_iiii"
-+msgid "Pieces of a jigsaw"
-+msgstr "Koš�ki sestavljanke"
- 
- #: ../sheets/jigsaw.sheet.in.h:3
--msgid "Jigsaw - part_iiio"
--msgstr "Sestavljanka - del_iiio"
-+msgid "Jigsaw - part_oioi"
-+msgstr "Sestavljanka - del_oioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:4
--msgid "Jigsaw - part_iioi"
--msgstr "Sestavljanka - del_iioi"
-+msgid "Jigsaw - part_ioio"
-+msgstr "Sestavljanka - del_ioio"
- 
- #: ../sheets/jigsaw.sheet.in.h:5
--msgid "Jigsaw - part_iioo"
--msgstr "Sestavljanka - del_iioo"
-+msgid "Jigsaw - part_iiii"
-+msgstr "Sestavljanka - del_iiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:6
--msgid "Jigsaw - part_ioii"
--msgstr "Sestavljanka - del_ioii"
-+msgid "Jigsaw - part_oooo"
-+msgstr "Sestavljanka - del_oooo"
- 
- #: ../sheets/jigsaw.sheet.in.h:7
--msgid "Jigsaw - part_ioio"
--msgstr "Sestavljanka - del_ioio"
-+msgid "Jigsaw - part_oooi"
-+msgstr "Sestavljanka - del_oooi"
- 
- #: ../sheets/jigsaw.sheet.in.h:8
--msgid "Jigsaw - part_iooi"
--msgstr "Sestavljanka - del_iooi"
--
--#: ../sheets/jigsaw.sheet.in.h:9
- msgid "Jigsaw - part_iooo"
- msgstr "Sestavljanka - del_iooo"
- 
-+#: ../sheets/jigsaw.sheet.in.h:9
-+msgid "Jigsaw - part_oioo"
-+msgstr "Sestavljanka - del_oioo"
-+
- #: ../sheets/jigsaw.sheet.in.h:10
--msgid "Jigsaw - part_oiii"
--msgstr "Sestavljanka - del_oiii"
-+msgid "Jigsaw - part_ooio"
-+msgstr "Sestavljanka - del_ooio"
- 
- #: ../sheets/jigsaw.sheet.in.h:11
--msgid "Jigsaw - part_oiio"
--msgstr "Sestavljanka - del_oiio"
-+msgid "Jigsaw - part_iioo"
-+msgstr "Sestavljanka - del_iioo"
- 
- #: ../sheets/jigsaw.sheet.in.h:12
--msgid "Jigsaw - part_oioi"
--msgstr "Sestavljanka - del_oioi"
-+msgid "Jigsaw - part_oiio"
-+msgstr "Sestavljanka - del_oiio"
- 
- #: ../sheets/jigsaw.sheet.in.h:13
--msgid "Jigsaw - part_oioo"
--msgstr "Sestavljanka - del_oioo"
--
--#: ../sheets/jigsaw.sheet.in.h:14
- msgid "Jigsaw - part_ooii"
- msgstr "Sestavljanka - del_ooii"
- 
-+#: ../sheets/jigsaw.sheet.in.h:14
-+msgid "Jigsaw - part_iooi"
-+msgstr "Sestavljanka - del_iooi"
-+
- #: ../sheets/jigsaw.sheet.in.h:15
--msgid "Jigsaw - part_ooio"
--msgstr "Sestavljanka - del_ooio"
-+msgid "Jigsaw - part_oiii"
-+msgstr "Sestavljanka - del_oiii"
- 
- #: ../sheets/jigsaw.sheet.in.h:16
--msgid "Jigsaw - part_oooi"
--msgstr "Sestavljanka - del_oooi"
-+msgid "Jigsaw - part_ioii"
-+msgstr "Sestavljanka - del_ioii"
- 
- #: ../sheets/jigsaw.sheet.in.h:17
--msgid "Jigsaw - part_oooo"
--msgstr "Sestavljanka - del_oooo"
-+msgid "Jigsaw - part_iioi"
-+msgstr "Sestavljanka - del_iioi"
- 
- #: ../sheets/jigsaw.sheet.in.h:18
--msgid "Pieces of a jigsaw"
--msgstr "Koš�ki sestavljanke"
--
--#: ../sheets/network.sheet.in.h:1
--msgid "24 Port Patch Panel"
--msgstr "24-vratna priklju�na omarica"
-+msgid "Jigsaw - part_iiio"
-+msgstr "Sestavljanka - del_iiio"
- 
- #: ../sheets/network.sheet.in.h:2
--msgid "3 1/2 inch diskette"
--msgstr "3,5-pal�na disketa"
-+msgid "Objects to design network diagrams with"
-+msgstr "Predmeti za omrežne diagrame"
- 
- #: ../sheets/network.sheet.in.h:3
--msgid "ATM switch symbol"
--msgstr "Simbol preklopnika ATM"
--
--#: ../sheets/network.sheet.in.h:4
--msgid "Antenna for wireless transmission"
--msgstr "Antena za brezži�ni prenos"
-+msgid "Computer"
-+msgstr "Ra�unalnik"
- 
- #: ../sheets/network.sheet.in.h:5
--msgid "Bigtower PC"
--msgstr "Osebni ra�unalnik, stolp"
-+msgid "Storage"
-+msgstr "Shramba"
- 
- #: ../sheets/network.sheet.in.h:6
--msgid "Computer"
--msgstr "Ra�unalnik"
-+msgid "Ethernet bus"
-+msgstr "Vodilo Ethernet"
- 
- #: ../sheets/network.sheet.in.h:7
--msgid "Desktop PC"
--msgstr "Namizni ra�unalnik"
-+msgid "Simple printer"
-+msgstr "Enostavni tiskalnik"
- 
- #: ../sheets/network.sheet.in.h:8
--msgid "Digitizing board"
--msgstr "Vezje za digitalizacijo"
-+msgid "WAN connection"
-+msgstr "Povezava WAN"
- 
- #: ../sheets/network.sheet.in.h:9
--msgid "Ethernet bus"
--msgstr "Vodilo Ethernet"
-+msgid "WAN link"
-+msgstr "Link WAN"
- 
- #: ../sheets/network.sheet.in.h:10
--msgid "External DAT drive"
--msgstr "Zunanji pogon DAT"
-+msgid "Stackable hub or switch"
-+msgstr "Razširljivo zvezdiš�e ali preklopnik"
- 
- #: ../sheets/network.sheet.in.h:11
--msgid "Firewall router"
--msgstr "Usmerjevalnik s požarnim zidom"
-+msgid "Modular switching system"
-+msgstr "Modularni preklopni sistem"
- 
- #: ../sheets/network.sheet.in.h:12
--msgid "Laptop PC"
--msgstr "Presnosni ra�unalnik"
-+msgid "24 Port Patch Panel"
-+msgstr "24-vratna priklju�na omarica"
- 
- #: ../sheets/network.sheet.in.h:13
--msgid "Miditower PC"
--msgstr "Osebni ra�unalnik, srednji stolp"
-+msgid "RJ45 wall-plug"
-+msgstr "Zidna vti�nica RJ45"
- 
- #: ../sheets/network.sheet.in.h:14
--msgid "Minitower PC"
--msgstr "Osebni ra�unalnik, mali stolp"
-+msgid "Wall-plug for the scEAD cabling system"
-+msgstr "Zidna vti�nica za kabelski sistem scEAD"
- 
- #: ../sheets/network.sheet.in.h:15
--msgid "Mobile phone"
--msgstr "Mobilni telefon"
-+msgid "Simple modem"
-+msgstr "Enostavni modem"
- 
- #: ../sheets/network.sheet.in.h:16
-+msgid "Antenna for wireless transmission"
-+msgstr "Antena za brezži�ni prenos"
-+
-+#: ../sheets/network.sheet.in.h:17
- msgid "Mobile telephony base station"
- msgstr "Bazna postaja za mobilno telefonijo"
- 
--#: ../sheets/network.sheet.in.h:17
-+#: ../sheets/network.sheet.in.h:19
- msgid "Mobile telephony cell"
- msgstr "Baterija za mobilni telefon"
- 
--#: ../sheets/network.sheet.in.h:18
--msgid "Modular switching system"
--msgstr "Modularni preklopni sistem"
-+#: ../sheets/network.sheet.in.h:20
-+msgid "Router symbol"
-+msgstr "Simbol usmerjevalnika"
-+
-+#: ../sheets/network.sheet.in.h:21
-+msgid "Switch symbol"
-+msgstr "Simbol preklopnika"
- 
- #: ../sheets/network.sheet.in.h:22
--msgid "Objects to design network diagrams with"
--msgstr "Predmeti za omrežne diagrame"
-+msgid "ATM switch symbol"
-+msgstr "Simbol preklopnika ATM"
- 
- #: ../sheets/network.sheet.in.h:23
--msgid "Plotter"
--msgstr "Risalnik"
-+msgid "Firewall router"
-+msgstr "Usmerjevalnik s požarnim zidom"
- 
- #: ../sheets/network.sheet.in.h:24
--msgid "RJ45 wall-plug"
--msgstr "Zidna vti�nica RJ45"
-+msgid "Workstation monitor"
-+msgstr "Zaslon delovne postaje"
- 
- #: ../sheets/network.sheet.in.h:25
--msgid "Router symbol"
--msgstr "Simbol usmerjevalnika"
-+msgid "UNIX workstation"
-+msgstr "Delovna postaja UNIX"
- 
- #: ../sheets/network.sheet.in.h:26
--msgid "Simple modem"
--msgstr "Enostavni modem"
-+msgid "Desktop PC"
-+msgstr "Namizni ra�unalnik"
- 
- #: ../sheets/network.sheet.in.h:27
--msgid "Simple printer"
--msgstr "Enostavni tiskalnik"
-+msgid "Laptop PC"
-+msgstr "Presnosni ra�unalnik"
- 
- #: ../sheets/network.sheet.in.h:28
--msgid "Speaker with integrated amplifier"
--msgstr "Zvo�nik z vgrajenim oja�evalnikom"
-+msgid "Bigtower PC"
-+msgstr "Osebni ra�unalnik, stolp"
- 
- #: ../sheets/network.sheet.in.h:29
--msgid "Speaker without amplifier"
--msgstr "Zvo�nik brez oja�evalnika"
-+msgid "Miditower PC"
-+msgstr "Osebni ra�unalnik, srednji stolp"
- 
- #: ../sheets/network.sheet.in.h:30
--msgid "Stackable hub or switch"
--msgstr "Razširljivo zvezdiš�e ali preklopnik"
-+msgid "Minitower PC"
-+msgstr "Osebni ra�unalnik, mali stolp"
- 
- #: ../sheets/network.sheet.in.h:31
--msgid "Storage"
--msgstr "Shramba"
-+msgid "Speaker with integrated amplifier"
-+msgstr "Zvo�nik z vgrajenim oja�evalnikom"
- 
- #: ../sheets/network.sheet.in.h:32
--msgid "Switch symbol"
--msgstr "Simbol preklopnika"
-+msgid "Speaker without amplifier"
-+msgstr "Zvo�nik brez oja�evalnika"
-+
-+#: ../sheets/network.sheet.in.h:33
-+msgid "3 1/2 inch diskette"
-+msgstr "3,5-pal�na disketa"
- 
- #: ../sheets/network.sheet.in.h:34
--msgid "UNIX workstation"
--msgstr "Delovna postaja UNIX"
-+msgid "ZIP disk"
-+msgstr "Disketa ZIP"
- 
- #: ../sheets/network.sheet.in.h:35
--msgid "WAN connection"
--msgstr "Povezava WAN"
-+msgid "External DAT drive"
-+msgstr "Zunanji pogon DAT"
- 
- #: ../sheets/network.sheet.in.h:36
--msgid "WAN link"
--msgstr "Link WAN"
--
--#: ../sheets/network.sheet.in.h:37
--msgid "Wall-plug for the scEAD cabling system"
--msgstr "Zidna vti�nica za kabelski sistem scEAD"
-+msgid "Mobile phone"
-+msgstr "Mobilni telefon"
- 
- #: ../sheets/network.sheet.in.h:38
--msgid "Workstation monitor"
--msgstr "Zaslon delovne postaje"
-+msgid "Plotter"
-+msgstr "Risalnik"
- 
- #: ../sheets/network.sheet.in.h:39
--msgid "ZIP disk"
--msgstr "Disketa ZIP"
-+msgid "Digitizing board"
-+msgstr "Vezje za digitalizacijo"
- 
- #: ../sheets/sybase.sheet.in.h:1
--msgid "Log transfer manager or rep agent"
--msgstr "Upravljalnik prenosov dnevnikov ali replikacijski agent"
-+msgid "Sybase"
-+msgstr "Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:2
- msgid "Objects to design Sybase replication domain diagrams with"
- msgstr "Predmeti za oblikovanje diagramov replikacijskih okolij Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:3
--msgid "Replication server manager"
--msgstr "Upravitelj replikacijskega strežnika"
-+msgid "Sybase dataserver"
-+msgstr "Podatkovni strežnik Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:4
--msgid "Stable storage device"
--msgstr "Stabilna hrambna naprava"
-+msgid "Sybase replication server"
-+msgstr "Replikacijski strežnik Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:5
--msgid "Sybase"
--msgstr "Sybase"
-+msgid "Log transfer manager or rep agent"
-+msgstr "Upravljalnik prenosov dnevnikov ali replikacijski agent"
- 
- #: ../sheets/sybase.sheet.in.h:6
--msgid "Sybase client application"
--msgstr "Odjemalna aplikacija Sybase"
-+msgid "Stable storage device"
-+msgstr "Stabilna hrambna naprava"
- 
- #: ../sheets/sybase.sheet.in.h:7
--msgid "Sybase dataserver"
--msgstr "Podatkovni strežnik Sybase"
-+msgid "Sybase client application"
-+msgstr "Odjemalna aplikacija Sybase"
- 
- #: ../sheets/sybase.sheet.in.h:8
--msgid "Sybase replication server"
--msgstr "Replikacijski strežnik Sybase"
--
-+msgid "Replication server manager"
-+msgstr "Upravitelj replikacijskega strežnika"
--- 
-1.8.4.4
-
diff --git a/graphics/dia/patches/0024-Bug-709017-warningectomy-array-subscript-is-above-ar.patch b/graphics/dia/patches/0024-Bug-709017-warningectomy-array-subscript-is-above-ar.patch
deleted file mode 100644
index c007dfa11f..0000000000
--- a/graphics/dia/patches/0024-Bug-709017-warningectomy-array-subscript-is-above-ar.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 80f95dfaeb92c44e49e51b8a69e301ea879b846b Mon Sep 17 00:00:00 2001
-From: Hans Breuer <hans@breuer.org>
-Date: Thu, 3 Oct 2013 20:04:37 +0200
-Subject: [PATCH 24/24] Bug 709017 [warningectomy] array subscript is above
- array bounds
-
-Get rid of the temporary array for font name, loose the limitation
-of maximum font name length and spare a string copy.
----
- lib/dia_svg.c | 82 ++++++++++++++++-------------------------------------------
- 1 file changed, 22 insertions(+), 60 deletions(-)
-
-diff --git a/lib/dia_svg.c b/lib/dia_svg.c
-index eea21b2..4eec0d0 100644
---- a/lib/dia_svg.c
-+++ b/lib/dia_svg.c
-@@ -127,11 +127,6 @@ _parse_color(gint32 *color, const char *str)
-   return TRUE;
- }
- 
--enum
--{
--  FONT_NAME_LENGTH_MAX = 40
--};
--
- /** This function not only parses the style attribute of the given node
-  *  it also extracts some of the style properties directly.
-  * @param node An XML node to parse a style from.
-@@ -144,9 +139,7 @@ void
- dia_svg_parse_style(xmlNodePtr node, DiaSvgStyle *s, real user_scale)
- {
-   xmlChar *str;
--  gchar temp[FONT_NAME_LENGTH_MAX+1]; /* font-family names will be limited to 40 characters */
-   int i = 0;
--  gboolean over = FALSE;
-   char *family = NULL, *style = NULL, *weight = NULL;
- 
-   str = xmlGetProp(node, (const xmlChar *)"style");
-@@ -161,68 +154,37 @@ dia_svg_parse_style(xmlNodePtr node, DiaSvgStyle *s, real user_scale)
-       if (!strncmp("font-family:", ptr, 12)) {
- 	ptr += 12;
- 	while ((ptr[0] != '\0') && g_ascii_isspace(ptr[0])) ptr++;
--	i = 0; over = FALSE;
--	while (ptr[0] != '\0' && ptr[0] != ';' && !over) {
--	  if (i < FONT_NAME_LENGTH_MAX) {
--	    temp[i] = ptr[0];
--	  } else over = TRUE;
--	  i++;
--	  ptr++;
--	}
--	temp[i] = '\0';
--
--	if (!over) {
--	  if (strcmp (temp, "sanserif") == 0 || strcmp (temp, "sans-serif") == 0)
--	    family = g_strdup ("sans"); /* special name adaption */
--	  else
--	    family = g_strdup(temp);
--	}
-+	i = 0;
-+	while (ptr[i] != '\0' && ptr[i] != ';')  ++i;
-+	/* with i==0 we fall back to 'sans' too */
-+	if (strncmp (ptr, "sanserif", i) == 0 || strncmp (ptr, "sans-serif", i) == 0)
-+	  family = g_strdup ("sans"); /* special name adaption */
-+	else
-+	  family = i > 0 ? g_strndup(ptr, i) : NULL;
-+	ptr += i;
-       } else if (!strncmp("font-weight:", ptr, 12)) {
- 	ptr += 12;
- 	while ((ptr[0] != '\0') && g_ascii_isspace(ptr[0])) ptr++;
--	i = 0; over = FALSE;
--	while (ptr[0] != '\0' && ptr[0] != ';' && !over) {
--	  if (i < FONT_NAME_LENGTH_MAX) {
--	    temp[i] = ptr[0];
--	  } else over = TRUE;
--	  i++;
--	  ptr++;
--	}
--	temp[i] = '\0';
--
--	if (!over) weight = g_strdup(temp);
-+	i = 0;
-+	while (ptr[i] != '\0' && ptr[i] != ';') ++i;
-+	weight = i > 0 ? g_strndup (ptr, i) : NULL;
-+	ptr += i;
-       } else if (!strncmp("font-style:", ptr, 11)) {
- 	ptr += 11;
- 	while ((ptr[0] != '\0') && g_ascii_isspace(ptr[0])) ptr++;
--	i = 0; over = FALSE;
--	while (ptr[0] != '\0' && ptr[0] != ';' && !over) {
--	  if (i < FONT_NAME_LENGTH_MAX) {
--	    temp[i] = ptr[0];
--	  } else over = TRUE;
--	  i++;
--	  ptr++;
--	}
--	temp[i] = '\0';
--
--	if (!over) style = g_strdup(temp);
-+	i = 0;
-+	while (ptr[i] != '\0' && ptr[i] != ';') ++i;
-+	style = i > 0 ? g_strndup(ptr, i) : NULL;
-+	ptr += i;
-       } else if (!strncmp("font-size:", ptr, 10)) {
- 	ptr += 10;
- 	while ((ptr[0] != '\0') && g_ascii_isspace(ptr[0])) ptr++;
--	i = 0; over = FALSE;
--	while (ptr[0] != '\0' && ptr[0] != ';' && !over) {
--	  if (i < FONT_NAME_LENGTH_MAX) {
--	    temp[i] = ptr[0];
--	  } else over = TRUE;
--	  i++;
--	  ptr++;
--	}
--	temp[i] = '\0';
--
--	if (!over) {
--	  s->font_height = g_ascii_strtod(temp, NULL);
--	  if (user_scale > 0)
--	    s->font_height /= user_scale;
--	}
-+	i = 0;
-+	while (ptr[i] != '\0' && ptr[i] != ';') ++i;
-+	s->font_height = g_ascii_strtod(ptr, NULL);
-+	ptr += i;
-+	if (user_scale > 0)
-+	  s->font_height /= user_scale;
-       } else if (!strncmp("text-anchor:", ptr, 12)) {
- 	ptr += 12;
- 	while ((ptr[0] != '\0') && g_ascii_isspace(ptr[0])) ptr++;
--- 
-1.8.4.4
-
diff --git a/graphics/dia/slack-desc b/graphics/dia/slack-desc
index 8373d8c1f1..866da50b0e 100644
--- a/graphics/dia/slack-desc
+++ b/graphics/dia/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-dia: Dia (diagram creation program)
+dia: dia (diagram creation program)
 dia:
-dia: Dia is inspired by the commercial Windows program 'Visio', though
-dia: more geared towards informal diagrams for casual use. It can be used
-dia: to draw many different kinds of diagrams. It currently has special
-dia: objects to help draw entity relationship diagrams, UML diagrams,
-dia: flowcharts, network diagrams, and many other diagrams. It is also
-dia: possible to add support for new shapes by writing simple XML files,
-dia: using a subset of SVG to draw the shape.
+dia: Dia is an application for creating technical diagrams. Its interface
+dia: and features are loosely patterned after the Windows program Visio.
+dia: Its features include multiple-page printing, export to many formats
+dia: and the ability to use custom shapes created by the user as simple
+dia: XML descriptions. Dia is useful for drawing UML diagrams, network
+dia: maps and flowcharts.
+dia:
+dia: Homepage: https://wiki.gnome.org/Apps/Dia/
 dia:
-dia: Homepage: http://live.gnome.org/Dia
diff --git a/graphics/digikam/README b/graphics/digikam/README
index f1a2f6fe6d..9b872c8964 100644
--- a/graphics/digikam/README
+++ b/graphics/digikam/README
@@ -10,5 +10,4 @@ eigen3, enblend-enfuse, hugin, sqlite2, libdc1394 and QtGStreamer are optional d
 NOTE:
 - digikam now ships with its own internal version of kipi-plugins.
 - please remove previous version before building the current version.
-  Otherwise, libkface will link to the previous version
 - Make sure qt5 is not installed before building opencv or else digiKam will segfault.
diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index 299c5dd838..fc091e3977 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=digikam
-VERSION=${VERSION:-4.11.0}
+VERSION=${VERSION:-4.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,6 +81,8 @@ cd build
     -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
     -DDIGIKAMSC_COMPILE_LIBKFACE=ON \
     -DDIGIKAMSC_COMPILE_DOC=OFF \
+    -DCMAKE_CXX_FLAGS:STRING="$(/usr/bin/Magick++-config --libs)" \
+    -DENABLE_OPENCV3=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info
index 936c9831b0..87aedbe887 100644
--- a/graphics/digikam/digikam.info
+++ b/graphics/digikam/digikam.info
@@ -1,10 +1,10 @@
 PRGNAM="digikam"
-VERSION="4.11.0"
+VERSION="4.14.0"
 HOMEPAGE="http://www.digikam.org/"
-DOWNLOAD="http://download.kde.org/stable/digikam/digikam-4.11.0.tar.bz2"
-MD5SUM="02a6bf2c3038d4872274bc65ff84c530"
+DOWNLOAD="http://download.kde.org/stable/digikam/digikam-4.14.0.tar.bz2"
+MD5SUM="8fd3cb0a822e8c2d4102e8adc00c082f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="liblqr lensfun ffmpeg opencv libpgf"
+REQUIRES="liblqr lensfun ffmpeg libpgf libkvkontakte libkface"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/graphics/dvisvgm/README b/graphics/dvisvgm/README
index 7ad9bb195c..59e0991ba0 100644
--- a/graphics/dvisvgm/README
+++ b/graphics/dvisvgm/README
@@ -1,11 +1,33 @@
-dvisvgm is a fast DVI to SVG converter
+dvisvgm is a fast DVI (and EPS) to SVG converter
 
-The command-line utility dvisvgm is a tool for TeX/LaTeX users. It converts DVI
-and EPS files to the XML-based scalable vector graphics format SVG. In contrast 
-to bitmap graphics, vector graphics are arbitrarily scalable without loss of 
-quality.
-
-All modern web browsers support a large amount of the current SVG standard 1.1. 
-Furthermore, SVG files can also be displayed with the Java-based Squiggle SVG 
-browser which is part of the Apache Batik project, and the free vector 
-graphics editor Inkscape.
+The command-line utility dvisvgm is a tool for TeX/LaTeX users. It
+converts DVI and EPS files to the XML-based scalable vector graphics
+format SVG. The latest releases support standard DVI files (format 2) as
+well as DVI output created by pTeX in vertical mode (format 3), and XeTeX
+(format 5 and 6, also known as XDV).
+                    http://dvisvgm.bplaced.net
+dvisvgm version 1.6 is present in SlackBuild texlive-2014052
+This separate package presents an updated version 1.11 of dvisvgm
+offereing various bugfixes and the following main features:
+* Complete font support including virtual fonts, evaluation of font
+encodings, CMap files, sub-font definitions and font maps.
+* Glyph outlines of all required fonts are embedded into the generated
+SVG files.
+* Glyph outlines of fonts that are not available in a vector format are
+generated on-the-fly by vectorizing METAFONT's bitmap output.
+* dvisvgm allows to replace font definitions by paths so that
+applications without SVG font support are enabled to render dvisvgm's
+output properly.
+* Computes tight bounding boxes for the generated graphics, but supports
+common paper formats and arbitrary user-defined sizes as well.
+* Option --eps allows to convert EPS files to SVG.
+* Intersections of clipping paths can be computed directly instead of
+delegating this task to the SVG renderer. This increases the
+compatibility of the generated SVG files.
+* Approximates PostScript color gradient fills not directly supported by
+SVG 1.1.
+* Optionally creates compressed SVGZ files.
+* Provides options for applying page transformations, like translation,
+rotation, scaling, and skewing.
+* Evaluates color, emTeX, tpic, hyperref/HyperTeX, PDF mapfile, and
+PostScript specials.
diff --git a/graphics/dvisvgm/c-std.h.diff b/graphics/dvisvgm/c-std.h.diff
new file mode 100644
index 0000000000..7f8d403523
--- /dev/null
+++ b/graphics/dvisvgm/c-std.h.diff
@@ -0,0 +1,14 @@
+--- c-std.h	2010-05-17 22:01:37.000000000 +0200
++++ c-std.h.new	2015-11-19 10:18:18.000000000 +0100
+@@ -93,9 +93,9 @@
+ #else
+ #ifndef WIN32
+ /* `popen' and `pclose' are part of POSIX.2, not POSIX.1.  So
+-   STDC_HEADERS isn't enough.  */
++   STDC_HEADERS isn't enough.  
+ extern FILE *popen ();
+-extern int pclose ();
++extern int pclose (); */
+ #endif /* not WIN32 */
+ #endif /* not VMS */
+ 
diff --git a/graphics/dvisvgm/doinst.sh b/graphics/dvisvgm/doinst.sh
deleted file mode 100644
index 598b54425f..0000000000
--- a/graphics/dvisvgm/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-schema_install() {
-  SCHEMA="$1"
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/$SCHEMA \
-    1>/dev/null
-}
-
-schema_install blah.schemas
diff --git a/graphics/dvisvgm/dvisvgm.SlackBuild b/graphics/dvisvgm/dvisvgm.SlackBuild
index 6d8d210f00..ee54426624 100644
--- a/graphics/dvisvgm/dvisvgm.SlackBuild
+++ b/graphics/dvisvgm/dvisvgm.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
-
-# Slackware build script for <appname>
-
-# Copyright <year> <you> <where you live>
+# Slackware build script for dvisvgm
+# SlackBuild Version: 151119
+# Copyright 2015 Igor ( igor29768 AT gmail.com )
+# Based on the SlackBuild script by Rudson Alves (rudsonalves@yahoo.com.br)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dvisvgm
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,15 +70,22 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Libkpathsea check...
-if [ ! -e /usr/include/kpathsea ]; then
-    ln -s /usr/share/texmf/include/kpathsea /usr/include/kpathsea
+# If Slackware tetex is installed
+if [ -d /usr/share/texmf/include/kpathsea ] && [ ! -e /usr/include/kpathsea ]; then
+  cp -r /usr/share/texmf/include/kpathsea/ $TMP/$PRGNAM-$VERSION
+  cd kpathsea
+  patch -i $CWD/c-std.h.diff
+  cd ..
+  export CPPFLAGS+="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION"
 fi
 
-if [ ! -e /usr/lib${LIBDIRSUFFIX}/libkpathsea.a ]; then
-    ln -s /usr/share/texmf/lib/libkpathsea.a /usr/lib${LIBDIRSUFFIX}/libkpathsea.a
-    ln -s /usr/share/texmf/lib/libkpathsea.la /usr/lib${LIBDIRSUFFIX}/libkpathsea.la
+if [ ! -e /usr/lib${LIBDIRSUFFIX}/libkpathsea.la ] && [ -e /usr/share/texmf/lib/libkpathsea.la ]; then
+  LIBS+=" -l/usr/share/texmf/lib/"
+  export LDFLAGS+=" -L/usr/share/texmf/lib/"
 fi
 
+echo "CPPFLAGS=$CPPFLAGS LIBS=$LIBS LDFLAGS=$LDFLAGS"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -105,7 +112,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/dvisvgm/dvisvgm.info b/graphics/dvisvgm/dvisvgm.info
index 12d2b68c45..7d343a50be 100644
--- a/graphics/dvisvgm/dvisvgm.info
+++ b/graphics/dvisvgm/dvisvgm.info
@@ -1,10 +1,10 @@
 PRGNAM="dvisvgm"
-VERSION="1.4"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/dvisvgm/files/dvisvgm/1.4/dvisvgm-1.4.tar.gz"
-MD5SUM="5ba576bbd664f8b04e4db1e4efd3a541"
+VERSION="1.12"
+HOMEPAGE="http://dvisvgm.bplaced.net"
+DOWNLOAD="https://github.com/mgieseki/dvisvgm/releases/download/1.12/dvisvgm-1.12.tar.gz"
+MD5SUM="a6b3870156cdbdb1eadc543a3f7d5b8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="potrace"
-MAINTAINER="Rudson Alves"
-EMAIL="rudsonalves@yahoo.com.br"
+MAINTAINER="Igor"
+EMAIL="igor29768@gmail.com"
diff --git a/graphics/dvisvgm/slack-desc b/graphics/dvisvgm/slack-desc
index 254f94df58..87e0630264 100644
--- a/graphics/dvisvgm/slack-desc
+++ b/graphics/dvisvgm/slack-desc
@@ -6,14 +6,15 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-dvisvgm: dvisvgm (converts DVI files to the XML-based scalable SVG)
-dvisvgm:
-dvisvgm: dvisvgm a tool for TeX/LaTeX users to converts DVI files to the 
-dvisvgm: XML-based scalable vector graphics format SVG. SVG files can be 
-dvisvgm: displayed with Adobe's old SVG browser plug-in or the Java-based 
-dvisvgm: Squiggle SVG browser from the Apache Batik project, for example. 
-dvisvgm: A subset of the current SVG standard 1.1 is also supported by most 
-dvisvgm: Web browsers as well as the free vector graphics editor Inkscape.'
-dvisvgm:
+dvisvgm: dvisvgm (converts DVI and EPS files to SVG -Scalable Vector Graphics)
 dvisvgm:
+dvisvgm: dvisvgm a tool for TeX/LaTeX users to converts DVI and
+dvisvgm: EPS files to the XML-based scalable vector graphics format SVG 
+dvisvgm: version 1.1.
+dvisvgm: It currently supports standard DVI files (format 2) as well as 
+dvisvgm: DVI output created by pTeX in vertical mode (format 3), and
+dvisvgm: XeTeX (format 5 and 6, also known as XDV). 
+dvisvgm: Option --eps allows to convert EPS files to SVG.
+dvisvgm: 
+dvisvgm: http://dvisvgm.bplaced.net
 dvisvgm:
diff --git a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
index db6384a215..89225d3202 100644
--- a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
+++ b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Enblend-Enfuse
 #
 # Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2011-2014 titopoquito (titopoquito@gmail.com)
+# Copyright 2011-2015 titopoquito (titopoquito@gmail.com)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=enblend-enfuse
 VERSION=${VERSION:-4.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,8 +70,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# for version 4.1.2 there is an underlinking problem in
+# enblend-enfuse when used with an vigra library that is
+# compiled to support OpenEXR. Both are needed to run
+# hugin, a program to create panorama photos.
+# Thanks to David Spencer for the LDFLAGS hint!
+
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
+LDFLAGS="-lpthread" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
diff --git a/graphics/fbv/fbv.SlackBuild b/graphics/fbv/fbv.SlackBuild
index 0bde96e9a0..90252b9f35 100644
--- a/graphics/fbv/fbv.SlackBuild
+++ b/graphics/fbv/fbv.SlackBuild
@@ -57,6 +57,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Check for new giflib API, apply patch only if needed. This changed
+# between Slack 14.1 and 14.2.
+grep -q DGifOpenFileName.*Error /usr/include/gif_lib.h && \
+  patch -p1 < $CWD/giflib5_api.diff
+
+# Patch is needed for linpng-1.6, and does no harm on 1.4.
+patch -p1 < $CWD/png16_api.diff
+
 # Man page is missing a few options, and --help output is wrong.
 # Also next/prev/quit options weren't documented in either place.
 patch -p1 < $CWD/manhelp.diff
diff --git a/graphics/fbv/giflib5_api.diff b/graphics/fbv/giflib5_api.diff
new file mode 100644
index 0000000000..6de9afd0ed
--- /dev/null
+++ b/graphics/fbv/giflib5_api.diff
@@ -0,0 +1,66 @@
+diff -Naur fbv-1.0b/gif.c fbv-1.0b.patched/gif.c
+--- fbv-1.0b/gif.c	2003-08-24 16:23:02.000000000 -0400
++++ fbv-1.0b.patched/gif.c	2015-11-22 12:16:54.093999000 -0500
+@@ -31,10 +31,10 @@
+ #include <string.h>
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define gflush return(FH_ERROR_FILE);
+-#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
+-#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
++#define grflush { int dummy; DGifCloseFile(gft, &dummy); return(FH_ERROR_FORMAT); }
++#define mgrflush { int dummy; free(lb); free(slb); DGifCloseFile(gft, &dummy); return(FH_ERROR_FORMAT); }
+ #define agflush return(FH_ERROR_FORMAT);
+-#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
++#define agrflush { int dummy; DGifCloseFile(gft, &dummy); return(FH_ERROR_FORMAT); }
+ 
+ 
+ int fh_gif_id(char *name)
+@@ -80,8 +80,9 @@
+     GifRecordType rt;
+     ColorMapObject *cmap;
+     int cmaps;
++    int dummyopenarg;
+ 
+-    gft=DGifOpenFileName(name);
++    gft=DGifOpenFileName(name, &dummyopenarg);
+     if(gft==NULL){printf("err5\n"); gflush;} //////////
+     do
+     {
+@@ -170,7 +171,7 @@
+ 	}
+     }
+     while( rt!= TERMINATE_RECORD_TYPE );
+-    DGifCloseFile(gft);
++    DGifCloseFile(gft, &dummyopenarg);
+     return(FH_ERROR_OK);
+ }
+ 
+@@ -183,8 +184,9 @@
+     GifByteType *extension;
+     int extcode;
+     GifRecordType rt;
++    int dummyopenarg;
+ 
+-    gft=DGifOpenFileName(name);
++    gft=DGifOpenFileName(name, &dummyopenarg);
+     if(gft==NULL) gflush;
+     do
+     {
+@@ -197,7 +199,7 @@
+ 		px=gft->Image.Width;
+ 		py=gft->Image.Height;
+ 		*x=px; *y=py;
+-		DGifCloseFile(gft);
++		DGifCloseFile(gft, &dummyopenarg);
+ 		return(FH_ERROR_OK);
+ 		break;
+ 	    case EXTENSION_RECORD_TYPE:
+@@ -210,7 +212,7 @@
+ 	}  
+     }
+     while( rt!= TERMINATE_RECORD_TYPE );
+-    DGifCloseFile(gft);
++    DGifCloseFile(gft, &dummyopenarg);
+     return(FH_ERROR_FORMAT);
+ }
+ #endif
diff --git a/graphics/fbv/png16_api.diff b/graphics/fbv/png16_api.diff
new file mode 100644
index 0000000000..235b343666
--- /dev/null
+++ b/graphics/fbv/png16_api.diff
@@ -0,0 +1,21 @@
+diff -Naur fbv-1.0b/png.c fbv-1.0b.patched/png.c
+--- fbv-1.0b/png.c	2003-08-24 16:22:22.000000000 -0400
++++ fbv-1.0b.patched/png.c	2015-11-22 12:21:33.247999000 -0500
+@@ -69,7 +69,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);
+@@ -161,7 +161,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);
diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild
index e3a4b031fe..29c1260cbc 100644
--- a/graphics/feh/feh.SlackBuild
+++ b/graphics/feh/feh.SlackBuild
@@ -23,7 +23,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=feh
-VERSION=${VERSION:-2.13.1}
+VERSION=${VERSION:-2.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/feh/feh.info b/graphics/feh/feh.info
index 53803474a8..7c87119157 100644
--- a/graphics/feh/feh.info
+++ b/graphics/feh/feh.info
@@ -1,8 +1,8 @@
 PRGNAM="feh"
-VERSION="2.13.1"
+VERSION="2.14"
 HOMEPAGE="http://feh.finalrewind.org"
-DOWNLOAD="http://feh.finalrewind.org/feh-2.13.1.tar.bz2"
-MD5SUM="18a70487dddf43682d4acc896bfed0d3"
+DOWNLOAD="http://feh.finalrewind.org/feh-2.14.tar.bz2"
+MD5SUM="79c2e287f00071066b2857ade0b03560"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
diff --git a/graphics/fim/fim.info b/graphics/fim/fim.info
index 9b3e10c103..53ca4638b9 100644
--- a/graphics/fim/fim.info
+++ b/graphics/fim/fim.info
@@ -1,8 +1,8 @@
 PRGNAM="fim"
 VERSION="0.5"
 HOMEPAGE="http://www.nongnu.org/fbi-improved/"
-DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/fbi-improved/fim-0.5-trunk.tar.gz"
-MD5SUM="6163588b993205eae14986002dc291de"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/fim/fim-0.5-trunk.tar.gz"
+MD5SUM="ed14220420bf5e33f08b449de161dbc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/findimagedupes/README b/graphics/findimagedupes/README
new file mode 100644
index 0000000000..fece13a32d
--- /dev/null
+++ b/graphics/findimagedupes/README
@@ -0,0 +1,7 @@
+findimagedupes (find visually similar or duplicate images)
+
+findimagedupes compares a list of files for visual similarity, by
+computing and comparing 'visual fingerprints'.
+
+If you get "Can't locate Graphics/Magick.pm" errors, upgrade your
+GraphicsMagick to the latest available on SBo.
diff --git a/graphics/findimagedupes/findimagedupes.SlackBuild b/graphics/findimagedupes/findimagedupes.SlackBuild
new file mode 100644
index 0000000000..9519209a71
--- /dev/null
+++ b/graphics/findimagedupes/findimagedupes.SlackBuild
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Slackware build script for findimagedupes
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=findimagedupes
+VERSION=${VERSION:-2.18}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 644 *
+
+# use private per-user dirs for Inline's compiled code.
+sed -i \
+  -e '/^use *Inline/iBEGIN { mkdir("$ENV{HOME}/.findimagedupes-inline"); }' \
+  -e '/DIRECTORY/s,=>.*,=> "$ENV{HOME}/.findimagedupes-inline";,' \
+  $PRGNAM
+
+install -D -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+mkdir -p $PKG/usr/man/man1
+pod2man -s1 --stderr -cSlackBuilds.org -r$VERSION $PRGNAM | \
+  gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING history $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/findimagedupes/findimagedupes.info b/graphics/findimagedupes/findimagedupes.info
new file mode 100644
index 0000000000..2b79d0ddf5
--- /dev/null
+++ b/graphics/findimagedupes/findimagedupes.info
@@ -0,0 +1,10 @@
+PRGNAM="findimagedupes"
+VERSION="2.18"
+HOMEPAGE="http://www.jhnc.org/findimagedupes/"
+DOWNLOAD="http://www.jhnc.org/findimagedupes/findimagedupes-2.18.tar.gz"
+MD5SUM="5c353c6e4611e194114d4192c32c6adb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Inline-C perl-file-mimeinfo GraphicsMagick"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/findimagedupes/slack-desc b/graphics/findimagedupes/slack-desc
new file mode 100644
index 0000000000..610346bb71
--- /dev/null
+++ b/graphics/findimagedupes/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+findimagedupes: findimagedupes (find visually similar or duplicate images)
+findimagedupes:
+findimagedupes: findimagedupes compares a list of files for visual similarity, by
+findimagedupes: comparing 'visual fingerprints'.
+findimagedupes:
+findimagedupes:
+findimagedupes:
+findimagedupes:
+findimagedupes:
+findimagedupes:
+findimagedupes:
diff --git a/graphics/flpsed/flpsed.SlackBuild b/graphics/flpsed/flpsed.SlackBuild
index 23c1a54e34..80804e4a0c 100644
--- a/graphics/flpsed/flpsed.SlackBuild
+++ b/graphics/flpsed/flpsed.SlackBuild
@@ -1,11 +1,13 @@
 #!/bin/sh
 
 # Slackware build script for flpsed
-# Written by Jack Maddox <jackmaddox@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
+# Originally written by Jack Maddox <jackmaddox@gmail.com>
+# Currently maintained by B. Watson <yalhcru@gmail.com>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=flpsed
-VERSION=${VERSION:-0.6.1}
+VERSION=${VERSION:-0.7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,6 +53,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Allow building with SBo fltk13 package or Pat's extra/fltk on -current
+# (or 14.2, when it's released).
+if [ "$( fltk-config --api-version 2>/dev/null )" = "1.3" ]; then
+  FLTKCONFIG="$( which fltk-config )"
+else
+  FLTKCONFIG="$( which fltk13-config )"
+fi
+
+if [ -z "$FLTKCONFIG" ]; then
+  echo "$0: can't find fltk-config for fltk version 1.3.x" 1>&2
+  exit 1
+fi
+
+FLTKCONFIG="$FLTKCONFIG" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -62,17 +78,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README INSTALL COPYING AUTHORS NEWS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README INSTALL COPYING AUTHORS NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/applications
diff --git a/graphics/flpsed/flpsed.info b/graphics/flpsed/flpsed.info
index f1791c2618..e77eb21530 100644
--- a/graphics/flpsed/flpsed.info
+++ b/graphics/flpsed/flpsed.info
@@ -1,10 +1,10 @@
 PRGNAM="flpsed"
-VERSION="0.6.1"
+VERSION="0.7.3"
 HOMEPAGE="http://flpsed.org/flpsed.html"
-DOWNLOAD="http://www.flpsed.org/flpsed-0.6.1.tar.gz"
-MD5SUM="5377fe7e80d677c794e013ce07627d6a"
+DOWNLOAD="http://flpsed.org/flpsed-0.7.3.tar.gz"
+MD5SUM="3b7c2ffd349a41c2e484dad3fd3d73d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fltk2"
-MAINTAINER="Jack Maddox"
-EMAIL="jack@auburn.edu"
+REQUIRES="fltk13"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/fotoxx/fotoxx.SlackBuild b/graphics/fotoxx/fotoxx.SlackBuild
index 488d45894a..5000136fcf 100644
--- a/graphics/fotoxx/fotoxx.SlackBuild
+++ b/graphics/fotoxx/fotoxx.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fotoxx
 
-# Copyright 2010-2014  Robby Workman, Northport, Alabama, USA
+# Copyright 2010-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fotoxx
-VERSION=${VERSION:-14.01.1}
+VERSION=${VERSION:-16.01.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+MAPSRC=$PRGNAM-maps
+MAPVERS=${MAPVERS:-1.1}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -58,6 +61,8 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
+
+# Install fotoxx
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
@@ -69,18 +74,39 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# No thanks, we'll handle the deps
-printf "#!/bin/sh\n/bin/true\n" > dependencies.sh
-
-# Install the "normal" stuff and manual page
+make \
+  CPPFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+  MANDIR=/usr/man/man1
 make install \
-  CXXFLAGS="$SLKCFLAGS -Wno-deprecated-declarations" \
-  LDFLAGS="$SLKCFLAGS -Wall -rdynamic" \
   PREFIX=/usr \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION \
   MANDIR=/usr/man/man1 \
   DESTDIR=$PKG
 
+# Install the fotoxx-maps stuff
+cd $TMP
+rm -rf $MAPSRC-$MAPVERS
+tar xvf $CWD/$MAPSRC-$MAPVERS.tar.gz
+cd $MAPSRC-$MAPVERS
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make \
+  PREFIX=/usr \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION/$MAPSRC \
+  MANDIR=/usr/man/man1
+make install \
+  PREFIX=/usr \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION/$MAPSRC \
+  MANDIR=/usr/man/man1 \
+  DESTDIR=$PKG
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/graphics/fotoxx/fotoxx.info b/graphics/fotoxx/fotoxx.info
index d064d4e2bf..72cd259be0 100644
--- a/graphics/fotoxx/fotoxx.info
+++ b/graphics/fotoxx/fotoxx.info
@@ -1,8 +1,10 @@
 PRGNAM="fotoxx"
-VERSION="14.01.1"
-HOMEPAGE="http://www.kornelix.com/fotoxx.html"
-DOWNLOAD="http://www.kornelix.com/uploads/1/3/0/3/13035936/fotoxx-14.01.1.tar.gz"
-MD5SUM="2300c7d8bdf704354bedd1ce07fa843c"
+VERSION="16.01.1"
+HOMEPAGE="http://kornelix.net/fotoxx/fotoxx.html"
+DOWNLOAD="http://kornelix.net/downloads/tarballs/fotoxx-16.01.1.tar.gz \
+          http://kornelix.net/downloads/tarballs/fotoxx-maps-1.1.tar.gz"
+MD5SUM="b818c87c14a9f8047016096274f27981 \
+        0d9f2d2715fea15ad9f4189caaf1112f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="exiftool ufraw"
diff --git a/graphics/freewrl/README b/graphics/freewrl/README
new file mode 100644
index 0000000000..be42fe9362
--- /dev/null
+++ b/graphics/freewrl/README
@@ -0,0 +1,18 @@
+FreeWRL has had an impressive track record, is here to stay. X3D Components get 
+added, problems get resolved. Program with GLSL Shaders using the X3D Shaders 
+Component, put your models exactly where you want them with the Geospatial 
+Component, or just throw triangles to the screen as Extrusions, IndexedFaceSets, 
+TriangleSets, Circle2D, Disk2D, Spheres, Boxes, Cubes; the list goes on and on.
+
+With royalty free open standards, your models will continue to render, year 
+after year.
+
+Requires: imlib2 openal freealut 
+
+Additional options:
+By default the SlackBuild compiles with native OpenGL
+to overwrites it pass MESA=yes.
+For generating the documentation: DOCS=yes
+To use OpenCL (requires an OpenCL API) define the 
+OpenCL API path using: OCL_PATH=
+
diff --git a/graphics/freewrl/doinst.sh b/graphics/freewrl/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/graphics/freewrl/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/graphics/freewrl/freewrl.SlackBuild b/graphics/freewrl/freewrl.SlackBuild
new file mode 100644
index 0000000000..4a75b00b7c
--- /dev/null
+++ b/graphics/freewrl/freewrl.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# Slackware build script for freewrl
+
+# Copyright 2015 Guilherme Calandrini, Madrid, Spain
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=freewrl
+VERSION=${VERSION:-3.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+# Prefer the Mesa library over a vendors native OpenGL
+if [ "${MESA:-no}" == "yes" ]; then
+  OPT_DEPS="--with-mesa"
+fi
+
+# Generate documentation
+if [ "${DOCS:-no}" == "yes" ]; then
+  OPT_DEPS="$OPT_DEPS --enable-docs"
+fi
+
+# Use OpenCL. Requires OpenCL API.
+if [ ! -z "$OCL_PATH" ]; then
+  OPT_DEPS="$OPT_DEPS --with-OpenCL=$OCL_PATH"
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  $OPT_DEPS \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING COPYING.LESSER README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/freewrl/freewrl.info b/graphics/freewrl/freewrl.info
new file mode 100644
index 0000000000..d9b965431d
--- /dev/null
+++ b/graphics/freewrl/freewrl.info
@@ -0,0 +1,10 @@
+PRGNAM="freewrl"
+VERSION="3.0.0"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/freewrl/files/freewrl-linux/3.0/freewrl-3.0.0.tar.bz2"
+MD5SUM="350066d1b7c0fd0b842260c60c1c3179"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="imlib2 OpenAL freealut"
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini@hotmail.es"
diff --git a/graphics/freewrl/slack-desc b/graphics/freewrl/slack-desc
new file mode 100644
index 0000000000..ea6481a8b5
--- /dev/null
+++ b/graphics/freewrl/slack-desc
@@ -0,0 +1,17 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+freewrl: freewrl (3D Viewer)
+freewrl:
+freewrl: FreeWRL has had an impressive track record, is here to stay. X3D 
+freewrl: Components get added, problems get resolved. Program with GLSL Shaders 
+freewrl: using the X3D Shaders Component, put your models exactly where you 
+freewrl: want them with the Geospatial Component, or just throw triangles to 
+freewrl: the screen as Extrusions, IndexedFaceSets, TriangleSets, Circle2D, 
+freewrl: Disk2D, Spheres, Boxes, Cubes; the list goes on and on.
+freewrl: 
diff --git a/graphics/fritzing/fritzing.SlackBuild b/graphics/fritzing/fritzing.SlackBuild
index 8714f8d988..fed7d25e94 100644
--- a/graphics/fritzing/fritzing.SlackBuild
+++ b/graphics/fritzing/fritzing.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for fritzing
+# Slackware build script for Fritzing
 # electronic prototyping
 
 # Copyright 2010-2013  Niels Horn, Rio de Janeiro, RJ, Brazil
@@ -29,7 +29,7 @@
 # Revision date 2013/03/26
 
 PRGNAM=fritzing
-VERSION=${VERSION:-0.9.1b}
+VERSION=${VERSION:-0.9.2b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,8 +65,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION.source
-unzip $CWD/$PRGNAM-$VERSION.source.zip
+rm -rf $PRGNAM-app-master
+unzip $CWD/$PRGNAM-app-master.zip
 cd $PRGNAM-app-master
 chown -R root:root .
 find -L . \
@@ -75,9 +75,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake-qt5 \
-  "QMAKE_CXXFLAGS+=$SLKCFLAGS" \
-  "QMAKE_CFLAGS+=$SLKCFLAGS"
+qmake-qt5
 make
 
 # "install" program
@@ -85,7 +83,8 @@ mkdir -p $PKG/usr/bin
 cp Fritzing $PKG/usr/bin/
 # "install" data
 mkdir -p $PKG/usr/share/$PRGNAM
-cp -a bins parts sketches translations $PKG/usr/share/$PRGNAM/
+cp -a parts sketches translations help $PKG/usr/share/$PRGNAM/
+mv $PKG/usr/share/$PRGNAM/parts/bins $PKG/usr/share/$PRGNAM/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/graphics/fritzing/fritzing.info b/graphics/fritzing/fritzing.info
index 2b1e3924ab..65ffe6189d 100644
--- a/graphics/fritzing/fritzing.info
+++ b/graphics/fritzing/fritzing.info
@@ -1,8 +1,8 @@
 PRGNAM="fritzing"
-VERSION="0.9.1b"
+VERSION="0.9.2b"
 HOMEPAGE="http://fritzing.org/"
-DOWNLOAD="http://fritzing.org/download/0.9.1b/source-tarball/fritzing-0.9.1b.source.zip"
-MD5SUM="3106dce73ceb5f0ca8aada00fc1784db"
+DOWNLOAD="https://www.dropbox.com/s/lxu8ayjbtdd7st6/fritzing-app-master.zip"
+MD5SUM="c15a16a818a94b7ce5cdf9ccd0bd0611"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/graphics/gimp-plugin-bimp/README b/graphics/gimp-plugin-bimp/README
new file mode 100644
index 0000000000..634bf12c6d
--- /dev/null
+++ b/graphics/gimp-plugin-bimp/README
@@ -0,0 +1,5 @@
+With BIMP you can apply a set of GIMP manipulations on groups of images. It provides an easy to use 
+interface and a lot of batch functions:
+
+Resize, Crop, Flip and rotate, Blurring and sharpening, Color (and curve) correction, Watermark,
+Rename, Change compression and format, ... and whatever you want! (almost)
diff --git a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
new file mode 100644
index 0000000000..785d5cf758
--- /dev/null
+++ b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for gimp-plugin-bimp
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gimp-plugin-bimp
+VERSION=${VERSION:-1.16}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+make
+
+# Copy over executable
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins
+mv bin/bimp $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
new file mode 100644
index 0000000000..61a64d2edc
--- /dev/null
+++ b/graphics/gimp-plugin-bimp/gimp-plugin-bimp.info
@@ -0,0 +1,10 @@
+PRGNAM="gimp-plugin-bimp"
+VERSION="1.16"
+HOMEPAGE="https://github.com/alessandrofrancesconi/gimp-plugin-bimp"
+DOWNLOAD="https://github.com/alessandrofrancesconi/gimp-plugin-bimp/archive/v1.16.tar.gz"
+MD5SUM="5c9664c486889fc28d0a5c43665faa83"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/graphics/gimp-plugin-bimp/slack-desc b/graphics/gimp-plugin-bimp/slack-desc
new file mode 100644
index 0000000000..f978453ee1
--- /dev/null
+++ b/graphics/gimp-plugin-bimp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        	|-----handy-ruler------------------------------------------------------|
+gimp-plugin-bimp: gimp-plugin-bimp (Batch Image Manipulation Plugin for GIMP)
+gimp-plugin-bimp:
+gimp-plugin-bimp: With BIMP you can apply a set of GIMP manipulations on groups of
+gimp-plugin-bimp: images. It provides an easy to use interface and a lot of batch
+gimp-plugin-bimp: functions.
+gimp-plugin-bimp:
+gimp-plugin-bimp: Homepage: https://github.com/alessandrofrancesconi/gimp-plugin-bimp
+gimp-plugin-bimp:
+gimp-plugin-bimp:
+gimp-plugin-bimp:
+gimp-plugin-bimp:
diff --git a/graphics/gnofract4d/gnofract4d.SlackBuild b/graphics/gnofract4d/gnofract4d.SlackBuild
index 2d4cfc983a..3aafbe65a9 100644
--- a/graphics/gnofract4d/gnofract4d.SlackBuild
+++ b/graphics/gnofract4d/gnofract4d.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnofract4d
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnofract4d
-VERSION=${VERSION:-3.14.1}
-BUILD=${BUILD:-1}
+SRCVER=${SRCVER:-V_3_14_1}
+VERSION=$(echo $SRCVER | tr _ . | cut -c3-8)
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz || tar xvf $CWD/$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,8 +82,7 @@ find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING PKG-INFO README doc/* \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README Todo $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/gnofract4d/gnofract4d.info b/graphics/gnofract4d/gnofract4d.info
index 6c4791cdaf..cc25c5bd7d 100644
--- a/graphics/gnofract4d/gnofract4d.info
+++ b/graphics/gnofract4d/gnofract4d.info
@@ -1,8 +1,8 @@
 PRGNAM="gnofract4d"
 VERSION="3.14.1"
-HOMEPAGE="http://gnofract4d.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/gnofract4d/files/gnofract4d/3.14.1/gnofract4d-3.14.1.tar.bz2"
-MD5SUM="db12eabcf5bece42c037fb9937f9b0af"
+HOMEPAGE="https://github.com/edyoung/gnofract4d"
+DOWNLOAD="https://github.com/edyoung/gnofract4d/archive/V_3_14_1.tar.gz"
+MD5SUM="0872b6acefa9123205e099c9e174a791"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/grafx2/README b/graphics/grafx2/README
new file mode 100644
index 0000000000..fda64c8c5d
--- /dev/null
+++ b/graphics/grafx2/README
@@ -0,0 +1,8 @@
+GrafX2 - The Ultimate 256-color bitmap paint program
+
+GrafX2 is a drawing program dedicated to pixelart and low-color
+graphics. Its layout is not very different from the famous
+Deluxe Paint or Brilliance.
+
+If you want LUA scripting support, pass LUA=yes to the
+SlackBuild. This requires "lua".
diff --git a/graphics/grafx2/doinst.sh b/graphics/grafx2/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/graphics/grafx2/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/graphics/grafx2/grafx2.SlackBuild b/graphics/grafx2/grafx2.SlackBuild
new file mode 100644
index 0000000000..1087d977a2
--- /dev/null
+++ b/graphics/grafx2/grafx2.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for GrafX2
+
+# Copyright 2015 Jorge Giner Cordero
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=grafx2
+VERSION=${VERSION:-2.4.2035}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+if [ "$LUA" = yes ]; then
+  LUA=""
+else
+  LUA="NOLUA=1"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-src.tgz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cd src
+CFLAGS="$SLKCFLAGS" \
+make $LUA
+make install prefix=/usr DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/grafx2/grafx2.info b/graphics/grafx2/grafx2.info
new file mode 100644
index 0000000000..a1fb8e9140
--- /dev/null
+++ b/graphics/grafx2/grafx2.info
@@ -0,0 +1,10 @@
+PRGNAM="grafx2"
+VERSION="2.4.2035"
+HOMEPAGE="http://pulkomandy.tk/projects/GrafX2"
+DOWNLOAD="https://grafx2.googlecode.com/files/grafx2-2.4.2035-src.tgz"
+MD5SUM="9bfbb3cdbfe35cc195df17c0a8e8b9b7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jorge Giner"
+EMAIL="jorge.giner@hotmail.com"
diff --git a/graphics/grafx2/slack-desc b/graphics/grafx2/slack-desc
new file mode 100644
index 0000000000..75933bd380
--- /dev/null
+++ b/graphics/grafx2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+grafx2: grafx2 (The Ultimate 256-color bitmap paint program)
+grafx2:
+grafx2: GrafX2 is a drawing program dedicated to pixelart and low-color
+grafx2: graphics. Its layout is not very different from the famous Deluxe
+grafx2: Paint or Brilliance.
+grafx2:
+grafx2: Homepage: http://pulkomandy.tk/projects/GrafX2
+grafx2:
+grafx2:
+grafx2:
+grafx2:
diff --git a/graphics/graphite2/README b/graphics/graphite2/README
new file mode 100644
index 0000000000..c4486282b4
--- /dev/null
+++ b/graphics/graphite2/README
@@ -0,0 +1,8 @@
+Graphite2 is a rendering engine for graphite fonts. These are TrueType
+fonts with additional tables containing smart rendering information and
+were originally developed to support complex non-Roman writing systems.
+They may contain rules for e.g. ligatures, glyph substitution, kerning,
+justification - this can make them useful even on text written in Roman
+writing systems such as English. Note that firefox provides an internal
+copy of the graphite engine and cannot use a system version, but it too
+should benefit from the availability of graphite fonts.
diff --git a/graphics/graphite2/graphite2.SlackBuild b/graphics/graphite2/graphite2.SlackBuild
new file mode 100644
index 0000000000..dda16bbadd
--- /dev/null
+++ b/graphics/graphite2/graphite2.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for graphite2
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=graphite2
+VERSION=${VERSION:-1.3.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -Wno-dev ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog LICENSE Todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/graphite2/graphite2.info b/graphics/graphite2/graphite2.info
new file mode 100644
index 0000000000..81cef328a6
--- /dev/null
+++ b/graphics/graphite2/graphite2.info
@@ -0,0 +1,10 @@
+PRGNAM="graphite2"
+VERSION="1.3.3"
+HOMEPAGE="http://projects.palaso.org/projects/graphitedev"
+DOWNLOAD="http://projects.palaso.org/attachments/download/436/graphite2-1.3.3.tgz"
+MD5SUM="7cda6fc6bc197b216777b15ce52c38a8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/graphics/graphite2/slack-desc b/graphics/graphite2/slack-desc
new file mode 100644
index 0000000000..5f58c7bff7
--- /dev/null
+++ b/graphics/graphite2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+graphite2: graphite2 (rendering engine for graphite fonts)
+graphite2:
+graphite2: Graphite2 is a rendering engine for graphite fonts. These are
+graphite2: TrueType fonts with additional tables containing smart rendering
+graphite2: information and were originally developed to support complex
+graphite2: non-Roman writing systems.
+graphite2:
+graphite2:
+graphite2:
+graphite2:
+graphite2:
diff --git a/graphics/hugin/README b/graphics/hugin/README
index 87809f1047..05cf86b958 100644
--- a/graphics/hugin/README
+++ b/graphics/hugin/README
@@ -2,3 +2,7 @@ An easy to use cross-platform panoramic imaging toolchain based on
 Panorama Tools. With hugin you can assemble a mosaic of photographs
 into a complete immersive panorama, stitch any series of overlapping
 pictures and much more.
+Since version 2015.0.0 the external lensfun library is replaced by
+an internal database. vigra now has to be compiled with OpenEXR
+support. And last but not least hugin now ships an own blender tool
+which you could use instead of enblend.
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 70dd5f9571..f7915c45b6 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -3,12 +3,8 @@
 # Slackware build script for Hugin
 #
 # Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2011-2015  by titopoquito (titopoquito@gmail.com)
 # All rights reserved.
-# Modified 2011 for version 2011.0.0 by titopoquito
-# Modified 2012 for version 2011.4.0 by titopoquito
-# Modified 2013 for version 2012.0.0 by titopoquito
-# Modified 2014 for version 2013.0.0 and 2014.0.0 by titopoquito
-#                                      (titopoquito@gmail.com)
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -28,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hugin
-VERSION=${VERSION:-2014.0.0}
+VERSION=${VERSION:-2015.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,18 +64,12 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 
-# make it compile with lensfun 0.3.0
-# taken from the gentoo-commits.gentoo.org
-# mailing list. Thanks to Francesco Riosa!
-# https://bugs.gentoo.org/show_bug.cgi?id=524700
-patch -p1 < $CWD/patch.lensfun-0.3.0
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
@@ -99,7 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 mv $PKG/usr/share/man $PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL_cmake LICENCE_VIGRA README README_JP \
+cp -a AUTHORS COPYING ChangeLog INSTALL_cmake README README_JP \
   TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/hugin/hugin.info b/graphics/hugin/hugin.info
index aae0d08df6..965382733d 100644
--- a/graphics/hugin/hugin.info
+++ b/graphics/hugin/hugin.info
@@ -1,10 +1,10 @@
 PRGNAM="hugin"
-VERSION="2014.0.0"
+VERSION="2015.0.0"
 HOMEPAGE="http://hugin.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2014.0.0.tar.bz2"
-MD5SUM="711784c27bdb743ddc45dc2c448ac87c"
+DOWNLOAD="http://downloads.sourceforge.net/hugin/hugin-2015.0.0.tar.bz2"
+MD5SUM="fda7d06f296d3d8ded5b03b0062642cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="enblend-enfuse exiftool lensfun libpano13 tclap wxPython"
+REQUIRES="enblend-enfuse exiftool libpano13 tclap wxPython"
 MAINTAINER="titopoquito"
 EMAIL="titopoquito@gmail.com"
diff --git a/graphics/hugin/patch.lensfun-0.3.0 b/graphics/hugin/patch.lensfun-0.3.0
deleted file mode 100644
index ff195c90e0..0000000000
--- a/graphics/hugin/patch.lensfun-0.3.0
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=524700
-
-diff -Naur hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp 
-hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp
---- hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp	2014-04-27 
-08:26:57.000000000 +0200
-+++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp	2014-10-08 
-10:44:29.445076647 +0200
-@@ -620,7 +620,9 @@
-                 break;
-             case LF_DIST_MODEL_NONE:
-             case LF_DIST_MODEL_POLY5:
-+#ifdef LF_DIST_MODEL_FOV1
-             case LF_DIST_MODEL_FOV1:
-+#endif
-             default:
-                 return false;
-                 break;
-
diff --git a/graphics/jp2a/README b/graphics/jp2a/README
new file mode 100644
index 0000000000..33f5bd0ca7
--- /dev/null
+++ b/graphics/jp2a/README
@@ -0,0 +1,2 @@
+jp2a is a small utility that converts JPG images to ASCII. It's written in C 
+and released under the GPL.
diff --git a/graphics/jp2a/jp2a.SlackBuild b/graphics/jp2a/jp2a.SlackBuild
new file mode 100644
index 0000000000..d7bb52a79e
--- /dev/null
+++ b/graphics/jp2a/jp2a.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for jp2a
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=jp2a
+VERSION=${VERSION:-1.0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog NEWS README AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/jp2a/jp2a.info b/graphics/jp2a/jp2a.info
new file mode 100644
index 0000000000..1e769e9296
--- /dev/null
+++ b/graphics/jp2a/jp2a.info
@@ -0,0 +1,10 @@
+PRGNAM="jp2a"
+VERSION="1.0.6"
+HOMEPAGE="https://csl.name/jp2a/"
+DOWNLOAD="http://sourceforge.net/projects/jp2a/files/jp2a/1.0.6/jp2a-1.0.6.tar.gz"
+MD5SUM="eb6281eee29acf1c494dcaf7d745a5df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/graphics/jp2a/slack-desc b/graphics/jp2a/slack-desc
new file mode 100644
index 0000000000..67bd3aad95
--- /dev/null
+++ b/graphics/jp2a/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+jp2a: jp2a (Image converter)
+jp2a:
+jp2a: jp2a is a small utility that converts JPG images to ASCII. It's
+jp2a: written in C and released under the GPL.
+jp2a:
+jp2a: Homepage: https://csl.name/jp2a/
+jp2a:
+jp2a:
+jp2a:
+jp2a:
+jp2a:
diff --git a/graphics/jpegoptim/jpegoptim.SlackBuild b/graphics/jpegoptim/jpegoptim.SlackBuild
index 4c51aa3d66..c325248577 100644
--- a/graphics/jpegoptim/jpegoptim.SlackBuild
+++ b/graphics/jpegoptim/jpegoptim.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/graphics/mozjpeg/mozjpeg.SlackBuild b/graphics/mozjpeg/mozjpeg.SlackBuild
index e6001fbb22..2439037a6c 100644
--- a/graphics/mozjpeg/mozjpeg.SlackBuild
+++ b/graphics/mozjpeg/mozjpeg.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/graphics/openimageio/005_tiffversion.diff b/graphics/openimageio/005_tiffversion.diff
deleted file mode 100644
index 1bcc3a59e9..0000000000
--- a/graphics/openimageio/005_tiffversion.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tiff.imageio/tiffoutput.cpp.orig	2015-02-12 15:30:01.000000000 +1000
-+++ src/tiff.imageio/tiffoutput.cpp	2015-03-12 17:46:38.306214366 +1000
-@@ -518,7 +518,7 @@
- bool
- TIFFOutput::write_exif_data ()
- {
--#if TIFFLIB_VERSION >= 20120922
-+#if TIFFLIB_VERSION > 20120922
-     // Older versions of libtiff do not support writing Exif directories
- 
-     // First, see if we have any Exif data at all
diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild
index cbe49db7cf..908e452406 100644
--- a/graphics/openimageio/openimageio.SlackBuild
+++ b/graphics/openimageio/openimageio.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=openimageio
 SRCNAM=oiio-Release
-VERSION=${VERSION:-1.5.12}
+VERSION=${VERSION:-1.5.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,7 +66,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
-patch -p0 < $CWD/005_tiffversion.diff
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/graphics/openimageio/openimageio.info b/graphics/openimageio/openimageio.info
index 05e15657cf..adff2ef161 100644
--- a/graphics/openimageio/openimageio.info
+++ b/graphics/openimageio/openimageio.info
@@ -1,10 +1,10 @@
 PRGNAM="openimageio"
-VERSION="1.5.12"
+VERSION="1.5.19"
 HOMEPAGE="https://sites.google.com/site/openimageio/home"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/openimageio/oiio-Release-1.5.12.tar.gz"
-MD5SUM="355162bc151df96f5488bfd5bc548658"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/openimageio/oiio-Release-1.5.19.tar.gz"
+MD5SUM="61ca1bbe47456f4c8578f536e3fd9b91"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="openjpeg LibRaw libwebp opencv opencolorio"
+REQUIRES="ffmpeg openjpeg LibRaw libwebp opencv opencolorio"
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/graphics/paraview/README b/graphics/paraview/README
index 29b5597534..219853a17c 100644
--- a/graphics/paraview/README
+++ b/graphics/paraview/README
@@ -4,3 +4,6 @@ visualizations to analyze their data using qualitative and
 quantitative techniques. The data exploration can be done
 interactively in 3D or programmatically using ParaView's batch
 processing capabilities.
+
+NOTE: Source is not downloadable from wget. Please download it manually
+via browser.
diff --git a/graphics/pdf2png/pdf2png.SlackBuild b/graphics/pdf2png/pdf2png.SlackBuild
index 4eb10311bf..47231e3e0a 100644
--- a/graphics/pdf2png/pdf2png.SlackBuild
+++ b/graphics/pdf2png/pdf2png.SlackBuild
@@ -40,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/graphics/phatch/phatch.info b/graphics/phatch/phatch.info
index 7b7a68dc44..0b4fea37b6 100644
--- a/graphics/phatch/phatch.info
+++ b/graphics/phatch/phatch.info
@@ -1,7 +1,7 @@
 PRGNAM="phatch"
 VERSION="0.2.7.1"
 HOMEPAGE="http://photobatch.stani.be"
-DOWNLOAD="http://photobatch.stani.be/download/package/phatch-0.2.7.1.tar.gz"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/phatch-0.2.7.1.tar.gz"
 MD5SUM="c0638bcc6510d340c03c40ddfb0a0c2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/phototonic/phototonic.SlackBuild b/graphics/phototonic/phototonic.SlackBuild
index 509d4b7e25..177743fda6 100644
--- a/graphics/phototonic/phototonic.SlackBuild
+++ b/graphics/phototonic/phototonic.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for phototonic
 
-# Copyright <2014-2015> <Dimitris Zlatanidis> <Orestiada, Greece>
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=phototonic
-VERSION=${VERSION:-1.6}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/phototonic/phototonic.info b/graphics/phototonic/phototonic.info
index 45be17b526..bb5266e781 100644
--- a/graphics/phototonic/phototonic.info
+++ b/graphics/phototonic/phototonic.info
@@ -1,8 +1,8 @@
 PRGNAM="phototonic"
-VERSION="1.6"
+VERSION="1.7"
 HOMEPAGE="http://oferkv.github.io/phototonic/"
-DOWNLOAD="https://github.com/oferkv/phototonic/archive/v1.6.tar.gz"
-MD5SUM="05aa3b8c31e34e3747c9208f10a2a5b9"
+DOWNLOAD="https://github.com/oferkv/phototonic/archive/v1.7.tar.gz"
+MD5SUM="9399d42b499a5124afa487fae4949d2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/graphics/pngcrush/pngcrush.SlackBuild b/graphics/pngcrush/pngcrush.SlackBuild
index 826da8a212..f367be9ed6 100644
--- a/graphics/pngcrush/pngcrush.SlackBuild
+++ b/graphics/pngcrush/pngcrush.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pngcrush
 
-# Copyright 2012 Leo Midha <netrixtardis at stealth3 dot com>, San Antonio, Texas.
+# Copyright 2012-2015 Leo Midha <netrixtardis at stealth3 dot com>, San Antonio, Texas.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Maintained by Eugene M. <damagedone at gmx dot com>
+# Maintained by Eugene M., <damagedone at gmx dot com>
 
 PRGNAM=pngcrush
-VERSION=${VERSION:-1.7.85}
+VERSION=${VERSION:-1.7.88}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/pngcrush/pngcrush.info b/graphics/pngcrush/pngcrush.info
index a3ce5db816..5599f1368f 100644
--- a/graphics/pngcrush/pngcrush.info
+++ b/graphics/pngcrush/pngcrush.info
@@ -1,8 +1,8 @@
 PRGNAM="pngcrush"
-VERSION="1.7.85"
+VERSION="1.7.88"
 HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
-DOWNLOAD="http://downloads.sourceforge.net/pmt/pngcrush-1.7.85.tar.xz"
-MD5SUM="c86e88856d9b3148da6c41d164108a9c "
+DOWNLOAD="http://downloads.sourceforge.net/pmt/pngcrush-1.7.88.tar.xz"
+MD5SUM="3146ad1e095a1c5a93e4fe7e4210e655"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/pngquant/pngquant.SlackBuild b/graphics/pngquant/pngquant.SlackBuild
index 64047a440d..f64f41e326 100644
--- a/graphics/pngquant/pngquant.SlackBuild
+++ b/graphics/pngquant/pngquant.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pngquant
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/pngquant/pngquant.info b/graphics/pngquant/pngquant.info
index c957b09c86..dba334ab8a 100644
--- a/graphics/pngquant/pngquant.info
+++ b/graphics/pngquant/pngquant.info
@@ -1,8 +1,8 @@
 PRGNAM="pngquant"
-VERSION="2.5.0"
+VERSION="2.5.2"
 HOMEPAGE="https://pngquant.org/"
-DOWNLOAD="https://pngquant.org/pngquant-2.5.0-src.tar.bz2"
-MD5SUM="946bbb125004316b86bc201796152596"
+DOWNLOAD="https://pngquant.org/pngquant-2.5.2-src.tar.bz2"
+MD5SUM="1c9981fdbdfabdcfaca29ce0cb7ec654"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/potrace/potrace.SlackBuild b/graphics/potrace/potrace.SlackBuild
index cf9e38bc80..0a811073bd 100644
--- a/graphics/potrace/potrace.SlackBuild
+++ b/graphics/potrace/potrace.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=potrace
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/potrace/potrace.info b/graphics/potrace/potrace.info
index 67da0371e3..e7e09ef581 100644
--- a/graphics/potrace/potrace.info
+++ b/graphics/potrace/potrace.info
@@ -1,8 +1,8 @@
 PRGNAM="potrace"
-VERSION="1.12"
+VERSION="1.13"
 HOMEPAGE="http://potrace.sourceforge.net/"
-DOWNLOAD="http://potrace.sourceforge.net/download/1.12/potrace-1.12.tar.gz"
-MD5SUM="314850e30ae4319f0615efdae485abaa"
+DOWNLOAD="http://potrace.sourceforge.net/download/1.13/potrace-1.13.tar.gz"
+MD5SUM="f26888fc2fbfa96fa79ce07fdcf4bb70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/pygraphviz/pygraphviz.SlackBuild b/graphics/pygraphviz/pygraphviz.SlackBuild
index e5e9504543..f83a68ace0 100644
--- a/graphics/pygraphviz/pygraphviz.SlackBuild
+++ b/graphics/pygraphviz/pygraphviz.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pygraphviz
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pygraphviz
-VERSION=${VERSION:-1.3rc2}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,20 +69,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# fix doc path
+sed -i "s/share\/doc/doc/" setup.py
+
 python setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM-$VERSION/examples/ $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL.txt PKG-INFO README.txt doc/source/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL.txt PKG-INFO README.rst doc/source/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rm -rf $PKG/usr/share
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/graphics/pygraphviz/pygraphviz.info b/graphics/pygraphviz/pygraphviz.info
index c94f4a8684..5bfdd21f5a 100644
--- a/graphics/pygraphviz/pygraphviz.info
+++ b/graphics/pygraphviz/pygraphviz.info
@@ -1,10 +1,10 @@
 PRGNAM="pygraphviz"
-VERSION="1.3rc2"
+VERSION="1.3.1"
 HOMEPAGE="http://pygraphviz.github.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pygraphviz/pygraphviz-1.3rc2.tar.gz"
-MD5SUM="061ff5c4b8ea4b7cd05be0588172ef07"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pygraphviz/pygraphviz-1.3.1.tar.gz"
+MD5SUM="7f690295dfe77edaa9e552d09d98d279"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="graphviz"
+REQUIRES="pysetuptools graphviz"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/graphics/qcad/README b/graphics/qcad/README
index 2f1c41e12b..0837ac6dac 100644
--- a/graphics/qcad/README
+++ b/graphics/qcad/README
@@ -3,4 +3,8 @@ dimensions (2D). With QCAD you can create technical drawings such as plans for
 buildings, interiors, mechanical parts or schematics and diagrams. QCAD works on 
 Windows, Mac OS X and Linux.
 
-Optional dependency: libqsqlpsql
+Optional dependency: libqsqlpsql and qt5
+
+To build qt5 version of qcad run the slackbuild with QT5=yes.
+
+  # QT5=yes ./qcad.SlackBuild
diff --git a/graphics/qcad/qcad.SlackBuild b/graphics/qcad/qcad.SlackBuild
index b1c6d61731..0af254919b 100644
--- a/graphics/qcad/qcad.SlackBuild
+++ b/graphics/qcad/qcad.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qcad
-VERSION=${VERSION:-3.9.1.3}
+VERSION=${VERSION:-3.12.4.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  CONFIG+=release -o Makefile $PRGNAM.pro
+
+# Build with Qt5/Qt4. Default is Qt4.
+if [ "${QT5:-no}" == "yes" ]; then
+  qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    CONFIG+=release -o Makefile $PRGNAM.pro
+  QTDIRECTORY="qt5"
+else
+  qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    CONFIG+=release -o Makefile $PRGNAM.pro
+  QTDIRECTORY="qt"
+fi
 
 make
 
@@ -80,23 +89,33 @@ cp -ar examples fonts libraries linetypes patterns plugins scripts ts $PKG/usr/s
 cp release/* $PKG/usr/share/$PRGNAM
 install -m 0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
 
-# Don't repackage libraries that already come with qt4.
-rm -f $PKG/usr/share/$PRGNAM/plugins/designer/libqwebview.so \
+# Don't repackage libraries that already come with Qt4/Qt5.
+rm -f $PKG/usr/share/$PRGNAM/plugins/designer/{libqwebview.so,readme.txt} \
   $PKG/usr/share/$PRGNAM/plugins/sqldrivers/* \
-  $PKG/usr/share/$PRGNAM/plugins/imageformats/* \
-  $PKG/usr/share/$PRGNAM/plugins/codecs/*
+  $PKG/usr/share/$PRGNAM/plugins/imageformats/*
 
-ln -s /usr/lib${LIBDIRSUFFIX}/qt/plugins/designer/libqwebview.so \
+ln -s /usr/lib${LIBDIRSUFFIX}/${QTDIRECTORY}/plugins/designer/libqwebview.so \
   $PKG/usr/share/$PRGNAM/plugins/designer/libqwebview.so
-for i in /usr/lib${LIBDIRSUFFIX}/qt/plugins/imageformats/*.so; do
+for i in /usr/lib${LIBDIRSUFFIX}/${QTDIRECTORY}/plugins/imageformats/*.so; do
   ln -s $i $PKG/usr/share/$PRGNAM/plugins/imageformats/$(basename $i)
 done
-for i in /usr/lib${LIBDIRSUFFIX}/qt/plugins/sqldrivers/*.so; do
+for i in /usr/lib${LIBDIRSUFFIX}/${QTDIRECTORY}/plugins/sqldrivers/*.so; do
   ln -s $i $PKG/usr/share/$PRGNAM/plugins/sqldrivers/$(basename $i)
 done
-for i in /usr/lib${LIBDIRSUFFIX}/qt/plugins/codecs/*; do
-  ln -s $i $PKG/usr/share/$PRGNAM/plugins/codecs/$(basename $i)
-done
+
+if [ "$QT5" == "yes" ]; then
+  rm -rf $PKG/usr/share/$PRGNAM/plugins/codecs \
+    $PKG/usr/share/$PRGNAM/plugins/printsupport/readme.txt
+  for i in /usr/lib${LIBDIRSUFFIX}/${QTDIRECTORY}/plugins/printsupport/*; do
+    ln -s $i $PKG/usr/share/$PRGNAM/plugins/printsupport/$(basename $i)
+  done
+else
+  rm -rf $PKG/usr/share/$PRGNAM/plugins/codecs/* \
+    $PKG/usr/share/$PRGNAM/plugins/printsupport
+  for i in /usr/lib${LIBDIRSUFFIX}/${QTDIRECTORY}/plugins/codecs/*; do
+    ln -s $i $PKG/usr/share/$PRGNAM/plugins/codecs/$(basename $i)
+  done
+fi
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -106,12 +125,13 @@ install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
 for i in 16 32 48 64 96 128; do
   convert scripts/${PRGNAM}_icon.png -resize ${i}x${i}! $PRGNAM-$i.png
-  install -D -m 0644 $PRGNAM-$i.png $PKG/usr/share/icons/hicolor/${i}x${i}/$PRGNAM.png
+  install -D -m 0644 $PRGNAM-$i.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
 done
 
 # A little clean up.
 find $PKG \( -name "*\.pro" -o -name "*\.pri" -o -name "*\.a" \
-  -o -name "*\.ts" \) -exec rm -f '{}' \;
+  -o -name "*\.ts" -o -name "\.gitignore" \) -exec rm -f '{}' \;
+find $PKG -type d -empty -delete
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/qcad/qcad.info b/graphics/qcad/qcad.info
index 0808426ecd..14243e22e1 100644
--- a/graphics/qcad/qcad.info
+++ b/graphics/qcad/qcad.info
@@ -1,8 +1,8 @@
 PRGNAM="qcad"
-VERSION="3.9.1.3"
+VERSION="3.12.4.8"
 HOMEPAGE="http://www.qcad.org/en/"
-DOWNLOAD="https://github.com/qcad/qcad/archive/v3.9.1.3.tar.gz"
-MD5SUM="90f5d3f7001a23258183cf864c65eea9"
+DOWNLOAD="https://github.com/qcad/qcad/archive/v3.12.4.8.tar.gz"
+MD5SUM="89b92dbbbad554bfbb210313241ac728"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/qelectrotech/qelectrotech.SlackBuild b/graphics/qelectrotech/qelectrotech.SlackBuild
index 2a7f862f09..cafcf4b360 100644
--- a/graphics/qelectrotech/qelectrotech.SlackBuild
+++ b/graphics/qelectrotech/qelectrotech.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qelectrotech
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,7 +59,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-src
 tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
 cd $PRGNAM-$VERSION-src
 
@@ -71,30 +71,30 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake
+qmake-qt5
 make
 make INSTALL_ROOT=$PKG install
 
-rm -r $PKG/share
-rm $PKG/usr/share/applications/qelectrotech.desktop
-rm -r $PKG/usr/doc/qelectrotech
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+rm -rf $PKG/usr/doc/$PRGNAM
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ELEMENTS.LICENSE LICENSE INSTALL CREDIT README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ELEMENTS.LICENSE LICENSE INSTALL CREDIT README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+mv $PKG/share/* $PKG/usr/share/
+rm -rf $PKG/share
+
 mkdir -p $PKG/usr/share/applications
 cat <<EOF > $PKG/usr/share/applications/qelectrotech.desktop
 [Desktop Entry]
diff --git a/graphics/qelectrotech/qelectrotech.info b/graphics/qelectrotech/qelectrotech.info
index a00e75099f..87fa722b34 100644
--- a/graphics/qelectrotech/qelectrotech.info
+++ b/graphics/qelectrotech/qelectrotech.info
@@ -1,10 +1,10 @@
 PRGNAM="qelectrotech"
-VERSION="0.4"
+VERSION="0.5"
 HOMEPAGE="http://qelectrotech.org/"
-DOWNLOAD="http://download.tuxfamily.org/qet/tags/20150220/qelectrotech-0.4-src.tar.gz"
-MD5SUM="3699e5718e0adc361511513c9f1f7ea1"
+DOWNLOAD="http://download.tuxfamily.org/qet/tags/20151127/qelectrotech-0.5-src.tar.gz"
+MD5SUM="6fdf6d0a9fa7437e3555d5a940e1a1e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
 MAINTAINER="R. S. Ananda Murthy"
 EMAIL="rsamurti@gmail.com"
diff --git a/graphics/rawstudio/patches/lensfun03.patch b/graphics/rawstudio/patches/lensfun03.patch
new file mode 100644
index 0000000000..ee2f3554e7
--- /dev/null
+++ b/graphics/rawstudio/patches/lensfun03.patch
@@ -0,0 +1,11 @@
+--- a/plugins/lensfun/lensfun.c
++++ b/plugins/lensfun/lensfun.c
+@@ -668,7 +668,7 @@ get_image(RSFilter *filter, const RSFilterRequest *request)
+ 			}
+ 
+ 			/* Start threads to apply phase 2, Vignetting and CA Correction */
+-			if (effective_flags & (LF_MODIFY_VIGNETTING | LF_MODIFY_CCI)) 
++			if (effective_flags & LF_MODIFY_VIGNETTING)
+ 			{
+ 				/* Phase 2 is corrected inplace, so copy input first */
+ 				guint y_offset, y_per_thread, threaded_h;
diff --git a/graphics/rawstudio/patches/libpng15.patch b/graphics/rawstudio/patches/libpng15.patch
new file mode 100644
index 0000000000..f83e82de85
--- /dev/null
+++ b/graphics/rawstudio/patches/libpng15.patch
@@ -0,0 +1,40 @@
+diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp
+--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp	2011-02-24 01:35:18.000000000 +0300
++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp	2012-01-23 15:03:22.000000000 +0400
+@@ -102,8 +102,8 @@
+ 	{
+ 		*linear_guess = FALSE;
+ 		RSColorSpace* profile = NULL;
+-		const gchar *icc_profile_title;
+-		const gchar *icc_profile;
++		png_charp icc_profile_title;
++		png_bytep icc_profile;
+ 		guint icc_profile_size;
+ 		png_structp png_ptr = png_create_read_struct(
+ 				PNG_LIBPNG_VER_STRING,
+@@ -125,11 +125,11 @@
+ 
+ 					int compression_type;
+ 					/* Extract embedded ICC profile */
+-					if (info_ptr->valid & PNG_INFO_iCCP)
++					if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP))
+ 					{
+ 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+-													(png_charpp) &icc_profile_title, &compression_type,
+-													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++													&icc_profile_title, &compression_type,
++													&icc_profile, (png_uint_32*) &icc_profile_size);
+ 						if (retval != 0)
+ 						{
+ 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
+diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c
+--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c	2011-03-26 04:52:29.000000000 +0300
++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c	2012-01-23 15:04:59.000000000 +0400
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
\ No newline at end of file
diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild
index 38abc69ae6..3c16761bc7 100644
--- a/graphics/rawstudio/rawstudio.SlackBuild
+++ b/graphics/rawstudio/rawstudio.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for rawstudio
 # Home Page http://rawstudio.org/
 
-# Copyright (c) 2007-2011, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net)
+# Copyright (c) 2007-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +30,7 @@
 
 PRGNAM="rawstudio"
 VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,19 +65,29 @@ set -e
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Add libgthread-2.0.so to linked-in library list
 find . -name "Makefile.in" -exec \
   sed -i "s,@PACKAGE_LIBS@,@PACKAGE_LIBS@ -lgthread-2.0,g" {} \;
 
+# Patches shamelessly copied from Arch Linux PKGBUILD:
+# https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/rawstudio
+
+# Patch to use lensfun > 0.3
+patch -p1 < $CWD/patches/lensfun03.patch
+
+# Patch to use libpng > 1.5.  This patch is only useful on -current and will need to
+# be applied once -current releases.  Uncomment if you are building on -current
+#patch -p1 < $CWD/patches/libpng15.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,12 +96,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/rawstudio/rawstudio.info b/graphics/rawstudio/rawstudio.info
index decba94be1..ae0face6fa 100644
--- a/graphics/rawstudio/rawstudio.info
+++ b/graphics/rawstudio/rawstudio.info
@@ -1,10 +1,10 @@
 PRGNAM="rawstudio"
 VERSION="2.0"
-HOMEPAGE="http://rawstudio.org/"
-DOWNLOAD="http://rawstudio.org/files/release/rawstudio-2.0.tar.gz"
-MD5SUM="b2f86b8ca6b83ad954e3104c4cb89e9b"
+HOMEPAGE="http://rawstudio.org"
+DOWNLOAD="https://www.dropbox.com/s/9msuzeooe5w7tiq/rawstudio-2.0.tar.xz"
+MD5SUM="10c8305dbf73a616f7ab414009fb5455"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="flickcurl lensfun-legacy"
+REQUIRES="flickcurl lensfun"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
diff --git a/graphics/scrot/scrot.SlackBuild b/graphics/scrot/scrot.SlackBuild
index 94667cf2d6..2f9c8199fd 100644
--- a/graphics/scrot/scrot.SlackBuild
+++ b/graphics/scrot/scrot.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/graphics/shutter/shutter.info b/graphics/shutter/shutter.info
index 712c10d72a..07f1f61710 100644
--- a/graphics/shutter/shutter.info
+++ b/graphics/shutter/shutter.info
@@ -5,8 +5,7 @@ DOWNLOAD="http://shutter-project.org/wp-content/uploads/releases/tars/shutter-0.
 MD5SUM="8a7bf8ce4580d82efedd516f6cdaa43d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-gnome2 perl-gnome2-gconf perl-gnome2-wnck perl-gtk2-imageview
-perl-net-dbus perl-Proc-ProcessTable perl-www-mechanize perl-x11-protocol
-perl-Gtk2-Unique"
+REQUIRES="perl-gnome2 perl-gnome2-gconf perl-gnome2-wnck perl-gtk2-imageview perl-net-dbus \
+perl-Proc-ProcessTable perl-www-mechanize perl-x11-protocol perl-Gtk2-Unique"
 MAINTAINER="Donald Cooley"
 EMAIL="dfc@warpmail.net"
diff --git a/graphics/tesseract/README b/graphics/tesseract/README
index 5feadb549d..f159608df6 100644
--- a/graphics/tesseract/README
+++ b/graphics/tesseract/README
@@ -5,14 +5,8 @@ by UNLV. It was open-sourced by HP and UNLV in 2005.
 You will need to get one of the language packs in order to do anything
 useful with tesseract, and that language pack tarball should be present
 in the same directory as the SlackBuild script when the package is created.
-See http://code.google.com/p/tesseract-ocr/downloads/list for a list of
-all available language packs.  Note that you can install more than one
-(or even all) of the language packs, as they do not conflict with each
-other.  The build script defaults to use English, but this is easily 
-changed by passing an alternate value on the command line.
-
-Here is the relevant code from the build script:
-  # Language pack(s) to use
-  # We'll install English by default, but you can pass another one.
-  # Edit the LANGNAM variable to switch to (or add) another language
-  # see https://code.google.com/p/tesseract-ocr/downloads/list for the list
+See the website for a list of all available language packs.  Note that you
+can install more than one (or even all) of the language packs, as they do
+not conflict with each other. The build script defaults to use English, but
+this is easily changed by passing an alternate value on the command line:
+edit the LANGNAM variable to switch to (or add) another language.
diff --git a/graphics/tesseract/slack-desc b/graphics/tesseract/slack-desc
index addc34c30a..5a90f2564c 100644
--- a/graphics/tesseract/slack-desc
+++ b/graphics/tesseract/slack-desc
@@ -13,7 +13,7 @@ tesseract: at HP between 1985 and 1995. In 1995, this engine was among the
 tesseract: top 3 evaluated by UNLV. It was open-sourced by HP and UNLV in
 tesseract: 2005.
 tesseract:
-tesseract: http://code.google.com/p/tesseract-ocr/
+tesseract:
 tesseract:
 tesseract:
 tesseract:
diff --git a/graphics/tesseract/tesseract.SlackBuild b/graphics/tesseract/tesseract.SlackBuild
index 90ba6f3577..20be19b845 100644
--- a/graphics/tesseract/tesseract.SlackBuild
+++ b/graphics/tesseract/tesseract.SlackBuild
@@ -2,7 +2,7 @@
 # Slackware build script for tesseract
 
 # Copyright 2009-2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
-# Copyright 2013 LukenShiro, Italy
+# Copyright 2013-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -31,7 +31,7 @@
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 
 PRGNAM=tesseract
-VERSION=${VERSION:-3.02.02}
+VERSION=${VERSION:-3.04.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,8 +71,7 @@ DOCFILES="AUTHORS COPYING ChangeLog INSTALL NEWS README ReleaseNotes"
 # slk ron por pol nor nld msa mlt mkd mal lit lav kor kan ita_old ita isl
 # ind chr hun hrv hin heb glg frm frk fra fin eus est equ epo enm ell due
 # dan ces cat bul ben bel aze ara afr jpn chi_sim chi_tra rus vie
-# see https://code.google.com/p/tesseract-ocr/downloads/list for complete list
-LANGVER=${LANGVER:-3.02}
+# see https://github.com/tesseract-ocr/tessdata/ for a list.
 LANGNAM=${LANGNAM:-"eng"}
 
 set -e
@@ -80,7 +79,7 @@ set -e
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -102,13 +101,14 @@ CFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+make training
+make training-install DESTDIR=$PKG
 
-# Extract language name described above;
+# Install language name described above;
 # language files are not automatically installed.
 mkdir -p $PKG/usr/share/tessdata
-for LNG in $LANGNAM; \
- do tar xvf $CWD/tesseract-ocr-$LANGVER.$LNG.tar.gz ; \
- mv tesseract-ocr/tessdata/* $PKG/usr/share/tessdata/
+for LNG in $LANGNAM ; \
+  do cp $CWD/$LNG.traineddata $PKG/usr/share/tessdata/ ; \
 done
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/graphics/tesseract/tesseract.info b/graphics/tesseract/tesseract.info
index 9d0e42ae69..1a4862f2a0 100644
--- a/graphics/tesseract/tesseract.info
+++ b/graphics/tesseract/tesseract.info
@@ -1,10 +1,10 @@
 PRGNAM="tesseract"
-VERSION="3.02.02"
-HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
-DOWNLOAD="https://tesseract-ocr.googlecode.com/files/tesseract-3.02.02.tar.gz \
-          https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz"
-MD5SUM="3d57ee5777fa998632ad0693c13a0e9e \
-        3562250fe6f4e76229a329166b8ae853"
+VERSION="3.04.00"
+HOMEPAGE="https://github.com/tesseract-ocr"
+DOWNLOAD="https://github.com/tesseract-ocr/tesseract/archive/3.04.00.tar.gz \
+          https://github.com/tesseract-ocr/tessdata/raw/3.04.00/eng.traineddata"
+MD5SUM="078130b9c7d28c558a0e49d432505864 \
+        59a99c829aa385ae8cde35775e32e57f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="leptonica"
diff --git a/graphics/ufraw/README b/graphics/ufraw/README
index 51a75a0564..3b99ae94ee 100644
--- a/graphics/ufraw/README
+++ b/graphics/ufraw/README
@@ -3,10 +3,9 @@ raw images from digital cameras.  It supports most of the existing raw
 formats (any format supported by DCRaw).  UFRaw can be used on its own or
 as a Gimp plug-in.
 
-You can add "--enable-extras" to the configure arguments in the build
-script to use the included dcraw and avoid the recommended dependency
-dcraw.
-
 UFRaw requires gtkimageview to include the image preview window. You can
 build it without gtkimageview (run with GTK=no) but you'll only have
 command line interface to UFRaw.
+
+cfitsio (available in SBo) is an optional dependency to support FITS file
+format.
diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild
index 4f89bcbb51..6a77d6f771 100644
--- a/graphics/ufraw/ufraw.SlackBuild
+++ b/graphics/ufraw/ufraw.SlackBuild
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="ufraw"
-VERSION=${VERSION:-0.21}
+VERSION=${VERSION:-0.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,6 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-mime \
+  --enable-extras \
+  --enable-dst-correction \
+  --enable-contrast \
   --build=$ARCH-slackware-linux \
   $gtk_option
 
@@ -95,6 +98,9 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# remove dcraw executable - we have a separate package in SBo which provides this.
+rm -f $PKG/usr/bin/dcraw
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
diff --git a/graphics/ufraw/ufraw.info b/graphics/ufraw/ufraw.info
index 3dc4f618d8..2cd98f3795 100644
--- a/graphics/ufraw/ufraw.info
+++ b/graphics/ufraw/ufraw.info
@@ -1,8 +1,8 @@
 PRGNAM="ufraw"
-VERSION="0.21"
+VERSION="0.22"
 HOMEPAGE="http://ufraw.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/ufraw/ufraw/ufraw-0.21/ufraw-0.21.tar.gz"
-MD5SUM="897873deec92f88e2b7c4e8699959f6f"
+DOWNLOAD="http://downloads.sourceforge.net/project/ufraw/ufraw/ufraw-0.22/ufraw-0.22.tar.gz"
+MD5SUM="c30767cae2c44310f2a3d67d7a76f2c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dcraw gtkimageview lensfun"
diff --git a/graphics/vips/README b/graphics/vips/README
new file mode 100644
index 0000000000..cdf96e9946
--- /dev/null
+++ b/graphics/vips/README
@@ -0,0 +1,6 @@
+VIPS is a free image processing system. It includes a range of filters, 
+arithmetic operations, colour processing, histograms, and geometric 
+transforms. It supports ten pixel formats, from 8-bit unsigned int 
+to 128-bit complex. As well as the usual JPEG, TIFF, PNG and WebP images,
+it also supports scientific formats like FITS, OpenEXR, Matlab, Analyze, 
+PFM, Radiance, OpenSlide and DICOM (via libMagick).
diff --git a/graphics/vips/slack-desc b/graphics/vips/slack-desc
new file mode 100644
index 0000000000..f68d5653d6
--- /dev/null
+++ b/graphics/vips/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |----handy-ruler----------------------------------------------------------|
+vips: vips (Free Image Processing System)
+vips:
+vips: VIPS is a free image processing system. It includes a range of filters, 
+vips: arithmetic operations, colour processing, histograms, and geometric 
+vips: transforms. It supports ten pixel formats, from 8-bit unsigned int 
+vips: to 128-bit complex. As well as the usual JPEG, TIFF, PNG and WebP images,
+vips: it also supports scientific formats like FITS, OpenEXR, Matlab, Analyze, 
+vips: PFM, Radiance, OpenSlide and DICOM (via libMagick).
+vips: 
+vips: http://www.vips.ecs.soton.ac.uk/index.php?title=VIPS
+vips:
diff --git a/graphics/vips/vips.SlackBuild b/graphics/vips/vips.SlackBuild
new file mode 100644
index 0000000000..1512b752c0
--- /dev/null
+++ b/graphics/vips/vips.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+#
+# Slackware Package Build Script for vips
+# Build script by <DIO> igor29768 @ gmail.com
+# Version 151119
+#
+# http://www.vips.ecs.soton.ac.uk/index.php?title=VIPS
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+PRGNAM="vips"
+VERSION=${VERSION:-8.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $TMP/$PRGNAM-$VERSION $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $TMP/$PRGNAM-$VERSION
+chown -R root.root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i \
+  -e "s:PYTHON_EXEC_PREFIX/lib/:PYTHON_EXEC_PREFIX/lib${LIBDIRSUFFIX}/:" \
+  configure
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux \
+  $gtk_option
+
+make V=1
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/vips/vips.info b/graphics/vips/vips.info
new file mode 100644
index 0000000000..d852b6ef4e
--- /dev/null
+++ b/graphics/vips/vips.info
@@ -0,0 +1,10 @@
+PRGNAM="vips"
+VERSION="8.1.1"
+HOMEPAGE="http://www.vips.ecs.soton.ac.uk/index.php?title=VIPS"
+DOWNLOAD="http://www.vips.ecs.soton.ac.uk/supported/8.1/vips-8.1.1.tar.gz"
+MD5SUM="7311df69cf0f3ae0666e0ead15b98cb0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="cfitsio libjpeg-turbo libwebp orc"
+MAINTAINER="Igor"
+EMAIL="igor29768@gmail.com"
diff --git a/graphics/xcalib/xcalib.info b/graphics/xcalib/xcalib.info
index 96c70d0f1b..3c4a1493cf 100644
--- a/graphics/xcalib/xcalib.info
+++ b/graphics/xcalib/xcalib.info
@@ -1,7 +1,7 @@
 PRGNAM="xcalib"
 VERSION="0.8"
 HOMEPAGE="http://xcalib.sourceforge.net"
-DOWNLOAD="http://colocrossing.dl.sourceforge.net/project/xcalib/xcalib/0.8/xcalib-source-0.8.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/xcalib/xcalib/0.8/xcalib-source-0.8.tar.gz"
 MD5SUM="1fbcae44ad8d754512fdd1e5f1b3a7e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/graphics/yagf/slack-desc b/graphics/yagf/slack-desc
index bd2cb93fa2..b48628de28 100644
--- a/graphics/yagf/slack-desc
+++ b/graphics/yagf/slack-desc
@@ -14,6 +14,6 @@ yagf: XSane, perform images preprocessing and recognize texts using
 yagf: cuneiform from a single command centre. YAGF also makes it easy to
 yagf: scan and recognize several images sequentially.
 yagf:
-yagf: Homepage: http://symmetrica.net/cuneiform-linux/yagf-en.html
+yagf: Homepage: http://sourceforge.net/projects/yagf-ocr/
 yagf:
 yagf:
diff --git a/graphics/yagf/yagf.info b/graphics/yagf/yagf.info
index b7b89bc14d..c6ccd0d775 100644
--- a/graphics/yagf/yagf.info
+++ b/graphics/yagf/yagf.info
@@ -1,6 +1,6 @@
 PRGNAM="yagf"
 VERSION="0.9.5"
-HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
+HOMEPAGE="http://sourceforge.net/projects/yagf-ocr/"
 DOWNLOAD="http://downloads.sourceforge.net/yagf-ocr/yagf-0.9.5.tar.gz"
 MD5SUM="cc01d671fafbfa71fad3d95591ccca37"
 DOWNLOAD_x86_64=""
diff --git a/graphics/yed/yed.info b/graphics/yed/yed.info
index 61aeb12305..ff331c5c29 100644
--- a/graphics/yed/yed.info
+++ b/graphics/yed/yed.info
@@ -1,7 +1,7 @@
 PRGNAM="yed"
 VERSION="3.14.2"
 HOMEPAGE="http://www.yworks.com/en/products_yed_about.html"
-DOWNLOAD="http://www.yworks.com/products/yed/demo/yEd-3.14.2.zip"
+DOWNLOAD="ftp://ftp.kajak.org.pl/distfiles/yEd-3.14.2.zip"
 MD5SUM="ed8b0c766148d0855d2620b6d352317e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/ham/aprx/aprx.SlackBuild b/ham/aprx/aprx.SlackBuild
index a6ba117547..4de405b44b 100644
--- a/ham/aprx/aprx.SlackBuild
+++ b/ham/aprx/aprx.SlackBuild
@@ -106,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/baudline/baudline.SlackBuild b/ham/baudline/baudline.SlackBuild
index 562268d1bf..de6e581cca 100644
--- a/ham/baudline/baudline.SlackBuild
+++ b/ham/baudline/baudline.SlackBuild
@@ -25,9 +25,10 @@ VERSION=${VERSION:-1.08}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-case "$( uname -m )" in
-    i?86) ARCH=x86 ;;
-    x86_64) ARCH=x86_64 ;;
+case "${ARCH:-$(uname -m)}" in
+    i?86)   SRCARCH=i686;   ARCHDIR=x86    ;;
+    x86_64) SRCARCH=x86_64; ARCHDIR=x86_64 ;;
+    *) echo "$ARCH is not supported"; exit 1 ;;
 esac
 
 CWD=$(pwd)
@@ -40,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM\_$VERSION\_linux_$ARCH.tar.gz
-cd $PRGNAM\_$VERSION\_linux_$ARCH
+rm -rf ${PRGNAM}_${VERSION}_linux_${ARCHDIR}
+tar -xvf $CWD/${PRGNAM}_${VERSION}_linux_${SRCARCH}.tar.gz
+cd ${PRGNAM}_${VERSION}_linux_${ARCHDIR}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -80,4 +81,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/chirp/chirp.SlackBuild b/ham/chirp/chirp.SlackBuild
index c6549f04a7..3622036f5a 100644
--- a/ham/chirp/chirp.SlackBuild
+++ b/ham/chirp/chirp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for chirp
 
-# Copyright 2014,2015  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2014,2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=chirp
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-20160215}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=$PRGNAM-daily
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -59,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/ham/chirp/chirp.info b/ham/chirp/chirp.info
index 08dc9eced0..a4baaadb22 100644
--- a/ham/chirp/chirp.info
+++ b/ham/chirp/chirp.info
@@ -1,8 +1,8 @@
 PRGNAM="chirp"
-VERSION="0.4.1"
+VERSION="20160215"
 HOMEPAGE="http://chirp.danplanet.com/projects/chirp/wiki/Home"
-DOWNLOAD="http://chirp.danplanet.com/download/0.4.1/chirp-0.4.1.tar.gz"
-MD5SUM="a86efa2bb05c33419b36cc9969327c86"
+DOWNLOAD="http://trac.chirp.danplanet.com/chirp_daily/daily-20160215/chirp-daily-20160215.tar.gz"
+MD5SUM="2addc42f71867cc3170276d14bceb173"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyserial"
diff --git a/ham/chirp/fixup-chirp.desktop.patch b/ham/chirp/fixup-chirp.desktop.patch
index 7f7ee5eae8..8dc7914ca5 100644
--- a/ham/chirp/fixup-chirp.desktop.patch
+++ b/ham/chirp/fixup-chirp.desktop.patch
@@ -14,7 +14,7 @@ diff -Nur chirp-0.4.0.orig/share/chirp.desktop chirp-0.4.0/share/chirp.desktop
  Terminal=false
 -Categories=Application;HamRadio
 -MimeType=inode/directory
-+Categories=Development;HamRadio;
++Categories=System;HamRadio;
 +MimeType=inode/directory;
  Name=CHIRP
  Comment=CHIRP Radio Programming Tool
diff --git a/ham/cwdaemon/cwdaemon.SlackBuild b/ham/cwdaemon/cwdaemon.SlackBuild
index 751eb2bd50..2e6a1066d5 100644
--- a/ham/cwdaemon/cwdaemon.SlackBuild
+++ b/ham/cwdaemon/cwdaemon.SlackBuild
@@ -96,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/cwstation/cwstation.info b/ham/cwstation/cwstation.info
index 3a7faded45..e5d0d5aeb4 100644
--- a/ham/cwstation/cwstation.info
+++ b/ham/cwstation/cwstation.info
@@ -1,7 +1,7 @@
 PRGNAM="cwstation"
 VERSION="0.1"
 HOMEPAGE="http://cwstation.sourceforge.net/"
-DOWNLOAD="http://waix.dl.sourceforge.net/project/cwstation/cwstation/cwstation%200.1/cwstation-0.1.tar.gz"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/ham/cwstation/cwstation-0.1.tar.gz"
 MD5SUM="2927f01fc3b2fcf5a1ba4dcfcb9d3f69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/ham/direwolf/direwolf.SlackBuild b/ham/direwolf/direwolf.SlackBuild
index 1a45dc3c43..ae8d1d4c6e 100644
--- a/ham/direwolf/direwolf.SlackBuild
+++ b/ham/direwolf/direwolf.SlackBuild
@@ -68,7 +68,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix some silly Makefile choices
-patch -p0 < $CWD/Makefile.patch
+todos < $CWD/Makefile.patch | patch -p0 --binary
 
 CFLAGS="$SLKCFLAGS -DUSE_ALSA -pthread -Iutm" \
 LDFLAGS="-L/lib${LIBDIRSUFFIX} -L/usr/lib${LIBDIRSUFFIX}" \
@@ -101,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/direwolf/direwolf.info b/ham/direwolf/direwolf.info
index 82bf651906..f9cf998e99 100644
--- a/ham/direwolf/direwolf.info
+++ b/ham/direwolf/direwolf.info
@@ -1,7 +1,7 @@
 PRGNAM="direwolf"
 VERSION="1.1"
 HOMEPAGE="http://home.comcast.net/~wb2osz/site/"
-DOWNLOAD="http://home.comcast.net/~wb2osz/Version%201.1/direwolf-1.1-src.zip"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/ham/direwolf/direwolf-1.1-src.zip"
 MD5SUM="6ea127d4c952eec1e5fb07355045f41d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/ham/dxcc/cty.dat b/ham/dxcc/cty.dat
index 37e909e21f..8cc053e5e8 100644
--- a/ham/dxcc/cty.dat
+++ b/ham/dxcc/cty.dat
@@ -1,7 +1,7 @@
 Sov Mil Order of Malta:   15:  28:  EU:   41.90:   -12.43:    -1.0:  1A:
     1A;
 Spratly Islands:          26:  50:  AS:    9.88:  -114.23:    -8.0:  1S:
-    1S,9M0,BM9S,BN9S,BO9S,BP9S,BQ9S,BU9S,BV9S,BW9S,BX9S;
+    1S,9M0,BM9S,BN9S,BO9S,BP9S,BQ9S,BU9S,BV9S,BW9S,BX9S,=VERSION;
 Monaco:                   14:  27:  EU:   43.73:    -7.40:    -1.0:  3A:
     3A;
 Agalega & St. Brandon:    39:  53:  AF:  -10.45:   -56.67:    -4.0:  3B6:
@@ -35,21 +35,21 @@ Peter 1 Island:           12:  72:  SA:  -68.77:    90.58:     4.0:  3Y/p:
 Azerbaijan:               21:  29:  AS:   40.45:   -47.37:    -4.0:  4J:
     4J,4K;
 Georgia:                  21:  29:  AS:   42.00:   -45.00:    -4.0:  4L:
-    4L,UF6V;
+    4L;
 Montenegro:               15:  28:  EU:   42.50:   -19.28:    -1.0:  4O:
     4O;
 Sri Lanka:                22:  41:  AS:    7.60:   -80.70:    -5.5:  4S:
     4P,4Q,4R,4S;
 ITU HQ:                   14:  28:  EU:   46.17:    -6.05:    -1.0:  4U1I:
-    4U0I,4U1I,4U2I,4U3I,4U4I,4U5I,4U6I,4U7I,4U8I,4U9I;
+    4U0I,4U2I,4U3I,4U4I,4U5I,4U6I,4U7I,4U8I,4U9I,=4U1ITU,=4U1WRC;
 United Nations HQ:        05:  08:  NA:   40.75:    73.97:     5.0:  4U1U:
-    4U1U;
+    4U1U,=4U70UN;
 Vienna Intl Ctr:          15:  28:  EU:   48.20:   -16.30:    -1.0:  *4U1V:
-    4U1V,=4Y1A,=C7A;
+    4U1V,=4U1A,=4U70VIC,=C7A;
 Timor - Leste:            28:  54:  OC:   -8.80:  -126.05:    -9.0:  4W:
     4W;
 Israel:                   20:  39:  AS:   31.32:   -34.82:    -2.0:  4X:
-    4X,4Z;
+    4X,4Z,=4Z4DX/J;
 Libya:                    34:  38:  AF:   27.20:   -16.60:    -2.0:  5A:
     5A;
 Cyprus:                   20:  39:  AS:   35.00:   -33.00:    -2.0:  5B:
@@ -91,11 +91,11 @@ Maldives:                 22:  41:  AS:    4.15:   -73.45:    -5.0:  8Q:
 Guyana:                   09:  12:  SA:    6.02:    59.45:     4.0:  8R:
     8R;
 Croatia:                  15:  28:  EU:   45.18:   -15.30:    -1.0:  9A:
-    9A;
+    9A,=9A70DP/KA,=9A70DP/PU,=9A70DP/RI,=9A70DP/ZG;
 Ghana:                    35:  46:  AF:    7.70:     1.57:     0.0:  9G:
     9G;
 Malta:                    15:  28:  EU:   35.88:   -14.42:    -1.0:  9H:
-    9H;
+    9H,=9H9DSG/J;
 Zambia:                   36:  53:  AF:  -14.22:   -26.73:    -2.0:  9J:
     9I,9J;
 Kuwait:                   21:  39:  AS:   29.38:   -47.38:    -3.0:  9K:
@@ -103,9 +103,9 @@ Kuwait:                   21:  39:  AS:   29.38:   -47.38:    -3.0:  9K:
 Sierra Leone:             35:  46:  AF:    8.50:    13.25:     0.0:  9L:
     9L;
 West Malaysia:            28:  54:  AS:    3.95:  -102.23:    -8.0:  9M2:
-    9M2,9M4,9W2,9W4,=9M8DX/2;
+    9M,9W;
 East Malaysia:            28:  54:  OC:    2.68:  -113.32:    -8.0:  9M6:
-    9M6,9M8,9M9,9W6,9W8,=9M4RSA,=VERSION;
+    9M6,9M8,9M9,9W6,9W8,=9M4CBP,=9M4CHQ,=9M4SAB,=9M58MS,=9M58MW;
 Nepal:                    22:  42:  AS:   27.70:   -85.33:   -5.75:  9N:
     9N;
 Dem. Rep. of the Congo:   36:  52:  AF:   -3.12:   -23.03:    -1.0:  9Q:
@@ -277,7 +277,7 @@ China:                    24:  44:  AS:   36.00:  -102.00:    -8.0:  BY:
     BZ8N[43],BZ8O[43],BZ8P[43],BZ8Q[43],BZ8R[43],BZ8S[43],BZ8T[43],BZ8U[43],
     BZ8V[43],BZ8W[43],BZ8X[43],BZ9A(24)[43],BZ9B(24)[43],BZ9C(24)[43],
     BZ9D(24)[43],BZ9E(24)[43],BZ9F(24)[43],BZ9S(23)[42],BZ9T(23)[42],
-    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42];
+    BZ9U(23)[42],BZ9V(23)[42],BZ9W(23)[42],BZ9X(23)[42],=BG9XD/7;
 Nauru:                    31:  65:  OC:   -0.52:  -166.92:   -12.0:  C2:
     C2;
 Andorra:                  14:  27:  EU:   42.58:    -1.62:    -1.0:  C3:
@@ -297,16 +297,18 @@ San Felix & San Ambrosio: 12:  14:  SA:  -26.28:    80.07:     4.0:  CE0X:
 Easter Island:            12:  63:  SA:  -27.10:   109.37:     6.0:  CE0Y:
     3G0,CA0,CB0,CC0,CD0,CE0,XQ0,XR0;
 Juan Fernandez Islands:   12:  14:  SA:  -33.60:    78.85:     4.0:  CE0Z:
-    3G0Z,CA0Z,CB0Z,CC0Z,CD0Z,CE0Z,XQ0Z,XR0Z;
+    3G0Z,CA0Z,CB0Z,CC0Z,CD0Z,CE0I,CE0Z,XQ0Z,XR0Z;
 Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     3Y[73],AX0(39)[69],AY1Z[73],AY2Z[73],AY3Z[73],AY4Z[73],AY5Z[73],AY6Z[73],
     AY7Z[73],AY8Z[73],AY9Z[73],FT0Y(30)[70],FT1Y(30)[70],FT2Y(30)[70],
-    FT4Y(30)[70],FT5Y(30)[70],FT8Y(30)[70],LU1Z[73],LU2Z[73],LU3Z[73],
-    LU4Z[73],LU5Z[73],LU6Z[73],LU7Z[73],LU8Z[73],LU9Z[73],RI1AN(29)[69],
-    VI0(39)[69],VK0(39)[69],ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],
-    =8J1RL(39)[67],=D8A(30)[71],=DP0GVN(38)[67],=IA/IZ3SUS(29)[70],
-    =KC4AAA(39),=KC4AAC[73],=KC4USV(30)[71],=RI1ANC(29)[70],=RI1ANP(39)[69],
-    =VP8ADE[73],=VP8ADE/B[73],=VP8DOI[73];
+    FT3Y(30)[70],FT4Y(30)[70],FT5Y(30)[70],FT6Y(30)[70],FT7Y(30)[70],
+    FT8Y(30)[70],LU1Z[73],LU2Z[73],LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],
+    LU7Z[73],LU8Z[73],LU9Z[73],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],
+    ZL5(30)[71],ZM5(30)[71],ZS7(38)[67],=8J1RL(39)[67],=D8A(30)[71],
+    =DP0GVN(38)[67],=DP1POL(38)[67],=IA/IZ3SUS(29)[70],=KC4AAA(39),
+    =KC4AAC[73],=KC4USV(30)[71],=OR4TN(38)[67],=RI1ANC(29)[70],
+    =RI1ANM(38)[67],=RI1ANP(39)[69],=RI1ANZ(39)[69],=VP8ADE[73],=VP8ADE/B[73],
+    =VP8DOU[73],=VP8ROT[73];
 Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
     CL,CM,CO,T4;
 Morocco:                  33:  37:  AF:   32.00:     5.00:     0.0:  CN:
@@ -340,7 +342,7 @@ Eritrea:                  37:  48:  AF:   15.00:   -39.00:    -3.0:  E3:
 Palestine:                20:  39:  AS:   31.28:   -34.27:    -2.0:  E4:
     E4;
 North Cook Islands:       32:  62:  OC:  -10.02:   161.08:    10.0:  E5/n:
-    =E51WL[63];
+    =E50W,=E51MBX,=E51MKW,=E51MQT,=E51WL[63];
 South Cook Islands:       32:  63:  OC:  -21.90:   157.93:    10.0:  E5/s:
     E5;
 Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  E6:
@@ -348,14 +350,14 @@ Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  E6:
 Bosnia-Herzegovina:       15:  28:  EU:   44.32:   -17.57:    -1.0:  E7:
     E7;
 Spain:                    14:  37:  EU:   40.37:     4.88:    -1.0:  EA:
-    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EF6,=EA1RCI/CA;
+    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA5ADM/P,=EA5CC/P,=EA5EZ/P,=EA5HCC/P,
+    =EA9QD/7,=EA9UV/7;
 Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
-    AM06,AM6,AN06,AN6,AO06,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EA5ADM/6,
-    =EA5HCC/6;
+    AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6;
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
-    AM08,AM8,AN08,AN8,AO08,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8;
+    AM8,AN8,AO8,EA8,EB8,EC8,ED8,EE8,EF8,EG8,EH8,=EA5EZ/8,=EA5RKB/8;
 Ceuta & Melilla:          33:  37:  AF:   35.90:     5.27:    -1.0:  EA9:
-    AM09,AM9,AN09,AN9,AO09,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9;
+    AM9,AN9,AO9,EA9,EB9,EC9,ED9,EE9,EF9,EG9,EH9,=EA9PD/P;
 Ireland:                  14:  27:  EU:   53.13:     8.02:     0.0:  EI:
     EI,EJ;
 Armenia:                  21:  29:  AS:   40.40:   -44.90:    -4.0:  EK:
@@ -373,8 +375,8 @@ Ethiopia:                 37:  48:  AF:    9.00:   -39.00:    -3.0:  ET:
 Belarus:                  16:  29:  EU:   54.00:   -28.00:    -2.0:  EU:
     EU,EV,EW;
 Kyrgyzstan:               17:  30:  AS:   41.70:   -74.13:    -6.0:  EX:
-    EX,EX2P[31],EX2Q[31],EX6P[31],EX6Q[31],EX7P[31],EX7Q[31],EX8P[31],
-    EX8Q[31];
+    EX,EX0P[31],EX0Q[31],EX2P[31],EX2Q[31],EX6P[31],EX6Q[31],EX7P[31],
+    EX7Q[31],EX8P[31],EX8Q[31];
 Tajikistan:               17:  30:  AS:   38.82:   -71.22:    -5.0:  EY:
     EY;
 Turkmenistan:             17:  30:  AS:   38.00:   -58.00:    -5.0:  EZ:
@@ -382,77 +384,74 @@ Turkmenistan:             17:  30:  AS:   38.00:   -58.00:    -5.0:  EZ:
 France:                   14:  27:  EU:   46.00:    -2.00:    -1.0:  F:
     F,HW,HX,HY,TH,TM,TP,TQ,TV;
 Guadeloupe:               08:  11:  NA:   16.13:    61.67:     4.0:  FG:
-    FG,=TO5MJ,=TO6A;
+    FG;
 Mayotte:                  39:  53:  AF:  -12.88:   -45.15:    -3.0:  FH:
     FH;
 St. Barthelemy:           08:  11:  NA:   17.90:    62.83:     4.0:  FJ:
-    FJ;
+    FJ,=TO4K;
 New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
     FK;
 Chesterfield Islands:     30:  56:  OC:  -19.87:  -158.32:   -11.0:  FK/c:
-    =FK8IK/C;
+    =TX3X;
 Martinique:               08:  11:  NA:   14.70:    61.03:     4.0:  FM:
-    FM,=TO5A,=TO7A;
+    FM,=TO2M,=TO4GU,=TO5A,=TO5T,=TO8M;
 French Polynesia:         32:  63:  OC:  -17.65:   149.40:    10.0:  FO:
-    FO;
+    FO,=TX7A;
 Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
-    =TX6G;
+    =TX5W;
 Clipperton Island:        07:  10:  NA:   10.28:   109.22:     8.0:  FO/c:
-    =TX5K;
+    =TX5P;
 Marquesas Islands:        31:  63:  OC:   -8.92:   140.07:     9.5:  FO/m:
-    =FO/UT6UD;
+    =FO/JI1JKW;
 St. Pierre & Miquelon:    05:  09:  NA:   46.77:    56.20:     3.0:  FP:
     FP;
 Reunion Island:           39:  53:  AF:  -21.12:   -55.48:    -4.0:  FR:
-    FR;
+    FR,=TO90R;
 St. Martin:               08:  11:  NA:   18.08:    63.03:     4.0:  FS:
-    FS;
+    FS,=TO1E,=TO2EME;
 Glorioso Islands:         39:  53:  AF:  -11.55:   -47.28:    -4.0:  FT/g:
-    FT4G,FT5G;
+    FT0G,FT1G,FT2G,FT3G,FT4G,FT5G,FT6G,FT7G,FT8G,FT9G;
 Juan de Nova, Europa:     39:  53:  AF:  -17.05:   -42.72:    -3.0:  FT/j:
-    FT4E,FT4J,FT5E,FT5J;
+    FT0E,FT0J,FT1E,FT1J,FT2E,FT2J,FT3E,FT3J,FT4E,FT4J,FT6E,FT6J,FT7E,FT7J,
+    FT8E,FT8J,FT9E,FT9J;
 Tromelin Island:          39:  53:  AF:  -15.88:   -54.50:    -4.0:  FT/t:
-    FT4T,FT5T;
+    FT0T,FT1T,FT2T,FT3T,FT4T,FT5T,FT6T,FT7T,FT8T,FT9T;
 Crozet Island:            39:  68:  AF:  -46.42:   -51.75:    -5.0:  FT/w:
-    FT0W,FT1W,FT2W,FT4W,FT5W,FT8W;
+    FT0W,FT1W,FT2W,FT3W,FT4W,FT5W,FT6W,FT7W,FT8W;
 Kerguelen Islands:        39:  68:  AF:  -49.00:   -69.27:    -5.0:  FT/x:
-    FT0X,FT1X,FT2X,FT4X,FT5X,FT8X;
+    FT0X,FT1X,FT2X,FT3X,FT4X,FT5X,FT6X,FT7X,FT8X;
 Amsterdam & St. Paul Is.: 39:  68:  AF:  -37.85:   -77.53:    -5.0:  FT/z:
-    FT0Z,FT1Z,FT2Z,FT4Z,FT5Z,FT8Z;
+    FT0Z,FT1Z,FT2Z,FT3Z,FT4Z,FT5Z,FT6Z,FT7Z,FT8Z;
 Wallis & Futuna Islands:  32:  62:  OC:  -13.30:   176.20:   -12.0:  FW:
     FW,TW;
 French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
-    FY;
+    FY,=TO2A;
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
     2E,G,M;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
     2D,GD,GT,MD,MT;
 Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
-    2I,GI,GN,MI,MN,=GB0GPF,=GB0REL,=GB0VC,=GB2AD,=GB4CSC,=GB5SPD;
+    2I,GI,GN,MI,MN,=GB0BTC,=GB0GPF,=GB0SBG,=GB1SPD,=GB2BOA,=GB2DMR,=GB3NGI,
+    =GB4UAS,=GB8DS;
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
-    2J,GH,GJ,MH,MJ;
-Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
-    GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB2ELH,=GB2ZET,=GB3LER,
-    =GB3LER/B,=GB4LER,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,=GM0GFL,=GM0ILB,
-    =GM0JDB,=GM0MZD,=GM0OMV,=GM0VFA,=GM1BYL,=GM1CBQ,=GM1KKI,=GM1MXN,=GM1ZNR,
-    =GM3KLA,=GM3KZH,=GM3RFR,=GM3SJA,=GM3STU,=GM3UPU,=GM3WCH,=GM3WHT,=GM3XPQ,
-    =GM3ZET,=GM3ZNM,=GM3ZXH,=GM4AGX,=GM4CAQ,=GM4DQD,=GM4ENK,=GM4FNA,=GM4FNE,
-    =GM4GPN,=GM4GPP,=GM4GQD,=GM4GQM,=GM4IPK,=GM4JPI,=GM4KJQ,=GM4LBE,=GM4LER,
-    =GM4PXG,=GM4SLV,=GM4SRU,=GM4SSA,=GM4SWU,=GM4WXQ,=GM4YEL,=GM4ZHL,=GM6RTO,
-    =GM6VZB,=GM6WVI,=GM6YQA,=GM7AFE,=GM7GWW,=GM7RKD,=GM8LNH,=GM8MMA,=GM8YEC,
-    =GS3ZET,=MA1FJM,=MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,=MM3ZET,=MM5PSL,
-    =MM6ACW,=MM6BDU,=MM6SJK,=MS0ZCG,=MS0ZET;
+    2J,GH,GJ,MH,MJ,=GB2JSA;
+Shetland Islands:         14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
+    GZ,MZ,=2M0BDR,=2M0BDT,=2M0CPN,=2M0GFC,=2M0SEG,=2M0SPX,=2M0ZET,=GB2ELH,
+    =GB3LER,=GB3LER/B,=GB4LER,=GM0CXQ,=GM0EKM,=GM0GFL,=GM0ILB,=GM0JDB,=GM1FGN,
+    =GM1KKI,=GM1ZNR,=GM3KLA,=GM3WHT,=GM3ZET,=GM4IPK,=GM4JPI,=GM4LBE,=GM4LER,
+    =GM4PXG,=GM4SLV,=GM4SSA,=GM4WXQ,=GM4ZHL,=GM6RQW,=GM6YQA,=GM7AFE,=GM7GWW,
+    =GM8LNH,=GM8MMA,=GM8YEC,=GS3ZET,=MM0LSM,=MM0XAU,=MM0ZAL,=MM0ZCG,=MM1FJM,
+    =MM3VQO,=MM5PSL,=MM5YLO,=MM6BDU,=MM6BZQ,=MM6MFA,=MM6PTE,=MM6SJK,=MM6ZBG,
+    =MM6ZDW,=MS0OXE,=MS0ZCG,=MS0ZET;
 Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
-    2A,2M,GA,GM,GS,GZ,MA,MM,MS,MZ,=G0FBJ,=GB0GDS,=GB0GGR,=GB0NHL,=GB0SSB,
-    =GB1OL,=GB1TAY,=GB2ELH,=GB2GNL,=GB2LBN,=GB2LT,=GB2MOF,=GB2OWM,=GB2RB,
-    =GB2SOH,=GB2SQN,=GB2VCB,=GB2ZET,=GB3ANG,=GB3LER,=GB3LER/B,=GB3ORK,
-    =GB3ORK/B,=GB4GM,=GB4LER,=GB4SI,=GB4SMM,=GM4WSB/P;
+    2A,2M,GA,GM,GS,GZ,MA,MM,MS,MZ,=GB0BDC,=GB0BSS,=GB0GDS,=GB0NHL,=GB1CS,
+    =GB1OL,=GB2BOL,=GB2ELH,=GB2GNL,=GB2OWM,=GB3ANG,=GB3LER,=GB3LER/B,=GB3ORK,
+    =GB4LER,=GB4PAS,=GB5AG,=GB5FHC;
 Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2U,GP,GU,MP,MU;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
-    2W,GC,GW,MC,MW,=GB0APS,=GB0MIW,=GB0MPA,=GB0RWM,=GB0TWM,=GB0WIW,=GB1BGS,
-    =GB1BW,=GB1JC,=GB1PGW,=GB2BEF,=GB2CC,=GB2IMD,=GB2LSA,=GB2MOP,=GB2SFM,
-    =GB4CTC,=GB4MD,=GB4MDI,=GB4OST,=GB4POW,=GB4SDD,=GB5GEO,=GB8MD;
+    2W,GC,GW,MC,MW,=GB0AVR,=GB0GMT,=GB0MPA,=GB0PSG,=GB0RWC,=GB0WIW,=GB1BAF,
+    =GB2IMD,=GB2MOP,=GB4GSS,=GB4MD,=GB4MDI,=GB4OST,=GB4SDD,=GB6BLB,=GB75BB;
 Solomon Islands:          28:  51:  OC:   -9.00:  -160.00:   -11.0:  H4:
     H4;
 Temotu Province:          32:  51:  OC:  -10.72:  -165.80:   -11.0:  H40:
@@ -463,7 +462,7 @@ Switzerland:              14:  28:  EU:   46.87:    -8.12:    -1.0:  HB:
     HB,HE;
 Liechtenstein:            14:  28:  EU:   47.13:    -9.57:    -1.0:  HB0:
     HB0,HE0;
-Ecuador:                  10:  12:  SA:   -1.40:    78.40:     6.0:  HC:
+Ecuador:                  10:  12:  SA:   -1.40:    78.40:     5.0:  HC:
     HC,HD;
 Galapagos Islands:        10:  12:  SA:   -0.78:    91.03:     6.0:  HC8:
     HC8,HD8;
@@ -474,7 +473,7 @@ Dominican Republic:       08:  11:  NA:   19.13:    70.68:     4.0:  HI:
 Colombia:                 09:  12:  SA:    5.00:    74.00:     5.0:  HK:
     5J,5K,HJ,HK;
 San Andres & Providencia: 07:  11:  NA:   12.55:    81.72:     5.0:  HK0/a:
-    5J0,5K0,HJ0,HK0,=HK3JJH/0;
+    5J0,5K0,HJ0,HK0;
 Malpelo Island:           09:  12:  SA:    3.98:    81.58:     5.0:  HK0/m:
     HJ0M,HK0M,=HK0TU;
 Republic of Korea:        25:  44:  AS:   36.23:  -127.90:    -9.0:  HL:
@@ -490,13 +489,15 @@ Vatican City:             15:  28:  EU:   41.90:   -12.47:    -1.0:  HV:
 Saudi Arabia:             21:  39:  AS:   24.20:   -43.83:    -3.0:  HZ:
     7Z,8Z,HZ;
 Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
-    I,=4U0WFP,=4U1GSC,=4U4F;
+    I,=4U0WFP,=4U1GSC,=4U20B,=4U5F,=IQ3FL/J,=IQ4FJ/J;
 African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
-    IG9,IH9,=IY9A;
+    IG9,IH9;
 Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
-    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=IQ0AG,=IQ0AH,=IQ0SS,=IW0HRI,=IY0GA;
+    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0ICH,=II0IDP,=II0SB,=IQ0AG,=IQ0AH,
+    =IQ0AI,=IQ0AK,=IQ0AL,=IQ0AM,=IQ0EH,=IQ0HO,=IQ0ID,=IQ0NU,=IQ0NU/P,=IQ0OG,
+    =IQ0QP,=IQ0SS,=IY0GA;
 Sicily:                   15:  28:  EU:   37.50:   -14.00:    -1.0:  *IT9:
-    IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9;
+    IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9,=IT9CHU/J;
 Djibouti:                 37:  48:  AF:   11.75:   -42.35:    -3.0:  J2:
     J2;
 Grenada:                  08:  11:  NA:   12.13:    61.68:     4.0:  J3:
@@ -513,7 +514,7 @@ Japan:                    25:  45:  AS:   36.40:  -138.38:    -9.0:  JA:
     7J,7K,7L,7M,7N,8J,8K,8L,8M,8N,JA,JE,JF,JG,JH,JI,JJ,JK,JL,JM,JN,JO,JP,JQ,
     JR,JS;
 Minami Torishima:         27:  90:  OC:   24.28:  -153.97:   -10.0:  JD/m:
-    =JG8NQJ/JD1;
+    =JD1YAA,=JG8NQJ/JD1;
 Ogasawara:                27:  45:  AS:   27.05:  -142.20:    -9.0:  JD/o:
     JD1;
 Mongolia:                 23:  32:  AS:   46.77:  -102.17:    -7.0:  JT:
@@ -521,102 +522,124 @@ Mongolia:                 23:  32:  AS:   46.77:  -102.17:    -7.0:  JT:
 Svalbard:                 40:  18:  EU:   78.00:   -16.00:    -1.0:  JW:
     JW;
 Bear Island:              40:  18:  EU:   74.43:   -19.08:    -1.0:  *JW/b:
-    =JW2US;
+    =JW9JKA;
 Jan Mayen:                40:  18:  EU:   71.05:     8.28:     1.0:  JX:
     JX;
 Jordan:                   20:  39:  AS:   31.18:   -36.42:    -2.0:  JY:
     JY;
 United States:            05:  08:  NA:   37.53:    91.67:     5.0:  K:
-    AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,=4U1WB(5)[8],=AA4DD(4)[8],=AA4R(4)[8],
-    =AA4YL(4)[8],=AB4B(4)[8],=AB4GG(4)[8],=AB4IQ(4)[8],=AB5ZA(4)[6],
-    =AC4CA(4)[7],=AC4G(4)[8],=AC4M(4)[8],=AC4YD(4)[8],=AC8Y(5)[8],=AD1C(4)[7],
-    =AD4EB(4)[8],=AD8J(5)[8],=AE5BR(4)[8],=AE7AP(4)[6],=AF4AI(4)[8],
-    =AF9T(4)[7],=AG1RL(3)[6],=AG1T(3)[6],=AG3V(4)[7],=AG4W(4)[8],=AG5Z(4)[8],
-    =AI4DB(4)[8],=AI8F(5)[8],=AI9K(4)[7],=AJ4A(4)[8],=AJ7G(5)[8],=AK4QU(4)[8],
-    =AL1VE(3)[6],=AL3A(3)[6],=AL5M(4)[7],=AL7RF(3)[6],=K0DQ(5)[8],=K0EJ(4)[8],
-    =K0JJ(3)[6],=K0LUZ(5)[8],=K0NW(3)[6],=K0PJ(4)[8],=K0SN(4)[6],=K0TQ(4)[8],
-    =K0TV(5)[8],=K0ZR(5)[8],=K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],
-    =K1TN(4)[8],=K2DSW(4)[7],=K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K3FIV(3)[6],
-    =K3GP(4)[8],=K3IE(4)[8],=K3PA(4)[7],=K3WA(4)[8],=K3WT(4)[7],=K3YP(4)[8],
-    =K4AB(4)[8],=K4AMC(4)[8],=K4BX(4)[8],=K4CX(4)[8],=K4DZR(4)[8],
-    =K4EDI(4)[8],=K4FT(4)[8],=K4FXN(4)[8],=K4HAL(4)[8],=K4IE(4)[8],
-    =K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],=K4MGE(4)[8],=K4RO(4)[8],
-    =K4SPO(4)[8],=K4TCG(4)[8],=K4TD(4)[8],=K4UU(4)[8],=K4WI(4)[8],=K4WW(4)[8],
-    =K4YJ(4)[8],=K4ZGB(4)[8],=K4ZHM(4)[8],=K5AUP(5)[8],=K5EK(5)[8],
-    =K5GDX(4)[8],=K5KG(5)[8],=K5OA(3)[6],=K5RR(3)[6],=K5VIP(5)[8],=K5WP(4)[8],
-    =K5ZD(5)[8],=K6ND(5)[8],=K6RM(5)[8],=K6SXA(4)[7],=K6XT(4)[7],=K7ABV(4)[6],
-    =K7BG(4)[6],=K7BV(5)[8],=K7CS(4)[8],=K7IA(4)[7],=K7KU(4)[7],=K7OM(5)[8],
-    =K7RB(4)[7],=K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VK(4)[6],=K7VU(4)[7],
-    =K8CN(5)[8],=K8FC(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8MN(5)[8],
-    =K8NYG(5)[8],=K8PO(5)[8],=K9DR(4)[7],=K9DU(4)[7],=K9FY(5)[8],=K9JF(3)[6],
-    =K9JM(3)[6],=K9MK(4)[7],=K9OM(5)[8],=K9OZ(4)[7],=K9QC(4)[7],=K9RS(5)[8],
-    =K9SG(3)[6],=K9WA(4)[7],=K9WZB(3)[6],=K9YC(3)[6],=KA3DRR(3)[6],
-    =KA4OTB(4)[8],=KA4R(4)[8],=KA7PNH(4)[7],=KA8HDE(4)[7],=KA8Q(5)[8],
-    =KB5JC(5)[8],=KB7FSC(4)[7],=KB7Q(4)[6],=KB8V(5)[8],=KB9S(4)[7],
-    =KC4HW(4)[8],=KC4SAW(4)[8],=KC4TEO(4)[8],=KC4WQ(4)[8],=KC8GCR(5)[8],
-    =KC8R(4)[7],=KD4POJ(4)[7],=KD9ST(4)[7],=KE1B(3)[6],=KE2VB(3)[6],
-    =KE4ETY(4)[8],=KE4KMG(4)[8],=KE4KY(4)[8],=KE5PRL(4)[8],=KE7X(4)[6],
-    =KE8UN(5)[8],=KG0F(3)[6],=KG4CUY(4)[8],=KH2D(5)[8],=KI4SP(4)[8],
-    =KI7MT(4)[6],=KJ4AOM(4)[8],=KJ4RAQ(4)[8],=KK6MC(4)[7],=KK9A(5)[8],
-    =KL0ET(4)[8],=KL7HM(3)[6],=KL7QW(4)[7],=KL7WP(3)[6],=KM4JA(4)[8],
-    =KO0Z(4)[8],=KO4OL(4)[8],=KO4PU(4)[8],=KO7X(4)[7],=KO9V(5)[8],=KP4N(5)[8],
-    =KR2E(3)[6],=KR4F(4)[8],=KR7C(4)[7],=KS4L(4)[8],=KS4X(4)[8],=KS5A(3)[6],
-    =KS7T(4)[6],=KT0P(5)[8],=KT3M(4)[7],=KU1CW(4)[7],=KU4A(4)[8],=KU8E(5)[8],
-    =KV1E(4)[7],=KV6O(4)[7],=KV8S(5)[8],=KW4J(4)[8],=KW7D(4)[7],=KW7Q(4)[7],
-    =KX2P(4)[7],=KX9X(5)[8],=KY0W(3)[6],=KY4F(4)[8],=KZ1W(3)[6],=KZ2V(3)[6],
-    =N0EF(4)[6],=N0FCD(4)[8],=N1CC(4)[7],=N1JM(3)[6],=N1KW(4)[8],=N2BJ(4)[8],
-    =N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],=N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],
-    =N3BUO(4)[7],=N3RC(4)[6],=N3ZZ(3)[6],=N4AAI(4)[8],=N4ARO(4)[8],
-    =N4ART(4)[8],=N4AU(4)[8],=N4BCB(4)[8],=N4BCD(4)[8],=N4CD(4)[7],
-    =N4DW(4)[8],=N4FNB(4)[8],=N4FZ(4)[8],=N4IJ(4)[7],=N4JF(4)[8],=N4KG(4)[8],
-    =N4KH(4)[8],=N4NA(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],=N4QS(4)[8],
-    =N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VV(4)[8],=N4XH(4)[8],=N4ZI(4)[8],
-    =N4ZZ(4)[8],=N5CR(3)[6],=N5CW(4)[8],=N5IE(5)[8],=N5KO(3)[6],=N5PU(4)[8],
-    =N5SMQ(5)[8],=N5ZO(3)[6],=N6AR(5)[8],=N6BM(5)[8],=N6DW(5)[8],=N7DR(4)[7],
-    =N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],=N7GP(3)[7],=N7IP(4)[6],=N7IV(4)[7],
-    =N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],=N7WY(4)[7],=N8CL(5)[8],
-    =N8DEZ(3)[6],=N8HM(5)[8],=N8II(5)[8],=N8IK(5)[8],=N8NA(5)[8],=N8OO(4)[7],
-    =N8PR(5)[8],=N8RA(5)[8],=N8WXQ(5)[8],=N9ADG(3)[6],=N9CIQ(4)[7],
-    =N9CM(5)[8],=N9DFD(5)[8],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],=N9RV(4)[6],
-    =N9SB(4)[7],=N9TX(4)[7],=N9UY(5)[8],=NA2U(3)[6],=NA4C(4)[8],=NA4K(4)[8],
-    =NA5NN(4)[8],=NB0O(3)[6],=NB4M(4)[8],=ND2T(3)[6],=ND4X(4)[8],=NE4RD(4)[7],
-    =NG7A(5)[8],=NH6Z(3)[6],=NJ4I(4)[8],=NK3L(3)[6],=NL7CO(4)[7],=NL7CQ(4)[7],
-    =NL7XM(5)[8],=NN3V(3)[6],=NN4MM(4)[8],=NN7A(4)[7],=NO7T(3)[7],=NO9E(5)[8],
-    =NP2MR(5)[8],=NP3D(5)[8],=NP3K(5)[8],=NQ6N(5)[8],=NS2X(4)[8],=NS4X(4)[8],
-    =NT4H(4)[8],=NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NY4N(4)[8],=NY6DX(5)[8],
-    =W0BR(5)[8],=W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],
-    =W0YK(3)[6],=W1NN(4)[8],=W1RH(3)[6],=W1SRD(3)[6],=W1WMU(4)[7],=W1ZD(3)[6],
-    =W2GS(4)[7],=W2OO(4)[8],=W2UP(4)[7],=W2VJN(3)[6],=W3HDH(4)[8],
-    =W4BCG(4)[8],=W4BK(4)[8],=W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],
-    =W4EF(3)[6],=W4GKM(4)[8],=W4HOD(4)[8],=W4II(4)[8],=W4JSI(4)[8],
-    =W4KW(4)[8],=W4LC(4)[8],=W4NI(4)[8],=W4NZ(4)[8],=W4PV(4)[8],=W4RYW(4)[8],
-    =W4TTM(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],=W4UT(4)[8],=W5BEN(4)[8],
-    =W5JR(5)[8],=W5MX(4)[8],=W5NZ(4)[8],=W5UE(4)[8],=W5XB(5)[8],=W6AAN(5)[8],
-    =W6DVS(5)[8],=W6GMT(4)[7],=W6HGF(5)[8],=W6IHG(5)[8],=W6KGP(4)[7],
-    =W6LFB(4)[7],=W6NWS(5)[8],=W6RLL(3)[7],=W6XR(5)[8],=W7DO(5)[8],
-    =W7HJ(5)[8],=W7KAM(4)[7],=W7SE(4)[7],=W8AKS(5)[8],=W8FJ(5)[8],=W8FN(4)[7],
-    =W8HGH(5)[8],=W8HY(5)[8],=W8KA(3)[6],=W8KRZ(5)[8],=W8MHW(4)[7],
-    =W8OHT(5)[8],=W8WEJ(5)[8],=W8ZA(5)[8],=W9CF(3)[6],=W9DKB(4)[7],
-    =W9DKC(5)[8],=W9FZ(4)[7],=W9GE(5)[8],=W9JA(4)[7],=W9KB(5)[8],=W9LHG(4)[7],
-    =W9MAF(4)[7],=W9PL(3)[6],=W9UK(5)[8],=WA0AVL(4)[8],=WA0WWW(3)[6],
-    =WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],=WA3C(4)[8],=WA5VGI(3)[6],
-    =WA6MM(4)[7],=WA7BME(3)[7],=WA8KAN(5)[8],=WA8OJR(5)[8],=WA8QYJ(5)[8],
-    =WA8ZBT(4)[7],=WB3JFS(3)[6],=WB4KDI(4)[8],=WB4YDL(4)[8],=WB4YDY(4)[8],
-    =WB5EIN(4)[8],=WB8CQV(5)[8],=WB8IMY(5)[8],=WB8YQJ(3)[6],=WB8YYY(5)[8],
-    =WB9G(5)[8],=WB9JPS(3)[6],=WB9KPT(4)[7],=WC7S(4)[7],=WD4OHD(4)[8],
-    =WE6EZ(4)[7],=WF4U(3)[6],=WF5K(4)[8],=WF7T(4)[8],=WG7Y(4)[7],=WH6E(4)[8],
-    =WJ9B(3)[6],=WL7OU(4)[7],=WM5DX(4)[8],=WQ5L(4)[8],=WQ9T(4)[7],=WR3O(4)[8],
-    =WS6K(4)[8],=WS9M(5)[8],=WT5L(5)[8],=WW4R(4)[8],=WY7FD(4)[7],=WY7SS(4)[7],
-    =WZ4F(4)[8],=WZ7I(5)[8];
+    AA,AB,AC,AD,AE,AF,AG,AI,AJ,AK,K,N,W,=4U1WB(5)[8],=AA2IL(3)[6],
+    =AA4DD(4)[8],=AA4NU(4)[8],=AA4Q(3)[6],=AA4R(4)[8],=AA4YL(4)[8],
+    =AA5TL(3)[6],=AB4B(4)[8],=AB4EJ(4)[8],=AB4GG(4)[8],=AB4IQ(4)[8],
+    =AB4KJ(4)[8],=AB5ZA(4)[6],=AB8RL(5)[8],=AC4CA(4)[7],=AC4G(4)[8],
+    =AC4YD(4)[8],=AC6ZM(4)[8],=AC7P(4)[7],=AC8Y(5)[8],=AD1C(4)[7],
+    =AD4EB(4)[8],=AD8J(5)[8],=AE7AP(4)[6],=AG1RL(3)[6],=AG1T(3)[6],
+    =AG3V(4)[7],=AG4W(4)[8],=AG5Z(4)[8],=AH0U(3)[6],=AH7T(3)[6],=AI4DB(4)[8],
+    =AI8F(5)[8],=AI9K(4)[7],=AJ4A(4)[8],=AJ4F(4)[7],=AJ7G(5)[8],=AK3Q(4)[8],
+    =AK4QR(4)[8],=AK9D(4)[7],=AL1VE(3)[6],=AL3A(3)[6],=AL4B(4)[8],=AL5M(4)[7],
+    =K0ACP(4)[8],=K0AU(3)[6],=K0DQ(5)[8],=K0EJ(4)[8],=K0IP(3)[6],=K0JJ(3)[6],
+    =K0LUZ(5)[8],=K0MP(3)[6],=K0NW(3)[6],=K0PJ(4)[8],=K0RG(3)[6],=K0SN(4)[6],
+    =K0TQ(4)[8],=K0TV(5)[8],=K0ZR(5)[8],=K1DC(4)[8],=K1DW(4)[7],=K1GU(4)[8],
+    =K1KD(4)[7],=K1LT(4)[8],=K2DSW(4)[7],=K2GMY(3)[6],=K2PO(3)[6],=K2RD(3)[6],
+    =K2RP(3)[6],=K2UR(4)[8],=K2VV(4)[7],=K3DMG(4)[8],=K3EST(3)[6],
+    =K3FIV(3)[6],=K3GP(4)[8],=K3IE(4)[8],=K3PA(4)[7],=K3WA(4)[8],=K3WT(4)[7],
+    =K3WYC(3)[6],=K3YP(4)[8],=K4AB(4)[8],=K4AMC(4)[8],=K4AVX(4)[8],
+    =K4BP(4)[8],=K4BX(4)[8],=K4CMS(4)[8],=K4CWW(4)[8],=K4DXV(4)[8],
+    =K4EDI(4)[8],=K4EZS(4)[8],=K4FT(4)[8],=K4FXN(4)[8],=K4HAL(4)[8],
+    =K4IE(4)[8],=K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],=K4MGE(4)[8],
+    =K4OAQ(4)[8],=K4PJ(4)[8],=K4RFT(4)[8],=K4RO(4)[8],=K4SPO(4)[8],
+    =K4TCG(4)[8],=K4TD(4)[8],=K4UU(4)[8],=K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],
+    =K4YJ(4)[8],=K4ZGB(4)[8],=K4ZHM(4)[8],=K5EK(5)[8],=K5GDX(4)[8],
+    =K5KG(5)[8],=K5OA(3)[6],=K5RR(3)[6],=K5TRI(3)[6],=K5VIP(5)[8],=K5WP(4)[8],
+    =K5ZD(5)[8],=K6ND(5)[8],=K6RM(5)[8],=K6RQT(4)[8],=K6SXA(4)[7],=K6XT(4)[7],
+    =K6ZB(4)[7],=K7ABV(4)[6],=K7BG(4)[6],=K7BV(5)[8],=K7DR(4)[8],=K7GM(5)[8],
+    =K7IA(4)[7],=K7KAR(4)[7],=K7KU(4)[7],=K7OM(5)[8],=K7RB(4)[7],=K7SCX(4)[7],
+    =K7SV(5)[8],=K7TD(4)[7],=K7VK(4)[6],=K7VU(4)[7],=K7ZYV(4)[8],=K8ARY(5)[8],
+    =K8CN(5)[8],=K8FC(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8LS(4)[7],
+    =K8NYG(5)[8],=K8PO(5)[8],=K8TE(4)[7],=K8WDX(5)[8],=K8YC(5)[8],
+    =K9DIG(4)[7],=K9DR(4)[7],=K9DU(4)[7],=K9FY(5)[8],=K9IA(5)[8],=K9JF(3)[6],
+    =K9JM(3)[6],=K9MK(4)[7],=K9MU(4)[7],=K9MWM(4)[7],=K9OM(5)[8],=K9OZ(4)[7],
+    =K9RS(5)[8],=K9SG(3)[6],=K9WA(4)[7],=K9WZB(3)[6],=K9YC(3)[6],
+    =KA1KIX(4)[8],=KA3DRR(3)[6],=KA4GAV(4)[7],=KA4OTB(4)[8],=KA4R(4)[8],
+    =KA7PNH(4)[7],=KA8HDE(4)[7],=KA8Q(5)[8],=KA9A(3)[6],=KB5EZ(4)[8],
+    =KB5JC(5)[8],=KB7FSC(4)[7],=KB7H(4)[8],=KB7Q(4)[6],=KB8KMH(5)[8],
+    =KB8V(5)[8],=KB9S(4)[7],=KC4HW(4)[8],=KC4SAW(4)[8],=KC4TEO(4)[8],
+    =KC4WQ(4)[8],=KC8GCR(5)[8],=KC8R(4)[7],=KD4EE(4)[8],=KD4POJ(4)[7],
+    =KD5UVV(4)[8],=KD9ST(4)[7],=KE0L(4)[8],=KE1B(3)[6],=KE2VB(3)[6],
+    =KE4ETY(4)[8],=KE4KE(4)[7],=KE4KMG(4)[8],=KE4KY(4)[8],=KE5PRL(4)[8],
+    =KE7X(4)[6],=KE8UN(5)[8],=KF2T(3)[6],=KG0F(3)[6],=KG2A(4)[8],
+    =KG4CUY(4)[8],=KG6MC(5)[8],=KH2D(5)[8],=KH6M(5)[8],=KH6XS(3)[6],
+    =KI4SP(4)[8],=KI7MT(4)[6],=KJ4AOM(4)[8],=KJ4IWZ(4)[8],=KJ4KKD(4)[8],
+    =KJ4LTA(4)[8],=KJ4RAQ(4)[8],=KK1Z(4)[7],=KK4JSJ(4)[8],=KK4TE(4)[8],
+    =KK6L(5)[8],=KK6MC(4)[7],=KK7JS(4)[7],=KK9A(5)[8],=KL0MP(5)[8],
+    =KL3DM(5)[8],=KL7DA(5)[8],=KL7FDQ(3)[6],=KL7HM(3)[6],=KL7IKV(3)[6],
+    =KL7QW(4)[7],=KL7WV(5)[8],=KM4DR(4)[7],=KM4FO(4)[8],=KM4JA(4)[8],
+    =KM9R(3)[6],=KN1CBR(4)[7],=KN4OK(4)[8],=KO0Z(4)[8],=KO4OL(4)[8],
+    =KO7X(4)[7],=KO9V(5)[8],=KP2F(4)[8],=KP4N(5)[8],=KR2E(3)[6],=KR4F(4)[8],
+    =KS4L(4)[8],=KS4X(4)[8],=KS5A(3)[6],=KS7T(4)[6],=KT0R(4)[8],=KT3M(4)[7],
+    =KT4RR(4)[8],=KU4A(4)[8],=KU8E(5)[8],=KV1E(4)[7],=KV6O(4)[7],=KV8S(5)[8],
+    =KW4J(4)[8],=KW7D(4)[7],=KW7Q(4)[7],=KX2P(4)[7],=KX9X(5)[8],=KY4F(4)[8],
+    =KZ1W(3)[6],=KZ2V(3)[6],=N0EF(4)[6],=N0FCD(4)[8],=N0FW(4)[8],=N0SMX(5)[8],
+    =N1CC(4)[7],=N1DID(3)[6],=N1JM(3)[6],=N1KW(4)[8],=N2BJ(4)[8],=N2IC(4)[7],
+    =N2NS(3)[6],=N2WN(4)[8],=N3AIU(3)[6],=N3BB(4)[7],=N3BUO(4)[7],
+    =N3KCJ(3)[6],=N3RC(3)[6],=N3ZZ(3)[6],=N4AB(4)[8],=N4ARO(4)[8],=N4AU(4)[8],
+    =N4BCB(4)[8],=N4BCD(4)[8],=N4DW(4)[8],=N4FNB(4)[8],=N4HAI(4)[8],
+    =N4HID(4)[8],=N4IJ(4)[7],=N4IM(4)[7],=N4IR(4)[8],=N4JF(4)[8],=N4JRG(4)[8],
+    =N4KG(4)[8],=N4KH(4)[8],=N4NA(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4OGW(4)[8],
+    =N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],=N4VV(4)[8],
+    =N4WE(4)[8],=N4XH(4)[8],=N4ZZ(4)[8],=N5CR(3)[6],=N5CW(4)[8],=N5KO(3)[6],
+    =N5PU(4)[8],=N5RP(4)[8],=N5SMQ(5)[8],=N5TF(4)[8],=N5TOO(5)[8],=N5ZO(3)[6],
+    =N6AR(5)[8],=N7DR(4)[7],=N7EO(5)[8],=N7FLT(4)[6],=N7FUL(4)[7],=N7GP(3)[7],
+    =N7IP(4)[6],=N7IV(4)[7],=N7KA(4)[7],=N7MZW(4)[7],=N7NG(4)[7],=N7US(4)[8],
+    =N7WY(4)[7],=N8CL(5)[8],=N8DEZ(3)[6],=N8II(5)[8],=N8IK(5)[8],=N8KSG(5)[8],
+    =N8NA(5)[8],=N8OO(4)[7],=N8OQ(5)[8],=N8RA(5)[8],=N8WXQ(5)[8],=N9ADG(3)[6],
+    =N9CIQ(4)[7],=N9DFD(5)[8],=N9JF(4)[7],=N9NA(3)[6],=N9NB(5)[8],=N9NC(5)[8],
+    =N9RV(4)[6],=N9SB(4)[7],=N9TX(4)[7],=N9UY(5)[8],=N9VPV(4)[7],=NA2U(3)[6],
+    =NA4C(4)[8],=NA4K(4)[8],=NA5NN(4)[8],=NB0O(3)[6],=NB4M(4)[8],=ND2T(3)[6],
+    =ND4X(4)[8],=ND4Y(4)[8],=NH6P(3)[6],=NH6Z(3)[6],=NK3L(3)[6],=NK8Q(5)[8],
+    =NL7CQ(4)[7],=NL7XM(5)[8],=NN4MM(4)[8],=NN7A(4)[7],=NO9E(5)[8],
+    =NP3D(5)[8],=NP3K(5)[8],=NR7DX(4)[6],=NS2X(4)[8],=NS4X(4)[8],=NT4H(4)[8],
+    =NW7M(5)[8],=NW8U(5)[8],=NX1P(3)[6],=NX9T(5)[8],=NY6DX(5)[8],=W0BR(5)[8],
+    =W0HI(3)[6],=W0IMD(5)[8],=W0PAN(3)[6],=W0PV(5)[8],=W0QQG(5)[8],
+    =W0UCE(5)[8],=W0YK(3)[6],=W1BO(4)[8],=W1GKT(4)[8],=W1JCW(4)[7],
+    =W1NN(4)[8],=W1PR(3)[6],=W1RH(3)[6],=W1SRD(3)[6],=W1WMU(4)[7],=W1ZD(3)[6],
+    =W2GS(4)[7],=W2OO(4)[8],=W2UP(4)[7],=W2VJN(3)[6],=W3DQN(4)[7],
+    =W3HDH(4)[8],=W3HKK(4)[8],=W4BCG(4)[8],=W4BK(4)[8],=W4CV(4)[8],
+    =W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],=W4GKM(4)[8],
+    =W4HOD(4)[8],=W4II(4)[8],=W4JSI(4)[8],=W4KW(4)[8],=W4LC(4)[8],=W4NI(4)[8],
+    =W4NJK(3)[6],=W4NZ(4)[8],=W4RYW(4)[8],=W4TTM(4)[8],=W4UAL(4)[8],
+    =W4UAT(3)[6],=W4UT(4)[8],=W4VAB(4)[8],=W5BEN(4)[8],=W5JR(5)[8],
+    =W5MX(4)[8],=W5NZ(4)[8],=W5THT(4)[8],=W5UE(4)[8],=W6DVS(5)[8],
+    =W6GMT(4)[7],=W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],
+    =W6RLL(3)[7],=W6SAI(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7DXX(4)[7],
+    =W7HJ(5)[8],=W7KAM(4)[7],=W7KF(4)[6],=W7SE(4)[7],=W7WZ(5)[8],=W8AKS(5)[8],
+    =W8BFX(3)[6],=W8FJ(5)[8],=W8FN(4)[7],=W8HAP(5)[8],=W8HGH(5)[8],
+    =W8KA(3)[6],=W8MHW(4)[7],=W8OHT(5)[8],=W8TK(3)[6],=W8WEJ(5)[8],
+    =W8ZA(5)[8],=W9CF(3)[6],=W9DKB(4)[7],=W9FZ(4)[7],=W9GE(5)[8],=W9JA(4)[7],
+    =W9JEF(4)[7],=W9KB(5)[8],=W9LHG(4)[7],=W9MAF(4)[7],=W9PL(3)[6],
+    =W9RM(4)[7],=W9TW(4)[7],=W9UK(5)[8],=WA0WWW(3)[6],=WA1FCN(4)[8],
+    =WA1UJU(4)[8],=WA2VYA(4)[7],=WA3C(4)[8],=WA4JA(4)[8],=WA5LOU(4)[8],
+    =WA5POK(4)[8],=WA5VGI(3)[6],=WA6MM(4)[7],=WA7BME(3)[7],=WA8KAN(5)[8],
+    =WA8OJR(5)[8],=WA8QYJ(5)[8],=WA8ZBT(4)[7],=WA9ETL(4)[7],=WB0POH(5)[8],
+    =WB3JFS(3)[6],=WB4CTX(4)[8],=WB4IT(4)[8],=WB4YDL(4)[8],=WB4YDY(4)[8],
+    =WB5EIN(4)[8],=WB7S(4)[7],=WB8CQV(5)[8],=WB8EKG(5)[8],=WB8FVB(4)[7],
+    =WB8IMY(5)[8],=WB8YQJ(3)[6],=WB8YYY(5)[8],=WB9G(4)[7],=WB9KPT(4)[7],
+    =WC1X(3)[6],=WC7S(4)[7],=WD4OHD(4)[8],=WD5CCA(4)[8],=WE5DX(4)[8],
+    =WE6EZ(4)[7],=WF4U(3)[6],=WF5K(4)[8],=WF7T(4)[8],=WH6E(4)[8],=WH6LE(5)[8],
+    =WH7R(4)[7],=WJ9B(3)[6],=WK4AA(4)[8],=WL7OU(4)[7],=WL7YQ(4)[7],
+    =WM5DX(4)[8],=WN1G(4)[8],=WP3ME(5)[8],=WP3Y(4)[7],=WQ5L(4)[8],=WQ9T(4)[7],
+    =WR3O(4)[8],=WR5G(3)[6],=WR5J(3)[6],=WS6K(4)[8],=WS7X(4)[7],=WS9M(5)[8],
+    =WT2P(4)[8],=WT5L(5)[8],=WT8V(5)[8],=WU5E(4)[8],=WW6O(4)[7],=WY7FD(4)[7],
+    =WY7SS(4)[7],=WZ4F(4)[8],=WZ7I(5)[8];
 Guantanamo Bay:           08:  11:  NA:   20.00:    75.00:     5.0:  KG4:
     KG4;
 Mariana Islands:          27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
-    AH0,KH0,NH0,WH0,=AB2QH,=AB9OQ,=AH2U,=WH6ZW;
+    AH0,KH0,NH0,WH0,=KG7DCN,=KL7QOL,=W3FM;
 Baker & Howland Islands:  31:  61:  OC:    0.00:   176.00:    12.0:  KH1:
     AH1,KH1,NH1,WH1;
 Guam:                     27:  64:  OC:   13.37:  -144.70:   -10.0:  KH2:
-    AH2,KH2,NH2,WH2,=K5GUA,=KE6ATM,=KF5ULC,=KG6DX,=KG6JDX,=KG6TEZ,=KG6TWZ,
-    =KK7AV,=W0REP;
+    AH2,KH2,NH2,WH2,=AH0AX,=KB7OVT,=KD7IRV,=KE7IPG,=KG6DX,=KG6JDX,=NH0B,
+    =WH0AC;
 Johnston Island:          31:  61:  OC:   16.72:   169.53:    10.0:  KH3:
     AH3,KH3,NH3,WH3;
 Midway Island:            31:  61:  OC:   28.20:   177.37:    11.0:  KH4:
@@ -625,38 +648,37 @@ Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
     AH5,KH5,NH5,WH5;
 Kingman Reef:             31:  61:  OC:    6.40:   162.40:    11.0:  KH5K:
     AH5K,KH5K,NH5K,WH5K;
-Hawaii:                   31:  61:  OC:   21.15:   157.53:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AC7N,=AE5LR,=K1ENT,=K2GT,=K7ZAR,=K9FD,
-    =KA8EBL,=KB6EGA,=KB7MEU,=KB7UVR,=KB7WUP,=KC0UUR,=KC2MIU,=KC6HOX,=KC6SHT,
-    =KC7ASJ,=KC7DUT,=KC7HNC,=KD0IRK,=KD0MSD,=KD0QLR,=KD4QWO,=KD5HX,=KD6EPD,
-    =KD7SMV,=KD7WJM,=KD8QML,=KE6EDJ,=KE6JXO,=KE6RAW,=KE7FJA,=KF4PRM,=KF4WGX,
-    =KF5AHW,=KF6MQT,=KF7GNP,=KF7TUU,=KG0XR,=KG6RJI,=KG6SDD,=KG6TFI,=KG7ICS,
-    =KI4HCZ,=KI4NOH,=KI4YAF,=KJ6QQT,=KJ6SKC,=KK6DLH,=KL1TP,=KW4JC,=N1IDP,
-    =N2AL,=N2NL,=N3DJT,=N3QKX,=N3RWD,=N3VBS,=N7TSV,=N7WBX,=N9SBL,=W6TDX,
-    =W7KFI,=W7NX,=W7PEA,=WB4JTT;
+Hawaii:                   31:  61:  OC:   21.12:   157.48:    10.0:  KH6:
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=K0BAD,=K1VAN,=K2GT,=K4XV,=K5HQM,=K7ASH,
+    =K7FAR,=K7FR,=K7OJL,=K9FD,=KA0FOR,=KA6RUZ,=KA8KND,=KB1GC,=KB3OXU,=KB3PJS,
+    =KB7EA,=KC2GSU,=KC7I,=KC7JVX,=KC7KAT,=KC7KAW,=KC7YXO,=KD7GLO,=KD7LMP,
+    =KE5CGA,=KE6AYZ,=KE7RCT,=KF5MXM,=KF6FDG,=KF6ZAL,=KF7LRS,=KF7OJR,=KG6LFX,
+    =KG6MZJ,=KG6WZD,=KG7ASP,=KG7EUP,=KJ6NZH,=KJ6RGW,=KQ6CD,=N6ZAB,=N7BLC,
+    =N7ODC,=N7TOF,=N7ZHK,=NH2CD,=W4PPA,=W6ROM,=W6SHH,=WA4ZOF,=WA7ZK,=WB4JTT,
+    =WB5ZDH,=WB6PJT,=WB6SAA,=WV6K;
 Kure Island:              31:  61:  OC:   29.00:   178.00:    10.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;
 American Samoa:           32:  62:  OC:  -14.32:   170.78:    11.0:  KH8:
     AH8,KH8,NH8,WH8;
 Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
-    =NH8S;
+    =KH8S/NA6M;
 Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
     AH9,KH9,NH9,WH9;
-Alaska:                   01:  01:  NA:   63.87:   153.78:     8.0:  KL:
-    AL,KL,NL,WL,=AB7YO,=AD0FQ,=AJ4MY,=AK2OR,=K2ICW,=K5RSO,=K6GKW,=K6WBZ,
-    =K7GRW,=KB0LOW,=KB1NDE,=KB1SHE,=KB5UWU,=KB7DEL,=KB7VFZ,=KB7ZVZ,=KB8SBG,
-    =KC2GVS,=KC8YIV,=KD4EYW,=KD7KRK,=KE4YLG,=KE5JTB,=KE5QDI,=KE5QDJ,=KE5QDK,
-    =KF5STO,=KF6BMF,=KF7LUA,=KF7PFT,=KG4TJS,=KG6RJE,=KG6TAL,=KH2YN,=KH7BW,
-    =KI4ERC,=KJ4ZWI,=KK4AMV,=KK4RYG,=KK7STL,=KY7J,=N0LHN,=N1KNK,=N2YZW,=N6SPP,
-    =N7UTV,=N7UWT,=N7XNM,=N7ZYS,=N8ZPO,=NW9F,=NW9H,=W0RWS,=W4A,=W7RAZ,=W8OES,
-    =WA7USX,=WP4IYI;
+Alaska:                   01:  01:  NA:   61.40:   148.87:     8.0:  KL:
+    AL,KL,NL,WL,=AD0DK,=K5HL,=K9WUV,=KB1KLH,=KB7AMA,=KB8TEW,=KB9NSV,=KC3DBK,
+    =KC5SLA,=KC7AXO,=KC7GSO,=KC7IKE,=KC7IKF,=KC9HIK,=KD0FJG,=KD0VAL,=KD0VGF,
+    =KD2GKT,=KD8BVD,=KD8LNA,=KE4YEI,=KE5ZRK,=KE6DXH,=KE7ELL,=KE7FXM,=KE7TRX,
+    =KF6BOV,=KF7UFY,=KG5GDF,=KG7GJL,=KG7LBW,=KI4GDI,=KK4WWH,=KK4WWI,=KM4AGL,
+    =KM4KWS,=KS0C,=N0IVJ,=N0SUB,=N2TJY,=N6SPP,=N7MTG,=W1RSC,=W5JKT,=W6TFD,
+    =W7DDG,=W9ITU,=WA1FVJ,=WA2BIW;
 Navassa Island:           08:  11:  NA:   18.40:    75.00:     5.0:  KP1:
     KP1,NP1,WP1;
 US Virgin Islands:        08:  11:  NA:   17.73:    64.80:     4.0:  KP2:
-    KP2,NP2,WP2,=KD4SGB,=KT6V,=KV4BT,=KV4CF,=KV4FZ,=N2OW,=N4M,=W4YY,=WI7C;
+    KP2,NP2,WP2,=K8RF,=K9VV,=KB1MDZ,=KB1ZTY,=KB9KHC,=KC5FDR,=KC9MCN,=KV4BT,
+    =KV4FZ,=WA4HLB,=WT3A;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
-    KP3,KP4,NP3,NP4,WP3,WP4,=AF4OU,=KA2GNG,=KB1UZV,=KB2MMX,=KB3BPK,=KC2TE,
-    =KE5LNG,=KF5IBN,=KH2RU,=KP2Z,=N1QVU,=N4LER,=NB0G;
+    KP3,KP4,NP3,NP4,WP3,WP4,=K4F,=KA9UTY,=KB1UZV,=KB8ZVP,=KC1DRV,=KC2TE,
+    =KF6OGJ,=KG5FVY,=KH2RU,=KK4DCX,=KM4AKA,=KP2H,=KP2Z,=N2KUE,=WB5YOF;
 Desecheo Island:          08:  11:  NA:   18.08:    67.88:     4.0:  KP5:
     KP5,NP5,WP5;
 Norway:                   14:  18:  EU:   61.00:    -9.00:    -1.0:  LA:
@@ -757,9 +779,9 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     LW2W[16],LW2X[16],LW2Y[16],LW3V[16],LW3W[16],LW3X[16],LW3Y[16],LW4V[16],
     LW4W[16],LW4X[16],LW4Y[16],LW5V[16],LW5W[16],LW5X[16],LW5Y[16],LW6V[16],
     LW6W[16],LW6X[16],LW6Y[16],LW7V[16],LW7W[16],LW7X[16],LW7Y[16],LW8V[16],
-    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1DAS/D,
-    =LU2XX/XP[16],=LU4EV/D,=LU5HJK/XP[16],=LU8DCH/D,=LU8DQ/D,=LU8XW/XP[16],
-    =LU9AOS/D;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU2BPM/D,
+    =LU2DVI/H,=LU3AAL/GR,=LU4AA/D,=LU5BE/GR,=LU5DGG/H,=LU5XP/D,=LU6FEC/O,
+    =LU8EFF/GR;
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -771,25 +793,25 @@ Peru:                     10:  12:  SA:  -10.00:    76.00:     5.0:  OA:
 Lebanon:                  20:  39:  AS:   33.83:   -35.83:    -2.0:  OD:
     OD;
 Austria:                  15:  28:  EU:   47.33:   -13.33:    -1.0:  OE:
-    4U1V,OE,=4Y1A,=C7A;
+    4U1V,OE,=4U1A,=4U70VIC,=C7A;
 Finland:                  15:  18:  EU:   63.78:   -27.08:    -2.0:  OH:
-    OF,OG,OH,OI,OJ,=OH1FJ/S,=OH2MO/SA,=OH5K/S,=OH6EOG/SA,=OH6FSQ/S;
+    OF,OG,OH,OI,OJ;
 Aland Islands:            15:  18:  EU:   60.13:   -20.37:    -2.0:  OH0:
     OF0,OG0,OH0,OI0;
 Market Reef:              15:  18:  EU:   60.00:   -19.00:    -2.0:  OJ0:
     OJ0;
 Czech Republic:           15:  28:  EU:   50.00:   -16.00:    -1.0:  OK:
-    OK,OL;
+    OK,OL,=OK1KCR/J;
 Slovak Republic:          15:  28:  EU:   49.00:   -20.00:    -1.0:  OM:
     OM;
 Belgium:                  14:  27:  EU:   50.70:    -4.85:    -1.0:  ON:
-    ON,OO,OP,OQ,OR,OS,OT;
+    ON,OO,OP,OQ,OR,OS,OT,=ON4CP/JOTA;
 Greenland:                40:  05:  NA:   74.00:    42.78:     3.0:  OX:
     OX,XP;
 Faroe Islands:            14:  18:  EU:   62.07:     6.93:     0.0:  OY:
     OW,OY;
 Denmark:                  14:  18:  EU:   56.00:   -10.00:    -1.0:  OZ:
-    5P,5Q,OU,OV,OZ;
+    5P,5Q,OU,OV,OZ,=OZ7SP/JOTA;
 Papua New Guinea:         28:  51:  OC:   -9.50:  -147.12:   -10.0:  P2:
     P2;
 Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:
@@ -797,7 +819,8 @@ Aruba:                    09:  11:  SA:   12.53:    69.98:     4.0:  P4:
 DPR of Korea:             25:  44:  AS:   39.78:  -126.30:    -9.0:  P5:
     HM,P5,P6,P7,P8,P9;
 Netherlands:              14:  27:  EU:   52.28:    -5.47:    -1.0:  PA:
-    PA,PB,PC,PD,PE,PF,PG,PH,PI,=PA4RVS/MILL,=PD0ARI/MILL,=PH4RTM/MILL;
+    PA,PB,PC,PD,PE,PF,PG,PH,PI,=PA1BP/J,=PA1FJ/J,=PA2DK/J,=PA6HYG/J,=PA6JAM/J,
+    =PA6SJB/J,=PA6SJS/J,=PD7DX/J,=PE2MC/J,=PI4CQ/J;
 Curacao:                  09:  11:  SA:   12.17:    69.00:     4.0:  PJ2:
     PJ2;
 Bonaire:                  09:  11:  SA:   12.20:    68.25:     4.0:  PJ4:
@@ -813,14 +836,13 @@ Brazil:                   11:  15:  SA:  -10.00:    53.00:     3.0:  PY:
 Fernando de Noronha:      11:  13:  SA:   -3.85:    32.43:     2.0:  PY0F:
     PP0F,PQ0F,PR0F,PS0F,PT0F,PU0F,PV0F,PW0F,PX0F,PY0F,PY0Z,ZV0F,ZW0F,ZX0F,
     ZY0F,ZY0Z,ZZ0F,PP0R,PQ0R,PR0R,PS0R,PT0R,PU0R,PV0R,PW0R,PX0R,PY0R,ZV0R,
-    ZW0R,ZX0R,ZY0R,ZZ0R;
+    ZW0R,ZX0R,ZY0R,ZZ0R,=PY0NY;
 St. Peter & St. Paul:     11:  13:  SA:    0.00:    29.00:     2.0:  PY0S:
     PP0S,PQ0S,PR0S,PS0S,PT0S,PU0S,PV0S,PW0S,PX0S,PY0S,ZV0S,ZW0S,ZX0S,ZY0S,
     ZZ0S;
 Trindade & Martim Vaz:    11:  15:  SA:  -20.50:    29.32:     2.0:  PY0T:
-    PP0M,PP0T,PQ0M,PQ0T,PR0M,PR0T,PS0M,PS0T,PT0M,PT0T,PU0M,PU0T,PV0M,PV0T,
-    PW0M,PW0T,PX0M,PX0T,PY0M,PY0T,ZV0M,ZV0T,ZW0M,ZW0T,ZX0M,ZX0T,ZY0M,ZY0T,
-    ZZ0M,ZZ0T;
+    PP0T,PQ0T,PR0T,PS0T,PT0T,PU0T,PV0T,PW0T,PX0T,PY0T,ZV0T,ZW0T,ZX0T,ZY0T,
+    ZZ0T;
 Suriname:                 09:  12:  SA:    4.00:    56.00:     3.0:  PZ:
     PZ;
 Franz Josef Land:         40:  75:  EU:   80.68:   -49.92:    -3.0:  R1FJ:
@@ -850,7 +872,7 @@ Mount Athos:              20:  28:  EU:   40.00:   -24.00:    -2.0:  SV/a:
 Dodecanese:               20:  28:  EU:   36.17:   -27.93:    -2.0:  SV5:
     J45,SV5,SW5,SX5,SY5,SZ5,=SV0XCA/5;
 Crete:                    20:  28:  EU:   35.23:   -24.78:    -2.0:  SV9:
-    J49,SV9,SW9,SX9,SY9,SZ9,=SV0XBN/9,=SV0XCC/9;
+    J49,SV9,SW9,SX9,SY9,SZ9,=SV0LB,=SV0XBN/9,=SV0XCC/9;
 Tuvalu:                   31:  65:  OC:   -8.50:  -179.20:   -12.0:  T2:
     T2;
 Western Kiribati:         31:  65:  OC:    1.42:  -173.00:   -12.0:  T30:
@@ -899,78 +921,80 @@ Mali:                     35:  46:  AF:   18.00:     2.58:     0.0:  TZ:
     TZ;
 European Russia:          16:  29:  EU:   53.65:   -41.37:    -4.0:  UA:
     R,U,R1N[19],R1O[19],R1P[20],R1Z[19],R4H[30],R4I[30],R4W[30],R8F(17)[30],
-    R8G(17)[30],R8X(17)[19],R9F(17)[30],R9G(17)[30],R9X(17)[19],RA1N[19],
+    R8G(17)[30],R8X(17)[20],R9F(17)[30],R9G(17)[30],R9X(17)[20],RA1N[19],
     RA1O[19],RA1P[20],RA1Z[19],RA4H[30],RA4I[30],RA4W[30],RA8F(17)[30],
-    RA8G(17)[30],RA8X(17)[19],RA9F(17)[30],RA9G(17)[30],RA9X(17)[19],RC1N[19],
+    RA8G(17)[30],RA8X(17)[20],RA9F(17)[30],RA9G(17)[30],RA9X(17)[20],RC1N[19],
     RC1O[19],RC1P[20],RC1Z[19],RC4H[30],RC4I[30],RC4W[30],RC8F(17)[30],
-    RC8G(17)[30],RC8X(17)[19],RC9F(17)[30],RC9G(17)[30],RC9X(17)[19],RD1N[19],
+    RC8G(17)[30],RC8X(17)[20],RC9F(17)[30],RC9G(17)[30],RC9X(17)[20],RD1N[19],
     RD1O[19],RD1P[20],RD1Z[19],RD4H[30],RD4I[30],RD4W[30],RD8F(17)[30],
-    RD8G(17)[30],RD8X(17)[19],RD9F(17)[30],RD9G(17)[30],RD9X(17)[19],RF1N[19],
+    RD8G(17)[30],RD8X(17)[20],RD9F(17)[30],RD9G(17)[30],RD9X(17)[20],RF1N[19],
     RF1O[19],RF1P[20],RF1Z[19],RF4H[30],RF4I[30],RF4W[30],RF8F(17)[30],
-    RF8G(17)[30],RF8X(17)[19],RF9F(17)[30],RF9G(17)[30],RF9X(17)[19],RG1N[19],
+    RF8G(17)[30],RF8X(17)[20],RF9F(17)[30],RF9G(17)[30],RF9X(17)[20],RG1N[19],
     RG1O[19],RG1P[20],RG1Z[19],RG4H[30],RG4I[30],RG4W[30],RG8F(17)[30],
-    RG8G(17)[30],RG8X(17)[19],RG9F(17)[30],RG9G(17)[30],RG9X(17)[19],RI1N[19],
+    RG8G(17)[30],RG8X(17)[20],RG9F(17)[30],RG9G(17)[30],RG9X(17)[20],RI1N[19],
     RI1O[19],RI1P[20],RI1Z[19],RI4H[30],RI4I[30],RI4W[30],RI8F(17)[30],
-    RI8G(17)[30],RI8X(17)[19],RI9F(17)[30],RI9G(17)[30],RI9X(17)[19],RJ1N[19],
+    RI8G(17)[30],RI8X(17)[20],RI9F(17)[30],RI9G(17)[30],RI9X(17)[20],RJ1N[19],
     RJ1O[19],RJ1P[20],RJ1Z[19],RJ4H[30],RJ4I[30],RJ4W[30],RJ8F(17)[30],
-    RJ8G(17)[30],RJ8X(17)[19],RJ9F(17)[30],RJ9G(17)[30],RJ9X(17)[19],RK1N[19],
+    RJ8G(17)[30],RJ8X(17)[20],RJ9F(17)[30],RJ9G(17)[30],RJ9X(17)[20],RK1N[19],
     RK1O[19],RK1P[20],RK1Z[19],RK4H[30],RK4I[30],RK4W[30],RK8F(17)[30],
-    RK8G(17)[30],RK8X(17)[19],RK9F(17)[30],RK9G(17)[30],RK9X(17)[19],RL1N[19],
+    RK8G(17)[30],RK8X(17)[20],RK9F(17)[30],RK9G(17)[30],RK9X(17)[20],RL1N[19],
     RL1O[19],RL1P[20],RL1Z[19],RL4H[30],RL4I[30],RL4W[30],RL8F(17)[30],
-    RL8G(17)[30],RL8X(17)[19],RL9F(17)[30],RL9G(17)[30],RL9X(17)[19],RM1N[19],
+    RL8G(17)[30],RL8X(17)[20],RL9F(17)[30],RL9G(17)[30],RL9X(17)[20],RM1N[19],
     RM1O[19],RM1P[20],RM1Z[19],RM4H[30],RM4I[30],RM4W[30],RM8F(17)[30],
-    RM8G(17)[30],RM8X(17)[19],RM9F(17)[30],RM9G(17)[30],RM9X(17)[19],RN1N[19],
+    RM8G(17)[30],RM8X(17)[20],RM9F(17)[30],RM9G(17)[30],RM9X(17)[20],RN1N[19],
     RN1O[19],RN1P[20],RN1Z[19],RN4H[30],RN4I[30],RN4W[30],RN8F(17)[30],
-    RN8G(17)[30],RN8X(17)[19],RN9F(17)[30],RN9G(17)[30],RN9X(17)[19],RO1N[19],
+    RN8G(17)[30],RN8X(17)[20],RN9F(17)[30],RN9G(17)[30],RN9X(17)[20],RO1N[19],
     RO1O[19],RO1P[20],RO1Z[19],RO4H[30],RO4I[30],RO4W[30],RO8F(17)[30],
-    RO8G(17)[30],RO8X(17)[19],RO9F(17)[30],RO9G(17)[30],RO9X(17)[19],RP1N[19],
+    RO8G(17)[30],RO8X(17)[20],RO9F(17)[30],RO9G(17)[30],RO9X(17)[20],RP1N[19],
     RP1O[19],RP1P[20],RP1Z[19],RP4H[30],RP4I[30],RP4W[30],RP8F(17)[30],
-    RP8G(17)[30],RP8X(17)[19],RP9F(17)[30],RP9G(17)[30],RP9X(17)[19],RQ1N[19],
+    RP8G(17)[30],RP8X(17)[20],RP9F(17)[30],RP9G(17)[30],RP9X(17)[20],RQ1N[19],
     RQ1O[19],RQ1P[20],RQ1Z[19],RQ4H[30],RQ4I[30],RQ4W[30],RQ8F(17)[30],
-    RQ8G(17)[30],RQ8X(17)[19],RQ9F(17)[30],RQ9G(17)[30],RQ9X(17)[19],RR1N[19],
+    RQ8G(17)[30],RQ8X(17)[20],RQ9F(17)[30],RQ9G(17)[30],RQ9X(17)[20],RR1N[19],
     RR1O[19],RR1P[20],RR1Z[19],RR4H[30],RR4I[30],RR4W[30],RR8F(17)[30],
-    RR8G(17)[30],RR8X(17)[19],RR9F(17)[30],RR9G(17)[30],RR9X(17)[19],RT1N[19],
+    RR8G(17)[30],RR8X(17)[20],RR9F(17)[30],RR9G(17)[30],RR9X(17)[20],RT1N[19],
     RT1O[19],RT1P[20],RT1Z[19],RT4H[30],RT4I[30],RT4W[30],RT8F(17)[30],
-    RT8G(17)[30],RT8X(17)[19],RT9F(17)[30],RT9G(17)[30],RT9X(17)[19],RU1N[19],
+    RT8G(17)[30],RT8X(17)[20],RT9F(17)[30],RT9G(17)[30],RT9X(17)[20],RU1N[19],
     RU1O[19],RU1P[20],RU1Z[19],RU4H[30],RU4I[30],RU4W[30],RU8F(17)[30],
-    RU8G(17)[30],RU8X(17)[19],RU9F(17)[30],RU9G(17)[30],RU9X(17)[19],RV1N[19],
+    RU8G(17)[30],RU8X(17)[20],RU9F(17)[30],RU9G(17)[30],RU9X(17)[20],RV1N[19],
     RV1O[19],RV1P[20],RV1Z[19],RV4H[30],RV4I[30],RV4W[30],RV8F(17)[30],
-    RV8G(17)[30],RV8X(17)[19],RV9F(17)[30],RV9G(17)[30],RV9X(17)[19],RW1N[19],
+    RV8G(17)[30],RV8X(17)[20],RV9F(17)[30],RV9G(17)[30],RV9X(17)[20],RW1N[19],
     RW1O[19],RW1P[20],RW1Z[19],RW4H[30],RW4I[30],RW4W[30],RW8F(17)[30],
-    RW8G(17)[30],RW8X(17)[19],RW9F(17)[30],RW9G(17)[30],RW9X(17)[19],RX1N[19],
+    RW8G(17)[30],RW8X(17)[20],RW9F(17)[30],RW9G(17)[30],RW9X(17)[20],RX1N[19],
     RX1O[19],RX1P[20],RX1Z[19],RX4H[30],RX4I[30],RX4W[30],RX8F(17)[30],
-    RX8G(17)[30],RX8X(17)[19],RX9F(17)[30],RX9G(17)[30],RX9X(17)[19],RY1N[19],
+    RX8G(17)[30],RX8X(17)[20],RX9F(17)[30],RX9G(17)[30],RX9X(17)[20],RY1N[19],
     RY1O[19],RY1P[20],RY1Z[19],RY4H[30],RY4I[30],RY4W[30],RY8F(17)[30],
-    RY8G(17)[30],RY8X(17)[19],RY9F(17)[30],RY9G(17)[30],RY9X(17)[19],RZ1N[19],
+    RY8G(17)[30],RY8X(17)[20],RY9F(17)[30],RY9G(17)[30],RY9X(17)[20],RZ1N[19],
     RZ1O[19],RZ1P[20],RZ1Z[19],RZ4H[30],RZ4I[30],RZ4W[30],RZ8F(17)[30],
-    RZ8G(17)[30],RZ8X(17)[19],RZ9F(17)[30],RZ9G(17)[30],RZ9X(17)[19],U1N[19],
+    RZ8G(17)[30],RZ8X(17)[20],RZ9F(17)[30],RZ9G(17)[30],RZ9X(17)[20],U1N[19],
     U1O[19],U1P[20],U1Z[19],U4H[30],U4I[30],U4W[30],U8F(17)[30],U8G(17)[30],
-    U8X(17)[19],U9F(17)[30],U9G(17)[30],U9X(17)[19],UA1N[19],UA1O[19],
+    U8X(17)[20],U9F(17)[30],U9G(17)[30],U9X(17)[20],UA1N[19],UA1O[19],
     UA1P[20],UA1Z[19],UA4H[30],UA4I[30],UA4W[30],UA8F(17)[30],UA8G(17)[30],
-    UA8X(17)[19],UA9F(17)[30],UA9G(17)[30],UA9X(17)[19],UB1N[19],UB1O[19],
+    UA8X(17)[20],UA9F(17)[30],UA9G(17)[30],UA9X(17)[20],UB1N[19],UB1O[19],
     UB1P[20],UB1Z[19],UB4H[30],UB4I[30],UB4W[30],UB8F(17)[30],UB8G(17)[30],
-    UB8X(17)[19],UB9F(17)[30],UB9G(17)[30],UB9X(17)[19],UC1N[19],UC1O[19],
+    UB8X(17)[20],UB9F(17)[30],UB9G(17)[30],UB9X(17)[20],UC1N[19],UC1O[19],
     UC1P[20],UC1Z[19],UC4H[30],UC4I[30],UC4W[30],UC8F(17)[30],UC8G(17)[30],
-    UC8X(17)[19],UC9F(17)[30],UC9G(17)[30],UC9X(17)[19],UD1N[19],UD1O[19],
+    UC8X(17)[20],UC9F(17)[30],UC9G(17)[30],UC9X(17)[20],UD1N[19],UD1O[19],
     UD1P[20],UD1Z[19],UD4H[30],UD4I[30],UD4W[30],UD8F(17)[30],UD8G(17)[30],
-    UD8X(17)[19],UD9F(17)[30],UD9G(17)[30],UD9X(17)[19],UE1N[19],UE1O[19],
+    UD8X(17)[20],UD9F(17)[30],UD9G(17)[30],UD9X(17)[20],UE1N[19],UE1O[19],
     UE1P[20],UE1Z[19],UE4H[30],UE4I[30],UE4W[30],UE8F(17)[30],UE8G(17)[30],
-    UE8X(17)[19],UE9F(17)[30],UE9G(17)[30],UE9X(17)[19],UF1N[19],UF1O[19],
+    UE8X(17)[20],UE9F(17)[30],UE9G(17)[30],UE9X(17)[20],UF1N[19],UF1O[19],
     UF1P[20],UF1Z[19],UF4H[30],UF4I[30],UF4W[30],UF8F(17)[30],UF8G(17)[30],
-    UF8X(17)[19],UF9F(17)[30],UF9G(17)[30],UF9X(17)[19],UG1N[19],UG1O[19],
+    UF8X(17)[20],UF9F(17)[30],UF9G(17)[30],UF9X(17)[20],UG1N[19],UG1O[19],
     UG1P[20],UG1Z[19],UG4H[30],UG4I[30],UG4W[30],UG8F(17)[30],UG8G(17)[30],
-    UG8X(17)[19],UG9F(17)[30],UG9G(17)[30],UG9X(17)[19],UH1N[19],UH1O[19],
+    UG8X(17)[20],UG9F(17)[30],UG9G(17)[30],UG9X(17)[20],UH1N[19],UH1O[19],
     UH1P[20],UH1Z[19],UH4H[30],UH4I[30],UH4W[30],UH8F(17)[30],UH8G(17)[30],
-    UH8X(17)[19],UH9F(17)[30],UH9G(17)[30],UH9X(17)[19],UI1N[19],UI1O[19],
+    UH8X(17)[20],UH9F(17)[30],UH9G(17)[30],UH9X(17)[20],UI1N[19],UI1O[19],
     UI1P[20],UI1Z[19],UI4H[30],UI4I[30],UI4W[30],UI8F(17)[30],UI8G(17)[30],
-    UI8X(17)[19],UI9F(17)[30],UI9G(17)[30],UI9X(17)[19],=R155PM(17)[30],
-    =RJ4P[30],=RM4R[30],=RU2FB/6/P,=RW9WJ/4/P[30],=UA4PN[30],=UA4RF[30],
-    =UA4RW[30],=UE04YCS;
+    UI8X(17)[20],UI9F(17)[30],UI9G(17)[30],UI9X(17)[20],=R9JI/1,=RA9YA/6,
+    =RU0ZW/6,=R6LCA/J,=R920RZ,=RJ4P[30],=RL96WS,=RM4R[30],=RT9K/3,=RT9K/6,
+    =RT9K/7,=RW9WJ/4[30],=UA0BDS/1,=UA4NF[30],=UA4PN[30],=UA4RW[30],=UA9FIT/4,
+    =UA9SY/4[30],=UE96MP,=UE96SN,=UE96WS;
 Kaliningrad:              15:  29:  EU:   54.72:   -20.52:    -3.0:  UA2:
     R2F,R2K,RA2,RC2F,RC2K,RD2F,RD2K,RF2F,RF2K,RG2F,RG2K,RI2F,RI2K,RJ2F,RJ2K,
     RK2F,RK2K,RL2F,RL2K,RM2F,RM2K,RN2F,RN2K,RO2F,RO2K,RP2F,RP2K,RQ2F,RQ2K,
     RR2F,RR2K,RT2F,RT2K,RU2F,RU2K,RV2F,RV2K,RW2F,RW2K,RX2F,RX2K,RY2F,RY2K,
-    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UE2,UF2,UG2,UH2,UI2,=R2MWO;
+    RZ2F,RZ2K,U2F,U2K,UA2,UB2,UC2,UD2,UF2,UG2,UH2,UI2,=R15CWC/2,=R2/N6TCZ,
+    =R2MWO,=RA/EU1FY/P,=UB9KAA/2;
 Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     R0,R8(17)[30],R9,RA0,RA8(17)[30],RA9,RB0,RB8(17)[30],RB9,RC0,RC8(17)[30],
     RC9,RD0,RD8(17)[30],RD9,RE0,RE8(17)[30],RE9,RF0,RF8(17)[30],RF9,RG0,
@@ -1097,11 +1121,12 @@ Asiatic Russia:           17:  30:  AS:   55.88:   -84.08:    -7.0:  UA9:
     UI8O(18)[31],UI8P(18)[31],UI8S(16)[30],UI8T(16)[30],UI8U(18)[31],
     UI8V(18)[31],UI8W(16)[30],UI8Y(18)[31],UI8Z(18)[31],UI9I(18)[31],
     UI9M(17)[30],UI9P(18)[31],UI9S(16),UI9T(16),UI9V(18)[31],UI9W(16),
-    =R150LA(18)[32],=R150LB(18)[32],=R155AP,=RA/KE5JA(19)[34],=RP69CM,=RP69DK,
-    =RP69GI(16),=RP69GP,=RP69GR,=RP69GS[20],=RP69KE,=RP69KM(18)[31],=RP69LK,
-    =RP69LL,=RP69LS,=RP69MC(17)[30],=RP69MD(17)[30],=RP69MM,=RP69NB(16),
-    =RP69P,=RP69PW(16),=RP69R,=RP69SD(19)[34],=RP69SF[20],=RP69UF(16),
-    =RP69V(19)[34],=RP69YN,=RZ9DX/9/P(18)[22],=UE14TS(18)[31];
+    =R00BVB(18)[32],=R100D(18)[22],=R100DI(18)[22],=R10NRC(18)[31],
+    =R15CWC/0(19)[34],=R15CWC/8(17)[30],=R15CWC/9(18)[31],=R1ZY/9[20],
+    =R2015AS(16),=R2015DM(16),=R2015DS(16),=R2015EP,=R2015RR(18)[31],
+    =R2015RY(19)[25],=R2015SV(18)[31],=R2015TL,=RK4PA/9[20],=RT9K/0(19)[35],
+    =RU0ZM/9(18)[31],=RV3DSA/0(19)[34],=UA7R/0(19)[34],=UA9MUY/0(19)[33],
+    =UE44Y(18)[31];
 Uzbekistan:               17:  30:  AS:   41.40:   -63.97:    -5.0:  UK:
     UJ,UK,UL,UM;
 Kazakhstan:               17:  30:  AS:   48.17:   -65.18:    -5.0:  UN:
@@ -1147,20 +1172,20 @@ Canada:                   05:  09:  NA:   44.35:    78.75:     5.0:  VE:
     CI1(1)[2],CI2,CJ2[4],CK2[4],CY1,CY2(2),CZ0(2)[4],CZ1(1)[2],CZ2,VA2[4],
     VB2[4],VC2[4],VD1,VD2(2),VE2[4],VF0(2)[4],VF1(1)[2],VF2,VG2[4],VO1,VO2(2),
     VX2[4],VY0(2)[4],VY1(1)[2],VY2,XJ1,XJ2(2),XK0(2)[4],XK1(1)[2],XK2,XL2[4],
-    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20140621,=VA2PL(2)[4],
-    =VE2CSI(2)[4],=VE2DXY(2)[4],=VE2EKA(2)[4],=VE2ENB(2)[4],=VE2FK[9],
-    =VE2GSO(2)[4],=VE2IM(2)[4],=VE2KK(2)[4],=VE2MAM/3(4)[4],=VE3AX/7(3)[2],
-    =VE7XF/5(4)[3],=VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20151027,=VA2PL(2)[4],
+    =VA2RC(2)[4],=VB2T(2)[4],=VE2CSI(2)[4],=VE2EKA(2)[4],=VE2FK[9],
+    =VE2GSO(2)[4],=VE2IDX(2)[4],=VE2IM(2)[4],=VE2TKH(2)[4],=VY0PW(4)[3];
 Australia:                30:  59:  OC:  -23.70:  -132.33:   -10.0:  VK:
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,AX4[55],VH4[55],VI4[55],VJ4[55],VK4[55],
-    VL4[55],VM4[55],VN4[55],VZ4[55];
+    VL4[55],VM4[55],VN4[55],VZ4[55],=VK3BYD/8(29)[55],=VK3NUT/6(29)[58],
+    =VK5MAV/8(29)[55],=VK6FMON/3;
 Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
     =VK0IR;
 Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:
     =AX/VK0TH;
 Cocos (Keeling) Islands:  29:  54:  OC:  -12.15:   -96.82:    -6.5:  VK9C:
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9Y,VL9C,VL9Y,VM9C,VM9Y,
-    VN9C,VN9Y,VZ9C,VZ9Y,=VK9EC;
+    VN9C,VN9Y,VZ9C,VZ9Y;
 Lord Howe Island:         30:  60:  OC:  -31.55:  -159.08:   -10.5:  VK9L:
     AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L;
 Mellish Reef:             30:  56:  OC:  -17.40:  -155.85:   -10.0:  VK9M:
@@ -1171,7 +1196,7 @@ Willis Island:            30:  55:  OC:  -16.22:  -150.02:   -10.0:  VK9W:
     AX9W,AX9Z,VH9W,VH9Z,VI9W,VI9Z,VJ9W,VJ9Z,VK9W,VK9Z,VL9W,VL9Z,VM9W,VM9Z,
     VN9W,VN9Z,VZ9W,VZ9Z;
 Christmas Island:         29:  54:  OC:  -10.48:  -105.63:    -7.0:  VK9X:
-    AX9X,VH9X,VI9X,VJ9X,VK9X,VL9X,VM9X,VN9X,VZ9X,=VK9EX;
+    AX9X,VH9X,VI9X,VJ9X,VK9X,VL9X,VM9X,VN9X,VZ9X;
 Anguilla:                 08:  11:  NA:   18.23:    63.00:     4.0:  VP2E:
     VP2E;
 Montserrat:               08:  11:  NA:   16.75:    62.18:     4.0:  VP2M:
@@ -1189,7 +1214,7 @@ Falkland Islands:         13:  16:  SA:  -51.63:    58.72:     4.0:  VP8:
 South Georgia Island:     13:  73:  SA:  -54.48:    37.08:     2.0:  VP8/g:
     =VP8SGK;
 South Shetland Islands:   13:  73:  SA:  -62.08:    58.67:     4.0:  VP8/h:
-    CE9,XR9,=HF0POL,=RI1ANF,=RI1ANU,=RI59ANT;
+    CE9,XR9,=HF0POL,=RI1ANA,=RI1ANF,=RI59ANT;
 South Orkney Islands:     13:  73:  SA:  -60.60:    45.55:     3.0:  VP8/o:
     =LU1ZA;
 South Sandwich Islands:   13:  73:  SA:  -58.43:    26.33:     2.0:  VP8/s:
@@ -1201,7 +1226,7 @@ Chagos Islands:           39:  41:  AF:   -7.32:   -72.42:    -6.0:  VQ9:
 Hong Kong:                24:  44:  AS:   22.28:  -114.18:    -8.0:  VR:
     VR;
 India:                    22:  41:  AS:   22.50:   -77.58:    -5.5:  VU:
-    8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW;
+    8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW,=VU4SEA;
 Andaman & Nicobar Is.:    26:  49:  AS:   12.37:   -92.78:    -5.5:  VU4:
     VU4;
 Lakshadweep Islands:      22:  41:  AS:   11.23:   -72.78:    -5.5:  VU7:
@@ -1248,7 +1273,7 @@ Romania:                  20:  28:  EU:   45.78:   -24.70:    -2.0:  YO:
 El Salvador:              07:  11:  NA:   14.00:    89.00:     6.0:  YS:
     HU,YS;
 Serbia:                   15:  28:  EU:   44.00:   -21.00:    -1.0:  YU:
-    YT,YU;
+    YT,YU,=YT1S/J;
 Venezuela:                09:  12:  SA:    8.00:    66.00:     4.5:  YV:
     4M,YV,YW,YX,YY;
 Aves Island:              08:  11:  NA:   15.67:    63.60:     4.0:  YV0:
@@ -1278,7 +1303,7 @@ Cayman Islands:           08:  11:  NA:   19.32:    81.22:     5.0:  ZF:
 Tokelau Islands:          31:  62:  OC:   -9.40:   171.20:   -13.0:  ZK3:
     ZK3;
 New Zealand:              32:  60:  OC:  -41.83:  -173.27:   -12.0:  ZL:
-    ZK,ZL,ZL50,ZM,=ZM90DX;
+    ZK,ZL,ZL50,ZM;
 Chatham Islands:          32:  60:  OC:  -43.85:   176.48:  -12.75:  ZL7:
     ZL7,ZM7;
 Kermadec Islands:         32:  60:  OC:  -29.25:   177.92:   -12.0:  ZL8:
diff --git a/ham/dxcc/dxcc.info b/ham/dxcc/dxcc.info
index 4d641e3f8a..e3410cd463 100644
--- a/ham/dxcc/dxcc.info
+++ b/ham/dxcc/dxcc.info
@@ -1,10 +1,8 @@
 PRGNAM="dxcc"
 VERSION="20080225"
 HOMEPAGE="http://fkurz.net/ham/dxcc.html"
-DOWNLOAD="http://fkurz.net/ham/dxcc/dxcc-20080225.tar.gz \
-	  http://www.country-files.com/cty/cty.dat"
-MD5SUM="74167d4afef980701fb2bac269117808 \
-	af196760b39277a24d39d06d25a56be2"
+DOWNLOAD="http://fkurz.net/ham/dxcc/dxcc-20080225.tar.gz"
+MD5SUM="74167d4afef980701fb2bac269117808"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/fldigi/fldigi.info b/ham/fldigi/fldigi.info
index f0072268ea..bdfa47e208 100644
--- a/ham/fldigi/fldigi.info
+++ b/ham/fldigi/fldigi.info
@@ -1,7 +1,7 @@
 PRGNAM="fldigi"
 VERSION="3.22.08"
 HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-DOWNLOAD="http://www.w1hkj.com/downloads/fldigi/fldigi-3.22.08.tar.gz"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/ham/fldigi/fldigi-3.22.08.tar.gz"
 MD5SUM="774bec2a5ac83502472906b192064787"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/ham/grig/grig.SlackBuild b/ham/grig/grig.SlackBuild
index ef4f6c3404..1597ca1a33 100644
--- a/ham/grig/grig.SlackBuild
+++ b/ham/grig/grig.SlackBuild
@@ -105,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/klog/klog.SlackBuild b/ham/klog/klog.SlackBuild
index 85c489e11b..ad54e87c31 100644
--- a/ham/klog/klog.SlackBuild
+++ b/ham/klog/klog.SlackBuild
@@ -109,4 +109,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/linlogbook/linlogbook.SlackBuild b/ham/linlogbook/linlogbook.SlackBuild
index 5fe56633b0..7af5aa0898 100644
--- a/ham/linlogbook/linlogbook.SlackBuild
+++ b/ham/linlogbook/linlogbook.SlackBuild
@@ -95,4 +95,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/linpsk/linpsk.SlackBuild b/ham/linpsk/linpsk.SlackBuild
index 43051a6da4..b5997033d6 100644
--- a/ham/linpsk/linpsk.SlackBuild
+++ b/ham/linpsk/linpsk.SlackBuild
@@ -93,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/nec2c/nec2c.SlackBuild b/ham/nec2c/nec2c.SlackBuild
index 199f22b464..d117c9fe91 100644
--- a/ham/nec2c/nec2c.SlackBuild
+++ b/ham/nec2c/nec2c.SlackBuild
@@ -93,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/psk31lx/psk31lx.SlackBuild b/ham/psk31lx/psk31lx.SlackBuild
index fde167b32e..2084001b79 100644
--- a/ham/psk31lx/psk31lx.SlackBuild
+++ b/ham/psk31lx/psk31lx.SlackBuild
@@ -93,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/qradiopredict/qradiopredict.SlackBuild b/ham/qradiopredict/qradiopredict.SlackBuild
index 42fef6c70f..713a0dcc10 100644
--- a/ham/qradiopredict/qradiopredict.SlackBuild
+++ b/ham/qradiopredict/qradiopredict.SlackBuild
@@ -57,7 +57,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$VERSION.tar.gz
+tar -xvf $CWD/$VERSION.tar.gz || tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -108,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/svxlink-sounds-en_US-heather-16k/svxlink-sounds-en_US-heather-16k.SlackBuild b/ham/svxlink-sounds-en_US-heather-16k/svxlink-sounds-en_US-heather-16k.SlackBuild
index 7b20ff5dd2..c60cc3d72a 100644
--- a/ham/svxlink-sounds-en_US-heather-16k/svxlink-sounds-en_US-heather-16k.SlackBuild
+++ b/ham/svxlink-sounds-en_US-heather-16k/svxlink-sounds-en_US-heather-16k.SlackBuild
@@ -23,6 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=svxlink-sounds-en_US-heather-16k
+SRCNAM=svxlink-sounds-en_US-heather
 VERSION=${VERSION:-14.08}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,14 +39,11 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-mkdir -p $PKG/usr/share/svxlink/sounds
-cd $PKG/usr/share/svxlink/sounds
-tar xzvf $CWD/$VERSION.tar.gz
-# source unpacks to nonstandard directory name, moving..
-mkdir -p $PKG/usr/share/svxlink/sounds/en_US-heather-16k
-mv $PKG/usr/share/svxlink/sounds/svxlink-sounds-en_US-heather-$VERSION/* $PKG/usr/share/svxlink/sounds/en_US-heather-16k/
 
-rm -rf $PKG/usr/share/svxlink/sounds/svxlink-sounds-en_US-heather-$VERSION
+mkdir -p $PKG/usr/share/svxlink/sounds/en_US-heather-16k
+cd $PKG/usr/share/svxlink/sounds/en_US-heather-16k
+tar xvf $CWD/$VERSION.tar.gz --strip-components 1 || \
+  tar xvf $CWD/$SRCNAM-$VERSION.tar.gz --strip-components 1
 
 chown -R root:root .
 find -L . \
diff --git a/ham/svxlink/svxlink.SlackBuild b/ham/svxlink/svxlink.SlackBuild
index 044db7c50f..0e9827facc 100644
--- a/ham/svxlink/svxlink.SlackBuild
+++ b/ham/svxlink/svxlink.SlackBuild
@@ -93,7 +93,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
 # the Github download unpacks several directories, we only need src
 # We will download a larger file but I think it's better this way
diff --git a/ham/tqsl/tqsl.SlackBuild b/ham/tqsl/tqsl.SlackBuild
index 351de0c418..bb14d7b537 100644
--- a/ham/tqsl/tqsl.SlackBuild
+++ b/ham/tqsl/tqsl.SlackBuild
@@ -104,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/tqsl/tqsl.info b/ham/tqsl/tqsl.info
index 3e141deb29..f80442c7e4 100644
--- a/ham/tqsl/tqsl.info
+++ b/ham/tqsl/tqsl.info
@@ -1,7 +1,7 @@
 PRGNAM="tqsl"
 VERSION="2.0.3"
 HOMEPAGE="http://www.arrl.org/instructions"
-DOWNLOAD="http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-2.0.3.tgz"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/ham/tqsl/tqsl-2.0.3.tgz"
 MD5SUM="0e62df9f8c2fbb4b5d42d3ee9111c75a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/ham/twhamqth/twhamqth.SlackBuild b/ham/twhamqth/twhamqth.SlackBuild
index a7b7b6c0e0..f36b1a2dd1 100644
--- a/ham/twhamqth/twhamqth.SlackBuild
+++ b/ham/twhamqth/twhamqth.SlackBuild
@@ -97,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/unixcw/unixcw.SlackBuild b/ham/unixcw/unixcw.SlackBuild
index d047d48d21..4d7e6e8875 100644
--- a/ham/unixcw/unixcw.SlackBuild
+++ b/ham/unixcw/unixcw.SlackBuild
@@ -96,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/wxapt/wxapt.SlackBuild b/ham/wxapt/wxapt.SlackBuild
index c4afd675ce..e0e7b35d1d 100644
--- a/ham/wxapt/wxapt.SlackBuild
+++ b/ham/wxapt/wxapt.SlackBuild
@@ -93,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xanalyser/xanalyser.SlackBuild b/ham/xanalyser/xanalyser.SlackBuild
index b6dbc8f5fe..f48fdc9259 100644
--- a/ham/xanalyser/xanalyser.SlackBuild
+++ b/ham/xanalyser/xanalyser.SlackBuild
@@ -96,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xdemorse/xdemorse.SlackBuild b/ham/xdemorse/xdemorse.SlackBuild
index 7ed2ee8070..8829ab190b 100644
--- a/ham/xdemorse/xdemorse.SlackBuild
+++ b/ham/xdemorse/xdemorse.SlackBuild
@@ -105,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xdemorse/xdemorse.info b/ham/xdemorse/xdemorse.info
index 1f99637420..48f2ed1109 100644
--- a/ham/xdemorse/xdemorse.info
+++ b/ham/xdemorse/xdemorse.info
@@ -2,7 +2,7 @@ PRGNAM="xdemorse"
 VERSION="2.9"
 HOMEPAGE="http://www.qsl.net/5b4az/"
 DOWNLOAD="http://www.qsl.net/5b4az/pkg/morse/xdemorse/xdemorse-2.9.tar.bz2"
-MD5SUM="c8b0556a6d3d7605f4d037ee2f48093c"
+MD5SUM="2a4a240f958fa58b6e09854b1f444125"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/xfhell/xfhell.SlackBuild b/ham/xfhell/xfhell.SlackBuild
index 4556f7868d..84e8738550 100644
--- a/ham/xfhell/xfhell.SlackBuild
+++ b/ham/xfhell/xfhell.SlackBuild
@@ -106,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xfhell/xfhell.info b/ham/xfhell/xfhell.info
index c302195b8f..2e560ac015 100644
--- a/ham/xfhell/xfhell.info
+++ b/ham/xfhell/xfhell.info
@@ -2,7 +2,7 @@ PRGNAM="xfhell"
 VERSION="3.2"
 HOMEPAGE="http://www.qsl.net/5b4az/"
 DOWNLOAD="http://www.qsl.net/5b4az/pkg/xfhell/xfhell-3.2.tar.bz2"
-MD5SUM="b85b161b94dffb52408eab7253dbbcc6"
+MD5SUM="7119dee2d51402fea2d036f210c22a59"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/xgridloc/xgridloc.SlackBuild b/ham/xgridloc/xgridloc.SlackBuild
index 759984fa27..6c74a8c799 100644
--- a/ham/xgridloc/xgridloc.SlackBuild
+++ b/ham/xgridloc/xgridloc.SlackBuild
@@ -102,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xnec2c/xnec2c.SlackBuild b/ham/xnec2c/xnec2c.SlackBuild
index ba82cc6240..f23590fa85 100644
--- a/ham/xnec2c/xnec2c.SlackBuild
+++ b/ham/xnec2c/xnec2c.SlackBuild
@@ -107,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xpsk31/xpsk31.SlackBuild b/ham/xpsk31/xpsk31.SlackBuild
index bd1c2d3aab..402326e48c 100644
--- a/ham/xpsk31/xpsk31.SlackBuild
+++ b/ham/xpsk31/xpsk31.SlackBuild
@@ -105,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xpsk31/xpsk31.info b/ham/xpsk31/xpsk31.info
index 0f2e9c3b78..9e1d173c5d 100644
--- a/ham/xpsk31/xpsk31.info
+++ b/ham/xpsk31/xpsk31.info
@@ -2,7 +2,7 @@ PRGNAM="xpsk31"
 VERSION="3.2"
 HOMEPAGE="http://www.qsl.net/5b4az/"
 DOWNLOAD="http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.2.tar.bz2"
-MD5SUM="4958d40018c0920bc509847504561628"
+MD5SUM="952385221c0a577e099ee3d3897db24b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ham/xwxapt/xwxapt.SlackBuild b/ham/xwxapt/xwxapt.SlackBuild
index 72bf038085..b5d5166fb3 100644
--- a/ham/xwxapt/xwxapt.SlackBuild
+++ b/ham/xwxapt/xwxapt.SlackBuild
@@ -106,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG${PKGTYPE:-.tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/ham/xwxapt/xwxapt.info b/ham/xwxapt/xwxapt.info
index 5474968200..db6738ff0b 100644
--- a/ham/xwxapt/xwxapt.info
+++ b/ham/xwxapt/xwxapt.info
@@ -2,7 +2,7 @@ PRGNAM="xwxapt"
 VERSION="2.4"
 HOMEPAGE="http://www.qsl.net/5b4az/"
 DOWNLOAD="http://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-2.4.tar.bz2"
-MD5SUM="9dc0a6c32fd01441e92ad59ea1cecc32"
+MD5SUM="1d82e5db1e65dc8bfdc79a8d6f479958"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/haskell/hscolour/hscolour.SlackBuild b/haskell/hscolour/hscolour.SlackBuild
index ac9af8106d..8eb1482fc8 100644
--- a/haskell/hscolour/hscolour.SlackBuild
+++ b/haskell/hscolour/hscolour.SlackBuild
@@ -1,11 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for hscolour
+
+# Copyright 2015 Christoph Willing  Brisbane, Australia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# Written by Christoph Willing <c.willing @ uq.edu.au>
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hscolour
-VERSION=${VERSION:-1.20.3}
+VERSION=${VERSION:-1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/haskell/hscolour/hscolour.info b/haskell/hscolour/hscolour.info
index be6f7f1758..8267336705 100644
--- a/haskell/hscolour/hscolour.info
+++ b/haskell/hscolour/hscolour.info
@@ -1,10 +1,10 @@
 PRGNAM="hscolour"
-VERSION="1.20.3"
+VERSION="1.23"
 HOMEPAGE="http://hackage.haskell.org/package/hscolour/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/hscolour/1.20.3/hscolour-1.20.3.tar.gz"
-MD5SUM="86ab0303a023ac22617d14bbcd06eab8"
+DOWNLOAD="http://hackage.haskell.org/package/hscolour-1.23/hscolour-1.23.tar.gz"
+MD5SUM="db7d455e29429c2038595ac1d33f1865"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ghc"
 MAINTAINER="Christoph Willing"
-EMAIL="c.willing@uq.edu.au"
+EMAIL="chris.willing@linux.com"
diff --git a/libraries/BeautifulSoup4/BeautifulSoup4.SlackBuild b/libraries/BeautifulSoup4/BeautifulSoup4.SlackBuild
index 637b1dcd9c..e9613ef025 100644
--- a/libraries/BeautifulSoup4/BeautifulSoup4.SlackBuild
+++ b/libraries/BeautifulSoup4/BeautifulSoup4.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=BeautifulSoup4
 SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-4.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/BeautifulSoup4/BeautifulSoup4.info b/libraries/BeautifulSoup4/BeautifulSoup4.info
index 636a6a9886..8516b6421c 100644
--- a/libraries/BeautifulSoup4/BeautifulSoup4.info
+++ b/libraries/BeautifulSoup4/BeautifulSoup4.info
@@ -1,8 +1,8 @@
 PRGNAM="BeautifulSoup4"
-VERSION="4.4.0"
+VERSION="4.4.1"
 HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/"
-DOWNLOAD="http://www.crummy.com/software/BeautifulSoup/bs4/download/4.4/beautifulsoup4-4.4.0.tar.gz"
-MD5SUM="63d1f33e6524f408cb6efbc5da1ae8a5"
+DOWNLOAD="http://www.crummy.com/software/BeautifulSoup/bs4/download/4.4/beautifulsoup4-4.4.1.tar.gz"
+MD5SUM="8fbd9a7cac0704645fa20d1419036815"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/libraries/CGAL/CGAL.SlackBuild b/libraries/CGAL/CGAL.SlackBuild
index 419b0c5ee1..ed4fe06fa5 100644
--- a/libraries/CGAL/CGAL.SlackBuild
+++ b/libraries/CGAL/CGAL.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CGAL
-VERSION=${VERSION:-4.6}
+VERSION=${VERSION:-4.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/CGAL/CGAL.info b/libraries/CGAL/CGAL.info
index d5a9e64c91..6c79747c3e 100644
--- a/libraries/CGAL/CGAL.info
+++ b/libraries/CGAL/CGAL.info
@@ -1,8 +1,8 @@
 PRGNAM="CGAL"
-VERSION="4.6"
+VERSION="4.6.3"
 HOMEPAGE="http://www.cgal.org/"
-DOWNLOAD="https://gforge.inria.fr/frs/download.php/file/34705/CGAL-4.6.tar.xz"
-MD5SUM="65fa7e17cd654ef68da47df608000007"
+DOWNLOAD="https://gforge.inria.fr/frs/download.php/file/35139/CGAL-4.6.3.tar.xz"
+MD5SUM="6953897544d41ffcc63ffe58b32a688f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/CoinMP/CoinMP.SlackBuild b/libraries/CoinMP/CoinMP.SlackBuild
new file mode 100644
index 0000000000..e5c6fc7896
--- /dev/null
+++ b/libraries/CoinMP/CoinMP.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for CoinMP
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=CoinMP
+VERSION=${VERSION:-1.8.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# not sure why these are put here, but lets move them
+mv $PKG$PKG/usr/share/coin/doc/CoinMP/* $PKG/usr/share/coin/doc/CoinMP
+rm -rf $PKG/tmp
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/CoinMP/CoinMP.info b/libraries/CoinMP/CoinMP.info
new file mode 100644
index 0000000000..23e40cb119
--- /dev/null
+++ b/libraries/CoinMP/CoinMP.info
@@ -0,0 +1,10 @@
+PRGNAM="CoinMP"
+VERSION="1.8.3"
+HOMEPAGE="https://projects.coin-or.org/CoinMP"
+DOWNLOAD="http://www.coin-or.org/download/source/CoinMP/CoinMP-1.8.3.tgz"
+MD5SUM="0a1e94502a6909e1afb800af6934f022"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/CoinMP/README b/libraries/CoinMP/README
new file mode 100644
index 0000000000..16738029cf
--- /dev/null
+++ b/libraries/CoinMP/README
@@ -0,0 +1,4 @@
+CoinMP is a C-API library that supports most of the functionality of
+CLP (Coin LP), CBC (Coin Branch-and-Cut), and CGL (Cut Generation
+Library) projects. When compiled for Unix it generates a CoinMP.so
+library that can be similarly used in other Unix C/C++ projects.
diff --git a/libraries/CoinMP/slack-desc b/libraries/CoinMP/slack-desc
new file mode 100644
index 0000000000..6973fa5d99
--- /dev/null
+++ b/libraries/CoinMP/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+CoinMP: CoinMP (C-API library functionality of CLP, CBC, and CGL projects)
+CoinMP:
+CoinMP: CoinMP is a C-API library that supports most of the functionality of
+CoinMP: CLP (Coin LP), CBC (Coin Branch-and-Cut), and CGL (Cut Generation
+CoinMP: Library) projects.
+CoinMP:
+CoinMP: Homepage: https://projects.coin-or.org/CoinMP
+CoinMP:
+CoinMP:
+CoinMP:
+CoinMP:
diff --git a/libraries/CondConfigParser/CondConfigParser.SlackBuild b/libraries/CondConfigParser/CondConfigParser.SlackBuild
new file mode 100644
index 0000000000..00eb5f8844
--- /dev/null
+++ b/libraries/CondConfigParser/CondConfigParser.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Slackware build script for CondConfigParser
+
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=CondConfigParser
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=${PKG:-$TMP/package-$PRGNAM}
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
+
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
+  -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cp -a AUTHORS COPYING* ChangeLog INSTALL.txt README.rst TODO $PRGDOC/
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/CondConfigParser/CondConfigParser.info b/libraries/CondConfigParser/CondConfigParser.info
new file mode 100644
index 0000000000..75557ceea2
--- /dev/null
+++ b/libraries/CondConfigParser/CondConfigParser.info
@@ -0,0 +1,10 @@
+PRGNAM="CondConfigParser"
+VERSION="1.0.2"
+HOMEPAGE="http://people.via.ecp.fr/~flo/projects/CondConfigParser"
+DOWNLOAD="http://people.via.ecp.fr/~flo/projects/CondConfigParser/dist/1.0.2/CondConfigParser-1.0.2.tar.bz2"
+MD5SUM="4d8e6e31bc789aa9abd09e44e80166c0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 pysetuptools"
+MAINTAINER="Philip Lacroix"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/CondConfigParser/README b/libraries/CondConfigParser/README
new file mode 100644
index 0000000000..59e4e82277
--- /dev/null
+++ b/libraries/CondConfigParser/README
@@ -0,0 +1,5 @@
+CondConfigParser is a Python library designed to help developers of Python
+applications to parse configuration files. Compared to well-known modules such
+as ConfigParser and json, CondConfigParser allows the user to define conditions 
+using boolean operators and specific sections in the configuration file, which
+are only applied when the corresponding condition is fulfilled.
diff --git a/libraries/CondConfigParser/slack-desc b/libraries/CondConfigParser/slack-desc
new file mode 100644
index 0000000000..f641450a7f
--- /dev/null
+++ b/libraries/CondConfigParser/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+CondConfigParser: CondConfigParser (Python library for parsing configuration files)
+CondConfigParser:
+CondConfigParser: CondConfigParser is a Python library designed to help developers of
+CondConfigParser: Python applications to parse configuration files. Compared to well-
+CondConfigParser: known modules such as ConfigParser and json, CondConfigParser allows
+CondConfigParser: the user to define conditions using boolean operators and specific
+CondConfigParser: sections in the configuration file, which are only applied when the
+CondConfigParser: corresponding condition is fulfilled.
+CondConfigParser:
+CondConfigParser: Homepage: http://people.via.ecp.fr/~flo/projects/CondConfigParser
+CondConfigParser:
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild
index 6ae4a05869..3cf47dc1ea 100644
--- a/libraries/DevIL/DevIL.SlackBuild
+++ b/libraries/DevIL/DevIL.SlackBuild
@@ -8,7 +8,7 @@
 PRGNAM=DevIL
 SRCNAM=devil
 VERSION=${VERSION:-1.7.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,7 +51,10 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix build with gcc5
+patch -p0 < $CWD/patch-include_IL_il.h
 
 # Build against libpng14, not libpng12.
 sed -i 's/png12/png14/g' configure
@@ -68,6 +71,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --datarootdir=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-static=no \
+  --enable-ILU=yes \
+  --enable-ILUT=yes \
   --build=$ARCH-slackware-linux
 make
 make install DESTDIR=$PKG
diff --git a/libraries/DevIL/patch-include_IL_il.h b/libraries/DevIL/patch-include_IL_il.h
new file mode 100644
index 0000000000..e265db2fe4
--- /dev/null
+++ b/libraries/DevIL/patch-include_IL_il.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_IL_il.h,v 1.1 2012/07/09 19:16:33 joerg Exp $
+
+--- include/IL/il.h.orig	2012-07-06 12:31:13.000000000 +0000
++++ include/IL/il.h
+@@ -63,7 +63,7 @@ extern "C" {
+ 	#endif
+ #endif
+ 
+-#ifdef RESTRICT_KEYWORD
++#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
+ #define RESTRICT restrict
+ #define CONST_RESTRICT const restrict
+ #else
diff --git a/libraries/DirectFB/DirectFB.info b/libraries/DirectFB/DirectFB.info
index ea7aff285e..e65cb10b0a 100644
--- a/libraries/DirectFB/DirectFB.info
+++ b/libraries/DirectFB/DirectFB.info
@@ -1,7 +1,7 @@
 PRGNAM="DirectFB"
 VERSION="1.6.2"
 HOMEPAGE="http://www.directfb.org/"
-DOWNLOAD="http://www.directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.2.tar.gz"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/6/b/6bebdbf26f03f7114ae17ab86d4d1d27/DirectFB-1.6.2.tar.gz"
 MD5SUM="6bebdbf26f03f7114ae17ab86d4d1d27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/HawkNL/HawkNL.info b/libraries/HawkNL/HawkNL.info
index c54d84078d..c31232f548 100644
--- a/libraries/HawkNL/HawkNL.info
+++ b/libraries/HawkNL/HawkNL.info
@@ -1,7 +1,7 @@
 PRGNAM="HawkNL"
 VERSION="1.68"
 HOMEPAGE="http://hawksoft.com/hawknl/"
-DOWNLOAD="http://hawksoft.com/download/files/HawkNL168src.zip"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip"
 MD5SUM="1b5eb1373a4c45dc49ded2c9d89cec93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/Impacket/Impacket.SlackBuild b/libraries/Impacket/Impacket.SlackBuild
index f313992273..2dea75a7d0 100644
--- a/libraries/Impacket/Impacket.SlackBuild
+++ b/libraries/Impacket/Impacket.SlackBuild
@@ -2,6 +2,9 @@
 
 # Slackware build script for Impacket.
 #
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
 # Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
@@ -23,7 +26,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Impacket
-VERSION=0.9.6.0
+SRCNAM=impacket
+VERSION=0.9.13
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,9 +51,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar -xzvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/libraries/Impacket/Impacket.info b/libraries/Impacket/Impacket.info
index b5cd81a36c..5896e77d86 100644
--- a/libraries/Impacket/Impacket.info
+++ b/libraries/Impacket/Impacket.info
@@ -1,10 +1,10 @@
 PRGNAM="Impacket"
-VERSION="0.9.6.0"
-HOMEPAGE="http://oss.coresecurity.com/projects/impacket.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/Impacket-0.9.6.0.tar.gz"
-MD5SUM="6393804c7b88bca89cf7516214a61033"
+VERSION="0.9.13"
+HOMEPAGE="http://www.coresecurity.com/corelabs-research/open-source-tools/impacket"
+DOWNLOAD="https://pypi.python.org/packages/source/i/impacket/impacket-0.9.13.tar.gz"
+MD5SUM="db305aff0dae6a3c09f873a2da248387"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+REQUIRES="pyasn1 pycrypto"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/libraries/Kivy/Kivy.SlackBuild b/libraries/Kivy/Kivy.SlackBuild
index 9c5de0194e..a9662ea119 100644
--- a/libraries/Kivy/Kivy.SlackBuild
+++ b/libraries/Kivy/Kivy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Kivy
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=Kivy
 SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-1.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE doc/README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE doc/README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/Kivy/Kivy.info b/libraries/Kivy/Kivy.info
index a41c3cf50e..131db0641f 100644
--- a/libraries/Kivy/Kivy.info
+++ b/libraries/Kivy/Kivy.info
@@ -1,10 +1,10 @@
 PRGNAM="Kivy"
-VERSION="1.9.0"
+VERSION="1.9.1"
 HOMEPAGE="http://kivy.org"
-DOWNLOAD="https://github.com/kivy/kivy/archive/1.9.0.tar.gz"
-MD5SUM="b1a9da71e0e9c60c391e1fa9f6d8752c"
+DOWNLOAD="https://github.com/kivy/kivy/archive/1.9.1.tar.gz"
+MD5SUM="e1cb0f9bca49fdad05653df3fb6fec46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Cython"
+REQUIRES="Cython-Kivy"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/LibRaw/LibRaw.SlackBuild b/libraries/LibRaw/LibRaw.SlackBuild
index b29899686e..fc14202d7f 100644
--- a/libraries/LibRaw/LibRaw.SlackBuild
+++ b/libraries/LibRaw/LibRaw.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=LibRaw
-VERSION=${VERSION:-0.16.0}
+VERSION=${VERSION:-0.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/LibRaw/LibRaw.info b/libraries/LibRaw/LibRaw.info
index a9efdd95d0..8578f8d3d3 100644
--- a/libraries/LibRaw/LibRaw.info
+++ b/libraries/LibRaw/LibRaw.info
@@ -1,12 +1,12 @@
 PRGNAM="LibRaw"
-VERSION="0.16.0"
+VERSION="0.17.0"
 HOMEPAGE="http://www.libraw.org/"
-DOWNLOAD="http://www.libraw.org/data/LibRaw-0.16.0.tar.gz \
-          http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.16.0.tar.gz \
-          http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.16.0.tar.gz"
-MD5SUM="21f569be043057b754d87e3062e2345a \
-        d0059998e5ab29f652b12093f5feff45 \
-        b30018c313e10c96521378efc8d492ff"
+DOWNLOAD="http://www.libraw.org/data/LibRaw-0.17.0.tar.gz \
+          http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.17.0.tar.gz \
+          http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.17.0.tar.gz"
+MD5SUM="f6d2b9dd22e63ac0f0bd3944489a81c6 \
+        291c83a5274b6ce0270131735f927adc \
+        141e24a0626b60e01dc9769cff14d499"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/OpenAL/OpenAL.SlackBuild b/libraries/OpenAL/OpenAL.SlackBuild
index 72991e114b..0be64346a8 100644
--- a/libraries/OpenAL/OpenAL.SlackBuild
+++ b/libraries/OpenAL/OpenAL.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=OpenAL
 SRCNAM=openal-soft
-VERSION=1.16.0
+VERSION=${VERSION:-1.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
diff --git a/libraries/OpenAL/OpenAL.info b/libraries/OpenAL/OpenAL.info
index daf0268cf9..c5568b0a05 100644
--- a/libraries/OpenAL/OpenAL.info
+++ b/libraries/OpenAL/OpenAL.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenAL"
-VERSION="1.16.0"
+VERSION="1.17.1"
 HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-DOWNLOAD="http://kcat.strangesoft.net/openal-releases/openal-soft-1.16.0.tar.bz2"
-MD5SUM="14db4b0d12f07252070b4fe5eb5911f6"
+DOWNLOAD="http://kcat.strangesoft.net/openal-releases/openal-soft-1.17.1.tar.bz2"
+MD5SUM="4e1cff46cdb3ac147745dea33ad92687"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.info b/libraries/OpenSceneGraph/OpenSceneGraph.info
index b0e46ecc2e..e695622d72 100644
--- a/libraries/OpenSceneGraph/OpenSceneGraph.info
+++ b/libraries/OpenSceneGraph/OpenSceneGraph.info
@@ -1,7 +1,7 @@
 PRGNAM="OpenSceneGraph"
 VERSION="3.2.1"
 HOMEPAGE="http://www.openscenegraph.org/"
-DOWNLOAD="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip"
+DOWNLOAD="http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip"
 MD5SUM="4f95206a1eef218bd007c3b43e1334f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/PyYAML/PyYAML.SlackBuild b/libraries/PyYAML/PyYAML.SlackBuild
index 4d46b39718..52cee33b82 100644
--- a/libraries/PyYAML/PyYAML.SlackBuild
+++ b/libraries/PyYAML/PyYAML.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=PyYAML
-VERSION=${VERSION:-3.10}
+VERSION=${VERSION:-3.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/PyYAML/PyYAML.info b/libraries/PyYAML/PyYAML.info
index b542aa8b0e..0e021ecc6c 100644
--- a/libraries/PyYAML/PyYAML.info
+++ b/libraries/PyYAML/PyYAML.info
@@ -1,8 +1,8 @@
 PRGNAM="PyYAML"
-VERSION="3.10"
+VERSION="3.11"
 HOMEPAGE="http://pyyaml.org"
-DOWNLOAD="http://pyyaml.org/download/pyyaml/PyYAML-3.10.tar.gz"
-MD5SUM="74c94a383886519e9e7b3dd1ee540247"
+DOWNLOAD="http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz"
+MD5SUM="f50e08ef0fe55178479d3a618efe21db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/SDL2/README b/libraries/SDL2/README
index 8e26524439..8e26524439 100644
--- a/development/SDL2/README
+++ b/libraries/SDL2/README
diff --git a/libraries/SDL2/SDL2.SlackBuild b/libraries/SDL2/SDL2.SlackBuild
new file mode 100644
index 0000000000..1240b3745b
--- /dev/null
+++ b/libraries/SDL2/SDL2.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for SDL2
+
+# Copyright 2013 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=SDL2
+VERSION=${VERSION:-2.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2/SDL2.info b/libraries/SDL2/SDL2.info
new file mode 100644
index 0000000000..2247b75e65
--- /dev/null
+++ b/libraries/SDL2/SDL2.info
@@ -0,0 +1,10 @@
+PRGNAM="SDL2"
+VERSION="2.0.4"
+HOMEPAGE="http://libsdl.org"
+DOWNLOAD="http://www.libsdl.org/release/SDL2-2.0.4.tar.gz"
+MD5SUM="44fc4a023349933e7f5d7a582f7b886e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2/slack-desc b/libraries/SDL2/slack-desc
index a546db6cec..a546db6cec 100644
--- a/development/SDL2/slack-desc
+++ b/libraries/SDL2/slack-desc
diff --git a/development/SDL2_image/README b/libraries/SDL2_image/README
index a63388362c..a63388362c 100644
--- a/development/SDL2_image/README
+++ b/libraries/SDL2_image/README
diff --git a/libraries/SDL2_image/SDL2_image.SlackBuild b/libraries/SDL2_image/SDL2_image.SlackBuild
new file mode 100644
index 0000000000..9f0a672fc9
--- /dev/null
+++ b/libraries/SDL2_image/SDL2_image.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for SDL2_image
+
+# Copyright 2013 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=SDL2_image
+VERSION=${VERSION:-2.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_image/SDL2_image.info b/libraries/SDL2_image/SDL2_image.info
new file mode 100644
index 0000000000..709dd785e8
--- /dev/null
+++ b/libraries/SDL2_image/SDL2_image.info
@@ -0,0 +1,10 @@
+PRGNAM="SDL2_image"
+VERSION="2.0.1"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
+DOWNLOAD="http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz"
+MD5SUM="d94b94555ba022fa249a53a021dc3606"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2"
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2_image/slack-desc b/libraries/SDL2_image/slack-desc
index 8786262b0a..8786262b0a 100644
--- a/development/SDL2_image/slack-desc
+++ b/libraries/SDL2_image/slack-desc
diff --git a/development/SDL2_mixer/README b/libraries/SDL2_mixer/README
index 40553085c7..40553085c7 100644
--- a/development/SDL2_mixer/README
+++ b/libraries/SDL2_mixer/README
diff --git a/libraries/SDL2_mixer/SDL2_mixer.SlackBuild b/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
new file mode 100644
index 0000000000..aad75527a6
--- /dev/null
+++ b/libraries/SDL2_mixer/SDL2_mixer.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for SDL2_mixer
+
+# Copyright 2013-2015 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=SDL2_mixer
+VERSION=${VERSION:-2.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-music-mod-modplug=no \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a playmus.c playwave.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_mixer/SDL2_mixer.info b/libraries/SDL2_mixer/SDL2_mixer.info
new file mode 100644
index 0000000000..4323326c16
--- /dev/null
+++ b/libraries/SDL2_mixer/SDL2_mixer.info
@@ -0,0 +1,10 @@
+PRGNAM="SDL2_mixer"
+VERSION="2.0.1"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+DOWNLOAD="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz"
+MD5SUM="c6c4f556d4415871f526248f5c9a627d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2"
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2_mixer/slack-desc b/libraries/SDL2_mixer/slack-desc
index 565899c0fc..565899c0fc 100644
--- a/development/SDL2_mixer/slack-desc
+++ b/libraries/SDL2_mixer/slack-desc
diff --git a/development/SDL2_net/README b/libraries/SDL2_net/README
index 3f3e632887..3f3e632887 100644
--- a/development/SDL2_net/README
+++ b/libraries/SDL2_net/README
diff --git a/libraries/SDL2_net/SDL2_net.SlackBuild b/libraries/SDL2_net/SDL2_net.SlackBuild
new file mode 100644
index 0000000000..ac25dc3fe3
--- /dev/null
+++ b/libraries/SDL2_net/SDL2_net.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for SDL2_net
+
+# Copyright 2013 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=SDL2_net
+VERSION=${VERSION:-2.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --disable-gui
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/demo
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a chat.cpp chat.h chatd.c $PKG/usr/doc/$PRGNAM-$VERSION/demo
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_net/SDL2_net.info b/libraries/SDL2_net/SDL2_net.info
new file mode 100644
index 0000000000..71a7778b2c
--- /dev/null
+++ b/libraries/SDL2_net/SDL2_net.info
@@ -0,0 +1,10 @@
+PRGNAM="SDL2_net"
+VERSION="2.0.1"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_net/"
+DOWNLOAD="http://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz"
+MD5SUM="5c1d9d1cfa63301b141cb5c0de2ea7c4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2"
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/development/SDL2_net/slack-desc b/libraries/SDL2_net/slack-desc
index 3f45345ca4..3f45345ca4 100644
--- a/development/SDL2_net/slack-desc
+++ b/libraries/SDL2_net/slack-desc
diff --git a/desktop/SDL2_ttf/README b/libraries/SDL2_ttf/README
index ac5e99801e..ac5e99801e 100644
--- a/desktop/SDL2_ttf/README
+++ b/libraries/SDL2_ttf/README
diff --git a/libraries/SDL2_ttf/SDL2_ttf.SlackBuild b/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
new file mode 100644
index 0000000000..3b92bbdb73
--- /dev/null
+++ b/libraries/SDL2_ttf/SDL2_ttf.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for SDL2_ttf
+
+# Copyright 2013 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=SDL2_ttf
+VERSION=${VERSION:-2.0.13}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a showfont.c $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/SDL2_ttf/SDL2_ttf.info b/libraries/SDL2_ttf/SDL2_ttf.info
new file mode 100644
index 0000000000..dffb163103
--- /dev/null
+++ b/libraries/SDL2_ttf/SDL2_ttf.info
@@ -0,0 +1,10 @@
+PRGNAM="SDL2_ttf"
+VERSION="2.0.13"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
+DOWNLOAD="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.13.tar.gz"
+MD5SUM="f57b13b2e51f1f8772cc1a79cdcdb14e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="SDL2"
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/desktop/SDL2_ttf/slack-desc b/libraries/SDL2_ttf/slack-desc
index dbd7fee216..dbd7fee216 100644
--- a/desktop/SDL2_ttf/slack-desc
+++ b/libraries/SDL2_ttf/slack-desc
diff --git a/libraries/SFML/SFML.SlackBuild b/libraries/SFML/SFML.SlackBuild
index a3d2631bb9..356274a2c7 100644
--- a/libraries/SFML/SFML.SlackBuild
+++ b/libraries/SFML/SFML.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for SFML
 
 # Written by Pawel Standowicz (standek@gmail.com)
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SFML
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.3.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/libraries/SFML/SFML.info b/libraries/SFML/SFML.info
index 9327fdd2d6..e97403a510 100644
--- a/libraries/SFML/SFML.info
+++ b/libraries/SFML/SFML.info
@@ -1,8 +1,8 @@
 PRGNAM="SFML"
-VERSION="2.3"
+VERSION="2.3.2"
 HOMEPAGE="http://www.sfml-dev.org"
-DOWNLOAD="http://www.sfml-dev.org/download/sfml/2.1/SFML-2.3-sources.zip"
-MD5SUM="abc06b4cdef6531143ac0221cd1b184a"
+DOWNLOAD="http://www.sfml-dev.org/download/sfml/2.1/SFML-2.3.2-sources.zip"
+MD5SUM="7f152bab6afc8ccbddaf51d6da318201"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL"
diff --git a/libraries/activemq-cpp/README b/libraries/activemq-cpp/README
new file mode 100644
index 0000000000..4c80fa4349
--- /dev/null
+++ b/libraries/activemq-cpp/README
@@ -0,0 +1,4 @@
+ActiveMQ CPP is a messaging library that can use multiple protocols to
+talk to a MOM (e.g. ActiveMQ).
+
+
diff --git a/libraries/activemq-cpp/activemq-cpp.SlackBuild b/libraries/activemq-cpp/activemq-cpp.SlackBuild
new file mode 100644
index 0000000000..163b59591e
--- /dev/null
+++ b/libraries/activemq-cpp/activemq-cpp.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for activemq-cpp
+
+# Copyright 2015 Mauricio Paicil , Santiago, Chile
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=activemq-cpp
+VERSION=${VERSION:-3.9.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-library-$VERSION
+tar xvf $CWD/$PRGNAM-library-$VERSION-src.tar.gz
+cd $PRGNAM-library-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+# Compile the application and install it into the $PKG directory
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/activemq-cpp/activemq-cpp.info b/libraries/activemq-cpp/activemq-cpp.info
new file mode 100644
index 0000000000..00ef71a189
--- /dev/null
+++ b/libraries/activemq-cpp/activemq-cpp.info
@@ -0,0 +1,10 @@
+PRGNAM="activemq-cpp"
+VERSION="3.9.1"
+HOMEPAGE="http://activemq.apache.org/cms/"
+DOWNLOAD="http://www.eu.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz"
+MD5SUM="be7baa131959a2a74a7d974eb94420da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Mauricio Paicil"
+EMAIL="mauricio.paicil.g@gmail.com"
diff --git a/libraries/activemq-cpp/slack-desc b/libraries/activemq-cpp/slack-desc
new file mode 100644
index 0000000000..e4abdba815
--- /dev/null
+++ b/libraries/activemq-cpp/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |------handy-ruler------------------------------------------------|
+activemq-cpp: activemq-cpp (ActiveMQ CPP Library)
+activemq-cpp:
+activemq-cpp: Apache ActiveMQ is the most popular and powerful open source
+activemq-cpp: messaging and Integration Patterns server.
+activemq-cpp:
+activemq-cpp: Apache ActiveMQ is fast, supports many Cross Language Clients
+activemq-cpp: and Protocols, comes with easy to use Enterprise Integration
+activemq-cpp: Patterns and many advanced features while fully supporting
+activemq-cpp: JMS 1.1 and J2EE 1.4.
+activemq-cpp:
+activemq-cpp: homepage: http://activemq.apache.org/cms/index.html
+activemq-cpp:
diff --git a/libraries/agg/agg.info b/libraries/agg/agg.info
index 81deb22f71..9b9466200f 100644
--- a/libraries/agg/agg.info
+++ b/libraries/agg/agg.info
@@ -1,7 +1,7 @@
 PRGNAM="agg"
 VERSION="2.5"
-HOMEPAGE="http://www.antigrain.com/"
-DOWNLOAD="http://www.antigrain.com/agg-2.5.tar.gz"
+HOMEPAGE="http://agg.sf.net"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/agg-2.5.tar.gz"
 MD5SUM="0229a488bc47be10a2fee6cf0b2febd6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/agg/slack-desc b/libraries/agg/slack-desc
index a3963006bd..e0a56ff37b 100644
--- a/libraries/agg/slack-desc
+++ b/libraries/agg/slack-desc
@@ -12,7 +12,7 @@ agg: A High Quality Rendering Engine for C++.
 agg:
 agg: AGG was written by Maxim Shemanarev
 agg:
-agg:
+agg: homepage: http://agg.sf.net
 agg:
 agg:
 agg:
diff --git a/libraries/bamf/README b/libraries/bamf/README
new file mode 100644
index 0000000000..b9db5532e6
--- /dev/null
+++ b/libraries/bamf/README
@@ -0,0 +1,6 @@
+bamf (Window matching library - shared library)
+
+bamf matches application windows to desktop files. Removes the 
+headache of applications matching into a simple DBus daemon and c 
+wrapper library. Currently features application matching at amazing 
+levels of accuracy (covering nearly every corner case).
diff --git a/libraries/bamf/bamf.SlackBuild b/libraries/bamf/bamf.SlackBuild
new file mode 100644
index 0000000000..3f286bcf5b
--- /dev/null
+++ b/libraries/bamf/bamf.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# Slackware build script for bamf.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=bamf
+VERSION=${VERSION:-0.5.1}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-introspection \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+DOCS="ChangeLog COPYING COPYING.LGPL INSTALL TODO"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/bamf/bamf.info b/libraries/bamf/bamf.info
new file mode 100644
index 0000000000..23c5f63ba1
--- /dev/null
+++ b/libraries/bamf/bamf.info
@@ -0,0 +1,10 @@
+PRGNAM="bamf"
+VERSION="0.5.1"
+HOMEPAGE="https://launchpad.net/bamf"
+DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.1/+download/bamf-0.5.1.tar.gz"
+MD5SUM="1a5b82819273adcc3e6ad6556c7dc90a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libgtop libwnck3"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/bamf/slack-desc b/libraries/bamf/slack-desc
new file mode 100644
index 0000000000..bd702b775e
--- /dev/null
+++ b/libraries/bamf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+bamf: bamf (Window matching library - shared library)
+bamf:
+bamf: bamf matches application windows to desktop files. Removes the 
+bamf: headache of applications matching into a simple DBus daemon and c 
+bamf: wrapper library. Currently features application matching at amazing 
+bamf: levels of accuracy (covering nearly every corner case).
+bamf:
+bamf: Home page: https://launchpad.net/bamf
+bamf:
+bamf:
+bamf:
diff --git a/libraries/batinfo/batinfo.SlackBuild b/libraries/batinfo/batinfo.SlackBuild
index 0c0fcc6aab..b0a137c5f9 100644
--- a/libraries/batinfo/batinfo.SlackBuild
+++ b/libraries/batinfo/batinfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for batinfo
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=batinfo
 VERSION=${VERSION:-0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,11 +65,6 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/libraries/batinfo/batinfo.info b/libraries/batinfo/batinfo.info
index 8fc6c9cb3f..f2002bc2f2 100644
--- a/libraries/batinfo/batinfo.info
+++ b/libraries/batinfo/batinfo.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/bcdoc/bcdoc.SlackBuild b/libraries/bcdoc/bcdoc.SlackBuild
index 38df8d8541..0e6dc179e9 100644
--- a/libraries/bcdoc/bcdoc.SlackBuild
+++ b/libraries/bcdoc/bcdoc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bcdoc
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bcdoc
-VERSION=${VERSION:-0.15.0}
+VERSION=${VERSION:-0.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/bcdoc/bcdoc.info b/libraries/bcdoc/bcdoc.info
index 98ebcedbec..c8939c175c 100644
--- a/libraries/bcdoc/bcdoc.info
+++ b/libraries/bcdoc/bcdoc.info
@@ -1,10 +1,10 @@
 PRGNAM="bcdoc"
-VERSION="0.15.0"
+VERSION="0.16.0"
 HOMEPAGE="https://github.com/boto/bcdoc"
-DOWNLOAD="https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.15.0.tar.gz"
-MD5SUM="0bb5ef70425e9bee2b6da7570c79f5a7"
+DOWNLOAD="https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.16.0.tar.gz"
+MD5SUM="e84b506c1c73e71b23d9be0aa00f6bec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils six"
+REQUIRES="docutils six pysetuptools"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/belle-sip/belle-sip.SlackBuild b/libraries/belle-sip/belle-sip.SlackBuild
index 8c162b628f..496bbe2195 100644
--- a/libraries/belle-sip/belle-sip.SlackBuild
+++ b/libraries/belle-sip/belle-sip.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=belle-sip
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/belle-sip/belle-sip.info b/libraries/belle-sip/belle-sip.info
index d2d00e225c..02fb204b7c 100644
--- a/libraries/belle-sip/belle-sip.info
+++ b/libraries/belle-sip/belle-sip.info
@@ -1,12 +1,12 @@
 PRGNAM="belle-sip"
-VERSION="1.3.0"
+VERSION="1.4.2"
 HOMEPAGE="http://www.linphone.org/technical-corner/belle-sip.html"
-DOWNLOAD="http://download.savannah.gnu.org/releases/linphone/belle-sip/belle-sip-1.3.0.tar.gz \
-	  https://github.com/antlr/website-antlr3/raw/gh-pages/download/antlr-3.4-complete.jar"
-MD5SUM="ae9e8be12f62552a5376edd66b0265d9 \
+DOWNLOAD="http://download.savannah.gnu.org/releases/linphone/belle-sip/belle-sip-1.4.2.tar.gz \
+	  http://github.com/antlr/website-antlr3/raw/gh-pages/download/antlr-3.4-complete.jar"
+MD5SUM="dbb58649225adefbad87241141fbea93 \
 	1b91dea1c7d480b3223f7c8a9aa0e172"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libantlr3c polarssl jdk"
+REQUIRES="libantlr3c jdk"
 MAINTAINER="Euan Thoms"
 EMAIL="euan at potensol dot com" 
diff --git a/libraries/blas/blas.SlackBuild b/libraries/blas/blas.SlackBuild
index f1a563d57a..b370743120 100644
--- a/libraries/blas/blas.SlackBuild
+++ b/libraries/blas/blas.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for BLAS
 
-# Copyright 2014-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2014-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 
 PRGNAM=blas
 SRCNAM=lapack
-VERSION=${VERSION:-3.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.6.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,16 +45,12 @@ DOCS="LICENSE"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -68,31 +64,30 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# `make install` wants to compile and install the rest of lapack,
-# so install files manually instead.
-#
-# Avoid adding an RPATH entry to the shared lib.  It's unnecessary, and
-# since we're not running `make install` we don't want to end up with
-# a temporary RPATH that refers to the build directory.
-#
-# WARNING:  The SONAME is "libblas.so", not "libblas.so.0" nor
-# "libblas.so.$MAJOR" as crafted in previous versions of this script.
-# I don't know if this is intentional or an omission by upstream.
+# Fix lots of bugs with the cmake build system and .pc files.
+# More importantly, allow building only the BLAS component.
+patch -p1 < $CWD/patches/generate-pkgconfig.diff
+patch -p1 < $CWD/patches/link-dependencies.diff
+patch -p1 < $CWD/patches/target-cleanup.diff
+patch -p1 < $CWD/patches/cmake-piecewise.diff
+
+# Avoid adding an RPATH entry to the shared lib.  It's unnecessary (except for
+# running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX).
 mkdir -p shared
 cd shared
   cmake \
     -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_RULE_MESSAGES=OFF \
     -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+    -DBUILD_BLAS=ON \
+    -DBUILD_TESTING=OFF \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_SKIP_RPATH=YES \
     ..
-  make blas/fast
-  install -D -m0755 -s lib/libblas.so $PKG/usr/lib${LIBDIRSUFFIX}/libblas.so
-  install -D -m0644 BLAS/blas.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/blas.pc
+  make
+  make install/strip DESTDIR=$PKG
 cd ..
 
 # cmake doesn't appear to let us build both shared and static libs
@@ -103,37 +98,32 @@ cd static
   cmake \
     -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_RULE_MESSAGES=OFF \
     -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+    -DBUILD_BLAS=ON \
+    -DBUILD_TESTING=OFF \
     ..
-  make blas/fast
-  install -D -m0644 lib/libblas.a $PKG/usr/lib${LIBDIRSUFFIX}/libblas.a
+  make
+  make install/strip DESTDIR=$PKG
 cd ..
 
-# Fix the pkg-config file:
-# 1.  Version is missing.
-# 2.  -L is hard-coded when a variable exists.
-sed -i \
-  -e "/^Version:/cVersion: ${VERSION}" \
-  -e "/^Libs:/s/-L[^ ]*/-L\${libdir}/" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/blas.pc
-
-# Generate man pages.  Also requires some fix-ups:
+# Generate man pages.  Requires some fix-ups:
+# 0.  Join all escaped newlines so the entire value is replaced.
 # 1.  Replace "LAPACK" with "BLAS" in headers/footers.
-# 2.  Version is wrong.
-# 3.  Only generate on the BLAS sources.
+# 2.  Only generate on the BLAS sources.
+# 3.  Turn off recursion.  Only operate on directories in INPUT.
 # 4.  Turn off some repetitive comments.
 # 5.  Turn off HAVE_DOT.  Graphs are unnecessary for this purpose.
 # 6.  Turn off MAN_LINKS.  See below.
 sed -i \
-  -e "s/^\(PROJECT_NAME *=\).*/\1 BLAS/" \
-  -e "s/^\(PROJECT_NUMBER *=\).*/\1 ${VERSION}/" \
-  -e "s/^\(INPUT *=\).*/\1 BLAS\/SRC/" \
-  -e "s/^\(REPEAT_BRIEF *=\).*/\1 NO/" \
-  -e "s/^\(HAVE_DOT *=\).*/\1 NO/" \
-  -e "s/^\(MAN_LINKS *=\).*/\1 NO/" \
+  -e ':a;/\\$/N;s/\\\n//;ta' \
+  -e 's/^\(PROJECT_NAME *=\).*/\1 BLAS/' \
+  -e 's/^\(INPUT *=\).*/\1 BLAS\/SRC/' \
+  -e 's/^\(RECURSIVE *=\).*/\1 NO/' \
+  -e 's/^\(REPEAT_BRIEF *=\).*/\1 NO/' \
+  -e 's/^\(HAVE_DOT *=\).*/\1 NO/' \
+  -e 's/^\(MAN_LINKS *=\).*/\1 NO/' \
   DOCS/Doxyfile_man
 doxygen DOCS/Doxyfile_man
 # Doxygen generates manpages on a file-by-file basis (note the .f extensions).
diff --git a/libraries/blas/blas.info b/libraries/blas/blas.info
index c910648705..61a211d072 100644
--- a/libraries/blas/blas.info
+++ b/libraries/blas/blas.info
@@ -1,8 +1,8 @@
 PRGNAM="blas"
-VERSION="3.5.0"
+VERSION="3.6.0"
 HOMEPAGE="http://www.netlib.org/blas/"
-DOWNLOAD="http://www.netlib.org/lapack/lapack-3.5.0.tgz"
-MD5SUM="b1d3e3e425b2e44a06760ff173104bdf"
+DOWNLOAD="http://www.netlib.org/lapack/lapack-3.6.0.tgz"
+MD5SUM="f2f6c67134e851fe189bb3ca1fbb5101"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/blas/patches/cmake-piecewise.diff b/libraries/blas/patches/cmake-piecewise.diff
new file mode 100644
index 0000000000..13402a52e7
--- /dev/null
+++ b/libraries/blas/patches/cmake-piecewise.diff
@@ -0,0 +1,615 @@
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ message(STATUS "CBLAS enable")
+ enable_language(C)
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-
+ # Create a header file cblas.h for the routines called in my C programs
+ include(FortranCInterface)
+ FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/cblas_mangling.h 
+@@ -40,51 +38,8 @@
+    add_subdirectory(examples)
+ endif(BUILD_TESTING)
+ 
+-if(NOT BLAS_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-endif(NOT BLAS_FOUND)
+-
+-# Export cblas targets from the
+-# install tree, if any.
+-set(_cblas_config_install_guard_target "")
+-if(ALL_TARGETS)
+-  install(EXPORT cblas-targets
+-    DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
+-  # Choose one of the cblas targets to use as a guard for
+-  # cblas-config.cmake to load targets from the install tree.
+-  list(GET ALL_TARGETS 0 _cblas_config_install_guard_target)
+-endif()
+-
+-# Export cblas targets from the build tree, if any.
+-set(_cblas_config_build_guard_target "")
+-if(ALL_TARGETS)
+-  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-
+-  # Choose one of the cblas targets to use as a guard
+-  # for cblas-config.cmake to load targets from the build tree.
+-  list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
+-endif()
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
+-  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-
+-
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+    )
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
+-  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
+-  DESTINATION lib/cmake/cblas-${LAPACK_VERSION}
+-  )
+-
+-#install(EXPORT cblas-targets
+-#  DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
+-
+diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-build.cmake.in
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "@LAPACK_BINARY_DIR@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapack targets from the build tree, including lapacke targets.
+-if(NOT TARGET lapacke)
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-
+-# Report lapacke header search locations.
+-set(CBLAS_INCLUDE_DIRS "@LAPACK_SOURCE_DIR@/cblas/include")
+-
+-# Report lapacke libraries.
+-set(CBLAS_LIBRARIES cblas)
+diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-install.cmake.in
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake
+-get_filename_component(_CBLAS_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_SELF_DIR}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
+-
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapacke targets from the install tree.
+-if(NOT TARGET cblas)
+-  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-endif()
+-
+-# Report lapacke header search locations.
+-set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
+-
+-# Report lapacke libraries.
+-set(CBLAS_LIBRARIES cblas)
+-
+-unset(_CBLAS_PREFIX)
+-unset(_CBLAS_SELF_DIR)
+diff --git a/CBLAS/cmake/cblas-config-version.cmake.in b/CBLAS/cmake/cblas-config-version.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-version.cmake.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-set(PACKAGE_VERSION "@LAPACK_VERSION@")
+-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+-  set(PACKAGE_VERSION_COMPATIBLE 1)
+-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+-    set(PACKAGE_VERSION_EXACT 1)
+-  endif()
+-endif()
+-
+diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
+deleted file mode 100644
+--- a/CMAKE/lapack-config-build.cmake.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-# Load lapack targets from the build tree if necessary.
+-set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
+-if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-unset(_LAPACK_TARGET)
+-
+-# Report the blas and lapack raw or imported libraries.
+-set(LAPACK_blas_LIBRARIES "@BLAS_LIBRARIES@")
+-set(LAPACK_lapack_LIBRARIES "@LAPACK_LIBRARIES@")
+diff --git a/CMAKE/lapack-config-install.cmake.in b/CMAKE/lapack-config-install.cmake.in
+deleted file mode 100644
+--- a/CMAKE/lapack-config-install.cmake.in
++++ /dev/null
+@@ -1,15 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapack-<v>/<self>.cmake
+-get_filename_component(_LAPACK_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-
+-# Load lapack targets from the install tree if necessary.
+-set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
+-if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
+-  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-endif()
+-unset(_LAPACK_TARGET)
+-
+-# Report the blas and lapack raw or imported libraries.
+-set(LAPACK_blas_LIBRARIES "@BLAS_LIBRARIES@")
+-set(LAPACK_lapack_LIBRARIES "@LAPACK_LIBRARIES@")
+-
+-unset(_LAPACK_SELF_DIR)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,8 +55,6 @@
+ endif()
+ # --------------------------------------------------
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-
+ if (UNIX)
+   include(GNUInstallDirs)
+   set(ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
+@@ -70,7 +68,6 @@
+ 
+ macro(lapack_install_library lib)
+   install(TARGETS ${lib}
+-    EXPORT ${LAPACK_INSTALL_EXPORT_NAME}
+     ARCHIVE DESTINATION ${ARCHIVE_DIR}
+     LIBRARY DESTINATION ${LIBRARY_DIR}
+     RUNTIME DESTINATION ${RUNTIME_DIR}
+@@ -96,20 +93,6 @@
+ include( CheckLAPACKCompilerFlags )
+ CheckLAPACKCompilerFlags()
+ 
+-# --------------------------------------------------
+-# Check second function
+-
+-include(CheckTimeFunction)
+-set(TIME_FUNC NONE ${TIME_FUNC})
+-CHECK_TIME_FUNCTION(NONE TIME_FUNC)
+-CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
+-CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
+-CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
+-CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
+-message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
+-
+-set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
+-set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
+ 
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+@@ -120,6 +103,11 @@
+ endif()
+ 
+ # --------------------------------------------------
++# By default static library
++option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
++option(BUILD_STATIC_LIBS "Build static libraries" ON)
++
++# --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
+ option(BUILD_SINGLE "Build Single Precision" ON)
+@@ -150,236 +138,134 @@
+     Please enable at least one of these: BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
+ endif()
+ 
+-# --------------------------------------------------
+-# Subdirectories that need to be processed
++# deprecated LAPACK routines
++option(BUILD_DEPRECATED "Build deprecated routines" OFF)
+ 
++# --------------------------------------------------
++# BLAS
+ option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
+-
++option(BUILD_BLAS "Build BLAS" OFF)
+ 
+ # Check the usage of the user provided BLAS libraries
+ if(BLAS_LIBRARIES)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
+   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
+-  unset( CMAKE_REQUIRED_LIBRARIES )
++  unset(CMAKE_REQUIRED_LIBRARIES)
+   if(BLAS_FOUND)
+     message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
+-  else(BLAS_FOUND)
+-    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
+-    message(ERROR "-->     Will use REFERENCE BLAS (by default)")
+-    message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
+-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
+-  endif(BLAS_FOUND)
++  else()
++    message(SEND_ERROR "--> BLAS supplied by user is NOT WORKING, cannot use ${BLAS_LIBRARIES}.")
++  endif()
+ 
+ # User did not provide a BLAS Library but specified to search for one
+-elseif( USE_OPTIMIZED_BLAS )
+-  find_package( BLAS )
+-endif (BLAS_LIBRARIES)
++elseif(USE_OPTIMIZED_BLAS)
++  find_package(BLAS)
+ 
+-# Neither user specified or optimized BLAS libraries can be used
+-if(NOT BLAS_FOUND)
+-  message(STATUS "Using supplied NETLIB BLAS implementation")
+-  add_subdirectory(BLAS)
+-  set( BLAS_LIBRARIES blas )
+-else()
+-  set( CMAKE_EXE_LINKER_FLAGS 
+-    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for executables" FORCE)
+-  set( CMAKE_MODULE_LINKER_FLAGS 
+-    "${CMAKE_MODULE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for modules" FORCE)
+-  set( CMAKE_SHARED_LINKER_FLAGS 
+-    "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for shared libs" FORCE)
+-endif( NOT BLAS_FOUND )
++elseif(BUILD_BLAS)
++  set(BLAS_LIBRARIES blas)
++  set(BLAS_FOUND TRUE)
+ 
++  add_subdirectory(BLAS)
++endif()
+ 
+ # --------------------------------------------------
+ # CBLAS
+-option(CBLAS "Build CBLAS" OFF)
++option(BUILD_CBLAS "Build CBLAS" OFF)
+ 
+-if(CBLAS)
++if(BUILD_CBLAS)
++  set(NEED_BLAS TRUE)
+   add_subdirectory(CBLAS)
+-endif(CBLAS)
++endif(BUILD_CBLAS)
+ 
+ # --------------------------------------------------
+ # XBLAS
+-
+ option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
+-if (USE_XBLAS)
++
++if(USE_XBLAS)
+   find_library(XBLAS_LIBRARY NAMES xblas)
+ endif(USE_XBLAS)
+-   
+-option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
+ 
+ # --------------------------------------------------
+ # LAPACK
+-# User did not provide a LAPACK Library but specified to search for one
+-if( USE_OPTIMIZED_LAPACK )
+-  find_package( LAPACK )
+-endif (USE_OPTIMIZED_LAPACK)
++option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
++option(BUILD_LAPACK "Build LAPACK" OFF)
+ 
+ # Check the usage of the user provided or automatically found LAPACK libraries
+ if(LAPACK_LIBRARIES)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
+   # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
+-  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)
+-  unset( CMAKE_REQUIRED_LIBRARIES )
+-  if(LATESTLAPACK_FOUND)
++  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LAPACK_FOUND)
++  unset(CMAKE_REQUIRED_LIBRARIES)
++  if(LAPACK_FOUND)
+     message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
+-  else(LAPACK_FOUND)
+-    message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, 	CANNOT USE ${LAPACK_LIBRARIES}.")
+-    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
+-    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
+-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
+-  endif(LATESTLAPACK_FOUND)
+-endif (LAPACK_LIBRARIES)
++  else()
++    message(SEND_ERROR "--> LAPACK supplied by user is NOT WORKING or is older than LAPACK 3.4.0, cannot use ${LAPACK_LIBRARIES}.")
++  endif()
++
++# User did not provide a LAPACK Library but specified to search for one
++elseif(USE_OPTIMIZED_LAPACK)
++  find_package(LAPACK)
++
++elseif(BUILD_LAPACK)
++  set(LAPACK_LIBRARIES lapack)
++  set(LAPACK_FOUND TRUE)
++
++  set(NEED_BLAS TRUE)
++
++  # Check second function
++  include(CheckTimeFunction)
++  set(TIME_FUNC NONE ${TIME_FUNC})
++  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
++  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
++  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
++  CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
++  CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
++  message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
++
++  set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
++  set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ 
+-# Neither user specified or optimized LAPACK libraries can be used
+-if(NOT LATESTLAPACK_FOUND)
+-  message(STATUS "Using supplied NETLIB LAPACK implementation")
+-  set( LAPACK_LIBRARIES lapack )
+   add_subdirectory(SRC)
+-else()
+-  set( CMAKE_EXE_LINKER_FLAGS 
+-    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for executables" FORCE)
+-  set( CMAKE_MODULE_LINKER_FLAGS 
+-    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for modules" FORCE)
+-  set( CMAKE_SHARED_LINKER_FLAGS 
+-    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for shared libs" FORCE)
+-endif( NOT LATESTLAPACK_FOUND )
+-
+-message(STATUS "BUILD TESTING : ${BUILD_TESTING}" )
+-if(BUILD_TESTING)
+-  add_subdirectory(TESTING)
+-endif(BUILD_TESTING)
+ 
+-# deprecated LAPACK routines
+-option(BUILD_DEPRECATED "Build deprecated routines" OFF)
++  message(STATUS "BUILD TESTING : ${BUILD_TESTING}")
++  if(BUILD_TESTING)
++    add_subdirectory(TESTING)
++  endif()
++
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++    install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    DESTINATION ${PKG_CONFIG_DIR})
++endif()
+ 
+ # --------------------------------------------------
+ # LAPACKE
+-option(LAPACKE "Build LAPACKE" OFF)
++option(BUILD_LAPACKE "Build LAPACKE" OFF)
+ 
+ # LAPACKE has also the interface to some routines from tmglib,
+ # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+ option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
+ if (LAPACKE_WITH_TMG)
+-  set(LAPACKE ON)
++  set(BUILD_LAPACKE ON)
+   if(NOT BUILD_TESTING)
+      add_subdirectory(TESTING/MATGEN)
+    endif(NOT BUILD_TESTING)
+ endif(LAPACKE_WITH_TMG)
+ 
+-if(LAPACKE)
++if(BUILD_LAPACKE)
++  set(NEED_LAPACK TRUE)
+   add_subdirectory(LAPACKE)
+-endif(LAPACKE)
+-
+-# --------------------------------------------------
+-# CPACK Packaging 
+-
+-SET(CPACK_PACKAGE_NAME "LAPACK")
+-SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")
+-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LAPACK- Linear Algebra Package")
+-set(CPACK_PACKAGE_VERSION_MAJOR 3)
+-set(CPACK_PACKAGE_VERSION_MINOR 5)
+-set(CPACK_PACKAGE_VERSION_PATCH 0)
+-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LAPACK")
+-IF(WIN32 AND NOT UNIX)
+-  # There is a bug in NSI that does not handle full unix paths properly. Make
+-  # sure there is at least one set of four (4) backlasshes.
+-  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\http://icl.cs.utk.edu/lapack-forum")
+-  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.netlib.org/lapack")
+-  SET(CPACK_NSIS_CONTACT "lapack@eecs.utk.edu")
+-  SET(CPACK_NSIS_MODIFY_PATH ON)
+-  SET(CPACK_NSIS_DISPLAY_NAME "LAPACK-${LAPACK_VERSION}")
+-  set(CPACK_PACKAGE_RELOCATABLE "true")
+-ELSE(WIN32 AND NOT UNIX)
+-  SET(CPACK_GENERATOR "TGZ")
+-  SET(CPACK_SOURCE_GENERATOR TGZ)
+-  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lapack-${LAPACK_VERSION}" )
+-  SET(CPACK_SOURCE_IGNORE_FILES ~$ .svn ${CPACK_SOURCE_IGNORE_FILES} )
+-ENDIF(WIN32 AND NOT UNIX)
+-INCLUDE(CPack)
++endif(BUILD_LAPACKE)
+ 
+ 
+-# --------------------------------------------------
+-# By default static library
+-OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF )
+-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
+-#OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
+-
+-if(NOT BLAS_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-endif(NOT BLAS_FOUND)
+-
+-if(NOT LATESTLAPACK_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-endif(NOT LATESTLAPACK_FOUND)
+-
+-if(BUILD_TESTING OR LAPACKE_WITH_TMG)
+-  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
+-
+-# Export lapack targets, not including lapacke, from the
+-# install tree, if any.
+-set(_lapack_config_install_guard_target "")
+-if(ALL_TARGETS)
+-  install(EXPORT lapack-targets
+-    DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION})
+-
+-  # Choose one of the lapack targets to use as a guard for
+-  # lapack-config.cmake to load targets from the install tree.
+-  list(GET ALL_TARGETS 0 _lapack_config_install_guard_target)
++# Neither user specified or optimized BLAS libraries can be used
++if(NEED_BLAS AND NOT BLAS_FOUND)
++  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
+ endif()
+ 
+-# Include cblas in targets exported from the build tree.
+-if(CBLAS)
+-  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-endif(CBLAS)
+-
+-# Include lapacke in targets exported from the build tree.
+-if(LAPACKE)
+-  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-endif(LAPACKE)
+-
+-# Export lapack and lapacke targets from the build tree, if any.
+-set(_lapack_config_build_guard_target "")
+-if(ALL_TARGETS)
+-  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-
+-  # Choose one of the lapack or lapacke targets to use as a guard
+-  # for lapack-config.cmake to load targets from the build tree.
+-  list(GET ALL_TARGETS 0 _lapack_config_build_guard_target)
++# Neither user specified or optimized LAPACK libraries can be used
++if(NEED_LAPACK AND NOT LAPACK_FOUND)
++  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
+ endif()
+-
+-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-  install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  DESTINATION ${PKG_CONFIG_DIR}
+-   )
+-
+-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-
+-include(CMakePackageConfigHelpers)
+-write_basic_package_version_file(
+-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  VERSION ${LAPACK_VERSION}
+-  COMPATIBILITY SameMajorVersion
+-  )
+-
+-install(FILES
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
+-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION}
+-  )
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ message(STATUS "LAPACKE enable")
+ enable_language(C)
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-
+ # Create a header file netlib.h for the routines called in my C programs
+ include(FortranCInterface)
+ FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/lapacke_mangling.h 
+@@ -74,19 +72,3 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+    )
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
+-  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
+-  DESTINATION lib/cmake/lapacke-${LAPACK_VERSION}
+-  )
+-
+-install(EXPORT lapacke-targets
+-  DESTINATION lib/cmake/lapacke-${LAPACK_VERSION})
+diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-build.cmake.in
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "@LAPACK_BINARY_DIR@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapack targets from the build tree, including lapacke targets.
+-if(NOT TARGET lapacke)
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-
+-# Report lapacke header search locations.
+-set(LAPACKE_INCLUDE_DIRS "@LAPACK_SOURCE_DIR@/lapacke/include")
+-
+-# Report lapacke libraries.
+-set(LAPACKE_LIBRARIES lapacke)
+diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-install.cmake.in
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake
+-get_filename_component(_LAPACKE_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_SELF_DIR}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
+-
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapacke targets from the install tree.
+-if(NOT TARGET lapacke)
+-  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-endif()
+-
+-# Report lapacke header search locations.
+-set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
+-
+-# Report lapacke libraries.
+-set(LAPACKE_LIBRARIES lapacke)
+-
+-unset(_LAPACKE_PREFIX)
+-unset(_LAPACKE_SELF_DIR)
+diff --git a/LAPACKE/cmake/lapacke-config-version.cmake.in b/LAPACKE/cmake/lapacke-config-version.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-version.cmake.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-set(PACKAGE_VERSION "@LAPACK_VERSION@")
+-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+-  set(PACKAGE_VERSION_COMPATIBLE 1)
+-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+-    set(PACKAGE_VERSION_EXACT 1)
+-  endif()
+-endif()
+-
diff --git a/libraries/blas/patches/generate-pkgconfig.diff b/libraries/blas/patches/generate-pkgconfig.diff
new file mode 100644
index 0000000000..f481ab8085
--- /dev/null
+++ b/libraries/blas/patches/generate-pkgconfig.diff
@@ -0,0 +1,117 @@
+diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
+--- a/BLAS/CMakeLists.txt
++++ b/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: blas
++Name: BLAS
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapacke
+-Description: C Standard Interface to BLAS Linear Algebra PACKage
++Name: CBLAS
++Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+ Version: @LAPACK_VERSION@
+-URL: http://www.netlib.org/lapack/
++URL: http://www.netlib.org/blas/#_cblas
+ Libs: -L${libdir} -lcblas
+ Requires: blas
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,6 +112,13 @@
+ set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
+ 
++set(prefix ${CMAKE_INSTALL_PREFIX})
++if(NOT IS_ABSOLUTE ${LIBRARY_DIR})
++  set(libdir "\${prefix}/${LIBRARY_DIR}")
++else()
++  set(libdir "${LIBRARY_DIR}")
++endif()
++
+ # --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
+@@ -333,7 +340,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapacke
++Name: LAPACKE
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+ Version: @LAPACK_VERSION@
+-URL: http://www.netlib.org/lapack/
++URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
+ Libs: -L${libdir} -llapacke
+ Requires: lapack blas
+diff --git a/lapack.pc.in b/lapack.pc.in
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapack
++Name: LAPACK
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/
diff --git a/libraries/blas/patches/link-dependencies.diff b/libraries/blas/patches/link-dependencies.diff
new file mode 100644
index 0000000000..31a2bcc642
--- /dev/null
+++ b/libraries/blas/patches/link-dependencies.diff
@@ -0,0 +1,232 @@
+diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -137,13 +137,9 @@
+   
+   
+ add_library(blas ${ALLOBJ})
+-#if(UNIX)
+-#  target_link_libraries(blas m)
+-#endif()
+ set_target_properties(
+   blas PROPERTIES
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+-target_link_libraries(blas)
+ lapack_install_library(blas)
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -6,4 +6,3 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/
+ Libs: -L${libdir} -lblas
+-Libs.private: -lm
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/#_cblas
+ Libs: -L${libdir} -lcblas
+-Requires: blas
++Requires.private: blas
+diff --git a/CBLAS/examples/CMakeLists.txt b/CBLAS/examples/CMakeLists.txt
+--- a/CBLAS/examples/CMakeLists.txt
++++ b/CBLAS/examples/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ add_executable(xexample1_CBLAS cblas_example1.c )
+ add_executable(xexample2_CBLAS cblas_example2.c )
+ 
+-target_link_libraries(xexample1_CBLAS cblas ${BLAS_LIBRARIES})
+-target_link_libraries(xexample2_CBLAS cblas ${BLAS_LIBRARIES})
++target_link_libraries(xexample1_CBLAS cblas)
++target_link_libraries(xexample2_CBLAS cblas)
+ 
+ add_test(example1_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample1_CBLAS)
+ add_test(example2_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample2_CBLAS)
+diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
+--- a/CBLAS/src/CMakeLists.txt
++++ b/CBLAS/src/CMakeLists.txt
+@@ -164,5 +164,9 @@
+ endif(CBLAS_COMPLEX16)
+ 
+ add_library(cblas ${ALLOBJ})
+-target_link_libraries(cblas ${BLAS_LIBRARIES} )
++target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
++set_target_properties(
++  cblas PROPERTIES
++  LINKER_LANGUAGE C
++  )
+ lapack_install_library(cblas)
+diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
+--- a/CBLAS/testing/CMakeLists.txt
++++ b/CBLAS/testing/CMakeLists.txt
+@@ -55,9 +55,9 @@
+   add_executable(xscblat2 c_sblat2.f ${STESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xscblat3 c_sblat3.f ${STESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xscblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xscblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xscblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xscblat1 cblas)
++  target_link_libraries(xscblat2 cblas)
++  target_link_libraries(xscblat3 cblas)
+  
+   add_cblas_test(stest1.out ""   xscblat1)
+   add_cblas_test(stest2.out sin2 xscblat2)
+@@ -71,9 +71,9 @@
+   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xdcblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xdcblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xdcblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xdcblat1 cblas)
++  target_link_libraries(xdcblat2 cblas)
++  target_link_libraries(xdcblat3 cblas)
+  
+   add_cblas_test(dtest1.out ""   xdcblat1)
+   add_cblas_test(dtest2.out din2 xdcblat2)
+@@ -87,9 +87,9 @@
+   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xccblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xccblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xccblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xccblat1 cblas)
++  target_link_libraries(xccblat2 cblas)
++  target_link_libraries(xccblat3 cblas)
+  
+   add_cblas_test(ctest1.out ""   xccblat1)
+   add_cblas_test(ctest2.out cin2 xccblat2)
+@@ -103,9 +103,9 @@
+   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xzcblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xzcblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xzcblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xzcblat1 cblas)
++  target_link_libraries(xzcblat2 cblas)
++  target_link_libraries(xzcblat3 cblas)
+  
+   add_cblas_test(ztest1.out ""   xzcblat1)
+   add_cblas_test(ztest2.out zin2 xzcblat2)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 2.8.10)
+-project(LAPACK Fortran)
++project(LAPACK C Fortran)
+ 
+ set(LAPACK_MAJOR_VERSION 3)
+ set(LAPACK_MINOR_VERSION 6)
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -46,17 +46,21 @@
+ 
+ if (USE_XBLAS)
+    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
++   target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+ else (USE_XBLAS)
+   if (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++   target_link_libraries(lapacke PRIVATE tmglib ${LAPACK_LIBRARIES})
+   else (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++   target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+   endif(LAPACKE_WITH_TMG)
+ endif(USE_XBLAS)
+ 
++set_target_properties(
++  lapacke PROPERTIES
++  LINKER_LANGUAGE C
++  )
+ lapack_install_library(lapacke)
+ INSTALL( FILES ${LAPACKE_INCLUDE} DESTINATION include )
+ 
+diff --git a/LAPACKE/example/CMakeLists.txt b/LAPACKE/example/CMakeLists.txt
+--- a/LAPACKE/example/CMakeLists.txt
++++ b/LAPACKE/example/CMakeLists.txt
+@@ -3,10 +3,10 @@
+ add_executable(xexample_DGELS_rowmajor example_DGELS_rowmajor.c lapacke_example_aux.c lapacke_example_aux.h)
+ add_executable(xexample_DGELS_colmajor example_DGELS_colmajor.c lapacke_example_aux.c lapacke_example_aux.h)
+ 
+-target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGESV_colmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGELS_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGELS_colmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++target_link_libraries(xexample_DGESV_rowmajor lapacke)
++target_link_libraries(xexample_DGESV_colmajor lapacke)
++target_link_libraries(xexample_DGELS_rowmajor lapacke)
++target_link_libraries(xexample_DGELS_colmajor lapacke)
+ 
+ add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
+ add_test(example_DGESV_colmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_colmajor)
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
+ Libs: -L${libdir} -llapacke
+-Requires: lapack blas
++Requires.private: lapack
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -455,12 +455,10 @@
+ list(REMOVE_DUPLICATES ALLOBJ)
+ 
+ add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+-
++target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ set_target_properties(
+   lapack PROPERTIES
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+-
+ lapack_install_library(lapack)
+diff --git a/TESTING/EIG/CMakeLists.txt b/TESTING/EIG/CMakeLists.txt
+--- a/TESTING/EIG/CMakeLists.txt
++++ b/TESTING/EIG/CMakeLists.txt
+@@ -119,7 +119,7 @@
+ 
+ macro(add_eig_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endmacro(add_eig_executable)
+ 
+ if (BUILD_SINGLE)
+diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
+--- a/TESTING/LIN/CMakeLists.txt
++++ b/TESTING/LIN/CMakeLists.txt
+@@ -193,7 +193,7 @@
+ 
+ macro(add_lin_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+diff --git a/lapack.pc.in b/lapack.pc.in
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/
+ Libs: -L${libdir} -llapack
+-Requires: blas
++Requires.private: blas
diff --git a/libraries/blas/patches/target-cleanup.diff b/libraries/blas/patches/target-cleanup.diff
new file mode 100644
index 0000000000..8f15294374
--- /dev/null
+++ b/libraries/blas/patches/target-cleanup.diff
@@ -0,0 +1,776 @@
+diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -113,29 +113,22 @@
+ 
+ set(ZBLAS3 zgemm.f zsymm.f zsyrk.f zsyr2k.f ztrmm.f ztrsm.f 
+ 	zhemm.f zherk.f zher2k.f)
+-# default build all of it
+-set(ALLOBJ ${SBLAS1} ${SBLAS2} ${SBLAS3} ${DBLAS1} ${DBLAS2} ${DBLAS3}	
+-	${CBLAS1} ${CBLAS2} ${CBLAS3} ${ZBLAS1} 
+-	${ZBLAS2} ${ZBLAS3} ${ALLBLAS})
+-
+-if(BLAS_SINGLE)
+-  set(ALLOBJ ${SBLAS1} ${ALLBLAS} 
+-	${SBLAS2} ${SBLAS3})
++
++set(ALLOBJ)
++if(BUILD_SINGLE)
++  list(APPEND ALLOBJ ${SBLAS1} ${ALLBLAS} ${SBLAS2} ${SBLAS3})
+ endif()
+-if(BLAS_DOUBLE)
+-  set(ALLOBJ ${DBLAS1} ${ALLBLAS} 
+-	${DBLAS2} ${DBLAS3})
++if(BUILD_DOUBLE)
++  list(APPEND ALLOBJ ${DBLAS1} ${ALLBLAS} ${DBLAS2} ${DBLAS3})
+ endif()
+-if(BLAS_COMPLEX)
+-  set(ALLOBJ  ${BLASLIB} ${CBLAS1} ${CB1AUX} 
+-	${ALLBLAS} ${CBLAS2})
++if(BUILD_COMPLEX)
++  list(APPEND ALLOBJ ${BLASLIB} ${CBLAS1} ${CB1AUX} ${ALLBLAS} ${CBLAS2} ${CBLAS3})
+ endif()
+-if(BLAS_COMPLEX16)
+-  set(ALLOBJ  ${BLASLIB} ${ZBLAS1} ${ZB1AUX} 
+-	${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
++if(BUILD_COMPLEX16)
++  list(APPEND ALLOBJ ${BLASLIB} ${ZBLAS1} ${ZB1AUX} ${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
+ endif()
+-  
+-  
++list(REMOVE_DUPLICATES ALLOBJ)
++
+ add_library(blas ${ALLOBJ})
+ set_target_properties(
+   blas PROPERTIES
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -65,9 +65,9 @@
+   list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
+ endif()
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-version.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
+   ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
+--- a/CBLAS/src/CMakeLists.txt
++++ b/CBLAS/src/CMakeLists.txt
+@@ -28,34 +28,26 @@
+          cblas_ddot.c  cblas_dsdot.c cblas_dnrm2.c cblas_dasum.c 
+          cblas_idamax.c   ddotsub.f   dsdotsub.f       dnrm2sub.f
+          dasumsub.f idamaxsub.f)
+-
+ #
+ # All object files for single complex precision
+ #
+ set (CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
+          cblas_caxpy.c cblas_cdotu_sub.c cblas_cdotc_sub.c
+          cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f)
+-
+ #
+ # All object files for double complex precision
+ #
+ set (ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
+-         cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c cblas_dznrm2.c
+-         cblas_dzasum.c cblas_izamax.c zdotcsub.f zdotusub.f     
+-         dzasumsub.f  dznrm2sub.f  izamaxsub.f)
+-       
+-
++         cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c
++         cblas_izamax.c zdotcsub.f zdotusub.f izamaxsub.f)
+ #
+ # Common files for single complex precision
+ #
+ set (SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)
+-
+-
+ #
+-# All object files
++# Common files for double complex precision
+ #
+-set (ALEV1 ${slev1} ${dlev1} ${clev1} ${zlev1} ${sclev1})
+-
++set (DZLEV1 cblas_dzasum.c dzasumsub.f cblas_dznrm2.c dznrm2sub.f)
+ 
+ #
+ #
+@@ -72,8 +64,6 @@
+         cblas_sspr.c  cblas_sspr2.c cblas_ssymv.c cblas_ssyr.c  cblas_ssyr2.c
+         cblas_stbmv.c cblas_stbsv.c cblas_stpmv.c cblas_stpsv.c  cblas_strmv.c
+         cblas_strsv.c)
+-
+- 
+ #
+ # All object files for double real precision
+ #
+@@ -81,7 +71,6 @@
+         cblas_dspr.c  cblas_dspr2.c cblas_dsymv.c cblas_dsyr.c  cblas_dsyr2.c
+         cblas_dtbmv.c cblas_dtbsv.c cblas_dtpmv.c cblas_dtpsv.c  cblas_dtrmv.c
+         cblas_dtrsv.c)
+-
+ #
+ # All object files for single complex precision
+ #
+@@ -89,7 +78,6 @@
+         cblas_ctrmv.c cblas_ctbmv.c cblas_ctpmv.c cblas_ctrsv.c cblas_ctbsv.c
+         cblas_ctpsv.c cblas_cgeru.c cblas_cgerc.c cblas_cher.c  cblas_cher2.c
+         cblas_chpr.c  cblas_chpr2.c)
+-
+ #
+ # All object files for double complex precision
+ #
+@@ -97,10 +85,6 @@
+         cblas_ztrmv.c cblas_ztbmv.c cblas_ztpmv.c cblas_ztrsv.c cblas_ztbsv.c
+         cblas_ztpsv.c cblas_zgeru.c cblas_zgerc.c cblas_zher.c  cblas_zher2.c
+         cblas_zhpr.c  cblas_zhpr2.c)
+-#
+-# All object files
+-#
+-set (AVEL2 ${slev2} ${dlev2} ${clev2} ${zlev2})
+ 
+ #
+ #
+@@ -132,36 +116,21 @@
+ set (ZLEV3 cblas_zgemm.c cblas_zsymm.c cblas_zhemm.c cblas_zherk.c
+         cblas_zher2k.c cblas_ztrmm.c cblas_ztrsm.c  cblas_zsyrk.c
+         cblas_zsyr2k.c)
+-#
+-# All object files
+-#
+-set (ALEV3 ${slev3} ${dlev3} ${clev3} ${zlev3})
+-
+-# default build all of it
+-set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND}
+-           ${DLEV1} ${DLEV2} ${DLEV3}
+-           ${CLEV1} ${CLEV2} ${CLEV3} 
+-           ${ZLEV1} ${ZLEV2} ${ZLEV3}   )
+-
+-# Single real precision
+-if(CBLAS_SINGLE)
+- set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND})
+-endif(CBLAS_SINGLE)
+-
+-# Double real precision
+-if(CBLAS_DOUBLE)
+- set(ALLOBJ  ${DLEV1} ${DLEV2} ${DLEV3} ${ERRHAND})
+-endif(CBLAS_DOUBLE)
+-	
+-# Single complex precision
+-if (CBLAS_COMPLEX)
+- set(ALLOBJ  ${CLEV1} ${SCLEV1} ${CLEV2} ${CLEV3} ${ERRHAND})
+-endif(CBLAS_COMPLEX)
+ 
+-# Double complex precision
+-if (CBLAS_COMPLEX16) 
+- set(ALLOBJ  ${ZLEV1} ${ZLEV2} ${ZLEV3} ${ERRHAND})
+-endif(CBLAS_COMPLEX16)
++set(ALLOBJ)
++if(BUILD_SINGLE)
++  list(APPEND ALLOBJ ${SLEV1} ${SCLEV1} ${ERRHAND} ${SLEV2} ${SLEV3})
++endif()
++if(BUILD_DOUBLE)
++  list(APPEND ALLOBJ ${DLEV1} ${DZLEV1} ${ERRHAND} ${DLEV2} ${DLEV3})
++endif()
++if(BUILD_COMPLEX)
++  list(APPEND ALLOBJ ${CLEV1} ${SCLEV1} ${ERRHAND} ${CLEV2} ${CLEV3})
++endif()
++if(BUILD_COMPLEX16) 
++  list(APPEND ALLOBJ ${ZLEV1} ${DZLEV1} ${ERRHAND} ${ZLEV2} ${ZLEV3})
++endif()
++list(REMOVE_DUPLICATES ALLOBJ)
+ 
+ add_library(cblas ${ALLOBJ})
+ target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
+diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile
+--- a/CBLAS/src/Makefile
++++ b/CBLAS/src/Makefile
+@@ -52,9 +52,8 @@
+ # All object files for double complex precision
+ #
+ zlev1 = cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
+-         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
+-         cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o      \
+-         dzasumsub.o  dznrm2sub.o  izamaxsub.o 
++         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o \
++         cblas_izamax.o zdotcsub.o zdotusub.o izamaxsub.o 
+ 
+ #
+ # Common files for single / complex precision
+@@ -62,9 +61,14 @@
+ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
+ 
+ #
++# Common files for double / complex precision
++#
++dzlev1 = cblas_dzasum.o dzasumsub.o cblas_dznrm2.o dznrm2sub.o
++
++#
+ # All object files
+ #
+-alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1)
++alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1) $(dzlev1)
+ 
+ 
+ #
+@@ -77,8 +81,8 @@
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Double real precision
+-dlib1: $(dlev1) 
+-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1)
++dlib1: $(dlev1) $(dzlev1)
++	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1) $(dzlev1)
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Single complex precision
+@@ -87,8 +91,8 @@
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Double complex precision
+-zlib1: $(zlev1)
+-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1)
++zlib1: $(zlev1) $(dzlev1)
++	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1) $(dzlev1)
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # All precisions
+diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
+--- a/CBLAS/testing/CMakeLists.txt
++++ b/CBLAS/testing/CMakeLists.txt
+@@ -28,8 +28,6 @@
+ 
+ # Object files for single real precision
+ SET( STESTL1O c_sblas1.c)
+-
+-SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+ SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+ SET( STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c)
+ 
+@@ -62,11 +60,9 @@
+   add_cblas_test(stest1.out ""   xscblat1)
+   add_cblas_test(stest2.out sin2 xscblat2)
+   add_cblas_test(stest3.out sin3 xscblat3)
+- 
+ endif()
+ 
+ if(BUILD_DOUBLE)
+-
+   add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -78,11 +74,9 @@
+   add_cblas_test(dtest1.out ""   xdcblat1)
+   add_cblas_test(dtest2.out din2 xdcblat2)
+   add_cblas_test(dtest3.out din3 xdcblat3)
+-
+ endif()
+ 
+ if(BUILD_COMPLEX)
+-
+   add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -94,11 +88,9 @@
+   add_cblas_test(ctest1.out ""   xccblat1)
+   add_cblas_test(ctest2.out cin2 xccblat2)
+   add_cblas_test(ctest3.out cin3 xccblat3)
+-
+ endif()
+ 
+ if(BUILD_COMPLEX16)
+-
+   add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -110,5 +102,4 @@
+   add_cblas_test(ztest1.out ""   xzcblat1)
+   add_cblas_test(ztest2.out zin2 xzcblat2)
+   add_cblas_test(ztest3.out zin3 xzcblat3)
+-
+ endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,33 @@
+ # --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
++option(BUILD_SINGLE "Build Single Precision" ON)
++option(BUILD_DOUBLE "Build Double Precision" ON)
++option(BUILD_COMPLEX "Build Complex Precision" ON)
++option(BUILD_COMPLEX16 "Build Double Complex Precision" ON)
++
++set(PRECISIONS)
++if(BUILD_SINGLE)
++  message(STATUS "Building Single Precision")
++  list(APPEND PRECISIONS "single")
++endif()
++if(BUILD_DOUBLE)
++  message(STATUS "Building Double Precision")
++  list(APPEND PRECISIONS "double")
++endif()
++if(BUILD_COMPLEX)
++  message(STATUS "Building Complex Precision")
++  list(APPEND PRECISIONS "complex")
++endif()
++if(BUILD_COMPLEX16)
++  message(STATUS "Building Double Complex Precision")
++  list(APPEND PRECISIONS "complex16")
++endif()
+ 
++if(NOT PRECISIONS)
++    message(FATAL_ERROR "--> Nothing to build, no precision selected.
++    Please enable at least one of these: BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
++endif()
+ 
+ # --------------------------------------------------
+ # Subdirectories that need to be processed
+@@ -214,10 +240,6 @@
+ if(NOT LATESTLAPACK_FOUND)
+   message(STATUS "Using supplied NETLIB LAPACK implementation")
+   set( LAPACK_LIBRARIES lapack )
+-  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
+-  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
+-  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
+-  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
+   add_subdirectory(SRC)
+ else()
+   set( CMAKE_EXE_LINKER_FLAGS 
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -1,22 +1,28 @@
+ #######################################################################
+ #  This is the makefile to create a library for LAPACK.
+ #  The files are organized as follows:
+-#       ALLAUX -- Auxiliary routines called from all precisions
+-#       ALLXAUX -- Auxiliary routines called from all precisions but
+-#                  only from routines using extra precision.
+-#       SCLAUX -- Auxiliary routines called from both REAL and COMPLEX
+-#       DZLAUX -- Auxiliary routines called from both DOUBLE PRECISION
+-#                 and COMPLEX*16
+-#       SLASRC -- Single precision real LAPACK routines
++#       ALLAUX  -- Auxiliary routines called from all precisions
++#
++#       SCLAUX  -- Auxiliary routines called from both REAL and COMPLEX.
++#       DZLAUX  -- Auxiliary routines called from both DOUBLE and COMPLEX*16.
++#
++#       DSLASRC -- Double-single mixed precision real routines called from
++#                  single, single-extra and double precision real LAPACK
++#                  routines (i.e. from SLASRC, SXLASRC, DLASRC).
++#       ZCLASRC -- Double-single mixed precision complex routines called from
++#                  single, single-extra and double precision complex LAPACK
++#                  routines (i.e. from CLASRC, CXLASRC, ZLASRC).
++#
++#       SLASRC  -- Single precision real LAPACK routines
+ #       SXLASRC -- Single precision real LAPACK routines using extra
+ #                  precision.
+-#       CLASRC -- Single precision complex LAPACK routines
++#       CLASRC  -- Single precision complex LAPACK routines
+ #       CXLASRC -- Single precision complex LAPACK routines using extra
+ #                  precision.
+-#       DLASRC -- Double precision real LAPACK routines
++#       DLASRC  -- Double precision real LAPACK routines
+ #       DXLASRC -- Double precision real LAPACK routines using extra
+ #                  precision.
+-#       ZLASRC -- Double precision complex LAPACK routines
++#       ZLASRC  -- Double precision complex LAPACK routines
+ #       ZXLASRC -- Double precision complex LAPACK routines using extra
+ #                  precision.
+ #
+@@ -51,8 +57,6 @@
+     ../INSTALL/ilaver.f ../INSTALL/lsame.f xerbla.f xerbla_array.f
+     ../INSTALL/slamch.f)
+ 
+-set(ALLXAUX )
+-
+ set(SCLAUX  
+    sbdsdc.f 
+    sbdsqr.f sdisna.f slabad.f slacpy.f sladiv.f slae2.f  slaebz.f 
+@@ -97,8 +101,8 @@
+    sgels.f  sgelsd.f sgelss.f sgelsy.f sgeql2.f sgeqlf.f 
+    sgeqp3.f sgeqr2.f sgeqr2p.f sgeqrf.f sgeqrfp.f sgerfs.f sgerq2.f sgerqf.f 
+    sgesc2.f sgesdd.f sgesv.f  sgesvd.f sgesvdx.f sgesvx.f sgetc2.f sgetf2.f 
+-   sgetrf.f sgetrf2.f sgetri.f 
+-   sgetrs.f sggbak.f sggbal.f
++   sgetrf2.f sgetri.f 
++   sggbak.f sggbal.f
+    sgges.f  sgges3.f sggesx.f sggev.f  sggev3.f sggevx.f
+    sggglm.f sgghrd.f sgghd3.f sgglse.f sggqrf.f 
+    sggrqf.f sggsvd3.f sggsvp3.f sgtcon.f sgtrfs.f sgtsv.f  
+@@ -123,7 +127,7 @@
+    sormr3.f sormrq.f sormrz.f sormtr.f spbcon.f spbequ.f spbrfs.f 
+    spbstf.f spbsv.f  spbsvx.f 
+    spbtf2.f spbtrf.f spbtrs.f spocon.f spoequ.f sporfs.f sposv.f  
+-   sposvx.f spotf2.f spotrf.f spotrf2.f spotri.f spotrs.f spstrf.f spstf2.f 
++   sposvx.f spotf2.f spotrf2.f spotri.f spstrf.f spstf2.f 
+    sppcon.f sppequ.f 
+    spprfs.f sppsv.f  sppsvx.f spptrf.f spptri.f spptrs.f sptcon.f 
+    spteqr.f sptrfs.f sptsv.f  sptsvx.f spttrs.f sptts2.f srscl.f  
+@@ -172,8 +176,8 @@
+    cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f 
+    cgesc2.f cgesdd.f cgesv.f  cgesvd.f cgesvdx.f
+    cgesvj.f cgejsv.f cgsvj0.f cgsvj1.f
+-   cgesvx.f cgetc2.f cgetf2.f cgetrf.f cgetrf2.f
+-   cgetri.f cgetrs.f 
++   cgesvx.f cgetc2.f cgetf2.f cgetrf2.f
++   cgetri.f 
+    cggbak.f cggbal.f
+    cgges.f  cgges3.f cggesx.f cggev.f  cggev3.f cggevx.f
+    cggglm.f cgghrd.f cgghd3.f cgglse.f cggqrf.f cggrqf.f 
+@@ -207,7 +211,7 @@
+    claswp.f clasyf.f clasyf_rook.f clatbs.f clatdf.f clatps.f clatrd.f clatrs.f clatrz.f 
+    clauu2.f clauum.f cpbcon.f cpbequ.f cpbrfs.f cpbstf.f cpbsv.f  
+    cpbsvx.f cpbtf2.f cpbtrf.f cpbtrs.f cpocon.f cpoequ.f cporfs.f 
+-   cposv.f  cposvx.f cpotf2.f cpotrf.f cpotrf2.f cpotri.f cpotrs.f cpstrf.f cpstf2.f 
++   cposv.f  cposvx.f cpotf2.f cpotrf2.f cpotri.f cpstrf.f cpstf2.f 
+    cppcon.f cppequ.f cpprfs.f cppsv.f  cppsvx.f cpptrf.f cpptri.f cpptrs.f 
+    cptcon.f cpteqr.f cptrfs.f cptsv.f  cptsvx.f cpttrf.f cpttrs.f cptts2.f 
+    crot.f   cspcon.f cspmv.f  cspr.f   csprfs.f cspsv.f  
+@@ -409,52 +413,45 @@
+    zla_heamv.f zla_hercond_c.f zla_hercond_x.f zla_herpvgrw.f		
+    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
+ 
+-
+-if( USE_XBLAS)
+-  set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})
++if(USE_XBLAS)
++  list(APPEND SLASRC ${SXLASRC})
++  list(APPEND DLASRC ${DXLASRC})
++  list(APPEND CLASRC ${CXLASRC})
++  list(APPEND ZLASRC ${ZXLASRC})
+ endif()
+ 
+ if(BUILD_DEPRECATED)
+-	LIST(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
++  LIST(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
+     DEPRECATED/sgeqpf.f DEPRECATED/sgelsx.f DEPRECATED/sggsvd.f
+     DEPRECATED/sggsvp.f DEPRECATED/slahrd.f DEPRECATED/slatzm.f DEPRECATED/stzrqf.f)
+-	LIST(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
++  LIST(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
+     DEPRECATED/dgeqpf.f DEPRECATED/dgelsx.f DEPRECATED/dggsvd.f
+-    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f )
++    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f)
+   LIST(APPEND CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f
+     DEPRECATED/cgeqpf.f DEPRECATED/cgelsx.f DEPRECATED/cggsvd.f
+     DEPRECATED/cggsvp.f DEPRECATED/clahrd.f DEPRECATED/clatzm.f DEPRECATED/ctzrqf.f)
+   LIST(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f
+     DEPRECATED/zgeqpf.f DEPRECATED/zgelsx.f DEPRECATED/zggsvd.f
+     DEPRECATED/zggsvp.f DEPRECATED/zlahrd.f DEPRECATED/zlatzm.f DEPRECATED/ztzrqf.f)
+-	message(STATUS "Building deprecated routines")
++  message(STATUS "Building LAPACK deprecated routines")
+ endif()
+ 
++set(ALLOBJ)
+ if(BUILD_SINGLE)
+-set(ALLOBJ  ${SLASRC} ${ALLAUX}	${SCLAUX} )
+-message(STATUS "Building Single Precision")
++  list(APPEND ALLOBJ ${SLASRC} ${ALLAUX} ${SCLAUX} ${DSLASRC})
+ endif()
+ if(BUILD_DOUBLE)
+-  set(ALLOBJ ${ALLOBJ} ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
+-message(STATUS "Building Double Precision")
++  list(APPEND ALLOBJ ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
+ endif()
+ if(BUILD_COMPLEX)
+-  set(ALLOBJ ${ALLOBJ} ${CLASRC} ${ALLAUX} ${SCLAUX} )
+-message(STATUS "Building Complex Precision")
++  list(APPEND ALLOBJ ${CLASRC} ${ALLAUX} ${SCLAUX} ${ZCLASRC})
+ endif()
+ if(BUILD_COMPLEX16)
+-  set(ALLOBJ  ${ALLOBJ} ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+-message(STATUS "Building Double Complex Precision")
+-endif()
+-
+-if (NOT ALLOBJ)
+-    message(FATAL_ERROR "-->LAPACK SRC BUILD: NOTHING TO BUILD, NO PRECISION SELECTED:
+-     PLEASE ENABLE AT LEAST ONE OF THOSE: BUILD_SINGLE, BUILD_COMPLEX, BUILD_DOUBLE, BUILD_COMPLEX16.")
++  list(APPEND ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+ endif()
+-
+ list(REMOVE_DUPLICATES ALLOBJ)
+ 
+-add_library(lapack ${ALLOBJ} ${ALLXOBJ})
++add_library(lapack ${ALLOBJ})
+ target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ set_target_properties(
+   lapack PROPERTIES
+diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
+--- a/TESTING/CMakeLists.txt
++++ b/TESTING/CMakeLists.txt
+@@ -289,7 +289,7 @@
+ endif()
+ 
+ 
+-if (BUILD_SIMPLE)
++if (BUILD_SINGLE)
+     if (BUILD_DOUBLE)
+ #
+ # ======== SINGLE-DOUBLE PROTO LIN TESTS ==============
+diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
+--- a/TESTING/LIN/CMakeLists.txt
++++ b/TESTING/LIN/CMakeLists.txt
+@@ -13,10 +13,10 @@
+    schksp.f schksy.f schksy_rook.f schktb.f schktp.f schktr.f 
+    schktz.f 
+    sdrvgt.f sdrvls.f sdrvpb.f 
+-   sdrvpp.f sdrvpt.f sdrvsp.f sdrvsy.f sdrvsy_rook.f
++   sdrvpp.f sdrvpt.f sdrvsp.f sdrvsy_rook.f
+    serrgt.f serrlq.f serrls.f 
+-   serrpo.f serrps.f serrql.f serrqp.f serrqr.f 
+-   serrrq.f serrsy.f serrtr.f serrtz.f serrvx.f 
++   serrps.f serrql.f serrqp.f serrqr.f 
++   serrrq.f serrtr.f serrtz.f 
+    sgbt01.f sgbt02.f sgbt05.f sgelqs.f sgeqls.f sgeqrs.f 
+    sgerqs.f sget01.f sget02.f 
+    sget03.f sget04.f sget06.f sget07.f sgtt01.f sgtt02.f 
+@@ -37,9 +37,11 @@
+    sqrt04.f sqrt05.f schkqrt.f serrqrt.f schkqrtp.f serrqrtp.f)
+ 
+ if(USEXBLAS)
+-  list(APPEND SLINTST sdrvgex.f serrgex.f sdrvgbx.f sdrvpox.f sebchvxx.f)
++  list(APPEND SLINTST serrvxx.f sdrvgex.f sdrvsyx.f serrgex.f sdrvgbx.f sdrvpox.f
++    sebchvxx.f serrsyx.f serrpox.f)
+ else()
+-  list(APPEND SLINTST sdrvge.f serrge.f sdrvgb.f sdrvpo.f)
++  list(APPEND SLINTST serrvx.f sdrvge.f sdrvsy.f serrge.f sdrvgb.f sdrvpo.f
++    serrsy.f serrpo.f)
+ endif()
+ 
+ set(CLINTST  cchkaa.f 
+@@ -48,13 +50,12 @@
+    cchkpo.f cchkps.f cchkpp.f cchkpt.f cchkq3.f cchkql.f 
+    cchkqr.f cchkrq.f cchksp.f cchksy.f cchksy_rook.f cchktb.f 
+    cchktp.f cchktr.f cchktz.f 
+-   cdrvgt.f cdrvhe.f cdrvhe_rook.f cdrvhp.f 
++   cdrvgt.f cdrvhe_rook.f cdrvhp.f 
+    cdrvls.f cdrvpb.f cdrvpp.f cdrvpt.f 
+-   cdrvsp.f cdrvsy.f cdrvsy_rook.f
+-   cerrgt.f cerrhe.f cerrlq.f 
++   cdrvsp.f cdrvsy_rook.f
++   cerrgt.f cerrlq.f 
+    cerrls.f cerrps.f cerrql.f cerrqp.f 
+-   cerrqr.f cerrrq.f cerrsy.f cerrtr.f cerrtz.f 
+-   cerrvx.f 
++   cerrqr.f cerrrq.f cerrtr.f cerrtz.f 
+    cgbt01.f cgbt02.f cgbt05.f cgelqs.f cgeqls.f cgeqrs.f 
+    cgerqs.f cget01.f cget02.f 
+    cget03.f cget04.f cget07.f cgtt01.f cgtt02.f 
+@@ -77,10 +78,11 @@
+    cqrt04.f cqrt05.f cchkqrt.f cerrqrt.f cchkqrtp.f cerrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND 
+-    CLINTST cdrvgex.f cdrvgbx.f cerrgex.f cdrvpox.f cerrpox.f cebchvxx.f)
++  list(APPEND CLINTST cerrvxx.f cdrvgex.f cdrvsyx.f cdrvgbx.f cerrgex.f cdrvpox.f
++    cdrvhex.f cerrpox.f cebchvxx.f cerrsyx.f cerrhex.f)
+ else()
+-  list(APPEND CLINTST cdrvge.f cdrvgb.f cerrge.f cdrvpo.f cerrpo.f)
++  list(APPEND CLINTST cerrvx.f cdrvge.f cdrvsy.f cdrvgb.f cerrge.f cdrvpo.f
++    cdrvhe.f cerrpo.f cerrsy.f cerrhe.f)
+ endif()
+ 
+ set(DLINTST  dchkaa.f 
+@@ -90,10 +92,10 @@
+    dchksp.f dchksy.f dchksy_rook.f dchktb.f dchktp.f dchktr.f 
+    dchktz.f 
+    ddrvgt.f ddrvls.f ddrvpb.f 
+-   ddrvpp.f ddrvpt.f ddrvsp.f ddrvsy.f ddrvsy_rook.f
++   ddrvpp.f ddrvpt.f ddrvsp.f ddrvsy_rook.f
+    derrgt.f derrlq.f derrls.f 
+    derrps.f derrql.f derrqp.f derrqr.f 
+-   derrrq.f derrsy.f derrtr.f derrtz.f derrvx.f 
++   derrrq.f derrtr.f derrtz.f 
+    dgbt01.f dgbt02.f dgbt05.f dgelqs.f dgeqls.f dgeqrs.f 
+    dgerqs.f dget01.f dget02.f 
+    dget03.f dget04.f dget06.f dget07.f dgtt01.f dgtt02.f 
+@@ -114,11 +116,11 @@
+    dqrt04.f dqrt05.f dchkqrt.f derrqrt.f dchkqrtp.f derrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND 
+-    DLINTST  ddrvgex.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f debchvxx.f)
++  list(APPEND DLINTST derrvxx.f ddrvgex.f ddrvsyx.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f
++    debchvxx.f derrsyx.f)
+ else()
+-  list(APPEND
+-    DLINTST  ddrvge.f ddrvgb.f derrge.f ddrvpo.f derrpo.f)
++  list(APPEND DLINTST derrvx.f ddrvge.f ddrvsy.f ddrvgb.f derrge.f ddrvpo.f derrpo.f
++    derrsy.f)
+ endif()
+ 
+ set(ZLINTST  zchkaa.f 
+@@ -127,17 +129,16 @@
+    zchkpo.f zchkps.f zchkpp.f zchkpt.f zchkq3.f zchkql.f 
+    zchkqr.f zchkrq.f zchksp.f zchksy.f zchksy_rook.f zchktb.f 
+    zchktp.f zchktr.f zchktz.f 
+-   zdrvgt.f zdrvhe.f zdrvhe_rook.f zdrvhp.f 
++   zdrvgt.f zdrvhe_rook.f zdrvhp.f 
+    zdrvls.f zdrvpb.f zdrvpp.f zdrvpt.f 
+-   zdrvsp.f zdrvsy.f zdrvsy_rook.f 
+-   zerrgt.f zerrhe.f zerrlq.f 
++   zdrvsp.f zdrvsy_rook.f 
++   zerrgt.f zerrlq.f 
+    zerrls.f zerrps.f zerrql.f zerrqp.f 
+-   zerrqr.f zerrrq.f zerrsy.f zerrtr.f zerrtz.f 
+-   zerrvx.f 
++   zerrqr.f zerrrq.f zerrtr.f zerrtz.f 
+    zgbt01.f zgbt02.f zgbt05.f zgelqs.f zgeqls.f zgeqrs.f 
+    zgerqs.f zget01.f zget02.f 
+    zget03.f zget04.f zget07.f zgtt01.f zgtt02.f 
+-   zgtt05.f zhet01.f zhet01.f zhet01_rook.f zhpt01.f zlaipd.f zlaptm.f zlarhs.f zlatb4.f zlatb5.f 
++   zgtt05.f zhet01.f zhet01_rook.f zhpt01.f zlaipd.f zlaptm.f zlarhs.f zlatb4.f zlatb5.f 
+    zlatsp.f zlatsy.f zlattb.f zlattp.f zlattr.f 
+    zlavhe.f zlavhe_rook.f zlavhp.f zlavsp.f zlavsy.f zlavsy_rook.f zlqt01.f 
+    zlqt02.f zlqt03.f zpbt01.f zpbt02.f zpbt05.f 
+@@ -156,11 +157,11 @@
+    zqrt04.f zqrt05.f zchkqrt.f zerrqrt.f zchkqrtp.f zerrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND
+-    ZLINTST  zdrvgex.f zdrvgbx.f zerrgex.f zdrvpox.f zerrpox.f zebchvxx.f)
++  list(APPEND ZLINTST zerrvxx.f zdrvgex.f zdrvsyx.f zdrvgbx.f zerrgex.f zdrvpox.f zdrvhex.f
++    zerrpox.f zebchvxx.f zerrsyx.f zerrhex.f)
+ else()
+-  list(APPEND
+-    ZLINTST  zdrvge.f zdrvgb.f zerrge.f zdrvpo.f zerrpo.f)
++  list(APPEND ZLINTST zerrvx.f zdrvge.f zdrvsy.f zdrvgb.f zerrge.f zdrvpo.f zdrvhe.f
++    zerrpo.f zerrsy.f zerrhe.f)
+ endif()
+ 
+ set(DSLINTST  dchkab.f 
+@@ -197,29 +198,29 @@
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+-add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} ${SECOND_SRC} )
++add_lin_executable(xlintsts ${ALINTST} ${SLINTST} ${SCLNTST} ${SECOND_SRC})
+ add_lin_executable(xlintstrfs ${SLINTSTRFP} ${SECOND_SRC})
+ endif()
+ 
+ if(BUILD_DOUBLE)
+-add_lin_executable(xlintstd  ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
++add_lin_executable(xlintstd ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
+ add_lin_executable(xlintstrfd ${DLINTSTRFP} ${DSECOND_SRC})
+ endif()
+ 
+ IF(BUILD_SINGLE AND BUILD_DOUBLE)
+-add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
++add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC})
+ endif()
+ 
+ if(BUILD_COMPLEX)
+-add_lin_executable(xlintstc  ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC} )
+-add_lin_executable(xlintstrfc  ${CLINTSTRFP} ${SECOND_SRC})
++add_lin_executable(xlintstc ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC})
++add_lin_executable(xlintstrfc ${CLINTSTRFP} ${SECOND_SRC})
+ endif()
+ 
+ if(BUILD_COMPLEX16)
+-add_lin_executable(xlintstz  ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
++add_lin_executable(xlintstz ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
+ add_lin_executable(xlintstrfz ${ZLINTSTRFP} ${DSECOND_SRC})
+ endif()
+ 
+ IF(BUILD_COMPLEX AND BUILD_COMPLEX16)
+-add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
++add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC})
+ endif()
+diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt
+--- a/TESTING/MATGEN/CMakeLists.txt
++++ b/TESTING/MATGEN/CMakeLists.txt
+@@ -31,45 +31,41 @@
+ #
+ #######################################################################
+  
+-set(SCATGEN  slatm1.f slaran.f slarnd.f)
++set(SCATGEN  slatm1.f slatm7.f slaran.f slarnd.f)
+ 
+ set(SMATGEN  slatms.f slatme.f slatmr.f slatmt.f 
+    slagge.f slagsy.f slakf2.f slarge.f slaror.f slarot.f slatm2.f 
+-   slatm3.f slatm5.f slatm6.f slatm7.f slahilb.f)
++   slatm3.f slatm5.f slatm6.f slahilb.f)
+ 
+ set(CMATGEN  clatms.f clatme.f clatmr.f clatmt.f 
+    clagge.f claghe.f clagsy.f clakf2.f clarge.f claror.f clarot.f 
+-   clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f slatm7.f)
++   clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f)
+ 
+-set(DZATGEN  dlatm1.f dlaran.f dlarnd.f)
++set(DZATGEN  dlatm1.f dlatm7.f dlaran.f dlarnd.f)
+ 
+ set(DMATGEN  dlatms.f dlatme.f dlatmr.f dlatmt.f 
+    dlagge.f dlagsy.f dlakf2.f dlarge.f dlaror.f dlarot.f dlatm2.f 
+-   dlatm3.f dlatm5.f dlatm6.f dlatm7.f dlahilb.f)
++   dlatm3.f dlatm5.f dlatm6.f dlahilb.f)
+ 
+ set(ZMATGEN  zlatms.f zlatme.f zlatmr.f zlatmt.f 
+-  zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f 
+-  zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f dlatm7.f)
++   zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f 
++   zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f)
+ 
++set(ALLOBJ)
+ if(BUILD_SINGLE)
+-  set(ALLOBJ ${SMATGEN} ${SCATGEN})
++  list(APPEND ALLOBJ ${SMATGEN} ${SCATGEN})
+ endif()
+ if(BUILD_DOUBLE)
+-  set(ALLOBJ ${ALLOBJ} ${DMATGEN} ${DZATGEN})
++  list(APPEND ALLOBJ ${DMATGEN} ${DZATGEN})
+ endif()
+ if(BUILD_COMPLEX)
+-  set(ALLOBJ  ${ALLOBJ} ${CMATGEN} ${SCATGEN})
++  list(APPEND ALLOBJ ${CMATGEN} ${SCATGEN})
+ endif()
+ if(BUILD_COMPLEX16)
+-  set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
++  LIST(APPEND ALLOBJ ${ZMATGEN} ${DZATGEN})
+ endif()
++list(REMOVE_DUPLICATES ALLOBJ)
+ 
+-if (NOT ALLOBJ)
+-set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
+-  ${DZATGEN})
+-else()
+-  list(REMOVE_DUPLICATES ALLOBJ)
+-endif()
+-add_library(tmglib ${ALLOBJ} )
++add_library(tmglib ${ALLOBJ})
+ target_link_libraries(tmglib ${LAPACK_LIBRARIES})
+ lapack_install_library(tmglib)
+diff --git a/TESTING/MATGEN/Makefile b/TESTING/MATGEN/Makefile
+--- a/TESTING/MATGEN/Makefile
++++ b/TESTING/MATGEN/Makefile
+@@ -33,21 +33,21 @@
+ #
+ #######################################################################
+  
+-SCATGEN = slatm1.o slaran.o slarnd.o
++SCATGEN = slatm1.o slatm7.o slaran.o slarnd.o
+ 
+ SMATGEN = slatms.o slatme.o slatmr.o slatmt.o \
+    slagge.o slagsy.o slakf2.o slarge.o slaror.o slarot.o slatm2.o \
+-   slatm3.o slatm5.o slatm6.o slatm7.o slahilb.o
++   slatm3.o slatm5.o slatm6.o slahilb.o
+ 
+ CMATGEN = clatms.o clatme.o clatmr.o clatmt.o \
+    clagge.o claghe.o clagsy.o clakf2.o clarge.o claror.o clarot.o \
+    clatm1.o clarnd.o clatm2.o clatm3.o clatm5.o clatm6.o clahilb.o
+ 
+-DZATGEN = dlatm1.o dlaran.o dlarnd.o
++DZATGEN = dlatm1.o dlatm7.o dlaran.o dlarnd.o
+ 
+ DMATGEN = dlatms.o dlatme.o dlatmr.o dlatmt.o \
+    dlagge.o dlagsy.o dlakf2.o dlarge.o dlaror.o dlarot.o dlatm2.o \
+-   dlatm3.o dlatm5.o dlatm6.o dlatm7.o dlahilb.o
++   dlatm3.o dlatm5.o dlatm6.o dlahilb.o
+ 
+ ZMATGEN = zlatms.o zlatme.o zlatmr.o zlatmt.o \
+    zlagge.o zlaghe.o zlagsy.o zlakf2.o zlarge.o zlaror.o zlarot.o \
diff --git a/libraries/boolstuff/boolstuff.info b/libraries/boolstuff/boolstuff.info
index 2f69b14fac..66c5b83bf3 100644
--- a/libraries/boolstuff/boolstuff.info
+++ b/libraries/boolstuff/boolstuff.info
@@ -2,7 +2,7 @@ PRGNAM="boolstuff"
 VERSION="0.1.14"
 HOMEPAGE="http://sarrazip.com/dev/boolstuff.html"
 DOWNLOAD="http://perso.b2b2c.ca/sarrazip/dev/boolstuff-0.1.14.tar.gz"
-MD5SUM="2fa184b368bc39e57357721ff01262fd"
+MD5SUM="fc8397d732f696d9f5e371bab2fb2c14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/botocore/botocore.SlackBuild b/libraries/botocore/botocore.SlackBuild
index ab5e2ff007..e7717e1bd6 100644
--- a/libraries/botocore/botocore.SlackBuild
+++ b/libraries/botocore/botocore.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for botocore
 
-# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=botocore
-VERSION=${VERSION:-1.1.2}
+VERSION=${VERSION:-1.3.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/botocore/botocore.info b/libraries/botocore/botocore.info
index 59e4b26b6f..44542eb7f6 100644
--- a/libraries/botocore/botocore.info
+++ b/libraries/botocore/botocore.info
@@ -1,8 +1,8 @@
 PRGNAM="botocore"
-VERSION="1.1.2"
+VERSION="1.3.18"
 HOMEPAGE="https://github.com/boto/botocore"
-DOWNLOAD="https://pypi.python.org/packages/source/b/botocore/botocore-1.1.2.tar.gz"
-MD5SUM="86399897bb6240cd94571707307aba42"
+DOWNLOAD="https://pypi.python.org/packages/source/b/botocore/botocore-1.3.18.tar.gz"
+MD5SUM="c7bc720cd202c2fbabb3fafec6618e12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-dateutil jmespath bcdoc"
diff --git a/libraries/bzrtp/README b/libraries/bzrtp/README
new file mode 100644
index 0000000000..c73bc0f053
--- /dev/null
+++ b/libraries/bzrtp/README
@@ -0,0 +1,20 @@
+bzrtp is an opensource implementation of ZRTP keys exchange protocol.
+
+The library written in C 89 is fully portable and can be executed on many platforms including both ARM processor and x86.
+Licensing: The source code is licensed under GPLv2.
+
+----------------------------------------------------------------------------------
+Compatibility with RFC6189 - ZRTP: Media Path Key Agreement for Unicast Secure RTP
+----------------------------------------------------------------------------------
+
+*** Mandatory but NOT implemented
+- Sas Relay mechanism (section 7.3)
+- Error message generation, emission or reception(which doesn't imply any security problem, they are mostly for debug purpose)
+*** Optional and implementd
+- multistream mode
+- cacheless implementation
+- key agreement DH2048
+*** Optional and NOT implemented
+- zrtp-hash attribute in SDP
+- Go Clear/Clear ACK messages
+- SAS signing
diff --git a/libraries/bzrtp/bzrtp.SlackBuild b/libraries/bzrtp/bzrtp.SlackBuild
new file mode 100644
index 0000000000..4a5ca95433
--- /dev/null
+++ b/libraries/bzrtp/bzrtp.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for bzrtp
+
+# Copyright 2015 Euan Thoms Singapore
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=bzrtp
+VERSION=${VERSION:-1.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/libraries/bzrtp/bzrtp.info b/libraries/bzrtp/bzrtp.info
new file mode 100644
index 0000000000..cda45da332
--- /dev/null
+++ b/libraries/bzrtp/bzrtp.info
@@ -0,0 +1,10 @@
+PRGNAM="bzrtp"
+VERSION="1.0.3"
+HOMEPAGE="http://www.linphone.org/"
+DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/linphone/bzrtp/bzrtp-1.0.3.tar.gz"
+MD5SUM="0d0c694e114d85420d351b94f0e9d867"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="polarssl"
+MAINTAINER="Euan Thoms"
+EMAIL="euan at potensol dot com"
diff --git a/libraries/bzrtp/slack-desc b/libraries/bzrtp/slack-desc
new file mode 100644
index 0000000000..7bde7bb43f
--- /dev/null
+++ b/libraries/bzrtp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+bzrtp: bzrtp (ZRTP Key Exchange Library)
+bzrtp:
+bzrtp: bzrtp is an opensource implementation of ZRTP keys exchange protocol.
+bzrtp:
+bzrtp: The library written in C 89 is fully portable and can be executed
+bzrtp: on many platforms including both ARM  processor and x86.
+bzrtp:
+bzrtp:
+bzrtp:
+bzrtp:
+bzrtp:
diff --git a/libraries/c++-gtk-utils/c++-gtk-utils.SlackBuild b/libraries/c++-gtk-utils/c++-gtk-utils.SlackBuild
index be0b1f8679..242c4d97b4 100644
--- a/libraries/c++-gtk-utils/c++-gtk-utils.SlackBuild
+++ b/libraries/c++-gtk-utils/c++-gtk-utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for c++-gtk-utils
 
-# Copyright 2012-2014 LukenShiro, Italy
+# Copyright 2012-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=c++-gtk-utils
-VERSION=${VERSION:-2.0.25}
+VERSION=${VERSION:-2.0.29}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/c++-gtk-utils/c++-gtk-utils.info b/libraries/c++-gtk-utils/c++-gtk-utils.info
index 56466aec69..b40dc7332c 100644
--- a/libraries/c++-gtk-utils/c++-gtk-utils.info
+++ b/libraries/c++-gtk-utils/c++-gtk-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="c++-gtk-utils"
-VERSION="2.0.25"
+VERSION="2.0.29"
 HOMEPAGE="http://cxx-gtk-utils.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/cxx-gtk-utils/c++-gtk-utils-2.0.25.tar.gz"
-MD5SUM="5bb59c36efd7aba2d5f7b5b51cac70a2"
+DOWNLOAD="http://downloads.sourceforge.net/cxx-gtk-utils/c++-gtk-utils-2.0.29.tar.gz"
+MD5SUM="9fdc2f04cd4dffb619002b66a1191032"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cchardet/cchardet.SlackBuild b/libraries/cchardet/cchardet.SlackBuild
index 2e4fd61212..9ae80c569c 100644
--- a/libraries/cchardet/cchardet.SlackBuild
+++ b/libraries/cchardet/cchardet.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cchardet
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cchardet
-VERSION=${VERSION:-0.3.5}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/cchardet/cchardet.info b/libraries/cchardet/cchardet.info
index eb986752ba..0a04734c80 100644
--- a/libraries/cchardet/cchardet.info
+++ b/libraries/cchardet/cchardet.info
@@ -1,8 +1,8 @@
 PRGNAM="cchardet"
-VERSION="0.3.5"
+VERSION="1.0.0"
 HOMEPAGE="https://github.com/PyYoshi/cChardet"
-DOWNLOAD="https://pypi.python.org/packages/source/c/cchardet/cchardet-0.3.5.tar.gz"
-MD5SUM="b1e73ed1e6d6ab775c95f014b127df01"
+DOWNLOAD="https://pypi.python.org/packages/source/c/cchardet/cchardet-1.0.0.tar.gz"
+MD5SUM="353f5ca2bc445cef5f103a9a7c2f7599"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Cython"
diff --git a/libraries/cdk/cdk.SlackBuild b/libraries/cdk/cdk.SlackBuild
index 5deb6aa4bd..81b7e960e8 100644
--- a/libraries/cdk/cdk.SlackBuild
+++ b/libraries/cdk/cdk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cdk
 
-# Copyright 2010-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cdk
-VERSION=${VERSION:-5.0_20140118}
+VERSION=${VERSION:-5.0_20150928}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,13 +64,10 @@ tar xvf $CWD/$PRGNAM-${VERSION/_/-}.tgz
 cd $PRGNAM-${VERSION/_/-}
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix cdk-config.in lib directory.
-sed -i "s|/lib\>|/lib${LIBDIRSUFFIX}|" cdk-config.in
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -81,22 +78,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-ncursesw \
   --with-x \
   --with-Xaw3d \
+  --with-Xaw3dxft \
   --with-libtool \
-  --disable-rpath-hack \
+  --with-shared \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG DOCUMENT_DIR=$PKG/usr/doc/$PRGNAM-$VERSION
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Fix permissions on the config and dynamic library files.
+# Fix permissions on the dynamic library files.
 ABI_VERSION=$($PKG/usr/bin/${PRGNAM}5-config --abi-version)
-chmod 0755 $PKG/usr/bin/cdk5-config $PKG/usr/lib${LIBDIRSUFFIX}/libcdkw.so.${ABI_VERSION}
+chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/libcdkw.so.${ABI_VERSION}
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/cdk/cdk.info b/libraries/cdk/cdk.info
index 5a62a2ff97..cc21dd6a14 100644
--- a/libraries/cdk/cdk.info
+++ b/libraries/cdk/cdk.info
@@ -1,8 +1,8 @@
 PRGNAM="cdk"
-VERSION="5.0_20140118"
+VERSION="5.0_20150928"
 HOMEPAGE="http://invisible-island.net/cdk/"
-DOWNLOAD="ftp://invisible-island.net/cdk/cdk-5.0-20140118.tgz"
-MD5SUM="d2687e5558b6d6be5fd39328e5c86033"
+DOWNLOAD="ftp://invisible-island.net/cdk/cdk-5.0-20150928.tgz"
+MD5SUM="4cdeb55c4f9e8fb81c411f1f2a7564a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cffi/cffi.SlackBuild b/libraries/cffi/cffi.SlackBuild
index f716e0e968..54fcf19619 100644
--- a/libraries/cffi/cffi.SlackBuild
+++ b/libraries/cffi/cffi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cffi
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cffi
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/cffi/cffi.info b/libraries/cffi/cffi.info
index 0867f11fe8..abeed6dc86 100644
--- a/libraries/cffi/cffi.info
+++ b/libraries/cffi/cffi.info
@@ -1,8 +1,8 @@
 PRGNAM="cffi"
-VERSION="1.1.1"
+VERSION="1.4.2"
 HOMEPAGE="http://cffi.readthedocs.org"
-DOWNLOAD="https://pypi.python.org/packages/source/c/cffi/cffi-1.1.1.tar.gz"
-MD5SUM="f397363bfbf99048accb0498ffc3e72b"
+DOWNLOAD="https://pypi.python.org/packages/source/c/cffi/cffi-1.4.2.tar.gz"
+MD5SUM="81357fe5042d00650b85b728cc181df2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools pycparser"
diff --git a/libraries/cln/cln.SlackBuild b/libraries/cln/cln.SlackBuild
index 62c160f9a5..4cd6164218 100644
--- a/libraries/cln/cln.SlackBuild
+++ b/libraries/cln/cln.SlackBuild
@@ -22,8 +22,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cln
-VERSION=1.3.2
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -66,12 +66,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Apply some patches from git
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-autoreconf -i
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -90,19 +85,15 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a \
-  COPYING INSTALL* NEWS README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  examples/*.cc examples/*.1 \
-    $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp -a COPYING INSTALL* NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a examples/*.cc examples/*.1 $PKG/usr/doc/$PRGNAM-$VERSION/examples
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/libraries/cln/cln.info b/libraries/cln/cln.info
index 5b46ea3527..7c81fd2c94 100644
--- a/libraries/cln/cln.info
+++ b/libraries/cln/cln.info
@@ -1,10 +1,10 @@
 PRGNAM="cln"
-VERSION="1.3.2"
+VERSION="1.3.4"
 HOMEPAGE="http://www.ginac.de/CLN"
-DOWNLOAD="http://www.ginac.de/CLN/cln-1.3.2.tar.bz2"
-MD5SUM="d897cce94d9c34d106575ed4ec865d71"
+DOWNLOAD="http://www.ginac.de/CLN/cln-1.3.4.tar.bz2"
+MD5SUM="30ef9d2f02ef5c3f8d221a8692f8b28e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andrew Psaltis"
-EMAIL="ampsaltis@gmail.com"
+MAINTAINER="Igor"
+EMAIL="igor29768@gmail.com"
diff --git a/libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch b/libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch
deleted file mode 100644
index 42a5a1c3ed..0000000000
--- a/libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Richard Kreckel <kreckel@ginac.de>
-Date: Fri, 2 Mar 2012 22:40:34 +0000 (+0100)
-Subject: Fix bug in converting cl_LF to float, double.
-X-Git-Url: http://www.ginac.de/CLN/cln.git/?p=cln.git;a=commitdiff_plain;h=3c6225a8b3fedffaba7279d86db96b8f180b3f28
-
-Fix bug in converting cl_LF to float, double.
----
-
-diff --git a/src/float/conv/cl_LF_to_double.cc b/src/float/conv/cl_LF_to_double.cc
-index 078bd1b..f9f5e86 100644
---- a/src/float/conv/cl_LF_to_double.cc
-+++ b/src/float/conv/cl_LF_to_double.cc
-@@ -20,7 +20,7 @@ double double_approx (const cl_LF& x)
- {
- 	// x entpacken:
- 	var cl_signean sign;
--	var sintL exp;
-+	var sintE exp;
- 	var uintD* ptr;
- 	var uintC len;
- 	LF_decode(x, { return 0.0; }, sign=,exp=,ptr=,len=,);
-diff --git a/src/float/conv/cl_LF_to_float.cc b/src/float/conv/cl_LF_to_float.cc
-index 913b08e..b476d04 100644
---- a/src/float/conv/cl_LF_to_float.cc
-+++ b/src/float/conv/cl_LF_to_float.cc
-@@ -20,7 +20,7 @@ float float_approx (const cl_LF& x)
- {
- 	// x entpacken:
- 	var cl_signean sign;
--	var sintL exp;
-+	var sintE exp;
- 	var uintD* ptr;
- 	var uintC len;
- 	LF_decode(x, { return 0.0; }, sign=,exp=,ptr=,len=,);
diff --git a/libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch b/libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch
deleted file mode 100644
index c2109dc3f6..0000000000
--- a/libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From: Richard Kreckel <kreckel@ginac.de>
-Date: Sun, 18 Mar 2012 23:35:03 +0000 (+0100)
-Subject: Avoid input stream fail state when reading number at EOF.
-X-Git-Url: http://www.ginac.de/CLN/cln.git/?p=cln.git;a=commitdiff_plain;h=4985c8a7895076df62758466c86cd1bc9df10438
-
-Avoid input stream fail state when reading number at EOF.
-
-istream::get() puts the stream in fail state when trying to read at
-EOF. This is best avoided by first peek()ing what is available.
----
-
-diff --git a/README b/README
-index 7de3f55..d445d55 100644
---- a/README
-+++ b/README
-@@ -1,8 +1,8 @@
- Class Library for Numbers
- 
- Copyright (c)      Bruno Haible 1988-2008
--Copyright (c)   Richard Kreckel 2000-2009
--Copyright (c) Alexei Sheplyakov 2008
-+Copyright (c)   Richard Kreckel 2000-2012
-+Copyright (c) Alexei Sheplyakov 2008-2010
- 
- GPL
- 
-diff --git a/doc/cln.texi b/doc/cln.texi
-index 354cacc..d5ed502 100644
---- a/doc/cln.texi
-+++ b/doc/cln.texi
-@@ -36,7 +36,7 @@ Published by Bruno Haible, @code{<haible@@clisp.cons.org>} and
- Richard B. Kreckel, @code{<kreckel@@ginac.de>}.
- 
- Copyright (C)  Bruno Haible 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
--Copyright (C)  Richard B. Kreckel 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-+Copyright (C)  Richard B. Kreckel 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
- Copyright (C)  Alexei Sheplyakov 2008, 2010.
- 
- Permission is granted to make and distribute verbatim copies of
-diff --git a/src/base/cl_free.cc b/src/base/cl_free.cc
-index ccda8af..a829aa2 100644
---- a/src/base/cl_free.cc
-+++ b/src/base/cl_free.cc
-@@ -34,8 +34,8 @@ void cl_free_heap_object (cl_heap* pointer)
- static const char * copyright_notice[] = {
-   "                                                                    \n"
-   "Copyright (c)      Bruno Haible 1988-2008                           \n"
--  "Copyright (c)   Richard Kreckel 2000-2009                           \n"
--  "Copyright (c) Alexei Sheplyakov 2008                                \n"
-+  "Copyright (c)   Richard Kreckel 2000-2012                           \n"
-+  "Copyright (c) Alexei Sheplyakov 2008-2010                           \n"
-   "                                                                    \n"
-   "This program is free software; you can redistribute it and/or modify\n"
-   "it under the terms of the GNU General Public License as published by\n"
-diff --git a/src/complex/input/cl_N_read_stream.cc b/src/complex/input/cl_N_read_stream.cc
-index 139af04..fc207aa 100644
---- a/src/complex/input/cl_N_read_stream.cc
-+++ b/src/complex/input/cl_N_read_stream.cc
-@@ -91,13 +91,10 @@ const cl_N read_complex (std::istream& stream, const cl_read_flags& flags)
- 		goto syntax1;
- 	loop {
- 		buffer.push(c);
--		c = stream.get();
--		if (stream.eof() || stream.fail())
--			break;
--		if (!number_char_p(c)) {
--			stream.putback(c);
-+		c = stream.peek();  // Avoid fail state on EOF.
-+		if (stream.eof() || stream.fail() || !number_char_p(c))
- 			break;
--		}
-+		c = stream.get();
- 	}
- done:
- 	// Parse the number.
-diff --git a/src/float/input/cl_F_read_stream.cc b/src/float/input/cl_F_read_stream.cc
-index baafc3b..044e4d6 100644
---- a/src/float/input/cl_F_read_stream.cc
-+++ b/src/float/input/cl_F_read_stream.cc
-@@ -82,13 +82,10 @@ const cl_F read_float (std::istream& stream, const cl_read_flags& flags)
- 		goto syntax1;
- 	loop {
- 		buffer.push(c);
--		c = stream.get();
--		if (stream.eof() || stream.fail())
--			break;
--		if (!number_char_p(c)) {
--			stream.putback(c);
-+		c = stream.peek();  // Avoid fail state on EOF.
-+		if (stream.eof() || stream.fail() || !number_char_p(c))
- 			break;
--		}
-+		c = stream.get();
- 	}
- 	// Parse the number.
- 	return read_float(flags,
-diff --git a/src/integer/input/cl_I_read_stream.cc b/src/integer/input/cl_I_read_stream.cc
-index 227d845..b242ae7 100644
---- a/src/integer/input/cl_I_read_stream.cc
-+++ b/src/integer/input/cl_I_read_stream.cc
-@@ -82,13 +82,10 @@ const cl_I read_integer (std::istream& stream, const cl_read_flags& flags)
- 		goto syntax1;
- 	loop {
- 		buffer.push(c);
--		c = stream.get();
--		if (stream.eof() || stream.fail())
--			break;
--		if (!number_char_p(c)) {
--			stream.putback(c);
-+		c = stream.peek();  // Avoid fail state on EOF.
-+		if (stream.eof() || stream.fail() || !number_char_p(c))
- 			break;
--		}
-+		c = stream.get();
- 	}
- 	// Parse the number.
- 	return read_integer(flags,
-diff --git a/src/rational/input/cl_RA_read_stream.cc b/src/rational/input/cl_RA_read_stream.cc
-index bba1d03..9e5f4f6 100644
---- a/src/rational/input/cl_RA_read_stream.cc
-+++ b/src/rational/input/cl_RA_read_stream.cc
-@@ -83,13 +83,10 @@ const cl_RA read_rational (std::istream& stream, const cl_read_flags& flags)
- 		goto syntax1;
- 	loop {
- 		buffer.push(c);
--		c = stream.get();
--		if (stream.eof() || stream.fail())
--			break;
--		if (!number_char_p(c)) {
--			stream.putback(c);
-+		c = stream.peek();  // Avoid fail state on EOF.
-+		if (stream.eof() || stream.fail() || !number_char_p(c))
- 			break;
--		}
-+		c = stream.get();
- 	}
- 	// Parse the number.
- 	return read_rational(flags,
-diff --git a/src/real/input/cl_R_read_stream.cc b/src/real/input/cl_R_read_stream.cc
-index 56b01d3..c032eee 100644
---- a/src/real/input/cl_R_read_stream.cc
-+++ b/src/real/input/cl_R_read_stream.cc
-@@ -82,13 +82,10 @@ const cl_R read_real (std::istream& stream, const cl_read_flags& flags)
- 		goto syntax1;
- 	loop {
- 		buffer.push(c);
--		c = stream.get();
--		if (stream.eof() || stream.fail())
--			break;
--		if (!number_char_p(c)) {
--			stream.putback(c);
-+		c = stream.peek();  // Avoid fail state on EOF.
-+		if (stream.eof() || stream.fail() || !number_char_p(c))
- 			break;
--		}
-+		c = stream.get();
- 	}
- 	// Parse the number.
- 	return read_real(flags,
diff --git a/libraries/collada-dom/collada-dom.info b/libraries/collada-dom/collada-dom.info
index 317f2a2759..6208435ba4 100644
--- a/libraries/collada-dom/collada-dom.info
+++ b/libraries/collada-dom/collada-dom.info
@@ -1,7 +1,7 @@
 PRGNAM="collada-dom"
 VERSION="2.4.0"
 HOMEPAGE="http://collada-dom.sourceforge.net/"
-DOWNLOAD="http://softlayer-dal.dl.sourceforge.net/project/collada-dom/Collada%20DOM/Collada%20DOM%202.4/collada-dom-2.4.0.tgz"
+DOWNLOAD="http://sourceforge.net/projects/collada-dom/files/Collada%20DOM/Collada%20DOM%202.4/collada-dom-2.4.0.tgz"
 MD5SUM="20399de4206eab850c32e65c04e907cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/cracklib/cracklib.SlackBuild b/libraries/cracklib/cracklib.SlackBuild
index c065f5149d..a6ebe7d1c4 100644
--- a/libraries/cracklib/cracklib.SlackBuild
+++ b/libraries/cracklib/cracklib.SlackBuild
@@ -29,11 +29,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cracklib
-VERSION=${VERSION:-2.8.22}
+VERSION=${VERSION:-2.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DICT=${DICT:-cracklib-words-20080507}
+DICT=${DICT:-cracklib-words-$VERSION}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -75,7 +75,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -99,13 +99,11 @@ elif [ -e $CWD/${DICT} ]; then
   cat $CWD/${DICT} > $PKG/usr/share/cracklib/$PRGNAM-large
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog INSTALL NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir $PKG/install
diff --git a/libraries/cracklib/cracklib.info b/libraries/cracklib/cracklib.info
index 1fe3115f46..22092db32c 100644
--- a/libraries/cracklib/cracklib.info
+++ b/libraries/cracklib/cracklib.info
@@ -1,10 +1,10 @@
 PRGNAM="cracklib"
-VERSION="2.8.22"
-HOMEPAGE="http://sourceforge.net/projects/cracklib"
-DOWNLOAD="http://downloads.sourceforge.net/project/cracklib/cracklib/2.8.22/cracklib-2.8.22.tar.gz \
-          http://downloads.sourceforge.net/cracklib/cracklib-words-20080507.gz"
-MD5SUM="463177b5c29c7a598c991e12a4898e06 \
-        7fa6ba0cd50e7f9ccaf4707c810b14f1"
+VERSION="2.9.6"
+HOMEPAGE="https://github.com/cracklib/cracklib"
+DOWNLOAD="https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-2.9.6.tar.gz \
+          https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-words-2.9.6.gz"
+MD5SUM="c52f463585d85924b28cdc1e373ae06d \
+        cae1257e3a9f95c917cc9dbbab852316"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/dbus-sharp/dbus-sharp.SlackBuild b/libraries/dbus-sharp/dbus-sharp.SlackBuild
index 8c0501d7f3..d052ca551d 100644
--- a/libraries/dbus-sharp/dbus-sharp.SlackBuild
+++ b/libraries/dbus-sharp/dbus-sharp.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=dbus-sharp
 VERSION=${VERSION:-0.8.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,6 +77,7 @@ find -L . \
 # We will fix the pkgconfig location on 64bit later.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+GMCS=/usr/bin/mcs \
 ./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib \
diff --git a/libraries/discogs-client/README b/libraries/discogs-client/README
index 71729fa058..f34c2e1c00 100644
--- a/libraries/discogs-client/README
+++ b/libraries/discogs-client/README
@@ -1 +1,6 @@
-Official Python API client for Discogs.
+This is the official Discogs API client for Python. It enables you 
+to query the Discogs database for information on artists, releases, 
+labels, users, Marketplace listings, and more. It also supports 
+OAuth 1.0a authorization, which allows you to change user data such 
+as profile information, collections and wantlists, inventory, 
+and orders.
diff --git a/libraries/discogs-client/discogs-client.SlackBuild b/libraries/discogs-client/discogs-client.SlackBuild
index f6e7873cd3..8641b523ef 100644
--- a/libraries/discogs-client/discogs-client.SlackBuild
+++ b/libraries/discogs-client/discogs-client.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=discogs-client
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/discogs-client/discogs-client.info b/libraries/discogs-client/discogs-client.info
index 1185b515a2..96a96d5270 100644
--- a/libraries/discogs-client/discogs-client.info
+++ b/libraries/discogs-client/discogs-client.info
@@ -1,8 +1,8 @@
 PRGNAM="discogs-client"
-VERSION="2.2.0"
-HOMEPAGE="https://pypi.python.org/pypi/discogs-client/"
-DOWNLOAD="https://pypi.python.org/packages/source/d/discogs-client/discogs-client-2.2.0.tar.gz"
-MD5SUM="aac0528f8fbff48f5bbf8dbd26989158"
+VERSION="2.2.1"
+HOMEPAGE="https://github.com/discogs/discogs_client"
+DOWNLOAD="https://pypi.python.org/packages/source/d/discogs-client/discogs-client-2.2.1.tar.gz"
+MD5SUM="c82be8006e1c02fcfc2bb42a2e312151"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-oauthlib python-requests six"
diff --git a/libraries/discogs-client/slack-desc b/libraries/discogs-client/slack-desc
index 13b0caa0a1..74001d7414 100644
--- a/libraries/discogs-client/slack-desc
+++ b/libraries/discogs-client/slack-desc
@@ -8,12 +8,12 @@
               |-----handy-ruler------------------------------------------------------|
 discogs-client: discogs-client (Official Python API client for Discogs)
 discogs-client:
-discogs-client: Official Python API client for Discogs
-discogs-client:
-discogs-client: homepage: https://pypi.python.org/pypi/discogs-client/
-discogs-client:
-discogs-client:
-discogs-client:
-discogs-client:
-discogs-client:
-discogs-client:
+discogs-client: This is the official Discogs API client for Python. It enables
+discogs-client: you to query the Discogs database for information on artists,
+discogs-client: releases, labels, users, Marketplace listings, and more. It also
+discogs-client: supports OAuth 1.0a authorization, which allows you to change user
+discogs-client: data such as profile information, collections and wantlists,
+discogs-client: inventory, and orders.
+discogs-client:
+discogs-client: Homepage: https://github.com/discogs/discogs_client
+discogs-client: 
diff --git a/libraries/dropbox-python/dropbox-python.SlackBuild b/libraries/dropbox-python/dropbox-python.SlackBuild
index 74308b6f70..c1a5cbfde9 100644
--- a/libraries/dropbox-python/dropbox-python.SlackBuild
+++ b/libraries/dropbox-python/dropbox-python.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dropbox-python
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=dropbox-python
 SCRNAM=$(printf $PRGNAM | cut -c1-7)
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SCRNAM-$VERSION
-unzip $CWD/$SCRNAM-$VERSION.zip
+tar xvf $CWD/$SCRNAM-$VERSION.tar.gz
 cd $SCRNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -72,16 +72,11 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.mdown LICENSE PKG-INFO README.rst TESTING conf.py \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/dropbox-python/dropbox-python.info b/libraries/dropbox-python/dropbox-python.info
index 9b698c36d4..897222ff5c 100644
--- a/libraries/dropbox-python/dropbox-python.info
+++ b/libraries/dropbox-python/dropbox-python.info
@@ -1,11 +1,11 @@
 PRGNAM="dropbox-python"
-VERSION="2.2.0"
+VERSION="4.0"
 HOMEPAGE="http://www.dropbox.com/"
-DOWNLOAD="https://pypi.python.org/packages/source/d/dropbox/dropbox-2.2.0.zip"
-MD5SUM="8f9bc437c19b34670aff2526e30c855a"
+DOWNLOAD="https://pypi.python.org/packages/source/d/dropbox/dropbox-4.0.tar.gz"
+MD5SUM="0a68c0a0a4d7cfa88f3e6cde925d6f39"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pysetuptools python-urllib3"
+REQUIRES="pysetuptools python-urllib3 six python-requests"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
 
diff --git a/libraries/e_dbus/e_dbus.SlackBuild b/libraries/e_dbus/e_dbus.SlackBuild
index 805a1c7784..4c20933d92 100644
--- a/libraries/e_dbus/e_dbus.SlackBuild
+++ b/libraries/e_dbus/e_dbus.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/ecore/ecore.SlackBuild b/libraries/ecore/ecore.SlackBuild
index b44128b0d6..fc0f91b16c 100644
--- a/libraries/ecore/ecore.SlackBuild
+++ b/libraries/ecore/ecore.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/edelib/edelib.info b/libraries/edelib/edelib.info
index 449a8826ae..664c169f99 100644
--- a/libraries/edelib/edelib.info
+++ b/libraries/edelib/edelib.info
@@ -1,7 +1,7 @@
 PRGNAM="edelib"
 VERSION="2.1"
 HOMEPAGE="http://edeproject.org/"
-DOWNLOAD="http://sourceforge.net/projects/ede/files/edelib/2.1/edelib-2.1.tar.gz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/extras/edelib/edelib-2.1.tar.gz/2e6ee2e1ceaea327967ed55868a1cb9f/edelib-2.1.tar.gz"
 MD5SUM="2e6ee2e1ceaea327967ed55868a1cb9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/edje/edje.SlackBuild b/libraries/edje/edje.SlackBuild
index 383ea10ddc..a20a814ab9 100644
--- a/libraries/edje/edje.SlackBuild
+++ b/libraries/edje/edje.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/eet/eet.SlackBuild b/libraries/eet/eet.SlackBuild
index c0ee116bdd..7830d87a26 100644
--- a/libraries/eet/eet.SlackBuild
+++ b/libraries/eet/eet.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/efreet/efreet.SlackBuild b/libraries/efreet/efreet.SlackBuild
index a0d41cacbe..7975e9e661 100644
--- a/libraries/efreet/efreet.SlackBuild
+++ b/libraries/efreet/efreet.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/eina/eina.SlackBuild b/libraries/eina/eina.SlackBuild
index bfd521cefe..dd9bcd4cde 100644
--- a/libraries/eina/eina.SlackBuild
+++ b/libraries/eina/eina.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/eio/eio.SlackBuild b/libraries/eio/eio.SlackBuild
index d88359a846..c3608cc449 100644
--- a/libraries/eio/eio.SlackBuild
+++ b/libraries/eio/eio.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/embryo/embryo.SlackBuild b/libraries/embryo/embryo.SlackBuild
index 54cf52935f..67666033b0 100644
--- a/libraries/embryo/embryo.SlackBuild
+++ b/libraries/embryo/embryo.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/enum34/enum34.SlackBuild b/libraries/enum34/enum34.SlackBuild
index b07a9a4186..5e607c141b 100644
--- a/libraries/enum34/enum34.SlackBuild
+++ b/libraries/enum34/enum34.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for enum34
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=enum34
-VERSION=${VERSION:-1.0.4}
+VERSION=${VERSION:-1.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/enum34/enum34.info b/libraries/enum34/enum34.info
index e7ac22de10..713c68afc8 100644
--- a/libraries/enum34/enum34.info
+++ b/libraries/enum34/enum34.info
@@ -1,8 +1,8 @@
 PRGNAM="enum34"
-VERSION="1.0.4"
+VERSION="1.1.2"
 HOMEPAGE="https://pypi.python.org/pypi/enum34"
-DOWNLOAD="https://pypi.python.org/packages/source/e/enum34/enum34-1.0.4.tar.gz"
-MD5SUM="ac80f432ac9373e7d162834b264034b6"
+DOWNLOAD="https://pypi.python.org/packages/source/e/enum34/enum34-1.1.2.tar.gz"
+MD5SUM="025bb71b3f9d2fad15d0ee53e48dc873"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/evas/evas.SlackBuild b/libraries/evas/evas.SlackBuild
index bbd562cccc..ab45c91bff 100644
--- a/libraries/evas/evas.SlackBuild
+++ b/libraries/evas/evas.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/exiftool/exiftool.SlackBuild b/libraries/exiftool/exiftool.SlackBuild
index 26ef46d79f..66718525e7 100644
--- a/libraries/exiftool/exiftool.SlackBuild
+++ b/libraries/exiftool/exiftool.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exiftool
-VERSION=${VERSION:-9.90}
+VERSION=${VERSION:-10.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,7 +53,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Makefile.PL INSTALLDIRS=vendor
 make test
diff --git a/libraries/exiftool/exiftool.info b/libraries/exiftool/exiftool.info
index 51ca27d7df..1a982a235d 100644
--- a/libraries/exiftool/exiftool.info
+++ b/libraries/exiftool/exiftool.info
@@ -1,8 +1,8 @@
 PRGNAM="exiftool"
-VERSION="9.90"
+VERSION="10.00"
 HOMEPAGE="https://metacpan.org/pod/Image::ExifTool"
-DOWNLOAD="http://www.cpan.org/authors/id/E/EX/EXIFTOOL/Image-ExifTool-9.90.tar.gz"
-MD5SUM="4ce15d63f29f682763e77e7bb4685dec"
+DOWNLOAD="http://www.cpan.org/authors/id/E/EX/EXIFTOOL/Image-ExifTool-10.00.tar.gz"
+MD5SUM="0093bf26c07c3c38a32f85cab32102cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/ffms2/ffms2.SlackBuild b/libraries/ffms2/ffms2.SlackBuild
index a1e50f98a4..b99352cde9 100644
--- a/libraries/ffms2/ffms2.SlackBuild
+++ b/libraries/ffms2/ffms2.SlackBuild
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ffms2
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-2.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/ffms2/ffms2.info b/libraries/ffms2/ffms2.info
index e852c0eb4a..aa1e2d7847 100644
--- a/libraries/ffms2/ffms2.info
+++ b/libraries/ffms2/ffms2.info
@@ -1,8 +1,8 @@
 PRGNAM="ffms2"
-VERSION="2.21"
+VERSION="2.22"
 HOMEPAGE="https://github.com/FFMS/ffms2"
-DOWNLOAD="https://github.com/FFMS/ffms2/archive/2.21.tar.gz"
-MD5SUM="311178b420d8a69fad5811e900dbc2fb"
+DOWNLOAD="https://github.com/FFMS/ffms2/archive/2.22.tar.gz"
+MD5SUM="a7863cdc50ae9236a507d387dba744d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/libraries/fox-toolkit/fox-toolkit.SlackBuild b/libraries/fox-toolkit/fox-toolkit.SlackBuild
index 010035a185..5fdd906bca 100644
--- a/libraries/fox-toolkit/fox-toolkit.SlackBuild
+++ b/libraries/fox-toolkit/fox-toolkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fox-toolkit
 
-# Copyright 2006-2013  Robby Workman, Northport, AL, USA
+# Copyright 2006-2016  Robby Workman, Tuscaloosa, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fox-toolkit
-VERSION=${VERSION:-1.6.49}
+VERSION=${VERSION:-1.6.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/fox-toolkit/fox-toolkit.info b/libraries/fox-toolkit/fox-toolkit.info
index ceb7478c2d..db303da706 100644
--- a/libraries/fox-toolkit/fox-toolkit.info
+++ b/libraries/fox-toolkit/fox-toolkit.info
@@ -1,8 +1,8 @@
 PRGNAM="fox-toolkit"
-VERSION="1.6.49"
+VERSION="1.6.50"
 HOMEPAGE="http://www.fox-toolkit.org/"
-DOWNLOAD="ftp://ftp.fox-toolkit.org/pub/fox-1.6.49.tar.gz"
-MD5SUM="e120647d26a27ed37cd5fed8b75c8a3d"
+DOWNLOAD="ftp://ftp.fox-toolkit.org/pub/fox-1.6.50.tar.gz"
+MD5SUM="f68c2219318ecb0b838387ae85d3220d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/frei0r/fix_building_against_opencv_3.0.patch b/libraries/frei0r/fix_building_against_opencv_3.0.patch
new file mode 100644
index 0000000000..b9dd1352f4
--- /dev/null
+++ b/libraries/frei0r/fix_building_against_opencv_3.0.patch
@@ -0,0 +1,52 @@
+diff -up ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c.opencv3 ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c
+--- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c.opencv3	2013-02-24 14:43:22.000000000 +0100
++++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c	2015-07-08 12:44:30.987056878 +0200
+@@ -211,8 +211,8 @@ CvSeq* detect_and_draw( IplImage* img, C
+ 
+   double scale = 1.3;
+   IplImage* gray = cvCreateImage( cvSize(img->width,img->height), 8, 1 );
+-  IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
+-                                               cvRound (img->height/scale)),
++  IplImage* small_img = cvCreateImage( cvSize( cvRound ((double)img->width/scale),
++                                               cvRound ((double)img->height/scale)),
+                                        8, 1 );
+   int i;
+ 
+diff -up ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp.opencv3 ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp
+--- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp.opencv3	2013-02-24 14:43:22.000000000 +0100
++++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp	2015-07-08 12:48:32.754615885 +0200
+@@ -259,11 +259,11 @@ private:
+     {
+         double scale = this->scale == 0? 1.0 : this->scale;
+         CvScalar colors[5] = {
+-            {{cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)}},
+-            {{cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)}},
++            CvScalar(cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)),
++            CvScalar(cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)),
+         };
+         
+         for (int i = 0; i < (objects ? objects->total : 0); i++)
+@@ -287,14 +287,14 @@ private:
+                 }
+             case 1:
+                 {
+-                    CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
++                    CvBox2D box = CvBox2D(CvPoint2D32f(center.x, center.y), CvSize2D32f(r->width / scale, (r->height / scale) * 1.2), 90);
+                     cvEllipseBox(image, box, colors[i % 5], thickness, linetype);
+                     break;
+                 }
+             case 2:
+                 {
+-                    CvPoint pt1 = {r->x / scale, r->y / scale};
+-                    CvPoint pt2 = {(r->x + r->width) / scale, (r->y + r->height) / scale};
++                    CvPoint pt1 = CvPoint(r->x / scale, r->y / scale);
++                    CvPoint pt2 = CvPoint((r->x + r->width) / scale, (r->y + r->height) / scale);
+                     cvRectangle(image, pt1, pt2, colors[i % 5], thickness, linetype);
+                     break;
+                 }
diff --git a/libraries/frei0r/frei0r.SlackBuild b/libraries/frei0r/frei0r.SlackBuild
index 83095f7977..93690fd000 100644
--- a/libraries/frei0r/frei0r.SlackBuild
+++ b/libraries/frei0r/frei0r.SlackBuild
@@ -2,6 +2,7 @@
 
 # Copyright 2009, Jonathan Larsen (agentc0re), SLC, UT
 # Contact Info: agentc0re 'AT' learnix 'DOT' net
+# Copyright 2012-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,10 +29,12 @@
 #	*compatibility and removed the man page section
 # Mar 12th, 2013
 #   *Updated for 1.4
+# Sep 7th, 2015
+#   *Patch for opencv-3.0
 
 PRGNAM=frei0r
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -76,6 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p2 < $CWD/fix_building_against_opencv_3.0.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/ftplib/ftplib.SlackBuild b/libraries/ftplib/ftplib.SlackBuild
index ae21706b49..56648754db 100644
--- a/libraries/ftplib/ftplib.SlackBuild
+++ b/libraries/ftplib/ftplib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ftplib
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -74,7 +74,8 @@ CFLAGS="$SLKCFLAGS"
 
 cd src
 make
-# The makefile has no customizable DESTDIR, so we'll modify it accordingly.
+# We'll edit the destination paths manually (since no config script or
+# DESTDIR variable are available).
 sed -i -e "s~/usr/local/bin~"$PKG"/usr/bin~" Makefile
 sed -i -e "s~/usr/local/lib~"$PKG"/usr/lib"${LIBDIRSUFFIX}"~" Makefile
 sed -i -e "s~/usr/local/include~"$PKG"/usr/include~" Makefile
diff --git a/libraries/ftplib/ftplib.info b/libraries/ftplib/ftplib.info
index e04a1a6260..7b81583f07 100644
--- a/libraries/ftplib/ftplib.info
+++ b/libraries/ftplib/ftplib.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/gallerize/gallerize.SlackBuild b/libraries/gallerize/gallerize.SlackBuild
index 680897281f..58a454fcff 100644
--- a/libraries/gallerize/gallerize.SlackBuild
+++ b/libraries/gallerize/gallerize.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/libraries/gallerize/gallerize.info b/libraries/gallerize/gallerize.info
index 585e303a9f..149324672a 100644
--- a/libraries/gallerize/gallerize.info
+++ b/libraries/gallerize/gallerize.info
@@ -1,7 +1,7 @@
 PRGNAM="gallerize"
 VERSION="0.3.1"
 HOMEPAGE="http://homework.nwsnet.de/releases/cc0e/#gallerize"
-DOWNLOAD="http://homework.nwsnet.de/releases/cc0e/gallerize-0.3.1.tgz"
+DOWNLOAD="https://github.com/homeworkprod/gallerize/archive/v0.3.1.tar.gz"
 MD5SUM="09e2f21ad4b2e6e0dcb9a87595a6272e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/ganv/ganv.SlackBuild b/libraries/ganv/ganv.SlackBuild
index f0171ce7af..c3154d4646 100644
--- a/libraries/ganv/ganv.SlackBuild
+++ b/libraries/ganv/ganv.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/gcab/README b/libraries/gcab/README
new file mode 100644
index 0000000000..489d796426
--- /dev/null
+++ b/libraries/gcab/README
@@ -0,0 +1 @@
+A GObject library to create cabinet files.
diff --git a/libraries/gcab/gcab.SlackBuild b/libraries/gcab/gcab.SlackBuild
new file mode 100644
index 0000000000..d9c205a962
--- /dev/null
+++ b/libraries/gcab/gcab.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for "gcab".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gcab
+VERSION=${VERSION:-0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/gcab/gcab.info b/libraries/gcab/gcab.info
new file mode 100644
index 0000000000..2a389b5326
--- /dev/null
+++ b/libraries/gcab/gcab.info
@@ -0,0 +1,10 @@
+PRGNAM="gcab"
+VERSION="0.6"
+HOMEPAGE="https://wiki.gnome.org/msitools/"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gcab/0.6/gcab-0.6.tar.xz"
+MD5SUM="dd7333644cb88995693f043da9bf55d3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="vala"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/libraries/gcab/slack-desc b/libraries/gcab/slack-desc
new file mode 100644
index 0000000000..f59f407e98
--- /dev/null
+++ b/libraries/gcab/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+gcab: gcab (A GObject library to create cabinet files)
+gcab:
+gcab: A GObject library to create cabinet files.
+gcab:
+gcab: Homepage: https://wiki.gnome.org/msitools/
+gcab:
+gcab:
+gcab:
+gcab:
+gcab:
+gcab:
diff --git a/libraries/gtkhotkey/0001-Disable-debug-mode.patch b/libraries/gtkhotkey/0001-Disable-debug-mode.patch
new file mode 100644
index 0000000000..934541eda4
--- /dev/null
+++ b/libraries/gtkhotkey/0001-Disable-debug-mode.patch
@@ -0,0 +1,26 @@
+From 6fdad02e8bcf6876c8a5aa3512960311e8ea9fb7 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+Date: Tue, 19 Jan 2010 14:14:38 +0900
+Subject: [PATCH 1/2] Disable debug mode.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+---
+ src/x11/tomboykeybinder.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/x11/tomboykeybinder.c b/src/x11/tomboykeybinder.c
+index fe569a7..0edd476 100644
+--- a/src/x11/tomboykeybinder.c
++++ b/src/x11/tomboykeybinder.c
+@@ -12,7 +12,7 @@
+ #include "tomboykeybinder.h"
+ 
+ /* Uncomment the next line to print a debug trace. */
+-#define DEBUG 1
++/* #define DEBUG 1 */
+ 
+ #ifdef DEBUG
+ #  define TRACE(x) x
+-- 
+1.6.6
+
diff --git a/libraries/gtkhotkey/README b/libraries/gtkhotkey/README
new file mode 100644
index 0000000000..da0f769c00
--- /dev/null
+++ b/libraries/gtkhotkey/README
@@ -0,0 +1,12 @@
+gtkhotkey (hotkey handling for Gtk+ applications)
+
+GtkHotkey Library - Cross Platform Library For Using Desktop Wide Hotkeys.
+
+The idea of the library is to keep it as simple as possible, while sticking
+to an object oriented design, without falling back to C-isms (read: '#ifdefs')
+where it would otherwise be tempting.
+
+It can be argued that the code base is too small to be put in a separate library.
+However the functionality is very well defined and would probably appear
+oddly placed in some bigger helper library for GTk+ apps, where it would likely
+live in a hodge podge of unrelated functionality.
diff --git a/libraries/gtkhotkey/glib-single-include.patch b/libraries/gtkhotkey/glib-single-include.patch
new file mode 100644
index 0000000000..76b0520efb
--- /dev/null
+++ b/libraries/gtkhotkey/glib-single-include.patch
@@ -0,0 +1,30 @@
+Description: Fix build failure with glib 2.32
+ where including invidual glib headers is no longer allowed.
+Author: Michael Biebl <biebl@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665548
+Index: gtkhotkey-0.2.1/src/gtk-hotkey-error.h
+===================================================================
+--- gtkhotkey-0.2.1.orig/src/gtk-hotkey-error.h	2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1/src/gtk-hotkey-error.h	2012-03-25 19:07:05.822268171 +0200
+@@ -23,7 +23,7 @@
+ #ifndef __GTK_HOTKEY_ERROR_H__
+ #define __GTK_HOTKEY_ERROR_H__
+ 
+-#include <glib/gquark.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: gtkhotkey-0.2.1/src/x11/tomboykeybinder.h
+===================================================================
+--- gtkhotkey-0.2.1.orig/src/x11/tomboykeybinder.h	2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1/src/x11/tomboykeybinder.h	2012-03-25 19:07:05.914268168 +0200
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/libraries/gtkhotkey/gtkhotkey.SlackBuild b/libraries/gtkhotkey/gtkhotkey.SlackBuild
new file mode 100644
index 0000000000..22d2a02745
--- /dev/null
+++ b/libraries/gtkhotkey/gtkhotkey.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Slackware build script for gtkhotkey.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gtkhotkey
+VERSION=${VERSION:-0.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/0001-Disable-debug-mode.patch
+patch -p1 < $CWD/glib-single-include.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+rm -rf $PKG/usr/doc/$PRGNAM
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/gtkhotkey/gtkhotkey.info b/libraries/gtkhotkey/gtkhotkey.info
new file mode 100644
index 0000000000..128f69bd1b
--- /dev/null
+++ b/libraries/gtkhotkey/gtkhotkey.info
@@ -0,0 +1,10 @@
+PRGNAM="gtkhotkey"
+VERSION="0.2.1"
+HOMEPAGE="https://launchpad.net/gtkhotkey/"
+DOWNLOAD="https://launchpad.net/gtkhotkey/0.2/0.2.1/+download/gtkhotkey-0.2.1.tar.gz"
+MD5SUM="bfdc73e68e9adbe0d506d31a25862914"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/gtkhotkey/slack-desc b/libraries/gtkhotkey/slack-desc
new file mode 100644
index 0000000000..3efc9c4511
--- /dev/null
+++ b/libraries/gtkhotkey/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+gtkhotkey: gtkhotkey (hotkey handling for Gtk+ applications)
+gtkhotkey:
+gtkhotkey: gtkhotkey is a platform independent hotkey handling for Gtk+ 
+gtkhotkey: applications.
+gtkhotkey:
+gtkhotkey: Home page: https://launchpad.net/gtkhotkey/
+gtkhotkey:
+gtkhotkey:
+gtkhotkey:
+gtkhotkey:
+gtkhotkey:
diff --git a/libraries/hdf5/hdf5.SlackBuild b/libraries/hdf5/hdf5.SlackBuild
index 78a3d453ab..5171da7c6c 100644
--- a/libraries/hdf5/hdf5.SlackBuild
+++ b/libraries/hdf5/hdf5.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for hdf5
 
-# Copyright 2007-2014  LukenShiro, Italy
+# Copyright 2007-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hdf5
-VERSION=${VERSION:-1.8.13}
+VERSION=${VERSION:-1.8.15_patch1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/hdf5/hdf5.info b/libraries/hdf5/hdf5.info
index f27abe35ca..e64fdb2063 100644
--- a/libraries/hdf5/hdf5.info
+++ b/libraries/hdf5/hdf5.info
@@ -1,8 +1,8 @@
 PRGNAM="hdf5"
-VERSION="1.8.13"
+VERSION="1.8.15_patch1"
 HOMEPAGE="https://www.hdfgroup.org/"
-DOWNLOAD="http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.13/src/hdf5-1.8.13.tar.bz2"
-MD5SUM="b060bb137d6bd8accf8f0c4c59d2746d"
+DOWNLOAD="http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.15-patch1/src/hdf5-1.8.15-patch1.tar.bz2"
+MD5SUM="3c0d7a8c38d1abc7b40fc12c1d5f2bb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/hidapi/README b/libraries/hidapi/README
new file mode 100644
index 0000000000..f20a6b2e70
--- /dev/null
+++ b/libraries/hidapi/README
@@ -0,0 +1,2 @@
+A Simple library for communicating with USB and Bluetooth HID
+devices on Linux, Mac, and Windows.
diff --git a/libraries/hidapi/hidapi.SlackBuild b/libraries/hidapi/hidapi.SlackBuild
new file mode 100644
index 0000000000..7adc204d95
--- /dev/null
+++ b/libraries/hidapi/hidapi.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for hidapi
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hidapi
+SRCNAM=hidapi-hidapi
+VERSION=${VERSION:-0.8.0_rc1}
+SRCVER=$(echo $VERSION | tr _ -)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $SRCNAM-$SRCVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./bootstrap
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/hidapi/hidapi.info b/libraries/hidapi/hidapi.info
new file mode 100644
index 0000000000..ace4d7284f
--- /dev/null
+++ b/libraries/hidapi/hidapi.info
@@ -0,0 +1,10 @@
+PRGNAM="hidapi"
+VERSION="0.8.0_rc1"
+HOMEPAGE="http://www.signal11.us/oss/hidapi/"
+DOWNLOAD="https://github.com/signal11/hidapi/archive/hidapi-0.8.0-rc1.tar.gz"
+MD5SUM="069f9dd746edc37b6b6d0e3656f47199"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/hidapi/slack-desc b/libraries/hidapi/slack-desc
new file mode 100644
index 0000000000..835b425bd3
--- /dev/null
+++ b/libraries/hidapi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+hidapi: hidapi (Library to access HID devices)
+hidapi:
+hidapi: A Simple library for communicating with USB and Bluetooth HID
+hidapi: devices on Linux, Mac, and Windows.
+hidapi:
+hidapi:
+hidapi:
+hidapi: Project URL: http://www.signal11.us/oss/hidapi/
+hidapi:
+hidapi:
+hidapi:
diff --git a/libraries/hiredis/Makefile.patch b/libraries/hiredis/Makefile.patch
deleted file mode 100644
index 28d399625a..0000000000
--- a/libraries/hiredis/Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	2015-04-03 15:07:16.975046819 -0700
-+++ Makefile	2015-04-03 15:08:21.383052670 -0700
-@@ -150,15 +150,15 @@ INSTALL?= cp -a
- $(PKGCONFNAME): hiredis.h
- 	@echo "Generating $@ for pkgconfig..."
- 	@echo prefix=$(PREFIX) > $@
--	@echo exec_prefix=$${prefix} >> $@
-+	@echo exec_prefix=\$${prefix} >> $@
- 	@echo libdir=$(INSTALL_LIBRARY_PATH) >> $@
- 	@echo includedir=$(INSTALL_INCLUDE_PATH) >> $@
- 	@echo >> $@
- 	@echo Name: hiredis >> $@
- 	@echo Description: Minimalistic C client library for Redis. >> $@
- 	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
--	@echo Libs: -L$${libdir} -lhiredis >> $@
--	@echo Cflags: -I$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
-+	@echo Libs: -L\$${libdir} -lhiredis >> $@
-+	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
- 
- install: $(DYLIBNAME) $(STLIBNAME)
- 	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
diff --git a/libraries/hiredis/hiredis.SlackBuild b/libraries/hiredis/hiredis.SlackBuild
index 39c9cdf13f..cd3b1bcca4 100644
--- a/libraries/hiredis/hiredis.SlackBuild
+++ b/libraries/hiredis/hiredis.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hiredis
-VERSION=${VERSION:-0.12.1}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +62,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-patch < $CWD/Makefile.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/hiredis/hiredis.info b/libraries/hiredis/hiredis.info
index 9f210e9300..7bf733b1ef 100644
--- a/libraries/hiredis/hiredis.info
+++ b/libraries/hiredis/hiredis.info
@@ -1,8 +1,8 @@
 PRGNAM="hiredis"
-VERSION="0.12.1"
+VERSION="0.13.1"
 HOMEPAGE="https://github.com/redis/hiredis"
-DOWNLOAD="https://github.com/redis/hiredis/archive/v0.12.1.tar.gz"
-MD5SUM="914e4aa8ab4a3f60d5739d2106e50502"
+DOWNLOAD="https://github.com/redis/hiredis/archive/v0.13.1.tar.gz"
+MD5SUM="4226dda52dbe08304e3b6027b4d6c74d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/htmlcxx/htmlcxx.SlackBuild b/libraries/htmlcxx/htmlcxx.SlackBuild
index 195c11a9b6..bf3b78fbc9 100644
--- a/libraries/htmlcxx/htmlcxx.SlackBuild
+++ b/libraries/htmlcxx/htmlcxx.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=htmlcxx
-VERSION=${VERSION:-0.85}
+VERSION=${VERSION:-0.86}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/htmlcxx/htmlcxx.info b/libraries/htmlcxx/htmlcxx.info
index b041b710bd..447460b1a9 100644
--- a/libraries/htmlcxx/htmlcxx.info
+++ b/libraries/htmlcxx/htmlcxx.info
@@ -1,8 +1,8 @@
 PRGNAM="htmlcxx"
-VERSION="0.85"
+VERSION="0.86"
 HOMEPAGE="http://htmlcxx.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/htmlcxx/files/htmlcxx/0.85/htmlcxx-0.85.tar.gz"
-MD5SUM="dbe13c25b5846eb7cbbfa63d85f00f74"
+DOWNLOAD="http://sourceforge.net/projects/htmlcxx/files/htmlcxx/0.86/htmlcxx-0.86.tar.gz"
+MD5SUM="38376334b13155a1bcccb405ddd22da8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/http-parser/http-parser.SlackBuild b/libraries/http-parser/http-parser.SlackBuild
index 4b1b52e5c5..e456896636 100644
--- a/libraries/http-parser/http-parser.SlackBuild
+++ b/libraries/http-parser/http-parser.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=http-parser
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/http-parser/http-parser.info b/libraries/http-parser/http-parser.info
index a071fdd36c..c1698259fb 100644
--- a/libraries/http-parser/http-parser.info
+++ b/libraries/http-parser/http-parser.info
@@ -1,8 +1,8 @@
 PRGNAM="http-parser"
-VERSION="2.4.2"
+VERSION="2.6.0"
 HOMEPAGE="https://github.com/joyent/http-parser"
-DOWNLOAD="https://github.com/joyent/http-parser/archive/v2.4.2.tar.gz"
-MD5SUM="320b65ff6d79c7d3a2fa88d5ea94196a"
+DOWNLOAD="https://github.com/joyent/http-parser/archive/v2.6.0.tar.gz"
+MD5SUM="63033f3e657ee46c5fef6e53e4d9886b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/hyphen/README b/libraries/hyphen/README
new file mode 100644
index 0000000000..97633624e6
--- /dev/null
+++ b/libraries/hyphen/README
@@ -0,0 +1 @@
+Hyphenation library to use converted TeX hyphenation patterns.
diff --git a/libraries/hyphen/hyphen.SlackBuild b/libraries/hyphen/hyphen.SlackBuild
new file mode 100644
index 0000000000..b1c575d773
--- /dev/null
+++ b/libraries/hyphen/hyphen.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for hyphen
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hyphen
+VERSION=${VERSION:-2.8.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYIN* ChangeLog INSTALL NEWS READM* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/hyphen/hyphen.info b/libraries/hyphen/hyphen.info
new file mode 100644
index 0000000000..2091b0c8a6
--- /dev/null
+++ b/libraries/hyphen/hyphen.info
@@ -0,0 +1,10 @@
+PRGNAM="hyphen"
+VERSION="2.8.8"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-2.8.8.tar.gz"
+MD5SUM="5ade6ae2a99bc1e9e57031ca88d36dad"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/hyphen/slack-desc b/libraries/hyphen/slack-desc
new file mode 100644
index 0000000000..ae13d6639e
--- /dev/null
+++ b/libraries/hyphen/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+hyphen: hyphen (hyphenation library)
+hyphen:
+hyphen: Hyphenation library to use converted TeX hyphenation pattern
+hyphen:
+hyphen: Homepage: http://hunspell.sourceforge.net/
+hyphen:
+hyphen:
+hyphen:
+hyphen:
+hyphen:
+hyphen:
diff --git a/libraries/ioncube-loader/ioncube-loader.SlackBuild b/libraries/ioncube-loader/ioncube-loader.SlackBuild
deleted file mode 100644
index c9296083db..0000000000
--- a/libraries/ioncube-loader/ioncube-loader.SlackBuild
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "ioncube-loader".
-
-# Copyright 2015 Eugene Wissner <belka.ew@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ioncube-loader
-SRCNAM=ioncube
-VERSION=${VERSION:-5.0.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  TARGET="x86"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  TARGET="x86"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  TARGET="x86-64"
-  LIBDIRSUFFIX="64"
-fi
-
-set -e
-
-rm -rf $PKG
-rm -rf $TMP/$SRCNAM
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-tar xvf $CWD/ioncube_loaders_lin_$TARGET.tar.bz2
-cd $SRCNAM
-chown -R root:root .
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions
-install -m 0755 ioncube_loader_lin_5.4_ts.so $PKG/usr/lib${LIBDIRSUFFIX}/php/extensions
-mkdir -p $PKG/etc/php
-cat $CWD/ioncube${LIBDIRSUFFIX}.ini > $PKG/etc/php/20ioncube.ini.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.txt USER-GUIDE.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/ioncube-loader/ioncube-loader.info b/libraries/ioncube-loader/ioncube-loader.info
deleted file mode 100644
index 45b6aed093..0000000000
--- a/libraries/ioncube-loader/ioncube-loader.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ioncube-loader"
-VERSION="5.0.12"
-HOMEPAGE="https://www.ioncube.com"
-DOWNLOAD="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86.tar.bz2"
-MD5SUM="a1be410194f2bf1de24ba7a286097a3d"
-DOWNLOAD_x86_64="http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.bz2"
-MD5SUM_x86_64="bfe1dbcf8b767ac5391461c60d81fda8"
-REQUIRES=""
-MAINTAINER="Eugene Wissner"
-EMAIL="belka.ew@gmail.com"
diff --git a/libraries/ipaddress/ipaddress.SlackBuild b/libraries/ipaddress/ipaddress.SlackBuild
index bb27da53bb..1f5082547b 100644
--- a/libraries/ipaddress/ipaddress.SlackBuild
+++ b/libraries/ipaddress/ipaddress.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ipaddress
-VERSION=${VERSION:-1.0.14}
+VERSION=${VERSION:-1.0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/ipaddress/ipaddress.info b/libraries/ipaddress/ipaddress.info
index c40028a011..a6823c3b78 100644
--- a/libraries/ipaddress/ipaddress.info
+++ b/libraries/ipaddress/ipaddress.info
@@ -1,8 +1,8 @@
 PRGNAM="ipaddress"
-VERSION="1.0.14"
+VERSION="1.0.16"
 HOMEPAGE="https://github.com/phihag/ipaddress"
-DOWNLOAD="https://pypi.python.org/packages/source/i/ipaddress/ipaddress-1.0.14.tar.gz"
-MD5SUM="e2f2f6593b2b8a7e8abba0fbdf33f046"
+DOWNLOAD="https://pypi.python.org/packages/source/i/ipaddress/ipaddress-1.0.16.tar.gz"
+MD5SUM="1e27b62aa20f5b6fc200b2bdbf0d0847"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/irrlicht/irrlicht-1.8.1-mesa10.patch b/libraries/irrlicht/irrlicht-1.8.1-mesa10.patch
new file mode 100644
index 0000000000..ca8e4a7614
--- /dev/null
+++ b/libraries/irrlicht/irrlicht-1.8.1-mesa10.patch
@@ -0,0 +1,26 @@
+diff -up irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10	2013-12-13 23:05:43.208343706 -0500
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h	2013-12-13 23:05:43.213343691 -0500
+@@ -59,6 +59,9 @@
+ 	#endif

+ 	#include <GL/gl.h>

+ 	#include <GL/glx.h>

++        #ifndef PFNGLBLENDEQUATIONPROC 

++         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);

++        #endif

+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)

+ 	#include <GL/glext.h>

+ 	 typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);

+diff -up irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10 irrlicht-1.8.1/source/Irrlicht/glxext.h
+--- irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10	2013-12-30 12:18:38.368368241 -0500
++++ irrlicht-1.8.1/source/Irrlicht/glxext.h	2013-12-30 12:18:54.305386790 -0500
+@@ -44,6 +44,9 @@ extern "C" {
+ #ifndef GLAPI

+ #define GLAPI extern

+ #endif

++#ifndef GLXContextID

++#define GLXContextID XID

++#endif

+ 

+ /*************************************************************/

+ 

diff --git a/libraries/irrlicht/irrlicht.SlackBuild b/libraries/irrlicht/irrlicht.SlackBuild
index c40a3de712..aa493f5875 100644
--- a/libraries/irrlicht/irrlicht.SlackBuild
+++ b/libraries/irrlicht/irrlicht.SlackBuild
@@ -26,7 +26,7 @@
 # Revision date 2013/03/28
 
 PRGNAM=irrlicht
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,6 +72,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Set maximum number of textures.
+sed -i '/_IRR_MATERIAL_MAX_TEXTURES_/s|4|8|' include/IrrCompileConfig.h
+
+# Patch for Mesa 10.
+patch -p1 < $CWD/irrlicht-1.8.1-mesa10.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 NDEBUG=1 \
@@ -92,8 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Fix end-of-line encoding.
 for i in $PKG/usr/include/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/*; do
-  cp $i ${i}.new
-  sed -i 's/\r//' ${i}.new
+  sed -e 's/\r//' $i > ${i}.new
   touch -r $i ${i}.new
   mv ${i}.new $i
 done
diff --git a/libraries/irrlicht/irrlicht.info b/libraries/irrlicht/irrlicht.info
index 9f55453262..3466bf3de7 100644
--- a/libraries/irrlicht/irrlicht.info
+++ b/libraries/irrlicht/irrlicht.info
@@ -1,8 +1,8 @@
 PRGNAM="irrlicht"
-VERSION="1.8.1"
+VERSION="1.8.3"
 HOMEPAGE="http://irrlicht.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.1.zip"
-MD5SUM="f4f7fa33bd1060eb0dd51dcd66b0f6e3"
+DOWNLOAD="http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.3.zip"
+MD5SUM="d13dbdad9609741de02023627ee51078"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/jai-imageio/jai-imageio.SlackBuild b/libraries/jai-imageio/jai-imageio.SlackBuild
index 9997866d9a..1d76aee36a 100644
--- a/libraries/jai-imageio/jai-imageio.SlackBuild
+++ b/libraries/jai-imageio/jai-imageio.SlackBuild
@@ -57,11 +57,16 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-mkdir $PRGNAM-$VERSION
+rm -rf $SRCNAM-$SRCVER
 tar xvf $CWD/$SRCNAM-$SRCVER-lib-linux-$SRCARCH.tar.gz
 cd $SRCNAM-$SRCVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/$JAVA_HOME/jre/lib/$SRCARCH
 cp -a lib/*.so $PKG/$JAVA_HOME/jre/lib/$SRCARCH
diff --git a/libraries/jai/jai.SlackBuild b/libraries/jai/jai.SlackBuild
index 419f31d17d..d148883624 100644
--- a/libraries/jai/jai.SlackBuild
+++ b/libraries/jai/jai.SlackBuild
@@ -56,11 +56,16 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-mkdir $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER-lib-linux-$SRCARCH.tar.gz
 cd $PRGNAM-$SRCVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/$JAVA_HOME/jre/lib/$SRCARCH
 cp -a lib/*.so $PKG/$JAVA_HOME/jre/lib/$SRCARCH
diff --git a/libraries/jansson/jansson.SlackBuild b/libraries/jansson/jansson.SlackBuild
index 1076cf15a9..399022902a 100644
--- a/libraries/jansson/jansson.SlackBuild
+++ b/libraries/jansson/jansson.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jansson
 
-# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jansson
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,6 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
+  --disable-silent-rules \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/libraries/jansson/jansson.info b/libraries/jansson/jansson.info
index 8c6c8ab14f..d4d9c292ca 100644
--- a/libraries/jansson/jansson.info
+++ b/libraries/jansson/jansson.info
@@ -1,8 +1,8 @@
 PRGNAM="jansson"
-VERSION="2.6"
+VERSION="2.7"
 HOMEPAGE="http://www.digip.org/jansson/"
-DOWNLOAD="http://www.digip.org/jansson/releases/jansson-2.6.tar.bz2"
-MD5SUM="c70a52488db623a26f7213c7c6b7c878"
+DOWNLOAD="http://www.digip.org/jansson/releases/jansson-2.7.tar.bz2"
+MD5SUM="ffac352f9c5f80a6ae8145d451af2c0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/jbig2dec/jbig2dec.SlackBuild b/libraries/jbig2dec/jbig2dec.SlackBuild
index 93874c7ae9..bf0af26bb4 100644
--- a/libraries/jbig2dec/jbig2dec.SlackBuild
+++ b/libraries/jbig2dec/jbig2dec.SlackBuild
@@ -10,8 +10,11 @@
 # - Use 'make install-strip'
 # - Added 'how to edit' stuff to slack-desc
 
+# 20150915 bkw:
+# - update for v0.12
+
 PRGNAM=jbig2dec
-VERSION=${VERSION:-0.11}
+VERSION=${VERSION:-0.12}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +60,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# patch from here: http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=70c7f1967f43a94f9f0d6808d6ab5700a120d2fc
+# ...but modified to affect libpng-1.4 also.
+patch -p1 < $CWD/newlibpng.diff
+
+autoreconf -if
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/jbig2dec/jbig2dec.info b/libraries/jbig2dec/jbig2dec.info
index 323445ebfc..528a3ae29b 100644
--- a/libraries/jbig2dec/jbig2dec.info
+++ b/libraries/jbig2dec/jbig2dec.info
@@ -1,8 +1,8 @@
 PRGNAM="jbig2dec"
-VERSION="0.11"
-HOMEPAGE="http://jbig2dec.sourceforge.net/"
-DOWNLOAD="http://distfiles.gentoo.org/distfiles/jbig2dec-0.11.tar.gz"
-MD5SUM="1f61e144852c86563fee6e5ddced63f1"
+VERSION="0.12"
+HOMEPAGE="http://git.ghostscript.com/?p=jbig2dec.git;a=summary"
+DOWNLOAD="http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-0.12.tar.gz"
+MD5SUM="b73cfb55c61c6978e6539b889bdc2633"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/jbig2dec/newlibpng.diff b/libraries/jbig2dec/newlibpng.diff
new file mode 100644
index 0000000000..9c7513297f
--- /dev/null
+++ b/libraries/jbig2dec/newlibpng.diff
@@ -0,0 +1,165 @@
+*** Modified by SBo:
+*** Was: PNG_LIBPNG_VER_MINOR < 5
+*** Now: PNG_LIBPNG_VER_MINOR < 4
+From 70c7f1967f43a94f9f0d6808d6ab5700a120d2fc Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Fri, 17 Apr 2015 12:19:26 +0100
+Subject: [PATCH] Bug 695890: Update jbig2dec for modern libpng
+
+libpng 1.5.x and newer hide the internals, and only allow values to be set and
+retrieved via define API calls.
+
+Also tidy up a couple of (benign) compiler warnings.
+
+No cluster diffs.
+---
+ jbig2_arith.c      |  9 +++++++--
+ jbig2_image_pbm.c  |  2 +-
+ jbig2_image_png.c  | 23 ++++++++++++++++++-----
+ jbig2_refinement.c |  4 ++++
+ jbig2_text.c       |  2 ++
+ 5 files changed, 32 insertions(+), 8 deletions(-)
+
+diff --git a/jbig2_arith.c b/jbig2_arith.c
+index 5e6cf4c..b65022e 100644
+--- a/jbig2_arith.c
++++ b/jbig2_arith.c
+@@ -422,9 +422,14 @@ main (int argc, char **argv)
+ 
+   for (i = 0; i < 256; i++)
+     {
+-      bool D;
++#ifdef JBIG2_DEBUG_ARITH
++      bool D =
++#else
++      (void)
++#endif
++
++      jbig2_arith_decode (as, &cx);
+ 
+-      D = jbig2_arith_decode (as, &cx);
+ #ifdef JBIG2_DEBUG_ARITH
+       fprintf(stderr, "%3d: D = %d, ", i, D);
+       jbig2_arith_trace (as, cx);
+diff --git a/jbig2_image_pbm.c b/jbig2_image_pbm.c
+index 0ad7e32..49bf756 100644
+--- a/jbig2_image_pbm.c
++++ b/jbig2_image_pbm.c
+@@ -145,7 +145,7 @@ Jbig2Image *jbig2_image_read_pbm(Jbig2Ctx *ctx, FILE *in)
+     }
+     /* the pbm data is byte-aligned, so we can
+        do a simple block read */
+-    fread(image->data, 1, image->height*image->stride, in);
++    (void)fread(image->data, 1, image->height*image->stride, in);
+     if (feof(in)) {
+         fprintf(stderr, "unexpected end of pbm file.\n");
+         jbig2_image_release(ctx, image);
+diff --git a/jbig2_image_png.c b/jbig2_image_png.c
+index 6b2d9b9..1dd4e45 100644
+--- a/jbig2_image_png.c
++++ b/jbig2_image_png.c
+@@ -26,7 +26,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 4
+ #include <pngstruct.h>
++#endif
++
+ #define CVT_PTR(ptr) (ptr)
+ 
+ #include "jbig2.h"
+@@ -39,8 +43,13 @@ static void
+ jbig2_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+     png_size_t check;
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 4
++    png_FILE_p f = (png_FILE_p)png_ptr->io_ptr;
++#else
++    png_FILE_p f = (png_FILE_p)png_get_io_ptr(png_ptr);
++#endif
+ 
+-    check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
++    check = fwrite(data, 1, length, f);
+     if (check != length) {
+       png_error(png_ptr, "Write Error");
+     }
+@@ -49,10 +58,14 @@ jbig2_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ static void
+ jbig2_png_flush(png_structp png_ptr)
+ {
+-    png_FILE_p io_ptr;
+-    io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+-    if (io_ptr != NULL)
+-        fflush(io_ptr);
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 4
++    png_FILE_p f = (png_FILE_p)png_ptr->io_ptr;
++#else
++    png_FILE_p f = (png_FILE_p)png_get_io_ptr(png_ptr);
++#endif
++
++    if (f != NULL)
++        fflush(f);
+ }
+ 
+ int jbig2_image_write_png_file(Jbig2Image *image, char *filename)
+diff --git a/jbig2_refinement.c b/jbig2_refinement.c
+index 31b0bfe..b456173 100644
+--- a/jbig2_refinement.c
++++ b/jbig2_refinement.c
+@@ -38,6 +38,7 @@
+ #include "jbig2_generic.h"
+ #include "jbig2_image.h"
+ 
++#if 0 /* currently not used */
+ static int
+ jbig2_decode_refinement_template0(Jbig2Ctx *ctx,
+                               Jbig2Segment *segment,
+@@ -49,6 +50,7 @@ jbig2_decode_refinement_template0(Jbig2Ctx *ctx,
+   return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+     "refinement region template 0 NYI");
+ }
++#endif
+ 
+ static int
+ jbig2_decode_refinement_template0_unopt(Jbig2Ctx *ctx,
+@@ -159,6 +161,7 @@ jbig2_decode_refinement_template1_unopt(Jbig2Ctx *ctx,
+   return 0;
+ }
+ 
++#if 0 /* currently not used */
+ static int
+ jbig2_decode_refinement_template1(Jbig2Ctx *ctx,
+                               Jbig2Segment *segment,
+@@ -241,6 +244,7 @@ jbig2_decode_refinement_template1(Jbig2Ctx *ctx,
+   return 0;
+ 
+ }
++#endif
+ 
+ 
+ typedef uint32_t (*ContextBuilder)(const Jbig2RefinementRegionParams *,
+diff --git a/jbig2_text.c b/jbig2_text.c
+index 5c9df26..3fdd3a5 100644
+--- a/jbig2_text.c
++++ b/jbig2_text.c
+@@ -412,6 +412,7 @@ cleanup1:
+ 		case JBIG2_CORNER_TOPLEFT: x = S; y = T; break;
+ 		case JBIG2_CORNER_TOPRIGHT: x = S - IB->width + 1; y = T; break;
+ 		case JBIG2_CORNER_BOTTOMLEFT: x = S; y = T - IB->height + 1; break;
++		default:
+ 		case JBIG2_CORNER_BOTTOMRIGHT: x = S - IB->width + 1; y = T - IB->height + 1; break;
+ 		}
+ 	    } else { /* TRANSPOSED */
+@@ -419,6 +420,7 @@ cleanup1:
+ 		case JBIG2_CORNER_TOPLEFT: x = T; y = S; break;
+ 		case JBIG2_CORNER_TOPRIGHT: x = T - IB->width + 1; y = S; break;
+ 		case JBIG2_CORNER_BOTTOMLEFT: x = T; y = S - IB->height + 1; break;
++		default:
+ 		case JBIG2_CORNER_BOTTOMRIGHT: x = T - IB->width + 1; y = S - IB->height + 1; break;
+ 		}
+ 	    }
+-- 
+2.5.1
+
diff --git a/libraries/jcal/README b/libraries/jcal/README
new file mode 100644
index 0000000000..c4344cb32c
--- /dev/null
+++ b/libraries/jcal/README
@@ -0,0 +1,9 @@
+|-----handy-ruler------------------------------------------------------|
+Jalali calendar is a small and portable free software library to
+manipulate date and time in Jalali calendar system. It's written in C
+Jalali calendar provides an API similar to that of libc's timezone, date
+and time functions.
+
+Jalali calendar package consists of a library namely libjalali and two
+simple and easy to use terminal tools, jcal and jdate with functionality
+similar to UNIX cal and date.
diff --git a/libraries/jcal/jcal.SlackBuild b/libraries/jcal/jcal.SlackBuild
new file mode 100644
index 0000000000..badb9cb880
--- /dev/null
+++ b/libraries/jcal/jcal.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for jcal
+
+# Copyright Mohammad Etemaddar Iran
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=jcal
+VERSION=${VERSION:-0.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL README TODO NEWS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/jcal/jcal.info b/libraries/jcal/jcal.info
new file mode 100644
index 0000000000..7de1be1e2c
--- /dev/null
+++ b/libraries/jcal/jcal.info
@@ -0,0 +1,10 @@
+PRGNAM="jcal"
+VERSION="0.4.1"
+HOMEPAGE="http://www.nongnu.org/jcal/"
+DOWNLOAD="http://download.savannah.gnu.org/releases/jcal/jcal-0.4.1.tar.gz"
+MD5SUM="d4f94ee612494cd0ab0cf1f537aaa33b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Mohammad Etemaddar"
+EMAIL="mohammad.etemaddar@gmail.com"
diff --git a/libraries/jcal/slack-desc b/libraries/jcal/slack-desc
new file mode 100644
index 0000000000..8609835e39
--- /dev/null
+++ b/libraries/jcal/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+jcal: jcal (Jalali calender)
+jcal:
+jcal:
+jcal: Jalali calendar is a small and portable free software library to
+jcal: manipulate date and time in Jalali calendar system. It provides API
+jcal: similar to that of libc's timezone, date and time functions.
+jcal:
+jcal: Home Page: http://www.nongnu.org/jcal/
+jcal:
+jcal:
+jcal:
diff --git a/libraries/jreen/README b/libraries/jreen/README
new file mode 100644
index 0000000000..28c13e6aa9
--- /dev/null
+++ b/libraries/jreen/README
@@ -0,0 +1,3 @@
+Jreen is extensible Qt-based asynchronious Jabber library
+
+Speex is an optional, but recommended dependency
diff --git a/libraries/jreen/jreen.SlackBuild b/libraries/jreen/jreen.SlackBuild
new file mode 100644
index 0000000000..5d360a1879
--- /dev/null
+++ b/libraries/jreen/jreen.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for jreen
+
+# Copyright 2015 Thorn Inurcide thorn-inurcide@yandex.com USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PRGNAM=jreen
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DJREEN_FORCE_QT4="on" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -Wno-dev ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog* COPYING README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/jreen/jreen.info b/libraries/jreen/jreen.info
new file mode 100644
index 0000000000..4788c8de58
--- /dev/null
+++ b/libraries/jreen/jreen.info
@@ -0,0 +1,10 @@
+PRGNAM="jreen"
+VERSION="1.2.1"
+HOMEPAGE="https://github.com/euroelessar/jreen"
+DOWNLOAD="https://github.com/euroelessar/jreen/archive/v1.2.1.tar.gz"
+MD5SUM="1a3efb4fd236b0abc97c885347cb2ee7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libgsasl"
+MAINTAINER="Thorn Inurcide"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/libraries/jreen/slack-desc b/libraries/jreen/slack-desc
new file mode 100644
index 0000000000..5e3e559414
--- /dev/null
+++ b/libraries/jreen/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+jreen: jreen (Extensible Qt-based asynchronious Jabber library)
+jreen:
+jreen: Jreen is extensible Qt-based asynchronious Jabber library
+jreen:
+jreen:
+jreen:
+jreen:
+jreen:
+jreen:
+jreen:
+jreen: Home: https://github.com/euroelessar/jreen
diff --git a/libraries/jsoncpp/jsoncpp.SlackBuild b/libraries/jsoncpp/jsoncpp.SlackBuild
index 21aa3146a9..11fe74a521 100644
--- a/libraries/jsoncpp/jsoncpp.SlackBuild
+++ b/libraries/jsoncpp/jsoncpp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jsoncpp
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,13 +73,14 @@ mkdir -p build
 cd build
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
-    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON \
-    -DJSONCPP_LIB_BUILD_SHARED:BOOL=ON \
-    -DJSONCPP_LIB_BUILD_STATIC:BOOL=OFF \
+    -DBUILD_STATIC_LIBS:BOOL=OFF \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
     -DJSONCPP_WITH_TESTS:BOOL=OFF \
+    -DINCLUDE_INSTALL_DIR=/usr/include/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release ..
 
   make VERBOSE=1
@@ -89,10 +90,6 @@ cd -
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Move incude directory because it conflicts with json-c.
-# This is how Arch, Fedora, Ubuntu and Gentoo do it.
-[ -d $PKG/usr/include/json ] && mv $PKG/usr/include/json $PKG/usr/include/$PRGNAM
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS LICENSE NEWS.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/jsoncpp/jsoncpp.info b/libraries/jsoncpp/jsoncpp.info
index ef793196d1..85be13d115 100644
--- a/libraries/jsoncpp/jsoncpp.info
+++ b/libraries/jsoncpp/jsoncpp.info
@@ -1,8 +1,8 @@
 PRGNAM="jsoncpp"
-VERSION="1.6.2"
+VERSION="1.6.5"
 HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.6.2.tar.gz"
-MD5SUM="5a62da8b5c5b0e46a0e782e7363aee3d"
+DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.6.5.tar.gz"
+MD5SUM="2bb16bb8d2b867acbdd71d1855062a89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/lapack/lapack.SlackBuild b/libraries/lapack/lapack.SlackBuild
index 44526623f0..32086868dd 100644
--- a/libraries/lapack/lapack.SlackBuild
+++ b/libraries/lapack/lapack.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LAPACK
 
-# Copyright 2014-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2014-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lapack
-VERSION=${VERSION:-3.5.0}
-BUILD=${BUILD:-2}
+SRCNAM=lapack
+VERSION=${VERSION:-3.6.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,20 +41,16 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE README"
+DOCS="LICENSE README DOCS/lapack.png DOCS/lawn81.tex DOCS/org2.ps"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -61,38 +58,37 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# `make install` compiles and installs tmglib, along with many extra tests,
-# so install files manually instead.
-#
-# Avoid adding an RPATH entry to the shared lib.  It's unnecessary, and
-# since we're not running `make install` we don't want to end up with
-# a temporary RPATH that refers to the build directory.
-#
-# WARNING:  The SONAME is "liblapack.so", not "liblapack.so.0" nor
-# "liblapack.so.$MAJOR" as crafted in previous versions of this script.
-# I don't know if this is intentional or an omission by upstream.
+# Fix lots of bugs with the cmake build system and .pc files.
+# More importantly, allow building only the LAPACK component.
+patch -p1 < $CWD/patches/generate-pkgconfig.diff
+patch -p1 < $CWD/patches/link-dependencies.diff
+patch -p1 < $CWD/patches/target-cleanup.diff
+patch -p1 < $CWD/patches/cmake-piecewise.diff
+
+# Avoid adding an RPATH entry to the shared lib.  It's unnecessary (except for
+# running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX).
 mkdir -p shared
 cd shared
   cmake \
     -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_RULE_MESSAGES=OFF \
     -DCMAKE_VERBOSE_MAKEFILE=TRUE \
     -DUSE_OPTIMIZED_BLAS=ON \
+    -DBUILD_LAPACK=ON \
+    -DBUILD_TESTING=OFF \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_SKIP_RPATH=YES \
     ..
-  make lapack/fast
-  install -D -m0755 -s lib/liblapack.so $PKG/usr/lib${LIBDIRSUFFIX}/liblapack.so
-  install -D -m0644 lapack.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/lapack.pc
+  make
+  make install/strip DESTDIR=$PKG
 cd ..
 
 # cmake doesn't appear to let us build both shared and static libs
@@ -103,36 +99,31 @@ cd static
   cmake \
     -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_RULE_MESSAGES=OFF \
     -DCMAKE_VERBOSE_MAKEFILE=TRUE \
     -DUSE_OPTIMIZED_BLAS=ON \
+    -DBUILD_LAPACK=ON \
+    -DBUILD_TESTING=OFF \
     ..
-  make lapack/fast
-  install -D -m0644 lib/liblapack.a $PKG/usr/lib${LIBDIRSUFFIX}/liblapack.a
+  make
+  make install/strip DESTDIR=$PKG
 cd ..
 
-# Fix the pkg-config file:
-# 1.  Version is wrong.
-# 2.  -L is hard-coded when a variable exists.
-sed -i \
-  -e "/^Version:/cVersion: ${VERSION}" \
-  -e "/^Libs:/s/-L[^ ]*/-L\${libdir}/" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/lapack.pc
-
 # Generate man pages.  Also requires some fix-ups:
-# 1.  Version is wrong.
-# 2.  Only generate on the LAPACK sources.
+# 0.  Join all escaped newlines so the entire value is replaced.
+# 1.  Only generate on the LAPACK sources.
+# 2.  Turn off recursion.  Only operate on directories in INPUT.
 # 3.  Turn off some repetitive comments.
 # 4.  Turn off HAVE_DOT.  Graphs are unnecessary for this purpose.
 # 5.  Turn off MAN_LINKS.  See below.
 sed -i \
-  -e "s/^\(PROJECT_NUMBER *=\).*/\1 ${VERSION}/" \
-  -e "s/^\(INPUT *=\).*/\1 SRC/" \
-  -e "s/^\(REPEAT_BRIEF *=\).*/\1 NO/" \
-  -e "s/^\(HAVE_DOT *=\).*/\1 NO/" \
-  -e "s/^\(MAN_LINKS *=\).*/\1 NO/" \
+  -e ':a;/\\$/N;s/\\\n//;ta' \
+  -e 's/^\(INPUT *=\).*/\1 SRC/' \
+  -e 's/^\(RECURSIVE *=\).*/\1 NO/' \
+  -e 's/^\(REPEAT_BRIEF *=\).*/\1 NO/' \
+  -e 's/^\(HAVE_DOT *=\).*/\1 NO/' \
+  -e 's/^\(MAN_LINKS *=\).*/\1 NO/' \
   DOCS/Doxyfile_man
 doxygen DOCS/Doxyfile_man
 # Doxygen generates manpages on a file-by-file basis (note the .f extensions).
@@ -154,7 +145,7 @@ ln -s dladiv.3.gz $PKG/usr/man/man3/dladiv2.3.gz
 # select few.  Some are duplicated by BLAS (lsame.f), by LAPACK (ilaver.f),
 # are unused (slamchf77.f, dlamchf77.f), or are test programs.
 rm -rf DOCS/man
-sed -i "s/^\(INPUT *=\).*/\1 INSTALL/" DOCS/Doxyfile_man
+sed -i 's/^\(INPUT *=\).*/\1 INSTALL/' DOCS/Doxyfile_man
 doxygen DOCS/Doxyfile_man
 gzip -9c DOCS/man/man3/slamch.f.3 > $PKG/usr/man/man3/slamch.3.gz
 gzip -9c DOCS/man/man3/dlamch.f.3 > $PKG/usr/man/man3/dlamch.3.gz
diff --git a/libraries/lapack/lapack.info b/libraries/lapack/lapack.info
index 2f9db3866e..35489b8e23 100644
--- a/libraries/lapack/lapack.info
+++ b/libraries/lapack/lapack.info
@@ -1,8 +1,8 @@
 PRGNAM="lapack"
-VERSION="3.5.0"
+VERSION="3.6.0"
 HOMEPAGE="http://www.netlib.org/lapack/"
-DOWNLOAD="http://www.netlib.org/lapack/lapack-3.5.0.tgz"
-MD5SUM="b1d3e3e425b2e44a06760ff173104bdf"
+DOWNLOAD="http://www.netlib.org/lapack/lapack-3.6.0.tgz"
+MD5SUM="f2f6c67134e851fe189bb3ca1fbb5101"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas"
diff --git a/libraries/lapack/patches/cmake-piecewise.diff b/libraries/lapack/patches/cmake-piecewise.diff
new file mode 100644
index 0000000000..13402a52e7
--- /dev/null
+++ b/libraries/lapack/patches/cmake-piecewise.diff
@@ -0,0 +1,615 @@
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ message(STATUS "CBLAS enable")
+ enable_language(C)
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
+-
+ # Create a header file cblas.h for the routines called in my C programs
+ include(FortranCInterface)
+ FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/cblas_mangling.h 
+@@ -40,51 +38,8 @@
+    add_subdirectory(examples)
+ endif(BUILD_TESTING)
+ 
+-if(NOT BLAS_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-endif(NOT BLAS_FOUND)
+-
+-# Export cblas targets from the
+-# install tree, if any.
+-set(_cblas_config_install_guard_target "")
+-if(ALL_TARGETS)
+-  install(EXPORT cblas-targets
+-    DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
+-  # Choose one of the cblas targets to use as a guard for
+-  # cblas-config.cmake to load targets from the install tree.
+-  list(GET ALL_TARGETS 0 _cblas_config_install_guard_target)
+-endif()
+-
+-# Export cblas targets from the build tree, if any.
+-set(_cblas_config_build_guard_target "")
+-if(ALL_TARGETS)
+-  export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake)
+-
+-  # Choose one of the cblas targets to use as a guard
+-  # for cblas-config.cmake to load targets from the build tree.
+-  list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
+-endif()
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
+-  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+-
+-
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+    )
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
+-install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake
+-  ${LAPACK_BINARY_DIR}/cblas-config-version.cmake
+-  DESTINATION lib/cmake/cblas-${LAPACK_VERSION}
+-  )
+-
+-#install(EXPORT cblas-targets
+-#  DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
+-
+diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-build.cmake.in
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "@LAPACK_BINARY_DIR@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapack targets from the build tree, including lapacke targets.
+-if(NOT TARGET lapacke)
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-
+-# Report lapacke header search locations.
+-set(CBLAS_INCLUDE_DIRS "@LAPACK_SOURCE_DIR@/cblas/include")
+-
+-# Report lapacke libraries.
+-set(CBLAS_LIBRARIES cblas)
+diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-install.cmake.in
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake
+-get_filename_component(_CBLAS_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_SELF_DIR}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
+-get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH)
+-
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "${_CBLAS_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapacke targets from the install tree.
+-if(NOT TARGET cblas)
+-  include(${_CBLAS_SELF_DIR}/cblas-targets.cmake)
+-endif()
+-
+-# Report lapacke header search locations.
+-set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include)
+-
+-# Report lapacke libraries.
+-set(CBLAS_LIBRARIES cblas)
+-
+-unset(_CBLAS_PREFIX)
+-unset(_CBLAS_SELF_DIR)
+diff --git a/CBLAS/cmake/cblas-config-version.cmake.in b/CBLAS/cmake/cblas-config-version.cmake.in
+deleted file mode 100644
+--- a/CBLAS/cmake/cblas-config-version.cmake.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-set(PACKAGE_VERSION "@LAPACK_VERSION@")
+-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+-  set(PACKAGE_VERSION_COMPATIBLE 1)
+-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+-    set(PACKAGE_VERSION_EXACT 1)
+-  endif()
+-endif()
+-
+diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in
+deleted file mode 100644
+--- a/CMAKE/lapack-config-build.cmake.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-# Load lapack targets from the build tree if necessary.
+-set(_LAPACK_TARGET "@_lapack_config_build_guard_target@")
+-if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-unset(_LAPACK_TARGET)
+-
+-# Report the blas and lapack raw or imported libraries.
+-set(LAPACK_blas_LIBRARIES "@BLAS_LIBRARIES@")
+-set(LAPACK_lapack_LIBRARIES "@LAPACK_LIBRARIES@")
+diff --git a/CMAKE/lapack-config-install.cmake.in b/CMAKE/lapack-config-install.cmake.in
+deleted file mode 100644
+--- a/CMAKE/lapack-config-install.cmake.in
++++ /dev/null
+@@ -1,15 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapack-<v>/<self>.cmake
+-get_filename_component(_LAPACK_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-
+-# Load lapack targets from the install tree if necessary.
+-set(_LAPACK_TARGET "@_lapack_config_install_guard_target@")
+-if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}")
+-  include("${_LAPACK_SELF_DIR}/lapack-targets.cmake")
+-endif()
+-unset(_LAPACK_TARGET)
+-
+-# Report the blas and lapack raw or imported libraries.
+-set(LAPACK_blas_LIBRARIES "@BLAS_LIBRARIES@")
+-set(LAPACK_lapack_LIBRARIES "@LAPACK_LIBRARIES@")
+-
+-unset(_LAPACK_SELF_DIR)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,8 +55,6 @@
+ endif()
+ # --------------------------------------------------
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+-
+ if (UNIX)
+   include(GNUInstallDirs)
+   set(ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
+@@ -70,7 +68,6 @@
+ 
+ macro(lapack_install_library lib)
+   install(TARGETS ${lib}
+-    EXPORT ${LAPACK_INSTALL_EXPORT_NAME}
+     ARCHIVE DESTINATION ${ARCHIVE_DIR}
+     LIBRARY DESTINATION ${LIBRARY_DIR}
+     RUNTIME DESTINATION ${RUNTIME_DIR}
+@@ -96,20 +93,6 @@
+ include( CheckLAPACKCompilerFlags )
+ CheckLAPACKCompilerFlags()
+ 
+-# --------------------------------------------------
+-# Check second function
+-
+-include(CheckTimeFunction)
+-set(TIME_FUNC NONE ${TIME_FUNC})
+-CHECK_TIME_FUNCTION(NONE TIME_FUNC)
+-CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
+-CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
+-CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
+-CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
+-message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
+-
+-set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
+-set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
+ 
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+@@ -120,6 +103,11 @@
+ endif()
+ 
+ # --------------------------------------------------
++# By default static library
++option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
++option(BUILD_STATIC_LIBS "Build static libraries" ON)
++
++# --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
+ option(BUILD_SINGLE "Build Single Precision" ON)
+@@ -150,236 +138,134 @@
+     Please enable at least one of these: BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
+ endif()
+ 
+-# --------------------------------------------------
+-# Subdirectories that need to be processed
++# deprecated LAPACK routines
++option(BUILD_DEPRECATED "Build deprecated routines" OFF)
+ 
++# --------------------------------------------------
++# BLAS
+ option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
+-
++option(BUILD_BLAS "Build BLAS" OFF)
+ 
+ # Check the usage of the user provided BLAS libraries
+ if(BLAS_LIBRARIES)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
+   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
+-  unset( CMAKE_REQUIRED_LIBRARIES )
++  unset(CMAKE_REQUIRED_LIBRARIES)
+   if(BLAS_FOUND)
+     message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
+-  else(BLAS_FOUND)
+-    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
+-    message(ERROR "-->     Will use REFERENCE BLAS (by default)")
+-    message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
+-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
+-  endif(BLAS_FOUND)
++  else()
++    message(SEND_ERROR "--> BLAS supplied by user is NOT WORKING, cannot use ${BLAS_LIBRARIES}.")
++  endif()
+ 
+ # User did not provide a BLAS Library but specified to search for one
+-elseif( USE_OPTIMIZED_BLAS )
+-  find_package( BLAS )
+-endif (BLAS_LIBRARIES)
++elseif(USE_OPTIMIZED_BLAS)
++  find_package(BLAS)
+ 
+-# Neither user specified or optimized BLAS libraries can be used
+-if(NOT BLAS_FOUND)
+-  message(STATUS "Using supplied NETLIB BLAS implementation")
+-  add_subdirectory(BLAS)
+-  set( BLAS_LIBRARIES blas )
+-else()
+-  set( CMAKE_EXE_LINKER_FLAGS 
+-    "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for executables" FORCE)
+-  set( CMAKE_MODULE_LINKER_FLAGS 
+-    "${CMAKE_MODULE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for modules" FORCE)
+-  set( CMAKE_SHARED_LINKER_FLAGS 
+-    "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for shared libs" FORCE)
+-endif( NOT BLAS_FOUND )
++elseif(BUILD_BLAS)
++  set(BLAS_LIBRARIES blas)
++  set(BLAS_FOUND TRUE)
+ 
++  add_subdirectory(BLAS)
++endif()
+ 
+ # --------------------------------------------------
+ # CBLAS
+-option(CBLAS "Build CBLAS" OFF)
++option(BUILD_CBLAS "Build CBLAS" OFF)
+ 
+-if(CBLAS)
++if(BUILD_CBLAS)
++  set(NEED_BLAS TRUE)
+   add_subdirectory(CBLAS)
+-endif(CBLAS)
++endif(BUILD_CBLAS)
+ 
+ # --------------------------------------------------
+ # XBLAS
+-
+ option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
+-if (USE_XBLAS)
++
++if(USE_XBLAS)
+   find_library(XBLAS_LIBRARY NAMES xblas)
+ endif(USE_XBLAS)
+-   
+-option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
+ 
+ # --------------------------------------------------
+ # LAPACK
+-# User did not provide a LAPACK Library but specified to search for one
+-if( USE_OPTIMIZED_LAPACK )
+-  find_package( LAPACK )
+-endif (USE_OPTIMIZED_LAPACK)
++option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
++option(BUILD_LAPACK "Build LAPACK" OFF)
+ 
+ # Check the usage of the user provided or automatically found LAPACK libraries
+ if(LAPACK_LIBRARIES)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
+   # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
+-  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)
+-  unset( CMAKE_REQUIRED_LIBRARIES )
+-  if(LATESTLAPACK_FOUND)
++  CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LAPACK_FOUND)
++  unset(CMAKE_REQUIRED_LIBRARIES)
++  if(LAPACK_FOUND)
+     message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
+-  else(LAPACK_FOUND)
+-    message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, 	CANNOT USE ${LAPACK_LIBRARIES}.")
+-    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
+-    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
+-    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
+-  endif(LATESTLAPACK_FOUND)
+-endif (LAPACK_LIBRARIES)
++  else()
++    message(SEND_ERROR "--> LAPACK supplied by user is NOT WORKING or is older than LAPACK 3.4.0, cannot use ${LAPACK_LIBRARIES}.")
++  endif()
++
++# User did not provide a LAPACK Library but specified to search for one
++elseif(USE_OPTIMIZED_LAPACK)
++  find_package(LAPACK)
++
++elseif(BUILD_LAPACK)
++  set(LAPACK_LIBRARIES lapack)
++  set(LAPACK_FOUND TRUE)
++
++  set(NEED_BLAS TRUE)
++
++  # Check second function
++  include(CheckTimeFunction)
++  set(TIME_FUNC NONE ${TIME_FUNC})
++  CHECK_TIME_FUNCTION(NONE TIME_FUNC)
++  CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
++  CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)
++  CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
++  CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
++  message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
++
++  set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
++  set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ 
+-# Neither user specified or optimized LAPACK libraries can be used
+-if(NOT LATESTLAPACK_FOUND)
+-  message(STATUS "Using supplied NETLIB LAPACK implementation")
+-  set( LAPACK_LIBRARIES lapack )
+   add_subdirectory(SRC)
+-else()
+-  set( CMAKE_EXE_LINKER_FLAGS 
+-    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for executables" FORCE)
+-  set( CMAKE_MODULE_LINKER_FLAGS 
+-    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for modules" FORCE)
+-  set( CMAKE_SHARED_LINKER_FLAGS 
+-    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
+-    CACHE STRING "Linker flags for shared libs" FORCE)
+-endif( NOT LATESTLAPACK_FOUND )
+-
+-message(STATUS "BUILD TESTING : ${BUILD_TESTING}" )
+-if(BUILD_TESTING)
+-  add_subdirectory(TESTING)
+-endif(BUILD_TESTING)
+ 
+-# deprecated LAPACK routines
+-option(BUILD_DEPRECATED "Build deprecated routines" OFF)
++  message(STATUS "BUILD TESTING : ${BUILD_TESTING}")
++  if(BUILD_TESTING)
++    add_subdirectory(TESTING)
++  endif()
++
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++    install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++    DESTINATION ${PKG_CONFIG_DIR})
++endif()
+ 
+ # --------------------------------------------------
+ # LAPACKE
+-option(LAPACKE "Build LAPACKE" OFF)
++option(BUILD_LAPACKE "Build LAPACKE" OFF)
+ 
+ # LAPACKE has also the interface to some routines from tmglib,
+ # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+ option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
+ if (LAPACKE_WITH_TMG)
+-  set(LAPACKE ON)
++  set(BUILD_LAPACKE ON)
+   if(NOT BUILD_TESTING)
+      add_subdirectory(TESTING/MATGEN)
+    endif(NOT BUILD_TESTING)
+ endif(LAPACKE_WITH_TMG)
+ 
+-if(LAPACKE)
++if(BUILD_LAPACKE)
++  set(NEED_LAPACK TRUE)
+   add_subdirectory(LAPACKE)
+-endif(LAPACKE)
+-
+-# --------------------------------------------------
+-# CPACK Packaging 
+-
+-SET(CPACK_PACKAGE_NAME "LAPACK")
+-SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")
+-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LAPACK- Linear Algebra Package")
+-set(CPACK_PACKAGE_VERSION_MAJOR 3)
+-set(CPACK_PACKAGE_VERSION_MINOR 5)
+-set(CPACK_PACKAGE_VERSION_PATCH 0)
+-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LAPACK")
+-IF(WIN32 AND NOT UNIX)
+-  # There is a bug in NSI that does not handle full unix paths properly. Make
+-  # sure there is at least one set of four (4) backlasshes.
+-  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\http://icl.cs.utk.edu/lapack-forum")
+-  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.netlib.org/lapack")
+-  SET(CPACK_NSIS_CONTACT "lapack@eecs.utk.edu")
+-  SET(CPACK_NSIS_MODIFY_PATH ON)
+-  SET(CPACK_NSIS_DISPLAY_NAME "LAPACK-${LAPACK_VERSION}")
+-  set(CPACK_PACKAGE_RELOCATABLE "true")
+-ELSE(WIN32 AND NOT UNIX)
+-  SET(CPACK_GENERATOR "TGZ")
+-  SET(CPACK_SOURCE_GENERATOR TGZ)
+-  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lapack-${LAPACK_VERSION}" )
+-  SET(CPACK_SOURCE_IGNORE_FILES ~$ .svn ${CPACK_SOURCE_IGNORE_FILES} )
+-ENDIF(WIN32 AND NOT UNIX)
+-INCLUDE(CPack)
++endif(BUILD_LAPACKE)
+ 
+ 
+-# --------------------------------------------------
+-# By default static library
+-OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF )
+-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
+-#OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
+-
+-if(NOT BLAS_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} blas)
+-endif(NOT BLAS_FOUND)
+-
+-if(NOT LATESTLAPACK_FOUND)
+-  set(ALL_TARGETS ${ALL_TARGETS} lapack)
+-endif(NOT LATESTLAPACK_FOUND)
+-
+-if(BUILD_TESTING OR LAPACKE_WITH_TMG)
+-  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+-endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
+-
+-# Export lapack targets, not including lapacke, from the
+-# install tree, if any.
+-set(_lapack_config_install_guard_target "")
+-if(ALL_TARGETS)
+-  install(EXPORT lapack-targets
+-    DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION})
+-
+-  # Choose one of the lapack targets to use as a guard for
+-  # lapack-config.cmake to load targets from the install tree.
+-  list(GET ALL_TARGETS 0 _lapack_config_install_guard_target)
++# Neither user specified or optimized BLAS libraries can be used
++if(NEED_BLAS AND NOT BLAS_FOUND)
++  message(FATAL_ERROR "--> No BLAS library found.  Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.")
+ endif()
+ 
+-# Include cblas in targets exported from the build tree.
+-if(CBLAS)
+-  set(ALL_TARGETS ${ALL_TARGETS} cblas)
+-endif(CBLAS)
+-
+-# Include lapacke in targets exported from the build tree.
+-if(LAPACKE)
+-  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+-endif(LAPACKE)
+-
+-# Export lapack and lapacke targets from the build tree, if any.
+-set(_lapack_config_build_guard_target "")
+-if(ALL_TARGETS)
+-  export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
+-
+-  # Choose one of the lapack or lapacke targets to use as a guard
+-  # for lapack-config.cmake to load targets from the build tree.
+-  list(GET ALL_TARGETS 0 _lapack_config_build_guard_target)
++# Neither user specified or optimized LAPACK libraries can be used
++if(NEED_LAPACK AND NOT LAPACK_FOUND)
++  message(FATAL_ERROR "--> No LAPACK library found.  Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.")
+ endif()
+-
+-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+-
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+-  install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+-  DESTINATION ${PKG_CONFIG_DIR}
+-   )
+-
+-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+-
+-include(CMakePackageConfigHelpers)
+-write_basic_package_version_file(
+-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  VERSION ${LAPACK_VERSION}
+-  COMPATIBILITY SameMajorVersion
+-  )
+-
+-install(FILES
+-  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
+-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+-  DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION}
+-  )
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ message(STATUS "LAPACKE enable")
+ enable_language(C)
+ 
+-set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
+-
+ # Create a header file netlib.h for the routines called in my C programs
+ include(FortranCInterface)
+ FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/lapacke_mangling.h 
+@@ -74,19 +72,3 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+    )
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in
+-  ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY)
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY)
+-install(FILES
+-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake
+-  ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake
+-  DESTINATION lib/cmake/lapacke-${LAPACK_VERSION}
+-  )
+-
+-install(EXPORT lapacke-targets
+-  DESTINATION lib/cmake/lapacke-${LAPACK_VERSION})
+diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-build.cmake.in
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "@LAPACK_BINARY_DIR@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapack targets from the build tree, including lapacke targets.
+-if(NOT TARGET lapacke)
+-  include("@LAPACK_BINARY_DIR@/lapack-targets.cmake")
+-endif()
+-
+-# Report lapacke header search locations.
+-set(LAPACKE_INCLUDE_DIRS "@LAPACK_SOURCE_DIR@/lapacke/include")
+-
+-# Report lapacke libraries.
+-set(LAPACKE_LIBRARIES lapacke)
+diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-install.cmake.in
++++ /dev/null
+@@ -1,23 +0,0 @@
+-# Compute locations from <prefix>/lib/cmake/lapacke-<v>/<self>.cmake
+-get_filename_component(_LAPACKE_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_SELF_DIR}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
+-get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH)
+-
+-# Load the LAPACK package with which we were built.
+-set(LAPACK_DIR "${_LAPACKE_PREFIX}/lib/cmake/lapack-@LAPACK_VERSION@")
+-find_package(LAPACK NO_MODULE)
+-
+-# Load lapacke targets from the install tree.
+-if(NOT TARGET lapacke)
+-  include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake)
+-endif()
+-
+-# Report lapacke header search locations.
+-set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include)
+-
+-# Report lapacke libraries.
+-set(LAPACKE_LIBRARIES lapacke)
+-
+-unset(_LAPACKE_PREFIX)
+-unset(_LAPACKE_SELF_DIR)
+diff --git a/LAPACKE/cmake/lapacke-config-version.cmake.in b/LAPACKE/cmake/lapacke-config-version.cmake.in
+deleted file mode 100644
+--- a/LAPACKE/cmake/lapacke-config-version.cmake.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-set(PACKAGE_VERSION "@LAPACK_VERSION@")
+-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+-  set(PACKAGE_VERSION_COMPATIBLE 1)
+-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+-    set(PACKAGE_VERSION_EXACT 1)
+-  endif()
+-endif()
+-
diff --git a/libraries/lapack/patches/generate-pkgconfig.diff b/libraries/lapack/patches/generate-pkgconfig.diff
new file mode 100644
index 0000000000..f481ab8085
--- /dev/null
+++ b/libraries/lapack/patches/generate-pkgconfig.diff
@@ -0,0 +1,117 @@
+diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
+--- a/BLAS/CMakeLists.txt
++++ b/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: blas
++Name: BLAS
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapacke
+-Description: C Standard Interface to BLAS Linear Algebra PACKage
++Name: CBLAS
++Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+ Version: @LAPACK_VERSION@
+-URL: http://www.netlib.org/lapack/
++URL: http://www.netlib.org/blas/#_cblas
+ Libs: -L${libdir} -lcblas
+ Requires: blas
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,6 +112,13 @@
+ set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+ set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
+ 
++set(prefix ${CMAKE_INSTALL_PREFIX})
++if(NOT IS_ABSOLUTE ${LIBRARY_DIR})
++  set(libdir "\${prefix}/${LIBRARY_DIR}")
++else()
++  set(libdir "${LIBRARY_DIR}")
++endif()
++
+ # --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
+@@ -333,7 +340,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapacke
++Name: LAPACKE
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+ Version: @LAPACK_VERSION@
+-URL: http://www.netlib.org/lapack/
++URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
+ Libs: -L${libdir} -llapacke
+ Requires: lapack blas
+diff --git a/lapack.pc.in b/lapack.pc.in
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ libdir=@libdir@
+ 
+-Name: lapack
++Name: LAPACK
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/
diff --git a/libraries/lapack/patches/link-dependencies.diff b/libraries/lapack/patches/link-dependencies.diff
new file mode 100644
index 0000000000..31a2bcc642
--- /dev/null
+++ b/libraries/lapack/patches/link-dependencies.diff
@@ -0,0 +1,232 @@
+diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -137,13 +137,9 @@
+   
+   
+ add_library(blas ${ALLOBJ})
+-#if(UNIX)
+-#  target_link_libraries(blas m)
+-#endif()
+ set_target_properties(
+   blas PROPERTIES
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+-target_link_libraries(blas)
+ lapack_install_library(blas)
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -6,4 +6,3 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/
+ Libs: -L${libdir} -lblas
+-Libs.private: -lm
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/blas/#_cblas
+ Libs: -L${libdir} -lcblas
+-Requires: blas
++Requires.private: blas
+diff --git a/CBLAS/examples/CMakeLists.txt b/CBLAS/examples/CMakeLists.txt
+--- a/CBLAS/examples/CMakeLists.txt
++++ b/CBLAS/examples/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ add_executable(xexample1_CBLAS cblas_example1.c )
+ add_executable(xexample2_CBLAS cblas_example2.c )
+ 
+-target_link_libraries(xexample1_CBLAS cblas ${BLAS_LIBRARIES})
+-target_link_libraries(xexample2_CBLAS cblas ${BLAS_LIBRARIES})
++target_link_libraries(xexample1_CBLAS cblas)
++target_link_libraries(xexample2_CBLAS cblas)
+ 
+ add_test(example1_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample1_CBLAS)
+ add_test(example2_CBLAS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample2_CBLAS)
+diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
+--- a/CBLAS/src/CMakeLists.txt
++++ b/CBLAS/src/CMakeLists.txt
+@@ -164,5 +164,9 @@
+ endif(CBLAS_COMPLEX16)
+ 
+ add_library(cblas ${ALLOBJ})
+-target_link_libraries(cblas ${BLAS_LIBRARIES} )
++target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
++set_target_properties(
++  cblas PROPERTIES
++  LINKER_LANGUAGE C
++  )
+ lapack_install_library(cblas)
+diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
+--- a/CBLAS/testing/CMakeLists.txt
++++ b/CBLAS/testing/CMakeLists.txt
+@@ -55,9 +55,9 @@
+   add_executable(xscblat2 c_sblat2.f ${STESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xscblat3 c_sblat3.f ${STESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xscblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xscblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xscblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xscblat1 cblas)
++  target_link_libraries(xscblat2 cblas)
++  target_link_libraries(xscblat3 cblas)
+  
+   add_cblas_test(stest1.out ""   xscblat1)
+   add_cblas_test(stest2.out sin2 xscblat2)
+@@ -71,9 +71,9 @@
+   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xdcblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xdcblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xdcblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xdcblat1 cblas)
++  target_link_libraries(xdcblat2 cblas)
++  target_link_libraries(xdcblat3 cblas)
+  
+   add_cblas_test(dtest1.out ""   xdcblat1)
+   add_cblas_test(dtest2.out din2 xdcblat2)
+@@ -87,9 +87,9 @@
+   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xccblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xccblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xccblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xccblat1 cblas)
++  target_link_libraries(xccblat2 cblas)
++  target_link_libraries(xccblat3 cblas)
+  
+   add_cblas_test(ctest1.out ""   xccblat1)
+   add_cblas_test(ctest2.out cin2 xccblat2)
+@@ -103,9 +103,9 @@
+   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   
+-  target_link_libraries(xzcblat1 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xzcblat2 cblas ${BLAS_LIBRARIES})
+-  target_link_libraries(xzcblat3 cblas ${BLAS_LIBRARIES})
++  target_link_libraries(xzcblat1 cblas)
++  target_link_libraries(xzcblat2 cblas)
++  target_link_libraries(xzcblat3 cblas)
+  
+   add_cblas_test(ztest1.out ""   xzcblat1)
+   add_cblas_test(ztest2.out zin2 xzcblat2)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 2.8.10)
+-project(LAPACK Fortran)
++project(LAPACK C Fortran)
+ 
+ set(LAPACK_MAJOR_VERSION 3)
+ set(LAPACK_MINOR_VERSION 6)
+diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
+--- a/LAPACKE/CMakeLists.txt
++++ b/LAPACKE/CMakeLists.txt
+@@ -46,17 +46,21 @@
+ 
+ if (USE_XBLAS)
+    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
++   target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+ else (USE_XBLAS)
+   if (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++   target_link_libraries(lapacke PRIVATE tmglib ${LAPACK_LIBRARIES})
+   else (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++   target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+   endif(LAPACKE_WITH_TMG)
+ endif(USE_XBLAS)
+ 
++set_target_properties(
++  lapacke PROPERTIES
++  LINKER_LANGUAGE C
++  )
+ lapack_install_library(lapacke)
+ INSTALL( FILES ${LAPACKE_INCLUDE} DESTINATION include )
+ 
+diff --git a/LAPACKE/example/CMakeLists.txt b/LAPACKE/example/CMakeLists.txt
+--- a/LAPACKE/example/CMakeLists.txt
++++ b/LAPACKE/example/CMakeLists.txt
+@@ -3,10 +3,10 @@
+ add_executable(xexample_DGELS_rowmajor example_DGELS_rowmajor.c lapacke_example_aux.c lapacke_example_aux.h)
+ add_executable(xexample_DGELS_colmajor example_DGELS_colmajor.c lapacke_example_aux.c lapacke_example_aux.h)
+ 
+-target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGESV_colmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGELS_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_DGELS_colmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++target_link_libraries(xexample_DGESV_rowmajor lapacke)
++target_link_libraries(xexample_DGESV_colmajor lapacke)
++target_link_libraries(xexample_DGELS_rowmajor lapacke)
++target_link_libraries(xexample_DGELS_colmajor lapacke)
+ 
+ add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
+ add_test(example_DGESV_colmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_colmajor)
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
+ Libs: -L${libdir} -llapacke
+-Requires: lapack blas
++Requires.private: lapack
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -455,12 +455,10 @@
+ list(REMOVE_DUPLICATES ALLOBJ)
+ 
+ add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+-
++target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ set_target_properties(
+   lapack PROPERTIES
+   VERSION ${LAPACK_VERSION}
+   SOVERSION ${LAPACK_MAJOR_VERSION}
+   )
+-
+ lapack_install_library(lapack)
+diff --git a/TESTING/EIG/CMakeLists.txt b/TESTING/EIG/CMakeLists.txt
+--- a/TESTING/EIG/CMakeLists.txt
++++ b/TESTING/EIG/CMakeLists.txt
+@@ -119,7 +119,7 @@
+ 
+ macro(add_eig_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endmacro(add_eig_executable)
+ 
+ if (BUILD_SINGLE)
+diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
+--- a/TESTING/LIN/CMakeLists.txt
++++ b/TESTING/LIN/CMakeLists.txt
+@@ -193,7 +193,7 @@
+ 
+ macro(add_lin_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+diff --git a/lapack.pc.in b/lapack.pc.in
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -6,4 +6,4 @@
+ Version: @LAPACK_VERSION@
+ URL: http://www.netlib.org/lapack/
+ Libs: -L${libdir} -llapack
+-Requires: blas
++Requires.private: blas
diff --git a/libraries/lapack/patches/target-cleanup.diff b/libraries/lapack/patches/target-cleanup.diff
new file mode 100644
index 0000000000..8f15294374
--- /dev/null
+++ b/libraries/lapack/patches/target-cleanup.diff
@@ -0,0 +1,776 @@
+diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -113,29 +113,22 @@
+ 
+ set(ZBLAS3 zgemm.f zsymm.f zsyrk.f zsyr2k.f ztrmm.f ztrsm.f 
+ 	zhemm.f zherk.f zher2k.f)
+-# default build all of it
+-set(ALLOBJ ${SBLAS1} ${SBLAS2} ${SBLAS3} ${DBLAS1} ${DBLAS2} ${DBLAS3}	
+-	${CBLAS1} ${CBLAS2} ${CBLAS3} ${ZBLAS1} 
+-	${ZBLAS2} ${ZBLAS3} ${ALLBLAS})
+-
+-if(BLAS_SINGLE)
+-  set(ALLOBJ ${SBLAS1} ${ALLBLAS} 
+-	${SBLAS2} ${SBLAS3})
++
++set(ALLOBJ)
++if(BUILD_SINGLE)
++  list(APPEND ALLOBJ ${SBLAS1} ${ALLBLAS} ${SBLAS2} ${SBLAS3})
+ endif()
+-if(BLAS_DOUBLE)
+-  set(ALLOBJ ${DBLAS1} ${ALLBLAS} 
+-	${DBLAS2} ${DBLAS3})
++if(BUILD_DOUBLE)
++  list(APPEND ALLOBJ ${DBLAS1} ${ALLBLAS} ${DBLAS2} ${DBLAS3})
+ endif()
+-if(BLAS_COMPLEX)
+-  set(ALLOBJ  ${BLASLIB} ${CBLAS1} ${CB1AUX} 
+-	${ALLBLAS} ${CBLAS2})
++if(BUILD_COMPLEX)
++  list(APPEND ALLOBJ ${BLASLIB} ${CBLAS1} ${CB1AUX} ${ALLBLAS} ${CBLAS2} ${CBLAS3})
+ endif()
+-if(BLAS_COMPLEX16)
+-  set(ALLOBJ  ${BLASLIB} ${ZBLAS1} ${ZB1AUX} 
+-	${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
++if(BUILD_COMPLEX16)
++  list(APPEND ALLOBJ ${BLASLIB} ${ZBLAS1} ${ZB1AUX} ${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
+ endif()
+-  
+-  
++list(REMOVE_DUPLICATES ALLOBJ)
++
+ add_library(blas ${ALLOBJ})
+ set_target_properties(
+   blas PROPERTIES
+diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
+--- a/CBLAS/CMakeLists.txt
++++ b/CBLAS/CMakeLists.txt
+@@ -65,9 +65,9 @@
+   list(GET ALL_TARGETS 0 _cblas_config_build_guard_target)
+ endif()
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-version.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in
+   ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
+--- a/CBLAS/src/CMakeLists.txt
++++ b/CBLAS/src/CMakeLists.txt
+@@ -28,34 +28,26 @@
+          cblas_ddot.c  cblas_dsdot.c cblas_dnrm2.c cblas_dasum.c 
+          cblas_idamax.c   ddotsub.f   dsdotsub.f       dnrm2sub.f
+          dasumsub.f idamaxsub.f)
+-
+ #
+ # All object files for single complex precision
+ #
+ set (CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
+          cblas_caxpy.c cblas_cdotu_sub.c cblas_cdotc_sub.c
+          cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f)
+-
+ #
+ # All object files for double complex precision
+ #
+ set (ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
+-         cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c cblas_dznrm2.c
+-         cblas_dzasum.c cblas_izamax.c zdotcsub.f zdotusub.f     
+-         dzasumsub.f  dznrm2sub.f  izamaxsub.f)
+-       
+-
++         cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c
++         cblas_izamax.c zdotcsub.f zdotusub.f izamaxsub.f)
+ #
+ # Common files for single complex precision
+ #
+ set (SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)
+-
+-
+ #
+-# All object files
++# Common files for double complex precision
+ #
+-set (ALEV1 ${slev1} ${dlev1} ${clev1} ${zlev1} ${sclev1})
+-
++set (DZLEV1 cblas_dzasum.c dzasumsub.f cblas_dznrm2.c dznrm2sub.f)
+ 
+ #
+ #
+@@ -72,8 +64,6 @@
+         cblas_sspr.c  cblas_sspr2.c cblas_ssymv.c cblas_ssyr.c  cblas_ssyr2.c
+         cblas_stbmv.c cblas_stbsv.c cblas_stpmv.c cblas_stpsv.c  cblas_strmv.c
+         cblas_strsv.c)
+-
+- 
+ #
+ # All object files for double real precision
+ #
+@@ -81,7 +71,6 @@
+         cblas_dspr.c  cblas_dspr2.c cblas_dsymv.c cblas_dsyr.c  cblas_dsyr2.c
+         cblas_dtbmv.c cblas_dtbsv.c cblas_dtpmv.c cblas_dtpsv.c  cblas_dtrmv.c
+         cblas_dtrsv.c)
+-
+ #
+ # All object files for single complex precision
+ #
+@@ -89,7 +78,6 @@
+         cblas_ctrmv.c cblas_ctbmv.c cblas_ctpmv.c cblas_ctrsv.c cblas_ctbsv.c
+         cblas_ctpsv.c cblas_cgeru.c cblas_cgerc.c cblas_cher.c  cblas_cher2.c
+         cblas_chpr.c  cblas_chpr2.c)
+-
+ #
+ # All object files for double complex precision
+ #
+@@ -97,10 +85,6 @@
+         cblas_ztrmv.c cblas_ztbmv.c cblas_ztpmv.c cblas_ztrsv.c cblas_ztbsv.c
+         cblas_ztpsv.c cblas_zgeru.c cblas_zgerc.c cblas_zher.c  cblas_zher2.c
+         cblas_zhpr.c  cblas_zhpr2.c)
+-#
+-# All object files
+-#
+-set (AVEL2 ${slev2} ${dlev2} ${clev2} ${zlev2})
+ 
+ #
+ #
+@@ -132,36 +116,21 @@
+ set (ZLEV3 cblas_zgemm.c cblas_zsymm.c cblas_zhemm.c cblas_zherk.c
+         cblas_zher2k.c cblas_ztrmm.c cblas_ztrsm.c  cblas_zsyrk.c
+         cblas_zsyr2k.c)
+-#
+-# All object files
+-#
+-set (ALEV3 ${slev3} ${dlev3} ${clev3} ${zlev3})
+-
+-# default build all of it
+-set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND}
+-           ${DLEV1} ${DLEV2} ${DLEV3}
+-           ${CLEV1} ${CLEV2} ${CLEV3} 
+-           ${ZLEV1} ${ZLEV2} ${ZLEV3}   )
+-
+-# Single real precision
+-if(CBLAS_SINGLE)
+- set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND})
+-endif(CBLAS_SINGLE)
+-
+-# Double real precision
+-if(CBLAS_DOUBLE)
+- set(ALLOBJ  ${DLEV1} ${DLEV2} ${DLEV3} ${ERRHAND})
+-endif(CBLAS_DOUBLE)
+-	
+-# Single complex precision
+-if (CBLAS_COMPLEX)
+- set(ALLOBJ  ${CLEV1} ${SCLEV1} ${CLEV2} ${CLEV3} ${ERRHAND})
+-endif(CBLAS_COMPLEX)
+ 
+-# Double complex precision
+-if (CBLAS_COMPLEX16) 
+- set(ALLOBJ  ${ZLEV1} ${ZLEV2} ${ZLEV3} ${ERRHAND})
+-endif(CBLAS_COMPLEX16)
++set(ALLOBJ)
++if(BUILD_SINGLE)
++  list(APPEND ALLOBJ ${SLEV1} ${SCLEV1} ${ERRHAND} ${SLEV2} ${SLEV3})
++endif()
++if(BUILD_DOUBLE)
++  list(APPEND ALLOBJ ${DLEV1} ${DZLEV1} ${ERRHAND} ${DLEV2} ${DLEV3})
++endif()
++if(BUILD_COMPLEX)
++  list(APPEND ALLOBJ ${CLEV1} ${SCLEV1} ${ERRHAND} ${CLEV2} ${CLEV3})
++endif()
++if(BUILD_COMPLEX16) 
++  list(APPEND ALLOBJ ${ZLEV1} ${DZLEV1} ${ERRHAND} ${ZLEV2} ${ZLEV3})
++endif()
++list(REMOVE_DUPLICATES ALLOBJ)
+ 
+ add_library(cblas ${ALLOBJ})
+ target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
+diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile
+--- a/CBLAS/src/Makefile
++++ b/CBLAS/src/Makefile
+@@ -52,9 +52,8 @@
+ # All object files for double complex precision
+ #
+ zlev1 = cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
+-         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
+-         cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o      \
+-         dzasumsub.o  dznrm2sub.o  izamaxsub.o 
++         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o \
++         cblas_izamax.o zdotcsub.o zdotusub.o izamaxsub.o 
+ 
+ #
+ # Common files for single / complex precision
+@@ -62,9 +61,14 @@
+ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
+ 
+ #
++# Common files for double / complex precision
++#
++dzlev1 = cblas_dzasum.o dzasumsub.o cblas_dznrm2.o dznrm2sub.o
++
++#
+ # All object files
+ #
+-alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1)
++alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1) $(dzlev1)
+ 
+ 
+ #
+@@ -77,8 +81,8 @@
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Double real precision
+-dlib1: $(dlev1) 
+-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1)
++dlib1: $(dlev1) $(dzlev1)
++	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev1) $(dzlev1)
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Single complex precision
+@@ -87,8 +91,8 @@
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # Double complex precision
+-zlib1: $(zlev1)
+-	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1)
++zlib1: $(zlev1) $(dzlev1)
++	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(zlev1) $(dzlev1)
+ 	$(RANLIB) $(CBLASLIB)
+ 
+ # All precisions
+diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
+--- a/CBLAS/testing/CMakeLists.txt
++++ b/CBLAS/testing/CMakeLists.txt
+@@ -28,8 +28,6 @@
+ 
+ # Object files for single real precision
+ SET( STESTL1O c_sblas1.c)
+-
+-SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+ SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+ SET( STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c)
+ 
+@@ -62,11 +60,9 @@
+   add_cblas_test(stest1.out ""   xscblat1)
+   add_cblas_test(stest2.out sin2 xscblat2)
+   add_cblas_test(stest3.out sin3 xscblat3)
+- 
+ endif()
+ 
+ if(BUILD_DOUBLE)
+-
+   add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -78,11 +74,9 @@
+   add_cblas_test(dtest1.out ""   xdcblat1)
+   add_cblas_test(dtest2.out din2 xdcblat2)
+   add_cblas_test(dtest3.out din3 xdcblat3)
+-
+ endif()
+ 
+ if(BUILD_COMPLEX)
+-
+   add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -94,11 +88,9 @@
+   add_cblas_test(ctest1.out ""   xccblat1)
+   add_cblas_test(ctest2.out cin2 xccblat2)
+   add_cblas_test(ctest3.out cin3 xccblat3)
+-
+ endif()
+ 
+ if(BUILD_COMPLEX16)
+-
+   add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
+@@ -110,5 +102,4 @@
+   add_cblas_test(ztest1.out ""   xzcblat1)
+   add_cblas_test(ztest2.out zin2 xzcblat2)
+   add_cblas_test(ztest3.out zin3 xzcblat3)
+-
+ endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,33 @@
+ # --------------------------------------------------
+ # Precision to build
+ # By default all precisions are generated
++option(BUILD_SINGLE "Build Single Precision" ON)
++option(BUILD_DOUBLE "Build Double Precision" ON)
++option(BUILD_COMPLEX "Build Complex Precision" ON)
++option(BUILD_COMPLEX16 "Build Double Complex Precision" ON)
++
++set(PRECISIONS)
++if(BUILD_SINGLE)
++  message(STATUS "Building Single Precision")
++  list(APPEND PRECISIONS "single")
++endif()
++if(BUILD_DOUBLE)
++  message(STATUS "Building Double Precision")
++  list(APPEND PRECISIONS "double")
++endif()
++if(BUILD_COMPLEX)
++  message(STATUS "Building Complex Precision")
++  list(APPEND PRECISIONS "complex")
++endif()
++if(BUILD_COMPLEX16)
++  message(STATUS "Building Double Complex Precision")
++  list(APPEND PRECISIONS "complex16")
++endif()
+ 
++if(NOT PRECISIONS)
++    message(FATAL_ERROR "--> Nothing to build, no precision selected.
++    Please enable at least one of these: BUILD_SINGLE, BUILD_DOUBLE, BUILD_COMPLEX, BUILD_COMPLEX16.")
++endif()
+ 
+ # --------------------------------------------------
+ # Subdirectories that need to be processed
+@@ -214,10 +240,6 @@
+ if(NOT LATESTLAPACK_FOUND)
+   message(STATUS "Using supplied NETLIB LAPACK implementation")
+   set( LAPACK_LIBRARIES lapack )
+-  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
+-  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
+-  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
+-  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
+   add_subdirectory(SRC)
+ else()
+   set( CMAKE_EXE_LINKER_FLAGS 
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -1,22 +1,28 @@
+ #######################################################################
+ #  This is the makefile to create a library for LAPACK.
+ #  The files are organized as follows:
+-#       ALLAUX -- Auxiliary routines called from all precisions
+-#       ALLXAUX -- Auxiliary routines called from all precisions but
+-#                  only from routines using extra precision.
+-#       SCLAUX -- Auxiliary routines called from both REAL and COMPLEX
+-#       DZLAUX -- Auxiliary routines called from both DOUBLE PRECISION
+-#                 and COMPLEX*16
+-#       SLASRC -- Single precision real LAPACK routines
++#       ALLAUX  -- Auxiliary routines called from all precisions
++#
++#       SCLAUX  -- Auxiliary routines called from both REAL and COMPLEX.
++#       DZLAUX  -- Auxiliary routines called from both DOUBLE and COMPLEX*16.
++#
++#       DSLASRC -- Double-single mixed precision real routines called from
++#                  single, single-extra and double precision real LAPACK
++#                  routines (i.e. from SLASRC, SXLASRC, DLASRC).
++#       ZCLASRC -- Double-single mixed precision complex routines called from
++#                  single, single-extra and double precision complex LAPACK
++#                  routines (i.e. from CLASRC, CXLASRC, ZLASRC).
++#
++#       SLASRC  -- Single precision real LAPACK routines
+ #       SXLASRC -- Single precision real LAPACK routines using extra
+ #                  precision.
+-#       CLASRC -- Single precision complex LAPACK routines
++#       CLASRC  -- Single precision complex LAPACK routines
+ #       CXLASRC -- Single precision complex LAPACK routines using extra
+ #                  precision.
+-#       DLASRC -- Double precision real LAPACK routines
++#       DLASRC  -- Double precision real LAPACK routines
+ #       DXLASRC -- Double precision real LAPACK routines using extra
+ #                  precision.
+-#       ZLASRC -- Double precision complex LAPACK routines
++#       ZLASRC  -- Double precision complex LAPACK routines
+ #       ZXLASRC -- Double precision complex LAPACK routines using extra
+ #                  precision.
+ #
+@@ -51,8 +57,6 @@
+     ../INSTALL/ilaver.f ../INSTALL/lsame.f xerbla.f xerbla_array.f
+     ../INSTALL/slamch.f)
+ 
+-set(ALLXAUX )
+-
+ set(SCLAUX  
+    sbdsdc.f 
+    sbdsqr.f sdisna.f slabad.f slacpy.f sladiv.f slae2.f  slaebz.f 
+@@ -97,8 +101,8 @@
+    sgels.f  sgelsd.f sgelss.f sgelsy.f sgeql2.f sgeqlf.f 
+    sgeqp3.f sgeqr2.f sgeqr2p.f sgeqrf.f sgeqrfp.f sgerfs.f sgerq2.f sgerqf.f 
+    sgesc2.f sgesdd.f sgesv.f  sgesvd.f sgesvdx.f sgesvx.f sgetc2.f sgetf2.f 
+-   sgetrf.f sgetrf2.f sgetri.f 
+-   sgetrs.f sggbak.f sggbal.f
++   sgetrf2.f sgetri.f 
++   sggbak.f sggbal.f
+    sgges.f  sgges3.f sggesx.f sggev.f  sggev3.f sggevx.f
+    sggglm.f sgghrd.f sgghd3.f sgglse.f sggqrf.f 
+    sggrqf.f sggsvd3.f sggsvp3.f sgtcon.f sgtrfs.f sgtsv.f  
+@@ -123,7 +127,7 @@
+    sormr3.f sormrq.f sormrz.f sormtr.f spbcon.f spbequ.f spbrfs.f 
+    spbstf.f spbsv.f  spbsvx.f 
+    spbtf2.f spbtrf.f spbtrs.f spocon.f spoequ.f sporfs.f sposv.f  
+-   sposvx.f spotf2.f spotrf.f spotrf2.f spotri.f spotrs.f spstrf.f spstf2.f 
++   sposvx.f spotf2.f spotrf2.f spotri.f spstrf.f spstf2.f 
+    sppcon.f sppequ.f 
+    spprfs.f sppsv.f  sppsvx.f spptrf.f spptri.f spptrs.f sptcon.f 
+    spteqr.f sptrfs.f sptsv.f  sptsvx.f spttrs.f sptts2.f srscl.f  
+@@ -172,8 +176,8 @@
+    cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f 
+    cgesc2.f cgesdd.f cgesv.f  cgesvd.f cgesvdx.f
+    cgesvj.f cgejsv.f cgsvj0.f cgsvj1.f
+-   cgesvx.f cgetc2.f cgetf2.f cgetrf.f cgetrf2.f
+-   cgetri.f cgetrs.f 
++   cgesvx.f cgetc2.f cgetf2.f cgetrf2.f
++   cgetri.f 
+    cggbak.f cggbal.f
+    cgges.f  cgges3.f cggesx.f cggev.f  cggev3.f cggevx.f
+    cggglm.f cgghrd.f cgghd3.f cgglse.f cggqrf.f cggrqf.f 
+@@ -207,7 +211,7 @@
+    claswp.f clasyf.f clasyf_rook.f clatbs.f clatdf.f clatps.f clatrd.f clatrs.f clatrz.f 
+    clauu2.f clauum.f cpbcon.f cpbequ.f cpbrfs.f cpbstf.f cpbsv.f  
+    cpbsvx.f cpbtf2.f cpbtrf.f cpbtrs.f cpocon.f cpoequ.f cporfs.f 
+-   cposv.f  cposvx.f cpotf2.f cpotrf.f cpotrf2.f cpotri.f cpotrs.f cpstrf.f cpstf2.f 
++   cposv.f  cposvx.f cpotf2.f cpotrf2.f cpotri.f cpstrf.f cpstf2.f 
+    cppcon.f cppequ.f cpprfs.f cppsv.f  cppsvx.f cpptrf.f cpptri.f cpptrs.f 
+    cptcon.f cpteqr.f cptrfs.f cptsv.f  cptsvx.f cpttrf.f cpttrs.f cptts2.f 
+    crot.f   cspcon.f cspmv.f  cspr.f   csprfs.f cspsv.f  
+@@ -409,52 +413,45 @@
+    zla_heamv.f zla_hercond_c.f zla_hercond_x.f zla_herpvgrw.f		
+    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
+ 
+-
+-if( USE_XBLAS)
+-  set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})
++if(USE_XBLAS)
++  list(APPEND SLASRC ${SXLASRC})
++  list(APPEND DLASRC ${DXLASRC})
++  list(APPEND CLASRC ${CXLASRC})
++  list(APPEND ZLASRC ${ZXLASRC})
+ endif()
+ 
+ if(BUILD_DEPRECATED)
+-	LIST(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
++  LIST(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
+     DEPRECATED/sgeqpf.f DEPRECATED/sgelsx.f DEPRECATED/sggsvd.f
+     DEPRECATED/sggsvp.f DEPRECATED/slahrd.f DEPRECATED/slatzm.f DEPRECATED/stzrqf.f)
+-	LIST(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
++  LIST(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
+     DEPRECATED/dgeqpf.f DEPRECATED/dgelsx.f DEPRECATED/dggsvd.f
+-    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f )
++    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f)
+   LIST(APPEND CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f
+     DEPRECATED/cgeqpf.f DEPRECATED/cgelsx.f DEPRECATED/cggsvd.f
+     DEPRECATED/cggsvp.f DEPRECATED/clahrd.f DEPRECATED/clatzm.f DEPRECATED/ctzrqf.f)
+   LIST(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f
+     DEPRECATED/zgeqpf.f DEPRECATED/zgelsx.f DEPRECATED/zggsvd.f
+     DEPRECATED/zggsvp.f DEPRECATED/zlahrd.f DEPRECATED/zlatzm.f DEPRECATED/ztzrqf.f)
+-	message(STATUS "Building deprecated routines")
++  message(STATUS "Building LAPACK deprecated routines")
+ endif()
+ 
++set(ALLOBJ)
+ if(BUILD_SINGLE)
+-set(ALLOBJ  ${SLASRC} ${ALLAUX}	${SCLAUX} )
+-message(STATUS "Building Single Precision")
++  list(APPEND ALLOBJ ${SLASRC} ${ALLAUX} ${SCLAUX} ${DSLASRC})
+ endif()
+ if(BUILD_DOUBLE)
+-  set(ALLOBJ ${ALLOBJ} ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
+-message(STATUS "Building Double Precision")
++  list(APPEND ALLOBJ ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
+ endif()
+ if(BUILD_COMPLEX)
+-  set(ALLOBJ ${ALLOBJ} ${CLASRC} ${ALLAUX} ${SCLAUX} )
+-message(STATUS "Building Complex Precision")
++  list(APPEND ALLOBJ ${CLASRC} ${ALLAUX} ${SCLAUX} ${ZCLASRC})
+ endif()
+ if(BUILD_COMPLEX16)
+-  set(ALLOBJ  ${ALLOBJ} ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+-message(STATUS "Building Double Complex Precision")
+-endif()
+-
+-if (NOT ALLOBJ)
+-    message(FATAL_ERROR "-->LAPACK SRC BUILD: NOTHING TO BUILD, NO PRECISION SELECTED:
+-     PLEASE ENABLE AT LEAST ONE OF THOSE: BUILD_SINGLE, BUILD_COMPLEX, BUILD_DOUBLE, BUILD_COMPLEX16.")
++  list(APPEND ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+ endif()
+-
+ list(REMOVE_DUPLICATES ALLOBJ)
+ 
+-add_library(lapack ${ALLOBJ} ${ALLXOBJ})
++add_library(lapack ${ALLOBJ})
+ target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ set_target_properties(
+   lapack PROPERTIES
+diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
+--- a/TESTING/CMakeLists.txt
++++ b/TESTING/CMakeLists.txt
+@@ -289,7 +289,7 @@
+ endif()
+ 
+ 
+-if (BUILD_SIMPLE)
++if (BUILD_SINGLE)
+     if (BUILD_DOUBLE)
+ #
+ # ======== SINGLE-DOUBLE PROTO LIN TESTS ==============
+diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
+--- a/TESTING/LIN/CMakeLists.txt
++++ b/TESTING/LIN/CMakeLists.txt
+@@ -13,10 +13,10 @@
+    schksp.f schksy.f schksy_rook.f schktb.f schktp.f schktr.f 
+    schktz.f 
+    sdrvgt.f sdrvls.f sdrvpb.f 
+-   sdrvpp.f sdrvpt.f sdrvsp.f sdrvsy.f sdrvsy_rook.f
++   sdrvpp.f sdrvpt.f sdrvsp.f sdrvsy_rook.f
+    serrgt.f serrlq.f serrls.f 
+-   serrpo.f serrps.f serrql.f serrqp.f serrqr.f 
+-   serrrq.f serrsy.f serrtr.f serrtz.f serrvx.f 
++   serrps.f serrql.f serrqp.f serrqr.f 
++   serrrq.f serrtr.f serrtz.f 
+    sgbt01.f sgbt02.f sgbt05.f sgelqs.f sgeqls.f sgeqrs.f 
+    sgerqs.f sget01.f sget02.f 
+    sget03.f sget04.f sget06.f sget07.f sgtt01.f sgtt02.f 
+@@ -37,9 +37,11 @@
+    sqrt04.f sqrt05.f schkqrt.f serrqrt.f schkqrtp.f serrqrtp.f)
+ 
+ if(USEXBLAS)
+-  list(APPEND SLINTST sdrvgex.f serrgex.f sdrvgbx.f sdrvpox.f sebchvxx.f)
++  list(APPEND SLINTST serrvxx.f sdrvgex.f sdrvsyx.f serrgex.f sdrvgbx.f sdrvpox.f
++    sebchvxx.f serrsyx.f serrpox.f)
+ else()
+-  list(APPEND SLINTST sdrvge.f serrge.f sdrvgb.f sdrvpo.f)
++  list(APPEND SLINTST serrvx.f sdrvge.f sdrvsy.f serrge.f sdrvgb.f sdrvpo.f
++    serrsy.f serrpo.f)
+ endif()
+ 
+ set(CLINTST  cchkaa.f 
+@@ -48,13 +50,12 @@
+    cchkpo.f cchkps.f cchkpp.f cchkpt.f cchkq3.f cchkql.f 
+    cchkqr.f cchkrq.f cchksp.f cchksy.f cchksy_rook.f cchktb.f 
+    cchktp.f cchktr.f cchktz.f 
+-   cdrvgt.f cdrvhe.f cdrvhe_rook.f cdrvhp.f 
++   cdrvgt.f cdrvhe_rook.f cdrvhp.f 
+    cdrvls.f cdrvpb.f cdrvpp.f cdrvpt.f 
+-   cdrvsp.f cdrvsy.f cdrvsy_rook.f
+-   cerrgt.f cerrhe.f cerrlq.f 
++   cdrvsp.f cdrvsy_rook.f
++   cerrgt.f cerrlq.f 
+    cerrls.f cerrps.f cerrql.f cerrqp.f 
+-   cerrqr.f cerrrq.f cerrsy.f cerrtr.f cerrtz.f 
+-   cerrvx.f 
++   cerrqr.f cerrrq.f cerrtr.f cerrtz.f 
+    cgbt01.f cgbt02.f cgbt05.f cgelqs.f cgeqls.f cgeqrs.f 
+    cgerqs.f cget01.f cget02.f 
+    cget03.f cget04.f cget07.f cgtt01.f cgtt02.f 
+@@ -77,10 +78,11 @@
+    cqrt04.f cqrt05.f cchkqrt.f cerrqrt.f cchkqrtp.f cerrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND 
+-    CLINTST cdrvgex.f cdrvgbx.f cerrgex.f cdrvpox.f cerrpox.f cebchvxx.f)
++  list(APPEND CLINTST cerrvxx.f cdrvgex.f cdrvsyx.f cdrvgbx.f cerrgex.f cdrvpox.f
++    cdrvhex.f cerrpox.f cebchvxx.f cerrsyx.f cerrhex.f)
+ else()
+-  list(APPEND CLINTST cdrvge.f cdrvgb.f cerrge.f cdrvpo.f cerrpo.f)
++  list(APPEND CLINTST cerrvx.f cdrvge.f cdrvsy.f cdrvgb.f cerrge.f cdrvpo.f
++    cdrvhe.f cerrpo.f cerrsy.f cerrhe.f)
+ endif()
+ 
+ set(DLINTST  dchkaa.f 
+@@ -90,10 +92,10 @@
+    dchksp.f dchksy.f dchksy_rook.f dchktb.f dchktp.f dchktr.f 
+    dchktz.f 
+    ddrvgt.f ddrvls.f ddrvpb.f 
+-   ddrvpp.f ddrvpt.f ddrvsp.f ddrvsy.f ddrvsy_rook.f
++   ddrvpp.f ddrvpt.f ddrvsp.f ddrvsy_rook.f
+    derrgt.f derrlq.f derrls.f 
+    derrps.f derrql.f derrqp.f derrqr.f 
+-   derrrq.f derrsy.f derrtr.f derrtz.f derrvx.f 
++   derrrq.f derrtr.f derrtz.f 
+    dgbt01.f dgbt02.f dgbt05.f dgelqs.f dgeqls.f dgeqrs.f 
+    dgerqs.f dget01.f dget02.f 
+    dget03.f dget04.f dget06.f dget07.f dgtt01.f dgtt02.f 
+@@ -114,11 +116,11 @@
+    dqrt04.f dqrt05.f dchkqrt.f derrqrt.f dchkqrtp.f derrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND 
+-    DLINTST  ddrvgex.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f debchvxx.f)
++  list(APPEND DLINTST derrvxx.f ddrvgex.f ddrvsyx.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f
++    debchvxx.f derrsyx.f)
+ else()
+-  list(APPEND
+-    DLINTST  ddrvge.f ddrvgb.f derrge.f ddrvpo.f derrpo.f)
++  list(APPEND DLINTST derrvx.f ddrvge.f ddrvsy.f ddrvgb.f derrge.f ddrvpo.f derrpo.f
++    derrsy.f)
+ endif()
+ 
+ set(ZLINTST  zchkaa.f 
+@@ -127,17 +129,16 @@
+    zchkpo.f zchkps.f zchkpp.f zchkpt.f zchkq3.f zchkql.f 
+    zchkqr.f zchkrq.f zchksp.f zchksy.f zchksy_rook.f zchktb.f 
+    zchktp.f zchktr.f zchktz.f 
+-   zdrvgt.f zdrvhe.f zdrvhe_rook.f zdrvhp.f 
++   zdrvgt.f zdrvhe_rook.f zdrvhp.f 
+    zdrvls.f zdrvpb.f zdrvpp.f zdrvpt.f 
+-   zdrvsp.f zdrvsy.f zdrvsy_rook.f 
+-   zerrgt.f zerrhe.f zerrlq.f 
++   zdrvsp.f zdrvsy_rook.f 
++   zerrgt.f zerrlq.f 
+    zerrls.f zerrps.f zerrql.f zerrqp.f 
+-   zerrqr.f zerrrq.f zerrsy.f zerrtr.f zerrtz.f 
+-   zerrvx.f 
++   zerrqr.f zerrrq.f zerrtr.f zerrtz.f 
+    zgbt01.f zgbt02.f zgbt05.f zgelqs.f zgeqls.f zgeqrs.f 
+    zgerqs.f zget01.f zget02.f 
+    zget03.f zget04.f zget07.f zgtt01.f zgtt02.f 
+-   zgtt05.f zhet01.f zhet01.f zhet01_rook.f zhpt01.f zlaipd.f zlaptm.f zlarhs.f zlatb4.f zlatb5.f 
++   zgtt05.f zhet01.f zhet01_rook.f zhpt01.f zlaipd.f zlaptm.f zlarhs.f zlatb4.f zlatb5.f 
+    zlatsp.f zlatsy.f zlattb.f zlattp.f zlattr.f 
+    zlavhe.f zlavhe_rook.f zlavhp.f zlavsp.f zlavsy.f zlavsy_rook.f zlqt01.f 
+    zlqt02.f zlqt03.f zpbt01.f zpbt02.f zpbt05.f 
+@@ -156,11 +157,11 @@
+    zqrt04.f zqrt05.f zchkqrt.f zerrqrt.f zchkqrtp.f zerrqrtp.f )
+ 
+ if(USEXBLAS)
+-  list(APPEND
+-    ZLINTST  zdrvgex.f zdrvgbx.f zerrgex.f zdrvpox.f zerrpox.f zebchvxx.f)
++  list(APPEND ZLINTST zerrvxx.f zdrvgex.f zdrvsyx.f zdrvgbx.f zerrgex.f zdrvpox.f zdrvhex.f
++    zerrpox.f zebchvxx.f zerrsyx.f zerrhex.f)
+ else()
+-  list(APPEND
+-    ZLINTST  zdrvge.f zdrvgb.f zerrge.f zdrvpo.f zerrpo.f)
++  list(APPEND ZLINTST zerrvx.f zdrvge.f zdrvsy.f zdrvgb.f zerrge.f zdrvpo.f zdrvhe.f
++    zerrpo.f zerrsy.f zerrhe.f)
+ endif()
+ 
+ set(DSLINTST  dchkab.f 
+@@ -197,29 +198,29 @@
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+-add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} ${SECOND_SRC} )
++add_lin_executable(xlintsts ${ALINTST} ${SLINTST} ${SCLNTST} ${SECOND_SRC})
+ add_lin_executable(xlintstrfs ${SLINTSTRFP} ${SECOND_SRC})
+ endif()
+ 
+ if(BUILD_DOUBLE)
+-add_lin_executable(xlintstd  ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
++add_lin_executable(xlintstd ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
+ add_lin_executable(xlintstrfd ${DLINTSTRFP} ${DSECOND_SRC})
+ endif()
+ 
+ IF(BUILD_SINGLE AND BUILD_DOUBLE)
+-add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
++add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC})
+ endif()
+ 
+ if(BUILD_COMPLEX)
+-add_lin_executable(xlintstc  ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC} )
+-add_lin_executable(xlintstrfc  ${CLINTSTRFP} ${SECOND_SRC})
++add_lin_executable(xlintstc ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC})
++add_lin_executable(xlintstrfc ${CLINTSTRFP} ${SECOND_SRC})
+ endif()
+ 
+ if(BUILD_COMPLEX16)
+-add_lin_executable(xlintstz  ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
++add_lin_executable(xlintstz ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
+ add_lin_executable(xlintstrfz ${ZLINTSTRFP} ${DSECOND_SRC})
+ endif()
+ 
+ IF(BUILD_COMPLEX AND BUILD_COMPLEX16)
+-add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
++add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC})
+ endif()
+diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt
+--- a/TESTING/MATGEN/CMakeLists.txt
++++ b/TESTING/MATGEN/CMakeLists.txt
+@@ -31,45 +31,41 @@
+ #
+ #######################################################################
+  
+-set(SCATGEN  slatm1.f slaran.f slarnd.f)
++set(SCATGEN  slatm1.f slatm7.f slaran.f slarnd.f)
+ 
+ set(SMATGEN  slatms.f slatme.f slatmr.f slatmt.f 
+    slagge.f slagsy.f slakf2.f slarge.f slaror.f slarot.f slatm2.f 
+-   slatm3.f slatm5.f slatm6.f slatm7.f slahilb.f)
++   slatm3.f slatm5.f slatm6.f slahilb.f)
+ 
+ set(CMATGEN  clatms.f clatme.f clatmr.f clatmt.f 
+    clagge.f claghe.f clagsy.f clakf2.f clarge.f claror.f clarot.f 
+-   clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f slatm7.f)
++   clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f)
+ 
+-set(DZATGEN  dlatm1.f dlaran.f dlarnd.f)
++set(DZATGEN  dlatm1.f dlatm7.f dlaran.f dlarnd.f)
+ 
+ set(DMATGEN  dlatms.f dlatme.f dlatmr.f dlatmt.f 
+    dlagge.f dlagsy.f dlakf2.f dlarge.f dlaror.f dlarot.f dlatm2.f 
+-   dlatm3.f dlatm5.f dlatm6.f dlatm7.f dlahilb.f)
++   dlatm3.f dlatm5.f dlatm6.f dlahilb.f)
+ 
+ set(ZMATGEN  zlatms.f zlatme.f zlatmr.f zlatmt.f 
+-  zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f 
+-  zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f dlatm7.f)
++   zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f 
++   zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f)
+ 
++set(ALLOBJ)
+ if(BUILD_SINGLE)
+-  set(ALLOBJ ${SMATGEN} ${SCATGEN})
++  list(APPEND ALLOBJ ${SMATGEN} ${SCATGEN})
+ endif()
+ if(BUILD_DOUBLE)
+-  set(ALLOBJ ${ALLOBJ} ${DMATGEN} ${DZATGEN})
++  list(APPEND ALLOBJ ${DMATGEN} ${DZATGEN})
+ endif()
+ if(BUILD_COMPLEX)
+-  set(ALLOBJ  ${ALLOBJ} ${CMATGEN} ${SCATGEN})
++  list(APPEND ALLOBJ ${CMATGEN} ${SCATGEN})
+ endif()
+ if(BUILD_COMPLEX16)
+-  set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
++  LIST(APPEND ALLOBJ ${ZMATGEN} ${DZATGEN})
+ endif()
++list(REMOVE_DUPLICATES ALLOBJ)
+ 
+-if (NOT ALLOBJ)
+-set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
+-  ${DZATGEN})
+-else()
+-  list(REMOVE_DUPLICATES ALLOBJ)
+-endif()
+-add_library(tmglib ${ALLOBJ} )
++add_library(tmglib ${ALLOBJ})
+ target_link_libraries(tmglib ${LAPACK_LIBRARIES})
+ lapack_install_library(tmglib)
+diff --git a/TESTING/MATGEN/Makefile b/TESTING/MATGEN/Makefile
+--- a/TESTING/MATGEN/Makefile
++++ b/TESTING/MATGEN/Makefile
+@@ -33,21 +33,21 @@
+ #
+ #######################################################################
+  
+-SCATGEN = slatm1.o slaran.o slarnd.o
++SCATGEN = slatm1.o slatm7.o slaran.o slarnd.o
+ 
+ SMATGEN = slatms.o slatme.o slatmr.o slatmt.o \
+    slagge.o slagsy.o slakf2.o slarge.o slaror.o slarot.o slatm2.o \
+-   slatm3.o slatm5.o slatm6.o slatm7.o slahilb.o
++   slatm3.o slatm5.o slatm6.o slahilb.o
+ 
+ CMATGEN = clatms.o clatme.o clatmr.o clatmt.o \
+    clagge.o claghe.o clagsy.o clakf2.o clarge.o claror.o clarot.o \
+    clatm1.o clarnd.o clatm2.o clatm3.o clatm5.o clatm6.o clahilb.o
+ 
+-DZATGEN = dlatm1.o dlaran.o dlarnd.o
++DZATGEN = dlatm1.o dlatm7.o dlaran.o dlarnd.o
+ 
+ DMATGEN = dlatms.o dlatme.o dlatmr.o dlatmt.o \
+    dlagge.o dlagsy.o dlakf2.o dlarge.o dlaror.o dlarot.o dlatm2.o \
+-   dlatm3.o dlatm5.o dlatm6.o dlatm7.o dlahilb.o
++   dlatm3.o dlatm5.o dlatm6.o dlahilb.o
+ 
+ ZMATGEN = zlatms.o zlatme.o zlatmr.o zlatmt.o \
+    zlagge.o zlaghe.o zlagsy.o zlakf2.o zlarge.o zlaror.o zlarot.o \
diff --git a/libraries/lensfun-legacy/README b/libraries/lensfun-legacy/README
deleted file mode 100644
index 26b99c0fe7..0000000000
--- a/libraries/lensfun-legacy/README
+++ /dev/null
@@ -1,9 +0,0 @@
-lensfun is a library that provide a open source database of photographic
-lenses and their characteristics, also provides a set of algorithms for
-correcting images based on detailed knowledge of lens properties and
-calibration data.
-
-This package provides legacy version of lensfun which is still needed
-by other packages.
-
-NOTE: This package conflicts with lensfun, so only install ONE of them.
diff --git a/libraries/lensfun-legacy/lensfun-legacy.SlackBuild b/libraries/lensfun-legacy/lensfun-legacy.SlackBuild
deleted file mode 100644
index 3dbe49839a..0000000000
--- a/libraries/lensfun-legacy/lensfun-legacy.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script of lensfun-legacy
-
-# Copyright 2009 Ricardson Williams <ricardsonwilliams at yahoo.com.br>
-# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=lensfun-legacy
-SRCNAM=lensfun
-VERSION=${VERSION:-0.2.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_FOR_SSE=ON \
-    -DBUILD_FOR_SSE2=ON \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README docs/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/lensfun-legacy/lensfun-legacy.info b/libraries/lensfun-legacy/lensfun-legacy.info
deleted file mode 100644
index 14610ee19d..0000000000
--- a/libraries/lensfun-legacy/lensfun-legacy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lensfun-legacy"
-VERSION="0.2.8"
-HOMEPAGE="http://lensfun.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/lensfun/files/0.2.8/lensfun-0.2.8.tar.bz2"
-MD5SUM="db2988505e7432c6b331aa597789c639"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/lensfun-legacy/slack-desc b/libraries/lensfun-legacy/slack-desc
deleted file mode 100644
index 981ad2baca..0000000000
--- a/libraries/lensfun-legacy/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-              |-----handy-ruler------------------------------------------------------|
-lensfun-legacy: lensfun-legacy (photographic lens characteristics database library)
-lensfun-legacy:
-lensfun-legacy: lensfun is a library that provide a open source database of
-lensfun-legacy: photographic lenses and their characteristics also provides
-lensfun-legacy: a set of algorithms for correcting images based on detailed
-lensfun-legacy: knowledge of lens properties and calibration data.
-lensfun-legacy:
-lensfun-legacy: Homepage: http://lensfun.sourceforge.net/
-lensfun-legacy:
-lensfun-legacy:
-lensfun-legacy:
diff --git a/libraries/leptonica/leptonica.SlackBuild b/libraries/leptonica/leptonica.SlackBuild
index 1d4f55c281..70f9a3b17c 100644
--- a/libraries/leptonica/leptonica.SlackBuild
+++ b/libraries/leptonica/leptonica.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for leptonica
 
-# Copyright 2012-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2012-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=leptonica
-VERSION=${VERSION:-1.71}
+VERSION=${VERSION:-1.72}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/leptonica/leptonica.info b/libraries/leptonica/leptonica.info
index 410435b4c1..d5c3918a8c 100644
--- a/libraries/leptonica/leptonica.info
+++ b/libraries/leptonica/leptonica.info
@@ -1,8 +1,8 @@
 PRGNAM="leptonica"
-VERSION="1.71"
+VERSION="1.72"
 HOMEPAGE="http://www.leptonica.com/"
-DOWNLOAD="http://www.leptonica.com/source/leptonica-1.71.tar.gz"
-MD5SUM="790f34d682e6150c12c54bfe4a824f7f"
+DOWNLOAD="http://www.leptonica.com/source/leptonica-1.72.tar.gz"
+MD5SUM="7581db29f8442197ce68e766c6047c4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libaacs/libaacs-0.8.1-include-errno.patch b/libraries/libaacs/libaacs-0.8.1-include-errno.patch
new file mode 100644
index 0000000000..f5c2a9fcf5
--- /dev/null
+++ b/libraries/libaacs/libaacs-0.8.1-include-errno.patch
@@ -0,0 +1,10 @@
+--- libaacs-0.8.1/src/libaacs/crypto.c
++++ libaacs-0.8.1/src/libaacs/crypto.c
+@@ -37,6 +37,7 @@
+ 
+ #ifdef HAVE_PTHREAD_H
+ #if GCRYPT_VERSION_NUMBER < 0x010600
++#include <errno.h>
+ #include <pthread.h>
+ #endif
+ #endif
diff --git a/libraries/libaacs/libaacs.SlackBuild b/libraries/libaacs/libaacs.SlackBuild
index 66cff2fce8..d8fcf64eea 100644
--- a/libraries/libaacs/libaacs.SlackBuild
+++ b/libraries/libaacs/libaacs.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libaacs
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,10 +70,14 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix CL/RF formatting.
-cat KEYDB.cfg | sed -e 's/\r//g' > KEYDB.cfg.new
+sed -e 's/\r//g' KEYDB.cfg > KEYDB.cfg.new
 touch -r KEYDB.cfg KEYDB.cfg.new
 mv KEYDB.cfg.new KEYDB.cfg
 
+# Fix ENOMEM bug.
+# Issue: https://bugs.gentoo.org/show_bug.cgi?id=550978
+patch -p1 < $CWD/libaacs-0.8.1-include-errno.patch
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/libraries/libaacs/libaacs.info b/libraries/libaacs/libaacs.info
index 6d4e275a9e..b1df09fc43 100644
--- a/libraries/libaacs/libaacs.info
+++ b/libraries/libaacs/libaacs.info
@@ -1,8 +1,8 @@
 PRGNAM="libaacs"
-VERSION="0.8.0"
+VERSION="0.8.1"
 HOMEPAGE="http://www.videolan.org/developers/libaacs.html"
-DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/libaacs/0.8.0/libaacs-0.8.0.tar.bz2"
-MD5SUM="0b6fb63f81d62cd6acc98ae8f8d50c74"
+DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/libaacs/0.8.1/libaacs-0.8.1.tar.bz2"
+MD5SUM="2210935ac10d47887fb35ceb11d67eed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libabw/README b/libraries/libabw/README
new file mode 100644
index 0000000000..2620855ca7
--- /dev/null
+++ b/libraries/libabw/README
@@ -0,0 +1,4 @@
+Libabw is an import filter library for AbiWord documents, based on
+librevenge. It is a part of the Document Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libabw/libabw.SlackBuild b/libraries/libabw/libabw.SlackBuild
new file mode 100644
index 0000000000..7c3d90fda2
--- /dev/null
+++ b/libraries/libabw/libabw.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for libabw
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libabw
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+CXXFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* CREDITS ChangeLog HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libabw/libabw.info b/libraries/libabw/libabw.info
new file mode 100644
index 0000000000..2d0b4f3251
--- /dev/null
+++ b/libraries/libabw/libabw.info
@@ -0,0 +1,10 @@
+PRGNAM="libabw"
+VERSION="0.1.1"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libabw/libabw-0.1.1.tar.xz"
+MD5SUM="6be55a46078b593ec20cad9bb8730c3e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libabw/slack-desc b/libraries/libabw/slack-desc
new file mode 100644
index 0000000000..3101967f31
--- /dev/null
+++ b/libraries/libabw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libabw: libabw (AbiWord Import Library)
+libabw:
+libabw: Libabw is a library that parses the file format of AbiWord documents
+libabw:
+libabw: Homepage: https://wiki.documentfoundation.org/DLP/Libraries/libabw
+libabw:
+libabw:
+libabw:
+libabw:
+libabw:
+libabw:
diff --git a/libraries/libb64/README b/libraries/libb64/README
new file mode 100644
index 0000000000..13f621dacf
--- /dev/null
+++ b/libraries/libb64/README
@@ -0,0 +1,7 @@
+libb64 is a library of ANSI C routines for fast encoding/decoding data into and
+from a base64-encoded format. C++ wrappers are included, as well as the source
+code for standalone encoding and decoding executables.
+
+Base64 uses a subset of displayable ASCII characters, and is therefore a useful
+encoding for storing binary data in a text file, such as XML, or sending binary
+data over text-only email.
diff --git a/libraries/libb64/libb64.SlackBuild b/libraries/libb64/libb64.SlackBuild
new file mode 100644
index 0000000000..ddc45518bd
--- /dev/null
+++ b/libraries/libb64/libb64.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for libb64
+
+# Copyright 2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libb64
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix warnings as errors.
+sed -i 's|-Werror||' */Makefile
+# Build shared library.
+patch -p0 < $CWD/shared-library.patch
+
+CFLAGS="$SLKCFLAGS" make
+
+# Manually install.
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+#install -m 0644 src/libb64.a $PKG/usr/lib${LIBDIRSUFFIX}
+install -m 0755 src/libb64.so.0 $PKG/usr/lib${LIBDIRSUFFIX}
+ln -s /usr/lib${LIBDIRSUFFIX}/$PRGNAM.so.0 $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM.so
+mv include $PKG/usr
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BENCHMARKS CHANGELOG INSTALL LICENSE README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libb64/libb64.info b/libraries/libb64/libb64.info
new file mode 100644
index 0000000000..d30e6a8ea4
--- /dev/null
+++ b/libraries/libb64/libb64.info
@@ -0,0 +1,10 @@
+PRGNAM="libb64"
+VERSION="1.2.1"
+HOMEPAGE="http://libb64.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/libb64/libb64-1.2.1.zip"
+MD5SUM="8a5dc72eb7e32f074605260bc127c764"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Larry Hajali"
+EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/libb64/shared-library.patch b/libraries/libb64/shared-library.patch
new file mode 100644
index 0000000000..0cd2bf234f
--- /dev/null
+++ b/libraries/libb64/shared-library.patch
@@ -0,0 +1,25 @@
+--- src/Makefile~
++++ src/Makefile
+@@ -1,4 +1,5 @@
+-LIBRARIES = libb64.a
++LIBRARIES = libb64.a libb64.so
++SOVERSION ?= 0
+ 
+ # Build flags (uncomment one)
+ #############################
+@@ -27,6 +28,15 @@ all: $(TARGETS) #strip
+ libb64.a: cencode.o cdecode.o
+ 	$(AR) $(ARFLAGS) $@ $^
+ 
++libb64.so.$(SOVERSION): cencode.So cdecode.So
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
++
++%.So: %.c
++	$(CC) -fPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++
++%.so: %.so.$(SOVERSION)
++	ln -fs $< $@
++
+ strip:
+ 	strip $(BINARIES) *.exe
+ 
diff --git a/libraries/libb64/slack-desc b/libraries/libb64/slack-desc
new file mode 100644
index 0000000000..341c48ffe8
--- /dev/null
+++ b/libraries/libb64/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libb64: libb64 (C routines for base64 encoding/decoding)
+libb64:
+libb64: libb64 is a library of ANSI C routines for fast encoding/decoding data
+libb64: into and from a base64-encoded format. C++ wrappers are included, as
+libb64: well as the source code for standalone encoding and decoding
+libb64: executables.
+libb64:
+libb64: Homepage: http://libb64.sourceforge.net/
+libb64:
+libb64:
+libb64:
diff --git a/libraries/libbluray/libbluray.SlackBuild b/libraries/libbluray/libbluray.SlackBuild
index 01669c0ce3..a0e2f84267 100644
--- a/libraries/libbluray/libbluray.SlackBuild
+++ b/libraries/libbluray/libbluray.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libbluray
 
-# Copyright 2011-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libbluray
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libbluray/libbluray.info b/libraries/libbluray/libbluray.info
index ea11da8b04..de861cd7fd 100644
--- a/libraries/libbluray/libbluray.info
+++ b/libraries/libbluray/libbluray.info
@@ -1,8 +1,8 @@
 PRGNAM="libbluray"
-VERSION="0.8.0"
+VERSION="0.9.2"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/libbluray/0.8.0/libbluray-0.8.0.tar.bz2"
-MD5SUM="bd2b8684d5afd17dc270f19eb1a5bb9a"
+DOWNLOAD="ftp://ftp.videolan.org/pub/videolan/libbluray/0.9.2/libbluray-0.9.2.tar.bz2"
+MD5SUM="836b2de16547776bf2726166cf796f13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libbonobo/libbonobo.SlackBuild b/libraries/libbonobo/libbonobo.SlackBuild
index 3e0f437100..449ec2a1e3 100644
--- a/libraries/libbonobo/libbonobo.SlackBuild
+++ b/libraries/libbonobo/libbonobo.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for libbonobo
 #
-# Copyright 2009-2011  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=libbonobo
 VERSION=${VERSION:-2.32.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,6 +71,7 @@ find -L . \
 
 # Apply patch from upstream to build with the newer glib
 patch -p1 < $CWD/remove_use_of_G_DISABLE_DEPRECATED.patch
+patch -p1 < $CWD/test_no_srcdir.patch
 
 autoreconf -fi
 
diff --git a/libraries/libbonobo/test_no_srcdir.patch b/libraries/libbonobo/test_no_srcdir.patch
new file mode 100644
index 0000000000..24a9b98637
--- /dev/null
+++ b/libraries/libbonobo/test_no_srcdir.patch
@@ -0,0 +1,18 @@
+--- libbonobo-2.32.1.orig/tests/Makefile.am	2010-08-29 13:56:00.000000000 +0200
++++ libbonobo-2.32.1/tests/Makefile.am	2015-11-28 11:33:17.439444590 +0100
+@@ -51,11 +51,12 @@
+ 	LD_LIBRARY_PATH="$(top_builddir)/bonobo/.libs:$$LD_LIBRARY_PATH"	\
+ 	PATH="$(top_builddir)/bonobo/.libs:$$PATH"	\
+ 	BONOBO_PLUGIN_PATH="$(top_builddir)/storage-modules/.libs:$$BONOBO_PLUGIN_PATH"\
+-	BONOBO_ACTIVATION_PATH="$(srcdir)$(SEARCHPATHSEP)$$BONOBO_ACTIVATION_PATH"\
+-	MODELS_DIR="$(srcdir)/models"
++	BONOBO_ACTIVATION_PATH="$(SEARCHPATHSEP)$$BONOBO_ACTIVATION_PATH"\
++	MODELS_DIR="models"
++
+ 
+ TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \
+-	test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \
++	test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \
+ 	test-main-loop$(EXEEXT)
+ 
+ # TESTS += test-generic-factory.sh
diff --git a/libraries/libcangjie/README b/libraries/libcangjie/README
new file mode 100644
index 0000000000..105829e49a
--- /dev/null
+++ b/libraries/libcangjie/README
@@ -0,0 +1,6 @@
+Libcangjie is a C library implementing the Cangjie input method.
+This library is based on Wan Leung Wong's original libcangjie and forked by Cangjians team.
+The library handles all the mappings between the input codes and the desired characters
+and provides some filtering options.
+
+Libcangjie is licensed under LGPLv3 or later.
diff --git a/libraries/libcangjie/libcangjie.SlackBuild b/libraries/libcangjie/libcangjie.SlackBuild
new file mode 100644
index 0000000000..0e76585eed
--- /dev/null
+++ b/libraries/libcangjie/libcangjie.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for libcangjie
+
+# Copyright 2015  CCHsu, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libcangjie
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libcangjie/libcangjie.info b/libraries/libcangjie/libcangjie.info
new file mode 100644
index 0000000000..3c7533daa5
--- /dev/null
+++ b/libraries/libcangjie/libcangjie.info
@@ -0,0 +1,10 @@
+PRGNAM="libcangjie"
+VERSION="1.3"
+HOMEPAGE="http://cangjians.github.io/"
+DOWNLOAD="https://github.com/Cangjians/libcangjie/releases/download/v1.3/libcangjie-1.3.tar.xz"
+MD5SUM="e50ed193b0e82b07d2d32ee6e62720b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="CCHsu"
+EMAIL="a12321aabb@gmail.com"
diff --git a/libraries/libcangjie/slack-desc b/libraries/libcangjie/slack-desc
new file mode 100644
index 0000000000..44b5570a02
--- /dev/null
+++ b/libraries/libcangjie/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+libcangjie: libcangjie (Library for Cangjie input method)
+libcangjie:
+libcangjie: Libcangjie is a C library implementing the Cangjie input method. The
+libcangjie: library handles all the mappings between the input codes and the
+libcangjie: desired characters, and provides some filtering options.
+libcangjie:
+libcangjie: Homepage: http://cangjians.github.io/projects/libcangjie/
+libcangjie: Main site: http://cangjians.github.io/
+libcangjie:
+libcangjie:
+libcangjie:
diff --git a/libraries/libcdr/README b/libraries/libcdr/README
new file mode 100644
index 0000000000..f45595f5a9
--- /dev/null
+++ b/libraries/libcdr/README
@@ -0,0 +1,5 @@
+Libcdr is an import filter library for CorelDRAW files, based on
+librevenge. It can import files of all CorelDRAW versions. The
+library is a part of the Document Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libcdr/libcdr.SlackBuild b/libraries/libcdr/libcdr.SlackBuild
new file mode 100644
index 0000000000..ae3f01ced9
--- /dev/null
+++ b/libraries/libcdr/libcdr.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for libcdr
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libcdr
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+CXXFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libcdr/libcdr.info b/libraries/libcdr/libcdr.info
new file mode 100644
index 0000000000..1b9478a061
--- /dev/null
+++ b/libraries/libcdr/libcdr.info
@@ -0,0 +1,10 @@
+PRGNAM="libcdr"
+VERSION="0.1.1"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.1.tar.xz"
+MD5SUM="72ed4d2f900eac95061207d026d5324c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libcdr/slack-desc b/libraries/libcdr/slack-desc
new file mode 100644
index 0000000000..c7d171fb43
--- /dev/null
+++ b/libraries/libcdr/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libcdr: libcdr (CorelDRAW Import Library)
+libcdr:
+libcdr: Libcdr is a library that parses the file format of CorelDRAW
+libcdr: documents of all versions.
+libcdr:
+libcdr: Homepage: https://wiki.documentfoundation.org/DLP/Libraries/libcdr
+libcdr:
+libcdr:
+libcdr:
+libcdr:
+libcdr:
diff --git a/libraries/libcec/libcec.SlackBuild b/libraries/libcec/libcec.SlackBuild
index dec95aed15..c999ae146a 100644
--- a/libraries/libcec/libcec.SlackBuild
+++ b/libraries/libcec/libcec.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libcec
 
-# Copyright 2011-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libcec
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,29 +69,34 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-autoreconf -vif
+# Fix python install folder.
+sed -i \
+  -e "s|lib/|lib${LIBDIRSUFFIX}/|" -e 's|dist-|site-|' \
+  src/$PRGNAM/cmake/CheckPlatformSupport.cmake
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-static=no \
-  --disable-dependency-tracking \
-  --disable-silent-rules \
-  --build=$ARCH-slackware-linux
+mkdir -p build
+cd build
+  cmake -G "Unix Makefiles" \
+    -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release ..
 
-make
-make install DESTDIR=$PKG
+  make VERBOSE=1
+  make install DESTDIR=$PKG
+cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Fix permissions on python file.
+chmod 755 $PKG/usr/bin/pyCecClient.py
+
 install -D -m 0644 debian/cec-client.1 $PKG/usr/man/man1/cec-client.1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libcec/libcec.info b/libraries/libcec/libcec.info
index 8bbb0c947d..f3542436bd 100644
--- a/libraries/libcec/libcec.info
+++ b/libraries/libcec/libcec.info
@@ -1,10 +1,10 @@
 PRGNAM="libcec"
-VERSION="2.2.0"
+VERSION="3.0.1"
 HOMEPAGE="http://libcec.pulse-eight.com/"
-DOWNLOAD="https://github.com/Pulse-Eight/libcec/archive/libcec-2.2.0.tar.gz"
-MD5SUM="006df0d807d4b72bc6859e592c7a70eb"
+DOWNLOAD="https://github.com/Pulse-Eight/libcec/archive/libcec-3.0.1.tar.gz"
+MD5SUM="216ab1a5f04300dcad9d5b5d67ef9100"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lockdev"
+REQUIRES="lockdev platform"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/libcmis/README b/libraries/libcmis/README
new file mode 100644
index 0000000000..b2791a5496
--- /dev/null
+++ b/libraries/libcmis/README
@@ -0,0 +1,5 @@
+Libcmis aims at providing a C/C++ client library for the CMIS
+protocol. A cmis-client tool is maintained to help testing and
+showing libcmis features.
+
+To build the tests, install cppunit before running this script.
diff --git a/libraries/libcmis/libcmis-boost-gcc.patch.gz b/libraries/libcmis/libcmis-boost-gcc.patch.gz
new file mode 100644
index 0000000000..f7468a7b29
--- /dev/null
+++ b/libraries/libcmis/libcmis-boost-gcc.patch.gz
diff --git a/libraries/libcmis/libcmis.SlackBuild b/libraries/libcmis/libcmis.SlackBuild
new file mode 100644
index 0000000000..128eaea984
--- /dev/null
+++ b/libraries/libcmis/libcmis.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for Libcmis
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libcmis
+VERSION=${VERSION:-0.5.0}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if pkg-config --exists cppunit; then cppunit=""; else cppunit="--disable-tests"; fi
+
+# https://github.com/pld-linux/libcmis/blob/master/libcmis-boost-gcc.patch
+# Needed for compiling on current
+zcat $CWD/libcmis-boost-gcc.patch.gz | patch -p1
+
+# generate the configure file
+sed '/configure/d' -i autogen.sh
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --with-boost=/usr/include \
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  $cppunit
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libcmis/libcmis.info b/libraries/libcmis/libcmis.info
new file mode 100644
index 0000000000..40b332077e
--- /dev/null
+++ b/libraries/libcmis/libcmis.info
@@ -0,0 +1,10 @@
+PRGNAM="libcmis"
+VERSION="0.5.0"
+HOMEPAGE="https://github.com/tdf/libcmis"
+DOWNLOAD="https://github.com/tdf/libcmis/archive/v0.5.0.tar.gz"
+MD5SUM="c4ee5bc26b0443769b9761bd3ebb6f03"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libcmis/slack-desc b/libraries/libcmis/slack-desc
new file mode 100644
index 0000000000..718781ba39
--- /dev/null
+++ b/libraries/libcmis/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+libcmis: libcmis (C++ client library for the CMIS interface)
+libcmis:
+libcmis: Libcmis aims at providing a C/C++ client library for the CMIS
+libcmis: protocol. A cmis-client tool is maintained to help testing and 
+libcmis: showing libcmis features.
+libcmis:
+libcmis: Hompage: https://github.com/tdf/libcmis 
+libcmis:
+libcmis:
+libcmis:
+libcmis:
diff --git a/libraries/libcpuid/README b/libraries/libcpuid/README
new file mode 100644
index 0000000000..f78e3ce45c
--- /dev/null
+++ b/libraries/libcpuid/README
@@ -0,0 +1,11 @@
+libcpuid is a small C library for x86 CPU detection and feature extraction. 
+Using it, you can:
+
+* get the processor vendor, model, brand string, code name
+* get information about CPU features such as: number of cores or logical CPUs, cache sizes, CPU clock
+* check if the processor implements a specific instruction set such as the SSE2, 3DNow!
+* execute the CPUID and RDTSC instructions (portably!)
+* and have this all in your commercial application, without getting into trouble.
+
+It works on Windows, Linux and Mac OS X, both 32-bit and 64-bit flavours. Compiler support 
+includes GCC and Microsoft Visual C++ (and compatible, e.g. Intel C++ compiler).
diff --git a/libraries/libcpuid/libcpuid.SlackBuild b/libraries/libcpuid/libcpuid.SlackBuild
new file mode 100644
index 0000000000..59752bf18f
--- /dev/null
+++ b/libraries/libcpuid/libcpuid.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for libcpuid
+
+# Copyright (c) 2015 Cristiano Urban, Gonars, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libcpuid
+VERSION=${VERSION:-0.2.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+libtoolize
+autoreconf --install
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libcpuid/libcpuid.info b/libraries/libcpuid/libcpuid.info
new file mode 100644
index 0000000000..cd26fcf304
--- /dev/null
+++ b/libraries/libcpuid/libcpuid.info
@@ -0,0 +1,10 @@
+PRGNAM="libcpuid"
+VERSION="0.2.2"
+HOMEPAGE="http://libcpuid.sourceforge.net"
+DOWNLOAD="https://github.com/anrieff/libcpuid/archive/v0.2.2.tar.gz"
+MD5SUM="729ed33f806d68e08462c6258012ea12"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Cristiano Urban"
+EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/libraries/libcpuid/slack-desc b/libraries/libcpuid/slack-desc
new file mode 100644
index 0000000000..34aa704442
--- /dev/null
+++ b/libraries/libcpuid/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libcpuid: libcpuid (C library for x86 CPU detection and feature extraction)
+libcpuid:
+libcpuid: libcpuid is a small C library for x86 CPU detection and feature
+libcpuid: extraction.
+libcpuid:
+libcpuid: Homepage: http://libcpuid.sourceforge.net
+libcpuid:
+libcpuid:
+libcpuid:
+libcpuid:
+libcpuid:
diff --git a/libraries/libcue/libcue.info b/libraries/libcue/libcue.info
index 7492c9d40f..12dc15bbf6 100644
--- a/libraries/libcue/libcue.info
+++ b/libraries/libcue/libcue.info
@@ -1,7 +1,7 @@
 PRGNAM="libcue"
 VERSION="1.4.0"
-HOMEPAGE="http://libcue.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/libcue/libcue-1.4.0.tar.bz2"
+HOMEPAGE="https://github.com/lipnitsk/libcue"
+DOWNLOAD="https://github.com/lipnitsk/libcue/releases/download/v1.4.0/libcue-1.4.0.tar.bz2"
 MD5SUM="5f5045f00e6ac92d9a057fe5b0982c69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/libdbusmenu/README b/libraries/libdbusmenu/README
new file mode 100644
index 0000000000..0bb930475c
--- /dev/null
+++ b/libraries/libdbusmenu/README
@@ -0,0 +1,7 @@
+libdbusmenu (library for passing menus over DBus)
+
+libdbusmenu is a small little library that was created by pulling out some comon
+code out of indicator-applet.
+
+It passes a menu structure across DBus so that a program can create a menu simply
+without worrying about how it is displayed on the other side of the bus.
diff --git a/libraries/libdbusmenu/g_type_init.patch b/libraries/libdbusmenu/g_type_init.patch
new file mode 100644
index 0000000000..a050f169e4
--- /dev/null
+++ b/libraries/libdbusmenu/g_type_init.patch
@@ -0,0 +1,26 @@
+--- a/tools/dbusmenu-dumper.c
++++ b/tools/dbusmenu-dumper.c
+@@ -388,7 +388,10 @@
+ int
+ main (int argc, char ** argv)
+ {
++#if GLIB_VERSION_CUR_STABLE < G_ENCODE_VERSION(2, 36)
++	// g_type_init is deprecated after 2.36
+ 	g_type_init();
++#endif
+ 	GError * error = NULL;
+ 	GOptionContext * context;
+ 
+--- a/tools/testapp/main.c
++++ b/tools/testapp/main.c
+@@ -135,7 +135,10 @@
+ 
+ int main (int argc, char ** argv)
+ {
++#if GLIB_VERSION_CUR_STABLE < G_ENCODE_VERSION(2, 36)
++	// g_type_init is deprecated after 2.36
+ 	g_type_init();
++#endif
+ 
+ 	if (argc != 2) {
+ 		g_warning(USAGE);
diff --git a/libraries/libdbusmenu/libdbusmenu.SlackBuild b/libraries/libdbusmenu/libdbusmenu.SlackBuild
new file mode 100644
index 0000000000..03bdc11d85
--- /dev/null
+++ b/libraries/libdbusmenu/libdbusmenu.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# Slackware build script for libdbusmenu.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libdbusmenu
+VERSION=${VERSION:-12.10.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/g_type_init.patch
+patch -p1 < $CWD/reference-xinclude.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+DOCS="AUTHORS ChangeLog COPYING* INSTALL NEWS README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libdbusmenu/libdbusmenu.info b/libraries/libdbusmenu/libdbusmenu.info
new file mode 100644
index 0000000000..2946514cec
--- /dev/null
+++ b/libraries/libdbusmenu/libdbusmenu.info
@@ -0,0 +1,10 @@
+PRGNAM="libdbusmenu"
+VERSION="12.10.2"
+HOMEPAGE="https://launchpad.net/libdbusmenu/"
+DOWNLOAD="https://launchpad.net/libdbusmenu/12.10/12.10.2/+download/libdbusmenu-12.10.2.tar.gz"
+MD5SUM="e30fc986b447f62513d61225fa573a70"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="json-glib"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/libdbusmenu/reference-xinclude.patch b/libraries/libdbusmenu/reference-xinclude.patch
new file mode 100644
index 0000000000..a4e6ee3a0b
--- /dev/null
+++ b/libraries/libdbusmenu/reference-xinclude.patch
@@ -0,0 +1,22 @@
+--- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
++++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
+@@ -15,9 +15,6 @@
+     <xi:include href="xml/menuitem-proxy.xml"/>
+     <xi:include href="xml/menuitem.xml"/>
+     <xi:include href="xml/client.xml"/>
+-    <xi:include href="xml/client-menuitem.xml"/>
+-    <xi:include href="xml/dbusmenu-client.xml"/>
+-    <xi:include href="xml/dbusmenu-server.xml"/>
+     <xi:include href="xml/types.xml"/>
+ 
+   </chapter>
+--- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
++++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
+@@ -15,7 +15,6 @@
+     <xi:include href="xml/menuitem.xml"/>
+     <xi:include href="xml/client.xml"/>
+     <xi:include href="xml/parser.xml"/>
+-    <xi:include href="xml/serializablemenuitem.xml"/>
+ 
+   </chapter>
+   <chapter id="object-tree">
diff --git a/libraries/libdbusmenu/slack-desc b/libraries/libdbusmenu/slack-desc
new file mode 100644
index 0000000000..6e0f840eb5
--- /dev/null
+++ b/libraries/libdbusmenu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+libdbusmenu: libdbusmenu (library for passing menus over DBus)
+libdbusmenu:
+libdbusmenu: libdbusmenu passes a menu structure across DBus so that a program can 
+libdbusmenu: create a menu simply without worrying about how it is displayed on 
+libdbusmenu: the other side of the bus.
+libdbusmenu:
+libdbusmenu: Home page: https://launchpad.net/libdbusmenu/
+libdbusmenu:
+libdbusmenu:
+libdbusmenu:
+libdbusmenu:
diff --git a/libraries/libdc1394/libdc1394.SlackBuild b/libraries/libdc1394/libdc1394.SlackBuild
index d53543c129..24f1fce178 100644
--- a/libraries/libdc1394/libdc1394.SlackBuild
+++ b/libraries/libdc1394/libdc1394.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libdc1394
 
-# Copyright 2010-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libdc1394
-VERSION=${VERSION:-2.2.2}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-doxygen-man \
   --disable-silent-rules \
   --enable-static=no \
@@ -91,7 +90,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libdc1394/libdc1394.info b/libraries/libdc1394/libdc1394.info
index ece2f3cecb..f266ffaddf 100644
--- a/libraries/libdc1394/libdc1394.info
+++ b/libraries/libdc1394/libdc1394.info
@@ -1,8 +1,8 @@
 PRGNAM="libdc1394"
-VERSION="2.2.2"
+VERSION="2.2.3"
 HOMEPAGE="http://damien.douxchamps.net/ieee1394/libdc1394/"
-DOWNLOAD="http://downloads.sourceforge.net/libdc1394/libdc1394-2.2.2.tar.gz"
-MD5SUM="6544c6abb9ba41840c7d36f95ff4d593"
+DOWNLOAD="http://downloads.sourceforge.net/libdc1394/libdc1394-2.2.3.tar.gz"
+MD5SUM="443d0638e51054ff37fb8e551e07672a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libe-book/README b/libraries/libe-book/README
new file mode 100644
index 0000000000..c667037f07
--- /dev/null
+++ b/libraries/libe-book/README
@@ -0,0 +1,17 @@
+Libe-book is a library and a set of tools for reading and converting
+various reflowable e-book formats.
+
+Currently supported are:
+- Broad Band eBook
+- eReader .pdb
+- FictionBook v. 2 (including zipped files)
+- PalmDoc Ebook
+- Plucker .pdb
+- QiOO (mobile format, for java-enabled cellphones)
+- TCR (simple compressed text format)
+- TealDoc
+- zTXT
+- ZVR (simple compressed text format)
+
+To build the doxygen html documentation use DOC="yes".
+To build the tests, install cppunit before running this script.
diff --git a/libraries/libe-book/libe-book.SlackBuild b/libraries/libe-book/libe-book.SlackBuild
new file mode 100644
index 0000000000..52893aa65e
--- /dev/null
+++ b/libraries/libe-book/libe-book.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for libe-book
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libe-book
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+if pkg-config --exists cppunit; then cppunit=""; else cppunit="--disable-tests"; fi
+
+CFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+CXXFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc \
+  $cppunit
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libe-book/libe-book.info b/libraries/libe-book/libe-book.info
new file mode 100644
index 0000000000..6db1b9c4b4
--- /dev/null
+++ b/libraries/libe-book/libe-book.info
@@ -0,0 +1,10 @@
+PRGNAM="libe-book"
+VERSION="0.1.2"
+HOMEPAGE="https://sourceforge.net/projects/libebook/"
+DOWNLOAD="http://sourceforge.net/projects/libebook/files/libe-book-0.1.2/libe-book-0.1.2.tar.xz"
+MD5SUM="19d84f4a97aab32d350d1f47ea3da0b3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libe-book/slack-desc b/libraries/libe-book/slack-desc
new file mode 100644
index 0000000000..36b328496c
--- /dev/null
+++ b/libraries/libe-book/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+libe-book: libe-book (reflowable e-book import library)
+libe-book:
+libe-book: libe-book is a library and a set of tools for reading and converting
+libe-book: various reflowable e-book formats.
+libe-book:
+libe-book: Homepage: https://sourceforge.net/projects/libebook/
+libe-book:
+libe-book:
+libe-book:
+libe-book:
+libe-book:
\ No newline at end of file
diff --git a/libraries/libeot/README b/libraries/libeot/README
new file mode 100644
index 0000000000..01668edc60
--- /dev/null
+++ b/libraries/libeot/README
@@ -0,0 +1,4 @@
+Library for parsing Embedded OpenType files (Microsoft embedded font
+"standard"), and converting them to other formats.
+
+Read the PATENTS file for important information on patents.
diff --git a/libraries/libeot/libeot.SlackBuild b/libraries/libeot/libeot.SlackBuild
new file mode 100644
index 0000000000..15fed26b7a
--- /dev/null
+++ b/libraries/libeot/libeot.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for libeot
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libeot
+VERSION=${VERSION:-0.01}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+autoreconf -i
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE PATENTS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libeot/libeot.info b/libraries/libeot/libeot.info
new file mode 100644
index 0000000000..ce123a5922
--- /dev/null
+++ b/libraries/libeot/libeot.info
@@ -0,0 +1,10 @@
+PRGNAM="libeot"
+VERSION="0.01"
+HOMEPAGE="https://github.com/umanwizard/libeot"
+DOWNLOAD="https://github.com/umanwizard/libeot/archive/v0.01.tar.gz"
+MD5SUM="891ec10e22c090a09420dbbb5efacfd3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libeot/slack-desc b/libraries/libeot/slack-desc
new file mode 100644
index 0000000000..c9d3e026bb
--- /dev/null
+++ b/libraries/libeot/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libeot: libeot (Embedded OpenType Import Library)
+libeot:
+libeot: Library for parsing Embedded OpenType files (Microsoft embedded font
+libeot: "standard"), and converting them to other formats 
+libeot:
+libeot: Homepage: https://github.com/umanwizard/libeot
+libeot:
+libeot:
+libeot:
+libeot:
+libeot:
diff --git a/libraries/libetonyek/README b/libraries/libetonyek/README
new file mode 100644
index 0000000000..b584bf4785
--- /dev/null
+++ b/libraries/libetonyek/README
@@ -0,0 +1,8 @@
+Libetonyek is an import filter library for Apple Keynote presentations,
+based on librevenge. It can import presentations of Keynote versions
+2-5. Support for version 6 is planned. Support for Pages and Numbers
+is planned as well. The library is a part of the Document Liberation
+Project.
+
+To build the doxygen html documentation use DOC="yes".
+To build the tests, install cppunit before running this script.
diff --git a/libraries/libetonyek/libetonyek.SlackBuild b/libraries/libetonyek/libetonyek.SlackBuild
new file mode 100644
index 0000000000..b11d4a2022
--- /dev/null
+++ b/libraries/libetonyek/libetonyek.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for libetonyek
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libetonyek
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+if pkg-config --exists cppunit; then cppunit=""; else cppunit="--disable-tests"; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc \
+  $cppunit
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog FEATURES NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libetonyek/libetonyek.info b/libraries/libetonyek/libetonyek.info
new file mode 100644
index 0000000000..4e178e78a2
--- /dev/null
+++ b/libraries/libetonyek/libetonyek.info
@@ -0,0 +1,10 @@
+PRGNAM="libetonyek"
+VERSION="0.1.3"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.3.tar.xz"
+MD5SUM="8a2c7de34b5c02f4a75ba086bc5af57b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="glm librevenge mdds"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libetonyek/slack-desc b/libraries/libetonyek/slack-desc
new file mode 100644
index 0000000000..db4b6134fb
--- /dev/null
+++ b/libraries/libetonyek/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+libetonyek: libetonyek (Apple Keynote Import Library)
+libetonyek:
+libetonyek: Libetonyek is a library that parses the file format of Apple Keynote
+libetonyek: documents. It supports Keynote versions 2-5. Version 6 is planned for
+libetonyek: near future. There is also an initial support for Pages and Numbers.
+libetonyek:
+libetonyek:
+libetonyek:
+libetonyek:
+libetonyek:
+libetonyek:
diff --git a/libraries/libevhtp/libevhtp.SlackBuild b/libraries/libevhtp/libevhtp.SlackBuild
index 57d12c71d0..ad161da63b 100644
--- a/libraries/libevhtp/libevhtp.SlackBuild
+++ b/libraries/libevhtp/libevhtp.SlackBuild
@@ -25,8 +25,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libevhtp
-VERSION=${VERSION:-1.2.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.11n}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,6 +71,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# fix wrong version number
+sed -i "s/@PROJECT_VERSION@/${VERSION}/" evhtp.pc.in
+
 mkdir -p build
 cd build
   cmake \
@@ -85,6 +88,14 @@ cd build
   make install/strip DESTDIR=$PKG
 cd ..
 
+if [ "$ARCH" = "x86_64" ]; then
+  (
+   cd $PKG
+   mv usr/lib/pkgconfig usr/lib${LIBDIRSUFFIX}
+   rm -rf usr/lib
+  )
+fi
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog LICENSE README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/libevhtp/libevhtp.info b/libraries/libevhtp/libevhtp.info
index 92e0299cd1..30494f22b1 100644
--- a/libraries/libevhtp/libevhtp.info
+++ b/libraries/libevhtp/libevhtp.info
@@ -1,8 +1,8 @@
 PRGNAM="libevhtp"
-VERSION="1.2.10"
+VERSION="1.2.11n"
 HOMEPAGE="https://github.com/ellzey/libevhtp/"
-DOWNLOAD="https://github.com/ellzey/libevhtp/archive/1.2.10.tar.gz"
-MD5SUM="e7261c7e34654f78047431d169b88806"
+DOWNLOAD="https://github.com/ellzey/libevhtp/archive/1.2.11n.tar.gz"
+MD5SUM="38e11f0623ce13c01ce7626d11ddffd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libewf/libewf.SlackBuild b/libraries/libewf/libewf.SlackBuild
index 5ab18d63e4..189e2189b8 100644
--- a/libraries/libewf/libewf.SlackBuild
+++ b/libraries/libewf/libewf.SlackBuild
@@ -27,7 +27,7 @@
 PRGNAM=libewf
 STATUS=${STATUS:-experimental}
 VERSION=${VERSION:-20150126}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -73,7 +73,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu89" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libexttextcat/README b/libraries/libexttextcat/README
new file mode 100644
index 0000000000..3b9743c04a
--- /dev/null
+++ b/libraries/libexttextcat/README
@@ -0,0 +1,20 @@
+Libtextcat is a library with functions that implement the
+classification technique described in Cavnar & Trenkle, "N-Gram-Based
+Text Categorization". It was primarily developed for language
+guessing, a task on which it is known to perform with near-perfect
+accuracy.
+     
+The central idea of the Cavnar & Trenkle technique is to calculate a
+"fingerprint" of a document with an unknown category, and compare this
+with the fingerprints of a number of documents of which the categories
+are known. The categories of the closest matches are output as the
+classification. A fingerprint is a list of the most frequent n-grams
+occurring in a document, ordered by frequency. Fingerprints are
+compared with a simple out-of-place metric. See the article for more
+details.
+     
+Considerable effort went into making this implementation fast and
+efficient. The language guesser processes over 100 documents/second on
+a simple PC, which makes it practical for many uses. It was developed
+for use in our webcrawler and search engine software, in which it it
+handles millions of documents a day.
diff --git a/libraries/libexttextcat/libexttextcat.SlackBuild b/libraries/libexttextcat/libexttextcat.SlackBuild
new file mode 100644
index 0000000000..5660f3930c
--- /dev/null
+++ b/libraries/libexttextcat/libexttextcat.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for libexttextcat
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libexttextcat
+VERSION=${VERSION:-3.4.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE READM* TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libexttextcat/libexttextcat.info b/libraries/libexttextcat/libexttextcat.info
new file mode 100644
index 0000000000..cf4e410507
--- /dev/null
+++ b/libraries/libexttextcat/libexttextcat.info
@@ -0,0 +1,10 @@
+PRGNAM="libexttextcat"
+VERSION="3.4.4"
+HOMEPAGE="https://wiki.freedesktop.org/www/Software/libexttextcat/"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.4.tar.xz"
+MD5SUM="bfa7107c27afda3a3afa4b7ab5a3fe17"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libexttextcat/slack-desc b/libraries/libexttextcat/slack-desc
new file mode 100644
index 0000000000..4799cd6380
--- /dev/null
+++ b/libraries/libexttextcat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+libexttextcat: libexttextcat (N-Gram-Based Text Categorization library)
+libexttextcat:
+libexttextcat: Libtextcat is a library with functions that implement the 
+libexttextcat: classification technique described in Cavnar & Trenkle, "N-Gram-Based
+libexttextcat: Text Categorization". It was primarily developed for language
+libexttextcat: guessing, a task on which it is known to perform with near-perfect
+libexttextcat: accuracy.
+libexttextcat:
+libexttextcat: Homepage: https://wiki.freedesktop.org/www/Software/libexttextcat/
+libexttextcat:
+libexttextcat:
diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info
index 0a1dfbcebb..90adcd01b0 100644
--- a/libraries/libffado/libffado.info
+++ b/libraries/libffado/libffado.info
@@ -1,7 +1,7 @@
 PRGNAM="libffado"
 VERSION="2.1.0"
 HOMEPAGE="http://www.ffado.org/"
-DOWNLOAD="http://www.ffado.org/files/libffado-2.1.0.tgz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/libffado/libffado-2.1.0.tgz/26bce2be0b9c1fa4e614f2f494edf388/libffado-2.1.0.tgz"
 MD5SUM="26bce2be0b9c1fa4e614f2f494edf388"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/libfilteraudio/libfilteraudio.SlackBuild b/libraries/libfilteraudio/libfilteraudio.SlackBuild
index ae706e56ae..3f35870879 100644
--- a/libraries/libfilteraudio/libfilteraudio.SlackBuild
+++ b/libraries/libfilteraudio/libfilteraudio.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libfilteraudio
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libfilteraudio
-VERSION=${VERSION:-20150516}
+VERSION=${VERSION:-20160614_2fc6695}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libfilteraudio/libfilteraudio.info b/libraries/libfilteraudio/libfilteraudio.info
index dacacf3759..de8bf69470 100644
--- a/libraries/libfilteraudio/libfilteraudio.info
+++ b/libraries/libfilteraudio/libfilteraudio.info
@@ -1,8 +1,8 @@
 PRGNAM="libfilteraudio"
-VERSION="20150516"
+VERSION="20160614_2fc6695"
 HOMEPAGE="https://github.com/irungentoo/libfilteraudio"
-DOWNLOAD="http://mirror.slackware.hr/sources/libfilteraudio/libfilteraudio-20150516.tar.bz2"
-MD5SUM="79083d987edc8ffe7a9f6edae6c5b16f"
+DOWNLOAD="http://mirror.slackware.hr/sources/libfilteraudio/libfilteraudio-20160614_2fc6695.tar.bz2"
+MD5SUM="53c68653a32dec319dc7930edbf37e46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL"
diff --git a/libraries/libfreehand/README b/libraries/libfreehand/README
new file mode 100644
index 0000000000..d8fd7e4476
--- /dev/null
+++ b/libraries/libfreehand/README
@@ -0,0 +1,5 @@
+Libfreehand is an import filter library for Aldus/Macromedia/Adobe
+FreeHand files, based on librevenge. It is a part of the Document
+Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libfreehand/libfreehand.SlackBuild b/libraries/libfreehand/libfreehand.SlackBuild
new file mode 100644
index 0000000000..1d8802c3ad
--- /dev/null
+++ b/libraries/libfreehand/libfreehand.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for libfreehand
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libfreehand
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libfreehand/libfreehand.info b/libraries/libfreehand/libfreehand.info
new file mode 100644
index 0000000000..2583af9ac2
--- /dev/null
+++ b/libraries/libfreehand/libfreehand.info
@@ -0,0 +1,10 @@
+PRGNAM="libfreehand"
+VERSION="0.1.1"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.1.tar.xz"
+MD5SUM="97eb6a8607de3c101ad05ceacc122107"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libfreehand/slack-desc b/libraries/libfreehand/slack-desc
new file mode 100644
index 0000000000..1c4e1bf01a
--- /dev/null
+++ b/libraries/libfreehand/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+libfreehand: libfreehand (Adobe FreeHand Import Library)
+libfreehand:
+libfreehand: Libfreehand is a library that parses the file format of
+libfreehand: Aldus/Macromedia/Adobe FreeHand documents. It supports
+libfreehand: documents from version 3 to 11.
+libfreehand:
+libfreehand:
+libfreehand:
+libfreehand:
+libfreehand:
+libfreehand:
diff --git a/libraries/libgaminggear/90-uinput.rules b/libraries/libgaminggear/90-uinput.rules
new file mode 100644
index 0000000000..400df0a0e2
--- /dev/null
+++ b/libraries/libgaminggear/90-uinput.rules
@@ -0,0 +1,2 @@
+KERNEL=="uinput", GROUP="uinput-users", MODE="0660"
+KERNEL=="uhid", GROUP="uinput-users", MODE="0660"
diff --git a/libraries/libgaminggear/README b/libraries/libgaminggear/README
new file mode 100644
index 0000000000..9253e2a310
--- /dev/null
+++ b/libraries/libgaminggear/README
@@ -0,0 +1,12 @@
+Libgaminggear provides functions and widgets common for gaming input
+devices.
+
+For input events to work for users (needed for software macros and such)
+they need access rights for uinput or uhid. To use them as normal user
+you should create an extra group like
+
+    # groupadd -r -g 317 uinput-users
+
+and add all needed users to this group
+
+    # usermod -a -G uinput-users $USER
diff --git a/libraries/libgaminggear/libgaminggear.SlackBuild b/libraries/libgaminggear/libgaminggear.SlackBuild
new file mode 100644
index 0000000000..98c137be54
--- /dev/null
+++ b/libraries/libgaminggear/libgaminggear.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for libgaminggear
+
+# Copyright 2015 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libgaminggear
+VERSION=${VERSION:-0.11.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+GROUP=${GROUP:-uinput-users}
+
+# Check the system group for uinput-users:
+if ! grep -q ^"$GROUP": /etc/group ; then
+  echo "  You will need a system group to add users to for input events to work"
+  echo "    # groupadd -r -g 317 $GROUP"
+  echo "  should do the job. Add your user to this group."
+  exit 1
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# setup udev rules for uinput and uhid modules
+mkdir -p $PKG/lib/udev/rules.d
+install -m 644 $CWD/90-uinput.rules $PKG/lib/udev/rules.d/
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libgaminggear/libgaminggear.info b/libraries/libgaminggear/libgaminggear.info
new file mode 100644
index 0000000000..a883499a8a
--- /dev/null
+++ b/libraries/libgaminggear/libgaminggear.info
@@ -0,0 +1,10 @@
+PRGNAM="libgaminggear"
+VERSION="0.11.2"
+HOMEPAGE="http://sourceforge.net/projects/libgaminggear/"
+DOWNLOAD="http://downloads.sourceforge.net/libgaminggear/libgaminggear-0.11.2.tar.bz2"
+MD5SUM="ee960e4a6af28f4cd586a613cef0b893"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/libraries/libgaminggear/slack-desc b/libraries/libgaminggear/slack-desc
new file mode 100644
index 0000000000..99e6906306
--- /dev/null
+++ b/libraries/libgaminggear/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+libgaminggear: libgaminggear (Libraries for gaming input devices)
+libgaminggear:
+libgaminggear: Libgaminggear provides functions and widgets common for gaming input
+libgaminggear: devices.
+libgaminggear:
+libgaminggear:
+libgaminggear:
+libgaminggear:
+libgaminggear: Homepage: http://sourceforge.net/projects/libgaminggear/
+libgaminggear:
+libgaminggear:
diff --git a/libraries/libgit2/libgit2.SlackBuild b/libraries/libgit2/libgit2.SlackBuild
index 5006e6eaa3..6c529bda17 100644
--- a/libraries/libgit2/libgit2.SlackBuild
+++ b/libraries/libgit2/libgit2.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libgit2
-VERSION=${VERSION:-0.22.2}
+VERSION=${VERSION:-0.23.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DTHREADSAFE:BOOL=ON \
+    -DUSE_ICONV:BOOL=ON \
     -DLIB_INSTALL_DIR:PATH="lib${LIBDIRSUFFIX}" \
     -DCMAKE_BUILD_TYPE=Release ..
 
diff --git a/libraries/libgit2/libgit2.info b/libraries/libgit2/libgit2.info
index f1457e275a..3ebb705eea 100644
--- a/libraries/libgit2/libgit2.info
+++ b/libraries/libgit2/libgit2.info
@@ -1,8 +1,8 @@
 PRGNAM="libgit2"
-VERSION="0.22.2"
+VERSION="0.23.4"
 HOMEPAGE="https://libgit2.github.com/"
-DOWNLOAD="https://github.com/libgit2/libgit2/archive/v0.22.2.tar.gz"
-MD5SUM="7b21448c471dc76a3ca4801b61ac856a"
+DOWNLOAD="https://github.com/libgit2/libgit2/archive/v0.23.4.tar.gz"
+MD5SUM="b7db3ab71dfa19fe1dc7fef76d6af216"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libgltf/README b/libraries/libgltf/README
new file mode 100644
index 0000000000..7c26fd56bc
--- /dev/null
+++ b/libraries/libgltf/README
@@ -0,0 +1,9 @@
+LIBGLTF is a C++ library for rendering OpenGL models stored in glTF format.
+
+The glTF, the GL Transmission Format, is the runtime asset format for
+the GL APIs: WebGL, OpenGL ES, and OpenGL. glTF bridges the gap between
+formats used by modeling tools and the GL APIs.
+
+LIBGLTF provides methods to load the OpenGL scene from glTF format and render
+it into an existing OpenGL context. LIBGLTF also allows to change the camera
+position so the scene can be displayed from different points of view.
diff --git a/libraries/libgltf/libgltf.SlackBuild b/libraries/libgltf/libgltf.SlackBuild
new file mode 100644
index 0000000000..02d4b6ef19
--- /dev/null
+++ b/libraries/libgltf/libgltf.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for libgltf
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libgltf
+VERSION=${VERSION:-0.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libgltf/libgltf.info b/libraries/libgltf/libgltf.info
new file mode 100644
index 0000000000..85ce5f5797
--- /dev/null
+++ b/libraries/libgltf/libgltf.info
@@ -0,0 +1,10 @@
+PRGNAM="libgltf"
+VERSION="0.0.2"
+HOMEPAGE="https://wiki.documentfoundation.org/Development/libgltf"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"
+MD5SUM="d63a9f47ab048f5009d90693d6aa6424"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="glm"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libgltf/slack-desc b/libraries/libgltf/slack-desc
new file mode 100644
index 0000000000..3ba0b76670
--- /dev/null
+++ b/libraries/libgltf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+libgltf: libgltf (rendering library for glTF models)
+libgltf:
+libgltf: LIBGLTF is a C++ library for rendering OpenGL models stored in glTF 
+libgltf: format.
+libgltf:
+libgltf: Homepage: https://wiki.documentfoundation.org/Development/libgltf
+libgltf:
+libgltf:
+libgltf:
+libgltf:
+libgltf:
diff --git a/libraries/libgme/README b/libraries/libgme/README
new file mode 100644
index 0000000000..2e797a99dc
--- /dev/null
+++ b/libraries/libgme/README
@@ -0,0 +1,2 @@
+libgme/game-music-emu is a library that handles processing of
+multiple video game music formats.
diff --git a/libraries/libgme/libgme.SlackBuild b/libraries/libgme/libgme.SlackBuild
new file mode 100644
index 0000000000..3364bf5491
--- /dev/null
+++ b/libraries/libgme/libgme.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for libgme
+
+# Copyright 2015 pomfland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libgme
+_PRGNAM=game-music-emu
+VERSION=${VERSION:-0.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $_PRGNAM-$VERSION
+tar xvf $CWD/$_PRGNAM-$VERSION.tar.bz2
+cd $_PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+  rm -rf $PKG/usr/lib
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a {changes,design,gme,license,readme}.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libgme/libgme.info b/libraries/libgme/libgme.info
new file mode 100644
index 0000000000..272eab3f2b
--- /dev/null
+++ b/libraries/libgme/libgme.info
@@ -0,0 +1,10 @@
+PRGNAM="libgme"
+VERSION="0.6.0"
+HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu/wiki/Home"
+DOWNLOAD="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.0.tar.bz2"
+MD5SUM="b98fafb737bc889dc65e7a8b94bd1bf5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="pomfland"
+EMAIL="pomfland@tfwno.gf"
diff --git a/libraries/libgme/slack-desc b/libraries/libgme/slack-desc
new file mode 100644
index 0000000000..90e75e054a
--- /dev/null
+++ b/libraries/libgme/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libgme: libgme (a video game music library)
+libgme:
+libgme: libgme/game-music-emu is a library that handles processing of
+libgme: multiple video game music formats.
+libgme:
+libgme: Homepage: https://bitbucket.org/mpyne/game-music-emu/wiki/Home
+libgme:
+libgme:
+libgme:
+libgme:
+libgme:
diff --git a/libraries/libharu/README b/libraries/libharu/README
new file mode 100644
index 0000000000..c788ae8647
--- /dev/null
+++ b/libraries/libharu/README
@@ -0,0 +1 @@
+libHaru is a free, cross platform, open source library for generating PDF files.
diff --git a/libraries/libharu/libharu.SlackBuild b/libraries/libharu/libharu.SlackBuild
new file mode 100644
index 0000000000..04188505b8
--- /dev/null
+++ b/libraries/libharu/libharu.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for libharu
+
+# Copyright 2015 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libharu
+VERSION=${VERSION:-2.3.0}
+TARVERSION=RELEASE_$(echo $VERSION | tr . _)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$TARVERSION
+tar xvf $CWD/$PRGNAM-$TARVERSION.tar.gz || tar xvf $CWD/$TARVERSION.tar.gz
+cd $PRGNAM-$TARVERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+>include/config.h.in
+aclocal
+libtoolize
+automake --add-missing
+autoconf
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+cd if/ruby
+  ruby extconf.rb
+  make install DESTDIR=$PKG
+cd - >/dev/null
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libharu/libharu.info b/libraries/libharu/libharu.info
new file mode 100644
index 0000000000..bdaffa00e5
--- /dev/null
+++ b/libraries/libharu/libharu.info
@@ -0,0 +1,10 @@
+PRGNAM="libharu"
+VERSION="2.3.0"
+HOMEPAGE="http://libharu.org/"
+DOWNLOAD="https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"
+MD5SUM="4f916aa49c3069b3a10850013c507460"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/libraries/libharu/slack-desc b/libraries/libharu/slack-desc
new file mode 100644
index 0000000000..97a0ec39d0
--- /dev/null
+++ b/libraries/libharu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+libharu: libharu (library for generating PDF files)
+libharu:
+libharu: libHaru is a free, cross platform, open source library for generating
+libharu: PDF files.
+libharu:
+libharu: http://libharu.org/
+libharu: https://github.com/libharu/libharu/
+libharu:
+libharu:
+libharu:
+libharu:
diff --git a/libraries/libhtp/libhtp.SlackBuild b/libraries/libhtp/libhtp.SlackBuild
index ef430f865b..6a167b1aa8 100644
--- a/libraries/libhtp/libhtp.SlackBuild
+++ b/libraries/libhtp/libhtp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libhtp
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libhtp
-VERSION=${VERSION:-0.5.17}
+VERSION=${VERSION:-0.5.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libhtp/libhtp.info b/libraries/libhtp/libhtp.info
index 046dc88577..e0fdfd20de 100644
--- a/libraries/libhtp/libhtp.info
+++ b/libraries/libhtp/libhtp.info
@@ -1,8 +1,8 @@
 PRGNAM="libhtp"
-VERSION="0.5.17"
+VERSION="0.5.18"
 HOMEPAGE="https://github.com/OISF/libhtp"
-DOWNLOAD="https://github.com/OISF/libhtp/archive/0.5.17.tar.gz"
-MD5SUM="97aa6e58c87078012a1ed9c9d46c31cf"
+DOWNLOAD="https://github.com/OISF/libhtp/archive/0.5.18.tar.gz"
+MD5SUM="c160f27b7865732790eac8c805d111c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libixion/README b/libraries/libixion/README
new file mode 100644
index 0000000000..18d81f47c8
--- /dev/null
+++ b/libraries/libixion/README
@@ -0,0 +1,9 @@
+The goal of this project is to create a library for calculating the
+results of formula expressions stored in multiple named targets, or
+"cells".  The cells can be referenced from each other, and the library
+takes care of resolving their dependencies automatically upon calculation.
+The caller can run the calculation routine either in a single-threaded
+mode, or a multi-threaded mode.  The library also supports re-calculations
+where the contents of one or more cells have been modified since the last
+calculation, and a partial calculation of only the affected cells need to
+be calculated.
diff --git a/libraries/libixion/libixion.SlackBuild b/libraries/libixion/libixion.SlackBuild
new file mode 100644
index 0000000000..15470323de
--- /dev/null
+++ b/libraries/libixion/libixion.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for libixion
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libixion
+VERSION=${VERSION:-0.9.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-boost=/usr/include \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libixion/libixion.info b/libraries/libixion/libixion.info
new file mode 100644
index 0000000000..7586bd5ea0
--- /dev/null
+++ b/libraries/libixion/libixion.info
@@ -0,0 +1,10 @@
+PRGNAM="libixion"
+VERSION="0.9.1"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+DOWNLOAD="http://kohei.us/files/ixion/src/libixion-0.9.1.tar.xz"
+MD5SUM="d292f6d62847f2305178459390842eac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="mdds"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libixion/slack-desc b/libraries/libixion/slack-desc
new file mode 100644
index 0000000000..ab4da2aa1c
--- /dev/null
+++ b/libraries/libixion/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libixion: libixion (general purpose formula parser & interpreter)
+libixion:
+libixion: Ixion is a general purpose formula parser & interpreter that can
+libixion: calculate multiple named targets, or "cells".
+libixion:
+libixion: Homepage: https://gitlab.com/ixion/ixion
+libixion:
+libixion:
+libixion:
+libixion:
+libixion:
diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
index f2ed388bde..e33fb35ee7 100644
--- a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
+++ b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libjpeg-turbo
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.info b/libraries/libjpeg-turbo/libjpeg-turbo.info
index f8c4b04c87..3b26c3b8a5 100644
--- a/libraries/libjpeg-turbo/libjpeg-turbo.info
+++ b/libraries/libjpeg-turbo/libjpeg-turbo.info
@@ -1,8 +1,8 @@
 PRGNAM="libjpeg-turbo"
-VERSION="1.4.1"
+VERSION="1.4.2"
 HOMEPAGE="http://libjpeg-turbo.virtualgl.org"
-DOWNLOAD="http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.4.1.tar.gz"
-MD5SUM="b1f6b84859a16b8ebdcda951fa07c3f2"
+DOWNLOAD="http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.4.2.tar.gz"
+MD5SUM="86b0d5f7507c2e6c21c00219162c3c44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libkface/README b/libraries/libkface/README
new file mode 100644
index 0000000000..8ccd70bdbc
--- /dev/null
+++ b/libraries/libkface/README
@@ -0,0 +1,2 @@
+A Qt/C++ wrapper around LibFace library to perform face recognition
+and detection over pictures.
diff --git a/libraries/libkface/libkface.SlackBuild b/libraries/libkface/libkface.SlackBuild
new file mode 100644
index 0000000000..51dad62750
--- /dev/null
+++ b/libraries/libkface/libkface.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for libkface
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libkface
+VERSION=${VERSION:-15.08.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# patch to support OpenCV3
+# https://quickgit.kde.org/?p=libkface.git&a=commit&h=a53bcebbfc4e6c42ee73adddc41f8c2f8f8f39c8
+patch -p1 < $CWD/libkface.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DENABLE_OPENCV3=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* AUTHORS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libkface/libkface.info b/libraries/libkface/libkface.info
new file mode 100644
index 0000000000..3f13e95821
--- /dev/null
+++ b/libraries/libkface/libkface.info
@@ -0,0 +1,10 @@
+PRGNAM="libkface"
+VERSION="15.08.2"
+HOMEPAGE="https://www.digikam.org"
+DOWNLOAD="http://download.kde.org/stable/applications/15.08.2/src/libkface-15.08.2.tar.xz"
+MD5SUM="ab51bf06908c4580769fed3bd2e2d774"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="opencv"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/libkface/libkface.patch b/libraries/libkface/libkface.patch
new file mode 100644
index 0000000000..dff5711b74
--- /dev/null
+++ b/libraries/libkface/libkface.patch
@@ -0,0 +1,418 @@
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Sat, 05 Sep 2015 19:20:22 +0000
+Subject: apply patch #94414 to support OpenCV3
+X-Git-Url: http://quickgit.kde.org/?p=libkface.git&a=commitdiff&h=a53bcebbfc4e6c42ee73adddc41f8c2f8f8f39c8
+---
+apply patch #94414 to support OpenCV3
+CCBUGS: 349601
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,8 @@
+ 
+ message(STATUS "----------------------------------------------------------------------------------")
+ message(STATUS "Starting CMake configuration for: libkface")
++
++option(ENABLE_OPENCV3 "Build libkface with OpenCV3 instead OpenCV2 (default=OFF)" OFF)
+ 
+ find_package(Qt4 4.6.0 REQUIRED)
+ find_package(KDE4 REQUIRED)
+@@ -30,7 +32,12 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ 
+ include(MacroOpenCV)
+-DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
++
++if (ENABLE_OPENCV3)
++    DETECT_OPENCV(3.0.0 core face highgui objdetect imgproc)
++else()
++    DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
++endif()
+ 
+ include_directories(${OpenCV_INCLUDE_DIRS})
+ 
+
+--- a/README
++++ b/README
+@@ -20,6 +20,11 @@
+ libqt      >= 4.6.x                    http://www.qtsoftware.com
+ libkde     >= 4.4.x                    http://www.kde.org
+ libopencv  >= 2.4.9                    http://opencv.willowgarage.com/wiki    (with opencv 'haarcascades' data files)
++
++CMake compilation options to custom libkface:
++
++Use CMake "-DENABLE_OPENCV3=on"        flag to compile libkface source code using OpenCV3 instead OpenCV2 (disabled by default).
++                                       OpenCV3 support needs extra contrib modules package, especially 'face' and 'legacy' components.
+ 
+ -- INSTALL ------------------------------------------------------------
+ 
+
+--- a/libkface/CMakeLists.txt
++++ b/libkface/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com>
++# Copyright (c) 2010-2015, Gilles Caulier, <caulier dot gilles at gmail dot com>
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+--- a/libkface/detection/opencvfacedetector.cpp
++++ b/libkface/detection/opencvfacedetector.cpp
+@@ -18,7 +18,7 @@
+  *         <a href="alexjironkin at gmail dot com">alexjironkin at gmail dot com</a>
+  * @author Copyright (C) 2010 by Aditya Bhatt
+  *         <a href="adityabhatt at gmail dot com">adityabhatt at gmail dot com</a>
+- * @author Copyright (C) 2010-2014 by Gilles Caulier
++ * @author Copyright (C) 2010-2015 by Gilles Caulier
+  *         <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  * @author Copyright (C) 2010-2013 by Marcel Wiesweg
+  *         <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
+@@ -136,13 +136,14 @@
+ 
+     cv::Size getOriginalWindowSize() const
+     {
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11)
+         // This is a HACK which may break any time. Work around the fact that getOriginalWindowSize()
+         // always returns (0,0) and we need these values.
+         if (oldCascade)
+         {
+             return oldCascade->orig_window_size;
+         }
+-
++#endif
+         return cv::Size(0, 0);
+     }
+ 
+
+--- a/libkface/libopencv.h.cmake.in
++++ b/libkface/libopencv.h.cmake.in
+@@ -7,7 +7,7 @@
+  * @date   2010-06-16
+  * @brief  Wrapper for OpenCV header files
+  *
+- * @author Copyright (C) 2012-2014 by Gilles Caulier
++ * @author Copyright (C) 2012-2015 by Gilles Caulier
+  *         <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  *
+  * This program is free software; you can redistribute it
+@@ -31,16 +31,16 @@
+ 
+ // Pragma directives to reduce warnings from OpenCV header files.
+ #if not defined(__APPLE__) && defined(__GNUC__)
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+-#pragma GCC diagnostic ignored "-Woverloaded-virtual"
++#   pragma GCC diagnostic push
++#   pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
++#   pragma GCC diagnostic ignored "-Woverloaded-virtual"
+ #endif
+ 
+ #if defined(__APPLE__) && defined(__clang__)
+-#pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+-#pragma clang diagnostic ignored "-Wcast-align"
++#   pragma clang diagnostic push
++#   pragma clang diagnostic ignored "-Wnon-virtual-dtor"
++#   pragma clang diagnostic ignored "-Woverloaded-virtual"
++#   pragma clang diagnostic ignored "-Wcast-align"
+ #endif
+ 
+ // OpenCV includes
+@@ -51,23 +51,30 @@
+ #define OPENCV_VERSION                         OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
+ #define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION >= OPENCV_MAKE_VERSION(major,minor,patch) )
+ 
+-#include <opencv2/core/core.hpp>
+-#include <opencv2/core/internal.hpp>
+-#include <opencv2/contrib/contrib.hpp>
++#if OPENCV_TEST_VERSION(3,0,0)
++#   include <opencv2/face.hpp>
++#   include <opencv2/core.hpp>
++#else
++#   include <opencv2/core/core.hpp>
++#   include <opencv2/core/internal.hpp>
++#   include <opencv2/contrib/contrib.hpp>
++#endif
+ 
+ // for old-style code
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11)
++#   include <opencv2/legacy/compat.hpp>
++#endif
+ #include <opencv2/opencv.hpp>
+-#include <opencv2/legacy/compat.hpp>
+ #include <opencv2/highgui/highgui_c.h>
+ #include <opencv/cvaux.h>
+ 
+ // Restore warnings
+ #if not defined(__APPLE__) && defined(__GNUC__)
+-#pragma GCC diagnostic pop
++#   pragma GCC diagnostic pop
+ #endif
+ 
+ #if defined(__APPLE__) && defined(__clang__)
+-#pragma clang diagnostic pop
++#   pragma clang diagnostic pop
+ #endif
+ 
+ #endif // LIB_OPEN_CV_H
+
+--- a/libkface/recognition-opencv-lbph/facerec_borrowed.cpp
++++ b/libkface/recognition-opencv-lbph/facerec_borrowed.cpp
+@@ -531,15 +531,17 @@
+     return ptr;
+ }
+ 
+-CV_INIT_ALGORITHM(LBPHFaceRecognizer, "FaceRecognizer.LBPH-KFaceIface",
+-                  obj.info()->addParam(obj, "radius",     obj.m_radius);
+-                  obj.info()->addParam(obj, "neighbors",  obj.m_neighbors);
+-                  obj.info()->addParam(obj, "grid_x",     obj.m_grid_x);
+-                  obj.info()->addParam(obj, "grid_y",     obj.m_grid_y);
+-                  obj.info()->addParam(obj, "threshold",  obj.m_threshold);
+-                  obj.info()->addParam(obj, "histograms", obj.m_histograms);         // modification: Make Read/Write
+-                  obj.info()->addParam(obj, "labels",     obj.m_labels);             // modification: Make Read/Write
+-                  obj.info()->addParam(obj, "statistic",  obj.m_statisticsMode));    // modification: Add parameter
++#if OPENCV_VERSION <= OPENCV_MAKE_VERSION(2,4,11)
++    CV_INIT_ALGORITHM(LBPHFaceRecognizer, "FaceRecognizer.LBPH-KFaceIface",
++                      obj.info()->addParam(obj, "radius",     obj.m_radius);
++                      obj.info()->addParam(obj, "neighbors",  obj.m_neighbors);
++                      obj.info()->addParam(obj, "grid_x",     obj.m_grid_x);
++                      obj.info()->addParam(obj, "grid_y",     obj.m_grid_y);
++                      obj.info()->addParam(obj, "threshold",  obj.m_threshold);
++                      obj.info()->addParam(obj, "histograms", obj.m_histograms);         // modification: Make Read/Write
++                      obj.info()->addParam(obj, "labels",     obj.m_labels);             // modification: Make Read/Write
++                      obj.info()->addParam(obj, "statistic",  obj.m_statisticsMode));    // modification: Add parameter
++#endif
+ 
+ } // namespace KFaceIface
+ 
+
+--- a/libkface/recognition-opencv-lbph/facerec_borrowed.h
++++ b/libkface/recognition-opencv-lbph/facerec_borrowed.h
+@@ -45,7 +45,11 @@
+ namespace KFaceIface
+ {
+ 
++#if OPENCV_TEST_VERSION(3,0,0)
++class LBPHFaceRecognizer : public cv::face::FaceRecognizer
++#else
+ class LBPHFaceRecognizer : public cv::FaceRecognizer
++#endif
+ {
+ public:
+ 
+@@ -99,8 +103,13 @@
+ 
+     ~LBPHFaceRecognizer() {}
+ 
++#if OPENCV_TEST_VERSION(3,0,0)
++    using cv::face::FaceRecognizer::save;
++    using cv::face::FaceRecognizer::load;
++#else
+     using cv::FaceRecognizer::save;
+     using cv::FaceRecognizer::load;
++#endif
+ 
+     static cv::Ptr<LBPHFaceRecognizer> create(int radius=1, int neighbors=8, int grid_x=8, int grid_y=8, double threshold = DBL_MAX, PredictionStatistics statistics = NearestNeighbor);
+ 
+@@ -139,6 +148,34 @@
+     /**
+      * Getter functions.
+      */
++#if OPENCV_TEST_VERSION(3,0,0)
++
++    int getNeighbors() const                             { return m_neighbors;            }
++    void setNeighbors(int _neighbors)                    { m_neighbors = _neighbors;      }
++
++    int getRadius()    const                             { return m_radius;               }
++    void setRadius(int radius)                           { m_radius = radius;             }
++
++    int getGrid_x()    const                             { return m_grid_x;               }
++    void setGrid_x(int _grid_x)                          { m_grid_x = _grid_x;            }
++
++    int getGrid_y()    const                             { return m_grid_y;               }
++    void setGrid_y(int _grid_y)                          { m_grid_y = _grid_y;            }
++
++    double getThreshold() const                          { return m_threshold;            }
++    void setThreshold(double _threshold)                 { m_threshold = _threshold;      }
++
++    void setHistograms(std::vector<cv::Mat> _histograms) { m_histograms = _histograms;    }
++    std::vector<cv::Mat> getHistograms() const           { return m_histograms;           }
++
++    void setLabels(cv::Mat _labels)                      { m_labels = _labels;            }
++    cv::Mat getLabels() const                            { return m_labels;               }
++
++    void setStatistic(int _statistic)                    { m_statisticsMode = _statistic; }
++    int getStatistic() const                             { return m_statisticsMode;       }
++
++#else
++
+     int neighbors() const { return m_neighbors; }
+     int radius()    const { return m_radius;    }
+     int grid_x()    const { return m_grid_x;    }
+@@ -146,6 +183,8 @@
+ 
+     // NOTE: Implementation done through CV_INIT_ALGORITHM macro from OpenCV.
+     cv::AlgorithmInfo* info() const;
++
++#endif
+ 
+ private:
+ 
+
+--- a/libkface/recognition-opencv-lbph/lbphfacemodel.cpp
++++ b/libkface/recognition-opencv-lbph/lbphfacemodel.cpp
+@@ -61,7 +61,11 @@
+     : cv::Ptr<LBPHFaceRecognizer>(LBPHFaceRecognizer::create()),
+       databaseId(0)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    ptr()->setThreshold(100.0);
++#else
+     ptr()->set("threshold", 100.0);
++#endif
+ }
+ 
+ LBPHFaceModel::~LBPHFaceModel()
+@@ -80,9 +84,13 @@
+ 
+ const LBPHFaceRecognizer* LBPHFaceModel::ptr() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    const LBPHFaceRecognizer* const ptr = cv::Ptr<LBPHFaceRecognizer>::operator KFaceIface::LBPHFaceRecognizer*();
++#else
+     const LBPHFaceRecognizer* const ptr = cv::Ptr<LBPHFaceRecognizer>::operator const KFaceIface::LBPHFaceRecognizer*();
+-
+-    if (!ptr) 
++#endif
++
++    if (!ptr)
+         kWarning() << "LBPHFaceRecognizer pointer is null";
+ 
+     return ptr;
+@@ -90,47 +98,83 @@
+ 
+ int LBPHFaceModel::radius() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    return ptr()->getRadius();
++#else
+     return ptr()->get<int>("radius");
++#endif
+ }
+ 
+ void LBPHFaceModel::setRadius(int radius)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    ptr()->setRadius(radius);
++#else
+     ptr()->set("radius", radius);
++#endif
+ }
+ 
+ int LBPHFaceModel::neighbors() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    return ptr()->getNeighbors();
++#else
+     return ptr()->get<int>("neighbors");
++#endif
+ }
+ 
+ void LBPHFaceModel::setNeighbors(int neighbors)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    ptr()->setNeighbors(neighbors);
++#else
+     ptr()->set("neighbors", neighbors);
++#endif
+ }
+ 
+ int LBPHFaceModel::gridX() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    return ptr()->getGrid_x();
++#else
+     return ptr()->get<int>("grid_x");
++#endif
+ }
+ 
+ void LBPHFaceModel::setGridX(int grid_x)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    ptr()->setGrid_x(grid_x);
++#else
+     ptr()->set("grid_x", grid_x);
++#endif
+ }
+ 
+ int LBPHFaceModel::gridY() const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    return ptr()->getGrid_y();
++#else
+     return ptr()->get<int>("grid_y");
++#endif
+ }
+ 
+ void LBPHFaceModel::setGridY(int grid_y)
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    ptr()->setGrid_y(grid_y);
++#else
+     ptr()->set("grid_y", grid_y);
++#endif
+ }
+ 
+ OpenCVMatData LBPHFaceModel::histogramData(int index) const
+ {
++#if OPENCV_TEST_VERSION(3,0,0)
++    return OpenCVMatData(ptr()->getHistograms().at(index));
++#else
+     return OpenCVMatData(ptr()->get<std::vector<cv::Mat> >("histograms").at(index));
++#endif
+ }
+ 
+ QList<LBPHistogramMetadata> LBPHFaceModel::histogramMetadata() const
+@@ -168,12 +212,24 @@
+         m_histogramMetadata << metadata;
+     }
+ 
++#if OPENCV_TEST_VERSION(3,0,0)
++    std::vector<cv::Mat> currentHistograms = ptr()->getHistograms();
++    cv::Mat currentLabels                  = ptr()->getLabels();
++#else
+     std::vector<cv::Mat> currentHistograms = ptr()->get<std::vector<cv::Mat> >("histograms");
+     cv::Mat currentLabels                  = ptr()->get<cv::Mat>("labels");
++#endif
++
+     currentHistograms.insert(currentHistograms.end(), newHistograms.begin(), newHistograms.end());
+     currentLabels.push_back(newLabels);
++
++#if OPENCV_TEST_VERSION(3,0,0)
++    ptr()->setHistograms(currentHistograms);
++    ptr()->setLabels(currentLabels);
++#else
+     ptr()->set("histograms", currentHistograms);
+-    ptr()->set("labels", currentLabels);
++    ptr()->set("labels",     currentLabels);
++#endif
+ 
+ /*
+     //Most cumbersome and inefficient way through a file storage which we were forced to use if we used standard OpenCV
+@@ -215,7 +271,11 @@
+ 
+     // Update local information
+     // We assume new labels are simply appended
++#if OPENCV_TEST_VERSION(3,0,0)
++    cv::Mat currentLabels = ptr()->getLabels();
++#else
+     cv::Mat currentLabels = ptr()->get<cv::Mat>("labels");
++#endif
+ 
+     for (int i = m_histogramMetadata.size() ; i < currentLabels.rows ; i++)
+     {
+
diff --git a/libraries/libkface/slack-desc b/libraries/libkface/slack-desc
new file mode 100644
index 0000000000..d48907b19b
--- /dev/null
+++ b/libraries/libkface/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libkface: libkface (KDE face recognition wrapper library)
+libkface:
+libkface: A Qt/C++ wrapper around LibFace library to perform face recognition
+libkface: and detection over pictures.
+libkface: This library is used by kipi-plugins, digiKam and others.
+libkface:
+libkface:
+libkface:
+libkface:
+libkface: For more information, visit:  https://www.digikam.org
+libkface:
diff --git a/libraries/libkvkontakte/README b/libraries/libkvkontakte/README
index f83cfa312c..47a4c8067b 100644
--- a/libraries/libkvkontakte/README
+++ b/libraries/libkvkontakte/README
@@ -1 +1 @@
-KDE C++ library for asynchronous interaction with vkontakte.rusocial network
+KDE C++ library for asynchronous interaction with VK social network
diff --git a/libraries/libkvkontakte/libkvkontakte.SlackBuild b/libraries/libkvkontakte/libkvkontakte.SlackBuild
index 57759b71ba..d8bb38d866 100644
--- a/libraries/libkvkontakte/libkvkontakte.SlackBuild
+++ b/libraries/libkvkontakte/libkvkontakte.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libkvkontakte
-VERSION=${VERSION:-4.11.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.12.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patched to work with newer cmake in current
+# sed -e "/^cmake_minimum_required/ a cmake_policy(SET CMP0022 OLD)\ncmake_policy(SET CMP0059 OLD)" -i CMakeLists.txt
+
 mkdir -p build
 cd build
   cmake \
@@ -77,6 +80,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
+    -DBUILD_TESTING=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/libraries/libkvkontakte/libkvkontakte.info b/libraries/libkvkontakte/libkvkontakte.info
index 922cd3e43f..29a0b497ac 100644
--- a/libraries/libkvkontakte/libkvkontakte.info
+++ b/libraries/libkvkontakte/libkvkontakte.info
@@ -1,8 +1,8 @@
 PRGNAM="libkvkontakte"
-VERSION="4.11.0"
+VERSION="4.12.0"
 HOMEPAGE="http://www.digikam.org/"
-DOWNLOAD="http://download.kde.org/stable/libkvkontakte/4.11.0/src/libkvkontakte-4.11.0.tar.xz"
-MD5SUM="f4a1e9925e21ee2ab9702a115c8e7ca9"
+DOWNLOAD="http://download.kde.org/stable/libkvkontakte/4.12.0/src/libkvkontakte-4.12.0.tar.xz"
+MD5SUM="66384c06c3d4da129169eaf042f5daa0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libkvkontakte/slack-desc b/libraries/libkvkontakte/slack-desc
index bb1b074b82..c14cc0a6a7 100644
--- a/libraries/libkvkontakte/slack-desc
+++ b/libraries/libkvkontakte/slack-desc
@@ -9,7 +9,7 @@
 libkvkontakte: libkvkontakte (C++ Library)
 libkvkontakte:
 libkvkontakte: KDE C++ library for asynchronous interaction with
-libkvkontakte: vkontakte.rusocial network
+libkvkontakte: VK social network
 libkvkontakte:
 libkvkontakte:
 libkvkontakte:
diff --git a/libraries/liblangtag/README b/libraries/liblangtag/README
new file mode 100644
index 0000000000..2a05b634fc
--- /dev/null
+++ b/libraries/liblangtag/README
@@ -0,0 +1 @@
+An interface library to access tags for identifying languages
diff --git a/libraries/liblangtag/liblangtag.SlackBuild b/libraries/liblangtag/liblangtag.SlackBuild
new file mode 100644
index 0000000000..c11346212c
--- /dev/null
+++ b/libraries/liblangtag/liblangtag.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for liblangtag
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=liblangtag
+VERSION=${VERSION:-0.5.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-html-dir=/usr/doc/$PRGNAM-$VERSION/gtk-doc/html \
+  --disable-test \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/liblangtag/liblangtag.info b/libraries/liblangtag/liblangtag.info
new file mode 100644
index 0000000000..f5e4fcb644
--- /dev/null
+++ b/libraries/liblangtag/liblangtag.info
@@ -0,0 +1,10 @@
+PRGNAM="liblangtag"
+VERSION="0.5.8"
+HOMEPAGE="http://tagoh.bitbucket.org/liblangtag/"
+DOWNLOAD="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.5.8.tar.bz2"
+MD5SUM="aa899eff126216dafe721149fbdb511b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/liblangtag/slack-desc b/libraries/liblangtag/slack-desc
new file mode 100644
index 0000000000..0723a1d827
--- /dev/null
+++ b/libraries/liblangtag/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+liblangtag: liblangtag (Library to access tags for identifying languages)
+liblangtag:
+liblangtag: Liblangtag is an interface library to access/deal with tags for
+liblangtag: identifying languages, which is described in RFC 5646.
+liblangtag:
+liblangtag: Homepage: http://tagoh.bitbucket.org/liblangtag/
+liblangtag:
+liblangtag:
+liblangtag:
+liblangtag:
+liblangtag:
diff --git a/libraries/libmicrohttpd/libmicrohttpd.SlackBuild b/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
index 0a1290d489..ecf1fded37 100644
--- a/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
+++ b/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libmicrohttpd
-VERSION=${VERSION:-0.9.39}
+VERSION=${VERSION:-0.9.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libmicrohttpd/libmicrohttpd.info b/libraries/libmicrohttpd/libmicrohttpd.info
index 462a5eb483..a87ccdd203 100644
--- a/libraries/libmicrohttpd/libmicrohttpd.info
+++ b/libraries/libmicrohttpd/libmicrohttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="libmicrohttpd"
-VERSION="0.9.39"
+VERSION="0.9.42"
 HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
-DOWNLOAD="http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.39.tar.gz"
-MD5SUM="86c9cb728b4bd4fcb8aeca18ba6c0548"
+DOWNLOAD="http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.42.tar.gz"
+MD5SUM="3b9cf0b67fc8ebc9e69f53c6bc84a88d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libmseed/README b/libraries/libmseed/README
new file mode 100644
index 0000000000..5ba7611a75
--- /dev/null
+++ b/libraries/libmseed/README
@@ -0,0 +1,6 @@
+The Mini-SEED library provides a framework for manipulation of SEED data records 
+including the unpacking and packing of data records. 
+Functionality is also included for managing waveform data as continuous traces. 
+
+The library is known to work in most Unix/Linux environments (including Mac OSX) 
+and in Win32 systems.
diff --git a/libraries/libmseed/libmseed.SlackBuild b/libraries/libmseed/libmseed.SlackBuild
new file mode 100644
index 0000000000..ada29c5d86
--- /dev/null
+++ b/libraries/libmseed/libmseed.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for libmseed
+
+# Copyright (c) 2015 Cristiano Urban, Gonars, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libmseed
+VERSION=${VERSION:-2.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make static
+make shared
+
+install -Dm755 $PRGNAM.so.$VERSION "$PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM.so.$VERSION"
+ln -s /usr/lib/$PRGNAM.so.$VERSION "$PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM.so"
+install -Dm644 $PRGNAM.a "$PKG/usr/include/$PRGNAM.a"
+install -Dm644 $PRGNAM.h "$PKG/usr/include/$PRGNAM.h"
+install -Dm644 lmplatform.h "$PKG/usr/include/lmplatform.h"
+
+install -dm755 "$PKG/usr/man/man3/"
+install -Dm644 -t "$PKG/usr/man/man3/" doc/ms*.3
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog INSTALL README README.byteorder $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libmseed/libmseed.info b/libraries/libmseed/libmseed.info
new file mode 100644
index 0000000000..fc2442a189
--- /dev/null
+++ b/libraries/libmseed/libmseed.info
@@ -0,0 +1,10 @@
+PRGNAM="libmseed"
+VERSION="2.17"
+HOMEPAGE="https://ds.iris.edu/ds/nodes/dmc/software/downloads/libmseed/"
+DOWNLOAD="https://seiscode.iris.washington.edu/attachments/download/742/libmseed-2.17.tar.gz"
+MD5SUM="4dff2f779aac5c46722a2446bd5ed695"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Cristiano Urban"
+EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/libraries/libmseed/slack-desc b/libraries/libmseed/slack-desc
new file mode 100644
index 0000000000..50ebca20bb
--- /dev/null
+++ b/libraries/libmseed/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libmseed: libmseed (C library framework for manipulating SEED data records)
+libmseed:
+libmseed: libmseed is a C library framework for manipulating and managing
+libmseed: SEED data records. The library is known to work in most Unix/Linux
+libmseed: environments (including Mac OSX) and in Win32 systems.
+libmseed:
+libmseed: Home: https://ds.iris.edu/ds/nodes/dmc/software/downloads/libmseed/
+libmseed:
+libmseed:
+libmseed:
+libmseed:
diff --git a/libraries/libmspub/README b/libraries/libmspub/README
new file mode 100644
index 0000000000..368c995f36
--- /dev/null
+++ b/libraries/libmspub/README
@@ -0,0 +1,5 @@
+Libmspub is an import filter library for Microsoft Publisher files,
+based on librevenge. It can import .pub files of all Microsoft
+Publisher versions. It is a part of the Document Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libmspub/libmspub.SlackBuild b/libraries/libmspub/libmspub.SlackBuild
new file mode 100644
index 0000000000..07de9c8a19
--- /dev/null
+++ b/libraries/libmspub/libmspub.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for libmspub
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libmspub
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libmspub/libmspub.info b/libraries/libmspub/libmspub.info
new file mode 100644
index 0000000000..fa3721481b
--- /dev/null
+++ b/libraries/libmspub/libmspub.info
@@ -0,0 +1,10 @@
+PRGNAM="libmspub"
+VERSION="0.1.2"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.2.tar.xz"
+MD5SUM="050b8b29c2620fdbfb5d8561d4d08a11"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libmspub/slack-desc b/libraries/libmspub/slack-desc
new file mode 100644
index 0000000000..831bc5e56c
--- /dev/null
+++ b/libraries/libmspub/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libmspub: libmspub (Microsoft Publisher Import Library)
+libmspub:
+libmspub: Libmspub is a library that parses the file format of Microsoft
+libmspub: Publisher documents of all versions.
+libmspub:
+libmspub: Homepage: https://wiki.documentfoundation.org/DLP/Libraries/libmspub
+libmspub:
+libmspub:
+libmspub:
+libmspub:
+libmspub:
diff --git a/libraries/libmwaw/README b/libraries/libmwaw/README
new file mode 100644
index 0000000000..fc481dc609
--- /dev/null
+++ b/libraries/libmwaw/README
@@ -0,0 +1,6 @@
+Libmwaw is an import filter library for legacy (pre-OS X) Mac files,
+based on librevenge. It can import text documents, vector and bitmap
+images, spreadsheets and databases of many formats. The library is a
+part of the Document Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libmwaw/libmwaw.SlackBuild b/libraries/libmwaw/libmwaw.SlackBuild
new file mode 100644
index 0000000000..5939d0b33a
--- /dev/null
+++ b/libraries/libmwaw/libmwaw.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for libmwaw
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libmwaw
+VERSION=${VERSION:-0.3.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-sharedptf=boost \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING* CREDITS HACKING INSTALL README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libmwaw/libmwaw.info b/libraries/libmwaw/libmwaw.info
new file mode 100644
index 0000000000..72cfef0bc2
--- /dev/null
+++ b/libraries/libmwaw/libmwaw.info
@@ -0,0 +1,10 @@
+PRGNAM="libmwaw"
+VERSION="0.3.7"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+DOWNLOAD="http://sourceforge.net/projects/libmwaw/files/libmwaw/libmwaw-0.3.7/libmwaw-0.3.7.tar.xz"
+MD5SUM="07e8989985ce734becd5f12f7d6688cd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libmwaw/slack-desc b/libraries/libmwaw/slack-desc
new file mode 100644
index 0000000000..de62fe2571
--- /dev/null
+++ b/libraries/libmwaw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+libmwaw: libmwaw (Import library for some old mac text documents)
+libmwaw:
+libmwaw: Libmwaw is a new project for converting many pre-OSX MAC text
+libmwaw: formats, some graphic formats and some spreadsheet formats.
+libmwaw:
+libmwaw: Homepage: https://sourceforge.net/p/libmwaw/wiki/Home/
+libmwaw:
+libmwaw:
+libmwaw:
+libmwaw:
+libmwaw:
diff --git a/libraries/libnfs/libnfs.SlackBuild b/libraries/libnfs/libnfs.SlackBuild
index 20fd554923..dc5de676e0 100644
--- a/libraries/libnfs/libnfs.SlackBuild
+++ b/libraries/libnfs/libnfs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libnfs
 
-# Copyright 2012-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libnfs
-VERSION=${VERSION:-1.9.6}
+VERSION=${VERSION:-1.9.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,10 +64,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,7 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING LICENCE* README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libnfs/libnfs.info b/libraries/libnfs/libnfs.info
index d20d18577d..796192dc23 100644
--- a/libraries/libnfs/libnfs.info
+++ b/libraries/libnfs/libnfs.info
@@ -1,8 +1,8 @@
 PRGNAM="libnfs"
-VERSION="1.9.6"
+VERSION="1.9.8"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
-DOWNLOAD="https://sites.google.com/site/libnfstarballs/li/libnfs-1.9.6.tar.gz"
-MD5SUM="9eb3afde906022c3512dd740304ed10c"
+DOWNLOAD="https://sites.google.com/site/libnfstarballs/li/libnfs-1.9.8.tar.gz"
+MD5SUM="8d6c4fc63bd313cf6dc4387b45a0ed41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libnids/libnids.info b/libraries/libnids/libnids.info
index ce9e85802b..8001c8a79d 100644
--- a/libraries/libnids/libnids.info
+++ b/libraries/libnids/libnids.info
@@ -6,5 +6,5 @@ MD5SUM="72d37c79c85615ffe158aa524d649610"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libnet"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/libraries/liborcus/README b/libraries/liborcus/README
new file mode 100644
index 0000000000..d43956a1a6
--- /dev/null
+++ b/libraries/liborcus/README
@@ -0,0 +1,25 @@
+Orcus is a library that provides a collection of standalone file
+processing filters. It is currently focused on providing filters
+for spreadsheet documents, but filters for other productivity
+application types (such as wordprocessor and presentation) are
+in consideration.
+
+The library currently includes the following import filters:
+
+    Microsoft Excel 2007 XML
+    Microsoft Excel 2003 XML
+    Open Document Spreadsheet
+    Plain Text
+    Gnumeric XML
+    Generic XML
+
+The library also includes low-level parsers for the following:
+
+    CSV
+    CSS
+    XML
+    JSON
+
+These parsers are all implemented as C++ templates and require a
+handler class passed as a template argument so that the handler class
+receives various callbacks from the parser as the file is being parsed.
diff --git a/libraries/liborcus/liborcus.SlackBuild b/libraries/liborcus/liborcus.SlackBuild
new file mode 100644
index 0000000000..7a67d6d67b
--- /dev/null
+++ b/libraries/liborcus/liborcus.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for liborcus
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=liborcus
+VERSION=${VERSION:-0.7.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-boost=/usr/include \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/liborcus/liborcus.info b/libraries/liborcus/liborcus.info
new file mode 100644
index 0000000000..2c0414daa5
--- /dev/null
+++ b/libraries/liborcus/liborcus.info
@@ -0,0 +1,10 @@
+PRGNAM="liborcus"
+VERSION="0.7.1"
+HOMEPAGE="https://gitlab.com/orcus/orcus"
+DOWNLOAD="http://kohei.us/files/orcus/src/liborcus-0.7.1.tar.xz"
+MD5SUM="644145470758d3ea4dd1d63582e82f8e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libixion"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/liborcus/slack-desc b/libraries/liborcus/slack-desc
new file mode 100644
index 0000000000..4292e97ef3
--- /dev/null
+++ b/libraries/liborcus/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+liborcus: liborcus (library for processing spreadsheet documents)
+liborcus:
+liborcus: Orcus is a library that provides a collection of standalone file
+liborcus: processing filters. It is currently focused on providing filters for
+liborcus: spreadsheet documents, but filters for other productivity application
+liborcus: types (such as wordprocessor and presentation) are in consideration.
+liborcus:
+liborcus: Homepage: https://gitlab.com/orcus/orcus
+liborcus:
+liborcus:
+liborcus:
diff --git a/libraries/libpagemaker/README b/libraries/libpagemaker/README
new file mode 100644
index 0000000000..621053c0dc
--- /dev/null
+++ b/libraries/libpagemaker/README
@@ -0,0 +1,5 @@
+Libpagemaker is an import filter library for Adobe PageMaker files,
+based on librevenge. The library is a part of the Document Liberation
+Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libpagemaker/libpagemaker.SlackBuild b/libraries/libpagemaker/libpagemaker.SlackBuild
new file mode 100644
index 0000000000..5e36cbd596
--- /dev/null
+++ b/libraries/libpagemaker/libpagemaker.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for libpagemaker
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libpagemaker
+VERSION=${VERSION:-0.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog HACKING NEWS NOTES $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libpagemaker/libpagemaker.info b/libraries/libpagemaker/libpagemaker.info
new file mode 100644
index 0000000000..a20d6315d7
--- /dev/null
+++ b/libraries/libpagemaker/libpagemaker.info
@@ -0,0 +1,10 @@
+PRGNAM="libpagemaker"
+VERSION="0.0.2"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.2.tar.xz"
+MD5SUM="1e6fec3e30f4f47c4c2619ee232dec04"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libpagemaker/slack-desc b/libraries/libpagemaker/slack-desc
new file mode 100644
index 0000000000..fe1de4f334
--- /dev/null
+++ b/libraries/libpagemaker/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+libpagemaker: libpagemaker (Adobe PageMaker Import Library)
+libpagemaker:
+libpagemaker: Libpagemaker is a library that parses the file format of Aldus/Adobe
+libpagemaker: PageMaker documents. Currently it only understands documents created
+libpagemaker: by PageMaker version 6.x and 7.
+libpagemaker:
+libpagemaker:
+libpagemaker:
+libpagemaker:
+libpagemaker:
+libpagemaker:
diff --git a/libraries/libpwquality/README b/libraries/libpwquality/README
new file mode 100644
index 0000000000..f568a5bb4b
--- /dev/null
+++ b/libraries/libpwquality/README
@@ -0,0 +1,9 @@
+libpwquality (library for password quality checking and generation)
+
+The libpwquality library purpose is to provide common functions for password quality checking
+and also scoring them based on their apparent randomness.
+The library also provides a function for generating random passwords with good pronounceability.
+The library supports reading and parsing of a configuration file. 
+
+In the package there are also very simple utilities that use the library function and PAM module
+that can be used instead of pam_cracklib. The module supports all the options of pam_cracklib.
diff --git a/libraries/libpwquality/libpwquality.SlackBuild b/libraries/libpwquality/libpwquality.SlackBuild
new file mode 100644
index 0000000000..43d7a0b8e8
--- /dev/null
+++ b/libraries/libpwquality/libpwquality.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+#
+# Slackware build script for libpwquality.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libpwquality
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libpwquality/libpwquality.info b/libraries/libpwquality/libpwquality.info
new file mode 100644
index 0000000000..fc8d7f68b7
--- /dev/null
+++ b/libraries/libpwquality/libpwquality.info
@@ -0,0 +1,10 @@
+PRGNAM="libpwquality"
+VERSION="1.3.0"
+HOMEPAGE="https://fedorahosted.org/libpwquality/"
+DOWNLOAD="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.3.0.tar.bz2"
+MD5SUM="2a3d4ba1d11b52b4f6a7f39622ebf736"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="cracklib"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/libpwquality/slack-desc b/libraries/libpwquality/slack-desc
new file mode 100644
index 0000000000..3366c1a46c
--- /dev/null
+++ b/libraries/libpwquality/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+libpwquality: libpwquality (library for password quality checking and generation)
+libpwquality:
+libpwquality: libpwquality's purpose is to provide common functions for password 
+libpwquality: quality checking and also scoring them based on their apparent 
+libpwquality: randomness. The library also provides a function for generating 
+libpwquality: random passwords with good pronounceability.
+libpwquality:
+libpwquality: Home page: https://fedorahosted.org/libpwquality/
+libpwquality:
+libpwquality:
+libpwquality:
diff --git a/libraries/librelp/librelp.SlackBuild b/libraries/librelp/librelp.SlackBuild
index 89634045b7..1d765edb13 100644
--- a/libraries/librelp/librelp.SlackBuild
+++ b/libraries/librelp/librelp.SlackBuild
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=librelp
-VERSION=${VERSION:-1.2.7}
+VERSION=${VERSION:-1.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/librelp/librelp.info b/libraries/librelp/librelp.info
index e7bfc10e7f..fe7a617119 100644
--- a/libraries/librelp/librelp.info
+++ b/libraries/librelp/librelp.info
@@ -1,8 +1,8 @@
 PRGNAM="librelp"
-VERSION="1.2.7"
+VERSION="1.2.8"
 HOMEPAGE="http://www.librelp.com/"
-DOWNLOAD="http://download.rsyslog.com/librelp/librelp-1.2.7.tar.gz"
-MD5SUM="26e02602490af3a681a2a13e6ce29efb"
+DOWNLOAD="http://download.rsyslog.com/librelp/librelp-1.2.8.tar.gz"
+MD5SUM="065e44d81ff35f8d3347ac910ee285c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/librevenge/README b/libraries/librevenge/README
new file mode 100644
index 0000000000..912378dfbd
--- /dev/null
+++ b/libraries/librevenge/README
@@ -0,0 +1,6 @@
+Librevenge is a base library for writing document import filters.
+It has interfaces for text documents, vector graphics, spreadsheets,
+and presentations.
+
+To build the doxygen html documentation use DOC="yes".
+To build the tests, install cppunit before running this script.
diff --git a/libraries/librevenge/librevenge.SlackBuild b/libraries/librevenge/librevenge.SlackBuild
new file mode 100644
index 0000000000..6822c68a93
--- /dev/null
+++ b/libraries/librevenge/librevenge.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for librevenge
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=librevenge
+VERSION=${VERSION:-0.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+if pkg-config --exists cppunit; then cppunit=""; else cppunit="--disable-tests"; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc \
+  $cppunit
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/librevenge/librevenge.info b/libraries/librevenge/librevenge.info
new file mode 100644
index 0000000000..92f977b5c1
--- /dev/null
+++ b/libraries/librevenge/librevenge.info
@@ -0,0 +1,10 @@
+PRGNAM="librevenge"
+VERSION="0.0.2"
+HOMEPAGE="http://sourceforge.net/p/libwpd/wiki/librevenge/"
+DOWNLOAD="http://sourceforge.net/projects/libwpd/files/librevenge/librevenge-0.0.2/librevenge-0.0.2.tar.xz"
+MD5SUM="4ee55a80ee32af6752dd8c56eb1b1b5e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/librevenge/slack-desc b/libraries/librevenge/slack-desc
new file mode 100644
index 0000000000..89fdbaa41f
--- /dev/null
+++ b/libraries/librevenge/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+librevenge: librevenge (Library for REVerse ENGineered formats filters)
+librevenge:
+librevenge: librevenge is a base library for writing document import filters.
+librevenge: It has interfaces for text documents, vector graphics, spreadsheets,
+librevenge: and presentations.
+librevenge:
+librevenge: Homepage: http://sourceforge.net/p/libwpd/wiki/librevenge/
+librevenge:
+librevenge:
+librevenge:
+librevenge:
diff --git a/libraries/libsearpc/libsearpc.SlackBuild b/libraries/libsearpc/libsearpc.SlackBuild
index 47579fa489..56aed9cbda 100644
--- a/libraries/libsearpc/libsearpc.SlackBuild
+++ b/libraries/libsearpc/libsearpc.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libsearpc
-VERSION=${VERSION:-3.0}
+VERSION=${VERSION:-3.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,8 +62,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION-latest
-tar xvf $CWD/v$VERSION-latest.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION-latest.tar.gz
-cd $PRGNAM-$VERSION-latest
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/libsearpc/libsearpc.info b/libraries/libsearpc/libsearpc.info
index 8724469a8b..24f2e679a6 100644
--- a/libraries/libsearpc/libsearpc.info
+++ b/libraries/libsearpc/libsearpc.info
@@ -1,8 +1,8 @@
 PRGNAM="libsearpc"
-VERSION="3.0"
+VERSION="3.0.7"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/libsearpc/archive/v3.0-latest.tar.gz"
-MD5SUM="32a6eaafe16d8c0c0e320b4a08a4d8f6"
+DOWNLOAD="https://github.com/haiwen/libsearpc/archive/v3.0.7.tar.gz"
+MD5SUM="1d20e93e0fb39f98c907e633d9f1b11b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jansson"
diff --git a/libraries/libsidplayfp/libsidplayfp.SlackBuild b/libraries/libsidplayfp/libsidplayfp.SlackBuild
index 2ce0d6d8c9..a031b27776 100644
--- a/libraries/libsidplayfp/libsidplayfp.SlackBuild
+++ b/libraries/libsidplayfp/libsidplayfp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for "libsidplayfp".
 
-# Copyright 2014-2015 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2014-2016 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libsidplayfp
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.8.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libsidplayfp/libsidplayfp.info b/libraries/libsidplayfp/libsidplayfp.info
index b095a9c81f..48d2b865fc 100644
--- a/libraries/libsidplayfp/libsidplayfp.info
+++ b/libraries/libsidplayfp/libsidplayfp.info
@@ -1,8 +1,8 @@
 PRGNAM="libsidplayfp"
-VERSION="1.8.0"
+VERSION="1.8.3"
 HOMEPAGE="http://bel.fi/~alankila/c64-sw/index-cpp.html"
-DOWNLOAD="http://downloads.sourceforge.net/project/sidplay-residfp/libsidplayfp/1.8/libsidplayfp-1.8.0.tar.gz"
-MD5SUM="c461ac2bb86811be571b18876c4d5ed1"
+DOWNLOAD="http://downloads.sourceforge.net/project/sidplay-residfp/libsidplayfp/1.8/libsidplayfp-1.8.3.tar.gz"
+MD5SUM="35bd99b636b5021b2e1e372837e4c7f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xa"
diff --git a/libraries/libsodium/libsodium.SlackBuild b/libraries/libsodium/libsodium.SlackBuild
index a97f61b08b..67e2bcb891 100644
--- a/libraries/libsodium/libsodium.SlackBuild
+++ b/libraries/libsodium/libsodium.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libsodium
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libsodium/libsodium.info b/libraries/libsodium/libsodium.info
index a515f4c614..96ea5f18aa 100644
--- a/libraries/libsodium/libsodium.info
+++ b/libraries/libsodium/libsodium.info
@@ -1,8 +1,8 @@
 PRGNAM="libsodium"
-VERSION="1.0.3"
+VERSION="1.0.7"
 HOMEPAGE="https://github.com/jedisct1/libsodium"
-DOWNLOAD="https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz"
-MD5SUM="b3bcc98e34d3250f55ae196822307fab"
+DOWNLOAD="https://download.libsodium.org/libsodium/releases/libsodium-1.0.7.tar.gz"
+MD5SUM="8bdc92cee556526a51612709e976208a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libspatialite/libspatialite.info b/libraries/libspatialite/libspatialite.info
index bfb2412547..359559f802 100644
--- a/libraries/libspatialite/libspatialite.info
+++ b/libraries/libspatialite/libspatialite.info
@@ -1,7 +1,7 @@
 PRGNAM="libspatialite"
 VERSION="4.2.0"
 HOMEPAGE="https://www.gaia-gis.it/fossil/libspatialite/index"
-DOWNLOAD="http://www.gaia-gis.it/gaia-sins/libspatialite-4.2.0.tar.gz"
+DOWNLOAD="http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.2.0.tar.gz"
 MD5SUM="83305ed694a77152120d1f74c5151779"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/libtermkey/libtermkey.SlackBuild b/libraries/libtermkey/libtermkey.SlackBuild
index 94b2d41f7c..aa41360751 100644
--- a/libraries/libtermkey/libtermkey.SlackBuild
+++ b/libraries/libtermkey/libtermkey.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libtermkey
-VERSION=${VERSION:-8c0cb7108cc63218ea19aa898968eede19e19603}
+VERSION=${VERSION:-0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libtermkey/libtermkey.info b/libraries/libtermkey/libtermkey.info
index 419f251767..6ba912b68f 100644
--- a/libraries/libtermkey/libtermkey.info
+++ b/libraries/libtermkey/libtermkey.info
@@ -1,8 +1,8 @@
 PRGNAM="libtermkey"
-VERSION="8c0cb7108cc63218ea19aa898968eede19e19603"
-HOMEPAGE="https://github.com/neovim/libtermkey"
-DOWNLOAD="https://github.com/neovim/libtermkey/archive/8c0cb7108cc63218ea19aa898968eede19e19603.tar.gz"
-MD5SUM="e0211def456a8fddafff103a0f6f3b24"
+VERSION="0.18"
+HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
+DOWNLOAD="http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.18.tar.gz"
+MD5SUM="3be2e3e5a851a49cc5e8567ac108b520"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="unibilium"
diff --git a/libraries/libtorrent/libtorrent.SlackBuild b/libraries/libtorrent/libtorrent.SlackBuild
index 67469fea36..feb2231046 100644
--- a/libraries/libtorrent/libtorrent.SlackBuild
+++ b/libraries/libtorrent/libtorrent.SlackBuild
@@ -2,17 +2,11 @@
 
 # Slackware build script for libtorrent
 # Written by Tom Fitzhenry <tom@fitzhenry.name> 2007/08/22
-
 # Updated by Andrew Brouwers, abrouwers@gmail.com
-# Updated to 0.12.6 by Brian Kysela <brian.kysela@gmail.com> 2010-02-17
-# Updated to 0.12.7 by Brian Kysela 2010-10-27
-# Updated to 0.12.8 by Brian Kysela 2011-05-09
-# Updated to 0.12.9 by Brian Kysela 2011-06-27
-# Updated to 0.13.0 by Brian Kysela 2011-12-12
 
 PRGNAM=libtorrent
-VERSION=${VERSION:-0.13.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.13.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/libraries/libtorrent/libtorrent.info b/libraries/libtorrent/libtorrent.info
index c78df85058..cf8c19258c 100644
--- a/libraries/libtorrent/libtorrent.info
+++ b/libraries/libtorrent/libtorrent.info
@@ -1,10 +1,10 @@
 PRGNAM="libtorrent"
-VERSION="0.13.4"
+VERSION="0.13.6"
 HOMEPAGE="https://github.com/rakshasa/libtorrent"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/libtorrent/libtorrent-0.13.4.tar.gz/e82f380a9d4b55b379e0e73339c73895/libtorrent-0.13.4.tar.gz"
-MD5SUM="e82f380a9d4b55b379e0e73339c73895"
+DOWNLOAD="http://rtorrent.net/downloads/libtorrent-0.13.6.tar.gz"
+MD5SUM="66f18044432a62c006c75f6d0bb4d7dc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Brian Kysela"
-EMAIL="brian.kysela@gmail.com"
+MAINTAINER="bkysela"
+EMAIL="bkysela@gmail.com"
diff --git a/libraries/libu2f-host/README b/libraries/libu2f-host/README
new file mode 100644
index 0000000000..2673e9fda8
--- /dev/null
+++ b/libraries/libu2f-host/README
@@ -0,0 +1,4 @@
+Yubico Universal 2nd Factor (U2F) Host C Library
+
+Libu2f-host provide a C library and command-line tool that implements
+the host-side of the U2F protocol.
diff --git a/libraries/libu2f-host/libu2f-host.SlackBuild b/libraries/libu2f-host/libu2f-host.SlackBuild
new file mode 100644
index 0000000000..1b973391f7
--- /dev/null
+++ b/libraries/libu2f-host/libu2f-host.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for libu2f-host
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libu2f-host
+SRCNAM=libu2f-host-libu2f-host
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/makefile.patch
+
+autoreconf -fi
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/etc/udev/rules.d/
+cp 70-u2f.rules $PKG/etc/udev/rules.d/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BLURB COPYING* NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libu2f-host/libu2f-host.info b/libraries/libu2f-host/libu2f-host.info
new file mode 100644
index 0000000000..a58bfee85e
--- /dev/null
+++ b/libraries/libu2f-host/libu2f-host.info
@@ -0,0 +1,10 @@
+PRGNAM="libu2f-host"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/Yubico/libu2f-host"
+DOWNLOAD="https://github.com/Yubico/libu2f-host/archive/libu2f-host-1.0.0.tar.gz"
+MD5SUM="34041578e81e6fe7017402908e30e768"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="hidapi json-c gengetopt"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/libraries/libu2f-host/makefile.patch b/libraries/libu2f-host/makefile.patch
new file mode 100644
index 0000000000..7a73947b7e
--- /dev/null
+++ b/libraries/libu2f-host/makefile.patch
@@ -0,0 +1,26 @@
+From f241518e0dfd896eee6886aad2f3f6f8ef83f6da Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Tue, 14 Oct 2014 11:25:54 +0200
+Subject: [PATCH 1/1] Makefile: make help2man depend on u2f-host, not
+ u2f-host.c
+
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9159a7..1afdddd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -35,7 +35,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+ dist_man_MANS = u2f-host.1
+ DISTCLEANFILES = $(dist_man_MANS)
+ 
+-u2f-host.1: $(srcdir)/u2f-host.c $(srcdir)/cmdline.ggo $(top_srcdir)/configure.ac
++u2f-host.1: $(builddir)/u2f-host$(EXEEXT) $(srcdir)/cmdline.ggo $(top_srcdir)/configure.ac
+ 	$(AM_V_GEN)$(HELP2MAN) \
+ 		--output=$@ $(builddir)/u2f-host$(EXEEXT) \
+ 		--name="Yubico Universal 2nd Factor (U2F) Host Tool" \
+-- 
+2.1.2
+
diff --git a/libraries/libu2f-host/slack-desc b/libraries/libu2f-host/slack-desc
new file mode 100644
index 0000000000..bb25452896
--- /dev/null
+++ b/libraries/libu2f-host/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+libu2f-host: libu2f-host (Yubico 2UF C Library)
+libu2f-host:
+libu2f-host: Libu2f-host provide a C library and command-line tool that implements
+libu2f-host: the host-side of the U2F protocol. 
+libu2f-host:
+libu2f-host:
+libu2f-host:
+libu2f-host: Project URL: https://github.com/Yubico/libu2f-host
+libu2f-host:
+libu2f-host:
+libu2f-host:
diff --git a/libraries/libuchardet/README b/libraries/libuchardet/README
new file mode 100644
index 0000000000..59b601ae09
--- /dev/null
+++ b/libraries/libuchardet/README
@@ -0,0 +1,8 @@
+libuchardet (encoding detector library)
+
+uchardet is a C language binding of the original C++ implementation of the
+universal charset detection library by Mozilla.
+
+uchardet is an encoding detector library, which takes a sequence of bytes
+in an unknown character encoding without any additional information, and attempts
+to determine the encoding of the text.
diff --git a/libraries/libuchardet/libuchardet.SlackBuild b/libraries/libuchardet/libuchardet.SlackBuild
new file mode 100644
index 0000000000..c03264c73a
--- /dev/null
+++ b/libraries/libuchardet/libuchardet.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# Slackware build script for libuchardet.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libuchardet
+VERSION=${VERSION:-0.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="uchardet"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cmake \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  .
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+rm -rf $PKG/usr/share
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libuchardet/libuchardet.info b/libraries/libuchardet/libuchardet.info
new file mode 100644
index 0000000000..ea48c49ae3
--- /dev/null
+++ b/libraries/libuchardet/libuchardet.info
@@ -0,0 +1,10 @@
+PRGNAM="libuchardet"
+VERSION="0.0.1"
+HOMEPAGE="https://github.com/BYVoid/uchardet"
+DOWNLOAD="http://uchardet.googlecode.com/files/uchardet-0.0.1.tar.gz"
+MD5SUM="9c17f0aca38c66c95d400691a9160b1b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/libuchardet/slack-desc b/libraries/libuchardet/slack-desc
new file mode 100644
index 0000000000..e94a9a920f
--- /dev/null
+++ b/libraries/libuchardet/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+libuchardet: libuchardet (encoding detector library)
+libuchardet:
+libuchardet: uchardet uchardet is a C language binding of the original C++ 
+libuchardet: implementation of the universal charset detection library by Mozilla. 
+libuchardet: uchardet is an encoding detector library, which takes a sequence of 
+libuchardet: bytes in an unknown character encoding without any additional 
+libuchardet: information, and attempts to determine the encoding of the text.
+libuchardet:
+libuchardet: Home page: https://github.com/BYVoid/uchardet/
+libuchardet:
+libuchardet:
diff --git a/libraries/libucil/README b/libraries/libucil/README
index 9be7fbbc44..7b3e09a060 100644
--- a/libraries/libucil/README
+++ b/libraries/libucil/README
@@ -1,4 +1,4 @@
-unicap provides a uniform interface to video capture devices. It allows
+Unicap provides a uniform interface to video capture devices. It allows
 applications to use any supported video capture device via a single API.
 The ucil library provides easy to use functions to render text and graphic
 overlays onto video images. 
diff --git a/libraries/libucil/libucil.SlackBuild b/libraries/libucil/libucil.SlackBuild
index 1c0f4972e6..6f7c76212f 100644
--- a/libraries/libucil/libucil.SlackBuild
+++ b/libraries/libucil/libucil.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libucil
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/libraries/libucil/libucil.info b/libraries/libucil/libucil.info
index 57fb769674..b18bce82d6 100644
--- a/libraries/libucil/libucil.info
+++ b/libraries/libucil/libucil.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libunicap"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/libucil/slack-desc b/libraries/libucil/slack-desc
index 372b32d3ed..9634e60d9d 100644
--- a/libraries/libucil/slack-desc
+++ b/libraries/libucil/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 libucil: libucil (simple image processing functions)
 libucil:
-libucil: unicap provides a uniform interface to video capture devices.
-libucil: It allows applications to use any supported video capture device
-libucil: via a single API.
-libucil: The ucil library provides easy to use functions to render text
-libucil: and graphic overlays onto video images.
+libucil: Unicap provides a uniform interface to video capture devices. It
+libucil: allows applications to use any supported video capture device via a
+libucil: single API. The ucil library provides easy to use functions to render
+libucil: text and graphic overlays onto video images.
 libucil:
 libucil: Homepage: https://github.com/unicap
 libucil:
 libucil:
+libucil:
diff --git a/libraries/libunicapgtk/README b/libraries/libunicapgtk/README
index d11942449a..65a4786fd0 100644
--- a/libraries/libunicapgtk/README
+++ b/libraries/libunicapgtk/README
@@ -1,4 +1,4 @@
-unicap provides a uniform interface to video capture devices. It allows
+Unicap provides a uniform interface to video capture devices. It allows
 applications to use any supported video capture device via a single API.
 Building applications with a graphical user interface is made especially
 easy with the unicapgtk widget set. 
diff --git a/libraries/libunicapgtk/libunicapgtk.SlackBuild b/libraries/libunicapgtk/libunicapgtk.SlackBuild
index 0ccb8a7e0a..d3ec6e4d10 100644
--- a/libraries/libunicapgtk/libunicapgtk.SlackBuild
+++ b/libraries/libunicapgtk/libunicapgtk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libunicapgtk
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/libraries/libunicapgtk/libunicapgtk.info b/libraries/libunicapgtk/libunicapgtk.info
index 7a3a295c5b..74829b8907 100644
--- a/libraries/libunicapgtk/libunicapgtk.info
+++ b/libraries/libunicapgtk/libunicapgtk.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libucil"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/libunicapgtk/slack-desc b/libraries/libunicapgtk/slack-desc
index 87d7386b9a..cf8301491a 100644
--- a/libraries/libunicapgtk/slack-desc
+++ b/libraries/libunicapgtk/slack-desc
@@ -8,12 +8,12 @@
             |-----handy-ruler------------------------------------------------------|
 libunicapgtk: libunicapgtk (GTK widget set for unicap)
 libunicapgtk:
-libunicapgtk: unicap provides a uniform interface to video capture devices.
-libunicapgtk: It allows applications to use any supported video capture device
-libunicapgtk: via a single API.
-libunicapgtk: Building applications with a graphical user interface is made
-libunicapgtk: especially easy with the unicapgtk widget set. 
+libunicapgtk: Unicap provides a uniform interface to video capture devices. It
+libunicapgtk: allows applications to use any supported video capture device via a
+libunicapgtk: single API. Building applications with a graphical user interface is
+libunicapgtk: made especially easy with the unicapgtk widget set.
 libunicapgtk:
 libunicapgtk: Homepage: https://github.com/unicap
 libunicapgtk:
 libunicapgtk:
+libunicapgtk:
diff --git a/libraries/liburcu/liburcu.SlackBuild b/libraries/liburcu/liburcu.SlackBuild
index b3cfec015e..c9eef233f9 100644
--- a/libraries/liburcu/liburcu.SlackBuild
+++ b/libraries/liburcu/liburcu.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=liburcu
-VERSION=${VERSION:-0.8.7}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCNAM=userspace-rcu
@@ -89,7 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE ChangeLog doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE ChangeLog *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/liburcu/liburcu.info b/libraries/liburcu/liburcu.info
index f84047be2b..b9b00a879e 100644
--- a/libraries/liburcu/liburcu.info
+++ b/libraries/liburcu/liburcu.info
@@ -1,8 +1,8 @@
 PRGNAM="liburcu"
-VERSION="0.8.7"
+VERSION="0.9.1"
 HOMEPAGE="http://urcu.so/"
-DOWNLOAD="http://lttng.org/files/urcu/userspace-rcu-0.8.7.tar.bz2"
-MD5SUM="7a6ee17871d31226db3f618e28351d22"
+DOWNLOAD="http://lttng.org/files/urcu/userspace-rcu-0.9.1.tar.bz2"
+MD5SUM="124eaeea06863271c0bdf2a0cc1d8e4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libuv/libuv.SlackBuild b/libraries/libuv/libuv.SlackBuild
index b48bd852a8..78d294a0f2 100644
--- a/libraries/libuv/libuv.SlackBuild
+++ b/libraries/libuv/libuv.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libuv
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libuv/libuv.info b/libraries/libuv/libuv.info
index 672dff41e8..06f8c25153 100644
--- a/libraries/libuv/libuv.info
+++ b/libraries/libuv/libuv.info
@@ -1,8 +1,8 @@
 PRGNAM="libuv"
-VERSION="1.6.1"
+VERSION="1.8.0"
 HOMEPAGE="http://libuv.org/"
-DOWNLOAD="http://dist.libuv.org/dist/v1.6.1/libuv-v1.6.1.tar.gz"
-MD5SUM="51cfa3d8adc05852982e3c742ec3c039"
+DOWNLOAD="http://dist.libuv.org/dist/v1.8.0/libuv-v1.8.0.tar.gz"
+MD5SUM="f4229c4360625e973ae933cb92e1faf7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libva-intel-driver/libva-intel-driver.SlackBuild b/libraries/libva-intel-driver/libva-intel-driver.SlackBuild
index 5b87c9f2d8..32a835db1b 100644
--- a/libraries/libva-intel-driver/libva-intel-driver.SlackBuild
+++ b/libraries/libva-intel-driver/libva-intel-driver.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libva-intel-driver
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-autoreconf -fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libva-intel-driver/libva-intel-driver.info b/libraries/libva-intel-driver/libva-intel-driver.info
index 517f5df321..c679a483a5 100644
--- a/libraries/libva-intel-driver/libva-intel-driver.info
+++ b/libraries/libva-intel-driver/libva-intel-driver.info
@@ -1,8 +1,8 @@
 PRGNAM="libva-intel-driver"
-VERSION="1.6.0"
+VERSION="1.6.1"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi/"
-DOWNLOAD="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.6.0.tar.bz2"
-MD5SUM="d7678f7c66cbb135cced82ee2af6d8e8"
+DOWNLOAD="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.6.1.tar.bz2"
+MD5SUM="ed1b04c1a3c029ad389b7e23822a2762"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libva"
diff --git a/libraries/libva/libva.SlackBuild b/libraries/libva/libva.SlackBuild
index d13154b9b0..2b46a02e53 100644
--- a/libraries/libva/libva.SlackBuild
+++ b/libraries/libva/libva.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for "libva".
 
-# Copyright 2010 Christopher Reimer <reimer.christopher@freenet.de>
+# Copyright 2010-2015 Christopher Reimer <reimer.christopher@freenet.de>
 # Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libva
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,11 +72,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# --enable-wayland=no isn't working without this patch
-patch -p1 < $CWD/wayland-automagic.patch
-mkdir m4
-
-autoreconf -if
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -89,9 +84,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-wayland=no \
   --build=$ARCH-slackware-linux
 
-# configure creates its own libtool, but that libtool seems broken:
-cp -a $(which libtool) .
-
 make
 make install-strip DESTDIR=$PKG
 
diff --git a/libraries/libva/libva.info b/libraries/libva/libva.info
index fa89432528..dc5c238511 100644
--- a/libraries/libva/libva.info
+++ b/libraries/libva/libva.info
@@ -1,8 +1,8 @@
 PRGNAM="libva"
-VERSION="1.6.0"
+VERSION="1.6.2"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi/"
-DOWNLOAD="http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.6.0.tar.bz2"
-MD5SUM="3f1241b4080db53c120325932f393f33"
+DOWNLOAD="http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.6.2.tar.bz2"
+MD5SUM="430cc2742df60204f121409c06039d09"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libva/wayland-automagic.patch b/libraries/libva/wayland-automagic.patch
deleted file mode 100644
index d55c3f5da8..0000000000
--- a/libraries/libva/wayland-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac	2015-06-14 18:17:48.776175722 +0200
-+++ b/configure.ac	2015-06-14 18:26:45.710159385 +0200
-@@ -275,14 +275,13 @@
-     if test "$USE_WAYLAND" = "yes"; then
-         AC_DEFINE([HAVE_VA_WAYLAND], [1],
-                   [Defined to 1 if VA/Wayland API is built])
-+        m4_ifdef([WAYLAND_SCANNER_RULES],
-+	  [WAYLAND_SCANNER_RULES(['$(top_buildir)/va/wayland/protocol'])],
-+	  [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])        
-     fi
- fi
- AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
- 
--m4_ifdef([WAYLAND_SCANNER_RULES],
--    [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
--    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
diff --git a/libraries/libvdpau/libvdpau.SlackBuild b/libraries/libvdpau/libvdpau.SlackBuild
index 662ddf53f3..76058c94f7 100644
--- a/libraries/libvdpau/libvdpau.SlackBuild
+++ b/libraries/libvdpau/libvdpau.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libvdpau
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/libraries/libvdpau/libvdpau.info b/libraries/libvdpau/libvdpau.info
index 342921d3f5..a7397fc2d0 100644
--- a/libraries/libvdpau/libvdpau.info
+++ b/libraries/libvdpau/libvdpau.info
@@ -1,8 +1,8 @@
 PRGNAM="libvdpau"
-VERSION="1.1"
+VERSION="1.1.1"
 HOMEPAGE="http://cgit.freedesktop.org/~aplattner/libvdpau"
-DOWNLOAD="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-1.1.tar.gz"
-MD5SUM="38d362869f1da5516f0f927db4d606c3"
+DOWNLOAD="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-1.1.1.tar.bz2"
+MD5SUM="2fa0b05a4f4d06791eec83bc9c854d14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libvirt-glib/libvirt-glib.SlackBuild b/libraries/libvirt-glib/libvirt-glib.SlackBuild
index 12420e434b..16fe5f28ad 100644
--- a/libraries/libvirt-glib/libvirt-glib.SlackBuild
+++ b/libraries/libvirt-glib/libvirt-glib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libvirt-glib
 
-# Copyright 2012-2014  Robby Workman, Northport, Alabama, USA
+# Copyright 2012-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libvirt-glib
-VERSION=${VERSION:-0.2.0}
+VERSION=${VERSION:-0.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libvirt-glib/libvirt-glib.info b/libraries/libvirt-glib/libvirt-glib.info
index e137c9cab3..2ec56673ac 100644
--- a/libraries/libvirt-glib/libvirt-glib.info
+++ b/libraries/libvirt-glib/libvirt-glib.info
@@ -1,8 +1,8 @@
 PRGNAM="libvirt-glib"
-VERSION="0.2.0"
+VERSION="0.2.3"
 HOMEPAGE="http://libvirt.org/"
-DOWNLOAD="http://libvirt.org/sources/glib/libvirt-glib-0.2.0.tar.gz"
-MD5SUM="ddfe8490af8263f3423aeb492afd7932"
+DOWNLOAD="ftp://libvirt.org/libvirt/glib/libvirt-glib-0.2.3.tar.gz"
+MD5SUM="a19c9b644dd5f2b9e3e1a4a21f34e2e0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libvirt vala"
diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild
index f1dc74cbc1..35c35c294b 100644
--- a/libraries/libvirt-python/libvirt-python.SlackBuild
+++ b/libraries/libvirt-python/libvirt-python.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libvirt-python
 
-# Copyright 2013-2015  Robby Workman, Northport, Alabama, USA
+# Copyright 2013-2015  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libvirt-python
-VERSION=${VERSION:-1.2.17}
+VERSION=${VERSION:-1.2.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info
index 15d3095a62..aaeaacc2f2 100644
--- a/libraries/libvirt-python/libvirt-python.info
+++ b/libraries/libvirt-python/libvirt-python.info
@@ -1,8 +1,8 @@
 PRGNAM="libvirt-python"
-VERSION="1.2.17"
+VERSION="1.2.21"
 HOMEPAGE="http://libvirt.org"
-DOWNLOAD="http://libvirt.org/sources/python/libvirt-python-1.2.17.tar.gz"
-MD5SUM="a695e323e33db562d86e947f7ac77f09"
+DOWNLOAD="http://libvirt.org/sources/python/libvirt-python-1.2.21.tar.gz"
+MD5SUM="d5fdcb6e2ff28eac90ba6906d349465a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libvirt"
diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild
index 30e3bb4fc1..2210ac4110 100644
--- a/libraries/libvirt/libvirt.SlackBuild
+++ b/libraries/libvirt/libvirt.SlackBuild
@@ -5,7 +5,7 @@
 # Maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=libvirt
-VERSION=${VERSION:-1.2.17}
+VERSION=${VERSION:-1.2.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info
index 5adc085919..aeb030e1e9 100644
--- a/libraries/libvirt/libvirt.info
+++ b/libraries/libvirt/libvirt.info
@@ -1,8 +1,8 @@
 PRGNAM="libvirt"
-VERSION="1.2.17"
+VERSION="1.2.21"
 HOMEPAGE="http://libvirt.org"
-DOWNLOAD="http://libvirt.org/sources/libvirt-1.2.17.tar.gz"
-MD5SUM="a1f49050223be3cbd7678c32b1ee2756"
+DOWNLOAD="ftp://libvirt.org/libvirt/libvirt-1.2.21.tar.gz"
+MD5SUM="76ab39194302b9067332e1f619c8bad9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yajl urlgrabber"
diff --git a/libraries/libvisio/README b/libraries/libvisio/README
new file mode 100644
index 0000000000..7f06a95415
--- /dev/null
+++ b/libraries/libvisio/README
@@ -0,0 +1,6 @@
+Libvisio is an import filter library for Microsoft Visio files, based
+on librevenge. It can import .vsd and .vss files of all versions. It
+is a part of the Document Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
+To build the tests, install cppunit before running this script.
diff --git a/libraries/libvisio/libvisio.SlackBuild b/libraries/libvisio/libvisio.SlackBuild
new file mode 100644
index 0000000000..4951aabebd
--- /dev/null
+++ b/libraries/libvisio/libvisio.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for libvisio
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libvisio
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+if pkg-config --exists cppunit; then cppunit=""; else cppunit="--disable-tests"; fi
+
+CFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+CXXFLAGS="$SLKCFLAGS -DBOOST_SYSTEM_NO_DEPRECATED" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --disable-static \
+  $doc \
+  $cppunit
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libvisio/libvisio.info b/libraries/libvisio/libvisio.info
new file mode 100644
index 0000000000..6ad8ea30fa
--- /dev/null
+++ b/libraries/libvisio/libvisio.info
@@ -0,0 +1,10 @@
+PRGNAM="libvisio"
+VERSION="0.1.3"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+DOWNLOAD="http://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.3.tar.xz"
+MD5SUM="fda521a18bbfccc5f034ea02119e7998"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libvisio/slack-desc b/libraries/libvisio/slack-desc
new file mode 100644
index 0000000000..50393b87be
--- /dev/null
+++ b/libraries/libvisio/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libvisio: libvisio (Microsoft Visio Import Library)
+libvisio:
+libvisio: Libvisio is a library that parses the file format of Microsoft Visio
+libvisio: documents of all versions.
+libvisio:
+libvisio: Homepage: https://wiki.documentfoundation.org/DLP/Libraries/libvisio
+libvisio:
+libvisio:
+libvisio:
+libvisio:
+libvisio:
diff --git a/libraries/libwhisker2/libwhisker2.info b/libraries/libwhisker2/libwhisker2.info
index 4cf60de02e..426150f0fa 100644
--- a/libraries/libwhisker2/libwhisker2.info
+++ b/libraries/libwhisker2/libwhisker2.info
@@ -6,5 +6,5 @@ MD5SUM="7cc1718dddde8f9a439d5622ae2f37eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/libraries/libwnck3/README b/libraries/libwnck3/README
new file mode 100644
index 0000000000..73bc947ba3
--- /dev/null
+++ b/libraries/libwnck3/README
@@ -0,0 +1,5 @@
+libwnck3 (Window Navigator Construction Kit)
+
+A library to use for writing pagers and task lists.
+
+This package can coexist with libwnck from Slackware default stock.
diff --git a/libraries/libwnck3/libwnck3.SlackBuild b/libraries/libwnck3/libwnck3.SlackBuild
new file mode 100644
index 0000000000..b877a392b9
--- /dev/null
+++ b/libraries/libwnck3/libwnck3.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+#
+# Slackware build script for libwnck3.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libwnck3
+VERSION=${VERSION:-3.4.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="libwnck"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${SRCNAM}-${VERSION}.tar.xz
+mv ${SRCNAM}-${VERSION} $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mv $PKG/usr/bin/wnckprop $PKG/usr/bin/wnckprop3
+mv $PKG/usr/bin/wnck-urgency-monitor $PKG/usr/bin/wnck3-urgency-monitor
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL MAINTAINERS NEWS README"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libwnck3/libwnck3.info b/libraries/libwnck3/libwnck3.info
new file mode 100644
index 0000000000..1baf156d1f
--- /dev/null
+++ b/libraries/libwnck3/libwnck3.info
@@ -0,0 +1,10 @@
+PRGNAM="libwnck3"
+VERSION="3.4.9"
+HOMEPAGE="http://ftp.gnome.org/pub/gnome/sources/libwnck/"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libwnck/3.4/libwnck-3.4.9.tar.xz"
+MD5SUM="5cb080285e8d5d6a70424cfb43bbf440"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/libwnck3/slack-desc b/libraries/libwnck3/slack-desc
new file mode 100644
index 0000000000..96d02f830c
--- /dev/null
+++ b/libraries/libwnck3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+libwnck3: libwnck3 (Window Navigator Construction Kit)
+libwnck3:
+libwnck3: A library to use for writing pagers and task lists.
+libwnck3:
+libwnck3: Home page: http://ftp.gnome.org/pub/gnome/sources/libwnck/
+libwnck3:
+libwnck3:
+libwnck3:
+libwnck3:
+libwnck3:
+libwnck3:
diff --git a/libraries/libwps/README b/libraries/libwps/README
new file mode 100644
index 0000000000..e2b3a59c33
--- /dev/null
+++ b/libraries/libwps/README
@@ -0,0 +1,9 @@
+Libwps is a library (for use by word procesors, for example) for
+importing the Microsoft Works word processor file format. As of
+December 2006, the project is new, but it imports Works format
+versions 2, 3, 4, 5 (aka 2000), and 8 with some formatting. The
+scope of this project is just a Works word processor import filter,
+so there are no plans for supporting an export filter, spreadsheets,
+or databases. It is a part of the Document Liberation Project.
+
+To build the doxygen html documentation use DOC="yes".
diff --git a/libraries/libwps/libwps.SlackBuild b/libraries/libwps/libwps.SlackBuild
new file mode 100644
index 0000000000..512e5a90a9
--- /dev/null
+++ b/libraries/libwps/libwps.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for libwps
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=libwps
+VERSION=${VERSION:-0.4.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+DOC=${DOC:-no}
+if [ ! "${DOC:-yes}" == "yes" ]; then doc="--without-docs"; else doc=""; fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  $doc
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* CREDITS ChangeLog HACKING INSTALL NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libwps/libwps.info b/libraries/libwps/libwps.info
new file mode 100644
index 0000000000..17690cdbfe
--- /dev/null
+++ b/libraries/libwps/libwps.info
@@ -0,0 +1,10 @@
+PRGNAM="libwps"
+VERSION="0.4.2"
+HOMEPAGE="http://libwps.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/project/libwps/libwps/libwps-0.4.2/libwps-0.4.2.tar.xz"
+MD5SUM="fdfc3b9c40d5912927a866d88196f394"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="librevenge"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/libwps/slack-desc b/libraries/libwps/slack-desc
new file mode 100644
index 0000000000..23d57d7c17
--- /dev/null
+++ b/libraries/libwps/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libwps: libwps (Microsoft Works format import library)
+libwps:
+libwps: Libwps is a library (for use by word procesors, for example) for
+libwps: importing the Microsoft Works word processor file format.
+libwps:
+libwps: Homepage: http://libwps.sourceforge.net/
+libwps:
+libwps:
+libwps:
+libwps:
+libwps:
diff --git a/libraries/libzdb/libzdb.SlackBuild b/libraries/libzdb/libzdb.SlackBuild
index 537df120ad..00f439ba09 100644
--- a/libraries/libzdb/libzdb.SlackBuild
+++ b/libraries/libzdb/libzdb.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libzdb
-VERSION=${VERSION:-3.0}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libzdb/libzdb.info b/libraries/libzdb/libzdb.info
index 98dc488632..be93263233 100644
--- a/libraries/libzdb/libzdb.info
+++ b/libraries/libzdb/libzdb.info
@@ -1,8 +1,8 @@
 PRGNAM="libzdb"
-VERSION="3.0"
+VERSION="3.1"
 HOMEPAGE="http://www.tildeslash.com/libzdb/"
-DOWNLOAD="http://www.tildeslash.com/libzdb/dist/libzdb-3.0.tar.gz"
-MD5SUM="3bb9efff10a1f3ebc5b76c1055c48635"
+DOWNLOAD="http://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz"
+MD5SUM="01d8519a596d62f6b43559cc29ecd36d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="re2c"
diff --git a/libraries/libzrtpcpp/libzrtpcpp.SlackBuild b/libraries/libzrtpcpp/libzrtpcpp.SlackBuild
index 4b311fd6b2..0fe58e8c8d 100644
--- a/libraries/libzrtpcpp/libzrtpcpp.SlackBuild
+++ b/libraries/libzrtpcpp/libzrtpcpp.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/V$VERSION.tar.gz
+tar xvf $CWD/V$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/libraries/live555/live555.SlackBuild b/libraries/live555/live555.SlackBuild
index 5c57f7db08..bbc4a31948 100644
--- a/libraries/live555/live555.SlackBuild
+++ b/libraries/live555/live555.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for live555
 
-# Copyright 2014-2015 Christoph Willing, Brisbane, Australia
+# Copyright 2014-2016 Christoph Willing, Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=live555
-VERSION=${VERSION:-2015.06.25}
+VERSION=${VERSION:-2015.12.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/live555/live555.info b/libraries/live555/live555.info
index cacbd0bd98..6df7ff065b 100644
--- a/libraries/live555/live555.info
+++ b/libraries/live555/live555.info
@@ -1,10 +1,10 @@
 PRGNAM="live555"
-VERSION="2015.06.25"
+VERSION="2015.12.22"
 HOMEPAGE="http://www.live555.com/"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/live555/live.2015.06.25.tar.gz"
-MD5SUM="7c13d58c020efa42369b5f23a839be0c"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/live555/live.2015.12.22.tar.gz"
+MD5SUM="a208e31d4c3f63c61e6f2fb1f4ea9639"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/libraries/live555/live555.pc.in b/libraries/live555/live555.pc.in
index e171450ec0..d5dcdc1a85 100644
--- a/libraries/live555/live555.pc.in
+++ b/libraries/live555/live555.pc.in
@@ -7,4 +7,5 @@ Name: live555
 Description: C++ multimedia streaming libraries
 Version: %VERSION%
 Cflags: -I${includedir} -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment -I${includedir}/groupsock -I${includedir}/liveMedia
+Libs: -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment
 
diff --git a/libraries/lua-zlib/lua-zlib.SlackBuild b/libraries/lua-zlib/lua-zlib.SlackBuild
index 0344bdce12..419e2980c2 100644
--- a/libraries/lua-zlib/lua-zlib.SlackBuild
+++ b/libraries/lua-zlib/lua-zlib.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$HASH
-tar xvf $CWD/$HASH.tar.gz
+tar xvf $CWD/$HASH.tar.gz || tar xvf $CWD/$PRGNAM-$HASH.tar.gz
 cd $PRGNAM-$HASH
 chown -R root:root .
 find -L . \
diff --git a/libraries/lua-zlib/lua-zlib.info b/libraries/lua-zlib/lua-zlib.info
index 6c9d6c741a..7dd388ce7f 100644
--- a/libraries/lua-zlib/lua-zlib.info
+++ b/libraries/lua-zlib/lua-zlib.info
@@ -2,7 +2,7 @@ PRGNAM="lua-zlib"
 VERSION="20140201_c0014bc"
 HOMEPAGE="https://github.com/brimworks/lua-zlib"
 DOWNLOAD="https://github.com/brimworks/lua-zlib/archive/c0014bcbc4c3fd65ba3519b10965f0c184c1a059.tar.gz"
-MD5SUM="451de7577901f2cc73a015a0afaa08ac"
+MD5SUM="3ba445324203e4e0beb2bc1cd93c547a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/libraries/luaexpat/slack-desc b/libraries/luaexpat/slack-desc
index 5560c644ef..91bbf95e54 100644
--- a/libraries/luaexpat/slack-desc
+++ b/libraries/luaexpat/slack-desc
@@ -12,8 +12,8 @@ luaexpat: Overview
 luaexpat: LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is
 luaexpat: free software and uses the same license as Lua 5.1.
 luaexpat:
-luaexpat: Status
-luaexpat: Current version is 1.2.0. It was developed for both Lua 5.0 and Lua
-luaexpat: 5.1, and has been tested on Linux, Windows (2000/XP) and MacOS X with
-luaexpat: Expat 2.0.0.
+luaexpat:
+luaexpat:
+luaexpat:
+luaexpat:
 luaexpat:
diff --git a/libraries/luasec/luasec.SlackBuild b/libraries/luasec/luasec.SlackBuild
index 05f705b97a..3060e286a6 100644
--- a/libraries/luasec/luasec.SlackBuild
+++ b/libraries/luasec/luasec.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$HASH
-tar xvf $CWD/$HASH.tar.gz
+tar xvf $CWD/$HASH.tar.gz || tar xvf $CWD/$PRGNAM-$HASH.tar.gz
 cd $PRGNAM-$HASH
 chown -R root:root .
 find -L . \
diff --git a/libraries/luasocket/luasocket.SlackBuild b/libraries/luasocket/luasocket.SlackBuild
index 230c379f7c..8d432d3b48 100644
--- a/libraries/luasocket/luasocket.SlackBuild
+++ b/libraries/luasocket/luasocket.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$HASH
-tar xvf $CWD/$HASH.tar.gz
+tar xvf $CWD/$HASH.tar.gz || tar xvf $CWD/$PRGNAM-$HASH.tar.gz
 cd $PRGNAM-$HASH
 chown -R root:root .
 find -L . \
diff --git a/libraries/lvtk/README b/libraries/lvtk/README
index 56bae27718..2ed61b53b3 100644
--- a/libraries/lvtk/README
+++ b/libraries/lvtk/README
@@ -8,4 +8,5 @@ If you want to build the API documentation, install graphviz, then export
 DOCS=yes before running lvtk.SlackBuild. This is only useful if you plan
 to develop your own code that uses lvtk. The docs take up 4MB of space
 in /usr/doc/lvtk-$VERSION/html/ (which makes the package 5x the size it
-would be without the docs).
+would be without the docs). Also, the example plugins will be installed
+in /usr/lib(64)?/lv2/ltvk.lv2/, for another 500KB or so.
diff --git a/libraries/lvtk/lvtk.SlackBuild b/libraries/lvtk/lvtk.SlackBuild
index 6508eef894..c0a70eb42f 100644
--- a/libraries/lvtk/lvtk.SlackBuild
+++ b/libraries/lvtk/lvtk.SlackBuild
@@ -6,8 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151110 bkw:
+# - Update for v1.2.0
+# - Install the example plugins if DOCS=yes. They were already being built.
+
 PRGNAM=lvtk
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -63,6 +67,16 @@ CXXFLAGS="$SLKCFLAGS" \
 ./waf build
 ./waf install --destdir=$PKG
 
+# only build the doxygen stuff if enabled. requires graphviz.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+if [ "${DOCS:-no}" = "yes" ] ; then
+  ./waf configure --docs build
+  cp -a build/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+  cp -a examples $PKG/usr/doc/$PRGNAM-$VERSION/examples
+  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/lv2
+  cp -a build/examples/$PRGNAM.lv2 $PKG/usr/lib$LIBDIRSUFFIX/lv2
+fi
+
 # Only ttl2c and the lv2 plugins actually get stripped, because the
 # libs in /usr/lib(64)?/ are static. No idea how (or even if) waf can
 # be coerced into building shared libs instead. The static libs are
@@ -70,17 +84,9 @@ CXXFLAGS="$SLKCFLAGS" \
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# only build the doxygen stuff if enabled. requires graphviz.
-if [ "${DOCS:-no}" = "yes" ] ; then
-  ./waf configure --docs build
-  cp -a build/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-  cp -a examples $PKG/usr/doc/$PRGNAM-$VERSION/examples
-fi
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/libraries/lvtk/lvtk.info b/libraries/lvtk/lvtk.info
index 0a6d85fef8..0a515c082a 100644
--- a/libraries/lvtk/lvtk.info
+++ b/libraries/lvtk/lvtk.info
@@ -1,7 +1,7 @@
 PRGNAM="lvtk"
-VERSION="1.1.1"
+VERSION="1.2.0"
 HOMEPAGE="http://lvtoolkit.org/"
-DOWNLOAD="http://download.tuxfamily.org/proaudio/distfiles/lvtk-1.1.1.tar.gz"
+DOWNLOAD="https://github.com/lvtk/lvtk/archive/1.2.0.tar.gz"
 MD5SUM="ab3040721aee72b14dbf5f3956b9713a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.SlackBuild b/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.SlackBuild
index 475f6fb570..ba6e85adc8 100644
--- a/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.SlackBuild
+++ b/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for manubulon-snmp-plugins
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=manubulon-snmp-plugins
-VERSION=${VERSION:-20140303}
+VERSION=${VERSION:-20151112}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ sed -i 's#/usr/local/icinga/libexec#/usr/libexec/monitoring-plugins#' \
   $PKG/usr/libexec/$PRGNAM/*.pl
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp README plugins/{Changelog,INSTALL,LICENSE} $PKG/usr/doc/$PRGNAM-$VERSION
+cp README.md plugins/{Changelog,INSTALL,LICENSE} $PKG/usr/doc/$PRGNAM-$VERSION
 cp -r --no-preserve=all plugins/doc $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat plugins/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.old
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.info b/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.info
index fb909bedeb..f8665d765a 100644
--- a/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.info
+++ b/libraries/manubulon-snmp-plugins/manubulon-snmp-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="manubulon-snmp-plugins"
-VERSION="20140303"
+VERSION="20151112"
 HOMEPAGE="https://github.com/dnsmichi/manubulon-snmp"
-DOWNLOAD="http://mirror.slackware.hr/sources/manubulon-snmp/manubulon-snmp-20140303.tar.bz2"
-MD5SUM="28ea0361d18f2bf1c76523ece6ed7374"
+DOWNLOAD="http://mirror.slackware.hr/sources/manubulon-snmp/manubulon-snmp-20151112.tar.bz2"
+MD5SUM="21bd9553916af17bc6cea9249ba87cb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Net-SNMP monitoring-plugins"
diff --git a/libraries/mariadb_client/mariadb_client.info b/libraries/mariadb_client/mariadb_client.info
index 0e8ede20cd..1e6dcf35d0 100644
--- a/libraries/mariadb_client/mariadb_client.info
+++ b/libraries/mariadb_client/mariadb_client.info
@@ -1,5 +1,5 @@
 PRGNAM="mariadb_client"
-VERSION="2.0.0-src"
+VERSION="2.0.0"
 HOMEPAGE="https://mariadb.com/kb/en/mariadb/client-libraries/client-library-for-c/"
 DOWNLOAD="http://ftp.utexas.edu/mariadb/client-native-2.0.0/src/mariadb_client-2.0.0-src.tar.gz"
 MD5SUM="a233181e03d3c307668b4c722d881661"
diff --git a/libraries/mbedtls/README b/libraries/mbedtls/README
new file mode 100644
index 0000000000..9cda09f819
--- /dev/null
+++ b/libraries/mbedtls/README
@@ -0,0 +1,6 @@
+mbed TLS is a light-weight open source cryptographic and SSL/TLS
+library written in C. mbed TLS makes it easy for developers to include
+cryptographic and SSL/TLS capabilities in their (embedded)
+applications with as little hassle as possible.
+
+NOTE: this project was formerly know as PolarSSL.
diff --git a/libraries/mbedtls/mbedtls.SlackBuild b/libraries/mbedtls/mbedtls.SlackBuild
new file mode 100644
index 0000000000..cadb659cfe
--- /dev/null
+++ b/libraries/mbedtls/mbedtls.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Slackware build script for mbedtls
+
+# Copyright 2015 Euan Thoms (euan at potensol dot com)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mbedtls
+VERSION=${VERSION:-2.2.0}
+LICENSE=apache
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="ChangeLog LICENSE README.md $CWD/$PRGNAM.SlackBuild"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-$LICENSE.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+
+mkdir build
+cd build
+cmake \
+  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  -DSYSCONF_INSTALL_DIR:PATH=/etc \
+  -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
+  -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DSHARE_INSTALL_PREFIX:PATH=/usr/share \
+  -DMAN_INSTALL_DIR:PATH=/usr/man \
+  -DCMAKE_BUILD_TYPE:STRING=Release \
+  -DBUILD_SHARED_LIBS:BOOL=ON \
+  -DCMAKE_SKIP_RPATH:BOOL=ON \
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+  -DUSE_SHARED_POLARSSL_LIBRARY:BOOL=ON \
+  -DUSE_STATIC_POLARSSL_LIBRARY:BOOL=OFF \
+  ..
+
+make
+make install DESTDIR=$PKG
+
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS  $PKG/usr/doc/$PRGNAM-$VERSION
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+
+# Slackware already include this
+rm -f $PKG/usr/bin/{md5sum,sha1sum}
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/mbedtls/mbedtls.info b/libraries/mbedtls/mbedtls.info
new file mode 100644
index 0000000000..398e70f9be
--- /dev/null
+++ b/libraries/mbedtls/mbedtls.info
@@ -0,0 +1,10 @@
+PRGNAM="mbedtls"
+VERSION="2.2.0"
+HOMEPAGE="http://tls.mbed.org"
+DOWNLOAD="http://tls.mbed.org/download/mbedtls-2.2.0-apache.tgz"
+MD5SUM="b02f6be0f26f00c20e0c24d64b628e62"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Euan Thoms"
+EMAIL="euan at potensol dot com"
diff --git a/libraries/mbedtls/slack-desc b/libraries/mbedtls/slack-desc
new file mode 100644
index 0000000000..dee24bc1b0
--- /dev/null
+++ b/libraries/mbedtls/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+mbedtls: mbedtls (Light-weight cryptographic and SSL/TLS library)
+mbedtls:
+mbedtls: mbed TLS is a light-weight open source cryptographic and SSL/TLS
+mbedtls: library written in C. mbed TLS makes it easy for developers to include
+mbedtls: cryptographic and SSL/TLS capabilities in their (embedded)
+mbedtls: applications with as little hassle as possible.
+mbedtls:
+mbedtls: http://tls.mbed.org/
+mbedtls:
+mbedtls:
+mbedtls:
diff --git a/libraries/mdds/README b/libraries/mdds/README
new file mode 100644
index 0000000000..a0dd4c8e44
--- /dev/null
+++ b/libraries/mdds/README
@@ -0,0 +1 @@
+A collection of multi-dimensional data structure and indexing algorithm.
diff --git a/libraries/mdds/mdds.SlackBuild b/libraries/mdds/mdds.SlackBuild
new file mode 100644
index 0000000000..c055374b12
--- /dev/null
+++ b/libraries/mdds/mdds.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for mdds
+
+# Copyright 2015 Hunter Sezen California, USA
+
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mdds
+VERSION=${VERSION:-0.12.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM"_"$VERSION
+tar xvf $CWD/$PRGNAM"_"$VERSION.tar.bz2
+cd $PRGNAM"_"$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-hash-container=boost \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/mdds/mdds.info b/libraries/mdds/mdds.info
new file mode 100644
index 0000000000..b0d709b668
--- /dev/null
+++ b/libraries/mdds/mdds.info
@@ -0,0 +1,10 @@
+PRGNAM="mdds"
+VERSION="0.12.1"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+DOWNLOAD="http://kohei.us/files/mdds/src/mdds_0.12.1.tar.bz2"
+MD5SUM="ef2560ed5416652a7fe195305b14cebe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/libraries/mdds/slack-desc b/libraries/mdds/slack-desc
new file mode 100644
index 0000000000..ecdd11ffe3
--- /dev/null
+++ b/libraries/mdds/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+mdds: mdds (Multi-Dimensional Data Structure)
+mdds:
+mdds: A collection of multi-dimensional data structure and indexing
+mdds: algorithm. 
+mdds:
+mdds: Homepage: https://gitlab.com/mdds/mdds
+mdds:
+mdds:
+mdds:
+mdds:
+mdds:
diff --git a/libraries/mpir/mpir.SlackBuild b/libraries/mpir/mpir.SlackBuild
index 36e2a9956a..f5a4ad9d30 100644
--- a/libraries/mpir/mpir.SlackBuild
+++ b/libraries/mpir/mpir.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpir
-VERSION=${VERSION:-2.7.0}
+VERSION=${VERSION:-2.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/mpir/mpir.info b/libraries/mpir/mpir.info
index a5dc68901d..3a6076d610 100644
--- a/libraries/mpir/mpir.info
+++ b/libraries/mpir/mpir.info
@@ -1,8 +1,8 @@
 PRGNAM="mpir"
-VERSION="2.7.0"
+VERSION="2.7.2"
 HOMEPAGE="http://www.mpir.org/"
-DOWNLOAD="http://mpir.org/mpir-2.7.0.tar.bz2"
-MD5SUM="4aec04108dd24c49d45beb959d837b40"
+DOWNLOAD="http://mpir.org/mpir-2.7.2.tar.bz2"
+MD5SUM="b31aa1ebc01b5fedf4ac43277c03feec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/msgpack-c/msgpack-c.SlackBuild b/libraries/msgpack-c/msgpack-c.SlackBuild
index 47a3dfe7de..fa1ca27fd1 100644
--- a/libraries/msgpack-c/msgpack-c.SlackBuild
+++ b/libraries/msgpack-c/msgpack-c.SlackBuild
@@ -24,7 +24,7 @@
 
 SRCNAM=msgpack
 PRGNAM=$SRCNAM-c
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,7 +85,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING LICENSE NOTICE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING LICENSE_1_0.txt NOTICE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/msgpack-c/msgpack-c.info b/libraries/msgpack-c/msgpack-c.info
index f4a505d72e..7bbcd13d46 100644
--- a/libraries/msgpack-c/msgpack-c.info
+++ b/libraries/msgpack-c/msgpack-c.info
@@ -1,8 +1,8 @@
 PRGNAM="msgpack-c"
-VERSION="1.1.0"
+VERSION="1.3.0"
 HOMEPAGE="http://msgpack-c.org/"
-DOWNLOAD="https://github.com/msgpack/msgpack-c/releases/download/cpp-1.1.0/msgpack-1.1.0.tar.gz"
-MD5SUM="ac41a64d6415fd184215825048bc4523"
+DOWNLOAD="https://github.com/msgpack/msgpack-c/releases/download/cpp-1.3.0/msgpack-1.3.0.tar.gz"
+MD5SUM="22f122176507f1bab479598f52f1b005"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/msx264/msx264.SlackBuild b/libraries/msx264/msx264.SlackBuild
index 8e2522819e..6b99a03c10 100644
--- a/libraries/msx264/msx264.SlackBuild
+++ b/libraries/msx264/msx264.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=msx264
-VERSION=${VERSION:-1.4.3}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/msx264/msx264.info b/libraries/msx264/msx264.info
index a13846f29c..09e249e862 100644
--- a/libraries/msx264/msx264.info
+++ b/libraries/msx264/msx264.info
@@ -1,8 +1,8 @@
 PRGNAM="msx264"
-VERSION="1.4.3"
+VERSION="1.5.2"
 HOMEPAGE="https://github.com/Distrotech/msx264"
-DOWNLOAD="http://ftp.yzu.edu.tw/nongnu/linphone/plugins/sources/msx264-1.4.3.tar.gz"
-MD5SUM="8e3dad81033631918bb1138548fd9797"
+DOWNLOAD="http://download.savannah.gnu.org/releases/linphone/plugins/sources/msx264-1.5.2.tar.gz"
+MD5SUM="877113f35d47b68b0ee60f934a2fee3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="linphone"
diff --git a/libraries/mujs/README b/libraries/mujs/README
new file mode 100644
index 0000000000..6e9a9606c0
--- /dev/null
+++ b/libraries/mujs/README
@@ -0,0 +1,11 @@
+MuJS is a lightweight Javascript interpreter designed for embedding in other
+software to extend them with scripting capabilities. It is written in portable
+C and implements ECMAScript as specified by ECMA-262.
+
+Why? Because V8, SpiderMonkey and JavaScriptCore are all too big and complex.
+MuJS's focus is on small size, correctness and simplicity.
+
+The interface for binding with native code is designed to be as simple as 
+possible to use, and is similar to Lua. There is no need for interacting with 
+byzantine C++ template mechanisms, or worry about marking and unmarking garbage 
+collection roots, or wrestle with obscure build systems. 
diff --git a/libraries/mujs/mujs.SlackBuild b/libraries/mujs/mujs.SlackBuild
new file mode 100644
index 0000000000..ccad97a0b0
--- /dev/null
+++ b/libraries/mujs/mujs.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for mujs
+
+# Written by Valerio Talora <navigare@gmx.com>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mujs
+VERSION=${VERSION:-0827611}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  SLKLDFLAGS="-L/usr/X11R6/lib64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+make prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/mujs/mujs.info b/libraries/mujs/mujs.info
new file mode 100644
index 0000000000..ffc10430b9
--- /dev/null
+++ b/libraries/mujs/mujs.info
@@ -0,0 +1,10 @@
+PRGNAM="mujs"
+VERSION="0827611"
+HOMEPAGE="http://mujs.com/"
+DOWNLOAD="http://navigare.esy.es/slackbuilds/mujs/mujs-0827611.tar.gz"
+MD5SUM="861635bceec64fc588700229f0ab156b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Navigare"
+EMAIL="navigare@gmx.com"
diff --git a/libraries/mujs/slack-desc b/libraries/mujs/slack-desc
new file mode 100644
index 0000000000..b3f7a5428b
--- /dev/null
+++ b/libraries/mujs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+mujs: mujs (javascript interpreter)
+mujs: 
+mujs: MuJS is a lightweight Javascript interpreter designed for embedding 
+mujs: in other software to extend them with scripting capabilities. It is 
+mujs: written in portable C and implements ECMAScript as specified by 
+mujs: ECMA-262.
+mujs: 
+mujs: Why? Because V8, SpiderMonkey and JavaScriptCore are all too big 
+mujs: and complex.
+mujs: MuJS's focus is on small size, correctness and simplicity.
+mujs: 
diff --git a/libraries/nltk/README b/libraries/nltk/README
index 89a521107d..c04df602b5 100644
--- a/libraries/nltk/README
+++ b/libraries/nltk/README
@@ -3,5 +3,7 @@ and development in natural language processing, supporting dozens of NLP
 tasks, with distributions for Windows, Mac OSX and Linux.
 
 NLTK comes with many corpora, toy grammars, trained models, etc. A complete
-list is posted at: http://nltk.googlecode.com/svn/trunk/nltk_data/index.xml
-To retrieve all the data, use "python -m nltk.downloader all".
+list is posted at: http://nltk.org/nltk_data/.  To retrieve all the data, use
+"python -m nltk.downloader all". To ensure system wideinstallation, you can
+run the command "python -m nltk.downloader -d /usr/share/nltk_data all" as
+root.
diff --git a/libraries/nltk/nltk.SlackBuild b/libraries/nltk/nltk.SlackBuild
index add8d78623..16065ac337 100644
--- a/libraries/nltk/nltk.SlackBuild
+++ b/libraries/nltk/nltk.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nltk
-VERSION=2.0.1rc1
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE.txt  PKG-INFO  README.txt"
+DOCS="LICENSE.txt  PKG-INFO  INSTALL.txt"
 
 set -e
 
@@ -48,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
diff --git a/libraries/nltk/nltk.info b/libraries/nltk/nltk.info
index 887ea0087e..fe501a360b 100644
--- a/libraries/nltk/nltk.info
+++ b/libraries/nltk/nltk.info
@@ -1,10 +1,10 @@
 PRGNAM="nltk"
-VERSION="2.0.1rc1"
+VERSION="3.1"
 HOMEPAGE="http://www.nltk.org/"
-DOWNLOAD="http://nltk.googlecode.com/files/nltk-2.0.1rc1.zip"
-MD5SUM="72f745eefd659aea23a44bf1e47e7b9d"
+DOWNLOAD="https://pypi.python.org/packages/source/n/nltk/nltk-3.1.tar.gz"
+MD5SUM="05aa744cd17e21fb545681a06a265c36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk PyYAML"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+REQUIRES="pysetuptools"
+MAINTAINER="ArTourter"
+EMAIL="artourter@gmail.com"
diff --git a/libraries/oath-toolkit/oath-toolkit.SlackBuild b/libraries/oath-toolkit/oath-toolkit.SlackBuild
index 35f2608bac..67465d4559 100644
--- a/libraries/oath-toolkit/oath-toolkit.SlackBuild
+++ b/libraries/oath-toolkit/oath-toolkit.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oath-toolkit
-VERSION=${VERSION:-2.6.0}
+VERSION=${VERSION:-2.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/oath-toolkit/oath-toolkit.info b/libraries/oath-toolkit/oath-toolkit.info
index 0a349c300b..cb20454586 100644
--- a/libraries/oath-toolkit/oath-toolkit.info
+++ b/libraries/oath-toolkit/oath-toolkit.info
@@ -1,8 +1,8 @@
 PRGNAM="oath-toolkit"
-VERSION="2.6.0"
+VERSION="2.6.1"
 HOMEPAGE="http://www.nongnu.org/oath-toolkit/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.0.tar.gz"
-MD5SUM="f19f1c47eb7d1c609b3e244876b9ce63"
+DOWNLOAD="http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.1.tar.gz"
+MD5SUM="19ee7ed7c2b40c1dc92887f893ed2726"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xmlsec"
diff --git a/libraries/ogre/ogre.info b/libraries/ogre/ogre.info
index 6c4746fe38..64e8c14295 100644
--- a/libraries/ogre/ogre.info
+++ b/libraries/ogre/ogre.info
@@ -2,7 +2,7 @@ PRGNAM="ogre"
 VERSION="1.9"
 HOMEPAGE="http://www.ogre3d.org/"
 DOWNLOAD="https://bitbucket.org/sinbad/ogre/get/v1-9.tar.bz2"
-MD5SUM="c41950f13cf4a8b6e83894920c1ea898"
+MD5SUM="c33f630808479c23ea752bd91081d180"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/opencv/fsh.patch b/libraries/opencv/fsh.patch
new file mode 100644
index 0000000000..4d391d4ad0
--- /dev/null
+++ b/libraries/opencv/fsh.patch
@@ -0,0 +1,72 @@
+From 2bb4ca7cc656969a9e2c655e594428b465edbfed Mon Sep 17 00:00:00 2001
+From: Valentin Churavy <v.churavy@gmail.com>
+Date: Sat, 28 Mar 2015 01:30:01 +0900
+Subject: [PATCH] fsh.patch
+
+---
+ CMakeLists.txt                                  | 14 +++++++-------
+ cmake/templates/opencv_run_all_tests_unix.sh.in |  2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9a17b3..3b4d9ad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -300,7 +300,7 @@ endif()
+ if(ANDROID OR WIN32)
+   set(OPENCV_DOC_INSTALL_PATH doc)
+ else()
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
+ endif()
+ 
+ if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+@@ -342,7 +342,7 @@ if(OPENCV_TEST_DATA_PATH AND NOT OPENCV_TEST_DATA_INSTALL_PATH)
+   elseif(WIN32)
+     set(OPENCV_TEST_DATA_INSTALL_PATH "testdata")
+   else()
+-    set(OPENCV_TEST_DATA_INSTALL_PATH "share/OpenCV/testdata")
++    set(OPENCV_TEST_DATA_INSTALL_PATH "share/opencv/testdata")
+   endif()
+ endif()
+ 
+@@ -371,10 +371,10 @@ else()
+     set(OPENCV_OTHER_INSTALL_PATH   etc)
+   else()
+     set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-    set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+-    set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
+-    set(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
+-    set(OPENCV_OTHER_INSTALL_PATH   share/OpenCV)
++    set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++    set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/opencv/samples)
++    set(OPENCV_JAR_INSTALL_PATH share/opencv/java)
++    set(OPENCV_OTHER_INSTALL_PATH   share/opencv)
+   endif()
+   set(OPENCV_INCLUDE_INSTALL_PATH "include")
+ 
+@@ -382,7 +382,7 @@ else()
+   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+   else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+   endif()
+ endif()
+ 
+diff --git a/cmake/templates/opencv_run_all_tests_unix.sh.in b/cmake/templates/opencv_run_all_tests_unix.sh.in
+index 7b946af..82370dc 100644
+--- a/cmake/templates/opencv_run_all_tests_unix.sh.in
++++ b/cmake/templates/opencv_run_all_tests_unix.sh.in
+@@ -53,7 +53,7 @@ fi
+ 
+ OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
+ OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@
+-export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
++export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata
+ 
+ # Run tests
+ 
+-- 
+2.4.2
+
diff --git a/libraries/opencv/opencv-2.4.11-fsh.patch b/libraries/opencv/opencv-2.4.11-fsh.patch
deleted file mode 100644
index 832d2c496e..0000000000
--- a/libraries/opencv/opencv-2.4.11-fsh.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naurp opencv-2.4.9-orig/CMakeLists.txt opencv-2.4.9/CMakeLists.txt
---- opencv-2.4.9-orig/CMakeLists.txt	2014-04-11 12:15:26.000000000 +0200
-+++ opencv-2.4.9/CMakeLists.txt	2014-06-26 15:06:18.705309828 +0200
-@@ -258,9 +258,9 @@ endif()
- if(ANDROID OR WIN32)
-   set(OPENCV_DOC_INSTALL_PATH doc)
- elseif(INSTALL_TO_MANGLED_PATHS)
--  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
-+  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
- else()
--  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
-+  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
- endif()
- 
- if(WIN32)
-@@ -313,8 +313,8 @@ else()
-     set(OPENCV_SAMPLES_SRC_INSTALL_PATH    samples/native)
-   else()
-     set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
--    set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
--    set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
-+    set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
-+    set(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/opencv/samples)
-   endif()
-   set(OPENCV_INCLUDE_INSTALL_PATH "include")
- 
-@@ -322,7 +322,7 @@ else()
-   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
-     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
-   else()
--    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
-+    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
-   endif()
- endif()
- 
-diff -Naurp opencv-2.4.9-orig/cmake/templates/opencv_run_all_tests_unix.sh.in opencv-2.4.9/cmake/templates/opencv_run_all_tests_unix.sh.in
---- opencv-2.4.9-orig/cmake/templates/opencv_run_all_tests_unix.sh.in	2014-04-11 12:15:26.000000000 +0200
-+++ opencv-2.4.9/cmake/templates/opencv_run_all_tests_unix.sh.in	2014-06-26 15:09:21.456025129 +0200
-@@ -1,7 +1,7 @@
- # Test binaries and data paths
- 
- OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
- OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@
--export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
-+export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata
- 
- # Run tests
- 
- SUMMARY_STATUS=0
- for t in "$OPENCV_TEST_PATH/"opencv_test_* "$OPENCV_TEST_PATH/"opencv_perf_*;
-@@ -22,4 +22,4 @@ else
-   echo "OpenCV tests finished with status $SUMMARY_STATUS"
- fi
- 
--return $SUMMARY_STATUS
-\ Manca newline alla fine del file
-+return $SUMMARY_STATUS
-diff -Naurp opencv-2.4.9-orig/data/CMakeLists.txt opencv-2.4.9/data/CMakeLists.txt
---- opencv-2.4.9-orig/data/CMakeLists.txt	2014-04-11 12:15:26.000000000 +0200
-+++ opencv-2.4.9/data/CMakeLists.txt	2014-06-26 15:07:54.202115953 +0200
-@@ -5,8 +5,8 @@ if(ANDROID)
-   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT libs)
-   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT libs)
- else()
--  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT libs)
--  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT libs)
-+  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT libs)
-+  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT libs)
- endif()
- 
- if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
-@@ -17,6 +17,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PA
-     install(DIRECTORY ${OPENCV_TEST_DATA_PATH}
-             DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
-               GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
--            DESTINATION share/OpenCV/testdata COMPONENT tests)
-+            DESTINATION share/opencv/testdata COMPONENT tests)
-   endif()
--endif()
-\ Manca newline alla fine del file
-+endif()
-diff -Naurp opencv-2.4.9-orig/modules/java/CMakeLists.txt opencv-2.4.9/modules/java/CMakeLists.txt
---- opencv-2.4.9-orig/modules/java/CMakeLists.txt	2014-04-11 12:15:26.000000000 +0200
-+++ opencv-2.4.9/modules/java/CMakeLists.txt	2014-06-26 15:08:28.534686737 +0200
-@@ -280,7 +280,7 @@ else(ANDROID)
-   if(WIN32)
-     set(JAR_INSTALL_DIR java)
-   else(WIN32)
--    set(JAR_INSTALL_DIR share/OpenCV/java)
-+    set(JAR_INSTALL_DIR share/opencv/java)
-   endif(WIN32)
-   install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
- endif(ANDROID)
-
diff --git a/libraries/opencv/opencv-2.4.11-pkgconfig.patch b/libraries/opencv/opencv-2.4.11-pkgconfig.patch
deleted file mode 100644
index facb1474fb..0000000000
--- a/libraries/opencv/opencv-2.4.11-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
---- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:27.253763202 +0000
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:41:48.936262732 +0000
-@@ -10,7 +10,7 @@
- # -------------------------------------------------------------------------------------------
- set(prefix      "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir      "\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}")
-+set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
- set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
- 
- if(CMAKE_BUILD_TYPE MATCHES "Release")
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 70e56b1774..ff8f4a27ad 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for opencv
 
-# Copyright 2012-2014 Matt Dinslage, Springfield, MO USA
+# Copyright 2012-2015 Matt Dinslage, Springfield, MO USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opencv
-VERSION=${VERSION:-2.4.11}
-BUILD=${BUILD:-1}
+PRGNAM2=opencv_contrib
+VERSION=${VERSION:-3.0.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,8 +61,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+unzip $CWD/$VERSION.zip || unzip $CWD/$PRGNAM2-$VERSION.zip
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,10 +72,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # http://code.opencv.org/issues/2512
-patch -p1 < $CWD/opencv-2.4.11-fsh.patch
-
-# https://bugzilla.novell.com/show_bug.cgi?id=853036
-patch -p1 < $CWD/opencv-2.4.11-pkgconfig.patch
+patch -p1 < $CWD/fsh.patch
 
 mkdir -p build
 cd build
@@ -87,9 +86,10 @@ cd build
     -DBUILD_SHARED_LIBS=ON \
     -DENABLE_PRECOMPILED_HEADERS=OFF \
     -DWITH_QT=ON \
+    -DWITH_IPP=OFF \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \
-    ..
+    -DOPENCV_EXTRA_MODULES_PATH=../$PRGNAM2-$VERSION/modules ..
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index 45ed61f746..184edd7dbe 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,10 +1,12 @@
 PRGNAM="opencv"
-VERSION="2.4.11"
-HOMEPAGE="http://opencv.willowgarage.com/wiki/"
-DOWNLOAD="http://downloads.sourceforge.net/opencvlibrary/opencv-2.4.11.zip"
-MD5SUM="32f498451bff1817a60e1aabc2939575"
+VERSION="3.0.0"
+HOMEPAGE="http://opencv.org/"
+DOWNLOAD="https://github.com/Itseez/opencv/archive/3.0.0.tar.gz \
+          https://github.com/Itseez/opencv_contrib/archive/3.0.0.zip"
+MD5SUM="e6c72f54f7127161b371ef798f34d5c9 \
+        ad5fc005890f1bda8a2ac899b4209ab9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="eigen3"
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
diff --git a/libraries/opensaml/opensaml.SlackBuild b/libraries/opensaml/opensaml.SlackBuild
index 3eb85806d0..3beca122d2 100644
--- a/libraries/opensaml/opensaml.SlackBuild
+++ b/libraries/opensaml/opensaml.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensaml
-VERSION=${VERSION:-2.5.4}
+VERSION=${VERSION:-2.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/opensaml/opensaml.info b/libraries/opensaml/opensaml.info
index 3bca3781be..b09eea2816 100644
--- a/libraries/opensaml/opensaml.info
+++ b/libraries/opensaml/opensaml.info
@@ -1,8 +1,8 @@
 PRGNAM="opensaml"
-VERSION="2.5.4"
+VERSION="2.5.5"
 HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/Home"
-DOWNLOAD="http://shibboleth.net/downloads/c++-opensaml/2.5.4/opensaml-2.5.4.tar.gz"
-MD5SUM="aabb73d4b3ef5c7421e789e87284bbad"
+DOWNLOAD="http://shibboleth.net/downloads/c++-opensaml/2.5.5/opensaml-2.5.5.tar.gz"
+MD5SUM="85c1e093b8df11d7b197f6d7585e46e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xmltooling"
diff --git a/libraries/pexpect/pexpect.SlackBuild b/libraries/pexpect/pexpect.SlackBuild
index c0811e97bc..d8774af912 100644
--- a/libraries/pexpect/pexpect.SlackBuild
+++ b/libraries/pexpect/pexpect.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pexpect
-VERSION=${VERSION:-3.3}
+VERSION=${VERSION:-4.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/pexpect/pexpect.info b/libraries/pexpect/pexpect.info
index bdb3a35e72..52ee8076ad 100644
--- a/libraries/pexpect/pexpect.info
+++ b/libraries/pexpect/pexpect.info
@@ -1,8 +1,8 @@
 PRGNAM="pexpect"
-VERSION="3.3"
+VERSION="4.0.1"
 HOMEPAGE="https://github.com/pexpect/pexpect"
-DOWNLOAD="https://github.com/pexpect/pexpect/archive/3.3.tar.gz"
-MD5SUM="dc2f408c95b0d8bc7c1c3bdba738a70e"
+DOWNLOAD="https://github.com/pexpect/pexpect/archive/4.0.1.tar.gz"
+MD5SUM="2bd260f7f2159f9bcab373721736d526"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/php-memcached/README b/libraries/php-memcached/README
new file mode 100644
index 0000000000..ffc8dabaf8
--- /dev/null
+++ b/libraries/php-memcached/README
@@ -0,0 +1,2 @@
+This extension uses libmemcached library to provide API for
+communicating with memcached servers.
diff --git a/libraries/php-memcached/doinst.sh b/libraries/php-memcached/doinst.sh
new file mode 100644
index 0000000000..320ae2b528
--- /dev/null
+++ b/libraries/php-memcached/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/php/memcached.ini.new
diff --git a/libraries/php-memcached/php-memcached.SlackBuild b/libraries/php-memcached/php-memcached.SlackBuild
new file mode 100644
index 0000000000..9be3f5183b
--- /dev/null
+++ b/libraries/php-memcached/php-memcached.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for "php-memcached".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=php-memcached
+VERSION=${VERSION:-2.2.0}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+phpize
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --enable-opcache \
+  --build=$ARCH-slackware-linux
+
+make install-modules INSTALL_ROOT=$PKG
+mkdir -p $PKG/etc/php/
+install -m 644 memcached.ini $PKG/etc/php/memcache.ini.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CREDITS ChangeLog LICENSE README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/php-memcached/php-memcached.info b/libraries/php-memcached/php-memcached.info
new file mode 100644
index 0000000000..7c2eb76cea
--- /dev/null
+++ b/libraries/php-memcached/php-memcached.info
@@ -0,0 +1,10 @@
+PRGNAM="php-memcached"
+VERSION="2.2.0"
+HOMEPAGE="https://github.com/php-memcached-dev/php-memcached/"
+DOWNLOAD="https://github.com/php-memcached-dev/php-memcached/archive/2.2.0.tar.gz"
+MD5SUM="687fb47e4a5ac323d85eb323ac5eb8d1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libmemcached"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/libraries/php-memcached/slack-desc b/libraries/php-memcached/slack-desc
new file mode 100644
index 0000000000..2afdbeef48
--- /dev/null
+++ b/libraries/php-memcached/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+php-memcached: php-memcached (PHP extension for memcached via libmemcached)
+php-memcached:
+php-memcached: This extension uses libmemcached library to provide API for
+php-memcached: communicating with memcached servers.
+php-memcached:
+php-memcached: Homepage: https://github.com/php-memcached-dev/php-memcached/
+php-memcached:
+php-memcached:
+php-memcached:
+php-memcached:
+php-memcached:
diff --git a/libraries/php-mssql/php-mssql.SlackBuild b/libraries/php-mssql/php-mssql.SlackBuild
index 1876c8a118..f89b472ce5 100644
--- a/libraries/php-mssql/php-mssql.SlackBuild
+++ b/libraries/php-mssql/php-mssql.SlackBuild
@@ -24,7 +24,7 @@
 
 SRCNAM=php
 PRGNAM=php-mssql
-VERSION=5.4.13
+VERSION=${VERSION:-5.4.45}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,10 +65,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd ext/mssql/
 
@@ -99,7 +99,7 @@ make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
 
 install -m 644 $CWD/mssql.ini $PKG/etc/php/mssql.ini.new
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/php-mssql/php-mssql.info b/libraries/php-mssql/php-mssql.info
index 52e42bc38b..30bf61d1cb 100644
--- a/libraries/php-mssql/php-mssql.info
+++ b/libraries/php-mssql/php-mssql.info
@@ -1,8 +1,8 @@
 PRGNAM="php-mssql"
-VERSION="5.4.13"
+VERSION="5.4.45"
 HOMEPAGE="http://www.php.net/manual/en/book.mssql.php"
-DOWNLOAD="http://museum.php.net/php5/php-5.4.13.tar.bz2"
-MD5SUM="cacd308e978b7cf9ba4993196612ccf7"
+DOWNLOAD="https://secure.php.net/distributions/php-5.4.45.tar.bz2"
+MD5SUM="185f67f1ca652b18bc0cca9d7edbde7c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="freetds"
diff --git a/libraries/php-pdo_dblib/php-pdo_dblib.SlackBuild b/libraries/php-pdo_dblib/php-pdo_dblib.SlackBuild
index 50fcd40c5a..58f164e326 100644
--- a/libraries/php-pdo_dblib/php-pdo_dblib.SlackBuild
+++ b/libraries/php-pdo_dblib/php-pdo_dblib.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=php-pdo_dblib
-VERSION=5.4.13
+VERSION=${VERSION:-5.4.45}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,10 +66,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd ext/pdo_dblib/
 
@@ -99,7 +99,7 @@ make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
 
 install -m 644 $CWD/pdo_dblib.ini $PKG/etc/php/pdo_dblib.ini.new
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/php-pdo_dblib/php-pdo_dblib.info b/libraries/php-pdo_dblib/php-pdo_dblib.info
index c00156f533..64e1d67fae 100644
--- a/libraries/php-pdo_dblib/php-pdo_dblib.info
+++ b/libraries/php-pdo_dblib/php-pdo_dblib.info
@@ -1,8 +1,8 @@
 PRGNAM="php-pdo_dblib"
-VERSION="5.4.13"
+VERSION="5.4.45"
 HOMEPAGE="http://php.net/manual/en/ref.pdo-dblib.php"
-DOWNLOAD="http://museum.php.net/php5/php-5.4.13.tar.bz2"
-MD5SUM="cacd308e978b7cf9ba4993196612ccf7"
+DOWNLOAD="https://secure.php.net/distributions/php-5.4.45.tar.bz2"
+MD5SUM="185f67f1ca652b18bc0cca9d7edbde7c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="freetds"
diff --git a/libraries/php-pgsql/php-pgsql.SlackBuild b/libraries/php-pgsql/php-pgsql.SlackBuild
index da79da23ef..e5ad29f58c 100644
--- a/libraries/php-pgsql/php-pgsql.SlackBuild
+++ b/libraries/php-pgsql/php-pgsql.SlackBuild
@@ -22,9 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by Mario Preksavec <mario@slackware.hr>
+
 SRCNAM=php
 PRGNAM=php-pgsql
-VERSION=5.4.34
+VERSION=${VERSION:-5.6.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,10 +67,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 PHP_CONFIG=/usr/bin/php-config
 EXTENSION_DIR="$PKG/$($PHP_CONFIG --extension-dir)"
@@ -122,7 +124,7 @@ cd -
 install -m 644 $CWD/pgsql.ini $PKG/etc/php/pgsql.ini.new
 install -m 644 $CWD/pdo_pgsql.ini $PKG/etc/php/pdo_pgsql.ini.new
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{pgsql,pdo_pgsql}
diff --git a/libraries/php-pgsql/php-pgsql.info b/libraries/php-pgsql/php-pgsql.info
index 87b17ec18d..f065607f74 100644
--- a/libraries/php-pgsql/php-pgsql.info
+++ b/libraries/php-pgsql/php-pgsql.info
@@ -1,8 +1,8 @@
 PRGNAM="php-pgsql"
-VERSION="5.4.34"
+VERSION="5.6.17"
 HOMEPAGE="http://php.net/manual/en/book.pgsql.php"
-DOWNLOAD="https://php.net/distributions/php-5.4.34.tar.bz2"
-MD5SUM="1afe3a10cefec9618acb785ef5064bf9"
+DOWNLOAD="https://php.net/distributions/php-5.6.17.tar.bz2"
+MD5SUM="23e2183852b172a8e2b2c739b7dde4ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql"
diff --git a/libraries/php-redis/README b/libraries/php-redis/README
new file mode 100644
index 0000000000..7e3f06a00d
--- /dev/null
+++ b/libraries/php-redis/README
@@ -0,0 +1,5 @@
+This extension enables PHP to work with redis.
+
+To enable the redis extension for php, go to
+/etc/php.d/redis.ini and uncomment the line:
+  ; extension=redis.so
diff --git a/libraries/php-redis/doinst.sh b/libraries/php-redis/doinst.sh
new file mode 100644
index 0000000000..3f7d33d743
--- /dev/null
+++ b/libraries/php-redis/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/php.d/redis.ini.new
diff --git a/libraries/php-redis/php-redis.SlackBuild b/libraries/php-redis/php-redis.SlackBuild
new file mode 100644
index 0000000000..311b910869
--- /dev/null
+++ b/libraries/php-redis/php-redis.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Slackware build script for php-redis
+
+# Copyright 2012, 2015  Ebben Aries, Denver, CO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SRCNAM=redis
+PRGNAM=php-redis
+VERSION=${VERSION:-2.2.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION package.xml
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+PHP_CONFIG=php-config
+
+phpize
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-php-config=$PHP_CONFIG \
+  --enable-redis \
+  --build=$ARCH-slackware-linux
+
+make
+
+EXTENSION_DIR="$PKG/$($PHP_CONFIG --extension-dir)"
+mkdir -p $EXTENSION_DIR $PKG/etc/php.d
+
+make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
+
+install -m 644 $CWD/redis.ini $PKG/etc/php.d/redis.ini.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp CREDITS README.markdown ../package.xml $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/php-redis/php-redis.info b/libraries/php-redis/php-redis.info
new file mode 100644
index 0000000000..9b8d906747
--- /dev/null
+++ b/libraries/php-redis/php-redis.info
@@ -0,0 +1,10 @@
+PRGNAM="php-redis"
+VERSION="2.2.7"
+HOMEPAGE="http://pecl.php.net/package/redis"
+DOWNLOAD="https://pecl.php.net/get/redis-2.2.7.tgz"
+MD5SUM="c55839465b2c435fd091ac50923f2d96"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="redis"
+MAINTAINER="Ebben Aries"
+EMAIL="e@dscp.org"
diff --git a/libraries/php-redis/redis.ini b/libraries/php-redis/redis.ini
new file mode 100644
index 0000000000..3b2840cd2f
--- /dev/null
+++ b/libraries/php-redis/redis.ini
@@ -0,0 +1,2 @@
+; Enable redis extension module
+; extension=redis.so
diff --git a/libraries/php-redis/slack-desc b/libraries/php-redis/slack-desc
new file mode 100644
index 0000000000..43065f9490
--- /dev/null
+++ b/libraries/php-redis/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+php-redis: php-redis (Redis bindings for PHP)
+php-redis:
+php-redis: This extension enables PHP to work with redis.
+php-redis:
+php-redis: Homepage: https://github.com/phpredis/phpredis
+php-redis:
+php-redis:
+php-redis:
+php-redis:
+php-redis:
+php-redis:
diff --git a/libraries/platform/README b/libraries/platform/README
new file mode 100644
index 0000000000..2dbef83e37
--- /dev/null
+++ b/libraries/platform/README
@@ -0,0 +1 @@
+Platform support library for libcec.
diff --git a/libraries/platform/platform.SlackBuild b/libraries/platform/platform.SlackBuild
new file mode 100644
index 0000000000..e9d1b008a9
--- /dev/null
+++ b/libraries/platform/platform.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for platform
+
+# Copyright 2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=platform
+VERSION=${VERSION:-1.0.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake -G "Unix Makefiles" \
+    -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  make VERBOSE=1
+  make install DESTDIR=$PKG
+cd -
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/platform/platform.info b/libraries/platform/platform.info
new file mode 100644
index 0000000000..16a0d659cc
--- /dev/null
+++ b/libraries/platform/platform.info
@@ -0,0 +1,10 @@
+PRGNAM="platform"
+VERSION="1.0.10"
+HOMEPAGE="https://github.com/Pulse-Eight/platform"
+DOWNLOAD="https://github.com/Pulse-Eight/platform/archive/1.0.10.tar.gz"
+MD5SUM="4ac07e020227d3cbe54351ec3837ba48"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Larry Hajali"
+EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/libraries/platform/slack-desc b/libraries/platform/slack-desc
new file mode 100644
index 0000000000..79d6c9b16c
--- /dev/null
+++ b/libraries/platform/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+platform: platform (support library)
+platform:
+platform: Platform support library for libcec.
+platform:
+platform: Homepage: https://github.com/Pulse-Eight/platform
+platform:
+platform:
+platform:
+platform:
+platform:
+platform:
diff --git a/libraries/plumbum/plumbum.SlackBuild b/libraries/plumbum/plumbum.SlackBuild
index 0f2f6e64a1..801aea4d97 100644
--- a/libraries/plumbum/plumbum.SlackBuild
+++ b/libraries/plumbum/plumbum.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for plumbum
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=plumbum
-VERSION=${VERSION:-1.4.2}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/plumbum/plumbum.info b/libraries/plumbum/plumbum.info
index f47fd1cb16..c9809d8739 100644
--- a/libraries/plumbum/plumbum.info
+++ b/libraries/plumbum/plumbum.info
@@ -1,8 +1,8 @@
 PRGNAM="plumbum"
-VERSION="1.4.2"
+VERSION="1.6.0"
 HOMEPAGE="http://plumbum.readthedocs.org"
-DOWNLOAD="https://pypi.python.org/packages/source/p/plumbum/plumbum-1.4.2.tar.gz"
-MD5SUM="38b526af9012a5282ae91dfe372cefd3"
+DOWNLOAD="https://pypi.python.org/packages/source/p/plumbum/plumbum-1.6.0.tar.gz"
+MD5SUM="eccc71c9f8a8056e41fc24e0d34daa57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/png++/README b/libraries/png++/README
new file mode 100644
index 0000000000..1d6a2ff4f8
--- /dev/null
+++ b/libraries/png++/README
@@ -0,0 +1,7 @@
+PNG++ aims to provide simple yet powerful C++ interface to libpng,
+the PNG reference implementation library.
+
+PNG++ is free software distributed under a modified variant of
+the BSD license.
+
+To install the html docs use: DOC=yes ./png++.SlackBuild
diff --git a/libraries/png++/png++.SlackBuild b/libraries/png++/png++.SlackBuild
new file mode 100644
index 0000000000..58655be584
--- /dev/null
+++ b/libraries/png++/png++.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for png++
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=png++
+VERSION=${VERSION:-0.2.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix doc location
+sed -i 's|share/doc|doc|g' Makefile
+
+DOC=${DOC:-no}
+make CFLAGS="$SLKCFLAGS"
+if [ "${DOC:-yes}" = "yes" ]; then make docs; fi
+make install PREFIX=$PKG/usr
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/png++/png++.info b/libraries/png++/png++.info
new file mode 100644
index 0000000000..792cfaf1dd
--- /dev/null
+++ b/libraries/png++/png++.info
@@ -0,0 +1,10 @@
+PRGNAM="png++"
+VERSION="0.2.9"
+HOMEPAGE="http://www.nongnu.org/pngpp/"
+DOWNLOAD="http://download.savannah.gnu.org/releases/pngpp/png++-0.2.9.tar.gz"
+MD5SUM="92863df3bee625d707cebc0e749c10df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/libraries/png++/slack-desc b/libraries/png++/slack-desc
new file mode 100644
index 0000000000..46cd23d58a
--- /dev/null
+++ b/libraries/png++/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+png++: png++ (C++ wrapper for libpng)
+png++:
+png++: PNG++ aims to provide simple yet powerful C++ interface to libpng,
+png++: the PNG reference implementation library.
+png++:
+png++: Homepage: http://www.nongnu.org/pngpp/
+png++:
+png++:
+png++:
+png++:
+png++:
diff --git a/libraries/poco/poco.SlackBuild b/libraries/poco/poco.SlackBuild
index 40e593ca7e..5ca517dda0 100644
--- a/libraries/poco/poco.SlackBuild
+++ b/libraries/poco/poco.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for poco
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=poco
-SRCVER=${SRCVER:-1.6.0-all}
-VERSION=$(echo $SRCVER | cut -c1-7)
+VERSION=${VERSION:-1.6.1}
+EDITION=all
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION-$EDITION
+tar xvf $CWD/$PRGNAM-$VERSION-$EDITION.tar.gz
+cd $PRGNAM-$VERSION-$EDITION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/poco/poco.info b/libraries/poco/poco.info
index c4bd80e293..d97a92c269 100644
--- a/libraries/poco/poco.info
+++ b/libraries/poco/poco.info
@@ -1,8 +1,8 @@
 PRGNAM="poco"
-VERSION="1.6.0"
+VERSION="1.6.1"
 HOMEPAGE="http://pocoproject.org"
-DOWNLOAD="http://pocoproject.org/releases/poco-1.6.0/poco-1.6.0-all.tar.gz"
-MD5SUM="4fed893d4ca57db98b0e10d82545232a"
+DOWNLOAD="http://pocoproject.org/releases/poco-1.6.1/poco-1.6.1-all.tar.gz"
+MD5SUM="05961d10195d0f760b707752e88938e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mysql-connector-c++ unixODBC"
diff --git a/libraries/pugixml/pugixml.SlackBuild b/libraries/pugixml/pugixml.SlackBuild
index adb66f155e..d1cd4744c9 100644
--- a/libraries/pugixml/pugixml.SlackBuild
+++ b/libraries/pugixml/pugixml.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pugixml
-VERSION=${VERSION:-1.6}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/pugixml/pugixml.info b/libraries/pugixml/pugixml.info
index 17987aa33a..af0e40f971 100644
--- a/libraries/pugixml/pugixml.info
+++ b/libraries/pugixml/pugixml.info
@@ -1,8 +1,8 @@
 PRGNAM="pugixml"
-VERSION="1.6"
+VERSION="1.7"
 HOMEPAGE="http://pugixml.org/"
-DOWNLOAD="http://github.com/zeux/pugixml/releases/download/v1.6/pugixml-1.6.tar.gz"
-MD5SUM="7fe3667bb6bf123f65cdf2f5cfe4732f"
+DOWNLOAD="http://github.com/zeux/pugixml/releases/download/v1.7/pugixml-1.7.tar.gz"
+MD5SUM="17e6a3996de2942629dce65db1a701c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/pyPEG2/README b/libraries/pyPEG2/README
new file mode 100644
index 0000000000..1439324977
--- /dev/null
+++ b/libraries/pyPEG2/README
@@ -0,0 +1,5 @@
+pyPEG2 (plain and simple intrinsic parser interpreter for Python)
+
+pyPEG2 is a plain and simple intrinsic parser interpreter framework for Python version 2.7 and 3.x.
+It is based on Parsing Expression Grammar (PEG).
+With pyPEG you can parse many formal languages in a very easy way.
diff --git a/libraries/pyPEG2/pyPEG2.SlackBuild b/libraries/pyPEG2/pyPEG2.SlackBuild
new file mode 100644
index 0000000000..ee53c6d5c1
--- /dev/null
+++ b/libraries/pyPEG2/pyPEG2.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# Slackware build script for pyPEG2.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pyPEG2
+VERSION=${VERSION:-2.15.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.txt LICENSE.txt PKG-INFO README.txt TODO.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/pyPEG2/pyPEG2.info b/libraries/pyPEG2/pyPEG2.info
new file mode 100644
index 0000000000..78d2ad65bb
--- /dev/null
+++ b/libraries/pyPEG2/pyPEG2.info
@@ -0,0 +1,10 @@
+PRGNAM="pyPEG2"
+VERSION="2.15.2"
+HOMEPAGE="http://fdik.org/pyPEG/"
+DOWNLOAD="http://fdik.org/pyPEG2/pyPEG2.tar.gz"
+MD5SUM="2ff44bc843c61ccd3951ef66a9e4a2b0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lxml"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/pyPEG2/slack-desc b/libraries/pyPEG2/slack-desc
new file mode 100644
index 0000000000..e4297b8942
--- /dev/null
+++ b/libraries/pyPEG2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+pyPEG2: pyPEG2 (plain and simple intrinsic parser interpreter for Python)
+pyPEG2:
+pyPEG2: pyPEG2 is a plain and simple intrinsic parser interpreter framework 
+pyPEG2: for Python version 2.7 and 3.x.
+pyPEG2:
+pyPEG2: Home page: http://fdik.org/pyPEG/
+pyPEG2:
+pyPEG2:
+pyPEG2:
+pyPEG2:
+pyPEG2:
diff --git a/libraries/pybloomfiltermmap/README b/libraries/pybloomfiltermmap/README
new file mode 100644
index 0000000000..b9c6b15903
--- /dev/null
+++ b/libraries/pybloomfiltermmap/README
@@ -0,0 +1,2 @@
+Pybloomfiltermmap is a fast, simple, and scalable library used for Bloom
+Filters in Python built on mmap.
diff --git a/libraries/pybloomfiltermmap/pybloomfiltermmap.SlackBuild b/libraries/pybloomfiltermmap/pybloomfiltermmap.SlackBuild
new file mode 100644
index 0000000000..86174487fe
--- /dev/null
+++ b/libraries/pybloomfiltermmap/pybloomfiltermmap.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for pybloomfiltermmap
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pybloomfiltermmap
+VERSION=${VERSION:-0.3.14}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG PKG-INFO AUTHORS LICENSE README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/pybloomfiltermmap/pybloomfiltermmap.info b/libraries/pybloomfiltermmap/pybloomfiltermmap.info
new file mode 100644
index 0000000000..37937c6ba8
--- /dev/null
+++ b/libraries/pybloomfiltermmap/pybloomfiltermmap.info
@@ -0,0 +1,10 @@
+PRGNAM="pybloomfiltermmap"
+VERSION="0.3.14"
+HOMEPAGE="https://axiak.github.io/pybloomfiltermmap/"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pybloomfiltermmap/pybloomfiltermmap-0.3.14.tar.gz"
+MD5SUM="9c711cf6efca7438fa9dd1829dfa9d05"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/libraries/pybloomfiltermmap/slack-desc b/libraries/pybloomfiltermmap/slack-desc
new file mode 100644
index 0000000000..6266c6518a
--- /dev/null
+++ b/libraries/pybloomfiltermmap/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+pybloomfiltermmap: pybloomfiltermmap (bloom filter for python)
+pybloomfiltermmap:
+pybloomfiltermmap: Pybloomfiltermmap is a fast, simple, and scalable  
+pybloomfiltermmap: library used for Bloom Filters in Python built on mmap. 
+pybloomfiltermmap: 
+pybloomfiltermmap:
+pybloomfiltermmap: Web site: https://axiak.github.io/pybloomfiltermmap/ 
+pybloomfiltermmap:
+pybloomfiltermmap:
+pybloomfiltermmap:
+pybloomfiltermmap:
diff --git a/libraries/pycparser/pycparser.SlackBuild b/libraries/pycparser/pycparser.SlackBuild
index 630a569f9b..905860a9b9 100644
--- a/libraries/pycparser/pycparser.SlackBuild
+++ b/libraries/pycparser/pycparser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pycparser
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pycparser
-VERSION=${VERSION:-2.13}
+VERSION=${VERSION:-2.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/pycparser/pycparser.info b/libraries/pycparser/pycparser.info
index 45c3d13cc8..a73202273f 100644
--- a/libraries/pycparser/pycparser.info
+++ b/libraries/pycparser/pycparser.info
@@ -1,8 +1,8 @@
 PRGNAM="pycparser"
-VERSION="2.13"
+VERSION="2.14"
 HOMEPAGE="https://github.com/eliben/pycparser"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pycparser/pycparser-2.13.tar.gz"
-MD5SUM="e4fe1a2d341b22e25da0d22f034ef32f"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pycparser/pycparser-2.14.tar.gz"
+MD5SUM="a2bc8d28c923b4fe2b2c3b4b51a4f935"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/pymdstat/pymdstat.SlackBuild b/libraries/pymdstat/pymdstat.SlackBuild
index 0971d96085..d5e57ede26 100644
--- a/libraries/pymdstat/pymdstat.SlackBuild
+++ b/libraries/pymdstat/pymdstat.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for PyMDstat
+# Slackware build script for pymdstat
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=pymdstat
 VERSION=${VERSION:-0.4.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -47,8 +47,8 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-# The upstream tarball will be named differently, depending on the file
-# being downloaded manually (web browser) or with wget.
+# The upstream tarball will be named differently, depending on
+# the file being downloaded manually (web browser) or with wget.
 if [ -e $CWD/v$VERSION.tar.gz ]; then
   tar xvzf $CWD/v$VERSION.tar.gz
 else
@@ -63,21 +63,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-PRGUSR=$PKG/usr
-PRGSHR=$PKG/usr/share
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-
 python setup.py install --root=$PKG
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null \
-  || true
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PRGUSR=$PKG/usr
+PRGSHR=$PKG/usr/share
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
+# Install documentation.
 mkdir -p $PRGDOC
 mv $PRGSHR/doc/$PRGNAM/* $PRGDOC/
 rm -rf $PRGSHR
diff --git a/libraries/pymdstat/pymdstat.info b/libraries/pymdstat/pymdstat.info
index 739b544433..cb42b02d6d 100644
--- a/libraries/pymdstat/pymdstat.info
+++ b/libraries/pymdstat/pymdstat.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/pymdstat/slack-desc b/libraries/pymdstat/slack-desc
index ab1c531328..819065ff8b 100644
--- a/libraries/pymdstat/slack-desc
+++ b/libraries/pymdstat/slack-desc
@@ -11,8 +11,8 @@ pymdstat:
 pymdstat: PyMDstat is a pythonic library to parse /proc/mdstat, which shows a
 pymdstat: snapshot of the kernel's RAID/md state. 
 pymdstat:
-pymdstat:
 pymdstat: Homepage: https://github.com/nicolargo/pymdstat
+pymdstat:
 pymdstat: 
 pymdstat: 
 pymdstat: 
diff --git a/libraries/pyqode.widgets/pyqode.widgets.info b/libraries/pyqode.widgets/pyqode.widgets.info
index 6c537e222c..e3d7371142 100644
--- a/libraries/pyqode.widgets/pyqode.widgets.info
+++ b/libraries/pyqode.widgets/pyqode.widgets.info
@@ -1,7 +1,7 @@
 PRGNAM="pyqode.widgets"
 VERSION="1.2.2"
 HOMEPAGE="https://github.com/pyQode/pyqode.widgets"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyqode.widgets/pyqode.widgets-1.2.2.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/slackbuildsdirectlinks/pyqode.widgets/pyqode.widgets-1.2.2.tar.gz"
 MD5SUM="d43138ede5d6689f61bfe2a14dff48ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/pyte/README b/libraries/pyte/README
new file mode 100644
index 0000000000..caba4d9c08
--- /dev/null
+++ b/libraries/pyte/README
@@ -0,0 +1,6 @@
+It’s an in memory VTXXX-compatible terminal emulator. 
+XXX stands for a series of video terminals, developed 
+by DEC between 1970 and 1995. The first, and probably 
+the most famous one, was VT100 terminal, which is now 
+a de-facto standard for all virtual terminal emulators. 
+pyte follows the suit.
diff --git a/libraries/pyte/pyte.SlackBuild b/libraries/pyte/pyte.SlackBuild
new file mode 100644
index 0000000000..6c8197a08a
--- /dev/null
+++ b/libraries/pyte/pyte.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for pyte
+
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pyte
+VERSION=${VERSION:-0.5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README CHANGES LICENSE AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/pyte/pyte.info b/libraries/pyte/pyte.info
new file mode 100644
index 0000000000..beb3cd6efb
--- /dev/null
+++ b/libraries/pyte/pyte.info
@@ -0,0 +1,10 @@
+PRGNAM="pyte"
+VERSION="0.5.1"
+HOMEPAGE="https://github.com/selectel/pyte"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyte/pyte-0.5.1.tar.gz"
+MD5SUM="028f7ea0a2c332fd23a8363838475437"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="wcwidth"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/libraries/pyte/slack-desc b/libraries/pyte/slack-desc
new file mode 100644
index 0000000000..ee25a5a715
--- /dev/null
+++ b/libraries/pyte/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+pyte: pyte (VTXXX-compatible terminal emulator)
+pyte:
+pyte: It’s an in memory VTXXX-compatible terminal emulator. XXX stands for
+pyte: a series of video terminals, developed by DEC between 1970 and 1995.
+pyte: The first, and probably the most famous one, was VT100 terminal,
+pyte: which is now a de-facto standard for all virtual terminal emulators.
+pyte: pyte follows the suit.
+pyte:
+pyte: Homepage: https://github.com/selectel/pyte
+pyte:
+pyte:
diff --git a/libraries/python-e_dbus/python-e_dbus.SlackBuild b/libraries/python-e_dbus/python-e_dbus.SlackBuild
index b99c75c531..5c6a5c2262 100644
--- a/libraries/python-e_dbus/python-e_dbus.SlackBuild
+++ b/libraries/python-e_dbus/python-e_dbus.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-ecore/python-ecore.SlackBuild b/libraries/python-ecore/python-ecore.SlackBuild
index e414efbb50..722a5fa699 100644
--- a/libraries/python-ecore/python-ecore.SlackBuild
+++ b/libraries/python-ecore/python-ecore.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-edje/python-edje.SlackBuild b/libraries/python-edje/python-edje.SlackBuild
index 61d34d99d3..d0cb7a6a3b 100644
--- a/libraries/python-edje/python-edje.SlackBuild
+++ b/libraries/python-edje/python-edje.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-elementary/python-elementary.SlackBuild b/libraries/python-elementary/python-elementary.SlackBuild
index 16906d3cb5..8e81c4d09c 100644
--- a/libraries/python-elementary/python-elementary.SlackBuild
+++ b/libraries/python-elementary/python-elementary.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-emotion/python-emotion.SlackBuild b/libraries/python-emotion/python-emotion.SlackBuild
index dd1d8787c1..5fc8016184 100644
--- a/libraries/python-emotion/python-emotion.SlackBuild
+++ b/libraries/python-emotion/python-emotion.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-ethumb/python-ethumb.SlackBuild b/libraries/python-ethumb/python-ethumb.SlackBuild
index 1b730f152d..436c1d25e4 100644
--- a/libraries/python-ethumb/python-ethumb.SlackBuild
+++ b/libraries/python-ethumb/python-ethumb.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-evas/python-evas.SlackBuild b/libraries/python-evas/python-evas.SlackBuild
index d99131c0f8..7397b3ad41 100644
--- a/libraries/python-evas/python-evas.SlackBuild
+++ b/libraries/python-evas/python-evas.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/python-librtmp/python-librtmp.SlackBuild b/libraries/python-librtmp/python-librtmp.SlackBuild
index 5d3ba79eb5..1448735188 100644
--- a/libraries/python-librtmp/python-librtmp.SlackBuild
+++ b/libraries/python-librtmp/python-librtmp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-librtmp
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-librtmp
-VERSION=${VERSION:-0.2.2}
+VERSION=${VERSION:-0.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/python-librtmp/python-librtmp.info b/libraries/python-librtmp/python-librtmp.info
index a07ec5434d..4533d71dee 100644
--- a/libraries/python-librtmp/python-librtmp.info
+++ b/libraries/python-librtmp/python-librtmp.info
@@ -1,8 +1,8 @@
 PRGNAM="python-librtmp"
-VERSION="0.2.2"
+VERSION="0.3.0"
 HOMEPAGE="https://github.com/chrippa/python-librtmp"
-DOWNLOAD="https://pypi.python.org/packages/source/p/python-librtmp/python-librtmp-0.2.2.tar.gz"
-MD5SUM="ac57c566f7e40d6e215715a7db2ced19"
+DOWNLOAD="https://pypi.python.org/packages/source/p/python-librtmp/python-librtmp-0.3.0.tar.gz"
+MD5SUM="f7afe8d463214072281998fa84553927"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rtmpdump cffi"
diff --git a/libraries/python-ntlm/DOCUMENTATION b/libraries/python-ntlm/DOCUMENTATION
new file mode 100644
index 0000000000..4d68dc29ca
--- /dev/null
+++ b/libraries/python-ntlm/DOCUMENTATION
@@ -0,0 +1,102 @@
+# python-ntlm
+Python library that provides NTLM support, including an authentication
+handler for urllib2.
+
+This library allows you to retrieve content from (usually corporate)
+servers protected with windows authentication (NTLM) using the python
+urllib2.
+
+## Python 3 Support
+There is work going on to port the library to python 3, you can find it
+in the python30 directory. (at this time it seems to work as good as the
+python 2 library)
+
+# Usage
+
+## Simple example
+```python
+import urllib2
+from ntlm import HTTPNtlmAuthHandler
+
+user = 'DOMAIN\User'
+password = "Password"
+url = "http://ntlmprotectedserver/securedfile.html"
+
+passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
+passman.add_password(None, url, user, password)
+# create the NTLM authentication handler
+auth_NTLM = HTTPNtlmAuthHandler.HTTPNtlmAuthHandler(passman)
+
+# create and install the opener
+opener = urllib2.build_opener(auth_NTLM)
+urllib2.install_opener(opener)
+
+# retrieve the result
+response = urllib2.urlopen(url)
+print(response.read())
+```
+
+## Extended Example
+```python
+import urllib2
+from urlparse import urlparse, urlunparse
+from ntlm import HTTPNtlmAuthHandler
+
+user = 'DOMAIN\User'
+password = "Password"
+url = "http://ntlmprotectedserver/securedfile.html"
+# determine a base_uri for which the username and password can be used
+parsed_url = urlparse(self.href)
+base_uri = urlunparse((parsed_url[0],parsed_url[1],"","","",""))
+
+passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
+passman.add_password(None, base_uri, user, password)
+# create the NTLM authentication handler
+auth_NTLM = HTTPNtlmAuthHandler.HTTPNtlmAuthHandler(passman)
+
+# other authentication handlers
+auth_basic = urllib2.HTTPBasicAuthHandler(passman)
+auth_digest = urllib2.HTTPDigestAuthHandler(passman)
+
+# disable proxies (if you want to stay within the corporate network)
+proxy_handler = urllib2.ProxyHandler({})
+
+# create and install the opener
+opener = urllib2.build_opener(proxy_handler, auth_NTLM, auth_digest,
+auth_basic)
+urllib2.install_opener(opener)
+
+# retrieve the result    
+response = urllib2.urlopen(url)
+print(response.read())
+```
+
+## Limitations
+  * A request using the `HTTPNtlmAuthHandler` has no HTTP status
+	* handling, for example: redirects are not handled by the opener, you
+	* must check and handle the response yourself.
+
+	# Resources
+
+	## Inspired by
+	  * [http://sourceforge.net/projects/ntlmaps/ NTLM Authorization Proxy
+		* Server]
+		(Dmitri Rozmanov kindly allowed his code to be redistributed under
+		the LGPL)
+
+		The NTLM Authorization Proxy Server can be used to make applications
+		that do not support NTLM proxies use them anyway: "Opens up IIS
+		Proxy Servers using NTLM to non-Microsoft browsers, etc"
+
+		In contrast the python-ntlm library is used to make it possible for
+		python code to retrieve content from an NTLM protected server. 
+
+		## References
+		  * [MS-NLMP]:
+			* [http://download.microsoft.com/download/a/e/6/ae6e4142-aa58-45c6-8dcf-a657e5900cd3/%5BMS-NLMP%5D.pdf
+			* NT LAN Manager (NTLM) Authentication Protocol Specification]
+			  * [MS-NTHT]:
+				* [http://download.microsoft.com/download/a/e/6/ae6e4142-aa58-45c6-8dcf-a657e5900cd3/%5BMS-NTHT%5D.pdf
+				* NTLM Over HTTP Protocol Specification]
+				  * [http://www.blackhat.com/presentations/bh-asia-04/bh-jp-04-pdfs/bh-jp-04-seki.pdf
+					* Optimized Attack for NTLM2 Session Response]
diff --git a/libraries/python-ntlm/README b/libraries/python-ntlm/README
new file mode 100644
index 0000000000..470765e9c1
--- /dev/null
+++ b/libraries/python-ntlm/README
@@ -0,0 +1,11 @@
+Python library that provides NTLM support, including an authentication
+handler for urllib2. Works with pass-the-hash in additon to password
+authentication.
+
+This library is useful for passing hashes to servers requiring ntlm
+authentication in instances where using windows tools is not desirable.
+
+It allows Python clients running on any operating system to provide NTLM
+authentication to a supporting Windows server.
+
+Usage and Examples located in /usr/doc/python-ntlm-$VERSION/README.md.
diff --git a/libraries/python-ntlm/python-ntlm.SlackBuild b/libraries/python-ntlm/python-ntlm.SlackBuild
new file mode 100644
index 0000000000..7da4da552c
--- /dev/null
+++ b/libraries/python-ntlm/python-ntlm.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for python-ntlm
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-ntlm
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+# Copy README.md from github, needs to be checked periodically
+cat $CWD/DOCUMENTATION > $PKG/usr/doc/$PRGNAM-$VERSION/README.md
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python-ntlm/python-ntlm.info b/libraries/python-ntlm/python-ntlm.info
new file mode 100644
index 0000000000..38bbfb218a
--- /dev/null
+++ b/libraries/python-ntlm/python-ntlm.info
@@ -0,0 +1,10 @@
+PRGNAM="python-ntlm"
+VERSION="1.1.0"
+HOMEPAGE="https://github.com/mullender/python-ntlm"
+DOWNLOAD="https://pypi.python.org/packages/source/p/python-ntlm/python-ntlm-1.1.0.tar.gz"
+MD5SUM="c1b036401a29dd979ee56d48a2267686"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/libraries/python-ntlm/slack-desc b/libraries/python-ntlm/slack-desc
new file mode 100644
index 0000000000..0ffe1aa8f3
--- /dev/null
+++ b/libraries/python-ntlm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+python-ntlm: python-ntlm (Python NTLM Support)
+python-ntlm:
+python-ntlm: Python library that provides NTLM support, including an
+python-ntlm: authentication handler for urllib2. Works with pass-the-hash in
+python-ntlm: additon to password authentication.
+python-ntlm:
+python-ntlm: Home page: https://github.com/mullender/python-ntlm
+python-ntlm:
+python-ntlm:
+python-ntlm:
+python-ntlm:
diff --git a/libraries/python3-PyQt5/README b/libraries/python3-PyQt5/README
new file mode 100644
index 0000000000..23ab8cbdae
--- /dev/null
+++ b/libraries/python3-PyQt5/README
@@ -0,0 +1,2 @@
+PyQt5 is a set of Python bindings for Trolltech's Qt5 application
+framework and runs on all platforms supported by Qt5.
diff --git a/libraries/python3-PyQt5/python3-PyQt5.SlackBuild b/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
new file mode 100644
index 0000000000..0ce82b5c0c
--- /dev/null
+++ b/libraries/python3-PyQt5/python3-PyQt5.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for "python3-PyQt5".
+
+# Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
+# Copyright 2008, 2009, 2010, 2011, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
+# Adapted by Marcel Saegebarth <marc@mos6581.de>
+
+PRGNAM=python3-PyQt5
+SRCNAM=PyQt
+VERSION=${VERSION:-5.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+PYTHONVER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-gpl-$VERSION.tar.gz
+cd $SRCNAM-gpl-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
+export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
+
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+
+python3 configure.py \
+  --confirm-license \
+  --verbose \
+  -q /usr/bin/qmake-qt5 \
+  --sip=/usr/bin/python3-sip \
+  --sip-incdir=/usr/include/python$PYTHONVER
+
+make
+make install DESTDIR=$PKG INSTALL_ROOT=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python3-PyQt5/python3-PyQt5.info b/libraries/python3-PyQt5/python3-PyQt5.info
new file mode 100644
index 0000000000..1eeb6b2ca5
--- /dev/null
+++ b/libraries/python3-PyQt5/python3-PyQt5.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-PyQt5"
+VERSION="5.5"
+HOMEPAGE="https://riverbankcomputing.com/software/pyqt/intro/"
+DOWNLOAD="http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-5.5/PyQt-gpl-5.5.tar.gz"
+MD5SUM="60c0137b26c9ecbc3db0addb9638dc01"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-sip qt5"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/libraries/python3-PyQt5/slack-desc b/libraries/python3-PyQt5/slack-desc
new file mode 100644
index 0000000000..1b573c62fa
--- /dev/null
+++ b/libraries/python3-PyQt5/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+python3-PyQt5: PyQt5 (Python bindings for Qt)
+python3-PyQt5:
+python3-PyQt5: PyQt5 is a set of Python bindings for Trolltech's Qt5 application
+python3-PyQt5: framework and runs on all platforms supported by Qt5.
+python3-PyQt5:
+python3-PyQt5: Homepage: https://riverbankcomputing.com/software/pyqt/intro/
+python3-PyQt5:
+python3-PyQt5:
+python3-PyQt5:
+python3-PyQt5:
+python3-PyQt5:
diff --git a/libraries/python3-PyYAML/README b/libraries/python3-PyYAML/README
new file mode 100644
index 0000000000..ea05ab9eee
--- /dev/null
+++ b/libraries/python3-PyYAML/README
@@ -0,0 +1,8 @@
+pyyaml (YAML parser and emitter for Python)
+
+YAML is a data serialization  format  designed for  human readability
+and interaction with scripting languages. PyYAML is a YAML parser and
+emitter for Python.
+
+This builds the python3 version of PyYAML. It is safe to install this
+on a system that has the SBo's PyYAML (python2) package installed.
diff --git a/libraries/python3-PyYAML/python3-PyYAML.SlackBuild b/libraries/python3-PyYAML/python3-PyYAML.SlackBuild
new file mode 100644
index 0000000000..455d8dfb10
--- /dev/null
+++ b/libraries/python3-PyYAML/python3-PyYAML.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for python-PyYAML
+# Copyright 2010  David Woodfall <dave@dawoodfall.net>
+# Copyright 2015  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Adapted for python3-PyYAML by Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+
+PRGNAM=python3-PyYAML
+SRCNAM=PyYAML
+VERSION=${VERSION:-3.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE README  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python3-PyYAML/python3-PyYAML.info b/libraries/python3-PyYAML/python3-PyYAML.info
new file mode 100644
index 0000000000..2a7773edc6
--- /dev/null
+++ b/libraries/python3-PyYAML/python3-PyYAML.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-PyYAML"
+VERSION="3.11"
+HOMEPAGE="http://pyyaml.org"
+DOWNLOAD="http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz"
+MD5SUM="f50e08ef0fe55178479d3a618efe21db"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo -at- gmail.com"
diff --git a/libraries/python3-PyYAML/slack-desc b/libraries/python3-PyYAML/slack-desc
new file mode 100644
index 0000000000..3e68405826
--- /dev/null
+++ b/libraries/python3-PyYAML/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python3-PyYAML: python3-PyYAML (YAML parser and emitter for Python)
+python3-PyYAML:
+python3-PyYAML: YAML is a data serialization format designed for human readability
+python3-PyYAML: and interaction with scripting languages. PyYAML is a YAML parser
+python3-PyYAML: and emitter for Python.
+python3-PyYAML:
+python3-PyYAML: Homepage: http://pyyaml.org
+python3-PyYAML:
+python3-PyYAML: This builds the python3 version of PyYAML. It is safe to install this
+python3-PyYAML: on a system that has the SBo's PyYAML (python2) package installed.
+python3-PyYAML:
diff --git a/libraries/python3-pillow/README b/libraries/python3-pillow/README
new file mode 100644
index 0000000000..94f59fd66a
--- /dev/null
+++ b/libraries/python3-pillow/README
@@ -0,0 +1,13 @@
+The Python Imaging Library (PIL) adds image processing capabilities to
+your Python environment.  This library provides extensive file format
+support, an efficient internal representation, and powerful image
+processing capabilities.
+
+This SlackBuild provides the PIL libraries with support for Python3.
+It is intended to be a complement to python-pillow, not to replace it.
+
+***Warning***
+
+Pillow and PIL CANNOT co-exist in the same environment. Before
+installing Pillow, please uninstall PIL.
+https://pillow.readthedocs.org/en/latest/installation.html
diff --git a/libraries/python3-pillow/python3-pillow.SlackBuild b/libraries/python3-pillow/python3-pillow.SlackBuild
new file mode 100644
index 0000000000..f714695546
--- /dev/null
+++ b/libraries/python3-pillow/python3-pillow.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for python3-pillow
+
+# Copyright 2015 by Philip Lacroix <slackph at posteo dot de>
+#
+# Based on the build script for python-pillow by the following authors:
+# Copyright 2009, 2010, 2013, 2014  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2014 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2015 Brenton Earl <brent at exitstatusone dot com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# This SlackBuild provides PIL libraries with support for Python3. It is a 
+# complement to python-pillow, not a replacement, and as such it doesn't
+# include the scripts in $PKG/usr/bin. 
+
+PRGNAM=python3-pillow
+SRCNAM=Pillow
+VERSION=${VERSION:-3.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Do not install scripts that would go to /usr/bin, as they
+# are already part of python-pillow.
+sed -i -e "s~.*scripts=glob.glob(\"Scripts/\*.py\"),~~" setup.py		
+
+python3 setup.py install --root=$PKG
+
+# Safety check to prevent changes in the install process of a
+# different version of Pillow that might allow files in /usr/bin.
+if [ -e $PKG/usr/bin ]; then
+  echo 'Warning - This package should not put files in /usr/bin: exiting'
+  exit
+fi
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install documentation.
+mkdir -p $PRGDOC
+cat $CWD/README > $PRGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python3-pillow/python3-pillow.info b/libraries/python3-pillow/python3-pillow.info
new file mode 100644
index 0000000000..6a9147c153
--- /dev/null
+++ b/libraries/python3-pillow/python3-pillow.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pillow"
+VERSION="3.0.0"
+HOMEPAGE="http://python-pillow.github.io/"
+DOWNLOAD="https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz"
+MD5SUM="fc8ac44e93da09678eac7e30c9b7377d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 python-pillow %README%"
+MAINTAINER="Philip Lacroix"
+EMAIL="slackph at posteo dot de"
diff --git a/libraries/python3-pillow/slack-desc b/libraries/python3-pillow/slack-desc
new file mode 100644
index 0000000000..e97ef968a7
--- /dev/null
+++ b/libraries/python3-pillow/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python3-pillow: python3-pillow (Python3 support for python-pillow)
+python3-pillow:
+python3-pillow: The Python Imaging Library (PIL) adds image processing capabilities
+python3-pillow: to your Python environment.  This library provides extensive file
+python3-pillow: format support, an efficient internal representation, and powerful
+python3-pillow: image processing capabilities.
+python3-pillow:
+python3-pillow: This package provides the PIL libraries with support for Python3. It
+python3-pillow: is intended to be a complement to python-pillow, not to replace it.
+python3-pillow:
+python3-pillow: PIL homepage:  https://python3-pillow.github.io/
diff --git a/libraries/qmltermwidget/README b/libraries/qmltermwidget/README
new file mode 100644
index 0000000000..56ece0d97c
--- /dev/null
+++ b/libraries/qmltermwidget/README
@@ -0,0 +1 @@
+QMLTermWidget is a QML port of qtermwidget.
diff --git a/libraries/qmltermwidget/qmltermwidget.SlackBuild b/libraries/qmltermwidget/qmltermwidget.SlackBuild
new file mode 100644
index 0000000000..3fa7ca4bc5
--- /dev/null
+++ b/libraries/qmltermwidget/qmltermwidget.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for qmltermwidget
+
+# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=qmltermwidget
+VERSION=${VERSION:-20151215_5aef9f2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="README.md AUTHORS COPYING"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+qmake-qt5
+make
+make INSTALL_ROOT=$PKG install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/qmltermwidget/qmltermwidget.info b/libraries/qmltermwidget/qmltermwidget.info
new file mode 100644
index 0000000000..f6f0dbbb36
--- /dev/null
+++ b/libraries/qmltermwidget/qmltermwidget.info
@@ -0,0 +1,10 @@
+PRGNAM="qmltermwidget"
+VERSION="20151215_5aef9f2"
+HOMEPAGE="https://github.com/Swordfish90/qmltermwidget"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/qmltermwidget-20151215_5aef9f2.tar.xz"
+MD5SUM="8d69455846d2f73b4653398b09366f9c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/qmltermwidget/slack-desc b/libraries/qmltermwidget/slack-desc
new file mode 100644
index 0000000000..e730607a52
--- /dev/null
+++ b/libraries/qmltermwidget/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+qmltermwidget: qmltermwidget (QML terminal widget)
+qmltermwidget:
+qmltermwidget: QMLTermWidget is a QML port of qtermwidget.
+qmltermwidget:
+qmltermwidget: homepage: https://github.com/Swordfish90/qmltermwidget
+qmltermwidget:
+qmltermwidget:
+qmltermwidget:
+qmltermwidget:
+qmltermwidget:
+qmltermwidget:
diff --git a/libraries/qt5/README b/libraries/qt5/README
index e1376a9998..ac0c8c5623 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -4,8 +4,8 @@ is its rich set of widgets that provide standard GUI functionality.
 Optional dependencies: unixodbc, libxkbcommon, freetds, pulseaudio,
 OpenAL, libwebp and postgresql
 
-Optional dependencies: wayland, openvg and firebird (not available at
-slackbuilds.org)
+Optional dependencies: wayland, openvg, libinput and firebird (not available
+at slackbuilds.org)
 
 Note: To build Qt5 with Pulseadio then pass USEPULSE=yes to the slackbuild.
 
diff --git a/libraries/qt5/patches/nss-update-sslv3-nonce.patch b/libraries/qt5/patches/nss-update-sslv3-nonce.patch
new file mode 100644
index 0000000000..1700c226a6
--- /dev/null
+++ b/libraries/qt5/patches/nss-update-sslv3-nonce.patch
@@ -0,0 +1,44 @@
+diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
+--- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc	2015-10-13 04:36:54.000000000 +0000
++++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc	2016-03-15 11:57:53.898988200 +0000
+@@ -66,9 +66,9 @@
+                                                AeadParams* aead_params) const {
+   aead_params->len = sizeof(aead_params->data.nss_aead_params);
+   CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
+-  nss_aead_params->pIv =
++  nss_aead_params->pNonce =
+       reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
+-  nss_aead_params->ulIvLen = nonce.size();
++  nss_aead_params->ulNonceLen = nonce.size();
+   nss_aead_params->pAAD =
+       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
+   nss_aead_params->ulAADLen = associated_data.size();
+diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc
+--- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc	2015-10-13 04:36:54.000000000 +0000
++++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc	2016-03-15 11:57:53.902988200 +0000
+@@ -66,9 +66,9 @@
+                                                AeadParams* aead_params) const {
+   aead_params->len = sizeof(aead_params->data.nss_aead_params);
+   CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
+-  nss_aead_params->pIv =
++  nss_aead_params->pNonce =
+       reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
+-  nss_aead_params->ulIvLen = nonce.size();
++  nss_aead_params->ulNonceLen = nonce.size();
+   nss_aead_params->pAAD =
+       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
+   nss_aead_params->ulAADLen = associated_data.size();
+diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c
+--- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c	2015-10-13 04:36:52.000000000 +0000
++++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c	2016-03-15 12:00:01.376986796 +0000
+@@ -2088,8 +2088,8 @@
+     param.len = sizeof(aeadParams);
+     param.data = (unsigned char *) &aeadParams;
+     memset(&aeadParams, 0, sizeof(aeadParams));
+-    aeadParams.pIv = (unsigned char *) additionalData;
+-    aeadParams.ulIvLen = 8;
++    aeadParams.pNonce = (unsigned char *) additionalData;
++    aeadParams.ulNonceLen = 8;
+     aeadParams.pAAD = (unsigned char *) additionalData;
+     aeadParams.ulAADLen = additionalDataLen;
+     aeadParams.ulTagLen = tagSize;
diff --git a/libraries/qt5/patches/qt5.pulseaudio.diff b/libraries/qt5/patches/qt5.pulseaudio.diff
new file mode 100644
index 0000000000..8d8f616d5b
--- /dev/null
+++ b/libraries/qt5/patches/qt5.pulseaudio.diff
@@ -0,0 +1,12 @@
+--- qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp.orig     2014-12-05 17:26:44.000000000 +0100
++++ qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp  2014-12-12 10:27:20.393735405 +0100
+@@ -29,7 +29,7 @@
+           ['use_cras==1', {
+             'use_pulseaudio%': 0,
+           }, {
+-            'use_pulseaudio%': 1,
++            'use_pulseaudio%': 0,
+           }],
+         ],
+       }, {
+
diff --git a/libraries/qt5/patches/qt5.whandle.patch b/libraries/qt5/patches/qt5.whandle.patch
new file mode 100644
index 0000000000..4428974d04
--- /dev/null
+++ b/libraries/qt5/patches/qt5.whandle.patch
@@ -0,0 +1,24 @@
+From: Ulf Hermann <ulf.hermann@theqtcompany.com>
+Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100)
+Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets
+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2
+
+WIP: Also do hide/show via WA_OutsideWSRange for native widgets
+
+Task-number: QTBUG-48321
+Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
+---
+
+diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
+index a006246..024005d 100644
+--- a/qtbase/src/widgets/kernel/qwidget.cpp
++++ b/qtbase/src/widgets/kernel/qwidget.cpp
+@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+ 
+     bool needsShow = false;
+ 
+-    if (q->isWindow()) {
++    if (q->isWindow() || q->windowHandle()) {
+         if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
+             q->setAttribute(Qt::WA_OutsideWSRange, true);
+             if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 4896c2c8ec..52110433a3 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -46,8 +46,8 @@
 # tailored to Qt 5. Modified by Larry Hajali.
 
 PRGNAM=qt5
-VERSION=${VERSION:-5.4.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-5.5.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -91,11 +91,6 @@ cd $TMP
 rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
 tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz
 cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
-# Fix dangling symlinks.
-rm -f qtwebengine/src/3rdparty/chromium/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
-rm -f qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf
-ln -s ../../../../../tools/perf\
-  qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -110,6 +105,12 @@ patch -p1 < $CWD/patches/qt5.mysql.h.diff
 # https://bugs.webkit.org/show_bug.cgi?id=117077
 patch -p1 < $CWD/patches/platformplugin-install-path-fix.patch
 
+# Prevent cropped video in full-screen mode (QTBUG-48321).
+patch -p1 < $CWD/patches/qt5.whandle.patch
+
+# Patch for the newer mozilla-nss
+patch -p1 < $CWD/patches/nss-update-sslv3-nonce.patch
+
 # Limit -reduce-relocations to ix86 and x86_64.
 # https://bugreports.qt-project.org/browse/QTBUG-36129
 if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
@@ -118,9 +119,7 @@ else
   RELOCATIONS=""
 fi
 
-if echo "$ARCH" | grep -q "i.86" 2>/dev/null; then
-  sed -i "/^QMAKE_CFLAGS_RELEASE/ s|+=.*|+= $SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
-fi
+sed -i "s|-O2|$SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
 
 # Use Pulseaudio. Default is not to use Pulseaudio. Pulseaudio is a
 # required dependency for the new qtwebengine.
@@ -129,7 +128,7 @@ if [ "${USEPULSE:-no}" == "yes" ]; then
   PULSE="-pulseaudio"
 else
   PULSE="-no-pulseaudio"
-  sed -i '/qtwebengine/d' qt.pro
+  patch -p1 < $CWD/patches/qt5.pulseaudio.diff
 fi
 
 # Build examples. Default is no.
@@ -141,7 +140,6 @@ fi
 
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
 ./configure -v \
   -confirm-license \
   -opensource \
@@ -239,7 +237,7 @@ Description: Qt5 Configuration
 Version: $VERSION
 EOF
 
-# Fix internal linking for Qt5WebKit.pc.
+# Fix internal linking for Qt5WebKit.pc and Qt5WebEngineCore.pc.
 sed -i \
   -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
   -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
@@ -250,6 +248,8 @@ sed -i \
   -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
   $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
 
+sed -i 's|-Wl,--whole-archive.*-Wl,--no-whole-archive||' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc
+
 # While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
 for PRL in $(find $PKG -name "*\.prl"); do
   sed -i '/^QMAKE_PRL_BUILD_DIR/d' $PRL
@@ -266,6 +266,10 @@ sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
 
 # Currently not working for qt version 5.4.0.  Extra layer added to *.ico file
 # freaks out ImageMagick and fails image conversion.
+# Eg.
+#   $ convert assistant.ico -resize 96x96! assistant.png
+#     convert: file format version mismatch `assistant.ico' @ error/xwd.c/ReadXWDImage/241.
+#     convert: no images defined `assistant.png' @ error/convert.c/ConvertImageCommand/3127.
 #for i in $(find . -name "assistant.ico" -o -name "designer.ico" \
 #  -o -name "linguist.ico" -o -name "qdbusviewer.ico"); do
 #  for j in 16 24 32 48 64 96 128; do
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 09e30d0979..478a81d58e 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5"
-VERSION="5.4.2"
+VERSION="5.5.1"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.4/5.4.2/single/qt-everywhere-opensource-src-5.4.2.tar.xz"
-MD5SUM="c23bd0f14d66e7901d24906a1edce9b0"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.5/5.5.1/single/qt-everywhere-opensource-src-5.5.1.tar.xz"
+MD5SUM="c2a249e8795d45200d997d96860d0353"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/qutepart/qutepart.SlackBuild b/libraries/qutepart/qutepart.SlackBuild
index fa53039bf6..945dd9efa2 100644
--- a/libraries/qutepart/qutepart.SlackBuild
+++ b/libraries/qutepart/qutepart.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/libraries/qwt/patch-6.1.2-pkgconfig.diff b/libraries/qwt/patch-6.1.2-pkgconfig.diff
new file mode 100644
index 0000000000..b7572b19e9
--- /dev/null
+++ b/libraries/qwt/patch-6.1.2-pkgconfig.diff
@@ -0,0 +1,22 @@
+--- src/src.pro.orig	2014-12-12 00:13:13.461186493 +1000
++++ src/src.pro	2015-10-05 08:55:43.504194164 +1000
+@@ -21,6 +21,19 @@
+ 
+ DESTDIR           = $${QWT_OUT_ROOT}/lib
+ 
++# Add pkgconfig support
++unix {
++	CONFIG  += create_pc create_prl no_install_prl
++	QMAKE_PKGCONFIG_NAME            = qwt
++	QMAKE_PKGCONFIG_DESCRIPTION     = GUI components
++	QMAKE_PKGCONFIG_PREFIX          = $${QWT_INSTALL_PREFIX}
++	QMAKE_PKGCONFIG_LIBDIR          = $${QWT_INSTALL_LIBS}
++	QMAKE_PKGCONFIG_INCDIR          = $${QWT_INSTALL_HEADERS}
++	QMAKE_PKGCONFIG_REQUIRES        = QtCore
++	QMAKE_PKGCONFIG_DESTDIR         = pkgconfig
++}
++
++
+ contains(QWT_CONFIG, QwtDll) {
+ 
+     CONFIG += dll
diff --git a/libraries/qwt/patch-6.1.2-qwtconfig.diff b/libraries/qwt/patch-6.1.2-qwtconfig.diff
new file mode 100644
index 0000000000..ca1638156a
--- /dev/null
+++ b/libraries/qwt/patch-6.1.2-qwtconfig.diff
@@ -0,0 +1,63 @@
+--- qwtconfig.pri.orig	2014-12-11 14:13:13.513186492 +0000
++++ qwtconfig.pri	2015-09-27 08:33:01.948490369 +0000
+@@ -16,11 +16,8 @@
+ # Install paths
+ ######################################################################
+ 
+-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
+-
+ unix {
+-    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
+-    # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
++    QWT_INSTALL_PREFIX    = /usr
+ }
+ 
+ win32 {
+@@ -29,8 +26,10 @@
+ }
+ 
+ QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
+-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
++QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt
++QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib$${LIBDIRSUFFIX}
++
++
+ 
+ ######################################################################
+ # Designer plugin
+@@ -42,14 +41,12 @@
+ # runtime environment of designer/creator.
+ ######################################################################
+ 
+-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+-
+ # linux distributors often organize the Qt installation
+ # their way and QT_INSTALL_PREFIX doesn't offer a good
+ # path. Also QT_INSTALL_PREFIX is only one of the default
+ # search paths of the designer - not the Qt creator
+ 
+-#QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PREFIX]/plugins/designer
++QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PLUGINS]/designer
+ 
+ ######################################################################
+ # Features
+@@ -63,8 +60,7 @@
+ # with every Qt upgrade. 
+ ######################################################################
+ 
+-QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
++QWT_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features
+ 
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -141,7 +137,7 @@
+ # Otherwise you have to build them from the examples directory.
+ ######################################################################
+ 
+-#QWT_CONFIG     += QwtExamples
++QWT_CONFIG     += QwtExamples
+ 
+ ######################################################################
+ # The playground is primarily intended for the Qwt development 
diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild
index 2d837299f5..0741c09b99 100644
--- a/libraries/qwt/qwt.SlackBuild
+++ b/libraries/qwt/qwt.SlackBuild
@@ -4,12 +4,12 @@
 
 # Written by Zordrak
 # Nobbled from Slacky and sanitised for sanity :)
-
 # Modified by dunkyp <dunkyp@gmail.com>
 # Modified by the Slackbuilds.org project
+# Maintained from 2015 by Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=qwt
-VERSION=${VERSION:-6.0.2}
+VERSION=${VERSION:-6.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,6 +48,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+patch -p0 < $CWD/patch-6.1.2-qwtconfig.diff
+patch -p0 < $CWD/patch-6.1.2-pkgconfig.diff
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,10 +57,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/qwt-6.0.2-qwtconfig.pri.patch
-sed -i -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%" -e "s%@QT4DIR@%$QT4DIR%" qwtconfig.pri
-
-qmake INSTALLBASE=/usr CONFIG+=QwtExamples
+qmake LIBDIRSUFFIX=$LIBDIRSUFFIX
 make \
   CFLAGS+="$SLKCFLAGS" \
   CXXFLAGS+="$SLKCFLAGS"
@@ -75,9 +74,11 @@ rm -f $PKG/usr/man/man3/_tmp*
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a CHANGES COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+find ./examples/ -name moc -type d |xargs rm -rf
+find ./examples/ -name obj -type d |xargs rm -rf
 cp -a ./examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples
 mv $PKG/usr/doc/html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES* COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/qwt/qwt.info b/libraries/qwt/qwt.info
index 2e1c463f1d..3a5661af2d 100644
--- a/libraries/qwt/qwt.info
+++ b/libraries/qwt/qwt.info
@@ -1,10 +1,10 @@
 PRGNAM="qwt"
-VERSION="6.0.2"
+VERSION="6.1.2"
 HOMEPAGE="http://qwt.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.0.2.tar.bz2"
-MD5SUM="845837320328e3c92d049cc45c7bdbc2"
+DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.2.tar.bz2"
+MD5SUM="9c88db1774fa7e3045af063bbde44d7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="dunkyp"
-EMAIL="dunkyp@gmail.com"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/libraries/qwtpolar/README b/libraries/qwtpolar/README
new file mode 100644
index 0000000000..3cd2af81d9
--- /dev/null
+++ b/libraries/qwtpolar/README
@@ -0,0 +1,2 @@
+QwtPolar - A Qwt/Qt Polar plot library with classes for
+displaying values on a polar coordinate system.
diff --git a/libraries/qwtpolar/qwtpolar-1.1.1-pkgconfig.patch b/libraries/qwtpolar/qwtpolar-1.1.1-pkgconfig.patch
new file mode 100644
index 0000000000..ab5354da42
--- /dev/null
+++ b/libraries/qwtpolar/qwtpolar-1.1.1-pkgconfig.patch
@@ -0,0 +1,27 @@
+commit 223b5436294642c8d1e2150783f3703b28a93430
+Author: Volker Fröhlich <volker27@gmx.at>
+Date:   Tue Sep 23 21:06:37 2014 +0200
+
+    Add chkconfig support
+
+diff --git a/src/src.pro b/src/src.pro
+index 86e6a57..d9c7567 100644
+--- a/src/src.pro	2014-09-19 20:28:24.308002267 +1000
++++ b/src/src.pro	2015-10-05 10:29:40.869985742 +1000
+@@ -16,6 +16,16 @@
+ TEMPLATE          = lib
+ TARGET            = $$qwtPolarLibraryTarget(qwtpolar)
+ 
++# pkgconfig support
++CONFIG     += create_pc create_prl no_install_prl
++QMAKE_PKGCONFIG_NAME = qwtpolar
++QMAKE_PKGCONFIG_DESCRIPTION = Qt/Qwt Polar Plot Widget
++QMAKE_PKGCONFIG_PREFIX = $${QWT_POLAR_INSTALL_PREFIX}
++QMAKE_PKGCONFIG_LIBDIR = $${QWT_POLAR_INSTALL_LIBS}
++QMAKE_PKGCONFIG_INCDIR = $${QWT_POLAR_INSTALL_HEADERS}
++QMAKE_PKGCONFIG_REQUIRES = qwt QtCore
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++
+ DESTDIR           = $${QWT_POLAR_ROOT}/lib
+ 
+ contains(QWT_POLAR_CONFIG, QwtPolarDll ) {
diff --git a/libraries/qwtpolar/qwtpolar-1.1.1-qt_paths.patch b/libraries/qwtpolar/qwtpolar-1.1.1-qt_paths.patch
new file mode 100644
index 0000000000..3458078b66
--- /dev/null
+++ b/libraries/qwtpolar/qwtpolar-1.1.1-qt_paths.patch
@@ -0,0 +1,54 @@
+--- a/qwtpolarbuild.pri	2014-09-19 20:28:24.314002267 +1000
++++ b/qwtpolarbuild.pri	2015-09-25 16:41:20.445026649 +1000
+@@ -13,7 +13,7 @@
+ CONFIG           += qt
+ CONFIG           += warn_on
+ CONFIG           += no_keywords
+-CONFIG           += silent
++#CONFIG           += silent
+ 
+ CONFIG           += qwt
+ 
+--- a/qwtpolarconfig.pri	2014-09-19 20:28:24.318002267 +1000
++++ b/qwtpolarconfig.pri	2015-09-25 16:45:43.466042709 +1000
+@@ -16,23 +16,19 @@
+ QWT_POLAR_VERSION      = $${QWT_POLAR_VER_MAJ}.$${QWT_POLAR_VER_MIN}.$${QWT_POLAR_VER_PAT}
+ 
+ unix {
+-    QWT_POLAR_INSTALL_PREFIX    = /usr/local/qwtpolar-$$QWT_POLAR_VERSION
++    QWT_POLAR_INSTALL_PREFIX    = /usr
+ }
+ 
+-win32 {
+-    QWT_POLAR_INSTALL_PREFIX    = C:/QwtPolar-$$QWT_POLAR_VERSION
+-}
+-
+-QWT_POLAR_INSTALL_DOCS      = $${QWT_POLAR_INSTALL_PREFIX}/doc
+-QWT_POLAR_INSTALL_HEADERS   = $${QWT_POLAR_INSTALL_PREFIX}/include
+-QWT_POLAR_INSTALL_LIBS      = $${QWT_POLAR_INSTALL_PREFIX}/lib
++QWT_POLAR_INSTALL_DOCS      = $${QWT_POLAR_INSTALL_PREFIX}/doc/qwtpolar-$${QWT_POLAR_VERSION}
++QWT_POLAR_INSTALL_HEADERS   = $${QWT_POLAR_INSTALL_PREFIX}/include/qwt
++QWT_POLAR_INSTALL_LIBS      = $${QWT_POLAR_INSTALL_PREFIX}/lib$${LIBDIRSUFFIX}
+ 
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+ 
+-QWT_POLAR_INSTALL_PLUGINS   = $${QWT_POLAR_INSTALL_PREFIX}/plugins/designer
+-# QWT_POLAR_INSTALL_PLUGINS   = $${QT_INSTALL_PREFIX}/plugins/designer
++#QWT_POLAR_INSTALL_PLUGINS   = $${QWT_POLAR_INSTALL_PREFIX}/plugins/designer
++QWT_POLAR_INSTALL_PLUGINS   = $$[QT_INSTALL_PLUGINS]/designer
+ 
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -61,8 +57,8 @@
+ # with every Qt upgrade. 
+ ######################################################################
+ 
+-QWT_POLAR_INSTALL_FEATURES  = $${QWT_POLAR_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES  = $${QT_INSTALL_PREFIX}/features
++#QWT_POLAR_INSTALL_FEATURES  = $${QWT_POLAR_INSTALL_PREFIX}/features
++QWT_POLAR_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features
+ 
+ ######################################################################
+ # If you want to build the QwtPolar designer plugin,
diff --git a/libraries/qwtpolar/qwtpolar.SlackBuild b/libraries/qwtpolar/qwtpolar.SlackBuild
new file mode 100644
index 0000000000..e266dbcc4b
--- /dev/null
+++ b/libraries/qwtpolar/qwtpolar.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for qwtpolar
+
+# Copyright 2015 Christoph Willing   Brisbane, Australia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=qwtpolar
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+
+patch -p1 < $CWD/qwtpolar-1.1.1-qt_paths.patch
+patch -p1 < $CWD/qwtpolar-1.1.1-pkgconfig.patch
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+qmake qwtpolar.pro LIBDIRSUFFIX=$LIBDIRSUFFIX
+make
+make install INSTALL_ROOT=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/doc/$PRGNAM-$VERSION/man $PKG/usr/
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+find ./examples/ -name moc -type d |xargs rm -rf
+find ./examples/ -name obj -type d |xargs rm -rf
+cp -a ./examples/*  $PKG/usr/doc/$PRGNAM-$VERSION/examples/
+cp -a CHANGES* COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/qwtpolar/qwtpolar.info b/libraries/qwtpolar/qwtpolar.info
new file mode 100644
index 0000000000..556bb16acb
--- /dev/null
+++ b/libraries/qwtpolar/qwtpolar.info
@@ -0,0 +1,10 @@
+PRGNAM="qwtpolar"
+VERSION="1.1.1"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/project/qwtpolar/qwtpolar/1.1.1/qwtpolar-1.1.1.tar.bz2"
+MD5SUM="0f549b51a06fa0f0f43b12f3269fe206"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qwt"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
diff --git a/libraries/qwtpolar/slack-desc b/libraries/qwtpolar/slack-desc
new file mode 100644
index 0000000000..ac03d245ff
--- /dev/null
+++ b/libraries/qwtpolar/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+qwtpolar: qwtpolar (Qwt/Qt Polar Plot Library)
+qwtpolar:
+qwtpolar: The QwtPolar library contains classes for displaying values on a
+qwtpolar: polar coordinate system.
+qwtpolar:
+qwtpolar:
+qwtpolar:
+qwtpolar:
+qwtpolar:
+qwtpolar:
+qwtpolar:
diff --git a/libraries/reportlab/reportlab.SlackBuild b/libraries/reportlab/reportlab.SlackBuild
index 18e200b5ea..8382e740b4 100644
--- a/libraries/reportlab/reportlab.SlackBuild
+++ b/libraries/reportlab/reportlab.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for reportlab
 
-# Copyright 2007-2014  LukenShiro, Italy
+# Copyright 2007-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=reportlab
-VERSION=${VERSION:-3.1.8}
+VERSION=${VERSION:-3.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +55,7 @@ fi
 # directory for python packages
 PYTHONDIR=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')")
 
-DOCFILES="CHANGES.txt LICENSE.txt README.txt INSTALL.txt docs/*.pdf"
+DOCFILES="CHANGES.md LICENSE.txt README.txt INSTALL.txt docs/*.pdf"
 OTHERPYFILES="demos tools tests"
 
 set -e
@@ -73,6 +73,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Unzip T1 font curves
+cd src/reportlab/fonts/
+unzip $CWD/pfbfer-20070710.zip
+cd -
+
 # Generate pdf documentation
 ( cd docs
   # workaround due to dependency loop if reportlab isn't previously installed
diff --git a/libraries/reportlab/reportlab.info b/libraries/reportlab/reportlab.info
index 0b83d68319..007cb5bc59 100644
--- a/libraries/reportlab/reportlab.info
+++ b/libraries/reportlab/reportlab.info
@@ -1,8 +1,10 @@
 PRGNAM="reportlab"
-VERSION="3.1.8"
+VERSION="3.2.0"
 HOMEPAGE="https://bitbucket.org/rptlab/reportlab/overview"
-DOWNLOAD="https://pypi.python.org/packages/source/r/reportlab/reportlab-3.1.8.tar.gz"
-MD5SUM="820a9fda647078503597b85cdba7ed7f"
+DOWNLOAD="https://pypi.python.org/packages/source/r/reportlab/reportlab-3.2.0.tar.gz \
+          http://www.reportlab.com/ftp/pfbfer-20070710.zip"
+MD5SUM="79d059e797c557aed4b40c68dd6c7eae \
+        35d20e26490cb2a8646fab6276ac6a4c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/reportlab/slack-desc b/libraries/reportlab/slack-desc
index 0c0009a443..129269eed8 100644
--- a/libraries/reportlab/slack-desc
+++ b/libraries/reportlab/slack-desc
@@ -14,6 +14,6 @@ reportlab: or creative design professionals who need to quickly and easily
 reportlab: create or automate complex (even data-driven) documents.
 reportlab: It is released by ReportLab Inc., under BSD license.
 reportlab:
-reportlab: Homepage: http://www.reportlab.org
+reportlab:
 reportlab:
 reportlab:
diff --git a/libraries/rhino/rhino.info b/libraries/rhino/rhino.info
index f3e0bc1036..1185a8789d 100644
--- a/libraries/rhino/rhino.info
+++ b/libraries/rhino/rhino.info
@@ -1,7 +1,7 @@
 PRGNAM="rhino"
 VERSION="1_7R2"
 HOMEPAGE="http://www.mozilla.org/rhino/"
-DOWNLOAD="ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip"
+DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/rhino1_7R2.zip"
 MD5SUM="40d0a9abec8169e42920214b37fa8e0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/tcllib/slack-desc b/libraries/tcllib/slack-desc
index f9eba68f35..f23d579ed6 100644
--- a/libraries/tcllib/slack-desc
+++ b/libraries/tcllib/slack-desc
@@ -14,6 +14,6 @@ tcllib: standard data structures to implementations of common networking
 tcllib: protocols. The intent is to collect commonly used function into a
 tcllib: single library, which users can rely on to be available and stable.
 tcllib:
-tcllib: Homepage: http://www.tcl.tk/software/tcllib/
+tcllib: Homepage: http://tcl.activestate.com/software/tcllib/
 tcllib:
 tcllib:
diff --git a/libraries/tcllib/tcllib.SlackBuild b/libraries/tcllib/tcllib.SlackBuild
index e8fe5e4952..628dab8923 100644
--- a/libraries/tcllib/tcllib.SlackBuild
+++ b/libraries/tcllib/tcllib.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Paul Wisehart wise@lupulin.net
 
 PRGNAM=tcllib
-VERSION=${VERSION:-1.14}
+VERSION=${VERSION:-1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/tcllib/tcllib.info b/libraries/tcllib/tcllib.info
index 3b52e40b40..3ee84759ac 100644
--- a/libraries/tcllib/tcllib.info
+++ b/libraries/tcllib/tcllib.info
@@ -1,8 +1,8 @@
 PRGNAM="tcllib"
-VERSION="1.14"
+VERSION="1.17"
 HOMEPAGE="http://www.tcl.tk/software/tcllib/"
-DOWNLOAD="http://downloads.sourceforge.net/tcllib/tcllib-1.14.tar.gz"
-MD5SUM="55bac9afce54c3328f368918cc2d7a4b"
+DOWNLOAD="http://sourceforge.net/projects/tcllib/files/tcllib/1.17/tcllib-1.17.tar.gz"
+MD5SUM="4c75fbfbb518f8990fcd4686b976bd70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/tinyxml2/tinyxml2.SlackBuild b/libraries/tinyxml2/tinyxml2.SlackBuild
index 58fd9cb9e0..9a4463fa23 100644
--- a/libraries/tinyxml2/tinyxml2.SlackBuild
+++ b/libraries/tinyxml2/tinyxml2.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tinyxml2
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,6 @@ cd build
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DBUILD_STATIC_LIBS:BOOL=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
 
   make VERBOSE=1
@@ -86,7 +85,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a readme.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a readme.md TinyXML2_small.png $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/tinyxml2/tinyxml2.info b/libraries/tinyxml2/tinyxml2.info
index 21e614092e..e1ef48b813 100644
--- a/libraries/tinyxml2/tinyxml2.info
+++ b/libraries/tinyxml2/tinyxml2.info
@@ -1,8 +1,8 @@
 PRGNAM="tinyxml2"
-VERSION="2.2.0"
+VERSION="3.0.0"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml2/index.html"
-DOWNLOAD="https://github.com/leethomason/tinyxml2/archive/2.2.0.tar.gz"
-MD5SUM="3c7a9191c8f26e4f056a89902ac848b1"
+DOWNLOAD="https://github.com/leethomason/tinyxml2/archive/3.0.0.tar.gz"
+MD5SUM="26584d2c1666aea5e664c105eb4e8153"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/trader/README b/libraries/trader/README
new file mode 100644
index 0000000000..29a8075909
--- /dev/null
+++ b/libraries/trader/README
@@ -0,0 +1,6 @@
+The trader extension is a free open source stock library based
+on TA-Lib. It's dedicated to trading software developers
+requiring to perform technical analysis of financial market
+data. Alongside many indicators like ADX, MACD, RSI, Stochastic,
+TRIX the candlestick pattern recognition and several vector
+arithmetic and algebraic functions are present.
diff --git a/libraries/trader/slack-desc b/libraries/trader/slack-desc
new file mode 100644
index 0000000000..d8773d5c52
--- /dev/null
+++ b/libraries/trader/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+trader: trader (Technical Analysis for traders)
+trader:
+trader: The trader extension is a free open source stock library based
+trader: on TA-Lib. It's dedicated to trading software developers
+trader: requiring to perform technical analysis of financial market
+trader: data. Alongside many indicators like ADX, MACD, RSI, Stochastic,
+trader: TRIX the candlestick pattern recognition and several vector
+trader: arithmetic and algebraic functions are present.
+trader:
+trader: Homepage: https://pecl.php.net/package/trader
+trader:
diff --git a/libraries/trader/trader.SlackBuild b/libraries/trader/trader.SlackBuild
new file mode 100644
index 0000000000..c99a2e7ff3
--- /dev/null
+++ b/libraries/trader/trader.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for "trader".
+
+# Copyright 2015 Tushar Jagad <tushar.jagad@gmail.com>
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=trader
+SRCNAM=trader
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$SRCNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+phpize
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install-modules INSTALL_ROOT=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CREDITS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/trader/trader.info b/libraries/trader/trader.info
new file mode 100644
index 0000000000..742809f8b4
--- /dev/null
+++ b/libraries/trader/trader.info
@@ -0,0 +1,10 @@
+PRGNAM="trader"
+VERSION="0.4.0"
+HOMEPAGE="https://pecl.php.net/package/trader/"
+DOWNLOAD="https://pecl.php.net/get/trader-0.4.0.tgz"
+MD5SUM="a784483719ad37b7e83c1fc597cb987a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tushar Jagad"
+EMAIL="tushar.jagad@gmail.com"
diff --git a/libraries/trilinos/README b/libraries/trilinos/README
new file mode 100644
index 0000000000..98891cb2d2
--- /dev/null
+++ b/libraries/trilinos/README
@@ -0,0 +1,21 @@
+ The Trilinos Project is an effort to develop algorithms and enabling 
+technologies within an object-oriented software framework for the 
+solution of large-scale, complex multi-physics engineering and 
+scientific problems. A unique design feature of Trilinos is its focus 
+on packages.
+
+The package has two building methods, the default is for a single 
+system (without parallelism).
+
+* The trilinos can also be compiled against individual packages 
+(i.e. amd, umfpack and metis) outside of suitesparse.SlackBuild. 
+** The suitesparse.SlackBuild, doesn't build metis by default. 
+For that you can use the parMETIS.SlackBuild.
+For more details about dependeces the Xyce webpage.
+have a list of required depences.
+
+Optional dependences:
+For enable parallelism set PARALLEL=yes. This requires the 
+ParMETIS library and a MPI implementation (openmpi or mpich).
+To enable CUDA set CUDA=yes (Additional requirements: CUDA
+SDK and CUSPARSE).
diff --git a/libraries/trilinos/slack-desc b/libraries/trilinos/slack-desc
new file mode 100644
index 0000000000..7da4c678b9
--- /dev/null
+++ b/libraries/trilinos/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |----handy-ruler------------------------------------------------------|
+trilinos: trilinos (trilinos project)
+trilinos:
+trilinos: The Trilinos Project is an effort to develop algorithms and enabling
+trilinos: technologies within an object-oriented software framework for the
+trilinos: solution of large-scale, complex multi-physics engineering and
+trilinos: scientific problems. A unique design feature of Trilinos is its focus
+trilinos: on packages.
+trilinos:
+trilinos:
+trilinos:
+trilinos:
diff --git a/libraries/trilinos/trilinos.SlackBuild b/libraries/trilinos/trilinos.SlackBuild
new file mode 100644
index 0000000000..81808a8b31
--- /dev/null
+++ b/libraries/trilinos/trilinos.SlackBuild
@@ -0,0 +1,194 @@
+#!/bin/sh
+
+# Slackware build script for trilinos
+
+# Copyright 2015 Guilherme Calandrini - Madrid (Spain)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=trilinos
+VERSION=${VERSION:-11.10.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION-Source
+tar jxvf $CWD/$PRGNAM-$VERSION-Source.tar.bz2
+cd $PRGNAM-$VERSION-Source
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+# Use CUDA SDK and CUSPARSE.
+if [ "${CUDA:-no}" == "yes" ]; then
+  OPT_DEPS="$OPT_DEPS -DTPL_ENABLE_CUDA -DTPL_ENABLE_CUSPARSE"
+fi
+
+if [ "${EXAMPLES:-yes}" == "no" ]; then
+  OPT_DEPS="$OPT_DEPS -DTrilinos_ENABLE_EXAMPLES=OFF"
+fi
+
+	CFGSERIAL="-DCMAKE_C_COMPILER=/usr/bin/gcc \
+	-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
+	-DCMAKE_Fortran_COMPILER=/usr/bin/gfortran \
+	-DCMAKE_MAKE_PROGRAM=make \
+	-DTrilinos_ENABLE_NOX=ON \
+	-DNOX_ENABLE_LOCA=ON \
+	-DTrilinos_ENABLE_EpetraExt=ON \
+	-DEpetraExt_BUILD_BTF=ON \
+	-DEpetraExt_BUILD_EXPERIMENTAL=ON \
+	-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON \
+	-DTrilinos_ENABLE_TrilinosCouplings=ON \
+	-DTrilinos_ENABLE_Ifpack=ON \
+	-DTrilinos_ENABLE_Isorropia=ON \
+	-DTrilinos_ENABLE_AztecOO=ON \
+	-DTrilinos_ENABLE_Belos=ON \
+	-DTrilinos_ENABLE_Teuchos=ON \
+	-DTeuchos_ENABLE_COMPLEX=ON \
+	-DTrilinos_ENABLE_Amesos=ON \
+	-DAmesos_ENABLE_KLU=ON \
+	-DAmesos_ENABLE_UMFPACK=ON \
+	-DTrilinos_ENABLE_Sacado=ON \
+	-DTrilinos_ENABLE_Kokkos=OFF \
+	-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF \
+	-DTPL_ENABLE_AMD=ON \
+	-DAMD_LIBRARY_DIRS=/usr/lib${LIBDIRSUFFIX} \
+	-DTPL_AMD_INCLUDE_DIRS=/usr/include/suitesparce \
+	-DTPL_ENABLE_UMFPACK=ON \
+	-DUMFPACK_LIBRARY_DIRS=/usr/lib${LIBDIRSUFFIX} \
+	-DTPL_UMFPACK_INCLUDE_DIRS=/usr/include/suitesparse \
+	-DTPL_ENABLE_BLAS=ON \
+	-DTPL_ENABLE_LAPACK=ON "
+
+	CFGPARALLEL="-DCMAKE_C_COMPILER=/usr/bin/mpicc \
+	-DCMAKE_CXX_COMPILER=/usr/bin/mpic++ \
+	-DCMAKE_Fortran_COMPILER=/usr/bin/mpif77 \
+	-DCMAKE_MAKE_PROGRAM=make \
+	-DTrilinos_ENABLE_NOX=ON \
+	-DNOX_ENABLE_LOCA=ON \
+	-DTrilinos_ENABLE_EpetraExt=ON \
+	-DEpetraExt_BUILD_BTF=ON \
+	-DEpetraExt_BUILD_EXPERIMENTAL=ON \
+	-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON \
+	-DTrilinos_ENABLE_TrilinosCouplings=ON \
+	-DTrilinos_ENABLE_Ifpack=ON \
+	-DTrilinos_ENABLE_ShyLU=ON \
+	-DTrilinos_ENABLE_Isorropia=ON \
+	-DTrilinos_ENABLE_AztecOO=ON \
+	-DTrilinos_ENABLE_Belos=ON \
+	-DTrilinos_ENABLE_Teuchos=ON \
+	-DTeuchos_ENABLE_COMPLEX=ON \
+	-DTrilinos_ENABLE_Amesos=ON \
+	-DAmesos_ENABLE_KLU=ON \
+	-DAmesos_ENABLE_UMFPACK=ON \
+	-DTrilinos_ENABLE_Sacado=ON \
+	-DTrilinos_ENABLE_Kokkos=OFF \
+	-DTrilinos_ENABLE_Zoltan=ON \
+	-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF \
+	-DTPL_ENABLE_AMD=ON \
+	-DAMD_LIBRARY_DIRS=/usr/lib${LIBDIRSUFFIX} \
+	-DTPL_AMD_INCLUDE_DIRS=/usr/include/suitesparse \
+	-DTPL_ENABLE_UMFPACK=ON \
+	-DUMFPACK_LIBRARY_DIRS=/usr/lib${LIBDIRSUFFIX} \
+	-DTPL_UMFPACK_INCLUDE_DIRS=/usr/include/suitesparse \
+	-DTPL_ENABLE_BLAS=ON \
+	-DTPL_ENABLE_LAPACK=ON \
+	-DTPL_ENABLE_ParMETIS=ON \
+	-DParMETIS_LIBRARY_DIRS=/usr/lib${LIBDIRSUFFIX} \
+	-DTPL_ParMETIS_INCLUDE_DIRS=/usr/include/parmetis \
+	-DTPL_ENABLE_MPI=ON "
+
+  CFGTRILINOS=$CFGSERIAL
+  BUILDDIR=build-serial
+
+if [ "${PARALLEL:-no}" == "yes" ]; then
+  CFGTRILINOS=$CFGPARALLEL
+  BUILDDIR=build-parallel
+  SLKCFLAGS="CC=mpicc CXX=mpic++ F77=mpif77 $SLKCFLAGS"
+fi
+
+  mkdir -p $BUILDDIR
+  cd $BUILDDIR
+
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_Fortran_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DTrilinos_INSTALL_LIB_DIR=/usr/lib${LIBDIRSUFFIX} \
+    -DTrilinos_INSTALL_INCLUDE_DIR=/usr/include \
+    $CFGTRILINOS \
+    $OPT_DEPS \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=RELEASE ..
+
+  make
+  ctest
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/trilinos/trilinos.info b/libraries/trilinos/trilinos.info
new file mode 100644
index 0000000000..f1b725234a
--- /dev/null
+++ b/libraries/trilinos/trilinos.info
@@ -0,0 +1,10 @@
+PRGNAM="trilinos"
+VERSION="11.10.2"
+HOMEPAGE="http://trilinos.org/"
+DOWNLOAD="https://trilinos.org/oldsite/download/files/trilinos-11.10.2-Source.tar.bz2"
+MD5SUM="c8dd5012890140b1a98c704c111cddaa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="atlas suitesparse"
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini[at]hotmail[dot]es"
diff --git a/libraries/unibilium/unibilium.SlackBuild b/libraries/unibilium/unibilium.SlackBuild
index 5e1852b4fa..14c07a10f3 100644
--- a/libraries/unibilium/unibilium.SlackBuild
+++ b/libraries/unibilium/unibilium.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unibilium
-VERSION=${VERSION:-1.1.5}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/unibilium/unibilium.info b/libraries/unibilium/unibilium.info
index 46dbc2e3ec..3f1d5a35f1 100644
--- a/libraries/unibilium/unibilium.info
+++ b/libraries/unibilium/unibilium.info
@@ -1,8 +1,8 @@
 PRGNAM="unibilium"
-VERSION="1.1.5"
+VERSION="1.2.0"
 HOMEPAGE="https://github.com/mauke/unibilium"
-DOWNLOAD="https://github.com/mauke/unibilium/archive/v1.1.5.tar.gz"
-MD5SUM="3cd508847eab55c4aa8466e9ff1e7080"
+DOWNLOAD="https://github.com/mauke/unibilium/archive/v1.2.0.tar.gz"
+MD5SUM="9b1c97839a880a373da6c097443b43c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64="5c0f5d93c34c2312c977d55b90d9f7a1"
 REQUIRES=""
diff --git a/libraries/unixODBC/unixODBC.SlackBuild b/libraries/unixODBC/unixODBC.SlackBuild
index 200b6eaf7d..975836a1ff 100644
--- a/libraries/unixODBC/unixODBC.SlackBuild
+++ b/libraries/unixODBC/unixODBC.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for unixODBC
 
-# Copyright (c) 2014, Bob De Mars (aka Mr. B-o-B) <mr.chew.baka@gmail.com>
+# Copyright (c) 2015, Bob De Mars (aka Mr. B-o-B) <mr.chew.baka@gmail.com>
 # Copyright (c) 2010, Henrique Grolli Bassotto <henrique.grolli@gmail.com>
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unixODBC
-VERSION=${VERSION:-2.3.2}
+VERSION=${VERSION:-2.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/unixODBC/unixODBC.info b/libraries/unixODBC/unixODBC.info
index 8718e046db..8386aa1eda 100644
--- a/libraries/unixODBC/unixODBC.info
+++ b/libraries/unixODBC/unixODBC.info
@@ -1,8 +1,8 @@
 PRGNAM="unixODBC"
-VERSION="2.3.2"
+VERSION="2.3.4"
 HOMEPAGE="http://www.unixodbc.org/"
-DOWNLOAD="ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.2.tar.gz"
-MD5SUM="5e4528851eda5d3d4aed249b669bd05b"
+DOWNLOAD="ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.4.tar.gz"
+MD5SUM="bd25d261ca1808c947cb687e2034be81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/libraries/utfcpp/utfcpp.SlackBuild b/libraries/utfcpp/utfcpp.SlackBuild
index a2748d9372..372fd62bfb 100644
--- a/libraries/utfcpp/utfcpp.SlackBuild
+++ b/libraries/utfcpp/utfcpp.SlackBuild
@@ -39,7 +39,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip -o $CWD/$GITHUBVERS.zip
+unzip -o $CWD/$GITHUBVERS.zip || unzip -o $CWD/$PRGNAM-$GITHUBVERS.zip
 cd $PRGNAM-$GITHUBVERS
 chown -R root:root .
 
diff --git a/libraries/utfcpp/utfcpp.info b/libraries/utfcpp/utfcpp.info
index fadc692c44..cd1b878c2d 100644
--- a/libraries/utfcpp/utfcpp.info
+++ b/libraries/utfcpp/utfcpp.info
@@ -2,7 +2,7 @@ PRGNAM="utfcpp"
 VERSION="2012.02.10"
 HOMEPAGE="http://utfcpp.sourceforge.net/"
 DOWNLOAD="http://github.com/ledger/utfcpp/archive/2233ec933f5661c7050b94d3b14f5f9f51ae3d55.zip"
-MD5SUM="20e30f9b8eb697c19e6fb56ccdd67c78"
+MD5SUM="377877d8375107620ed12ccbb0094a61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/vigra/vigra.SlackBuild b/libraries/vigra/vigra.SlackBuild
index 1a630c7992..945c1ace88 100644
--- a/libraries/vigra/vigra.SlackBuild
+++ b/libraries/vigra/vigra.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM="vigra"
 VERSION=${VERSION:-1.10.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,7 +70,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
@@ -79,6 +79,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DWITH_OPENEXR=true \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/libraries/vte3/vte3.SlackBuild b/libraries/vte3/vte3.SlackBuild
index 27d0d09e63..1f642d8ea6 100644
--- a/libraries/vte3/vte3.SlackBuild
+++ b/libraries/vte3/vte3.SlackBuild
@@ -24,7 +24,7 @@
 
 SRCNAM=vte
 PRGNAM=vte3
-VERSION=${VERSION:-0.36.3}
+VERSION=${VERSION:-0.36.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/vte3/vte3.info b/libraries/vte3/vte3.info
index c8bb08d559..343dd44ccb 100644
--- a/libraries/vte3/vte3.info
+++ b/libraries/vte3/vte3.info
@@ -1,8 +1,8 @@
 PRGNAM="vte3"
-VERSION="0.36.3"
+VERSION="0.36.5"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/vte-0.36.3.tar.xz"
-MD5SUM="3f9df4c9a67b09bf5c660bf5c3bae109"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/vte-0.36.5.tar.xz"
+MD5SUM="96f102ef9e178b6238edcfdb1fa9dbcc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/webkitgtk/webkitgtk.SlackBuild b/libraries/webkitgtk/webkitgtk.SlackBuild
index 34a5215f47..e6b0950f6b 100644
--- a/libraries/webkitgtk/webkitgtk.SlackBuild
+++ b/libraries/webkitgtk/webkitgtk.SlackBuild
@@ -83,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-geolocation=$GEOCLUE \
   --build=$ARCH-slackware-linux
 
-make
+make -j1
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/wxSQLite3/README b/libraries/wxSQLite3/README
new file mode 100644
index 0000000000..7505431a0a
--- /dev/null
+++ b/libraries/wxSQLite3/README
@@ -0,0 +1,4 @@
+wxSQLite3 (wxWidgets wrapper for SQLite3).
+
+wxSQLite3 is a C++ wrapper around the public domain SQLite 3.x database and
+is specifically designed for use in programs based on the wxWidgets library.
diff --git a/libraries/wxSQLite3/slack-desc b/libraries/wxSQLite3/slack-desc
new file mode 100644
index 0000000000..350faac0a1
--- /dev/null
+++ b/libraries/wxSQLite3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+wxSQLite3: wxSQLite3 (wxWidgets wrapper for SQLite3)
+wxSQLite3:
+wxSQLite3: wxSQLite3 is a C++ wrapper around the public domain SQLite 3.x 
+wxSQLite3: database and is specifically designed for use in programs based on  
+wxSQLite3: the wxWidgets library.
+wxSQLite3:
+wxSQLite3: Home Page: http://wxcode.sourceforge.net/components/wxsqlite3/
+wxSQLite3:
+wxSQLite3:
+wxSQLite3:
+wxSQLite3:
diff --git a/libraries/wxSQLite3/wxSQLite3.SlackBuild b/libraries/wxSQLite3/wxSQLite3.SlackBuild
new file mode 100644
index 0000000000..14de3a981f
--- /dev/null
+++ b/libraries/wxSQLite3/wxSQLite3.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# Slackware build script for wxSQLite3.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wxSQLite3
+VERSION=${VERSION:-3.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$(uname -m) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="wxsqlite3"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENCE.txt readme.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/wxSQLite3/wxSQLite3.info b/libraries/wxSQLite3/wxSQLite3.info
new file mode 100644
index 0000000000..746b14e4d1
--- /dev/null
+++ b/libraries/wxSQLite3/wxSQLite3.info
@@ -0,0 +1,10 @@
+PRGNAM="wxSQLite3"
+VERSION="3.3.0"
+HOMEPAGE="http://wxcode.sourceforge.net/components/wxsqlite3/"
+DOWNLOAD="http://sourceforge.net/projects/wxcode/files/Components/wxSQLite3/wxsqlite3-3.3.0.tar.gz"
+MD5SUM="a718a8ec885aa82ee3192b2765214fef"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="wxGTK"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/libraries/xapian-core/xapian-core.SlackBuild b/libraries/xapian-core/xapian-core.SlackBuild
index ac72ccb20d..95e73c6f95 100644
--- a/libraries/xapian-core/xapian-core.SlackBuild
+++ b/libraries/xapian-core/xapian-core.SlackBuild
@@ -23,7 +23,7 @@
 #   SUCH DAMAGE.
 
 PRGNAM=xapian-core
-VERSION=${VERSION:-1.2.12}
+VERSION=${VERSION:-1.2.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +60,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,17 +84,17 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS HACKING PLATFORMS README \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS HACKING PLATFORMS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 # We don't need api docs, I don't think  --rworkman
 rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/apidoc
 
diff --git a/libraries/xapian-core/xapian-core.info b/libraries/xapian-core/xapian-core.info
index 4fbf20f31f..e4bb0dbe59 100644
--- a/libraries/xapian-core/xapian-core.info
+++ b/libraries/xapian-core/xapian-core.info
@@ -1,8 +1,8 @@
 PRGNAM="xapian-core"
-VERSION="1.2.12"
+VERSION="1.2.21"
 HOMEPAGE="http://www.xapian.org/"
-DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz"
-MD5SUM="faf33a3945edbe4c848627750856cbeb"
+DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.21/xapian-core-1.2.21.tar.xz"
+MD5SUM="276497a458a8ae63e7dceb372cc1bc37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/xmltooling/xmltooling.SlackBuild b/libraries/xmltooling/xmltooling.SlackBuild
index 9d9a763593..10281613dc 100644
--- a/libraries/xmltooling/xmltooling.SlackBuild
+++ b/libraries/xmltooling/xmltooling.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmltooling
-VERSION=${VERSION:-1.5.4}
+VERSION=${VERSION:-1.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/xmltooling/xmltooling.info b/libraries/xmltooling/xmltooling.info
index 6ffa588432..9636cc8375 100644
--- a/libraries/xmltooling/xmltooling.info
+++ b/libraries/xmltooling/xmltooling.info
@@ -1,8 +1,8 @@
 PRGNAM="xmltooling"
-VERSION="1.5.4"
+VERSION="1.5.6"
 HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/XMLTooling-C"
-DOWNLOAD="http://shibboleth.net/downloads/c++-opensaml/2.5.4/xmltooling-1.5.4.tar.gz"
-MD5SUM="53b35e180cb6d4cd5ba46757c02fb686"
+DOWNLOAD="http://shibboleth.net/downloads/c++-opensaml/2.5.5/xmltooling-1.5.6.tar.gz"
+MD5SUM="de4903744de0c9e4ae8d9900e576de62"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="log4shib xml-security-c"
diff --git a/libraries/xulrunner/xulrunner.info b/libraries/xulrunner/xulrunner.info
index f254477275..e5a1ec3e76 100644
--- a/libraries/xulrunner/xulrunner.info
+++ b/libraries/xulrunner/xulrunner.info
@@ -1,7 +1,7 @@
 PRGNAM="xulrunner"
 VERSION="15.0.1"
 HOMEPAGE="https://developer.mozilla.org/en/Getting_started_with_XULRunner"
-DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/mozilla.org/xulrunner/releases/15.0.1/source/xulrunner-15.0.1.source.tar.bz2"
+DOWNLOAD="https://ftp.mozilla.org/pub/xulrunner/releases/15.0.1/source/xulrunner-15.0.1.source.tar.bz2"
 MD5SUM="e06cf648577c16d99f230b3569413e24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/libraries/yaml-cpp0.3/slack-desc b/libraries/yaml-cpp0.3/slack-desc
index 4af639b296..4d980ad149 100644
--- a/libraries/yaml-cpp0.3/slack-desc
+++ b/libraries/yaml-cpp0.3/slack-desc
@@ -11,7 +11,7 @@ yaml-cpp0.3:
 yaml-cpp0.3: yaml-cpp is a YAML parser and emitter in
 yaml-cpp0.3: C++ matching the YAML 1.2 spec.
 yaml-cpp0.3:
-yaml-cpp0.3: Homepage: https://code.google.com/p/yaml-cpp/
+yaml-cpp0.3: Homepage: https://github.com/jbeder/yaml-cpp
 yaml-cpp0.3:
 yaml-cpp0.3:
 yaml-cpp0.3:
diff --git a/libraries/yaml-cpp0.3/yaml-cpp0.3.SlackBuild b/libraries/yaml-cpp0.3/yaml-cpp0.3.SlackBuild
index e3155a79ac..33f35baf0c 100644
--- a/libraries/yaml-cpp0.3/yaml-cpp0.3.SlackBuild
+++ b/libraries/yaml-cpp0.3/yaml-cpp0.3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for yaml-cpp
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Orestiada
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=yaml-cpp0.3
 SRCNAM=yaml-cpp
 VERSION=${VERSION:-0.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM
+rm -rf $SRCNAM-release-$VERSION
+tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz || tar xvf $CWD/release-$VERSION.tar.gz
+cd $SRCNAM-release-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/yaml-cpp0.3/yaml-cpp0.3.info b/libraries/yaml-cpp0.3/yaml-cpp0.3.info
index 9c281595dd..62178bb2d5 100644
--- a/libraries/yaml-cpp0.3/yaml-cpp0.3.info
+++ b/libraries/yaml-cpp0.3/yaml-cpp0.3.info
@@ -1,8 +1,8 @@
 PRGNAM="yaml-cpp0.3"
 VERSION="0.3.0"
-HOMEPAGE="https://code.google.com/p/yaml-cpp/"
-DOWNLOAD="https://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz"
-MD5SUM="9aa519205a543f9372bf4179071c8ac6"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp"
+DOWNLOAD="https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"
+MD5SUM="0c0496b195299e956056430444e237b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/Colormake/Colormake.SlackBuild b/misc/Colormake/Colormake.SlackBuild
new file mode 100644
index 0000000000..b863bb4e2e
--- /dev/null
+++ b/misc/Colormake/Colormake.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# Slackware build script for Colormake.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Colormake
+VERSION=${VERSION:-0.9.20140503}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -d $PKG/usr/bin
+install -D -m755 {colormake,colormake.pl} $PKG/usr/bin/
+
+mkdir -p $PKG/usr/man/man1
+cp -a colormake.1 $PKG/usr/man/man1
+
+(
+ cd $PKG/usr/bin
+ ln -sf /usr/bin/colormake colormake-short
+ ln -sf /usr/bin/colormake clmake
+ ln -sf /usr/bin/colormake clmake-short
+)
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BUGS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/Colormake/Colormake.info b/misc/Colormake/Colormake.info
new file mode 100644
index 0000000000..a7add6a891
--- /dev/null
+++ b/misc/Colormake/Colormake.info
@@ -0,0 +1,10 @@
+PRGNAM="Colormake"
+VERSION="0.9.20140503"
+HOMEPAGE="https://github.com/pagekite/Colormake/"
+DOWNLOAD="https://github.com/pagekite/Colormake/archive/0.9.20140503.tar.gz"
+MD5SUM="5413fcc6d1e33a57b488be29e50f204d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/misc/Colormake/README b/misc/Colormake/README
new file mode 100644
index 0000000000..aa355f6c90
--- /dev/null
+++ b/misc/Colormake/README
@@ -0,0 +1,8 @@
+Colormake (a simple wrapper around make to colorize the output)
+
+Colormake is a simple wrapper for making the output from make easier
+to read (more colorful), and errors easier to find in messy 
+compilations. It was inspired by Micheal T. Babcock's excellent 
+logcolorize program.
+
+To use, simply create a alias: alias make='colormake'
diff --git a/misc/Colormake/slack-desc b/misc/Colormake/slack-desc
new file mode 100644
index 0000000000..992c911957
--- /dev/null
+++ b/misc/Colormake/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+Colormake: Colormake (a simple wrapper around make to colorize the output)
+Colormake:
+Colormake: Colormake is a simple wrapper for making the output from make easier
+Colormake: to read (more colorful), and errors easier to find in messy 
+Colormake: compilations.
+Colormake:
+Colormake: Home page: https://github.com/pagekite/Colormake/
+Colormake:
+Colormake:
+Colormake:
+Colormake:
diff --git a/misc/KeePass/KeePass.SlackBuild b/misc/KeePass/KeePass.SlackBuild
index 3a835c92c8..2fec14ad92 100644
--- a/misc/KeePass/KeePass.SlackBuild
+++ b/misc/KeePass/KeePass.SlackBuild
@@ -18,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=KeePass
-VERSION=${VERSION:-2.29}
+VERSION=${VERSION:-2.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/KeePass/KeePass.info b/misc/KeePass/KeePass.info
index 64342276a6..48cc7a4dd2 100644
--- a/misc/KeePass/KeePass.info
+++ b/misc/KeePass/KeePass.info
@@ -1,10 +1,10 @@
 PRGNAM="KeePass"
-VERSION="2.29"
+VERSION="2.30"
 HOMEPAGE="http://keepass.info/"
-DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.29.zip \
-          http://downloads.sourceforge.net/keepass/KeePass-2.29-Source.zip"
-MD5SUM="edf6ddc24346a6181a898e78db1d352c \
-        aa007fa7550e488a870c8f18932e0130"
+DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.30.zip \
+          http://downloads.sourceforge.net/keepass/KeePass-2.30-Source.zip"
+MD5SUM="b73b9fc520e47f47c517be1048be7aec \
+        9296808e4c30d1de4eb182bab521d864"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mono libgdiplus"
diff --git a/misc/abduco/README b/misc/abduco/README
new file mode 100644
index 0000000000..ed44947932
--- /dev/null
+++ b/misc/abduco/README
@@ -0,0 +1,5 @@
+abduco provides session management i.e. it allows programs to be
+run independently from their controlling terminal. That is, programs
+can be detached -- run in the background -- and then later reattached.
+Together with dvtm it provides a simpler and cleaner alternative to tmux
+or screen.
diff --git a/misc/abduco/abduco.SlackBuild b/misc/abduco/abduco.SlackBuild
new file mode 100644
index 0000000000..f3a7f025ae
--- /dev/null
+++ b/misc/abduco/abduco.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for abduco.
+
+# Adapted from Marcel Saegebarth's dvtm SlackBuild.
+# Copyright 2011-2015 Marcel Saegebarth <marc@mos6581.de>
+
+# Copyright 2015-2016 Leonard Schmidt <lems@gmx.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=abduco
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
+make
+make install DESTDIR=$PKG PREFIX=/usr MANPREFIX=/usr/man
+# binaries are already stripped
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/abduco/abduco.info b/misc/abduco/abduco.info
new file mode 100644
index 0000000000..389631cfe7
--- /dev/null
+++ b/misc/abduco/abduco.info
@@ -0,0 +1,10 @@
+PRGNAM="abduco"
+VERSION="0.5"
+HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
+DOWNLOAD="http://www.brain-dump.org/projects/abduco/abduco-0.5.tar.gz"
+MD5SUM="c1582411bc12f36620ec0e555da540fc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Leonard Schmidt"
+EMAIL="lems@gmx.net"
diff --git a/misc/abduco/slack-desc b/misc/abduco/slack-desc
new file mode 100644
index 0000000000..bfc78080df
--- /dev/null
+++ b/misc/abduco/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+abduco: abduco (session manager with attach/detach support)
+abduco:
+abduco: abduco provides session management i.e. it allows programs to
+abduco: be run independently from their controlling terminal. That is,
+abduco: programs can be detached -- run in the background -- and then
+abduco: later reattached. Together with dvtm it provides a simpler and
+abduco: cleaner alternative to tmux or screen.
+abduco:
+abduco: Homepage: http://www.brain-dump.org/projects/abduco/
+abduco:
+abduco:
diff --git a/misc/bdf2psf/README b/misc/bdf2psf/README
new file mode 100644
index 0000000000..a59392f229
--- /dev/null
+++ b/misc/bdf2psf/README
@@ -0,0 +1,14 @@
+bdf2psf (convert fonts from bdf to psf format)
+
+bdf2psf is a perl script that converts fonts from bdf to psf format.
+It can merge glyphs coming from several fonts, use the same
+glyph for several characters to save space through equivalence
+files, choose which characters to have glyphs included in the psf
+font through a list of character sets, output either a font suitable
+for a plain text linux console or for a framebuffer.
+
+Read carefully "man bdf2psf".
+
+bdf2psf's author is Anton Zinoviev.
+
+bdf2psf is shipped in Debian's console-setup source package.
diff --git a/misc/bdf2psf/bdf2psf.SlackBuild b/misc/bdf2psf/bdf2psf.SlackBuild
new file mode 100644
index 0000000000..78a27befe8
--- /dev/null
+++ b/misc/bdf2psf/bdf2psf.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Slackware build script for bdf2psf
+
+# Copyright 2015 Didier Spaier Paruis, France
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=bdf2psf
+VERSION=${VERSION:-1.131}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# perl script
+ARCH=noarch
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+ar xvf $CWD/$PRGNAM*deb
+rm control.tar.gz debian-binary
+mv data.tar.xz $PKG
+cd $PKG
+tar xvvf data.tar.xz
+rm data.tar.xz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/{doc/$PRGNAM-$VERSION,man/man1}
+mv $PKG/usr/share/doc/$PRGNAM/{README*,copyright} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1
+rm -r $PKG/usr/share/{man,doc}
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/bdf2psf/bdf2psf.info b/misc/bdf2psf/bdf2psf.info
new file mode 100644
index 0000000000..ae7a0c65c0
--- /dev/null
+++ b/misc/bdf2psf/bdf2psf.info
@@ -0,0 +1,10 @@
+PRGNAM="bdf2psf"
+VERSION="version of application"
+HOMEPAGE="none"
+DOWNLOAD="http://ftp.fr.debian.org/debian/pool/main/c/console-setup/bdf2psf_1.131_all.deb"
+MD5SUM="b2a8b8de9a3ff82cc2504e4568895fae"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Didier Spaier"
+EMAIL="didier at slint dot fr"
diff --git a/misc/bdf2psf/slack-desc b/misc/bdf2psf/slack-desc
new file mode 100644
index 0000000000..fe07435e88
--- /dev/null
+++ b/misc/bdf2psf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+bdf2psf: bdf2psf (convert fonts from bdf to psf format)
+bdf2psf:
+bdf2psf: bdf2psf is a perl script that converts fonts from bdf to psf format.
+bdf2psf: It can merge glyphs coming from several fonts, use the same
+bdf2psf: glyph for several characters to save space through equivalence
+bdf2psf: files, choose which characters to have glyphs included in the psf
+bdf2psf: font through a list of character sets, output either a font suitable
+bdf2psf: for a plain text linux console or for a framebuffer.
+bdf2psf:
+bdf2psf: See "man bdf2psf". bdf2psf's author is Anton Zinoviev.
+bdf2psf: bdf2psf is shipped in Debian's console-setup source package.
diff --git a/misc/cups-windows/cups-windows.SlackBuild b/misc/cups-windows/cups-windows.SlackBuild
index 03faf542d5..3f1b53f1a0 100644
--- a/misc/cups-windows/cups-windows.SlackBuild
+++ b/misc/cups-windows/cups-windows.SlackBuild
@@ -33,11 +33,8 @@ find -L . \
 
 make install BUILDROOT=$PKG
 
-# Permissions don't seem necessary, but I get errors like this otherwise:
-# smbd:   print_job_start: insufficient permissions to open spool file /var/spool/samba/smbprn.00000011.Ox9UuS.
-# Calling all cluebats...  ;-)  --rworkman
-mkdir -p $PKG/var/spool/samba
-chmod 1777 $PKG/var/spool/samba
+# /var/spool/samba should be part of the samba package and have ownershipo and
+# permissions of root:root 1777
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/misc/dos2unix/dos2unix.SlackBuild b/misc/dos2unix/dos2unix.SlackBuild
index 9a61c59b2c..10b10774d1 100644
--- a/misc/dos2unix/dos2unix.SlackBuild
+++ b/misc/dos2unix/dos2unix.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Slackware build script for dos2unix
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dos2unix
-VERSION=${VERSION:-7.2.3}
+VERSION=${VERSION:-7.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/dos2unix/dos2unix.info b/misc/dos2unix/dos2unix.info
index 24b9f0ee45..ee36dbab02 100644
--- a/misc/dos2unix/dos2unix.info
+++ b/misc/dos2unix/dos2unix.info
@@ -1,8 +1,8 @@
 PRGNAM="dos2unix"
-VERSION="7.2.3"
+VERSION="7.3.2"
 HOMEPAGE="http://waterlan.home.xs4all.nl/dos2unix.html"
-DOWNLOAD="http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.2.3.tar.gz"
-MD5SUM="b4cd9540de21148555ee690cbb9b1bb7"
+DOWNLOAD="http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.3.2.tar.gz"
+MD5SUM="77701464e6d715676f57304f6adc13ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/esniper/README b/misc/esniper/README
new file mode 100644
index 0000000000..7985e151a9
--- /dev/null
+++ b/misc/esniper/README
@@ -0,0 +1,5 @@
+Esniper is a simple, lightweight tool for sniping ebay auctions.
+
+It doesn't have a lot of features, and that is by design. Auctions are specified on the command line
+using the auction number and your bid price. Multiple auctions can be bid on by specifying more auctions and bid prices.
+esniper stops when the desired quantity has been won (default is 1). 
diff --git a/misc/esniper/esniper.SlackBuild b/misc/esniper/esniper.SlackBuild
new file mode 100644
index 0000000000..cb8642e582
--- /dev/null
+++ b/misc/esniper/esniper.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for esniper
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=esniper
+VERSION=${VERSION:-2.31.0}
+SRCVER=$(echo $VERSION | tr . -)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tgz
+cd $PRGNAM-$SRCVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/esniper/esniper.info b/misc/esniper/esniper.info
new file mode 100644
index 0000000000..f0d3649bc4
--- /dev/null
+++ b/misc/esniper/esniper.info
@@ -0,0 +1,10 @@
+PRGNAM="esniper"
+VERSION="2.31.0"
+HOMEPAGE="http://esniper.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/esniper/files/esniper/2.31.0/esniper-2-31-0.tgz"
+MD5SUM="4b411588c4a223acef7333ab684c7618"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/misc/esniper/slack-desc b/misc/esniper/slack-desc
new file mode 100644
index 0000000000..a010fa3bdb
--- /dev/null
+++ b/misc/esniper/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+esniper: esniper (a lightweight eBay sniping tool)
+esniper:
+esniper: Esniper is a lightweight ebay sniping tool. It doesn't have
+esniper: a lot of features, and that is by design. Auctions are specified
+esniper: on the command line, using the auction number and your bid price.
+esniper: Multiple auctions can be bid on by specifying more auctions and
+esniper: bid prices.esniper stops when the desired quantity has been won
+esniper: (default is 1).
+esniper:
+esniper: Homepage: http://esniper.sourceforge.net/
+esniper:
diff --git a/misc/fcitx-configtool/fcitx-configtool.SlackBuild b/misc/fcitx-configtool/fcitx-configtool.SlackBuild
index 5eb880b882..8e28704df1 100644
--- a/misc/fcitx-configtool/fcitx-configtool.SlackBuild
+++ b/misc/fcitx-configtool/fcitx-configtool.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fcitx-configtool
-VERSION=${VERSION:-0.4.5.1}
+VERSION=${VERSION:-0.4.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/fcitx-configtool/fcitx-configtool.info b/misc/fcitx-configtool/fcitx-configtool.info
index a1680a00b2..02cbeac911 100644
--- a/misc/fcitx-configtool/fcitx-configtool.info
+++ b/misc/fcitx-configtool/fcitx-configtool.info
@@ -1,10 +1,10 @@
 PRGNAM="fcitx-configtool"
-VERSION="0.4.5.1"
+VERSION="0.4.8"
 HOMEPAGE="http://code.google.com/p/fcitx/"
-DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-configtool-0.4.5.1.tar.xz"
-MD5SUM="6787dedcb57e6147553ef755c51bb46b"
-DOWNLOAD_x86_64="http://fcitx.googlecode.com/files/fcitx-configtool-0.4.5.1.tar.xz"
-MD5SUM_x86_64="6787dedcb57e6147553ef755c51bb46b"
+DOWNLOAD="http://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.8.tar.xz"
+MD5SUM="dcbcfc42577abb25b391d986799cd704"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES="fcitx"
 MAINTAINER="Grissiom"
 EMAIL="chaos.proton@gmail.com"
diff --git a/misc/fcitx-configtool/slack-desc b/misc/fcitx-configtool/slack-desc
index a7bc7abb68..fc87d15e47 100644
--- a/misc/fcitx-configtool/slack-desc
+++ b/misc/fcitx-configtool/slack-desc
@@ -10,7 +10,7 @@ fcitx-configtool: fcitx-configtool (configuration tool for fcitx)
 fcitx-configtool:
 fcitx-configtool: fcitx-configtool is a GTK-based configuration tool for fcitx.
 fcitx-configtool:
-fcitx-configtool: Homepage: http://code.google.com/p/fcitx/
+fcitx-configtool: Homepage: https://fcitx-im.org
 fcitx-configtool:
 fcitx-configtool:
 fcitx-configtool:
diff --git a/misc/fcitx-mozc/README b/misc/fcitx-mozc/README
new file mode 100644
index 0000000000..7619a50761
--- /dev/null
+++ b/misc/fcitx-mozc/README
@@ -0,0 +1 @@
+Fcitx-mozc is Mozc engine for fcitx. Mozc is a Japanese Input Method Editor designed for multi-platform.
diff --git a/misc/fcitx-mozc/fcitx-mozc.SlackBuild b/misc/fcitx-mozc/fcitx-mozc.SlackBuild
new file mode 100644
index 0000000000..8ec8a6a747
--- /dev/null
+++ b/misc/fcitx-mozc/fcitx-mozc.SlackBuild
@@ -0,0 +1,186 @@
+#! /bin/sh
+# Slackware build script for fcitx-mozc
+# Issued under The MIT License (MIT)
+#
+# Copyright 2015 Kuro_CODE25
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+PRGNAM=fcitx-mozc
+VERSION=${VERSION:-2.17.2102.102.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+BLDBASEDIR=$TMP/$PRGNAM-$VERSION
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# paramater of Qt dir.
+RCC_LOC=`pkg-config QtCore --variable=rcc_location`
+QT4DIR=${RCC_LOC%%/bin/rcc}
+QT4I=`pkg-config QtGui --cflags-only-I`
+BLDTYPE=Release
+
+# source rev. and version.
+ZIPCODE_REL=201504
+PROTOBUF_REV=172019c40bf548908ab09bfd276074c929d48415
+GYP_REV=ff251c3d43eb4263d3aafa29007d6420289525d1
+JSONCPP_REV=11086dd6a7eba04289944367ca82cea71299ed70
+JAPNESE_USAGE_DICT_REV=e5b3425575734c323e1d947009dd74709437b684
+MOZC_REV=3648b9bf06d5d9b36bed2425640bfd18ae05b588
+FONTTOOLS_REV=5ba7d98a4153fad57258fca23b0bcb238717aec3
+JSR305_VER=2.0.2
+FCITX_PATCH_VER=2.17.2102.102.1
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+echo "prepare source file..."
+# unzip packages
+unzip ${CWD}/x-ken-all-${ZIPCODE_REL}.zip
+unzip ${CWD}/jigyosyo-${ZIPCODE_REL}.zip
+tar -xvf ${CWD}/fcitx-mozc-icon.tar.gz
+unzip ${CWD}/$MOZC_REV.zip
+unzip ${CWD}/$JSONCPP_REV.zip
+unzip ${CWD}/$JAPNESE_USAGE_DICT_REV.zip
+unzip ${CWD}/$GYP_REV.zip
+unzip ${CWD}/$PROTOBUF_REV.zip
+unzip ${CWD}/$FONTTOOLS_REV.zip
+
+cp $CWD/fcitx-mozc-${FCITX_PATCH_VER}.patch .
+cp $CWD/jsr305-$JSR305_VER.jar .
+
+# rename directory
+mv mozc-$MOZC_REV mozc
+mv jsoncpp-$JSONCPP_REV jsoncpp
+mv japanese-usage-dictionary-$JAPNESE_USAGE_DICT_REV japanese_usage_dictionary
+mv gyp-$GYP_REV gyp
+mv protobuf-$PROTOBUF_REV protobuf
+mv fonttools-$FONTTOOLS_REV fonttools
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Apply fcitx patch
+cd $BLDBASEDIR/mozc/src
+echo "Apply fcitx patch ..."
+rm unix/fcitx -rf
+patch -Np2 -i "$BLDBASEDIR/fcitx-mozc-${FCITX_PATCH_VER}.patch"
+
+# Generate zip code seed
+echo "Generating zip code seed ..."
+python2 dictionary/gen_zip_code_seed.py --zip_code="$BLDBASEDIR/x-ken-all.csv" --jigyosyo="$BLDBASEDIR/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
+echo "Done."
+
+# Copy third party deps
+echo "Copy third party deps ..."
+cd $BLDBASEDIR
+for dep in jsoncpp gyp protobuf japanese_usage_dictionary fonttools
+do
+  cp -a $dep mozc/src/third_party/
+done
+
+install -D jsr305-$JSR305_VER.jar mozc/src/third_party/jsr305/jsr305-$JSR305_VER.jar
+
+echo "build package..."
+CFLAGS="${CFLAGS} $QT4I -fvisibility=hidden"
+CXXFLAGS="${CXXFLAGS} $QT4I -fvisibility=hidden"
+
+cd $BLDBASEDIR/mozc/src
+
+_targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
+
+QTDIR=$QT4DIR GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp
+sed -i 's|command = $cxx -MMD -MF $out.d $defines $includes $cflags $cflags_cc $cflags_pch_cc -c $in -o $out|command = $cxx -MMD -MF $out.d $defines $includes -D__STRICT_ANSI__ $cflags $cflags_cc $cflags_pch_cc -c $in -o $out|' out_linux/Release/build.ninja
+python2 build_mozc.py build -c $BLDTYPE $_targets
+
+# Extract license part of mozc
+head -n 29 server/mozc_server.cc > LICENSE
+
+BLDTYPE=Release
+#cd mozc/src
+
+# install mozc to /usr/lib even if 64 bit
+install -D -m 755 out_linux/${BLDTYPE}/mozc_server "${PKG}/usr/lib/mozc/mozc_server"
+install    -m 755 out_linux/${BLDTYPE}/mozc_tool   "${PKG}/usr/lib/mozc/mozc_tool"
+
+install -d "${PKG}/usr/share/licenses/$pkgname/"
+install -m 644 LICENSE data/installer/*.html "${PKG}/usr/share/licenses/${pkgname}/"
+
+for mofile in out_linux/${BLDTYPE}/gen/unix/fcitx/po/*.mo
+do
+  filename=`basename $mofile`
+  lang=${filename/.mo/}
+  install -D -m 644 "$mofile" "${PKG}/usr/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo"
+done
+
+install -D -m 755 out_linux/${BLDTYPE}/fcitx-mozc.so "${PKG}/usr/lib${LIBDIRSUFFIX}/fcitx/fcitx-mozc.so"
+install -D -m 644 unix/fcitx/fcitx-mozc.conf "${PKG}/usr/share/fcitx/addon/fcitx-mozc.conf"
+install -D -m 644 unix/fcitx/mozc.conf "${PKG}/usr/share/fcitx/inputmethod/mozc.conf"
+
+install -d "${PKG}/usr/share/fcitx/mozc/icon"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-alpha_full.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-alpha_half.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-direct.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-direct.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-hiragana.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-katakana_full.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-katakana_half.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-dictionary.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-properties.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-properties.png"
+install -m 644 "$BLDBASEDIR/fcitx-mozc-icons/mozc-tool.png" "${PKG}/usr/share/fcitx/mozc/icon/mozc-tool.png"
+
+mkdir -p $PKG/install
+
+# install slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/fcitx-mozc/fcitx-mozc.info b/misc/fcitx-mozc/fcitx-mozc.info
new file mode 100644
index 0000000000..4570d90c88
--- /dev/null
+++ b/misc/fcitx-mozc/fcitx-mozc.info
@@ -0,0 +1,10 @@
+PRGNAM="fcitx-mozc"
+VERSION="2.17.2102.102.1"
+HOMEPAGE="https://fcitx-im.org"
+DOWNLOAD="http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.17.2102.102.1.patch http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz http://downloads.sourceforge.net/pnsft-aur/jigyosyo-201504.zip http://findbugs.googlecode.com/svn/repos/release-repository/com/google/code/findbugs/jsr305/2.0.2/jsr305-2.0.2.jar http://downloads.sourceforge.net/pnsft-aur/x-ken-all-201504.zip https://github.com/google/mozc/archive/3648b9bf06d5d9b36bed2425640bfd18ae05b588.zip https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.zip https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.zip https://github.com/svn2github/gyp/archive/ff251c3d43eb4263d3aafa29007d6420289525d1.zip https://github.com/google/protobuf/archive/172019c40bf548908ab09bfd276074c929d48415.zip https://github.com/googlei18n/fonttools/archive/5ba7d98a4153fad57258fca23b0bcb238717aec3.zip"
+MD5SUM="d32e372c9e1fbbc028062e9f962089a7 80fe2ef127b70649df22d133822ac8a7 22e7aeec439f889b0cda4bd23126414c 144c0767e2aaf0c21a935908d0e52c68 5fa1b29d7e06a482b4eb99baf2b8597d a14580576d8401bc7f934796ff520e79 2390d646496db0bcec0ffa6bbfee2435 a6eb1da9ad7ceffcb9683003332abf7e 6e458cb1c330c772b59c80fe262a1944 828b7ffb92b4a01cce10312cdef4f532 cf0f74dd6536a35d0f6067a0de732c76"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fcitx-configtool ninja zinnia"
+MAINTAINER="Kuro_CODE25"
+EMAIL="kuro.code25@gmail.com" 
diff --git a/misc/fcitx-mozc/slack-desc b/misc/fcitx-mozc/slack-desc
new file mode 100644
index 0000000000..8d3ddb5f02
--- /dev/null
+++ b/misc/fcitx-mozc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+fcitx-mozc: fcitx-mozc (Mozc engine for fcitx)
+fcitx-mozc:
+fcitx-mozc: fcitx-mozc is Mozc, Japanese input method editor, engine for fcitx.
+fcitx-mozc:
+fcitx-mozc: Homepage: https://fcitx-im.org
+fcitx-mozc:
+fcitx-mozc:
+fcitx-mozc:
+fcitx-mozc:
+fcitx-mozc:
+fcitx-mozc:
diff --git a/misc/fcitx/doinst.sh b/misc/fcitx/doinst.sh
index 9424ce43ff..a37b27518a 100644
--- a/misc/fcitx/doinst.sh
+++ b/misc/fcitx/doinst.sh
@@ -2,6 +2,14 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/gtk-query-immodules-2.0 ]; then
+  /usr/bin/gtk-query-immodules-2.0 --update-cache
+fi
+
+if [ -x /usr/bin/gtk-query-immodules-3.0 ]; then
+  /usr/bin/gtk-query-immodules-3.0 --update-cache
+fi
+
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index c3136c5241..4e054725fb 100644
--- a/misc/fcitx/fcitx.SlackBuild
+++ b/misc/fcitx/fcitx.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fcitx
-VERSION=${VERSION:-4.2.6.1}
+VERSION=${VERSION:-4.2.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,16 +67,18 @@ tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir build
 cd build
   cmake -DCMAKE_C_FLAGS:STRING=${SLKCFLAGS} \
         -DCMAKE_CXX_FLAGS:STRING=${SLKCFLAGS} \
+	-DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
+	-DSYSCONFDIR=/etc \
         -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
         -DENABLE_GTK2_IM_MODULE=On \
         -DENABLE_GTK3_IM_MODULE=On \
@@ -87,7 +89,7 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/share/man $PKG/usr
@@ -100,8 +102,7 @@ chmod 0755 $PKG/etc/profile.d/*
 
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README THANKS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/fcitx/fcitx.info b/misc/fcitx/fcitx.info
index f84de57997..fd5a7f986a 100644
--- a/misc/fcitx/fcitx.info
+++ b/misc/fcitx/fcitx.info
@@ -1,8 +1,8 @@
 PRGNAM="fcitx"
-VERSION="4.2.6.1"
-HOMEPAGE="http://code.google.com/p/fcitx/"
-DOWNLOAD="http://fcitx.googlecode.com/files/fcitx-4.2.6.1_dict.tar.xz"
-MD5SUM="7dc57dbe41702ec8be856ce3de434f2b"
+VERSION="4.2.8.6"
+HOMEPAGE="https://fcitx-im.org"
+DOWNLOAD="http://download.fcitx-im.org/fcitx/fcitx-4.2.8.6_dict.tar.xz"
+MD5SUM="8dce1a0d65bf19f2a99b456458f8ac41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/fcitx/slack-desc b/misc/fcitx/slack-desc
index a18a054d7c..d56560b5aa 100644
--- a/misc/fcitx/slack-desc
+++ b/misc/fcitx/slack-desc
@@ -15,5 +15,5 @@ fcitx:
 fcitx: There are some good modules you can choose, like fcitx-config,
 fcitx: fcitx-{googlepinyin,sunpinyin,cloudpinyin}, fcitx-fbterm, etc.
 fcitx:
-fcitx: Homepage: http://code.google.com/p/fcitx/
+fcitx: Homepage: https://fcitx-im.org
 fcitx:
diff --git a/misc/glogg/glogg.SlackBuild b/misc/glogg/glogg.SlackBuild
index 732c33940d..0278e2c4e8 100644
--- a/misc/glogg/glogg.SlackBuild
+++ b/misc/glogg/glogg.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for glogg
 
-# Copyright 2014 Miroslaw Turski
+# Copyright 2015 Miroslaw Turski
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glogg
-VERSION=${VERSION:-0.9.2.1}
+VERSION=${VERSION:-1.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 qmake
 make
diff --git a/misc/glogg/glogg.info b/misc/glogg/glogg.info
index 9fdf572b35..61587350f7 100644
--- a/misc/glogg/glogg.info
+++ b/misc/glogg/glogg.info
@@ -1,8 +1,8 @@
 PRGNAM="glogg"
-VERSION="0.9.2.1"
+VERSION="1.0.2"
 HOMEPAGE="http://glogg.bonnefon.org/"
-DOWNLOAD="http://glogg.bonnefon.org/files/glogg-0.9.2.1.tar.gz"
-MD5SUM="17f4e7c10df0a1de4d3ee07ef4aa0fce"
+DOWNLOAD="http://glogg.bonnefon.org/files/glogg-1.0.2.tar.gz"
+MD5SUM="d6d9bb70ed50a38c5fa9114d71b52d3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/grc/README b/misc/grc/README
new file mode 100644
index 0000000000..4a0ed4ba0e
--- /dev/null
+++ b/misc/grc/README
@@ -0,0 +1,14 @@
+grc (generic colouriser)
+
+grc provides two programs: grc and grcat.  The main is grcat, which
+acts as a filter, i.e. taking standard input, colourising it and 
+writing to standard output. grcat takes as a parameter the name of
+configuration file.
+
+To use, add following lines into your ~/.bashrc or ~/.zshrc:
+
+ [[ -s "/etc/grc.bashrc" ]] && source /etc/grc.bashrc
+ [[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh
+ 
+Or put the entire content of /usr/doc/grc-1.9/grc.bashrc-expanded 
+example into these files.
diff --git a/misc/grc/grc.SlackBuild b/misc/grc/grc.SlackBuild
new file mode 100644
index 0000000000..99177d6e7e
--- /dev/null
+++ b/misc/grc/grc.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Slackware build script for grc.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="grc"
+VERSION=${VERSION:-1.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCVER="v$VERSION"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+install -d $PKG/etc
+install -D -m644 {grc.conf,grc.bashrc,$CWD/grc.zsh} $PKG/etc
+
+install -d $PKG/usr/bin
+install -D -m755 {grc,grcat} $PKG/usr/bin/
+
+install -d $PKG/usr/man/man1
+install -D -m644 {grc.1,grcat.1} $PKG/usr/man/man1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+install -d $PKG/usr/share/$PRGNAM
+install -D -m644 conf.* $PKG/usr/share/$PRGNAM
+
+DOCS="$CWD/grc.bashrc-expanded contrib debian/changelog debian/copyright \
+CREDITS INSTALL README Regexp.txt TODO"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/grc/grc.bashrc-expanded b/misc/grc/grc.bashrc-expanded
new file mode 100644
index 0000000000..e15fd64764
--- /dev/null
+++ b/misc/grc/grc.bashrc-expanded
@@ -0,0 +1,35 @@
+GRC=`which grc`
+if [ "$TERM" != dumb ] && [ -n "$GRC" ]
+then
+    alias colourify="$GRC -es --colour=auto"
+    alias cfg='colourify ./configure'
+    alias configure='colourify ./configure'
+    alias as='colourify as'
+    alias cvs='colourify cvs'
+    alias df='colourify df'
+    alias diff='colourify diff'
+    alias dig='colourify dig'
+    alias g++='colourify g++'
+    alias gas='colourify gas'
+    alias gcc='colourify gcc'
+    alias esperanto='colourify esperanto'
+    alias head='colourify head'
+    alias ifconfig='colourify ifconfig'
+    alias irclog='colourify irclog'
+    alias ld='colourify ld'
+    alias ldap='colourify ldap'
+    alias log='colourify log'
+    alias ls='colourify ls'
+    alias make='colourify make'
+    alias mount='colourify mount'
+    alias mount2='colourify mount2'
+    alias mtr='colourify mtr'
+    alias netstat='colourify netstat'
+    alias ping='colourify ping'
+    alias php='colourify php'
+    alias proftpd='colourify proftpd'
+    alias ps='colourify ps'
+    alias tail='colourify tail'
+    alias traceroute='colourify /usr/sbin/traceroute'
+    alias wdiff='colourify wdiff'
+fi
diff --git a/misc/grc/grc.info b/misc/grc/grc.info
new file mode 100644
index 0000000000..4d4f9c0e54
--- /dev/null
+++ b/misc/grc/grc.info
@@ -0,0 +1,10 @@
+PRGNAM="grc"
+VERSION="1.9"
+HOMEPAGE="https://github.com/garabik/grc"
+DOWNLOAD="https://github.com/garabik/grc/archive/v1.9.tar.gz"
+MD5SUM="2d2d2d4fb465e7f1974b5fecb6903206"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/misc/grc/grc.zsh b/misc/grc/grc.zsh
new file mode 100644
index 0000000000..f02db3ab83
--- /dev/null
+++ b/misc/grc/grc.zsh
@@ -0,0 +1,40 @@
+if [[ "$TERM" != dumb ]] && (( $+commands[grc] )) ; then
+  # Prevent grc aliases from overriding zsh completions.
+  setopt COMPLETE_ALIASES
+
+  # Supported commands
+  cmds=(
+    cc \
+    configure \
+    cvs \
+    df \
+    diff \
+    dig \
+    gcc \
+    gmake \
+    ifconfig \
+    last \
+    ldap \
+    ls \
+    make \
+    mount \
+    mtr \
+    netstat \
+    ping \
+    ping6 \
+    ps \
+    traceroute \
+    traceroute6 \
+    wdiff \
+  );
+
+  # Set alias for available commands.
+  for cmd in $cmds ; do
+    if (( $+commands[$cmd] )) ; then
+      alias $cmd="grc --colour=auto $cmd"
+    fi
+  done
+
+  # Clean up variables
+  unset cmds cmd
+fi
diff --git a/misc/grc/slack-desc b/misc/grc/slack-desc
new file mode 100644
index 0000000000..d770dd2c0b
--- /dev/null
+++ b/misc/grc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+grc: grc (generic colouriser)
+grc:
+grc: grc provides two programs: grc and grcat.  The main is grcat, which
+grc: acts as a filter, i.e. taking standard input, colourising it and 
+grc: writing to standard output. grcat takes as a parameter the name of
+grc: configuration file.
+grc:
+grc: https://github.com/garabik/grc
+grc:
+grc:
+grc:
diff --git a/misc/jstock/jstock.SlackBuild b/misc/jstock/jstock.SlackBuild
index 31a5adfec4..f0ba9a2760 100644
--- a/misc/jstock/jstock.SlackBuild
+++ b/misc/jstock/jstock.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jstock
-VERSION=${VERSION:-1.0.7.6}
+VERSION=${VERSION:-1.0.7.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,11 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
   LIBDIRSUFFIX=""
@@ -65,7 +61,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 chmod +x jstock/jstock.sh
 sed -i '/\/usr\/lib\/java/a JAVA_HOME='"$JAVAHOME"'' jstock/jstock.sh
diff --git a/misc/jstock/jstock.info b/misc/jstock/jstock.info
index 6782ab7e91..18cda288ed 100644
--- a/misc/jstock/jstock.info
+++ b/misc/jstock/jstock.info
@@ -1,8 +1,8 @@
 PRGNAM="jstock"
-VERSION="1.0.7.6"
+VERSION="1.0.7.10"
 HOMEPAGE="http://www.jstock.org/"
-DOWNLOAD="https://github.com/yccheok/jstock/releases/download/release_1-0-7-6/jstock-1.0.7.6-bin.zip"
-MD5SUM="37d3b57a3eb8450ce6dba6e82a26d43c"
+DOWNLOAD="https://github.com/yccheok/jstock/releases/download/release_1-0-7-10/jstock-1.0.7.10-bin.zip"
+MD5SUM="e6ca6f2fdb9a727517b2ed213bea7d81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/misc/kcm-fcitx/kcm-fcitx.SlackBuild b/misc/kcm-fcitx/kcm-fcitx.SlackBuild
index a6346f7e61..84e0b81f06 100644
--- a/misc/kcm-fcitx/kcm-fcitx.SlackBuild
+++ b/misc/kcm-fcitx/kcm-fcitx.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kcm-fcitx
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,10 +65,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir build
 cd build
@@ -80,11 +80,11 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/kcm-fcitx/kcm-fcitx.info b/misc/kcm-fcitx/kcm-fcitx.info
index 5b44f7ee1b..8c5bd794e7 100644
--- a/misc/kcm-fcitx/kcm-fcitx.info
+++ b/misc/kcm-fcitx/kcm-fcitx.info
@@ -1,10 +1,10 @@
 PRGNAM="kcm-fcitx"
-VERSION="0.4.1"
+VERSION="0.4.3"
 HOMEPAGE="http://fcitx-im.org/wiki/Kcm"
-DOWNLOAD="http://fcitx.googlecode.com/files/kcm-fcitx-0.4.1.tar.xz"
-MD5SUM="1a2a9802edf6df79d3883c362ba487f0"
-DOWNLOAD_x86_64="http://fcitx.googlecode.com/files/kcm-fcitx-0.4.1.tar.xz"
-MD5SUM_x86_64="1a2a9802edf6df79d3883c362ba487f0"
+DOWNLOAD="http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.4.3.tar.xz"
+MD5SUM="4cc0c0a4362ba9a3b814437273d9adb0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES="fcitx"
 MAINTAINER="Grissiom"
 EMAIL="chaos.proton@gmail.com"
diff --git a/misc/keychain/keychain.SlackBuild b/misc/keychain/keychain.SlackBuild
index ffe9b02eaa..00df0c5161 100644
--- a/misc/keychain/keychain.SlackBuild
+++ b/misc/keychain/keychain.SlackBuild
@@ -2,7 +2,7 @@
 # Slackware build script for keychain
 
 # Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
-# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -21,8 +21,8 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keychain
-VERSION=${VERSION:-2.7.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.8.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
 CWD=$(pwd)
@@ -40,12 +40,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make
+# Delete path that doesn't exist.
+sed -i 's|:/usr/ucb||' $PRGNAM
 
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
 install -m 755 $PRGNAM $PKG/usr/bin
@@ -54,7 +55,7 @@ cat keychain.1 > $PKG/usr/man/man1/keychain.1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.txt ChangeLog README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.txt ChangeLog README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/keychain/keychain.info b/misc/keychain/keychain.info
index 4b36032987..a53bbae3b7 100644
--- a/misc/keychain/keychain.info
+++ b/misc/keychain/keychain.info
@@ -1,8 +1,8 @@
 PRGNAM="keychain"
-VERSION="2.7.1"
+VERSION="2.8.2"
 HOMEPAGE="http://www.funtoo.org/index.php?title=Keychain"
-DOWNLOAD="http://www.funtoo.org/archive/keychain/keychain-2.7.1.tar.bz2"
-MD5SUM="07c622833192189f483cbaec287f9704"
+DOWNLOAD="http://www.funtoo.org/archive/keychain/keychain-2.8.2.tar.bz2"
+MD5SUM="2e1eef5237926086ddf7af497bf49b26"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/moedict-desktop.app/README b/misc/moedict-desktop.app/README
new file mode 100644
index 0000000000..ae094fc484
--- /dev/null
+++ b/misc/moedict-desktop.app/README
@@ -0,0 +1,9 @@
+Moedict-desktop is an offline version of moedict, an traditional Chinese dictionary
+originally published by Ministry of Education, R.O.C.
+
+Moedict is maintained by developers from g0v.tw community in Taiwan.
+Moedict-desktop includes translation functionality from traditional Chinese
+vocabularies into English, German, and French langues.
+
+This package directly installs pre-compiled binaries into /opt directory.
+You can start the program by executing the script "Moedict-Desktop".
diff --git a/misc/moedict-desktop.app/moedict-desktop.app.SlackBuild b/misc/moedict-desktop.app/moedict-desktop.app.SlackBuild
new file mode 100644
index 0000000000..70ee724e40
--- /dev/null
+++ b/misc/moedict-desktop.app/moedict-desktop.app.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for moedict-desktop
+
+# Copyright 2016 CCHsu Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=moedict-desktop.app
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar jxvf $CWD/${PRGNAM}-${VERSION}-linux-${ARCH}.tar.bz2
+cd ${PRGNAM}-linux-${ARCH}
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p ${PKG}/opt/${PRGNAM}-linux-${ARCH}/
+cp -a ${TMP}/${PRGNAM}-linux-${ARCH}/* ${PKG}/opt/${PRGNAM}-linux-${ARCH}/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/moedict-desktop.app/moedict-desktop.app.info b/misc/moedict-desktop.app/moedict-desktop.app.info
new file mode 100644
index 0000000000..b0fd7f7637
--- /dev/null
+++ b/misc/moedict-desktop.app/moedict-desktop.app.info
@@ -0,0 +1,10 @@
+PRGNAM="moedict-desktop.app"
+VERSION="1.1.1"
+HOMEPAGE="https://racklin.github.io/moedict-desktop/index.html"
+DOWNLOAD="https://github.com/racklin/moedict-desktop/releases/download/1.1.1/moedict-desktop.app-1.1.1-linux-i686.tar.bz2"
+MD5SUM="df02e9d9c9e075e9b526611b22aa55cd"
+DOWNLOAD_x86_64="https://github.com/racklin/moedict-desktop/releases/download/1.1.1/moedict-desktop.app-1.1.1-linux-x86_64.tar.bz2"
+MD5SUM_x86_64="97a9e778656e9b124d8acb3b2eaea22d"
+REQUIRES="%README%"
+MAINTAINER="CCHsu"
+EMAIL="a12321aabb@gmail.com"
diff --git a/misc/moedict-desktop.app/slack-desc b/misc/moedict-desktop.app/slack-desc
new file mode 100644
index 0000000000..c9fccdd7e7
--- /dev/null
+++ b/misc/moedict-desktop.app/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+moedict-desktop.app: moedict-desktop.app (Offline Traditional Chinese Dictionary)
+moedict-desktop.app:
+moedict-desktop.app: This is an offline version of moedict, an traditional Chinese dict-
+moedict-desktop.app: ionary originally published by Ministry of Education, R.O.C.
+moedict-desktop.app: Moedict includes translation functionality from traditional Chinese
+moedict-desktop.app: vocabularies into English, German, and French langues.
+moedict-desktop.app:
+moedict-desktop.app:
+moedict-desktop.app: Homepage: https://racklin.github.io/moedict-desktop/index.html
+moedict-desktop.app: See also: https://www.moedict.tw/
+moedict-desktop.app:
diff --git a/misc/moreutils/README b/misc/moreutils/README
new file mode 100644
index 0000000000..1878e061c4
--- /dev/null
+++ b/misc/moreutils/README
@@ -0,0 +1,2 @@
+moreutils is a growing collection of the unix tools that nobody
+thought to write long ago when unix was young.
diff --git a/misc/moreutils/moreutils.SlackBuild b/misc/moreutils/moreutils.SlackBuild
new file mode 100644
index 0000000000..e0c2fa9687
--- /dev/null
+++ b/misc/moreutils/moreutils.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for moreutils
+
+# Copyright 2015 Arkadiusz Drabczyk <arkadiusz@drabczyk.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=moreutils
+VERSION=${VERSION:-0.57}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
+make install DESTDIR=$PKG
+
+# Move manpages to /usr/man
+mkdir $PKG/usr/man
+mv $PKG/usr/share/man/* $PKG/usr/man
+rm -rf $PKG/usr/share/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/moreutils/moreutils.info b/misc/moreutils/moreutils.info
new file mode 100644
index 0000000000..738bceb93d
--- /dev/null
+++ b/misc/moreutils/moreutils.info
@@ -0,0 +1,10 @@
+PRGNAM="moreutils"
+VERSION="0.57"
+HOMEPAGE="https://joeyh.name/code/moreutils"
+DOWNLOAD="http://drabczyk.org/moreutils-0.57.tar.gz"
+MD5SUM="7268b9061281bcd550408218c7ec8ae9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Arkadiusz Drabczyk"
+EMAIL="arkadiusz@drabczyk.org"
diff --git a/misc/moreutils/slack-desc b/misc/moreutils/slack-desc
new file mode 100644
index 0000000000..f4613429fe
--- /dev/null
+++ b/misc/moreutils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+moreutils: moreutils (unix tools)
+moreutils:
+moreutils: moreutils is a growing collection of the unix tools that nobody
+moreutils: thought to write long ago when unix was young
+moreutils:
+moreutils:
+moreutils:
+moreutils:
+moreutils:
+moreutils:
+moreutils: https://joeyh.name/code/moreutils
diff --git a/misc/mosquitto/mosquitto.SlackBuild b/misc/mosquitto/mosquitto.SlackBuild
index 206c639dea..9215f6ee9c 100644
--- a/misc/mosquitto/mosquitto.SlackBuild
+++ b/misc/mosquitto/mosquitto.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mosquitto
 
-# Copyright 2011-2014  Christoph Willing <chris.willing@iinet.net.au>
+# Copyright 2011-2015  Christoph Willing <chris.willing@linux.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mosquitto
-VERSION=${VERSION:-1.4.2}
+VERSION=${VERSION:-1.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,7 +90,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE.txt CONTRIBUTING.md compiling.txt mosquitto.conf *.example examples readme.txt \
+  LICENSE.txt CONTRIBUTING.md compiling.txt mosquitto.conf *.example examples readme.* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/mosquitto/mosquitto.info b/misc/mosquitto/mosquitto.info
index b269091442..6a664b1d15 100644
--- a/misc/mosquitto/mosquitto.info
+++ b/misc/mosquitto/mosquitto.info
@@ -1,10 +1,10 @@
 PRGNAM="mosquitto"
-VERSION="1.4.2"
+VERSION="1.4.5"
 HOMEPAGE="http://mosquitto.org/"
-DOWNLOAD="http://mosquitto.org/files/source/mosquitto-1.4.2.tar.gz"
-MD5SUM="2c3b19686c04849ed4b183c63149bfe1"
+DOWNLOAD="http://mosquitto.org/files/source/mosquitto-1.4.5.tar.gz"
+MD5SUM="65667219196433292f373a34774d02af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="c-ares"
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/misc/opencc/README b/misc/opencc/README
new file mode 100644
index 0000000000..4f09f39400
--- /dev/null
+++ b/misc/opencc/README
@@ -0,0 +1,3 @@
+Open Chinese Convert (OpenCC) is an opensource project for conversion between
+Traditional Chinese and Simplified Chinese, supporting character-level conversion,
+phrase-level conversion, variant conversion and regional idioms among Mainland China, Taiwan and Hong kong.
diff --git a/misc/opencc/opencc.SlackBuild b/misc/opencc/opencc.SlackBuild
new file mode 100644
index 0000000000..20cc3826fe
--- /dev/null
+++ b/misc/opencc/opencc.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for OpenCC
+
+# Copyright 2015 CCHsu, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=opencc
+VERSION=${VERSION:-1.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf OpenCC-ver.$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/ver.$VERSION.tar.gz
+cd OpenCC-ver.$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/opencc/opencc.info b/misc/opencc/opencc.info
new file mode 100644
index 0000000000..2d78dba54f
--- /dev/null
+++ b/misc/opencc/opencc.info
@@ -0,0 +1,10 @@
+PRGNAM="opencc"
+VERSION="1.0.3"
+HOMEPAGE="http://byvoid.github.io/OpenCC/"
+DOWNLOAD="https://github.com/BYVoid/OpenCC/archive/ver.1.0.3.tar.gz"
+MD5SUM="1db89f0c6b2e39962464bda01de12017"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="CCHsu"
+EMAIL="a12321aabb@gmail.com"
diff --git a/misc/opencc/slack-desc b/misc/opencc/slack-desc
new file mode 100644
index 0000000000..f238fed167
--- /dev/null
+++ b/misc/opencc/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+opencc: opencc (Open Chinese Convert)
+opencc:
+opencc: Open Chinese Convert is an opensource project for conversion
+opencc: between Traditional Chinese and Simplified Chinese, supporting
+opencc: character-level conversion, phrase-level conversion, variant
+opencc: conversion and regional idioms among Mainland China, Taiwan and
+opencc: Hong kong.
+opencc:
+opencc: Homepage: http://byvoid.github.io/OpenCC/
+opencc:
+opencc:
diff --git a/misc/par/par.info b/misc/par/par.info
index c9a4d887b7..254334f841 100644
--- a/misc/par/par.info
+++ b/misc/par/par.info
@@ -1,7 +1,7 @@
 PRGNAM="par"
 VERSION="1.52"
 HOMEPAGE="http://www.nicemice.net/par/"
-DOWNLOAD="http://www.nicemice.net/par/Par152.tar.gz"
+DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/Par152.tar.gz"
 MD5SUM="4ccacd824171ba2c2f14fb8aba78b9bf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/misc/par2cmdline-tbb/par2cmdline-tbb.info b/misc/par2cmdline-tbb/par2cmdline-tbb.info
index c008a9249c..0e9e317321 100644
--- a/misc/par2cmdline-tbb/par2cmdline-tbb.info
+++ b/misc/par2cmdline-tbb/par2cmdline-tbb.info
@@ -1,7 +1,7 @@
 PRGNAM="par2cmdline-tbb"
 VERSION="0.4_20141125"
 HOMEPAGE="http://chuchusoft.com/par2_tbb/"
-DOWNLOAD="http://chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-20141125.tar.gz"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/par2cmdline-0.4-tbb-20141125.tar.gz"
 MD5SUM="18fb0f866e4105bdf98883bd068529fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/misc/po4a/README b/misc/po4a/README
index e560c89996..d02b4b28ad 100644
--- a/misc/po4a/README
+++ b/misc/po4a/README
@@ -4,8 +4,8 @@ po4a (PO for anything) eases translations and their maintenance,
 allowing gettext's usage on unexpected areas like documentation.
 
 In po4a each documentation format is handled by a module, that
-converts this format to/from PO. Formats included in po4a-0.45 are:
-BibTex, Dia, Halibut, KernelHelp, LaTeX, Man, POD, SGML, TeX,
+converts this format to/from PO. Formats included in po4a-0.47 are:
+AsciiDoc, BibTex, Dia, Halibut, KernelHelp, LaTeX, Man, POD, SGML, TeX,
 Texinfo, Text, WML, XHTML, XML.
 
 man pages are encoded in UTF-8. To read them in other languages than English,
@@ -18,10 +18,9 @@ WARNING: run po4a.SlackBuild as root (su -) not with only root privileges
 Dependencies tree is as follows (all dependencies listed are available at
 http://slackbuilds.org).
 
-Po4a-0.45
+Po4a-0.47
 |
-|-- locale-gettext (included in Slackware 14.1), allows translation of
-|   po4a's own messages. Optional
+|-- perl-Module-Build
 |-- perl-term-ReadKey to retrieve the terminal's line width. Only used if
 |   perl-text-WrapI18N is available. Optional
 |-- perl-text-WrapI18N to format po4a's warnings and error messages. Optional.
diff --git a/misc/po4a/po4a.SlackBuild b/misc/po4a/po4a.SlackBuild
index 7f65abc741..f719763700 100644
--- a/misc/po4a/po4a.SlackBuild
+++ b/misc/po4a/po4a.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for perl-Unicode-LineBreak
+# Slackware build script for po4a
 
-# Copyright  2014 Didier Spaier Paris, France
+# Copyright  2014,2015 Didier Spaier Paris, France
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,8 +28,8 @@
 #          LC_ALL=en_US.utf8 ./po4a.SlackBuild
 
 PRGNAM=po4a
-VERSION=${VERSION:-0.45}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.47}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
@@ -89,10 +89,8 @@ perl Build.PL \
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cp -rf $PKG/usr/share/man $PKG/usr
-rm -rf $PKG/usr/share/man
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+mv $PKG/usr/share/man/ $PKG/usr/
+# All man pages are already gzipped.
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
diff --git a/misc/po4a/po4a.info b/misc/po4a/po4a.info
index 066bafc79d..13fa48cacc 100644
--- a/misc/po4a/po4a.info
+++ b/misc/po4a/po4a.info
@@ -1,10 +1,10 @@
 PRGNAM="po4a"
-VERSION="0.45"
+VERSION="0.47"
 HOMEPAGE="http://po4a.alioth.debian.org/"
-DOWNLOAD="http://alioth.debian.org/frs/download.php/file/3942/po4a-0.45.tar.gz"
-MD5SUM="423bdf5c39f30e63a808b84c5d9d1899"
+DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"
+MD5SUM="fdbfe10c43c09bf1ea74ae91b5d82a96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README% perl-Unicode-LineBreak"
+REQUIRES="perl-Unicode-LineBreak perl-Module-Build"
 MAINTAINER="Didier Spaier"
-EMAIL="didier dot spaier at epsm dot fr"
+EMAIL="didier at slint dot fr"
diff --git a/misc/portecle/portecle.SlackBuild b/misc/portecle/portecle.SlackBuild
index 87fb74b988..0c3218abf8 100644
--- a/misc/portecle/portecle.SlackBuild
+++ b/misc/portecle/portecle.SlackBuild
@@ -5,7 +5,7 @@
 # Petr Kletecka petr@kle.cz <2013>
 
 PRGNAM=portecle
-VERSION=${VERSION:-1.7}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -26,10 +26,10 @@ unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/applications
 mv portecle.desktop $PKG/usr/share/applications/
diff --git a/misc/portecle/portecle.info b/misc/portecle/portecle.info
index 1d5824edba..3d028e1ff0 100644
--- a/misc/portecle/portecle.info
+++ b/misc/portecle/portecle.info
@@ -1,8 +1,8 @@
 PRGNAM="portecle"
-VERSION="1.7"
+VERSION="1.9"
 HOMEPAGE="http://portecle.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/portecle/portecle-1.7.zip"
-MD5SUM="c01754e2a298139f08fbb59d39d861df"
+DOWNLOAD="http://downloads.sourceforge.net/portecle/portecle-1.9.zip"
+MD5SUM="88ecd8a9d37cce8dd184193b76076c8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/misc/qtkeychain/qtkeychain.SlackBuild b/misc/qtkeychain/qtkeychain.SlackBuild
index 43d549c6d4..469eb16974 100644
--- a/misc/qtkeychain/qtkeychain.SlackBuild
+++ b/misc/qtkeychain/qtkeychain.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for qtkeychain
 
 # Copyright 2014 Donald Cooley La Porte, IN USA <dfc@warpmail.net>
+# Copyright 2016 Donald Cooley South Haven, IN USA <dfc@warpmail.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qtkeychain
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-0.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/qtkeychain/qtkeychain.info b/misc/qtkeychain/qtkeychain.info
index d97ecad2c2..2861c330fb 100644
--- a/misc/qtkeychain/qtkeychain.info
+++ b/misc/qtkeychain/qtkeychain.info
@@ -1,8 +1,8 @@
 PRGNAM="qtkeychain"
-VERSION="0.4.0"
+VERSION="0.5.0"
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DOWNLOAD="https://github.com/frankosterfeld/qtkeychain/archive/v0.4.0.tar.gz"
-MD5SUM="e4e48d8742a9fd2664425d58be236424"
+DOWNLOAD="https://github.com/frankosterfeld/qtkeychain/archive/v0.5.0.tar.gz"
+MD5SUM="ed813a5db320883c2cf34db16a72b2a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/rarcrack/README b/misc/rarcrack/README
new file mode 100644
index 0000000000..bb0ac4149c
--- /dev/null
+++ b/misc/rarcrack/README
@@ -0,0 +1,6 @@
+rarcrack (Password cracker for rar archives)
+
+rarcrack uses a brute force algorithm to guess your encrypted 
+compressed file's password.
+
+This program can crack zip, 7z and rar file passwords.
diff --git a/misc/rarcrack/rarcrack.SlackBuild b/misc/rarcrack/rarcrack.SlackBuild
new file mode 100644
index 0000000000..478bc75f7e
--- /dev/null
+++ b/misc/rarcrack/rarcrack.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+#
+# Slackware build script for rarcrack.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=rarcrack
+VERSION=${VERSION:-0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make prefix=/usr DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -d $PKG/usr/bin
+install -D -m755 rarcrack $PKG/usr/bin/rarcrack
+
+DOCS="CHANGELOG LICENSE README README.html RELEASE_NOTES"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/rarcrack/rarcrack.info b/misc/rarcrack/rarcrack.info
new file mode 100644
index 0000000000..80de5cceac
--- /dev/null
+++ b/misc/rarcrack/rarcrack.info
@@ -0,0 +1,10 @@
+PRGNAM="rarcrack"
+VERSION="0.2"
+HOMEPAGE="http://rarcrack.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/rarcrack/files/rarcrack-0.2/%5BUnnamed%20release%5D/rarcrack-0.2.tar.bz2"
+MD5SUM="62d0cf77c6c4edc7204305649f8b7362"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/misc/rarcrack/slack-desc b/misc/rarcrack/slack-desc
new file mode 100644
index 0000000000..5d150c6268
--- /dev/null
+++ b/misc/rarcrack/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+rarcrack: rarcrack (Password cracker for rar archives)
+rarcrack:
+rarcrack: rarcrack uses a brute force algorithm to guess your encrypted 
+rarcrack: compressed file's password.
+rarcrack:
+rarcrack: This program can crack zip, 7z and rar file passwords.
+rarcrack:
+rarcrack: Home page: http://rarcrack.sourceforge.net/
+rarcrack:
+rarcrack:
+rarcrack:
diff --git a/misc/sigrok-firmware-fx2lafw/README b/misc/sigrok-firmware-fx2lafw/README
new file mode 100644
index 0000000000..3dce275cd7
--- /dev/null
+++ b/misc/sigrok-firmware-fx2lafw/README
@@ -0,0 +1,4 @@
+fx2lafw is an open-source firmware for Cypress FX2 chips which makes them
+usable as simple logic analyzer hardware. The fx2lafw firmware is meant to
+work on any FX2-based hardware, including logic analyzers, FX2 eval boards,
+or other hardware which has this chip on-board.
diff --git a/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild
new file mode 100644
index 0000000000..2f6e98b9e7
--- /dev/null
+++ b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Slackware build script for sigrok fx2lafw firmware
+
+# Copyright 2015 Andrzej Telszewski, Sabadell
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=sigrok-firmware-fx2lafw
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./configure --prefix=/usr
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING{,.LESSER} INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info
new file mode 100644
index 0000000000..845d615f37
--- /dev/null
+++ b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info
@@ -0,0 +1,10 @@
+PRGNAM="sigrok-firmware-fx2lafw"
+VERSION="0.1.3"
+HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
+DOWNLOAD="http://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.tar.gz"
+MD5SUM="987afc07437742c3e6a98e80fdf511dd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="sdcc"
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/misc/sigrok-firmware-fx2lafw/slack-desc b/misc/sigrok-firmware-fx2lafw/slack-desc
new file mode 100644
index 0000000000..f3ee8cea83
--- /dev/null
+++ b/misc/sigrok-firmware-fx2lafw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                       |-----handy-ruler------------------------------------------------------|
+sigrok-firmware-fx2lafw: sigrok-firmware-fx2lafw (logic analyzer firmware for Cypress FX2)
+sigrok-firmware-fx2lafw:
+sigrok-firmware-fx2lafw: fx2lafw is an open-source firmware for Cypress FX2 chips which makes
+sigrok-firmware-fx2lafw: them usable as simple logic analyzer hardware. The firmware is meant
+sigrok-firmware-fx2lafw: to work on any FX2-based hardware, including logic analyzers, FX2
+sigrok-firmware-fx2lafw: eval boards, or other hardware which has this chip on-board.
+sigrok-firmware-fx2lafw:
+sigrok-firmware-fx2lafw:
+sigrok-firmware-fx2lafw:
+sigrok-firmware-fx2lafw: Homepage: http://sigrok.org/wiki/Fx2lafw
+sigrok-firmware-fx2lafw:
diff --git a/misc/subsurface/libgit2-0.23.x.patch b/misc/subsurface/libgit2-0.23.x.patch
new file mode 100644
index 0000000000..2765cfc861
--- /dev/null
+++ b/misc/subsurface/libgit2-0.23.x.patch
@@ -0,0 +1,37 @@
+From 95664af53bc6faf352cf5b193fe9dfd42fa25e60 Mon Sep 17 00:00:00 2001
+From: Dirk Hohndel <dirk@hohndel.org>
+Date: Thu, 28 May 2015 09:13:51 -0700
+Subject: [PATCH] Add libgit2 0.23 API
+
+Just as we would expect, the libgit2 developers of course once again broke
+their API. In order to compile against current master we need to remap
+those APIs once again.
+
+Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
+---
+ save-git.c     |  9 +++++++++
+ 1 files changed,  9 insertions(+)
+
+diff --git a/save-git.c b/save-git.c
+index a7b5144..6461366 100644
+--- a/save-git.c
++++ b/save-git.c
+@@ -34,6 +34,15 @@
+ #else
+   #define git_treebuilder_write(id, repo, bld)   git_treebuilder_write(id, bld)
+ #endif
++/*
++ * api break introduced in libgit2 master after 0.22 - let's guess this is the v0.23 API
++ */
++#if LIBGIT2_VER_MINOR >= 23
++  #define git_branch_create(out, repo, branch_name, target, force, signature, log_message) \
++	git_branch_create(out, repo, branch_name, target, force)
++  #define git_reference_set_target(out, ref, id, author, log_message) \
++	git_reference_set_target(out, ref, id, log_message)
++#endif
+ 
+ #define VA_BUF(b, fmt) do { va_list args; va_start(args, fmt); put_vformat(b, fmt, args); va_end(args); } while (0)
+ 
+-- 
+1.9.1
+
diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild
index 20bc7977d6..d3c07d9312 100644
--- a/misc/subsurface/subsurface.SlackBuild
+++ b/misc/subsurface/subsurface.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=subsurface
 SRCNAM=Subsurface
 VERSION=${VERSION:-4.4.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -74,6 +74,8 @@ find -L . \
 sed -i '/MANDIR =/s|=.*|= /usr/man/man1|' $PRGNAM-install.pri
 # Build with Qt4.
 patch -p1 < packaging/ubuntu/0001-Make-build-with-Qt4.patch
+# Build with newer libgit2.
+patch -Np1 < $CWD/libgit2-0.23.x.patch
 
 qmake PREFX="/usr" QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
   V=1 -config release -o Makefile $PRGNAM.pro
diff --git a/misc/tegaki-zinnia-japanese/README b/misc/tegaki-zinnia-japanese/README
new file mode 100644
index 0000000000..676c61fa05
--- /dev/null
+++ b/misc/tegaki-zinnia-japanese/README
@@ -0,0 +1,3 @@
+tegaki-zinnia-japanese is a data model for Zinnia.
+Zinnia is a simple, customizable and portable online hand recognition
+system based on Support Vector Machines.
diff --git a/misc/tegaki-zinnia-japanese/slack-desc b/misc/tegaki-zinnia-japanese/slack-desc
new file mode 100644
index 0000000000..69fa1d5db3
--- /dev/null
+++ b/misc/tegaki-zinnia-japanese/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+tegaki-zinnia-japanese: tegaki-zinnia-japanese (Japanese handwriting model for Zinnia)
+tegaki-zinnia-japanese:
+tegaki-zinnia-japanese: tegaki-zinnia-japanese is a data model for Zinnia.
+tegaki-zinnia-japanese: Zinnia is a simple, customizable and portable online hand recognition
+tegaki-zinnia-japanese: system based on Support Vector Machines.
+tegaki-zinnia-japanese:
+tegaki-zinnia-japanese: Homepage: http://www.tegaki.org
+tegaki-zinnia-japanese:
+tegaki-zinnia-japanese:
+tegaki-zinnia-japanese:
+tegaki-zinnia-japanese:
diff --git a/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild b/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild
new file mode 100644
index 0000000000..5207ceb627
--- /dev/null
+++ b/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for tegaki-zinnia-japanese
+# Issued under The MIT License (MIT)
+#
+# Copyright 2015 Kuro_CODE25
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+PRGNAM=tegaki-zinnia-japanese
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+#prepare
+sed -i 's|installpath=/usr/local/|installpath=/tmp/SBo/package-tegaki-zinnia-japanese/usr/|g' \
+	./Makefile
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING VERSION README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.info b/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.info
new file mode 100644
index 0000000000..2f1e61b639
--- /dev/null
+++ b/misc/tegaki-zinnia-japanese/tegaki-zinnia-japanese.info
@@ -0,0 +1,10 @@
+PRGNAM="tegaki-zinnia-japanese"
+VERSION="0.3"
+HOMEPAGE="http://www.tegaki.org"
+DOWNLOAD="http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip"
+MD5SUM="19c2ed9e770c23016f788b06ade41f95"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Kuro_CODE25"
+EMAIL="kuro.code25@gmail.com"
diff --git a/misc/wcd/wcd.SlackBuild b/misc/wcd/wcd.SlackBuild
index 60467b259b..76b9a634b2 100644
--- a/misc/wcd/wcd.SlackBuild
+++ b/misc/wcd/wcd.SlackBuild
@@ -1,12 +1,11 @@
 #!/bin/sh
-
 # Slackware build script for wcd
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -20,10 +19,10 @@
 
 # You may have received a copy of the GNU General Public License along
 # with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
+# <https://www.gnu.org/licenses/>.
 
 PRGNAM=wcd
-VERSION=${VERSION:-5.2.7}
+VERSION=${VERSION:-5.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,9 +50,9 @@ cd $PRGNAM-$VERSION/src
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
diff --git a/misc/wcd/wcd.info b/misc/wcd/wcd.info
index 3677115149..37506250b6 100644
--- a/misc/wcd/wcd.info
+++ b/misc/wcd/wcd.info
@@ -1,8 +1,8 @@
 PRGNAM="wcd"
-VERSION="5.2.7"
+VERSION="5.3.1"
 HOMEPAGE="http://waterlan.home.xs4all.nl/"
-DOWNLOAD="http://waterlan.home.xs4all.nl/wcd/wcd-5.2.7.tar.gz"
-MD5SUM="cd55fecd9ad83c74db1f8953dfb2e167"
+DOWNLOAD="http://waterlan.home.xs4all.nl/wcd/wcd-5.3.1.tar.gz"
+MD5SUM="f7146975bd5729cff223f4c5500759e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/xca/xca.SlackBuild b/misc/xca/xca.SlackBuild
index c55ce0f803..c51955db3f 100644
--- a/misc/xca/xca.SlackBuild
+++ b/misc/xca/xca.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xca
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/xca/xca.info b/misc/xca/xca.info
index d6f15dee6f..e6abb942f5 100644
--- a/misc/xca/xca.info
+++ b/misc/xca/xca.info
@@ -1,8 +1,8 @@
 PRGNAM="xca"
-VERSION="1.2.0"
+VERSION="1.3.0"
 HOMEPAGE="http://xca.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/xca/files/xca/1.2.0/xca-1.2.0.tar.gz"
-MD5SUM="c5c9ac3ab981f898c88a2eae37fd5e55"
+DOWNLOAD="http://sourceforge.net/projects/xca/files/xca/1.3.0/xca-1.3.0.tar.gz"
+MD5SUM="2add077edc5ae77f1ba976974cf8967b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/xcape/xcape.SlackBuild b/misc/xcape/xcape.SlackBuild
index ab6ccf6fa3..abdc1770da 100644
--- a/misc/xcape/xcape.SlackBuild
+++ b/misc/xcape/xcape.SlackBuild
@@ -46,7 +46,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/misc/ykpers/ykpers.SlackBuild b/misc/ykpers/ykpers.SlackBuild
index 00084febe3..7b8e8c1574 100644
--- a/misc/ykpers/ykpers.SlackBuild
+++ b/misc/ykpers/ykpers.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ykpers
-VERSION=${VERSION:-1.17.1}
+VERSION=${VERSION:-1.17.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/ykpers/ykpers.info b/misc/ykpers/ykpers.info
index 74f43c9b78..2cc4cf4101 100644
--- a/misc/ykpers/ykpers.info
+++ b/misc/ykpers/ykpers.info
@@ -1,8 +1,8 @@
 PRGNAM="ykpers"
-VERSION="1.17.1"
+VERSION="1.17.2"
 HOMEPAGE="https://developers.yubico.com/yubikey-personalization/"
-DOWNLOAD="https://developers.yubico.com/yubikey-personalization/releases/ykpers-1.17.1.tar.gz"
-MD5SUM="78b34e35d43482f95495773271d92ed1"
+DOWNLOAD="https://developers.yubico.com/yubikey-personalization/releases/ykpers-1.17.2.tar.gz"
+MD5SUM="c76de9624ad04094eb2aaeec10ea8c41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libyubikey"
diff --git a/misc/yubikey-personalization-gui/yubikey-personalization-gui.SlackBuild b/misc/yubikey-personalization-gui/yubikey-personalization-gui.SlackBuild
index 0c39c485f7..16b2b79f0e 100644
--- a/misc/yubikey-personalization-gui/yubikey-personalization-gui.SlackBuild
+++ b/misc/yubikey-personalization-gui/yubikey-personalization-gui.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yubikey-personalization-gui
-VERSION=${VERSION:-3.1.21}
+VERSION=${VERSION:-3.1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/misc/yubikey-personalization-gui/yubikey-personalization-gui.info b/misc/yubikey-personalization-gui/yubikey-personalization-gui.info
index 2433c5a3d8..27866f837b 100644
--- a/misc/yubikey-personalization-gui/yubikey-personalization-gui.info
+++ b/misc/yubikey-personalization-gui/yubikey-personalization-gui.info
@@ -1,8 +1,8 @@
 PRGNAM="yubikey-personalization-gui"
-VERSION="3.1.21"
+VERSION="3.1.23"
 HOMEPAGE="https://developers.yubico.com/yubikey-personalization-gui/"
-DOWNLOAD="https://developers.yubico.com/yubikey-personalization-gui/releases/yubikey-personalization-gui-3.1.21.tar.gz"
-MD5SUM="e9232d1d08d310ce5bd604aefcff6c42"
+DOWNLOAD="https://developers.yubico.com/yubikey-personalization-gui/releases/yubikey-personalization-gui-3.1.23.tar.gz"
+MD5SUM="579477bf366208e95ccb3f5307cf2231"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ykpers"
diff --git a/misc/zinnia/README b/misc/zinnia/README
new file mode 100644
index 0000000000..71fee5f3ff
--- /dev/null
+++ b/misc/zinnia/README
@@ -0,0 +1,2 @@
+Zinnia is a simple, customizable and portable online hand recognition
+system based on Support Vector Machines.
diff --git a/misc/zinnia/doinst.sh b/misc/zinnia/doinst.sh
new file mode 100644
index 0000000000..d2a441427c
--- /dev/null
+++ b/misc/zinnia/doinst.sh
@@ -0,0 +1,4 @@
+( cd usr/lib ; rm -rf libzinnia.so )
+( cd usr/lib ; ln -sf libzinnia.so.0.0.0 libzinnia.so )
+( cd usr/lib ; rm -rf libzinnia.so.0 )
+( cd usr/lib ; ln -sf libzinnia.so.0.0.0 libzinnia.so.0 )
diff --git a/misc/zinnia/slack-desc b/misc/zinnia/slack-desc
new file mode 100644
index 0000000000..ada6de39fc
--- /dev/null
+++ b/misc/zinnia/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+zinnia: zinnia(customizable and portable online hand recognition system)
+zinnia:
+zinnia: Zinnia is a simple, customizable and portable online hand recognition 
+zinnia: system based on Support Vector Machines.
+zinnia:
+zinnia: Homepage: http://taku910.github.io/zinnia/index.html
+zinnia:
+zinnia:
+zinnia:
+zinnia:
+zinnia:
diff --git a/misc/zinnia/zinnia.SlackBuild b/misc/zinnia/zinnia.SlackBuild
new file mode 100644
index 0000000000..8e6c7402c8
--- /dev/null
+++ b/misc/zinnia/zinnia.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for zinnia
+# Issued under The MIT License (MIT)
+#
+# Copyright 2015 Kuro_CODE25
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+PRGNAM=zinnia
+VERSION=${VERSION:-0.06}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/zinnia/zinnia.info b/misc/zinnia/zinnia.info
new file mode 100644
index 0000000000..498e01d35a
--- /dev/null
+++ b/misc/zinnia/zinnia.info
@@ -0,0 +1,10 @@
+PRGNAM="zinnia"
+VERSION="0.06"
+HOMEPAGE="http://taku910.github.io/zinnia/index.html"
+DOWNLOAD="http://downloads.sourceforge.net/project/zinnia/zinnia/0.06/zinnia-0.06.tar.gz"
+MD5SUM="5ed6213e2b879465783087a0cf6d5fa0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Kuro_CODE25"
+EMAIL="kuro.code25@gmail.com"
diff --git a/multimedia/ExMplayer/ExMplayer.SlackBuild b/multimedia/ExMplayer/ExMplayer.SlackBuild
new file mode 100644
index 0000000000..5c2bbdc6d1
--- /dev/null
+++ b/multimedia/ExMplayer/ExMplayer.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# Slackware build script for ExMPlayer.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ExMplayer
+VERSION=${VERSION:-5.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="exmplayer"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${SRCNAM}_$VERSION.tar.gz
+mv $PRGNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+make
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -Dm755 src/exmplayer $PKG/usr/bin/exmplayer
+
+install -dm755 $PKG/usr/share/{applications,pixmaps}
+install -m644 exmplayer.desktop exmplayer_enqueue.desktop $PKG/usr/share/applications
+install -Dm644 debian/exmplayer.png $PKG/usr/share/pixmaps/exmplayer.png
+
+install -dm755 $PKG/etc/exmplayer
+install -m644 linux_build/{sc_default.xml,fmts} $PKG/etc/exmplayer
+
+# to receive installed ffmpeg link (not a internal copy).
+install -dm755 $PKG/usr/share/exmplayer
+
+(
+ln -s /usr/bin/ffmpeg $PKG/usr/share/exmplayer/ffmpeg
+)
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/copyright README.md Release_notes.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/ExMplayer/ExMplayer.info b/multimedia/ExMplayer/ExMplayer.info
new file mode 100644
index 0000000000..f8a079f1b6
--- /dev/null
+++ b/multimedia/ExMplayer/ExMplayer.info
@@ -0,0 +1,10 @@
+PRGNAM="ExMplayer"
+VERSION="5.0.1"
+HOMEPAGE="http://exmplayer.sourceforge.net/index.html"
+DOWNLOAD="https://launchpad.net/~exmplayer-dev/+archive/ubuntu/exmplayer/+files/exmplayer_5.0.1.tar.gz"
+MD5SUM="e432230bdaffde582c9d002d12eaa424"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ffmpeg"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/multimedia/ExMplayer/README b/multimedia/ExMplayer/README
new file mode 100644
index 0000000000..d7ce6eecc4
--- /dev/null
+++ b/multimedia/ExMplayer/README
@@ -0,0 +1,31 @@
+ExMplayer (Free media player for windows and linux)
+
+ExMplayer (Extended MPlayer) is a GUI front-end for MPlayer with flow view and tool like media cutter. It can play audio, video, dvd files (.vob), vcd, files(.mpg,.dat) etc and supports network streaming. It supports subtitles, subtitle decoding is done by using ass library.
+It can play any media formats without any external codecs.
+
+ExMplayer Play any media files, convert, extract, animate and more.
+
+Features:
+ * 3D video playback support 
+ * Volume booster 
+ * Seekview 
+ * Audio extractor
+ * Audio converter
+ * Media cutter
+ * Movie Animator
+ * 10 band audio equalizer
+ * video equalizer
+ * Winamp dsp plugins support
+ * 8 Audio effect filters
+ * 17 Video effect filters
+ * Configurable keyboard shortcuts and mouse
+ * Play any files with out any codec,199 audio and 416 video built-in external codecs.So ExMplayer can play any media format.Supports network streaming and subtitles.
+ * Want to convert audio file ? here is it easy to use audio converter.ExMplayer audio converter supports more than 10 different audio file format conversions.
+ * Do you want to extract audio from video files? Hmm...here is it ExMplayer Audio Extractor,easy to use interface.High quality audio extraction without losing audio quality.
+ * Download video/audio from YouTube,facebook,dailymotion,metacafe and more
+ * Subtitle search enables to find movie subtitles very easily.Subtitle uploading also supported.Service provided by opensubtitles.org.
+ * Easy tool for extracting audio from your video files!
+ * Convert audio files to different formats (more than 10 popular formats)
+ * Cut your media file (Audio /video files ) using media cutter.Media quality preserved.
+
+Optional dependencie: youtube-dl
diff --git a/multimedia/ExMplayer/doinst.sh b/multimedia/ExMplayer/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/multimedia/ExMplayer/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/multimedia/ExMplayer/slack-desc b/multimedia/ExMplayer/slack-desc
new file mode 100644
index 0000000000..f3439759b3
--- /dev/null
+++ b/multimedia/ExMplayer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+ExMplayer: ExMplayer (Free media player for windows and linux)
+ExMplayer:
+ExMplayer: ExMplayer (Extended MPlayer) is a GUI front-end for MPlayer with flow 
+ExMplayer: view and tool like media cutter. It can play audio, video, dvd files
+ExMplayer: (.vob), vcd, files(.mpg,.dat) etc and supports network streaming. It
+ExMplayer: supports subtitles, subtitle decoding is done by using ass library.
+ExMplayer: It can play any media formats without any external codecs.
+ExMplayer:
+ExMplayer: ExMplayer Play any media files, convert, extract, animate and more.
+ExMplayer:
+ExMplayer: Home page: http://exmplayer.sourceforge.net/index.html
diff --git a/multimedia/HandBrake/HandBrake.info b/multimedia/HandBrake/HandBrake.info
index 51f078b576..c1ce2baf6a 100644
--- a/multimedia/HandBrake/HandBrake.info
+++ b/multimedia/HandBrake/HandBrake.info
@@ -1,7 +1,7 @@
 PRGNAM="HandBrake"
 VERSION="0.9.9"
 HOMEPAGE="http://handbrake.fr/"
-DOWNLOAD="http://downloads.sourceforge.net/project/handbrake/0.9.9/HandBrake-0.9.9.tar.bz2 \
+DOWNLOAD="http://download.handbrake.fr/releases/0.9.9/HandBrake-0.9.9.tar.bz2 \
           http://download.m0k.org/handbrake/contrib/a52dec-0.7.4.tar.gz \
           http://download.handbrake.fr/handbrake/contrib/bzip2-1.0.6.tar.gz \
           http://download.m0k.org/handbrake/contrib/faac-1.28.tar.gz \
diff --git a/multimedia/Mopidy/Mopidy.SlackBuild b/multimedia/Mopidy/Mopidy.SlackBuild
index eb05287e41..97c2c50a55 100644
--- a/multimedia/Mopidy/Mopidy.SlackBuild
+++ b/multimedia/Mopidy/Mopidy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Mopidy
-VERSION=${VERSION:-1.0.8}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/Mopidy/Mopidy.info b/multimedia/Mopidy/Mopidy.info
index e6d92c532e..c1c5ab0f58 100644
--- a/multimedia/Mopidy/Mopidy.info
+++ b/multimedia/Mopidy/Mopidy.info
@@ -1,10 +1,10 @@
 PRGNAM="Mopidy"
-VERSION="1.0.8"
+VERSION="1.1.1"
 HOMEPAGE="http://www.mopidy.com/"
-DOWNLOAD="https://pypi.python.org/packages/source/M/Mopidy/Mopidy-1.0.8.tar.gz"
-MD5SUM="90ec47ff53220887305dbf98877d022b"
+DOWNLOAD="https://pypi.python.org/packages/source/M/Mopidy/Mopidy-1.1.1.tar.gz"
+MD5SUM="4e20626c08bf5385d4567075116c93ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Pykka gst-python tornado"
+REQUIRES="Pykka gst-python tornado python-certifi python-requests"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/multimedia/TeamSpeak3/TeamSpeak3.SlackBuild b/multimedia/TeamSpeak3/TeamSpeak3.SlackBuild
index 0a12b22fe4..c49aa8ece6 100644
--- a/multimedia/TeamSpeak3/TeamSpeak3.SlackBuild
+++ b/multimedia/TeamSpeak3/TeamSpeak3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for TeamSpeak3
 
-# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=TeamSpeak3
-VERSION=${VERSION:-3.0.16}
+VERSION=${VERSION:-3.0.18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,7 @@ install -D -m 0644 $CWD/TeamSpeak3.xpm $PKG/usr/share/pixmaps/TeamSpeak3.xpm
 install -D -m 0755 $CWD/TeamSpeak3.launcher $PKG/usr/bin/TeamSpeak3
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/TeamSpeak3/{CHANGELOG,LICENSE} $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/TeamSpeak3/CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/TeamSpeak3/TeamSpeak3.info b/multimedia/TeamSpeak3/TeamSpeak3.info
index 242244c5ac..e8e3e7f61a 100644
--- a/multimedia/TeamSpeak3/TeamSpeak3.info
+++ b/multimedia/TeamSpeak3/TeamSpeak3.info
@@ -1,10 +1,10 @@
 PRGNAM="TeamSpeak3"
-VERSION="3.0.16"
+VERSION="3.0.18.2"
 HOMEPAGE="http://www.teamspeak.com/"
-DOWNLOAD="http://dl.4players.de/ts/releases/3.0.16/TeamSpeak3-Client-linux_x86-3.0.16.run"
-MD5SUM="3f87081afc857bd540575d5f9c82c815"
-DOWNLOAD_x86_64="http://dl.4players.de/ts/releases/3.0.16/TeamSpeak3-Client-linux_amd64-3.0.16.run"
-MD5SUM_x86_64="3eb6b02a7e22162a5ae3b36434c00f02"
+DOWNLOAD="http://dl.4players.de/ts/releases/3.0.18.2/TeamSpeak3-Client-linux_x86-3.0.18.2.run"
+MD5SUM="0b2cac6cfc63a52897fc0e5d37fa991c"
+DOWNLOAD_x86_64="http://dl.4players.de/ts/releases/3.0.18.2/TeamSpeak3-Client-linux_amd64-3.0.18.2.run"
+MD5SUM_x86_64="129b9968cd9a26eef22e001534ae5f6f"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild
index 250536d98a..04fcb2a83a 100644
--- a/multimedia/aegisub/aegisub.SlackBuild
+++ b/multimedia/aegisub/aegisub.SlackBuild
@@ -22,7 +22,7 @@
 
 PRGNAM=aegisub
 VERSION=${VERSION:-3.2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 MVER=3.2
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile
+
 LDFLAGS="$LDFLAGS -lz" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/bdtools/README b/multimedia/bdtools/README
new file mode 100644
index 0000000000..126c9bf57d
--- /dev/null
+++ b/multimedia/bdtools/README
@@ -0,0 +1 @@
+Blu-ray disc utilities.
diff --git a/multimedia/bdtools/bdtools.SlackBuild b/multimedia/bdtools/bdtools.SlackBuild
new file mode 100644
index 0000000000..8028a4b3b2
--- /dev/null
+++ b/multimedia/bdtools/bdtools.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for "bdtools".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=bdtools
+VERSION=${VERSION:-1.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -rf $PKG/usr/share/doc/gtt
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/bdtools/bdtools.info b/multimedia/bdtools/bdtools.info
new file mode 100644
index 0000000000..cb57076e81
--- /dev/null
+++ b/multimedia/bdtools/bdtools.info
@@ -0,0 +1,10 @@
+PRGNAM="bdtools"
+VERSION="1.5"
+HOMEPAGE="http://www.stebbins.biz/source/"
+DOWNLOAD="http://www.stebbins.biz/source/bdtools-1.5.tgz"
+MD5SUM="cf3c6fb5a54379a526940866b419b517"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/multimedia/bdtools/slack-desc b/multimedia/bdtools/slack-desc
new file mode 100644
index 0000000000..03df900f74
--- /dev/null
+++ b/multimedia/bdtools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+bdtools: bdtools (Blu-ray disc utilities)
+bdtools:
+bdtools: Blu-ray disc utilities.
+bdtools:
+bdtools: Homepage: http://www.stebbins.biz/source/
+bdtools:
+bdtools:
+bdtools:
+bdtools:
+bdtools:
+bdtools:
diff --git a/multimedia/beets/beets.SlackBuild b/multimedia/beets/beets.SlackBuild
index faa18af358..e80c9bd369 100644
--- a/multimedia/beets/beets.SlackBuild
+++ b/multimedia/beets/beets.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for beets
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=beets
-VERSION=${VERSION:-1.3.13}
+VERSION=${VERSION:-1.3.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/beets/beets.info b/multimedia/beets/beets.info
index 32ba1f0615..71df5f0454 100644
--- a/multimedia/beets/beets.info
+++ b/multimedia/beets/beets.info
@@ -1,8 +1,8 @@
 PRGNAM="beets"
-VERSION="1.3.13"
+VERSION="1.3.16"
 HOMEPAGE="http://beets.radbox.org"
-DOWNLOAD="https://pypi.python.org/packages/source/b/beets/beets-1.3.13.tar.gz"
-MD5SUM="3cbb0426906a0556fbb14f53b5273011"
+DOWNLOAD="https://pypi.python.org/packages/source/b/beets/beets-1.3.16.tar.gz"
+MD5SUM="5517e4481127919c2a74a799e95c6449"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mutagen munkres Unidecode musicbrainzngs PyYAML enum34 jellyfish"
diff --git a/multimedia/bino/README b/multimedia/bino/README
new file mode 100644
index 0000000000..746bf919ef
--- /dev/null
+++ b/multimedia/bino/README
@@ -0,0 +1,24 @@
+ bino (3D video player)
+
+Bino is a 3D video player with multi-display support.
+
+3D videos are more accurately called stereoscopic videos. Such videos 
+have separate views for the left and right eye and thus allow depth 
+perception through stereopsis.
+The left and right view of a stereoscopic video can be stored using 
+different layouts. Bino supports all commonly used layouts.
+
+Requirements:
+ - libGLEW with mx support
+
+glew.SlackBuild fix:
+----------------------------------------------------------
+# patch wrong multiple definitions for compiling bino
+patch -p1 < $CWD/glewexport.patch
+
+make install.all GLEW_DEST=$PKG/usr || exit 1
+----------------------------------------------------------
+
+Notes: The glew-1.9.0 needs to be rebuild with install.all for install
+libGLEWmx. For compiling bino with glew-1.9.0 is required a patch "glewexport.patch".
+The glew-1.10.0 compiles without problems.
diff --git a/multimedia/bino/bino.SlackBuild b/multimedia/bino/bino.SlackBuild
new file mode 100644
index 0000000000..5945b4274f
--- /dev/null
+++ b/multimedia/bino/bino.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for bino3d
+
+# Copyright 2015 Guilherme Calandrini, Madrid, Spain
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=bino
+VERSION=${VERSION:-1.6.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --without-equalizer \
+  --without-liblircclient \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+rm -Rf $PKG/usr/info/dir $PKG/usr/share/info
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/bino/bino.info b/multimedia/bino/bino.info
new file mode 100644
index 0000000000..e195d2e51c
--- /dev/null
+++ b/multimedia/bino/bino.info
@@ -0,0 +1,10 @@
+PRGNAM="bino"
+VERSION="1.6.1"
+HOMEPAGE="http://bino3d.org"
+DOWNLOAD="http://download.savannah.nongnu.org/releases/bino/bino-1.6.1.tar.xz"
+MD5SUM="59471d7eb3b6981a1e610f96a12ff47c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README% ffmpeg freealut libass"
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini@hotmail.es"
diff --git a/multimedia/bino/glewexport.patch b/multimedia/bino/glewexport.patch
new file mode 100644
index 0000000000..a85c4666ae
--- /dev/null
+++ b/multimedia/bino/glewexport.patch
@@ -0,0 +1,13 @@
+diff -up glew-1.9.0/include/GL/glxew.h.orig glew-1.9.0/include/GL/glxew.h
+--- glew-1.9.0/include/GL/glxew.h.orig	2012-08-06 17:59:08.000000000 +0200
++++ glew-1.9.0/include/GL/glxew.h	2013-05-23 17:29:09.712473195 +0200
+@@ -1393,7 +1393,7 @@ typedef int ( * PFNGLXVIDEORESIZESUNPROC
+ /* ------------------------------------------------------------------------- */
+ 
+ #ifdef GLEW_MX
+-#define GLXEW_FUN_EXPORT
++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+ #define GLXEW_VAR_EXPORT
+ #else
+ #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT
+
diff --git a/multimedia/bino/slack-desc b/multimedia/bino/slack-desc
new file mode 100644
index 0000000000..5fbdd2c990
--- /dev/null
+++ b/multimedia/bino/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+bino: bino (3D video player)
+bino:
+bino: Bino is a 3D video player with multi-display support.
+bino:
+bino: 3D videos are more accurately called stereoscopic videos. Such videos
+bino: have separate views for the left and right eye and thus allow depth
+bino: perception through stereopsis.
+bino: The left and right view of a stereoscopic video can be stored using
+bino: different layouts. Bino supports all commonly used layouts.
+bino:
+bino:
diff --git a/multimedia/cinelerra/README b/multimedia/cinelerra/README
index 729b141a32..6aef88e053 100644
--- a/multimedia/cinelerra/README
+++ b/multimedia/cinelerra/README
@@ -1,8 +1,10 @@
-Cinelerra is the most advanced non-linear video editor and compositor
-for Linux.   It does primarily 3 main things: capturing, compositing,
+Cinelerra CV is the most advanced non-linear video editor and compositor
+for Linux. It does primarily 3 main things: capturing, compositing,
 and editing audio and video with sample level accuracy.
 
-This is a development version maintained by official git cinelerra-cv:
-http://git.cinelerra.org/gitweb?p=j6t/cinelerra.git;a=summary
-This build script uses a git snapshot that was downloaded and hosted
-by the script maintainer.
+NOTE:
+Patches for ffmpeg-2.x from the official website are included in this SlackBuild.
+These patches work for the most part, but in various cases (like loading multiple DNxHD files)
+they make the program very unstable.
+
+If you still want to build with ffmpeg-2.x, pass "EXTERNALFFMPEG=yes" to the commandline.
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index 9642f9a0bb..de42bbd6b5 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cinelerra
 
-# Copyright 2011 by Giovanne Castro, Campinas, Sao Paulo, Brazil <giovannefc@ig.com.br>
+# Copyright 2015 by Danny Schmarsel <danny@schmarsel.de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cinelerra
-VERSION=${VERSION:-cv_2.2}
+VERSION=${VERSION:-cv_2.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -60,24 +60,39 @@ else
   mmx="--enable-mmx"
 fi
 
+# Patches for ffmpeg-2.x exist on the official website.
+# While testing, the patches work for the most part, but
+# in various cases (like loading multiple DNxHD files)
+# they make the program very unstable.
+# Defaulting to internal ffmpeg because of this.
+EXTERNALFFMPEG=${EXTERNALFFMPEG:-no}
+
+if [ "$EXTERNALFFMPEG" = "no" ]; then
+  externalffmpeg=""
+elif [ "$EXTERNALFFMPEG" = "yes" ]; then
+  externalffmpeg="--with-external-ffmpeg"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM
+rm -rf CinelerraCV-2.3
+tar xvf $CWD/CinelerraCV-2.3.tar.xz
+cd CinelerraCV-2.3
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Patches (from gentoo repository)
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if [ "$EXTERNALFFMPEG" = "yes" ]; then
+# Patches (from the official website) for compatibility with ffmpeg-2.x
+patch -p1 < $CWD/patches/cinelerra-cv-ffmpeg_api2.2.patch
+patch -p1 < $CWD/patches/cinelerra-cv-ffmpeg2.0.patch
+fi
 
 ./autogen.sh
 
@@ -96,7 +111,7 @@ CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
   --with-x \
   --enable-opengl \
   --build=$ARCH-slackware-linux \
-  --with-external-ffmpeg \
+  $externalffmpeg \
   $mmx
 
 make
@@ -106,8 +121,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README* TODO \
+cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README* TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info
index 67302dd042..e4a86572cb 100644
--- a/multimedia/cinelerra/cinelerra.info
+++ b/multimedia/cinelerra/cinelerra.info
@@ -1,10 +1,10 @@
 PRGNAM="cinelerra"
-VERSION="cv_2.2"
-HOMEPAGE="http://cinelerra.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-cv_2.2.tar.xz"
-MD5SUM="b13dafcdcbf75264ff136f5a17d1ac82"
+VERSION="cv_2.3"
+HOMEPAGE="http://cinelerra-cv.org/"
+DOWNLOAD="http://www.cinelerra-cv.org/releases/CinelerraCV-2.3.tar.xz"
+MD5SUM="a1e7bfaf9827f74900d58d25955bdf3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="a52dec faac faad2 ffmpeg imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264"
-MAINTAINER="Giovanne Castro"
-EMAIL="giovannefc@ig.com.br"
+REQUIRES="a52dec faac faad2 imlib2 libavc1394 libdv libiec61883 mjpegtools lame x264"
+MAINTAINER="Danny Schmarsel"
+EMAIL="danny@schmarsel.de"
diff --git a/multimedia/cinelerra/patches/01-cinelerra-entry.patch b/multimedia/cinelerra/patches/01-cinelerra-entry.patch
deleted file mode 100644
index 5ece08c419..0000000000
--- a/multimedia/cinelerra/patches/01-cinelerra-entry.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image/cinelerra.desktop
-+++ b/image/cinelerra.desktop
-@@ -5,9 +5,8 @@
- Name[fr]=Cinelerra
- Name[es]=Cinelerra
- Comment=Video Editor
--Categories=Application;AudioVideo;Multimedia;
--Encoding=UTF-8
-+Categories=AudioVideo;
- Exec=cinelerra
--Icon=cinelerra.xpm
-+Icon=cinelerra
- Terminal=false
- Type=Application
diff --git a/multimedia/cinelerra/patches/02-cinelerra-ffmpeg.patch b/multimedia/cinelerra/patches/02-cinelerra-ffmpeg.patch
deleted file mode 100644
index 6f7962fb1a..0000000000
--- a/multimedia/cinelerra/patches/02-cinelerra-ffmpeg.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Fix build with ffmpeg/libav trunk / 0.7
-
-Index: cinelerra-20101104/cinelerra/ffmpeg.C
-===================================================================
---- cinelerra-20101104.orig/cinelerra/ffmpeg.C
-+++ cinelerra-20101104/cinelerra/ffmpeg.C
-@@ -364,12 +364,15 @@ int FFMPEG::decode(uint8_t *data, long d
- 
- 	// NOTE: frame must already have data space allocated
- 	
-+	AVPacket pkt;
- 	got_picture = 0;
--	int length = avcodec_decode_video(context,
-+	av_init_packet( &pkt );
-+	pkt.data = data;
-+	pkt.size = data_size;
-+	int length = avcodec_decode_video2(context,
- 					  picture,
- 					  &got_picture,
--					  data,
--					  data_size);
-+					  &pkt);
- 	
- 	if (length < 0) {
- 		printf("FFMPEG::decode error decoding frame\n");
-Index: cinelerra-20101104/quicktime/qtffmpeg.c
-===================================================================
---- cinelerra-20101104.orig/quicktime/qtffmpeg.c
-+++ cinelerra-20101104/quicktime/qtffmpeg.c
-@@ -181,6 +181,7 @@ static int decode_wrapper(quicktime_t *f
-  
- 	if(!result) 
- 	{ 
-+		AVPacket pkt;
- 
- 
- // No way to determine if there was an error based on nonzero status.
-@@ -189,11 +190,13 @@ static int decode_wrapper(quicktime_t *f
- 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */;
- 		else
- 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT;
--		result = avcodec_decode_video(ffmpeg->decoder_context[current_field], 
-+		av_init_packet( &pkt );
-+		pkt.data = ffmpeg->work_buffer;
-+		pkt.size = bytes + header_bytes;
-+		result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], 
- 			&ffmpeg->picture[current_field], 
- 			&got_picture, 
--			ffmpeg->work_buffer, 
--			bytes + header_bytes);
-+			&pkt);
- 
- 
- 
-Index: cinelerra-20101104/quicktime/wma.c
-===================================================================
---- cinelerra-20101104.orig/quicktime/wma.c
-+++ cinelerra-20101104/quicktime/wma.c
-@@ -195,11 +195,14 @@ printf("decode 2 %x %llx %llx\n", chunk_
- 			chunk_size);
- #else
- 		bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--		result = avcodec_decode_audio2(codec->decoder_context,
-+		AVPacket pkt;
-+		av_init_packet( &pkt );
-+		pkt.data = codec->packet_buffer;
-+		pkt.size = chunk_size;
-+		result = avcodec_decode_audio3(codec->decoder_context,
- 			(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
- 			&bytes_decoded,
--			codec->packet_buffer,
--			chunk_size);
-+			&pkt);
- #endif
- 
- 		pthread_mutex_unlock(&ffmpeg_lock);
diff --git a/multimedia/cinelerra/patches/04-cinelerra-ffmpeg-0.11.patch b/multimedia/cinelerra/patches/04-cinelerra-ffmpeg-0.11.patch
deleted file mode 100644
index 6d59cc8408..0000000000
--- a/multimedia/cinelerra/patches/04-cinelerra-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Let it build with ffmpeg-0.11
-
-Index: cinelerra-20111223/cinelerra/ffmpeg.C
-===================================================================
---- cinelerra-20111223.orig/cinelerra/ffmpeg.C
-+++ cinelerra-20111223/cinelerra/ffmpeg.C
-@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
- 
- int FFMPEG::init(char *codec_string) {
- 
--	avcodec_init();
- 	avcodec_register_all();
- 
- 	CodecID id = codec_id(codec_string);
-Index: cinelerra-20111223/cinelerra/fileac3.C
-===================================================================
---- cinelerra-20111223.orig/cinelerra/fileac3.C
-+++ cinelerra-20111223/cinelerra/fileac3.C
-@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr)
- 
- 	if(wr)
- 	{
--  		avcodec_init();
- 		avcodec_register_all();
- 		codec = avcodec_find_encoder(CODEC_ID_AC3);
- 		if(!codec)
-Index: cinelerra-20111223/configure.in
-===================================================================
---- cinelerra-20111223.orig/configure.in
-+++ cinelerra-20111223/configure.in
-@@ -338,7 +338,7 @@ AC_SUBST(CPU_CFLAGS)
- AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
- 
- if test "x$with_external_ffmpeg" = "xyes"; then
--     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
-+     PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
-      FFMPEG_FOLDER=""
-      FFMPEG_EXTERNALTEXT="External ffmpeg"
- 		   
-@@ -356,10 +356,10 @@ if test "x$with_external_ffmpeg" = "xyes
-      AC_MSG_RESULT($enable_ffmpeg_swscale)
-      if test x"$enable_ffmpeg_swscale" = xyes; then
- 	     dnl AC_DEFINE(HAVE_SWSCALER)
--	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
-+	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil])
- 	     FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER"
-      else
--	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
-+	     PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
-      fi
-      FFMPEG_EXTERNALTEXT="External ffmpeg"
- else
-Index: cinelerra-20111223/quicktime/mpeg4.c
-===================================================================
---- cinelerra-20111223.orig/quicktime/mpeg4.c
-+++ cinelerra-20111223/quicktime/mpeg4.c
-@@ -8,6 +8,7 @@
- 
- 
- #include "libavcodec/avcodec.h"
-+#include "libavutil/dict.h"
- #include "colormodels.h"
- #include "funcprotos.h"
- #include "qtffmpeg.h"
-@@ -624,12 +625,12 @@ static int encode(quicktime_t *file, uns
- 		else
- // ffmpeg section
- 		{
-+			AVDictionary ** opts = NULL;
- 			static char *video_rc_eq="tex^qComp";
- 			codec->encode_initialized[current_field] = 1;
- 			if(!ffmpeg_initialized)
- 			{
- 				ffmpeg_initialized = 1;
--  				avcodec_init();
- 				avcodec_register_all();
- 			}
- 
-@@ -673,8 +674,10 @@ static int encode(quicktime_t *file, uns
-         	context->b_quant_offset = 1.25;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			context->error_resilience = FF_ER_CAREFUL;
--#else
-+#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
- 			context->error_recognition = FF_ER_CAREFUL;
-+#else
-+			context->err_recognition |= AV_EF_CAREFUL;
- #endif
- 			context->error_concealment = 3;
- 			context->frame_skip_cmp = FF_CMP_DCTMAX;
-@@ -699,7 +702,7 @@ static int encode(quicktime_t *file, uns
-         	context->profile= FF_PROFILE_UNKNOWN;
- 			context->rc_buffer_aggressivity = 1.0;
-         	context->level= FF_LEVEL_UNKNOWN;
--			context->flags |= CODEC_FLAG_H263P_UMV;
-+			av_dict_set(opts, "umv", "1", 0);
- 			context->flags |= CODEC_FLAG_AC_PRED;
- 
- // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
-@@ -717,10 +720,8 @@ static int encode(quicktime_t *file, uns
- 				(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
- 			         codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
- 			         codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
--			         codec->ffmpeg_id == CODEC_ID_H263P || 
--			         codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
-+			         codec->ffmpeg_id == CODEC_ID_H263P ))
- 			{
--				avcodec_thread_init(context, file->cpus);
- 				context->thread_count = file->cpus;
- 			}
- 
-@@ -740,7 +741,7 @@ static int encode(quicktime_t *file, uns
-  * codec->fix_bitrate,
-  * codec->quantizer);
-  */
--			avcodec_open(context, codec->encoder[current_field]);
-+			avcodec_open2(context, codec->encoder[current_field], opts);
- 
-    			avcodec_get_frame_defaults(&codec->picture[current_field]);
- 
-Index: cinelerra-20111223/quicktime/qtffmpeg.c
-===================================================================
---- cinelerra-20111223.orig/quicktime/qtffmpeg.c
-+++ cinelerra-20111223/quicktime/qtffmpeg.c
-@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
- 	if(!ffmpeg_initialized)
- 	{
- 		ffmpeg_initialized = 1;
--  		avcodec_init();
- 		avcodec_register_all();
- 	}
- 
-@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
- 				(ffmpeg_id == CODEC_ID_MPEG4 ||
- 			         ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
- 			         ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
--			         ffmpeg_id == CODEC_ID_H263P || 
--			         ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
-+			         ffmpeg_id == CODEC_ID_H263P ))
- 		{
--			avcodec_thread_init(context, cpus);
- 			context->thread_count = cpus;
- 		}
- 		if(avcodec_open(context, 
-Index: cinelerra-20111223/quicktime/wma.c
-===================================================================
---- cinelerra-20111223.orig/quicktime/wma.c
-+++ cinelerra-20111223/quicktime/wma.c
-@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_m
- 		if(!ffmpeg_initialized)
- 		{
- 			ffmpeg_initialized = 1;
--			avcodec_init();
- 			avcodec_register_all();
- 		}
- 
diff --git a/multimedia/cinelerra/patches/05-cinelerra-std_and_str_h.patch b/multimedia/cinelerra/patches/05-cinelerra-std_and_str_h.patch
deleted file mode 100644
index 66622a9c8e..0000000000
--- a/multimedia/cinelerra/patches/05-cinelerra-std_and_str_h.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Include required headers for free(), memcpy(), strcpy(), bcopy(), and more
-Thanks to Martin von Gagern for reporting and initial patch
-See, http://bugs.gentoo.org/show_bug.cgi?id=465478
-
---- a/cinelerra/vdevicebuz.C
-+++ b/cinelerra/vdevicebuz.C
-@@ -49,6 +49,8 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <unistd.h>
-+#include <string.h>
-+#include <strings.h>
- 
- #define BASE_VIDIOCPRIVATE	192	
- 
---- a/cinelerra/videodevice.C
-+++ b/cinelerra/videodevice.C
-@@ -53,6 +53,7 @@
- 
- #include <unistd.h>
- #include <fcntl.h>
-+#include <string.h>
- 
- KeepaliveThread::KeepaliveThread(VideoDevice *device)
-  : Thread()
---- a/libmpeg3/audio/ac3.c
-+++ b/libmpeg3/audio/ac3.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include <stdint.h>
- #include <stdio.h>
- 
---- a/libmpeg3/audio/layer3.c
-+++ b/libmpeg3/audio/layer3.c
-@@ -4,6 +4,7 @@
- #include "tables.h"
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- struct gr_info_s 
---- a/mplexlo/mplex.c
-+++ b/mplexlo/mplex.c
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <stdlib.h>
--
-+#include <string.h>
- 
- #include "libmpeg3.h"
- #include "mpeg3protos.h"
---- a/quicktime/graphics.c
-+++ b/quicktime/graphics.c
-@@ -1,5 +1,6 @@
- #include "graphics.h"
- 
-+#include <stdlib.h>
- #include <string.h>
- 
- /* Graphics acceleration routines */
---- a/quicktime/libmjpeg.c
-+++ b/quicktime/libmjpeg.c
-@@ -17,6 +17,7 @@
-  
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "colormodels.h"
- #include "libmjpeg.h"
- 
---- a/quicktime/qtpng.c
-+++ b/quicktime/qtpng.c
-@@ -1,6 +1,7 @@
- #include "colormodels.h"
- #include "funcprotos.h"
- #include <png.h>
-+#include <string.h>
- #include "quicktime.h"
- #include "qtpng.h"
- 
diff --git a/multimedia/cinelerra/patches/06-cinelerra-libav9.patch b/multimedia/cinelerra/patches/06-cinelerra-libav9.patch
deleted file mode 100644
index 47a4d6f231..0000000000
--- a/multimedia/cinelerra/patches/06-cinelerra-libav9.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urN cinelerra-20120707/cinelerra/ffmpeg.C /tmp/cinelerra-20120707/cinelerra/ffmpeg.C
---- cinelerra-20120707/cinelerra/ffmpeg.C	2013-06-22 18:07:43.632978553 +0200
-+++ /tmp/cinelerra-20120707/cinelerra/ffmpeg.C	2013-06-22 18:07:21.668979334 +0200
-@@ -32,9 +32,9 @@
- 		return 1;
- 	}
- 
--	context = avcodec_alloc_context();
-+	context = avcodec_alloc_context3(NULL);
- 
--	if (avcodec_open(context, codec)) {
-+	if (avcodec_open2(context, codec, NULL)) {
- 		printf("FFMPEG::init avcodec_open() failed\n");
- 	}
-
-diff -urN cinelerra-20120707/cinelerra/fileac3.C /tmp/cinelerra-20120707/cinelerra/fileac3.C
---- cinelerra-20120707/cinelerra/fileac3.C	2013-06-22 18:07:43.632978553 +0200
-+++ /tmp/cinelerra-20120707/cinelerra/fileac3.C	2013-06-22 18:07:21.668979334 +0200
-@@ -91,11 +91,11 @@
- 			eprintf("codec not found.\n");
- 			return 1;
- 		}
--		codec_context = avcodec_alloc_context();
-+		codec_context = avcodec_alloc_context3(NULL);
- 		codec_context->bit_rate = asset->ac3_bitrate * 1000;
- 		codec_context->sample_rate = asset->sample_rate;
- 		codec_context->channels = asset->channels;
--		if(avcodec_open(codec_context, codec))
-+		if(avcodec_open2(codec_context, codec, NULL))
- 		{
- 			eprintf("failed to open codec.\n");
- 			return 1;
-diff -urN cinelerra-20120707/quicktime/mpeg4.c /tmp/cinelerra-20120707/quicktime/mpeg4.c
---- cinelerra-20120707/quicktime/mpeg4.c	2013-06-22 18:07:43.633978553 +0200
-+++ /tmp/cinelerra-20120707/quicktime/mpeg4.c	2013-06-22 18:07:21.690979334 +0200
-@@ -642,7 +642,7 @@
- 				return 1;
- 			}
- 
--			codec->encoder_context[current_field] = avcodec_alloc_context();
-+			codec->encoder_context[current_field] = avcodec_alloc_context3(NULL);
- 			AVCodecContext *context = codec->encoder_context[current_field];
- 
- 			context->width = width_i;
-@@ -676,8 +676,6 @@
- 			context->error_resilience = FF_ER_CAREFUL;
- #elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
- 			context->error_recognition = FF_ER_CAREFUL;
--#else
--			context->err_recognition |= AV_EF_CAREFUL;
- #endif
- 			context->error_concealment = 3;
- 			context->frame_skip_cmp = FF_CMP_DCTMAX;
-diff -urN cinelerra-20120707/quicktime/qtffmpeg.c /tmp/cinelerra-20120707/quicktime/qtffmpeg.c
---- cinelerra-20120707/quicktime/qtffmpeg.c	2013-06-22 18:07:43.633978553 +0200
-+++ /tmp/cinelerra-20120707/quicktime/qtffmpeg.c	2013-06-22 18:07:21.690979334 +0200
-@@ -67,7 +67,7 @@
- 			return 0;
- 		}
- 
--		AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
-+		AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context3(NULL);
- 		static char fake_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
- 		context->width = ptr->width_i;
- 		context->height = ptr->height_i;
-@@ -93,8 +93,8 @@
- 		{
- 			context->thread_count = cpus;
- 		}
--		if(avcodec_open(context, 
--			ptr->decoder[i]) < 0)
-+		if(avcodec_open2(context, 
-+			ptr->decoder[i], NULL) < 0)
- 		{
- 			printf("quicktime_new_ffmpeg: avcodec_open failed.\n");
- 			quicktime_delete_ffmpeg(ptr);
-diff -urN cinelerra-20120707/quicktime/wma.c /tmp/cinelerra-20120707/quicktime/wma.c
---- cinelerra-20120707/quicktime/wma.c	2013-06-22 18:07:43.634978553 +0200
-+++ /tmp/cinelerra-20120707/quicktime/wma.c	2013-06-22 18:07:21.690979334 +0200
-@@ -76,10 +76,10 @@
- 			printf("init_decode: avcodec_find_decoder returned NULL.\n");
- 			return 1;
- 		}
--		codec->decoder_context = avcodec_alloc_context();
-+		codec->decoder_context = avcodec_alloc_context3(NULL);
- 		codec->decoder_context->sample_rate = trak->mdia.minf.stbl.stsd.table[0].sample_rate;
- 		codec->decoder_context->channels = track_map->channels;
--		if(avcodec_open(codec->decoder_context, codec->decoder) < 0)
-+		if(avcodec_open2(codec->decoder_context, codec->decoder, NULL) < 0)
- 		{
- 			printf("init_decode: avcodec_open failed.\n");
- 			return 1;
-
diff --git a/multimedia/cinelerra/patches/07-cinelerra-ffmpeg2.patch b/multimedia/cinelerra/patches/07-cinelerra-ffmpeg2.patch
deleted file mode 100644
index eb172d1ce4..0000000000
--- a/multimedia/cinelerra/patches/07-cinelerra-ffmpeg2.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=479394
-By Helmut Jarausch
-
---- a/cinelerra/ffmpeg.h.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/cinelerra/ffmpeg.h	2013-08-01 12:58:12.342474136 +0200
-@@ -26,7 +26,7 @@
- 	static int convert_cmodel_transfer(VFrame *frame_in,VFrame *frame_out);
- 	static int init_picture_from_frame(AVPicture *picture, VFrame *frame);
- 
--	static CodecID codec_id(char *codec_string);
-+	static AVCodecID codec_id(char *codec_string);
- 
-  private:
- 	static PixelFormat color_model_to_pix_fmt(int color_model);
---- a/cinelerra/ffmpeg.C.ORIG	2013-08-01 11:24:43.794419246 +0200
-+++ a/cinelerra/ffmpeg.C	2013-08-01 12:57:48.121473899 +0200
-@@ -25,7 +25,7 @@
- 
- 	avcodec_register_all();
- 
--	CodecID id = codec_id(codec_string);
-+	AVCodecID id = codec_id(codec_string);
- 	codec = avcodec_find_decoder(id);
- 	if (codec == NULL) {
- 		printf("FFMPEG::init no decoder for '%s'", codec_string);
-@@ -51,7 +51,7 @@
- }
- 
- 
--CodecID FFMPEG::codec_id(char *codec_string) {
-+AVCodecID FFMPEG::codec_id(char *codec_string) {
- #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
- 
- 	if (CODEC_IS(QUICKTIME_DV) ||
---- a/quicktime/ffmpeg/ffmpeg.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/ffmpeg.c	2013-08-01 12:57:59.025474005 +0200
-@@ -2663,7 +2663,7 @@
-     return 0;
- }
- 
--static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
-+static enum AVCodecID find_codec_or_die(const char *name, int type, int encoder)
- {
-     const char *codec_string = encoder ? "encoder" : "decoder";
-     AVCodec *codec;
---- a/quicktime/ffmpeg/libavformat/electronicarts.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/electronicarts.c	2013-08-01 13:00:57.855475755 +0200
-@@ -49,11 +49,11 @@
- typedef struct EaDemuxContext {
-     int big_endian;
- 
--    enum CodecID video_codec;
-+    enum AVCodecID video_codec;
-     AVRational time_base;
-     int video_stream_index;
- 
--    enum CodecID audio_codec;
-+    enum AVCodecID audio_codec;
-     int audio_stream_index;
-     int audio_frame_counter;
- 
---- a/quicktime/ffmpeg/libavformat/img2.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/img2.c	2013-08-01 12:59:21.408474812 +0200
-@@ -34,7 +34,7 @@
- } VideoData;
- 
- typedef struct {
--    enum CodecID id;
-+    enum AVCodecID id;
-     const char *str;
- } IdStrMap;
- 
-@@ -97,7 +97,7 @@
-     }
-     return -1;
- }
--static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
-+static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
- {
-     str= strrchr(str, '.');
-     if(!str) return CODEC_ID_NONE;
-@@ -175,7 +175,7 @@
-     return 0;
- }
- 
--enum CodecID av_guess_image2_codec(const char *filename){
-+enum AVCodecID av_guess_image2_codec(const char *filename){
-     return av_str2id(img_tags, filename);
- }
- 
---- a/quicktime/ffmpeg/libavformat/matroskadec.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/matroskadec.c	2013-08-01 12:59:57.556475165 +0200
-@@ -2476,7 +2476,7 @@
-         AVStream *st;
- 
-         for (i = 0; i < matroska->num_tracks; i++) {
--            enum CodecID codec_id = CODEC_ID_NONE;
-+            enum AVCodecID codec_id = CODEC_ID_NONE;
-             uint8_t *extradata = NULL;
-             int extradata_size = 0;
-             int extradata_offset = 0;
-@@ -2495,7 +2495,7 @@
-                 }
-             }
- 
--            /* Set the FourCC from the CodecID. */
-+            /* Set the FourCC from the AVCodecID. */
-             /* This is the MS compatibility mode which stores a
-              * BITMAPINFOHEADER in the CodecPrivate. */
-             if (!strcmp(track->codec_id,
-@@ -2600,7 +2600,7 @@
- 
-             if (codec_id == CODEC_ID_NONE) {
-                 av_log(matroska->ctx, AV_LOG_INFO,
--                       "Unknown/unsupported CodecID %s.\n",
-+                       "Unknown/unsupported AVCodecID %s.\n",
-                        track->codec_id);
-             }
- 
---- a/quicktime/ffmpeg/libavformat/matroska.h.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/matroska.h	2013-08-01 13:00:22.218475407 +0200
-@@ -220,12 +220,12 @@
- 
- typedef struct CodecTags{
-     char str[16];
--    enum CodecID id;
-+    enum AVCodecID id;
- }CodecTags;
- 
- typedef struct CodecMime{
-     char str[32];
--    enum CodecID id;
-+    enum AVCodecID id;
- }CodecMime;
- 
- #define MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC   "V_MS/VFW/FOURCC"
---- a/quicktime/ffmpeg/libavformat/mov.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/mov.c	2013-08-01 12:59:33.935474934 +0200
-@@ -678,7 +678,7 @@
- 
-     for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) {
-         //Parsing Sample description table
--        enum CodecID id;
-+        enum AVCodecID id;
-         int dref_id;
-         MOV_atom_t a = { 0, 0, 0 };
-         offset_t start_pos = url_ftell(pb);
---- a/quicktime/ffmpeg/libavformat/mxf.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/mxf.c	2013-08-01 12:59:12.025474720 +0200
-@@ -157,7 +157,7 @@
- typedef struct {
-     UID uid;
-     unsigned matching_len;
--    enum CodecID id;
-+    enum AVCodecID id;
- } MXFCodecUL;
- 
- typedef struct {
---- a/quicktime/ffmpeg/libavformat/riff.h.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/riff.h	2013-08-01 12:59:45.950475052 +0200
-@@ -48,7 +48,7 @@
- extern const AVCodecTag codec_wav_tags[];
- 
- unsigned int codec_get_tag(const AVCodecTag *tags, int id);
--enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
-+enum AVCodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
- void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
- 
- #endif /* FFMPEG_RIFF_H */
---- a/quicktime/ffmpeg/libavformat/rtp.c.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/rtp.c	2013-08-01 12:59:01.778474619 +0200
-@@ -40,7 +40,7 @@
-     int pt;
-     const char enc_name[6];
-     enum CodecType codec_type;
--    enum CodecID codec_id;
-+    enum AVCodecID codec_id;
-     int clock_rate;
-     int audio_channels;
- } AVRtpPayloadTypes[]=
-@@ -120,7 +120,7 @@
-     return "";
- }
- 
--enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
-+enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
- {
-     int i;
- 
---- a/quicktime/ffmpeg/libavformat/rtp_internal.h.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/ffmpeg/libavformat/rtp_internal.h	2013-08-01 13:00:09.147475279 +0200
-@@ -61,7 +61,7 @@
-     // fields from AVRtpDynamicPayloadType_s
-     const char enc_name[50];    /* XXX: still why 50 ? ;-) */
-     enum CodecType codec_type;
--    enum CodecID codec_id;
-+    enum AVCodecID codec_id;
- 
-     // may be null
-     int (*parse_sdp_a_line) (AVStream * stream,
-@@ -123,7 +123,7 @@
- 
- void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
- const char *ff_rtp_enc_name(int payload_type);
--enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
-+enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
- 
- void av_register_rtp_dynamic_payload_handlers(void);
- 
---- a/quicktime/wma.h.ORIG	2012-07-06 22:40:26.000000000 +0200
-+++ a/quicktime/wma.h	2013-08-01 13:11:46.431482103 +0200
-@@ -3,5 +3,6 @@
- 
- extern void quicktime_init_codec_wmav1(quicktime_audio_map_t *);
- extern void quicktime_init_codec_wmav2(quicktime_audio_map_t *);
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
- 
- #endif
diff --git a/multimedia/cinelerra/patches/cinelerra-cv-ffmpeg2.0.patch b/multimedia/cinelerra/patches/cinelerra-cv-ffmpeg2.0.patch
new file mode 100644
index 0000000000..b1e0324ba3
--- /dev/null
+++ b/multimedia/cinelerra/patches/cinelerra-cv-ffmpeg2.0.patch
@@ -0,0 +1,98 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index b762d46..53ad7a1 100644
+--- a/cinelerra/ffmpeg.C
++++ b/cinelerra/ffmpeg.C
+@@ -32,9 +32,9 @@ int FFMPEG::init(char *codec_string) {
+ 		return 1;
+ 	}
+ 
+-	context = avcodec_alloc_context();
++	context = avcodec_alloc_context3(codec);
+ 
+-	if (avcodec_open(context, codec)) {
++	if (avcodec_open2(context, codec,NULL)) {
+ 		printf("FFMPEG::init avcodec_open() failed\n");
+ 	}
+ 
+diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C
+index e56705f..119c2d5 100644
+--- a/cinelerra/fileac3.C
++++ b/cinelerra/fileac3.C
+@@ -91,11 +91,11 @@ int FileAC3::open_file(int rd, int wr)
+ 			eprintf("codec not found.\n");
+ 			return 1;
+ 		}
+-		codec_context = avcodec_alloc_context();
++		codec_context = avcodec_alloc_context3(codec);
+ 		codec_context->bit_rate = asset->ac3_bitrate * 1000;
+ 		codec_context->sample_rate = asset->sample_rate;
+ 		codec_context->channels = asset->channels;
+-		if(avcodec_open(codec_context, codec))
++		if(avcodec_open2(codec_context, codec,NULL))
+ 		{
+ 			eprintf("failed to open codec.\n");
+ 			return 1;
+diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c
+index 67bcab8..d78055e 100644
+--- a/quicktime/mpeg4.c
++++ b/quicktime/mpeg4.c
+@@ -640,7 +640,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
+ 				return 1;
+ 			}
+ 
+-			codec->encoder_context[current_field] = avcodec_alloc_context();
++			codec->encoder_context[current_field] = avcodec_alloc_context3(codec->encoder[current_field]);
+ 			AVCodecContext *context = codec->encoder_context[current_field];
+ 
+ 			context->width = width_i;
+@@ -736,7 +736,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
+  * codec->fix_bitrate,
+  * codec->quantizer);
+  */
+-			avcodec_open(context, codec->encoder[current_field]);
++			avcodec_open2(context, codec->encoder[current_field],NULL);
+ 
+    			avcodec_get_frame_defaults(&codec->picture[current_field]);
+ 
+diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
+index c808da7..522d23c 100644
+--- a/quicktime/qtffmpeg.c
++++ b/quicktime/qtffmpeg.c
+@@ -67,7 +67,9 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
+ 			return 0;
+ 		}
+ 
+-		AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
++		//AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
++		AVCodecContext *context = avcodec_alloc_context3(ptr->decoder[i]);
++		ptr->decoder_context[i] = context;
+ 		static char fake_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ 		context->width = ptr->width_i;
+ 		context->height = ptr->height_i;
+@@ -93,8 +95,7 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
+ 		{
+ 			context->thread_count = cpus;
+ 		}
+-		if(avcodec_open(context, 
+-			ptr->decoder[i]) < 0)
++		if(avcodec_open2(context, ptr->decoder[i], NULL) < 0)
+ 		{
+ 			printf("quicktime_new_ffmpeg: avcodec_open failed.\n");
+ 			quicktime_delete_ffmpeg(ptr);
+diff --git a/quicktime/wma.c b/quicktime/wma.c
+index f38bdce..4be0274 100644
+--- a/quicktime/wma.c
++++ b/quicktime/wma.c
+@@ -76,10 +76,10 @@ static int init_decode(quicktime_audio_map_t *track_map,
+ 			printf("init_decode: avcodec_find_decoder returned NULL.\n");
+ 			return 1;
+ 		}
+-		codec->decoder_context = avcodec_alloc_context();
++		codec->decoder_context = avcodec_alloc_context3(codec->decoder);
+ 		codec->decoder_context->sample_rate = trak->mdia.minf.stbl.stsd.table[0].sample_rate;
+ 		codec->decoder_context->channels = track_map->channels;
+-		if(avcodec_open(codec->decoder_context, codec->decoder) < 0)
++		if(avcodec_open2(codec->decoder_context, codec->decoder,NULL) < 0)
+ 		{
+ 			printf("init_decode: avcodec_open failed.\n");
+ 			return 1;
diff --git a/multimedia/cinelerra/patches/cinelerra-cv-ffmpeg_api2.2.patch b/multimedia/cinelerra/patches/cinelerra-cv-ffmpeg_api2.2.patch
new file mode 100644
index 0000000000..2def7089b2
--- /dev/null
+++ b/multimedia/cinelerra/patches/cinelerra-cv-ffmpeg_api2.2.patch
@@ -0,0 +1,200 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 6ab6047..b762d46 100644
+--- a/cinelerra/ffmpeg.C
++++ b/cinelerra/ffmpeg.C
+@@ -2,7 +2,7 @@
+ 
+ #ifdef HAVE_SWSCALER
+ extern "C" {
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ }
+ #endif
+ 
+@@ -23,10 +23,9 @@ FFMPEG::FFMPEG(Asset *asset) {
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-	avcodec_init();
+ 	avcodec_register_all();
+ 
+-	CodecID id = codec_id(codec_string);
++	AVCodecID id = codec_id(codec_string);
+ 	codec = avcodec_find_decoder(id);
+ 	if (codec == NULL) {
+ 		printf("FFMPEG::init no decoder for '%s'", codec_string);
+@@ -52,7 +51,7 @@ FFMPEG::~FFMPEG() {
+ }
+ 
+ 
+-CodecID FFMPEG::codec_id(char *codec_string) {
++AVCodecID FFMPEG::codec_id(char *codec_string) {
+ #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
+ 
+ 	if (CODEC_IS(QUICKTIME_DV) ||
+@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame *frame_out) {
+ 
+ 	// NOTE: frame must already have data space allocated
+ 	
++	AVPacket pkt;
+ 	got_picture = 0;
+-	int length = avcodec_decode_video(context,
++	av_init_packet( &pkt );
++	pkt.data = data;
++	pkt.size = data_size;
++	int length = avcodec_decode_video2(context,
+ 					  picture,
+ 					  &got_picture,
+-					  data,
+-					  data_size);
++					  &pkt);
+ 	
+ 	if (length < 0) {
+ 		printf("FFMPEG::decode error decoding frame\n");
+diff --git a/cinelerra/ffmpeg.h b/cinelerra/ffmpeg.h
+index 69c9956..dc7174e 100644
+--- a/cinelerra/ffmpeg.h
++++ b/cinelerra/ffmpeg.h
+@@ -26,7 +26,7 @@ class FFMPEG
+ 	static int convert_cmodel_transfer(VFrame *frame_in,VFrame *frame_out);
+ 	static int init_picture_from_frame(AVPicture *picture, VFrame *frame);
+ 
+-	static CodecID codec_id(char *codec_string);
++	static AVCodecID codec_id(char *codec_string);
+ 
+  private:
+ 	static PixelFormat color_model_to_pix_fmt(int color_model);
+diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C
+index a1ef61e..e56705f 100644
+--- a/cinelerra/fileac3.C
++++ b/cinelerra/fileac3.C
+@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr)
+ 
+ 	if(wr)
+ 	{
+-  		avcodec_init();
+ 		avcodec_register_all();
+ 		codec = avcodec_find_encoder(CODEC_ID_AC3);
+ 		if(!codec)
+diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c
+index 81cb72b..67bcab8 100644
+--- a/quicktime/mpeg4.c
++++ b/quicktime/mpeg4.c
+@@ -629,7 +629,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
+ 			if(!ffmpeg_initialized)
+ 			{
+ 				ffmpeg_initialized = 1;
+-  				avcodec_init();
+ 				avcodec_register_all();
+ 			}
+ 
+@@ -674,7 +673,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ 			context->error_resilience = FF_ER_CAREFUL;
+ #else
+-			context->error_recognition = FF_ER_CAREFUL;
++			context->err_recognition = AV_EF_CRCCHECK;
+ #endif
+ 			context->error_concealment = 3;
+ 			context->frame_skip_cmp = FF_CMP_DCTMAX;
+@@ -699,7 +698,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
+         	context->profile= FF_PROFILE_UNKNOWN;
+ 			context->rc_buffer_aggressivity = 1.0;
+         	context->level= FF_LEVEL_UNKNOWN;
+-			context->flags |= CODEC_FLAG_H263P_UMV;
+ 			context->flags |= CODEC_FLAG_AC_PRED;
+ 
+ // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
+@@ -717,10 +715,8 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
+ 				(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
+ 			         codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+ 			         codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         codec->ffmpeg_id == CODEC_ID_H263P || 
+-			         codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
++			         codec->ffmpeg_id == CODEC_ID_H263P))
+ 			{
+-				avcodec_thread_init(context, file->cpus);
+ 				context->thread_count = file->cpus;
+ 			}
+ 
+diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
+index b384a83..c808da7 100644
+--- a/quicktime/qtffmpeg.c
++++ b/quicktime/qtffmpeg.c
+@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
+ 	if(!ffmpeg_initialized)
+ 	{
+ 		ffmpeg_initialized = 1;
+-  		avcodec_init();
+ 		avcodec_register_all();
+ 	}
+ 
+@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
+ 				(ffmpeg_id == CODEC_ID_MPEG4 ||
+ 			         ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
+ 			         ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
+-			         ffmpeg_id == CODEC_ID_H263P || 
+-			         ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
++			         ffmpeg_id == CODEC_ID_H263P))
+ 		{
+-			avcodec_thread_init(context, cpus);
+ 			context->thread_count = cpus;
+ 		}
+ 		if(avcodec_open(context, 
+@@ -183,6 +180,7 @@ static int decode_wrapper(quicktime_t *file,
+  
+ 	if(!result) 
+ 	{ 
++		AVPacket pkt;
+ 
+ 
+ // No way to determine if there was an error based on nonzero status.
+@@ -191,11 +189,13 @@ static int decode_wrapper(quicktime_t *file,
+ 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */;
+ 		else
+ 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT;
+-		result = avcodec_decode_video(ffmpeg->decoder_context[current_field], 
++		av_init_packet( &pkt );
++		pkt.data = ffmpeg->work_buffer;
++		pkt.size = bytes + header_bytes;
++		result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], 
+ 			&ffmpeg->picture[current_field], 
+ 			&got_picture, 
+-			ffmpeg->work_buffer, 
+-			bytes + header_bytes);
++			&pkt);
+ 
+ 
+ 
+diff --git a/quicktime/wma.c b/quicktime/wma.c
+index c045741..f38bdce 100644
+--- a/quicktime/wma.c
++++ b/quicktime/wma.c
+@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_map_t *track_map,
+ 		if(!ffmpeg_initialized)
+ 		{
+ 			ffmpeg_initialized = 1;
+-			avcodec_init();
+ 			avcodec_register_all();
+ 		}
+ 
+@@ -194,12 +193,16 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk
+ 			codec->packet_buffer,
+ 			chunk_size);
+ #else
++#define     AVCODEC_MAX_AUDIO_FRAME_SIZE   192000
+ 		bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-		result = avcodec_decode_audio2(codec->decoder_context,
++		AVPacket pkt;
++		av_init_packet( &pkt );
++		pkt.data = codec->packet_buffer;
++		pkt.size = chunk_size;
++		result = avcodec_decode_audio3(codec->decoder_context,
+ 			(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
+ 			&bytes_decoded,
+-			codec->packet_buffer,
+-			chunk_size);
++			&pkt);
+ #endif
+ 
+ 		pthread_mutex_unlock(&ffmpeg_lock);
diff --git a/multimedia/cinelerra/slack-desc b/multimedia/cinelerra/slack-desc
index 60cd2cad5b..bbeb099ad8 100644
--- a/multimedia/cinelerra/slack-desc
+++ b/multimedia/cinelerra/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 cinelerra: cinelerra (GNU/Linux Video/Audio Studio)
 cinelerra:
-cinelerra: Cinelerra is the most  advanced non-linear video editor
+cinelerra: Cinelerra CV is the most  advanced non-linear video editor
 cinelerra: and compositor for Linux.  It does primarily three main
 cinelerra: things:  capturing, compositing, and  editing audio and
 cinelerra: video with sample level accuracy.
 cinelerra:
-cinelerra: Homepage: http://cinelerra.org/
+cinelerra: Homepage: http://cinelerra-cv.org/
 cinelerra:
 cinelerra:
 cinelerra:
diff --git a/multimedia/coriander/README b/multimedia/coriander/README
index dd4c900a62..fe6184b15a 100644
--- a/multimedia/coriander/README
+++ b/multimedia/coriander/README
@@ -3,6 +3,6 @@ through the IEEE-1394 bus (i.e. FireWire or iLink). It can also record videos,
 send images to an FTP site and convert videos to V4L streams. A live display is
 provided as well. The program will work with any camera which is compatible with
 the IIDC specifications (v1.04 or later): this includes most 1394 webcams and
-many industrial or scientific cameras.
+many industrial and scientific cameras.
 
 Optional dependencies: ftplib (FTP support)
diff --git a/multimedia/coriander/coriander.SlackBuild b/multimedia/coriander/coriander.SlackBuild
index f7231d9243..e6d3c9c846 100644
--- a/multimedia/coriander/coriander.SlackBuild
+++ b/multimedia/coriander/coriander.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for coriander
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/multimedia/coriander/coriander.info b/multimedia/coriander/coriander.info
index f594495a75..49cdd8fb2f 100644
--- a/multimedia/coriander/coriander.info
+++ b/multimedia/coriander/coriander.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libdc1394 libgnomeui"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/multimedia/coriander/slack-desc b/multimedia/coriander/slack-desc
index a123866cf4..71a96adc90 100644
--- a/multimedia/coriander/slack-desc
+++ b/multimedia/coriander/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-coriander: Coriander (program to control IEEE-1394 digital cameras)
+coriander: coriander (program to control IEEE-1394 digital cameras)
 coriander:
 coriander: Coriander is a full-featured graphical interface for controlling a
 coriander: digital camera through the IEEE-1394 bus (i.e. FireWire or iLink).
diff --git a/multimedia/cuetools/cuetag-fix_spaces.diff b/multimedia/cuetools/cuetag-fix_spaces.diff
deleted file mode 100644
index f240e9d375..0000000000
--- a/multimedia/cuetools/cuetag-fix_spaces.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-From 21ee6cc40f02693928efbc4f3beeb681950c16b5 Mon Sep 17 00:00:00 2001
-From: Svend Sorensen <svend@ciffer.net>
-Date: Sat, 23 Nov 2013 17:23:01 -0800
-Subject: [PATCH] cuetag: Fix handling of spaces in file names
-
-Fixes #14
----
- src/tools/cuetag.sh | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
-index f26fa20..448920f 100755
---- a/src/tools/cuetag.sh
-+++ b/src/tools/cuetag.sh
-@@ -182,16 +182,15 @@ main()
- 	ntrack=$(cueprint -d '%N' "$cue_file")
- 	trackno=1
- 
--	FILES= FIELDS=
-+	NUM_FILES=0 FIELDS=
- 	for arg in "$@"; do
- 		case "$arg" in
--			*.*) FILES="$FILES $arg";;
-+			*.*) NUM_FILES=$(expr $NUM_FILES + 1);;
- 			*) FIELDS="$FIELDS $arg";;
- 		esac
- 	done
- 
--	set -- $FILES
--	if [ $# -ne $ntrack ]; then
-+	if [ $NUM_FILES -ne $ntrack ]; then
- 		echo "warning: number of files does not match number of tracks"
- 	fi
- 
-@@ -209,7 +208,7 @@ main()
- 		*.[Tt][Xx][Tt])
- 			vorbis $trackno "$file"
- 			;;
--		*)
-+		*.*)
- 			echo "$file: uknown file type"
- 			;;
- 		esac
--- 
-1.8.5.1
-
diff --git a/multimedia/cuetools/cuetag.patch b/multimedia/cuetools/cuetag.patch
deleted file mode 100644
index ffda639c28..0000000000
--- a/multimedia/cuetools/cuetag.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- extras/cuetag.sh	2006-09-06 14:24:47.000000000 -0400
-+++ extras/cuetag.sh	2007-01-26 00:13:23.000000000 -0500
-@@ -63,7 +63,7 @@
- 	(for field in $fields; do
- 		value=""
- 		for conv in `eval echo \\$$field`; do
--			value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+			value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
- 
- 			if [ -n "$value" ]; then
- 				echo "$field=$value"
-@@ -96,7 +96,7 @@
- 	for field in $fields; do
- 		value=""
- 		for conv in `eval echo \\$$field`; do
--			value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+			value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
- 
- 			if [ -n "$value" ]; then
- 				break
-@@ -141,14 +141,14 @@
- 	cue_file=$1
- 	shift
- 
--	ntrack=`cueprint -d '%N' $cue_file`
-+	ntrack=`cueprint -d '%N' "$cue_file"`
- 	trackno=1
- 
- 	if [ $# -ne $ntrack ]; then
- 		echo "warning: number of files does not match number of tracks"
- 	fi
- 
--	for file in $@; do
-+	for file in "$@"; do
- 		case $file in
- 		*.[Ff][Ll][Aa][Cc])
- 			vorbis $trackno "$file"
-
diff --git a/multimedia/cuetools/cuetools.SlackBuild b/multimedia/cuetools/cuetools.SlackBuild
index bc2a660340..37113df872 100644
--- a/multimedia/cuetools/cuetools.SlackBuild
+++ b/multimedia/cuetools/cuetools.SlackBuild
@@ -17,7 +17,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cuetools
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,10 +63,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patching with patches from Archlinux
-patch -Np1 < "$CWD/fix_build_with_automake-1.12.diff"
-patch -Np1 < "$CWD/cuetag-fix_spaces.diff"
-
 aclocal
 autoheader
 automake --force-missing --add-missing
@@ -92,7 +88,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a  AUTHORS COPYING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/cuetools/cuetools.info b/multimedia/cuetools/cuetools.info
index 1d1e831877..737fc91b7e 100644
--- a/multimedia/cuetools/cuetools.info
+++ b/multimedia/cuetools/cuetools.info
@@ -1,8 +1,8 @@
 PRGNAM="cuetools"
-VERSION="1.4.0"
+VERSION="1.4.1"
 HOMEPAGE="https://github.com/svend/cuetools"
-DOWNLOAD="https://github.com/svend/cuetools/archive/1.4.0.tar.gz"
-MD5SUM="4492dae2b3f9e077f6455a1f1cddef3b"
+DOWNLOAD="https://github.com/svend/cuetools/archive/1.4.1.tar.gz"
+MD5SUM="b1f365fc7ab02eff4b58b6a54ecee080"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/cuetools/fix_build_with_automake-1.12.diff b/multimedia/cuetools/fix_build_with_automake-1.12.diff
deleted file mode 100644
index 9090f32c3d..0000000000
--- a/multimedia/cuetools/fix_build_with_automake-1.12.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From 761eba5b9b9c87a872a18b7ba4bf3d77a96e2157 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Horv=C3=A1th=20Bal=C3=A1zs?= <q@qroa.ch>
-Date: Tue, 15 Oct 2013 01:17:52 +0200
-Subject: [PATCH] Fix build with automake-1.12.
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index f54bb92..9f36932 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,6 +4,7 @@ AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AM_PROG_LEX
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
- AC_PROG_YACC
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/lib/Makefile src/tools/Makefile extras/Makefile])
--- 
-1.8.4
-
diff --git a/multimedia/dvdauthor/config.patch b/multimedia/dvdauthor/config.patch
new file mode 100644
index 0000000000..5976969af5
--- /dev/null
+++ b/multimedia/dvdauthor/config.patch
@@ -0,0 +1,19 @@
+--- dvdvml.c.orig       2012-08-19 21:41:52.000000000 -0700
++++ dvdvml.c    2015-06-09 15:28:51.780584903 -0700
+@@ -626,6 +626,7 @@
+  * USA
+  */
+
++#include "config.h"
+ #include "compat.h" /* needed for bool */
+ #include "dvdvm.h"
+ #include "dvdvmy.h"
+--- dvdvmy.c.orig       2012-08-19 21:41:52.000000000 -0700
++++ dvdvmy.c    2015-06-09 15:29:01.924584741 -0700
+@@ -96,6 +96,7 @@
+  * USA
+  */
+
++#include "config.h"
+ #include "compat.h" /* needed for bool */
+ #include "dvdvm.h"
diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild
index a333843e77..829bc055c1 100644
--- a/multimedia/dvdauthor/dvdauthor.SlackBuild
+++ b/multimedia/dvdauthor/dvdauthor.SlackBuild
@@ -29,7 +29,7 @@
 
 PRGNAM=dvdauthor
 VERSION=${VERSION:-0.7.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,7 +72,12 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+(
+cd src
+patch -p0 < $CWD/config.patch
+)
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -88,9 +93,7 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/multimedia/exaile/exaile.SlackBuild b/multimedia/exaile/exaile.SlackBuild
index e150fdc3cb..eceebd9be2 100644
--- a/multimedia/exaile/exaile.SlackBuild
+++ b/multimedia/exaile/exaile.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/multimedia/farstream/README b/multimedia/farstream/README
new file mode 100644
index 0000000000..8d5070efbe
--- /dev/null
+++ b/multimedia/farstream/README
@@ -0,0 +1,5 @@
+The Farstream (formerly Farsight) project is an effort to create
+a framework to deal with all known audio/video conferencing
+protocols. On one side it offers a generic API that makes it possible
+to write plugins for different streaming protocols, on the other
+side it offers an API for clients to use those plugins.
diff --git a/multimedia/farstream/farstream.SlackBuild b/multimedia/farstream/farstream.SlackBuild
new file mode 100644
index 0000000000..d89e6a869a
--- /dev/null
+++ b/multimedia/farstream/farstream.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for farstream
+
+# Copyright 2015 Thorn Inurcide USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=farstream
+VERSION=${VERSION:-0.2.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-introspection=yes \
+  --disable-valgrind \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog* COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/farstream/farstream.info b/multimedia/farstream/farstream.info
new file mode 100644
index 0000000000..829be50cdf
--- /dev/null
+++ b/multimedia/farstream/farstream.info
@@ -0,0 +1,10 @@
+PRGNAM="farstream"
+VERSION="0.2.7"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream/"
+DOWNLOAD="http://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.7.tar.gz"
+MD5SUM="bb56af4cbf2cd42f35353f20cf04bc17"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libnice gst1-plugins-base"
+MAINTAINER="Thorn Inurcide"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/multimedia/farstream/slack-desc b/multimedia/farstream/slack-desc
new file mode 100644
index 0000000000..1b5e650c1f
--- /dev/null
+++ b/multimedia/farstream/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+farstream: farstream (framework to deal with all known conferencing protocols)
+farstream:
+farstream: The Farstream (formerly Farsight) project is an effort to create
+farstream: a framework to deal with all known audio/video conferencing
+farstream: protocols. On one side it offers a generic API that makes it possible
+farstream: to write plugins for different streaming protocols, on the other
+farstream: side it offers an API for clients to use those plugins.
+farstream:
+farstream:
+farstream:
+farstream: Home: http://www.freedesktop.org/wiki/Software/Farstream/
diff --git a/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
index 9e8a8011ed..1f2c27493a 100644
--- a/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
+++ b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flashplayer-plugin
-VERSION=${VERSION:-11.2.202.491}
+VERSION=${VERSION:-11.2.202.632}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/flashplayer-plugin/flashplayer-plugin.info b/multimedia/flashplayer-plugin/flashplayer-plugin.info
index 7534b92874..295bfcfddb 100644
--- a/multimedia/flashplayer-plugin/flashplayer-plugin.info
+++ b/multimedia/flashplayer-plugin/flashplayer-plugin.info
@@ -1,10 +1,10 @@
 PRGNAM="flashplayer-plugin"
-VERSION="11.2.202.491"
+VERSION="11.2.202.632"
 HOMEPAGE="https://get.adobe.com/flashplayer/"
-DOWNLOAD="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.491/install_flash_player_11_linux.i386.tar.gz"
-MD5SUM="40eba6f56b9d52d5328967d830bb0e3b"
-DOWNLOAD_x86_64="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.491/install_flash_player_11_linux.x86_64.tar.gz"
-MD5SUM_x86_64="36f4a6a0ceceea15e80c2138170b39e3"
+DOWNLOAD="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.632/install_flash_player_11_linux.i386.tar.gz"
+MD5SUM="7bf30d1b2747b14dcf1ee77ca2ce04db"
+DOWNLOAD_x86_64="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.632/install_flash_player_11_linux.x86_64.tar.gz"
+MD5SUM_x86_64="ace1a0801f00a25fd90172f63e98e101"
 REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/multimedia/flvtool2/flvtool2.info b/multimedia/flvtool2/flvtool2.info
index dede2cd465..df096f848d 100644
--- a/multimedia/flvtool2/flvtool2.info
+++ b/multimedia/flvtool2/flvtool2.info
@@ -1,7 +1,7 @@
 PRGNAM="flvtool2"
 VERSION="1.0.6"
 HOMEPAGE="http://rubyforge.org/projects/flvtool2/"
-DOWNLOAD="http://rubyforge.org/frs/download.php/17497/flvtool2-1.0.6.tgz"
+DOWNLOAD="http://scenari-platform.org/video/flvtool2/flvtool2-1.0.6.tgz"
 MD5SUM="08e5f6f10c06903447d97d7ba10cec67"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/multimedia/google-earth/google-earth.SlackBuild b/multimedia/google-earth/google-earth.SlackBuild
index 8c0bd13047..04046bc88c 100644
--- a/multimedia/google-earth/google-earth.SlackBuild
+++ b/multimedia/google-earth/google-earth.SlackBuild
@@ -29,9 +29,9 @@
 # and to Daniel de Kok and Alan_Hicks for their comments.
 
 PRGNAM=google-earth
-VERSION="7.1.2.2041"
+VERSION="7.1.4.1529"
 ARCH=i386			# Since this is the arch google dictates
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
diff --git a/multimedia/google-earth/google-earth.info b/multimedia/google-earth/google-earth.info
index 4eaefe3b9b..8deea4d5bd 100644
--- a/multimedia/google-earth/google-earth.info
+++ b/multimedia/google-earth/google-earth.info
@@ -1,8 +1,8 @@
 PRGNAM="google-earth"
-VERSION="7.1.2.2041"
+VERSION="7.1.4.1529"
 HOMEPAGE="http://www.google.com/earth/index.html"
 DOWNLOAD="http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb"
-MD5SUM="c9675d0078d1b188188c9d3b616de6fa"
+MD5SUM="b8847cb867bdb3ff892149f0fd68f036"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
diff --git a/multimedia/gpac/GIT-VERSION b/multimedia/gpac/GIT-VERSION
new file mode 100644
index 0000000000..b8c0e5a441
--- /dev/null
+++ b/multimedia/gpac/GIT-VERSION
@@ -0,0 +1,3 @@
+git checkout - October 20, 2015
+
+git clone https://github.com/gpac/gpac.git
diff --git a/multimedia/gpac/README b/multimedia/gpac/README
index d7d7da6b9a..1a3ce80942 100644
--- a/multimedia/gpac/README
+++ b/multimedia/gpac/README
@@ -3,5 +3,5 @@ playback.  GPAC includes MP4Box utility which lets packaging of
 various audio and video codecs into mp4 container.
 
 Optional dependencies include the following: wxPython, js, faad2, ffmpeg
-xvidcore, a52dec, jack-audio-connection-kit, pulseaudio, xulrunner, and
+xvidcore, a52dec, jack-audio-connection-kit, pulseaudio, xulrunner and
 xmlrpc-c.
diff --git a/multimedia/gpac/SVN-VERSION b/multimedia/gpac/SVN-VERSION
deleted file mode 100644
index 468348a477..0000000000
--- a/multimedia/gpac/SVN-VERSION
+++ /dev/null
@@ -1,4 +0,0 @@
-SVN Revision 5564 - December 18, 2014
-
-svn check out link:
-svn co https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index 6f690fc3a1..3581f5e831 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 # Slackware Package Build Script for gpac
-# Home Page http://gpac.wp.institut-telecom.fr/
+# Home Page: https://gpac.wp.mines-telecom.fr/
 
-# Copyright (c) 2007-2014, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net)
+# Copyright (c) 2007-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="gpac"
-VERSION=${VERSION:-svn_r5564}
+VERSION=${VERSION:-git20151020}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,10 +74,10 @@ cd $PRGNAM-$VERSION
 
 chown -R root.root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # configure doesn't have --libdir option.
 sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
@@ -106,9 +107,9 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING Changelog INSTALLME README TODO doc/configuration.html \
+  AUTHORS BUGS COPYING Changelog INSTALLME README.md TODO doc/configuration.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/SVN-VERSION > $PKG/usr/doc/$PRGNAM-$VERSION/SVN-VERSION
+cat $CWD/GIT-VERSION > $PKG/usr/doc/$PRGNAM-$VERSION/GIT-VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index 8b93a9170d..bd31b8ec0b 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,8 +1,8 @@
 PRGNAM="gpac"
-VERSION="svn_r5564"
-HOMEPAGE="http://gpac.wp.institut-telecom.fr/"
-DOWNLOAD="https://www.dropbox.com/s/pun5nsyowv4wuax/gpac-svn_r5564.tar.xz?dl=0"
-MD5SUM="a9ad34d56dc7edfe6b85e0ba6fbf7a19"
+VERSION="git20151020"
+HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+DOWNLOAD="https://www.dropbox.com/s/26k4chj4m4ym0su/gpac-git20151020.tar.xz"
+MD5SUM="026a306ac0f0c61a412e33ee49a86693"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gpodder/gpodder.SlackBuild b/multimedia/gpodder/gpodder.SlackBuild
index fd529efd0b..a014a9914a 100644
--- a/multimedia/gpodder/gpodder.SlackBuild
+++ b/multimedia/gpodder/gpodder.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gpodder
-VERSION=${VERSION:-3.8.4}
+VERSION=${VERSION:-3.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/gpodder/gpodder.info b/multimedia/gpodder/gpodder.info
index 03fb674b1b..428e8f062f 100644
--- a/multimedia/gpodder/gpodder.info
+++ b/multimedia/gpodder/gpodder.info
@@ -1,8 +1,8 @@
 PRGNAM="gpodder"
-VERSION="3.8.4"
+VERSION="3.8.5"
 HOMEPAGE="http://gpodder.org/"
-DOWNLOAD="http://gpodder.org/src/gpodder-3.8.4.tar.gz"
-MD5SUM="277de4e0d8c0cf5459e9c9cd45ab5cc6"
+DOWNLOAD="http://gpodder.org/src/gpodder-3.8.5.tar.gz"
+MD5SUM="df651a331c91ebd634c0d0b5ae8f7ea2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="feedparser mygpoclient"
diff --git a/multimedia/guvcview/guvcview.SlackBuild b/multimedia/guvcview/guvcview.SlackBuild
index 3df98ff7bf..89ab23eaa1 100644
--- a/multimedia/guvcview/guvcview.SlackBuild
+++ b/multimedia/guvcview/guvcview.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for GuvcView.
 #
-# Copyright 2010-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2010-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=guvcview
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/guvcview/guvcview.info b/multimedia/guvcview/guvcview.info
index 295d3e237a..7e88cadaa9 100644
--- a/multimedia/guvcview/guvcview.info
+++ b/multimedia/guvcview/guvcview.info
@@ -1,8 +1,8 @@
 PRGNAM="guvcview"
-VERSION="2.0.1"
+VERSION="2.0.2"
 HOMEPAGE="http://guvcview.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/guvcview/source/guvcview-src-2.0.1.tar.gz"
-MD5SUM="54e608b8a2c13d96f546197117d758f4"
+DOWNLOAD="http://downloads.sourceforge.net/project/guvcview/source/guvcview-src-2.0.2.tar.gz"
+MD5SUM="d88a1bcf80c0d989ffcb19d71bdd8c1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg portaudio SDL2 gsl"
diff --git a/multimedia/kdenlive/kdenlive.SlackBuild b/multimedia/kdenlive/kdenlive.SlackBuild
index 5e1102256c..874bf5e963 100644
--- a/multimedia/kdenlive/kdenlive.SlackBuild
+++ b/multimedia/kdenlive/kdenlive.SlackBuild
@@ -62,7 +62,7 @@
 
 PRGNAM=kdenlive
 VERSION=${VERSION:-0.9.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -105,8 +105,9 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/locales.patch
 # Workaround for CMakeList.txt error at build time on some versions of Slackware
 sed -i.bak -e '69d' src/CMakeLists.txt
   cmake \
diff --git a/multimedia/kdenlive/locales.patch b/multimedia/kdenlive/locales.patch
new file mode 100644
index 0000000000..2e2f9b8bd9
--- /dev/null
+++ b/multimedia/kdenlive/locales.patch
@@ -0,0 +1,245 @@
+diff -Naur a/po/bs/CMakeLists.txt b/po/bs/CMakeLists.txt
+--- a/po/bs/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/bs/CMakeLists.txt	2015-11-04 14:08:11.439085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(bs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ca/CMakeLists.txt b/po/ca/CMakeLists.txt
+--- a/po/ca/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/ca/CMakeLists.txt	2015-11-04 14:08:11.501085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ca ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ca@valencia/CMakeLists.txt b/po/ca@valencia/CMakeLists.txt
+--- a/po/ca@valencia/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/ca@valencia/CMakeLists.txt	2015-11-04 14:08:11.494085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ca@valencia ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/cs/CMakeLists.txt b/po/cs/CMakeLists.txt
+--- a/po/cs/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/cs/CMakeLists.txt	2015-11-04 14:08:11.334085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(cs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/da/CMakeLists.txt b/po/da/CMakeLists.txt
+--- a/po/da/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/da/CMakeLists.txt	2015-11-04 14:08:11.543085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(da ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/de/CMakeLists.txt b/po/de/CMakeLists.txt
+--- a/po/de/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/de/CMakeLists.txt	2015-11-04 14:08:11.384085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(de ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/el/CMakeLists.txt b/po/el/CMakeLists.txt
+--- a/po/el/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/el/CMakeLists.txt	2015-11-04 14:08:11.377085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(el ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/es/CMakeLists.txt b/po/es/CMakeLists.txt
+--- a/po/es/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/es/CMakeLists.txt	2015-11-04 14:08:11.445085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(es ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/et/CMakeLists.txt b/po/et/CMakeLists.txt
+--- a/po/et/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/et/CMakeLists.txt	2015-11-04 14:08:11.353085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(et ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/fi/CMakeLists.txt b/po/fi/CMakeLists.txt
+--- a/po/fi/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/fi/CMakeLists.txt	2015-11-04 14:08:11.457085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(fi ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ga/CMakeLists.txt b/po/ga/CMakeLists.txt
+--- a/po/ga/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/ga/CMakeLists.txt	2015-11-04 14:08:11.507085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ga ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/gl/CMakeLists.txt b/po/gl/CMakeLists.txt
+--- a/po/gl/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/gl/CMakeLists.txt	2015-11-04 14:08:11.477085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(gl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/he/CMakeLists.txt b/po/he/CMakeLists.txt
+--- a/po/he/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/he/CMakeLists.txt	2015-11-04 14:08:11.408085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(he ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/hr/CMakeLists.txt b/po/hr/CMakeLists.txt
+--- a/po/hr/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/hr/CMakeLists.txt	2015-11-04 14:08:11.346085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(hr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/hu/CMakeLists.txt b/po/hu/CMakeLists.txt
+--- a/po/hu/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/hu/CMakeLists.txt	2015-11-04 14:08:11.488085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(hu ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/it/CMakeLists.txt b/po/it/CMakeLists.txt
+--- a/po/it/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/it/CMakeLists.txt	2015-11-04 14:08:11.390085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(it ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ja/CMakeLists.txt b/po/ja/CMakeLists.txt
+--- a/po/ja/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/ja/CMakeLists.txt	2015-11-04 14:08:11.402085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ja ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/lt/CMakeLists.txt b/po/lt/CMakeLists.txt
+--- a/po/lt/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/lt/CMakeLists.txt	2015-11-04 14:08:11.365085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(lt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/mr/CMakeLists.txt b/po/mr/CMakeLists.txt
+--- a/po/mr/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/mr/CMakeLists.txt	2015-11-04 14:08:11.414085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(mr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/nb/CMakeLists.txt b/po/nb/CMakeLists.txt
+--- a/po/nb/CMakeLists.txt	2014-05-16 14:46:42.000000000 +0400
++++ b/po/nb/CMakeLists.txt	2015-11-04 14:08:11.371085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/nds/CMakeLists.txt b/po/nds/CMakeLists.txt
+--- a/po/nds/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/nds/CMakeLists.txt	2015-11-04 14:08:11.420085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(nds ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/nl/CMakeLists.txt b/po/nl/CMakeLists.txt
+--- a/po/nl/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/nl/CMakeLists.txt	2015-11-04 14:08:11.470085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(nl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/pl/CMakeLists.txt b/po/pl/CMakeLists.txt
+--- a/po/pl/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/pl/CMakeLists.txt	2015-11-04 14:08:11.427085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(pl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/pt/CMakeLists.txt b/po/pt/CMakeLists.txt
+--- a/po/pt/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/pt/CMakeLists.txt	2015-11-04 14:08:11.463085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(pt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/pt_BR/CMakeLists.txt b/po/pt_BR/CMakeLists.txt
+--- a/po/pt_BR/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/pt_BR/CMakeLists.txt	2015-11-04 14:08:11.531085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(pt_BR ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ro/CMakeLists.txt b/po/ro/CMakeLists.txt
+--- a/po/ro/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/ro/CMakeLists.txt	2015-11-04 14:08:11.525085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ro ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ru/CMakeLists.txt b/po/ru/CMakeLists.txt
+--- a/po/ru/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/ru/CMakeLists.txt	2015-11-04 14:08:11.451085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/sk/CMakeLists.txt b/po/sk/CMakeLists.txt
+--- a/po/sk/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/sk/CMakeLists.txt	2015-11-04 14:08:11.483085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(sk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/sl/CMakeLists.txt b/po/sl/CMakeLists.txt
+--- a/po/sl/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/sl/CMakeLists.txt	2015-11-04 14:08:11.359085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(sl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/sv/CMakeLists.txt b/po/sv/CMakeLists.txt
+--- a/po/sv/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/sv/CMakeLists.txt	2015-11-04 14:08:11.537085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(sv ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/tr/CMakeLists.txt b/po/tr/CMakeLists.txt
+--- a/po/tr/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/tr/CMakeLists.txt	2015-11-04 14:08:11.340085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(tr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/ug/CMakeLists.txt b/po/ug/CMakeLists.txt
+--- a/po/ug/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/ug/CMakeLists.txt	2015-11-04 14:08:11.513085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(ug ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/uk/CMakeLists.txt b/po/uk/CMakeLists.txt
+--- a/po/uk/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/uk/CMakeLists.txt	2015-11-04 14:08:11.433085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(uk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/zh_CN/CMakeLists.txt b/po/zh_CN/CMakeLists.txt
+--- a/po/zh_CN/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/zh_CN/CMakeLists.txt	2015-11-04 14:08:11.328085810 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(zh_CN ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+diff -Naur a/po/zh_TW/CMakeLists.txt b/po/zh_TW/CMakeLists.txt
+--- a/po/zh_TW/CMakeLists.txt	2014-05-16 14:46:43.000000000 +0400
++++ b/po/zh_TW/CMakeLists.txt	2015-11-04 14:08:11.519085811 +0400
+@@ -1,2 +1,2 @@
+ file(GLOB _po_files *.po)
+-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
++GETTEXT_PROCESS_PO_FILES(zh_TW ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
diff --git a/multimedia/kodi/README b/multimedia/kodi/README
index b4f4da9a08..50fa952601 100644
--- a/multimedia/kodi/README
+++ b/multimedia/kodi/README
@@ -1,13 +1,13 @@
-XBMC is an award winning media center application for Linux, Mac OS X,
-Windows and XBox. The ultimate hub for all your media, XBMC is easy to
-use, looks slick, and has a large helpful community.  XBMC supports
+Kodi is an award winning media center application for Linux, Mac OS X,
+Windows and XBox. The ultimate hub for all your media, Kodi is easy to
+use, looks slick, and has a large helpful community.  Kodi supports
 viewing and playing a vast library of audio, video and image formats.
-XBMC has a sophisticated library management system that allows you to
+Kodi has a sophisticated library management system that allows you to
 organize all your media to give you quick and immediate access.
 
 Optional dependencies: libcec, pulseaudio, libbluray, libnfs, libva,
 libdvdcss, lirc, cwiid, pybluez, id3lib, libvdpau, rtmpdump, afpfs-ng,
-libmicrohttpd, avahi, lame, SDL2, cryptopp, and jsoncpp
+avahi, lame, SDL2, libmodplug and openjdk
 
 Optional: libcrystalhd and libshairport (not available at slackbuilds.org)
 
@@ -15,10 +15,12 @@ Below are some paramaters that can be passed to the slackbuild to turn
 on some optional components.
 
 WII=yes|no (Default is no), requires cwiid and pybluez
-WEBSERVER=yes|no (Default is no), requires libmicrohttpd
+WEBSERVER=yes|no (Default is yes), requires libmicrohttpd
 PULSE=yes|no (Default is no), requires pulseaudio
 
 NOTE:
+Kodi can be compiled with openjdk instead of jdk.
+
 Please remove or rename /etc/oss.conf if it exists on your system
 prior to building this package or it will fail to build.
 
diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild
index 6bc6becc0a..f4171e6527 100644
--- a/multimedia/kodi/kodi.SlackBuild
+++ b/multimedia/kodi/kodi.SlackBuild
@@ -24,8 +24,9 @@
 
 PRGNAM=kodi
 SRCNAM=xbmc
-VERSION=${VERSION:-14.2}
-FFMPEGVER=${FFMPEGVER:-2.4.6}
+CODNAM=Isengard
+VERSION=${VERSION:-15.2}
+FFMPEGVER=${FFMPEGVER:-2.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,7 +44,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=native -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,15 +62,14 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION-Helix
-tar xvf $CWD/$SRCNAM-$VERSION-Helix.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION-Helix.tar.gz
-cd $SRCNAM-$VERSION-Helix
-tar xvf $CWD/$SRCNAM-pvr-addons-Helix_rc3.tar.gz 2>/dev/null || tar xvf $CWD/Helix_rc3.tar.gz
+rm -rf $SRCNAM-$VERSION-$CODNAM
+tar xvf $CWD/$SRCNAM-$VERSION-$CODNAM.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION-$CODNAM.tar.gz
+cd $SRCNAM-$VERSION-$CODNAM
 # Don't have the Makefile download ffmpeg during install.
-if [ -f "$CWD/FFmpeg-${FFMPEGVER}-Helix.tar.gz" ]; then
-  ln -s $CWD/FFmpeg-${FFMPEGVER}-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-Helix.tar.gz
-elif [ -f "$CWD/${FFMPEGVER}-Helix.tar.gz" ]; then
-  ln -s $CWD/${FFMPEGVER}-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-Helix.tar.gz
+if [ -f "$CWD/FFmpeg-${FFMPEGVER}-${CODNAM}.tar.gz" ]; then
+  ln -s $CWD/FFmpeg-${FFMPEGVER}-${CODNAM}.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}.tar.gz
+elif [ -f "$CWD/${FFMPEGVER}-${CODNAM}.tar.gz" ]; then
+  ln -s $CWD/${FFMPEGVER}-${CODNAM}.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}.tar.gz
 else
   echo "FFMPEG wasn't found. Please download it and have it available"
   echo "in the source directory ${CWD}."
@@ -82,13 +82,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix for sse2 cpu's.
-if grep 'sse2' /proc/cpuinfo 2>&1 > /dev/null; then
-  patch -p1 < $CWD/patches/sse2.patch
-fi
-
 # No need to show Git: "Version" in a release build.
-sed -i '/Git:/s|.*|    return GetVersionShort();|' $SRCNAM/GUIInfoManager.cpp
+sed -i '/Git:/s|.*|  return GetVersionShort();|' $SRCNAM/GUIInfoManager.cpp
 
 # Patch for building against rtmpdump. Only needed if xbmc fails to build
 # w/rtmpdump.  See the following link for a rather obtuse explanation.
@@ -99,7 +94,11 @@ patch -p1 < $CWD/patches/xbmc-Gotham-rtmpdump-build.patch
 patch -p1 < $CWD/patches/xbmc-Helix-samba-4.0.patch
 
 # Use installed libdvdread.
-patch -p1 < $CWD/patches/xbmc-13.0-dvdread.patch
+patch -p1 < $CWD/patches/xbmc-15.0-dvdread.patch
+
+# Fix static linking for Texturepacker. Thanks to Gentoo.
+# Issue: http://forum.kodi.tv/showthread.php?tid=220407
+patch -p0 < $CWD/patches/kodi-texturepacker.patch
 
 # Hack for using afpfs-ng.
 cat lib/afpfs-ng/fix_afpfs-ng_includes.patch | head -1336 | tail -1172 | patch -p1
@@ -115,7 +114,7 @@ else
 fi
 
 # Build webserver. Requires libmicrohttpd.
-if [ "${WEBSERVER:-no}" == "yes" ]; then
+if [ "${WEBSERVER:-yes}" == "yes" ]; then
   OPT_DEPS="$OPT_DEPS --enable-webserver"
 else
   OPT_DEPS="$OPT_DEPS --disable-webserver"
@@ -126,32 +125,7 @@ if [ "${PULSE:-no}" == "yes" ]; then
   OPT_DEPS="$OPT_DEPS --enable-pulse"
 fi
 
-# Build the pvr addons.
-cd $SRCNAM-pvr-addons-Helix_rc3
-  # Fix include statements. Only needed if jsoncpp is installed.
-  if [ -d /usr/include/jsoncpp ]; then
-    sed -i 's|<json.*/|<jsoncpp/|' addons/*/*/*.*
-    sed -i '/sstream/s|.*|&\n#include <iostream>|' addons/*/*/FilmonAPI.cpp
-  fi
-  ./bootstrap
-  CFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS -DGL_GLEXT_PROTOTYPES" \
-  CXXFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS -DGL_GLEXT_PROTOTYPES" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX}/xbmc/addons \
-    --enable-release \
-    --enable-addons-with-dependencies \
-    --enable-static=no \
-    --disable-silent-rules \
-    --disable-dependency-tracking \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --build=$ARCH-slackware-linux
-
-    make
-cd -
-
-# Only link to static library.
-sed -i 's|-lsquish-native|-lsquish|' tools/TexturePacker/Makefile.in
+export PATH="$PATH:$PWD/tools/depends/native/JsonSchemaBuilder/bin"
 
 # Need to fix an autoreconf error with older version of pkg-config.
 # http://forum.kodi.tv/showthread.php?tid=195791
@@ -209,9 +183,7 @@ if ! [ "${WII:-no}" = "no" ]; then
 fi
 gzip -9 $PKG/usr/man/man?/*.?
 
-cp -a \
-  tools/EventClients/README.txt $SRCNAM-pvr-addons-Helix_rc3/COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a tools/EventClients/README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Final clean up.
diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info
index d3e1cdd76f..2b5b4114d6 100644
--- a/multimedia/kodi/kodi.info
+++ b/multimedia/kodi/kodi.info
@@ -1,14 +1,12 @@
 PRGNAM="kodi"
-VERSION="14.2"
+VERSION="15.2"
 HOMEPAGE="http://xbmc.org/"
-DOWNLOAD="https://github.com/xbmc/xbmc/archive/14.2-Helix.tar.gz \
-          https://github.com/opdenkamp/xbmc-pvr-addons/archive/Helix_rc3.tar.gz \
-          https://github.com/xbmc/FFmpeg/archive/2.4.6-Helix.tar.gz"
-MD5SUM="aa534c483cdd6cda71e5350c2094175b \
-        5fd7b09f11e0fb6c3a8874d4ed20a694 \
-        92f6208f6908ef1586bf34764ebeb073"
+DOWNLOAD="https://github.com/xbmc/xbmc/archive/15.2-Isengard.tar.gz \
+          https://github.com/xbmc/FFmpeg/archive/2.6.4-Isengard.tar.gz"
+MD5SUM="c2fc432da92df09ca827d39e32167880 \
+        3dbd015fbfea2cbedf1fbd0779ab987e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk libass libmpeg2 libmodplug yajl tinyxml"
+REQUIRES="jdk libass libmpeg2 yajl tinyxml libmicrohttpd"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/multimedia/kodi/patches/kodi-texturepacker.patch b/multimedia/kodi/patches/kodi-texturepacker.patch
new file mode 100644
index 0000000000..fe3dcdcf7a
--- /dev/null
+++ b/multimedia/kodi/patches/kodi-texturepacker.patch
@@ -0,0 +1,17 @@
+--- tools/depends/native/TexturePacker/Makefile.old	2015-03-17 22:29:18.880029509 +0100
++++ tools/depends/native/TexturePacker/Makefile	2015-03-17 22:29:41.459671679 +0100
+@@ -9,14 +9,10 @@
+ 
+ ifeq ($(NATIVEPLATFORM),)
+   PLATFORM = native
+-  EXTRA_CONFIGURE = --enable-static
+ else
+   PLATFORM = $(NATIVEPLATFORM)
+ endif
+ 
+-ifeq ($(NATIVE_OS), linux)
+-  EXTRA_CONFIGURE = --enable-static
+-endif
+ ifeq ($(NATIVE_OS), android)
+   EXTRA_CONFIGURE = --enable-static
+ endif
diff --git a/multimedia/kodi/patches/sse2.patch b/multimedia/kodi/patches/sse2.patch
deleted file mode 100644
index d9b730ed2f..0000000000
--- a/multimedia/kodi/patches/sse2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Git-xbmc.orig/lib/libsquish/config Git-xbmc/lib/libsquish/config
---- Git-xbmc.orig/lib/libsquish/config	2012-11-18 14:14:35.000000000 +0000
-+++ Git-xbmc/lib/libsquish/config	2012-12-07 02:54:22.864062271 +0000
-@@ -4,7 +4,7 @@
- USE_ALTIVEC ?= 0
- 
- # define to 1 to use SSE2 instructions
--USE_SSE ?= 0
-+USE_SSE ?= 1
- 
- # default flags
- CXXFLAGS ?= -O2
diff --git a/multimedia/kodi/patches/xbmc-13.0-dvdread.patch b/multimedia/kodi/patches/xbmc-13.0-dvdread.patch
deleted file mode 100644
index d694a95cae..0000000000
--- a/multimedia/kodi/patches/xbmc-13.0-dvdread.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date: Mon, 6 May 2013 17:07:40 -0600
-Subject: [PATCH 1/3] Fedora: use external dvdread
-
-Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
----
- bootstrap.mk           |  5 -----
- configure.in           | 19 -------------------
- lib/libdvd/Makefile.in | 20 +++++++-------------
- 3 files changed, 7 insertions(+), 37 deletions(-)
-
-diff --git a/bootstrap.mk b/bootstrap.mk
-index 8bc4795..1fc31a4 100644
---- a/bootstrap.mk
-+++ b/bootstrap.mk
-@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
- DVD_CSS=lib/libdvd/libdvdcss/configure
- endif
--BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
- 
- ifneq ($(wildcard pvr-addons/Makefile.am),)
-@@ -18,10 +17,6 @@ endif
- BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
- all: $(BOOTSTRAP_TARGETS)
- 
--#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
--lib/libdvd/libdvdread/configure: $(DVD_CSS)
--lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
--
- %: %.ac
- 	autoreconf -vif $(@D)
- 	-@rm -rf $(@D)/autom4te.cache
-diff --git a/configure.in b/configure.in
-index beb8aac..343292e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2860,27 +2860,9 @@
-     --with-pic
- ], [$SKIP_CONFIG_DVDCSS])
- 
--XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
--  ./configure2 \
--    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
--    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--    --host=$host_alias \
--    --build=$build_alias \
--    --target=$target_alias \      
--    --enable-static \
--    --disable-shared \
--    --disable-strip \
--    --disable-opts \
--    --cc="$CC" &&
--  mkdir -p `pwd`/../includes/dvdread
--  cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
--  cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
--], [0])
--
- XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
-   ./configure2 \
-     --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
--    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
-     --with-dvdread-config="`pwd`/../dvdread-config" \
-     --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
-     --host=$host_alias \
-diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
-index 69d2286..1f5eebb 100644
---- a/lib/libdvd/Makefile.in
-+++ b/lib/libdvd/Makefile.in
-@@ -5,8 +5,7 @@ CXX=@CXX@
- 
- SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
- SOS= libdvdnav-$(ARCH).so
--DIRS=	libdvdread \
--	libdvdnav
-+DIRS=	libdvdnav
- 
- WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
- WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
-@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al
- ifeq ($(findstring osx,$(ARCH)),osx)
- LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
- else
--LDFLAGS += -shared -fPIC -rdynamic
-+LDFLAGS += -shared -fPIC -rdynamic -ldvdread
- endif
- 
- ifeq ($(ARCH), powerpc-osx)
-@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS))
- 
- DISTCLEAN_FILES=includes/dvdread/*.h \
- 		includes/dvdcss/*.h \
--		libdvdnav/config.h \
--		libdvdread/config.h
-+		libdvdnav/config.h
- 
- .PHONY: $(DIRS) compile
- 
-@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so:  $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
- 	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
- 		$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
- 
--$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
-+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
- 	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
--		$(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
-+		$(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
- 
- else
- 
-@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- 		libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
--$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
--	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
-+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
- 		-Wl,--unresolved-symbols=ignore-all \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
-@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
- libdvdcss: compile
- 	$(MAKE) -C $@
- 
--libdvdread/obj/libdvdread.a: libdvdread;
--libdvdread: compile
--	$(MAKE) -C $@
--
- libdvdnav/obj/libdvdnav.a: libdvdnav;
- libdvdnav: compile
- 	$(MAKE) -C $@
--- 
-1.8.5.3
-
diff --git a/multimedia/kodi/patches/xbmc-15.0-dvdread.patch b/multimedia/kodi/patches/xbmc-15.0-dvdread.patch
new file mode 100644
index 0000000000..1387245c77
--- /dev/null
+++ b/multimedia/kodi/patches/xbmc-15.0-dvdread.patch
@@ -0,0 +1,138 @@
+From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <ktdreyer@ktdreyer.com>
+Date: Mon, 6 May 2013 17:07:40 -0600
+Subject: [PATCH 1/3] Fedora: use external dvdread
+
+Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
+(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
+---
+ bootstrap.mk           |  5 -----
+ configure.in           | 19 -------------------
+ lib/libdvd/Makefile.in | 20 +++++++-------------
+ 3 files changed, 7 insertions(+), 37 deletions(-)
+
+diff --git a/bootstrap.mk b/bootstrap.mk
+index 8bc4795..1fc31a4 100644
+--- a/bootstrap.mk
++++ b/bootstrap.mk
+@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
+ BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
+ DVD_CSS=lib/libdvd/libdvdcss/configure
+ endif
+-BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
+ BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
+ 
+ ifneq ($(wildcard pvr-addons/Makefile.am),)
+@@ -18,10 +17,6 @@ endif
+ BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
+ all: $(BOOTSTRAP_TARGETS)
+ 
+-#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
+-lib/libdvd/libdvdread/configure: $(DVD_CSS)
+-lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
+-
+ %: %.ac
+ 	autoreconf -vif $(@D)
+ 	-@rm -rf $(@D)/autom4te.cache
+diff --git a/configure.in b/configure.in
+index beb8aac..343292e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2860,27 +2860,9 @@
+     --with-pic
+ ], [$SKIP_CONFIG_DVDCSS])
+ 
+-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
+-  ./configure2 \
+-    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
+-    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+-    --host=$host_alias \
+-    --build=$build_alias \
+-    --target=$target_alias \      
+-    --enable-static \
+-    --disable-shared \
+-    --disable-strip \
+-    --disable-opts \
+-    --cc="$CC" &&
+-  mkdir -p `pwd`/../includes/dvdread
+-  cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
+-  cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
+-], [0])
+-
+ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
+   ./configure2 \
+     --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
+-    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
+     --with-dvdread-config="`pwd`/../dvdread-config" \
+     --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+     --host=$host_alias \
+diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
+index 69d2286..1f5eebb 100644
+--- a/lib/libdvd/Makefile.in
++++ b/lib/libdvd/Makefile.in
+@@ -5,8 +5,7 @@ CXX=@CXX@
+ 
+ SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
+ SOS= libdvdnav-$(ARCH).so
+-DIRS=	libdvdread \
+-	libdvdnav
++DIRS=	libdvdnav
+ 
+ WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
+@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al
+ ifeq ($(findstring osx,$(ARCH)),osx)
+ LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
+ else
+-LDFLAGS += -shared -fPIC -rdynamic
++LDFLAGS += -shared -fPIC -rdynamic -ldvdread
+ endif
+ 
+ ifeq ($(ARCH), powerpc-osx)
+@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS))
+ 
+ DISTCLEAN_FILES=includes/dvdread/*.h \
+ 		includes/dvdcss/*.h \
+-		libdvdnav/config.h \
+-		libdvdread/config.h
++		libdvdnav/config.h
+ 
+ .PHONY: $(DIRS) compile
+ 
+@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so:  $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
+ 	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
+ 		$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
+ 
+-$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
++$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+ 	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
+-		$(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
++		$(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
+ 
+ else
+ 
+@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
+ 		libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
+-	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
++$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
++	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
+ 		-Wl,--unresolved-symbols=ignore-all \
+ 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
+ 
+@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
+ libdvdcss: compile
+ 	$(MAKE) -C $@
+ 
+-libdvdread/obj/libdvdread.a: libdvdread;
+-libdvdread: compile
+-	$(MAKE) -C $@
+-
+ libdvdnav/obj/libdvdnav.a: libdvdnav;
+ libdvdnav: compile
+ 	$(MAKE) -C $@
+-- 
+1.8.5.3
+
diff --git a/multimedia/lives/lives.SlackBuild b/multimedia/lives/lives.SlackBuild
index c58f300101..63600c2666 100644
--- a/multimedia/lives/lives.SlackBuild
+++ b/multimedia/lives/lives.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for "lives".
 
-# Copyright -2015 Yanes Checcacci Balod <yanes@pobox.com>, Brazil
+# Copyright 2014-2015 Yanes Checcacci Balod <yanes@pobox.com>, Brazil
 # Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
 #
@@ -27,7 +27,7 @@
 
 PRGNAM=lives
 SRCNAM=LiVES
-VERSION=${VERSION:-2.4.0}
+VERSION=${VERSION:-2.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,10 +73,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p0 < $CWD/pulseaudio.patch
-patch -p2 < $CWD/osc.patch
-
-autoreconf -if
 # includes some multilib support
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -101,7 +97,6 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# symlink to relative path
 (
   cd $PKG/usr/bin && rm -f lives && ln -s lives-exe lives
 )
diff --git a/multimedia/lives/lives.info b/multimedia/lives/lives.info
index 29465a4aa5..441b504e37 100644
--- a/multimedia/lives/lives.info
+++ b/multimedia/lives/lives.info
@@ -1,8 +1,8 @@
 PRGNAM="lives"
-VERSION="2.4.0"
+VERSION="2.4.6"
 HOMEPAGE="http://lives.sourceforge.net"
-DOWNLOAD="http://www.xs4all.nl/~salsaman/lives/current/LiVES-2.4.0.tar.bz2"
-MD5SUM="1a4f2fd733a081b6c62ff0227157e3be"
+DOWNLOAD="http://lives-video.com/releases/LiVES-2.4.6.tar.bz2"
+MD5SUM="3249657af1310db812ff8bdb7e53cfe5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack2"
diff --git a/multimedia/lwks/README b/multimedia/lwks/README
index 9a1db1cf82..7ea49a1f14 100644
--- a/multimedia/lwks/README
+++ b/multimedia/lwks/README
@@ -1,30 +1,12 @@
 Lightworks is a cross-platform industry-grade NLE, having been used for films including Pulp Fiction, Hugo, and The King's Speech.
 It is free to use, but for additional codec support and technical support, you can purchase a variety of licenses from http://lwks.com
 
-Lightworks features supports a wide variety of container formats (including Quicktime, MXF OPAtom for native Avid support, mp4, avi, mpg, and more)
-GPU-accelerated colour correction, EDL export, automatic backups, metadata exchange, project sharing (in Pro version only),
-AAF interchange for Avid Media Composer, Pro Tools, and Resolve (Pro only), RED and DPX imports, SD/HD/2k preview, and much more.
-
-Lightworks is 64bit only.
-
-Registration:
--------------
-
 Using Lightworks requires registration on lwks.com. It is free, but you must register in order to use the application.
 You can register in advance or after you launch Lightworks.
 
-
-Graphics Cards:
----------------
-
 Lightworks will work with Nvidia or AMD graphic cards, but Nvidia is recommended. Lightworks requires proprietary Nvidia drivers.
 
-
-Requires:
----------
-
-ffmpeg
-
+Lightworks is 64bit only.
 
 System Recommendations:
 -----------------------
@@ -41,7 +23,6 @@ From lwks.com:
 - (Optional) a Lightworks Console.
 - (Optional) a Lightworks keyboard.
 
-
 From Klaatu:
 
 I run this on two machines:
diff --git a/multimedia/lwks/lwks.SlackBuild b/multimedia/lwks/lwks.SlackBuild
index 993ad92545..ff6655fcd1 100644
--- a/multimedia/lwks/lwks.SlackBuild
+++ b/multimedia/lwks/lwks.SlackBuild
@@ -9,7 +9,7 @@
 # without any warranty.
 
 PRGNAM=lwks
-VERSION=${VERSION:-12.0.3.I}
+VERSION=${VERSION:-12.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=amd64
@@ -38,10 +38,15 @@ find -L . \
 ## install
 mkdir -p $PKG/usr/bin $PKG/usr/lib64 $PKG/usr/share/fonts/TTF
 cp -v $TMP/usr/bin/lightworks $PKG/usr/bin/
-cp -rv $TMP/usr/lib/* $PKG/usr/lib64
+cp -rv $TMP/usr/lib/* $PKG/usr/lib64/
 cp -rv $TMP/usr/share/applications $PKG/usr/share/
 cp -rv $TMP/usr/share/fonts/truetype/lw3.ttf $PKG/usr/share/fonts/TTF/
 cp -rv $TMP/usr/share/lightworks $PKG/usr/share/
+
+# arch patch thanks to Marco Lavorini
+sed -i 's|/usr/lib/lightworks/spawn|/usr/lib64/lightworks/spawn|' \
+$PKG/usr/bin/lightworks
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/lwks/lwks.info b/multimedia/lwks/lwks.info
index 4a34078c26..fa77542867 100644
--- a/multimedia/lwks/lwks.info
+++ b/multimedia/lwks/lwks.info
@@ -1,10 +1,10 @@
 PRGNAM="lwks"
-VERSION="12.0.3.I"
+VERSION="12.5.0"
 HOMEPAGE="http://lwks.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="http://www.lwks.com/dmpub/lwks-12.0.3.I-amd64.deb"
-MD5SUM_x86_64="655c91254d1687e5fcec88e7b0657e6c"
-REQUIRES=""
+DOWNLOAD_x86_64="http://www.lwks.com/dmpub/lwks-12.5.0-amd64.deb"
+MD5SUM_x86_64="d7f1fd856a0c1e03affd1d4fe044d75b"
+REQUIRES="nvidia-cg-toolkit"
 MAINTAINER="klaatu"
 EMAIL="klaatu@member.fsf.org"
diff --git a/multimedia/makemkv/makemkv.SlackBuild b/multimedia/makemkv/makemkv.SlackBuild
index 878f422fd7..c679d96317 100644
--- a/multimedia/makemkv/makemkv.SlackBuild
+++ b/multimedia/makemkv/makemkv.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=makemkv
-VERSION=${VERSION:-1.9.4}
+VERSION=${VERSION:-1.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,10 +58,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# -D__STDC_CONSTANT_MACROS is a workaround for cadec in 1.9.3
-# No macros from __STDC_LIMIT_MACROS are used so don't bother passing it
-SLKCFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS"
-
 # Note: MakeMKV now includes a mips32 binary, but since there is no official
 # MIPS Slackware port I'm ignoring it unless someone complains. Still no ARM
 # version.
diff --git a/multimedia/makemkv/makemkv.info b/multimedia/makemkv/makemkv.info
index 8da010418f..50370754c0 100644
--- a/multimedia/makemkv/makemkv.info
+++ b/multimedia/makemkv/makemkv.info
@@ -1,10 +1,10 @@
 PRGNAM="makemkv"
-VERSION="1.9.4"
+VERSION="1.9.7"
 HOMEPAGE="http://www.makemkv.com/"
-DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.9.4.tar.gz \
-          http://www.makemkv.com/download/makemkv-bin-1.9.4.tar.gz"
-MD5SUM="10343016cd76df74c771f16b16cd5f0a \
-        3ec48cd40e06301dde48d72623ddbcc2"
+DOWNLOAD="http://www.makemkv.com/download/makemkv-oss-1.9.7.tar.gz \
+          http://www.makemkv.com/download/makemkv-bin-1.9.7.tar.gz"
+MD5SUM="2c0b0d31d1e1fb8576db024c7f02399c \
+        52bd49e4667284ce27cbec6a5d8b8877"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/multimedia/minidlna/minidlna.SlackBuild b/multimedia/minidlna/minidlna.SlackBuild
index 577505a6b9..a1e2d4b26a 100644
--- a/multimedia/minidlna/minidlna.SlackBuild
+++ b/multimedia/minidlna/minidlna.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=minidlna
-VERSION=${VERSION:-20150410}
+VERSION=${VERSION:-1.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/multimedia/minidlna/minidlna.info b/multimedia/minidlna/minidlna.info
index 3ec94d2a1e..1dad012127 100644
--- a/multimedia/minidlna/minidlna.info
+++ b/multimedia/minidlna/minidlna.info
@@ -1,8 +1,8 @@
 PRGNAM="minidlna"
-VERSION="20150410"
+VERSION="1.1.5"
 HOMEPAGE="http://minidlna.sourceforge.net/"
-DOWNLOAD="http://mirror.slackware.hr/sources/minidlna/minidlna-20150410.tar.bz2"
-MD5SUM="8944e44d6263599f3bbf32bd2f223b23"
+DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna-1.1.5.tar.gz"
+MD5SUM="1970e553a1eb8a3e7e302e2ce292cbc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index 3f935bccb5..d48308ba44 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mpv
 
-# Copyright 2014 John Vogel Corning, NY USA
+# Copyright 2015 John Vogel Corning, NY USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpv
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,7 +63,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-cp $CWD/waf-1.8.4 $PRGNAM-$VERSION/waf
+cp $CWD/waf-1.8.12 $PRGNAM-$VERSION/waf
 chmod +x $PRGNAM-$VERSION/waf
 cd $PRGNAM-$VERSION
 chown -R root:root .
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
index 20689b79f5..7cbbb634a7 100644
--- a/multimedia/mpv/mpv.info
+++ b/multimedia/mpv/mpv.info
@@ -1,10 +1,10 @@
 PRGNAM="mpv"
-VERSION="0.9.2"
+VERSION="0.10.0"
 HOMEPAGE="http://mpv.io"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.9.2.tar.gz
-          http://ponce.cc/slackware/sources/repo/waf-1.8.4"
-MD5SUM="ed1384e703f7032e531731842e4da4f7
-        cec616469f698d68cfd54125fa48f2a2"
+DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.10.0.tar.gz \
+          http://www.freehackers.org/~tnagy/release/waf-1.8.12"
+MD5SUM="e81a975e4fa17f500dc2e7ea3d3ecf25 \
+        cef4ee82206b1843db082d0b0506bf71"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg libass docutils"
diff --git a/multimedia/mythplugins/mythplugins.info b/multimedia/mythplugins/mythplugins.info
index fe0a560e20..76d8c05319 100644
--- a/multimedia/mythplugins/mythplugins.info
+++ b/multimedia/mythplugins/mythplugins.info
@@ -1,7 +1,7 @@
 PRGNAM="mythplugins"
 VERSION="0.27.4"
 HOMEPAGE="http://www.mythtv.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/mythtv.mirror/MythTV%200.27.4/mythtv-fixes-0.27.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/slackbuildsdirectlinks/mythtv/mythtv-fixes-0.27.tar.gz"
 MD5SUM="dc663ddb329ad8ee28be5840d3e7de94"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/multimedia/mythtv/mythtv.info b/multimedia/mythtv/mythtv.info
index aba72c8aa4..9ecc5f1801 100644
--- a/multimedia/mythtv/mythtv.info
+++ b/multimedia/mythtv/mythtv.info
@@ -1,7 +1,7 @@
 PRGNAM="mythtv"
 VERSION="0.27.4"
 HOMEPAGE="http://www.mythtv.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/mythtv.mirror/MythTV%200.27.4/mythtv-fixes-0.27.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/project/slackbuildsdirectlinks/mythtv/mythtv-fixes-0.27.tar.gz"
 MD5SUM="dc663ddb329ad8ee28be5840d3e7de94"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/multimedia/nightingale/nightingale.SlackBuild b/multimedia/nightingale/nightingale.SlackBuild
index 6636145ef1..91a102c44c 100644
--- a/multimedia/nightingale/nightingale.SlackBuild
+++ b/multimedia/nightingale/nightingale.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/multimedia/obs-studio/README b/multimedia/obs-studio/README
new file mode 100644
index 0000000000..3236fb0183
--- /dev/null
+++ b/multimedia/obs-studio/README
@@ -0,0 +1,4 @@
+This project is a rewrite of what was formerly known as "Open Broadcaster Software", software originally
+designed for recording and streaming live video content, efficiently.
+
+OBS has plug-ins for JACK and PulseAudio, so these can be viewed as optional dependencies.
diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild
new file mode 100644
index 0000000000..064a73eac1
--- /dev/null
+++ b/multimedia/obs-studio/obs-studio.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for Open Broadcaster Software
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=obs-studio
+VERSION=${VERSION:-0.12.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DUNIX_STRUCTURE=1 \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+if [ "$ARCH" = "x86_64" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/obs-studio/obs-studio.info b/multimedia/obs-studio/obs-studio.info
new file mode 100644
index 0000000000..45af9855f6
--- /dev/null
+++ b/multimedia/obs-studio/obs-studio.info
@@ -0,0 +1,10 @@
+PRGNAM="obs-studio"
+VERSION="0.12.3"
+HOMEPAGE="https://obsproject.com/"
+DOWNLOAD="https://github.com/jp9000/obs-studio/archive/0.12.3.tar.gz"
+MD5SUM="a5c561fc1d5a918e8ff28bea4adc0d6c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ffmpeg x264 qt5"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/multimedia/obs-studio/slack-desc b/multimedia/obs-studio/slack-desc
new file mode 100644
index 0000000000..1fc2902118
--- /dev/null
+++ b/multimedia/obs-studio/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   	  |-----handy-ruler--------------------------------------------------------|
+obs-studio: obs-studio (Open Broadcaster Software)
+obs-studio:
+obs-studio: This project is a rewrite of what was formerly known as "Open
+obs-studio: Broadcaster Software", software originally designed for recording and
+obs-studio: streaming live video content, efficiently.
+obs-studio:
+obs-studio: Homepage: https://obsproject.com/
+obs-studio:
+obs-studio:
+obs-studio:
+obs-studio:
diff --git a/multimedia/oggconvert/oggconvert.info b/multimedia/oggconvert/oggconvert.info
index a428313c12..0265895885 100644
--- a/multimedia/oggconvert/oggconvert.info
+++ b/multimedia/oggconvert/oggconvert.info
@@ -1,7 +1,7 @@
 PRGNAM="oggconvert"
 VERSION="0.3.3"
 HOMEPAGE="http://oggconvert.tristanb.net/"
-DOWNLOAD="http://oggconvert.tristanb.net/releases/0.3.3/oggconvert-0.3.3.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/oggconvert-0.3.3.tar.gz"
 MD5SUM="ddeb96f12b67fed5bafe1888cc5231de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/multimedia/parole/README b/multimedia/parole/README
index 38a864e9a0..e38997221a 100644
--- a/multimedia/parole/README
+++ b/multimedia/parole/README
@@ -6,4 +6,5 @@ plugins.
 The GStreamer framework provides a strong plugin interface to dynamically
 load plugins that support certain media types, the more GStreamer plugins
 you have installed in your system the more media formats you can play with
-Parole.
+Parole: gst-plugins-bad and gst-plugins-ugly are optional dependencies
+(and, recursively, their respective optional dependencies too).
diff --git a/multimedia/picard-plugins/picard-plugins.SlackBuild b/multimedia/picard-plugins/picard-plugins.SlackBuild
index 9b5025f5ad..26bd582f63 100644
--- a/multimedia/picard-plugins/picard-plugins.SlackBuild
+++ b/multimedia/picard-plugins/picard-plugins.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=picard-plugins
 DSTNAM=picard
-VERSION=${VERSION:-20150505}
+VERSION=${VERSION:-20151029}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/picard-plugins/picard-plugins.info b/multimedia/picard-plugins/picard-plugins.info
index 627a70c375..4f6ba70496 100644
--- a/multimedia/picard-plugins/picard-plugins.info
+++ b/multimedia/picard-plugins/picard-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="picard-plugins"
-VERSION="20150505"
+VERSION="20151029"
 HOMEPAGE="https://picard.musicbrainz.org/plugins/"
-DOWNLOAD="https://s.mos6581.de/static/slackbuilds.org/sources/picard-plugins-20150505.tar.xz"
-MD5SUM="dd7c701d8a4083cf20802275732fe054"
+DOWNLOAD="https://s.mos6581.de/static/slackbuilds.org/sources/picard-plugins-20151029.tar.xz"
+MD5SUM="0c590886c4b047e5f3bb7934e518a62d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="picard"
diff --git a/multimedia/pitivi/pitivi.SlackBuild b/multimedia/pitivi/pitivi.SlackBuild
index 92bdb302bd..0b64064583 100644
--- a/multimedia/pitivi/pitivi.SlackBuild
+++ b/multimedia/pitivi/pitivi.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Slackware build script for PiTiVi
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,8 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pitivi
-VERSION=${VERSION:-0.94_beta}
-SRCVERSION=${SRCVERSION:-0.94}
+VERSION=${VERSION:-0.95}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,22 +41,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-  SRCARCH=x86
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  SRCARCH=x86
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SRCARCH=x86_64
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+fi
+
+if [ `getconf LONG_BIT` = "32" ]; then
   SRCARCH=x86
+elif [ `getconf LONG_BIT` = "64" ]; then
+  SRCARCH=x86_64
+else
+  echo "Your architecture is not supported."
+  exit 1
 fi
 
 set -eu
@@ -69,10 +73,10 @@ mkdir -p $TMP/$PRGNAM-$VERSION/
 mkdir -p $PKG/opt/$PRGNAM/
 mkdir -p $PKG/usr/bin/
 cd $TMP/$PRGNAM-$VERSION/
-tar xpvf $CWD/${PRGNAM}-${SRCVERSION}-beta-${SRCARCH}.tar
+tar xpvf $CWD/${PRGNAM}-${VERSION}-beta-${SRCARCH}.tar.xz
 
-cp -av ${PRGNAM}-${SRCVERSION}-${SRCARCH} $PKG/opt/$PRGNAM/
-ln -sf ../../opt/${PRGNAM}/${PRGNAM}-${SRCVERSION}-${SRCARCH} $PKG/usr/bin/${PRGNAM}
+cp -av ${PRGNAM}-${VERSION}-${SRCARCH} $PKG/opt/$PRGNAM/
+ln -sf ../../opt/${PRGNAM}/${PRGNAM}-${VERSION}-${SRCARCH} $PKG/usr/bin/${PRGNAM}
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/pitivi/pitivi.info b/multimedia/pitivi/pitivi.info
index 6178380600..2b680b61a1 100644
--- a/multimedia/pitivi/pitivi.info
+++ b/multimedia/pitivi/pitivi.info
@@ -1,10 +1,10 @@
 PRGNAM="pitivi"
-VERSION="0.94-beta"
+VERSION="0.95"
 HOMEPAGE="http://www.pitivi.org/"
-DOWNLOAD="http://pitivi.ecchi.ca/bundles/releases/pitivi-0.94-beta-x86.tar"
-MD5SUM="b34617ed526a05ed6e15cb4654980ca8"
-DOWNLOAD_x86_64="http://pitivi.ecchi.ca/bundles/releases/pitivi-0.94-beta-x86_64.tar"
-MD5SUM_x86_64="bcd034b842cd1f590e0fd3c44f34a72e"
+DOWNLOAD="http://pitivi.ecchi.ca/bundles/releases/pitivi-0.95-beta-x86.tar.xz"
+MD5SUM="5f894e477f845cc13393101b8eb5d09b"
+DOWNLOAD_x86_64="http://pitivi.ecchi.ca/bundles/releases/pitivi-0.95-beta-x86_64.tar.xz"
+MD5SUM_x86_64="ec0d0d85eca47234309da63fd23770f1"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/multimedia/plexmediaserver/plexmediaserver.SlackBuild b/multimedia/plexmediaserver/plexmediaserver.SlackBuild
index 837372488f..fc3175925d 100644
--- a/multimedia/plexmediaserver/plexmediaserver.SlackBuild
+++ b/multimedia/plexmediaserver/plexmediaserver.SlackBuild
@@ -1,12 +1,32 @@
 #!/bin/sh
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009, 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for plexmediaserver
-# Written by Lionel Young <lionelyoung@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
+
+# Slackware build script for "plexmediaserver".
+
+# Copyright 2014-2015 Lionel Young <lionelyoung@gmail.com>
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=plexmediaserver
-VERSION=${VERSION:-0.9.11.4.739_a4e710f}
+VERSION=${VERSION:-0.9.14.1.1544_651f92a}
 PKG_VERSION=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,6 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 if [ "$ARCH" = "i486" ]; then
   DEBARCH="i386"
   LIBDIRSUFFIX=""
@@ -36,11 +61,6 @@ else
   exit 1
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 PLEX_USER=${PLEX_USER:-279}
 PLEX_GROUP=${PLEX_GROUP:-279}
 
@@ -48,8 +68,7 @@ set -e
 
 # Bail if user or group isn't valid on your system
 if ! getent passwd plex 1>/dev/null 2>/dev/null; then
-
-cat << EOF
+  cat << EOF
 
   You must have a plex user to run this script
 
@@ -58,34 +77,35 @@ cat << EOF
 
 EOF
 
-  exit
+  exit 1
 elif ! getent group plex 1>/dev/null 2>/dev/null; then
-
-cat << EOF
+  cat << EOF
 
   You must have a plex group to run this script
   # groupadd -g $PLEX_GROUP plex
 
 EOF
-  exit
+  exit 1
 fi
 
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 rm -rf $PRGNAM-$PKG_VERSION
 ar xv $CWD/${PRGNAM}_${PKG_VERSION}_${DEBARCH}.deb
 tar xvf data.tar.gz
-# Remove debian files
 rm -f debian-binary control.tar.gz data.tar.gz
 rm -rf $PKG/etc/apt/ $PKG/etc/init $PKG/etc/init.d
 chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM/bin/ 
 mv $PKG/usr/lib/plexmediaserver $PKG/opt/$PRGNAM/lib
 
-# Fix binary paths
 mv usr/sbin/start_pms $PKG/opt/$PRGNAM/bin/
 sed -i -e "s#/usr/lib/plexmediaserver#/opt/$PRGNAM/lib#" \
 	$PKG/opt/$PRGNAM/bin/start_pms
@@ -93,7 +113,6 @@ mkdir -p $PKG/usr/bin/
 ln -s /opt/$PRGNAM/bin/start_pms \
 	$PKG/usr/bin/start_pms
 
-# Install a .desktop launcher:
 mv usr/share/applications/plexmediamanager.desktop $PKG/opt/$PRGNAM/
 sed -i -e "s/x-www-browser/xdg-open/" \
 	$PKG/opt/$PRGNAM/plexmediamanager.desktop
@@ -101,7 +120,7 @@ mkdir -p $PKG/usr/share/applications
 ln -s /opt/$PRGNAM/plexmediamanager.desktop \
 	$PKG/usr/share/applications/plexmediamanager.desktop
 
-rm -rf $PKG/usr/share/doc $PKG/usr/sbin $PKG/usr/lib
+rm -rf $PKG/etc/systemd $PKG/usr/share/doc $PKG/usr/sbin $PKG/usr/lib
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -117,6 +136,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# makepkg
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/plexmediaserver/plexmediaserver.info b/multimedia/plexmediaserver/plexmediaserver.info
index 8a4c47221f..78bd3463f0 100644
--- a/multimedia/plexmediaserver/plexmediaserver.info
+++ b/multimedia/plexmediaserver/plexmediaserver.info
@@ -1,10 +1,10 @@
 PRGNAM="plexmediaserver"
-VERSION="0.9.11.4.739_a4e710f"
+VERSION="0.9.14.1.1544_651f92a"
 HOMEPAGE="http://www.plexapp.com/connected/"
-DOWNLOAD="https://downloads.plex.tv/plex-media-server/0.9.11.4.739-a4e710f/plexmediaserver_0.9.11.4.739-a4e710f_i386.deb"
-MD5SUM="9bf0108155bfbdd5e882dbd11a84ea97"
-DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server/0.9.11.4.739-a4e710f/plexmediaserver_0.9.11.4.739-a4e710f_amd64.deb"
-MD5SUM_x86_64="4e83fde95d75c33f0f368120419fd0c9"
+DOWNLOAD="https://downloads.plex.tv/plex-media-server/0.9.14.1.1544-651f92a/plexmediaserver_0.9.14.1.1544-651f92a_i386.deb"
+MD5SUM="780956da9417cec93aed45ffc7549fe3"
+DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server/0.9.14.1.1544-651f92a/plexmediaserver_0.9.14.1.1544-651f92a_amd64.deb"
+MD5SUM_x86_64="6cb7992d9de17c90cb33d0741502d244"
 REQUIRES=""
-MAINTAINER="Lionel Young"
-EMAIL="lionelyoung@gmail.com"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/multimedia/shotcut/README b/multimedia/shotcut/README
new file mode 100644
index 0000000000..2c161c6082
--- /dev/null
+++ b/multimedia/shotcut/README
@@ -0,0 +1,9 @@
+shotcut (a free, open source, cross-platform video editor).
+
+Shotcut is a free, open source, cross-platform video editor.
+
+Optional dependencie is: ladspa_sdk
+
+For build shotcut from sources these packages are required: 
+
+   qt5, mlt, x264, libvpx, lame, frei0r, ladspa_sdk.
diff --git a/multimedia/shotcut/Shotcut.desktop b/multimedia/shotcut/Shotcut.desktop
new file mode 100644
index 0000000000..454d2caf4d
--- /dev/null
+++ b/multimedia/shotcut/Shotcut.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name=Shotcut
+GenericName=Video Editor
+Comment=Video Editor
+Exec=sh -c "/opt/Shotcut/Shotcut.app/shotcut "%F""
+Icon=applications-multimedia
+Categories=Application
\ No newline at end of file
diff --git a/multimedia/shotcut/doinst.sh b/multimedia/shotcut/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/multimedia/shotcut/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/multimedia/shotcut/shotcut.SlackBuild b/multimedia/shotcut/shotcut.SlackBuild
new file mode 100644
index 0000000000..6e7b7cfbda
--- /dev/null
+++ b/multimedia/shotcut/shotcut.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# Slackware build script for shotcut.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=shotcut
+VERSION=${VERSION:-15.08}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  BITS="x86"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  BITS="x86"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  BITS="x86_64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+RELVER=${RELVER:-debian7}
+REVNO=${REVNO:-150810}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$RELVER-$BITS-$REVNO.tar.bz2 -C $PRGNAM-$VERSION/
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir $PKG/opt
+mv Shotcut $PKG/opt
+
+install -D -m644 $CWD/Shotcut.desktop $PKG/usr/share/applications/Shotcut.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/Shotcut/Shotcut.app/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/shotcut/shotcut.info b/multimedia/shotcut/shotcut.info
new file mode 100644
index 0000000000..1e963993e8
--- /dev/null
+++ b/multimedia/shotcut/shotcut.info
@@ -0,0 +1,10 @@
+PRGNAM="shotcut"
+VERSION="15.08"
+HOMEPAGE="http://www.shotcut.org/"
+DOWNLOAD="https://www.dropbox.com/s/pm9x3rcgq2fbxb1/shotcut-debian7-x86-150810.tar.bz2"
+MD5SUM="cfb589fbcbaed452b15cba659465c147"
+DOWNLOAD_x86_64="https://www.dropbox.com/s/qhepbn47ds4c74m/shotcut-debian7-x86_64-150810.tar.bz2"
+MD5SUM_x86_64="d0a8dcbaedca699c0a4c419527a9ff4a"
+REQUIRES="pulseaudio jack-audio-connection-kit"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/multimedia/shotcut/slack-desc b/multimedia/shotcut/slack-desc
new file mode 100644
index 0000000000..ba6e92ac6e
--- /dev/null
+++ b/multimedia/shotcut/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+shotcut: shotcut (cross-platform video editor)
+shotcut:
+shotcut: Shotcut is a free, open source, cross-platform video editor.
+shotcut:
+shotcut: Home page: http://www.shotcut.org/
+shotcut:
+shotcut:
+shotcut:
+shotcut:
+shotcut:
+shotcut:
diff --git a/multimedia/smplayer/smplayer.SlackBuild b/multimedia/smplayer/smplayer.SlackBuild
index 7dce264f2b..064cdf10e8 100644
--- a/multimedia/smplayer/smplayer.SlackBuild
+++ b/multimedia/smplayer/smplayer.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=smplayer
-VERSION=${VERSION:-14.9.0.6994}
+VERSION=${VERSION:-15.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/smplayer/smplayer.info b/multimedia/smplayer/smplayer.info
index 1c3f627833..8a7622ab0f 100644
--- a/multimedia/smplayer/smplayer.info
+++ b/multimedia/smplayer/smplayer.info
@@ -1,10 +1,10 @@
 PRGNAM="smplayer"
-VERSION="14.9.0.6994"
+VERSION="15.9.0"
 HOMEPAGE="http://smplayer.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/smplayer/smplayer-14.9.0.6994.tar.bz2 \
+DOWNLOAD="http://downloads.sourceforge.net/smplayer/smplayer-15.9.0.tar.bz2 \
           http://downloads.sourceforge.net/smplayer/smplayer-themes-15.6.0.tar.bz2 \
           http://downloads.sourceforge.net/smplayer/smplayer-skins-15.2.0.tar.bz2"
-MD5SUM="666a589b1fc3480a29e87f0ee7efd511 \
+MD5SUM="6ab6f96030df63b79f3a28fb3f99107d \
         d5c1889aea807a626c51dbb0a795a2a1 \
         57e165cf9a95808fafd179e5322b7f15"
 DOWNLOAD_x86_64=""
diff --git a/multimedia/smtube/smtube.SlackBuild b/multimedia/smtube/smtube.SlackBuild
index 0cd43699fd..3929e0783a 100644
--- a/multimedia/smtube/smtube.SlackBuild
+++ b/multimedia/smtube/smtube.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=smtube
-VERSION=${VERSION:-15.5.10}
+VERSION=${VERSION:-15.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/smtube/smtube.info b/multimedia/smtube/smtube.info
index 8660be550e..73c6cf0691 100644
--- a/multimedia/smtube/smtube.info
+++ b/multimedia/smtube/smtube.info
@@ -1,8 +1,8 @@
 PRGNAM="smtube"
-VERSION="15.5.10"
+VERSION="15.9.0"
 HOMEPAGE="http://smplayer.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/smplayer/smtube-15.5.10.tar.bz2"
-MD5SUM="ac05ed80bf724463512246832e57f253"
+DOWNLOAD="http://downloads.sourceforge.net/smplayer/smtube-15.9.0.tar.bz2"
+MD5SUM="9717ae650d1bbb47d4cd94b942306695"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/spotify32/spotify32.SlackBuild b/multimedia/spotify32/spotify32.SlackBuild
index ddc9d615b2..b08e149b10 100644
--- a/multimedia/spotify32/spotify32.SlackBuild
+++ b/multimedia/spotify32/spotify32.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -25,7 +25,7 @@
 PRGNAM=spotify32
 SRCNAM=spotify
 VERSION=${VERSION:-0.9.4.183.g644e24e.428}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 case "$(uname -m)" in
@@ -73,9 +73,19 @@ ln -sf /usr/lib${LIBDIRSUFFIX}/libssl3.so $PKG/opt/spotify/spotify-client/Data/l
 ln -sf /usr/lib${LIBDIRSUFFIX}/libssl.so.1.0.0 $PKG/opt/spotify/spotify-client/Data/libssl.so.0.9.8
 ln -sf /usr/lib${LIBDIRSUFFIX}/libcrypto.so.1.0.0 $PKG/opt/spotify/spotify-client/Data/libcrypto.so.0.9.8
 
-rm $PKG/opt/spotify/spotify-client/spotify.desktop
+## install all icon sizes, thanks to Dhaby
+(
+	cd $PKG/opt/$SRCNAM/$SRCNAM-client/Icons
+	for IMG in spotify-linux-*.png; do
+		SIZE=${IMG##*spotify-linux-}
+		DIRNAME=${SIZE%.png}x${SIZE%.png}
+		install -D $IMG $PKG/usr/share/icons/hicolor/$DIRNAME/apps/$SRCNAM-client.png
+	done
+)
+
 mkdir -p $PKG/usr/share/applications/
-cat $CWD/spotify.desktop > $PKG/usr/share/applications/spotify.desktop
+mv $PKG/opt/$SRCNAM/$SRCNAM-client/$SRCNAM.desktop \
+  $PKG/usr/share/applications/$SRCNAM.desktop
 
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/$SRCNAM-client $PKG/usr/doc/$SRCNAM-$VERSION
diff --git a/multimedia/spotify64/spotify.desktop b/multimedia/spotify64/spotify.desktop
deleted file mode 100644
index fd03b8ab8b..0000000000
--- a/multimedia/spotify64/spotify.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Spotify
-GenericName=Music Player
-Comment=Listen to music using Spotify
-Icon=/opt/spotify/spotify-client/Icons/spotify-linux-512.png
-Exec=spotify %U
-TryExec=spotify
-Terminal=false
-Type=Application
-Categories=Qt;Audio;Player;AudioVideo;
-MimeType=x-scheme-handler/spotify;
diff --git a/multimedia/spotify64/spotify64.SlackBuild b/multimedia/spotify64/spotify64.SlackBuild
index af2aa83d38..083b9cf78f 100644
--- a/multimedia/spotify64/spotify64.SlackBuild
+++ b/multimedia/spotify64/spotify64.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -25,7 +25,7 @@ PRGNAM=spotify64
 SRCNAM=spotify
 VERSION=${VERSION:-0.9.17.8.gd06432d.31}
 SHORTVER=`echo $VERSION | cut -d. -f1-3`
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 case "$(uname -m)" in
@@ -67,9 +67,19 @@ LD_LIBRARY_PATH=/opt/$SRCNAM/$SRCNAM-client/Data/ /opt/$SRCNAM/$SRCNAM-client/$S
 EOT
 chmod 755 $PKG/usr/bin/$SRCNAM
 
-rm $PKG/opt/$SRCNAM/$SRCNAM-client/$SRCNAM.desktop
+## install all icon sizes, thanks to Dhaby
+(
+	cd $PKG/opt/$SRCNAM/$SRCNAM-client/Icons
+	for IMG in spotify-linux-*.png; do
+		SIZE=${IMG##*spotify-linux-}
+		DIRNAME=${SIZE%.png}x${SIZE%.png}
+		install -D $IMG $PKG/usr/share/icons/hicolor/$DIRNAME/apps/$SRCNAM-client.png
+	done
+)
+
 mkdir -p $PKG/usr/share/applications/
-cat $CWD/$SRCNAM.desktop > $PKG/usr/share/applications/$SRCNAM.desktop
+mv $PKG/opt/$SRCNAM/$SRCNAM-client/$SRCNAM.desktop \
+  $PKG/usr/share/applications/$SRCNAM.desktop
 
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/$SRCNAM-client-$SHORTVER $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/telepathy-farstream/README b/multimedia/telepathy-farstream/README
new file mode 100644
index 0000000000..d84f3e11da
--- /dev/null
+++ b/multimedia/telepathy-farstream/README
@@ -0,0 +1,2 @@
+Telepathy Farstream is a Telepathy client library that uses Farstream
+to handle Call channels.
diff --git a/multimedia/telepathy-farstream/slack-desc b/multimedia/telepathy-farstream/slack-desc
new file mode 100644
index 0000000000..0fdbe3454e
--- /dev/null
+++ b/multimedia/telepathy-farstream/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+telepathy-farstream: telepathy-farstream (Library that uses Farstream to handle Call channels)
+telepathy-farstream:
+telepathy-farstream: Telepathy Farstream is a Telepathy client library that uses Farstream
+telepathy-farstream: to handle Call channels.
+telepathy-farstream:
+telepathy-farstream:
+telepathy-farstream:
+telepathy-farstream:
+telepathy-farstream:
+telepathy-farstream:
+telepathy-farstream: Home: http://telepathy.freedesktop.org/wiki/
diff --git a/multimedia/telepathy-farstream/telepathy-farstream.SlackBuild b/multimedia/telepathy-farstream/telepathy-farstream.SlackBuild
new file mode 100644
index 0000000000..41fd36746a
--- /dev/null
+++ b/multimedia/telepathy-farstream/telepathy-farstream.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for telepathy-farstream
+
+# Copyright 2015 Thorn Inurcide USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=telepathy-farstream
+VERSION=${VERSION:-0.6.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-introspection=yes \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog* COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/telepathy-farstream/telepathy-farstream.info b/multimedia/telepathy-farstream/telepathy-farstream.info
new file mode 100644
index 0000000000..2b852e3bb8
--- /dev/null
+++ b/multimedia/telepathy-farstream/telepathy-farstream.info
@@ -0,0 +1,10 @@
+PRGNAM="telepathy-farstream"
+VERSION="0.6.2"
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/"
+DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-0.6.2.tar.gz"
+MD5SUM="20bdc61ea3f3a01df41068006b62641b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="telepathy-glib"
+MAINTAINER="Thorn Inurcide"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/multimedia/telepathy-glib/README b/multimedia/telepathy-glib/README
new file mode 100644
index 0000000000..ce2fe2f792
--- /dev/null
+++ b/multimedia/telepathy-glib/README
@@ -0,0 +1,5 @@
+telepathy-glib is a C library using GLib, for use in Telepathy
+clients, connection managers (protocol backends) and other
+components. It can also be used from C++ via extern "C"
+linkage, and from higher-level languages including Python and
+JavaScript via GObject-Introspection.
diff --git a/multimedia/telepathy-glib/doinst.sh b/multimedia/telepathy-glib/doinst.sh
new file mode 100644
index 0000000000..6922dbb756
--- /dev/null
+++ b/multimedia/telepathy-glib/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/multimedia/telepathy-glib/slack-desc b/multimedia/telepathy-glib/slack-desc
new file mode 100644
index 0000000000..1f344db625
--- /dev/null
+++ b/multimedia/telepathy-glib/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+telepathy-glib: telepathy-glib (C library using GLib for use in Telepathy clients)
+telepathy-glib:
+telepathy-glib: telepathy-glib is a C library using GLib, for use in Telepathy
+telepathy-glib: clients, connection managers (protocol backends) and other
+telepathy-glib: components. It can also be used from C++ via extern "C"
+telepathy-glib: linkage, and from higher-level languages including Python and
+telepathy-glib: JavaScript via GObject-Introspection.
+telepathy-glib:
+telepathy-glib:
+telepathy-glib:
+telepathy-glib: Home: http://telepathy.freedesktop.org/wiki/
diff --git a/multimedia/telepathy-glib/telepathy-glib.SlackBuild b/multimedia/telepathy-glib/telepathy-glib.SlackBuild
new file mode 100644
index 0000000000..d411fda3b1
--- /dev/null
+++ b/multimedia/telepathy-glib/telepathy-glib.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for telepathy-glib
+
+# Copyright 2015 Thorn Inurcide
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=telepathy-glib
+VERSION=${VERSION:-0.24.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-introspection=yes \
+  --enable-vala-bindings=no \
+  --disable-schemas-compile \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog* COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/telepathy-glib/telepathy-glib.info b/multimedia/telepathy-glib/telepathy-glib.info
new file mode 100644
index 0000000000..77d13eb56c
--- /dev/null
+++ b/multimedia/telepathy-glib/telepathy-glib.info
@@ -0,0 +1,10 @@
+PRGNAM="telepathy-glib"
+VERSION="0.24.1"
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/"
+DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz"
+MD5SUM="cbeb0a24acc26e7f095be281c324da69"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="farstream"
+MAINTAINER="Thorn Inurcide"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/multimedia/telepathy-qt/README b/multimedia/telepathy-qt/README
new file mode 100644
index 0000000000..2c940ebe43
--- /dev/null
+++ b/multimedia/telepathy-qt/README
@@ -0,0 +1 @@
+This is a library for Qt-based Telepathy clients.
diff --git a/multimedia/telepathy-qt/slack-desc b/multimedia/telepathy-qt/slack-desc
new file mode 100644
index 0000000000..7bcb388edd
--- /dev/null
+++ b/multimedia/telepathy-qt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+telepathy-qt: telepathy-qt (Library for Qt-based Telepathy clients)
+telepathy-qt:
+telepathy-qt: This is a library for Qt-based Telepathy clients.
+telepathy-qt:
+telepathy-qt:
+telepathy-qt:
+telepathy-qt:
+telepathy-qt:
+telepathy-qt:
+telepathy-qt:
+telepathy-qt: Home: http://telepathy.freedesktop.org/doc/telepathy-qt/
diff --git a/multimedia/telepathy-qt/telepathy-qt.SlackBuild b/multimedia/telepathy-qt/telepathy-qt.SlackBuild
new file mode 100644
index 0000000000..fca2cefe8b
--- /dev/null
+++ b/multimedia/telepathy-qt/telepathy-qt.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for telepathy-qt
+
+# Copyright 2015 Thorn Inurcde USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=telepathy-qt
+VERSION=${VERSION:-0.9.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog* COPYING HACKING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/telepathy-qt/telepathy-qt.info b/multimedia/telepathy-qt/telepathy-qt.info
new file mode 100644
index 0000000000..aa250e06b3
--- /dev/null
+++ b/multimedia/telepathy-qt/telepathy-qt.info
@@ -0,0 +1,10 @@
+PRGNAM="telepathy-qt"
+VERSION="0.9.6"
+HOMEPAGE="http://telepathy.freedesktop.org/doc/telepathy-qt/"
+DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.tar.gz"
+MD5SUM="1f18935f30dcf90282a2d6d65fcde752"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="telepathy-farstream"
+MAINTAINER="Thorn Inurcide"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/multimedia/tomahawk/README b/multimedia/tomahawk/README
new file mode 100644
index 0000000000..1f449b87f8
--- /dev/null
+++ b/multimedia/tomahawk/README
@@ -0,0 +1,11 @@
+A new kind of music player that invites all your streams, downloads,
+cloud music storage, playlists, radio stations and friends to the
+same party. It's about time they all mingle.
+
+This will require gst1-plugins-ugly for mp3 support
+
+
+This optionally requires:
+
+Telepathy-Qt: Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy
+KDE4: Provides support for configuring Telepathy Accounts from inside Tomahawk
diff --git a/multimedia/tomahawk/doinst.sh b/multimedia/tomahawk/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/multimedia/tomahawk/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/multimedia/tomahawk/slack-desc b/multimedia/tomahawk/slack-desc
new file mode 100644
index 0000000000..934c3cb07a
--- /dev/null
+++ b/multimedia/tomahawk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+tomahawk: tomahawk (A new kind of music player)
+tomahawk:
+tomahawk: A new kind of music player that invites all your streams, downloads,
+tomahawk: cloud music storage, playlists, radio stations and friends to the
+tomahawk: same party. It's about time they all mingle.
+tomahawk:
+tomahawk:
+tomahawk:
+tomahawk:
+tomahawk:
+tomahawk: Home: http://www.tomahawk-player.org/
diff --git a/multimedia/tomahawk/tomahawk.SlackBuild b/multimedia/tomahawk/tomahawk.SlackBuild
new file mode 100644
index 0000000000..ed985a9937
--- /dev/null
+++ b/multimedia/tomahawk/tomahawk.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for tomahawk
+
+# Copyright 2015 Thorn Inurcide USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tomahawk		
+VERSION=${VERSION:-0.8.4}	
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}		
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+# Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}		
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}		
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog* LICENSE* PACKAGING* README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/tomahawk/tomahawk.info b/multimedia/tomahawk/tomahawk.info
new file mode 100644
index 0000000000..4226b3047b
--- /dev/null
+++ b/multimedia/tomahawk/tomahawk.info
@@ -0,0 +1,10 @@
+PRGNAM="tomahawk"
+VERSION="0.8.4"
+HOMEPAGE="tomahawk-player.org"
+DOWNLOAD="http://download.tomahawk-player.org/tomahawk-0.8.4.tar.bz2"
+MD5SUM="04832abe1786edcc55805875b5882445"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jreen libechonest LucenePlusPlus qtkeychain sparsehash quazip libwebsocketpp"
+MAINTAINER="Thorn Inurcide"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/multimedia/tvheadend/README b/multimedia/tvheadend/README
new file mode 100644
index 0000000000..b6520ae0a8
--- /dev/null
+++ b/multimedia/tvheadend/README
@@ -0,0 +1,11 @@
+tvheadend (PVR server)
+
+Tvheadend is a TV streaming server and recorder for Linux, FreeBSD 
+and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, 
+SAT>IP and HDHomeRun as input sources.
+
+Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and 
+SAT>IP streaming.
+
+
+Optional dependencies: avahi, libav, bundle, dvbcsa
diff --git a/multimedia/tvheadend/slack-desc b/multimedia/tvheadend/slack-desc
new file mode 100644
index 0000000000..77e05fd26a
--- /dev/null
+++ b/multimedia/tvheadend/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |---handy-ruler------------------------------------------------------|
+tvheadend: tvheadend (PVR server)
+tvheadend:
+tvheadend: Tvheadend is a TV streaming server and recorder for Linux, FreeBSD
+tvheadend: and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV,
+tvheadend: SAT>IP and HDHomeRun as input sources.
+tvheadend:
+tvheadend: Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and
+tvheadend: SAT>IP streaming.
+tvheadend:
+tvheadend:
+tvheadend:
diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild
new file mode 100644
index 0000000000..37358b8eb5
--- /dev/null
+++ b/multimedia/tvheadend/tvheadend.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for tvheadend
+
+# Copyright 2015 Guilherme Calandrini, Alcala de Henares - Spain
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tvheadend
+VERSION=${VERSION:-3.4patch1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-libffmpeg_static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+rm -f $PKG/usr/info/dir
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a docs $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/tvheadend/tvheadend.info b/multimedia/tvheadend/tvheadend.info
new file mode 100644
index 0000000000..6544b078d5
--- /dev/null
+++ b/multimedia/tvheadend/tvheadend.info
@@ -0,0 +1,10 @@
+PRGNAM="tvheadend"
+VERSION="3.4patch1"
+HOMEPAGE="https://tvheadend.org"
+DOWNLOAD="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz"
+MD5SUM="86d1be0ad6e02bd2aecd3d529a026797"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini[at]hotmail[dot]es" 
diff --git a/multimedia/ucview/README b/multimedia/ucview/README
index 42e683b445..1f62d36ca6 100644
--- a/multimedia/ucview/README
+++ b/multimedia/ucview/README
@@ -1,4 +1,4 @@
-UCView is a video capture and display program based on the unicap video
+UCView is a video capture and display program based on the Unicap video
 imaging library. It allows high performance live video display, by using
 XVideo hardware acceleration where possible. It supports a broad range of
 video capture devices via the unicap library. It allows audio and video
diff --git a/multimedia/ucview/slack-desc b/multimedia/ucview/slack-desc
index 9fed585bc8..4098ced3c9 100644
--- a/multimedia/ucview/slack-desc
+++ b/multimedia/ucview/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-ucview: UCView (video capture and display program)
+ucview: ucview (video capture and display program)
 ucview:
-ucview: unicap provides a uniform interface to video capture devices.
-ucview: It allows applications to use any supported video capture device
-ucview: via a single API.
-ucview: 
-ucview: UCView is a video capture and display program based on the unicap
-ucview: video imaging library.
+ucview: Unicap provides a uniform interface to video capture devices. It
+ucview: allows applications to use any supported video capture device via a
+ucview: single API. UCView is a video capture and display program based on
+ucview: the Unicap video imaging library.
 ucview:
 ucview: Homepage: https://github.com/unicap
 ucview:
+ucview:
+ucview:
diff --git a/multimedia/ucview/ucview.SlackBuild b/multimedia/ucview/ucview.SlackBuild
index 9265ebdefb..4813135b7e 100644
--- a/multimedia/ucview/ucview.SlackBuild
+++ b/multimedia/ucview/ucview.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for UCView
+# Slackware build script for ucview
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -62,8 +62,8 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
 
-# The upstream tarball will be named differently, depending on the
-# file being downloaded manually (web browser) or with wget.
+# The upstream tarball will be named differently, depending on
+# the file being downloaded manually (web browser) or with wget.
 if [ -e $CWD/$SRCVERSION.tar.gz ]; then
   tar xvzf $CWD/$SRCVERSION.tar.gz
 else
@@ -78,9 +78,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-PRGMAN=$PKG/usr/man/man1
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-
 mkdir m4
 autoreconf --force --install
 intltoolize --force
@@ -98,13 +95,14 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Compress man page.
-gzip -9 $PRGMAN/$PRGNAM.1
+PRGMAN=$PKG/usr/man/man1
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-# Install documentation.
+# Compress man page and install documentation.
+gzip -9 $PRGMAN/$PRGNAM.1
 mkdir -p $PRGDOC
 cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL README $PRGDOC/
 cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
diff --git a/multimedia/ucview/ucview.info b/multimedia/ucview/ucview.info
index 910e108814..72db971022 100644
--- a/multimedia/ucview/ucview.info
+++ b/multimedia/ucview/ucview.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libunicapgtk"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/multimedia/vivaldi-codecs-ffmpeg-extra/README b/multimedia/vivaldi-codecs-ffmpeg-extra/README
new file mode 100644
index 0000000000..39ca1b4809
--- /dev/null
+++ b/multimedia/vivaldi-codecs-ffmpeg-extra/README
@@ -0,0 +1,14 @@
+vivaldi-codecs-ffmpeg-extra (Extra ffmpeg codecs for Vivaldi browser).
+
+Extra ffmpeg codecs for Vivaldi browser.
+
+This will add H.264 support to Vivaldi and not replacing the default 
+/opt/vivaldi-snapshot/lib/libffmpeg.so.
+
+For tests, go to:
+
+ * https://html5test.com
+ * https://www.youtube.com/html5
+ * http://www.quirksmode.org/html5/tests/video.html
+
+More info at: https://gist.github.com/ruario/bec42d156d30affef655
diff --git a/multimedia/vivaldi-codecs-ffmpeg-extra/slack-desc b/multimedia/vivaldi-codecs-ffmpeg-extra/slack-desc
new file mode 100644
index 0000000000..f43a11027a
--- /dev/null
+++ b/multimedia/vivaldi-codecs-ffmpeg-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                           |-----handy-ruler------------------------------------------------------|
+vivaldi-codecs-ffmpeg-extra: vivaldi-codecs-ffmpeg-extra (Extra ffmpeg codec for Vivaldi browser)
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra: Extra ffmpeg codec for Vivaldi browser.
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra: Home Page: http://goo.gl/LMNo2l
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra:
+vivaldi-codecs-ffmpeg-extra:
diff --git a/multimedia/vivaldi-codecs-ffmpeg-extra/vivaldi-codecs-ffmpeg-extra.SlackBuild b/multimedia/vivaldi-codecs-ffmpeg-extra/vivaldi-codecs-ffmpeg-extra.SlackBuild
new file mode 100644
index 0000000000..8aca04fea0
--- /dev/null
+++ b/multimedia/vivaldi-codecs-ffmpeg-extra/vivaldi-codecs-ffmpeg-extra.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# Slackware build script for vivaldi-codecs-ffmpeg-extra.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="vivaldi-codecs-ffmpeg-extra"
+VERSION=${VERSION:-47.0.2526.73}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  BITS="i386"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  BITS="i386"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  BITS="amd64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="chromium-codecs-ffmpeg-extra"
+SRCVER=${SRCVER:-47.0.2526.73-0ubuntu0.15.10.1.1215}
+
+rm -rf $PKG $TMP/$PRGNAM
+mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
+
+cd $TMP/$PRGNAM
+ar p $CWD/${SRCNAM}_${SRCVER}_${BITS}.deb data.tar.xz | tar xJf - \
+./usr/lib/chromium-browser/libs/libffmpeg.so --strip 5
+ar p $CWD/${SRCNAM}_${SRCVER}_${BITS}.deb data.tar.xz | tar xJf - \
+./usr/share/doc/chromium-codecs-ffmpeg-extra/changelog.Debian.gz --strip 5
+ar p $CWD/${SRCNAM}_${SRCVER}_${BITS}.deb data.tar.xz | tar xJf - \
+./usr/share/doc/chromium-codecs-ffmpeg-extra/copyright --strip 5
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/opt/vivaldi-snapshot/
+mv libffmpeg.so $PKG/opt/vivaldi-snapshot/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+gzip -dc changelog.Debian.gz > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
+cp -a copyright $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/vivaldi-codecs-ffmpeg-extra/vivaldi-codecs-ffmpeg-extra.info b/multimedia/vivaldi-codecs-ffmpeg-extra/vivaldi-codecs-ffmpeg-extra.info
new file mode 100644
index 0000000000..2e1209c970
--- /dev/null
+++ b/multimedia/vivaldi-codecs-ffmpeg-extra/vivaldi-codecs-ffmpeg-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="vivaldi-codecs-ffmpeg-extra"
+VERSION="47.0.2526.73"
+HOMEPAGE="http://packages.ubuntu.com/search?keywords=chromium-codecs-ffmpeg-extra"
+DOWNLOAD="http://security.ubuntu.com/ubuntu/pool/universe/c/chromium-browser/chromium-codecs-ffmpeg-extra_47.0.2526.73-0ubuntu0.15.10.1.1215_i386.deb"
+MD5SUM="10809dc0932424c8f3db815939d679a7"
+DOWNLOAD_x86_64="http://security.ubuntu.com/ubuntu/pool/universe/c/chromium-browser/chromium-codecs-ffmpeg-extra_47.0.2526.73-0ubuntu0.15.10.1.1215_amd64.deb"
+MD5SUM_x86_64="efcbf522dee26d28699e17d987bba5af"
+REQUIRES="vivaldi"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 8f2ec4d02a..1aab89deab 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -12,8 +12,4 @@ are detected at build time, they will be included. Conversely if
 optional packages are not available at build time, vlc will continue
 to build with a reduced feature set.
 
-This SlackBuild also builds in support for BlackMagic Design's "Decklink"
-range of video input and output cards, including those with UHD (3840x2160)
-capability.
-
 Please advise the maintainer to suggest support for any further options.
diff --git a/multimedia/vlc/patch-vlc-opencv3.diff b/multimedia/vlc/patch-vlc-opencv3.diff
new file mode 100644
index 0000000000..6ffefa94d1
--- /dev/null
+++ b/multimedia/vlc/patch-vlc-opencv3.diff
@@ -0,0 +1,13 @@
+diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
+index ae3af05..998f286 100644
+--- a/modules/video_filter/opencv_example.cpp
++++ b/modules/video_filter/opencv_example.cpp
+@@ -41,6 +41,8 @@
+ 
+ #include <opencv2/core/core_c.h>
+ #include <opencv2/core/core.hpp>
++#include <opencv2/imgproc/imgproc_c.h>
++#include <opencv2/imgproc/imgproc.hpp>
+ #include <opencv2/objdetect/objdetect.hpp>
+ 
+ /*****************************************************************************
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index ef46374daf..df60516b9e 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -6,7 +6,7 @@
 # modified to build VLC only, shared libraries needed.
 
 # Copyright (c) 2007,2008,2009,2010,2011  Eric Hameleers, Eindhoven, Netherlands
-# Copyright (c) 2014  Christoph Willing, Brisbane, Australia
+# Copyright (c) 2014-2016  Christoph Willing, Brisbane, Australia
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -29,7 +29,7 @@
 
 PRGNAM=vlc
 VERSION=${VERSION:-2.1.6}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,9 +45,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DECKLINK_SDK_VERSION=${DECKLINK_SDK_VERSION:-10.1.4}
-DECKLINKSDK=Blackmagic_DeckLink_SDK_${DECKLINK_SDK_VERSION}.zip
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -81,9 +78,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
-mkdir -p decklink/include
-unzip -o $CWD/$DECKLINKSDK
-cp -p Blackmagic\ DeckLink\ SDK\ ${DECKLINK_SDK_VERSION}/Linux/include/* decklink/include/
+patch -p1 < $CWD/patch-vlc-opencv3.diff
 
 patch -p0 < $CWD/patch-freerdp.diff
 patch -p0 < $CWD/patch-freerdp_1_2.diff
@@ -112,8 +107,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --localstatedir=/var \
   --build=$ARCH-slackware-linux \
   --enable-merge-ffmpeg \
-  --with-kde-solid=no \
-  --with-decklink-sdk=$TMP/$PRGNAM-$VERSION/decklink
+  --with-kde-solid=no
 
 make
 make DESTDIR=$PKG install
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 3a6eb8606c..23f5d07c97 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -1,12 +1,10 @@
 PRGNAM="vlc"
 VERSION="2.1.6"
 HOMEPAGE="http://www.videolan.org/vlc/"
-DOWNLOAD="http://download.videolan.org/vlc/2.1.6/vlc-2.1.6.tar.xz \
-          http://software.blackmagicdesign.com/SDK/Blackmagic_DeckLink_SDK_10.1.4.zip"
-MD5SUM="6de050559fbb1456b35303f04705145d \
-        16fbc2f49dc62fecac15835c538f78d4"
+DOWNLOAD="http://download.videolan.org/vlc/2.1.6/vlc-2.1.6.tar.xz"
+MD5SUM="6de050559fbb1456b35303f04705145d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="a52dec libass libdc1394 libdvbpsi libdvdnav libmpeg2 libupnp lua portaudio twolame opus libvpx gsm opencv libtar libkate faac libdca libmatroska libshout speex libva avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump freerdp libdvdcss fluidsynth schroedinger libminizip chromaprint libssh2 gst1-plugins-base x265"
+REQUIRES="a52dec libass libdc1394 libdvbpsi libdvdnav libmpeg2 libupnp lua portaudio twolame opus libvpx gsm opencv libtar libkate faac libdca libmatroska libshout speex libva avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump freerdp libdvdcss fluidsynth schroedinger libminizip chromaprint libssh2 x265"
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/multimedia/whistle/README b/multimedia/whistle/README
new file mode 100644
index 0000000000..351ef98971
--- /dev/null
+++ b/multimedia/whistle/README
@@ -0,0 +1,2 @@
+whistle is a minimal audio player currently capable of playing
+mp3/ogg/flac files. It relies on mplayer as backend.
diff --git a/multimedia/whistle/doinst.sh b/multimedia/whistle/doinst.sh
new file mode 100644
index 0000000000..5013ef6d40
--- /dev/null
+++ b/multimedia/whistle/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+    /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/multimedia/whistle/slack-desc b/multimedia/whistle/slack-desc
new file mode 100644
index 0000000000..8753e4b4de
--- /dev/null
+++ b/multimedia/whistle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+whistle: whistle (ncurses audio player)
+whistle:
+whistle: whistle is a minimalistic audio player with mplayer backend
+whistle:
+whistle: homepage: https://github.com/ap0calypse/whistle/
+whistle:
+whistle:
+whistle:
+whistle:
+whistle:
+whistle:
diff --git a/multimedia/whistle/whistle.SlackBuild b/multimedia/whistle/whistle.SlackBuild
new file mode 100644
index 0000000000..589c981026
--- /dev/null
+++ b/multimedia/whistle/whistle.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# Slackbuild for whistle
+# Written by Manuel Fill <manuel.fill.42@gmail.com>
+
+# Slackbuild is released under the Dog-on-Fire License:
+# If use of this script causes your dog to catch on fire,
+# you agree to send me five dollars.  Or a picture
+# of the dog on fire.
+# Otherwise, you're on your own.  I've tested the script
+# on my own computer, and it hasn't broken anything.
+# So if it does it on your computer, that falls in
+# the realm of "Not my problem."
+#
+# Of course, if you'll send a bug report to the above
+# email address, I may be able to see what you did
+# wrong and prevent it from happening in the future.
+# In which case, I may just send YOU five dollars.
+
+# Oh, and feel free to copy it and modify it as you
+# see fit. Or as I see fit. Or as I fit. Although
+# that is unlikely, as I am rather tall.
+
+PRGNAM=whistle
+VERSION=${VERSION:-0.8.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin
+cp whistle $PKG/usr/bin/whistle
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/whistle/whistle.info b/multimedia/whistle/whistle.info
new file mode 100644
index 0000000000..4cefa5a03e
--- /dev/null
+++ b/multimedia/whistle/whistle.info
@@ -0,0 +1,10 @@
+PRGNAM="whistle"
+VERSION="0.8.7"
+HOMEPAGE="https://github.com/ap0calypse/whistle"
+DOWNLOAD="https://github.com/ap0calypse/whistle/archive/0.8.7.tar.gz"
+MD5SUM="e76535c7479d15b0af38d1524bc8f1ec"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Manuel Fill"
+REQUIRES="perl-Curses-UI perl-Audio-FLAC-Header perl-IPC-Run perl-IPC-System-Simple perl-MP3-Info perl-Ogg-Vorbis-Header-PurePerl perl-extutils-depends perl-extutils-pkgconfig perl-file-mimeinfo"
+EMAIL="manuel.fill.42@gmail.com"
diff --git a/multimedia/x265/x265.SlackBuild b/multimedia/x265/x265.SlackBuild
index 1a6e679eed..6cb009cec1 100644
--- a/multimedia/x265/x265.SlackBuild
+++ b/multimedia/x265/x265.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=x265
-VERSION=${VERSION:-1.7}
-REVISION=${REVISION:-8425278def1e}
+VERSION=${VERSION:-1.8}
+REVISION=${REVISION:-e27327f5da35}
 SRCNAM=multicoreware
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/multimedia/x265/x265.info b/multimedia/x265/x265.info
index e24d8fdd77..db01326fad 100644
--- a/multimedia/x265/x265.info
+++ b/multimedia/x265/x265.info
@@ -1,8 +1,8 @@
 PRGNAM="x265"
-VERSION="1.7"
+VERSION="1.8"
 HOMEPAGE="https://www.videolan.org/developers/x265.html"
-DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/1.7.tar.bz2"
-MD5SUM="d6020c277b05ab44f8222342aaa9c99f"
+DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/1.8.tar.bz2"
+MD5SUM="e3a008a74b8f44612cac4ec2f537b0f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/xmltv/xmltv.SlackBuild b/multimedia/xmltv/xmltv.SlackBuild
index 28ced7ab72..d7efae8986 100644
--- a/multimedia/xmltv/xmltv.SlackBuild
+++ b/multimedia/xmltv/xmltv.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmltv
-VERSION=0.5.66
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.5.66}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -50,10 +50,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Makefile.PL -default \
   PREFIX=/usr \
@@ -61,10 +61,9 @@ perl Makefile.PL -default \
   INSTALLVENDORMAN1DIR=/usr/man/man1 \
   INSTALLVENDORMAN3DIR=/usr/man/man3
 make
-make test
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -77,9 +76,7 @@ find $PKG -depth -type d -empty -delete || true
 rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-   ChangeLog README README.cygwin doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog README README.cygwin doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/xmltv/xmltv.info b/multimedia/xmltv/xmltv.info
index 27c0afe415..7cfe1539f1 100644
--- a/multimedia/xmltv/xmltv.info
+++ b/multimedia/xmltv/xmltv.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/xmltv/xmltv-0.5.66.tar.bz2"
 MD5SUM="1ad51ff5a02e8320bd908c7908c49661"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwww-perl perl-Date-Manip perl-File-Slurp perl-Lingua-EN-Numbers-Ordinate perl-Lingua-Preferred perl-Term-ProgressBar perl-TermReadKey perl-Unicode-String perl-XML-Writer perl-xml-libxml perl-xml-twig"
+REQUIRES="libwww-perl perl-Date-Manip perl-File-Slurp perl-Lingua-EN-Numbers-Ordinate perl-Lingua-Preferred perl-Term-ProgressBar perl-TermReadKey perl-Unicode-String perl-XML-Writer perl-xml-libxml perl-xml-twig perl-XML-TreePP"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
diff --git a/multimedia/xvst/qtlocalpeer.patch b/multimedia/xvst/qtlocalpeer.patch
new file mode 100644
index 0000000000..cdd0ee3fa5
--- /dev/null
+++ b/multimedia/xvst/qtlocalpeer.patch
@@ -0,0 +1,10 @@
+--- xVideoServiceThief-2.5.1/src/qtsingleapplication/src/qtlocalpeer.cpp.old	2016-01-06 01:14:10.288327384 +0700
++++ xVideoServiceThief-2.5.1/src/qtsingleapplication/src/qtlocalpeer.cpp	2016-01-06 01:14:29.371336089 +0700
+@@ -41,6 +41,7 @@
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
+ #include <QTime>
++#include <QDataStream>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QLibrary>
diff --git a/multimedia/xvst/xvst.SlackBuild b/multimedia/xvst/xvst.SlackBuild
index f56cf6fff9..8dea0f53ef 100644
--- a/multimedia/xvst/xvst.SlackBuild
+++ b/multimedia/xvst/xvst.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=xvst
 SRCNAM=xVideoServiceThief
 VERSION=${VERSION:-2.5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,6 +77,9 @@ sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/$PRGNAM|g" src/options.cpp
 lrelease-qt5 resources/translations/*.ts
 rm -f resources/translations/template_for_new_translations.qm
 
+# Patch for Qt 5.5.1
+patch -p1 < $CWD/qtlocalpeer.patch
+
 qmake-qt5 -set build_mode dynamic_build
 qmake-qt5 PREFIX=/usr QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCLAGS" \
   -o Makefile xVideoServiceThief.pro
diff --git a/multimedia/yarock/yarock.SlackBuild b/multimedia/yarock/yarock.SlackBuild
index 5dc5f8525e..a6db4af723 100644
--- a/multimedia/yarock/yarock.SlackBuild
+++ b/multimedia/yarock/yarock.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for yarock
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=yarock
-SRCNAM=Yarock
-VERSION=${VERSION:-1.1.2}
+SRCNAM=$(echo ${PRGNAM^})
+VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/yarock/yarock.info b/multimedia/yarock/yarock.info
index c438f2dc92..886673f137 100644
--- a/multimedia/yarock/yarock.info
+++ b/multimedia/yarock/yarock.info
@@ -1,10 +1,10 @@
 PRGNAM="yarock"
-VERSION="1.1.2"
+VERSION="1.1.4"
 HOMEPAGE="http://seb-apps.github.io/yarock/"
-DOWNLOAD="https://launchpad.net/yarock/1.x/1.1.2/+download/Yarock_1.1.2_source.tar.gz"
-MD5SUM="88733d9bed252c132a378dfecb158697"
+DOWNLOAD="https://launchpad.net/yarock/1.x/1.1.4/+download/Yarock_1.1.4_source.tar.gz"
+MD5SUM="794020bf0a571a24df6a6505d530f7c2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="htmlcxx"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/CherryMusic/CherryMusic.SlackBuild b/network/CherryMusic/CherryMusic.SlackBuild
index 0b3cf964be..3d9eb7e7d8 100644
--- a/network/CherryMusic/CherryMusic.SlackBuild
+++ b/network/CherryMusic/CherryMusic.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CherryMusic
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=CherryMusic
-VERSION=${VERSION:-0.35.2}
+VERSION=${VERSION:-0.36.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/CherryMusic/CherryMusic.info b/network/CherryMusic/CherryMusic.info
index e398bf62df..517da640cd 100644
--- a/network/CherryMusic/CherryMusic.info
+++ b/network/CherryMusic/CherryMusic.info
@@ -1,8 +1,8 @@
 PRGNAM="CherryMusic"
-VERSION="0.35.2"
+VERSION="0.36.0"
 HOMEPAGE="http://www.fomori.org/cherrymusic/"
-DOWNLOAD="https://pypi.python.org/packages/source/C/CherryMusic/CherryMusic-0.35.2.tar.gz"
-MD5SUM="67f7ab06002d7fc13b27ce84a67a1428"
+DOWNLOAD="https://pypi.python.org/packages/source/C/CherryMusic/CherryMusic-0.36.0.tar.gz"
+MD5SUM="afe736fa696ee052c728a7bfbf116c07"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CherryPy"
diff --git a/network/ClusterSSH/ClusterSSH.SlackBuild b/network/ClusterSSH/ClusterSSH.SlackBuild
index c4a5ccc784..5b3c0f9635 100644
--- a/network/ClusterSSH/ClusterSSH.SlackBuild
+++ b/network/ClusterSSH/ClusterSSH.SlackBuild
@@ -23,7 +23,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ClusterSSH
-VERSION=${VERSION:-4.03_06}
+VERSION=${VERSION:-4.05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/ClusterSSH/ClusterSSH.info b/network/ClusterSSH/ClusterSSH.info
index 1b84b3f570..d26a6baf0b 100644
--- a/network/ClusterSSH/ClusterSSH.info
+++ b/network/ClusterSSH/ClusterSSH.info
@@ -1,11 +1,12 @@
 PRGNAM="ClusterSSH"
-VERSION="4.03_06"
+VERSION="4.05"
 HOMEPAGE="http://clusterssh.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/clusterssh/App-ClusterSSH-4.03_06.tar.gz"
-MD5SUM="8d6fd139ab3c88b11c94f6d118ac0b4c"
+DOWNLOAD="http://downloads.sourceforge.net/clusterssh/App-ClusterSSH-4.05.tar.gz"
+MD5SUM="3abec90198fa242dff50b5195da6f4d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Try-Tiny perl-x11-protocol perl-File-Which perl-Test-Pod perl-Test-Pod-Coverage perl-CPAN-Changes \
-          perl-tk perl-Test-Trap perl-Exception-Class perl-Readonly perl-Test-DistManifest perl-Test-Differences"
+          perl-tk perl-Test-Trap perl-Exception-Class perl-Readonly perl-Test-DistManifest perl-Test-Differences \
+          perl-File-Slurp perl-Sort-Naturally"
 MAINTAINER="LEVAI Daniel"
 EMAIL="leva@ecentrum.hu"
diff --git a/network/Electrum/Electrum.SlackBuild b/network/Electrum/Electrum.SlackBuild
index b2dcb35232..891d3156d8 100644
--- a/network/Electrum/Electrum.SlackBuild
+++ b/network/Electrum/Electrum.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Electrum
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-2.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENCE README RELEASE-NOTES docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENCE README.rst RELEASE-NOTES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/Electrum/Electrum.info b/network/Electrum/Electrum.info
index 1293846b34..8f215512ac 100644
--- a/network/Electrum/Electrum.info
+++ b/network/Electrum/Electrum.info
@@ -1,8 +1,8 @@
 PRGNAM="Electrum"
-VERSION="2.3.3"
+VERSION="2.5.4"
 HOMEPAGE="https://electrum.org/"
-DOWNLOAD="https://download.electrum.org/Electrum-2.3.3.tar.gz"
-MD5SUM="f8d821842412a794c8350b33f6bcc513"
+DOWNLOAD="https://download.electrum.org/2.5.4/Electrum-2.5.4.tar.gz"
+MD5SUM="a36929bf236c22095e656a3b34003af2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SlowAES ecdsa python-qrcode pyasn1-modules python-tlslite python-pbkdf2 protobuf"
diff --git a/network/FireWorks/FireWorks.SlackBuild b/network/FireWorks/FireWorks.SlackBuild
index 1813b765f5..5fabd32419 100644
--- a/network/FireWorks/FireWorks.SlackBuild
+++ b/network/FireWorks/FireWorks.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/FireWorks/FireWorks.info b/network/FireWorks/FireWorks.info
index ab635c2ffa..c66037c35d 100644
--- a/network/FireWorks/FireWorks.info
+++ b/network/FireWorks/FireWorks.info
@@ -1,7 +1,7 @@
 PRGNAM="FireWorks"
 VERSION="1.07"
 HOMEPAGE="https://github.com/materialsproject/fireworks"
-DOWNLOAD="https://pypi.python.org/packages/source/F/FireWorks/FireWorks-1.07.tar.gz"
+DOWNLOAD="https://github.com/materialsproject/fireworks/archive/v1.07.tar.gz"
 MD5SUM="fd5422b65dfc2a5e0000fa81a0aa06cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/Flootty/Flootty.SlackBuild b/network/Flootty/Flootty.SlackBuild
index 712efc9f76..9657d05c8a 100644
--- a/network/Flootty/Flootty.SlackBuild
+++ b/network/Flootty/Flootty.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Flootty
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=Flootty
-VERSION=${VERSION:-3.1.3}
+VERSION=${VERSION:-3.1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/Flootty/Flootty.info b/network/Flootty/Flootty.info
index 880d0ef7ff..918534acf1 100644
--- a/network/Flootty/Flootty.info
+++ b/network/Flootty/Flootty.info
@@ -1,8 +1,8 @@
 PRGNAM="Flootty"
-VERSION="3.1.3"
+VERSION="3.1.7"
 HOMEPAGE="https://floobits.com"
-DOWNLOAD="https://pypi.python.org/packages/source/F/Flootty/Flootty-3.1.3.tar.gz"
-MD5SUM="28bd2bcbf3a1c03670706ce44a844090"
+DOWNLOAD="https://pypi.python.org/packages/source/F/Flootty/Flootty-3.1.7.tar.gz"
+MD5SUM="1ccfebefc3301c3bdcb1283a77ccd844"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch b/network/NetworkManager-openconnect/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch
new file mode 100644
index 0000000000..21a6800044
--- /dev/null
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch
@@ -0,0 +1,836 @@
+commit a965a00b2b4ba93a6ddbd7ff9dbf2d5ac08e2a66
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Mon Nov 3 17:39:43 2014 +0000
+
+    Update to new hash handling, fix to match stored certs only for the same host/port
+    
+    (cherry picked from commit 2dc45e25b200e1b70e862f46c9f7ad652e59c8a2)
+    
+    Conflicts:
+    	auth-dialog/main.c
+
+commit eb0bbb7254a3623b0bee32f30d31bcff7b91fb5d
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Thu Oct 30 23:16:20 2014 +0000
+
+    Drop support for libopenconnect.so.1
+    
+    (cherry picked from commit b8c7e773204d3b4a85a27d7d2ae58dfc1939e1a8)
+    
+    Conflicts:
+    	auth-dialog/main.c
+
+commit 9e4b394da0c29d77de9a110603aefa437c6b4173
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Thu Oct 30 23:09:14 2014 +0000
+
+    Support libopenconnect.so.4
+    
+    (cherry picked from commit 58944a3ef9c92f7afa07cbb539d062e1956bafc0)
+
+commit b3709a279c7e82dab34462bfc311d7d080255fc0
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Tue Aug 12 14:58:05 2014 +0100
+
+    Always return success from auth-dialog
+    
+    We want to store the secrets even when we ultimately failed to log in.
+    This was slightly suboptimal even before, when we were failing to remember
+    things like the 'autoconnect' and 'certsigs' secrets. But now with HOTP
+    it's particularly important that we keep track of which tokens have been
+    used *even* if we end up failing to log in.
+    
+    Even if we don't get a valid login cookie, it's OK to return success.
+    
+    (cherry picked from commit 5e899ec0dfff56ac15f9e19cccb8b8d17f792afd)
+
+commit 48530310d1a5d68c285343261eb4acfa55f3bdcb
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Tue Aug 12 14:55:39 2014 +0100
+
+    Add HOTP support
+    
+    This requires migrating the token_secret from a config item to a secret,
+    which thankfully doesn't seem to be too diffcult.
+    
+    (cherry picked from commit b3815e96635c8f89c6161bdb6de53cd3c01c8535)
+
+commit b5cbc8ca833353b8b712220c6cc7eab492d59835
+Author: Jiří Klimeš <jklimes@redhat.com>
+Date:   Fri May 30 12:06:52 2014 +0200
+
+    properties: use a real GError domain instead of 0 in export()
+    
+    (cherry picked from commit d16e7d1ea954516d0a12a7b4b8ebf67c15a11746)
+
+commit a90c1cd297aaa6120f253e0c13e70c1c09fa21bd
+Author: Dan Williams <dcbw@redhat.com>
+Date:   Thu Apr 10 12:22:28 2014 -0500
+
+    properties: don't overwrite a GError and use real GError domains
+    
+    Fixes warnings when importing connections.
+
+commit c78853ced9a61e6bb91a7ea75f95f2ea94f3e535
+Author: Piotr DrÄ…g <piotrdrag@gmail.com>
+Date:   Fri Mar 14 17:14:03 2014 +0100
+
+    Updated Polish translation
+diff --git a/auth-dialog/main.c b/auth-dialog/main.c
+index bc03cba..49c4ce0 100644
+--- a/auth-dialog/main.c
++++ b/auth-dialog/main.c
+@@ -48,20 +48,6 @@
+ 
+ #include "openconnect.h"
+ 
+-#if OPENCONNECT_API_VERSION_MAJOR == 1
+-#define openconnect_vpninfo_new openconnect_vpninfo_new_with_cbdata
+-#define openconnect_init_ssl openconnect_init_openssl
+-#endif
+-
+-#ifndef OPENCONNECT_CHECK_VER
+-#define OPENCONNECT_CHECK_VER(x,y) 0
+-#endif
+-
+-#if !OPENCONNECT_CHECK_VER(1,5)
+-#define OPENCONNECT_X509 X509
+-#define OPENCONNECT_OPENSSL
+-#endif
+-
+ #if !OPENCONNECT_CHECK_VER(2,1)
+ #define __openconnect_set_token_mode(...) -EOPNOTSUPP
+ #elif !OPENCONNECT_CHECK_VER(2,2)
+@@ -88,10 +74,19 @@
+ #define OC_FORM_RESULT_NEWGROUP		2
+ #endif
+ 
+-#ifdef OPENCONNECT_OPENSSL
+-#include <openssl/ssl.h>
+-#include <openssl/bio.h>
+-#include <openssl/ui.h>
++#if OPENCONNECT_CHECK_VER(4,0)
++#define dup_option_value(opt)		g_strdup((opt)->_value);
++#define OC3DUP(x)			(x)
++#define write_config_const		const
++#else
++#define dup_option_value(opt)		g_strdup((opt)->value);
++#define openconnect_set_option_value(opt, val) do { \
++		struct oc_form_opt *_o = (opt);				\
++		free(_o->value); _o->value = g_strdup(val);		\
++	} while (0)
++#define openconnect_free_cert_info(v, x) free(x)
++#define OC3DUP(x)			g_strdup(x)
++#define write_config_const		/* */
+ #endif
+ 
+ static const GnomeKeyringPasswordSchema OPENCONNECT_SCHEMA_DEF = {
+@@ -184,7 +179,6 @@ typedef struct auth_ui_data {
+ 	GtkWidget *last_notice_icon;
+ 	GtkTextBuffer *log;
+ 
+-	int retval;
+ 	int cookie_retval;
+ 
+ 	int cancel_pipes[2];
+@@ -305,9 +299,6 @@ typedef struct ui_fragment_data {
+ 	GtkWidget *entry;
+ 	gpointer find_request;
+ 	auth_ui_data *ui_data;
+-#ifdef OPENCONNECT_OPENSSL
+-	UI_STRING *uis;
+-#endif
+ 	struct oc_form_opt *opt;
+ 	char *entry_text;
+ 	int initial_selection;
+@@ -319,27 +310,9 @@ static void entry_activate_cb(GtkWidget *widget, auth_ui_data *ui_data)
+ 	gtk_dialog_response(GTK_DIALOG(ui_data->dialog), AUTH_DIALOG_RESPONSE_LOGIN);
+ }
+ 
+-#ifdef OPENCONNECT_OPENSSL
+-static void do_check_visibility(ui_fragment_data *data, gboolean *visible)
+-{
+-	int min_len;
+-
+-	if (!data->uis)
+-		return;
+-
+-	min_len = UI_get_result_minsize(data->uis);
+-
+-	if (min_len && (!data->entry_text || strlen(data->entry_text) < min_len))
+-		*visible = FALSE;
+-}
+-#endif
+ static void evaluate_login_visibility(auth_ui_data *ui_data)
+ {
+ 	gboolean visible = TRUE;
+-#ifdef OPENCONNECT_OPENSSL
+-	g_queue_foreach(ui_data->form_entries, (GFunc)do_check_visibility,
+-			&visible);
+-#endif
+ 	gtk_widget_set_sensitive (ui_data->login_button, visible);
+ }
+ 
+@@ -347,9 +320,6 @@ static void entry_changed(GtkEntry *entry, ui_fragment_data *data)
+ {
+ 	g_free (data->entry_text);
+ 	data->entry_text = g_strdup(gtk_entry_get_text(entry));
+-#ifdef OPENCONNECT_OPENSSL
+-	evaluate_login_visibility(data->ui_data);
+-#endif
+ }
+ 
+ static void do_override_label(ui_fragment_data *data, struct oc_choice *choice)
+@@ -391,26 +361,6 @@ static void combo_changed(GtkComboBox *combo, ui_fragment_data *data)
+ 			FORMCHOICE(sopt, entry));
+ }
+ 
+-#ifdef OPENCONNECT_OPENSSL
+-static gboolean ui_write_error (ui_fragment_data *data)
+-{
+-	ssl_box_add_error(data->ui_data, UI_get0_output_string(data->uis));
+-
+-	g_slice_free (ui_fragment_data, data);
+-
+-	return FALSE;
+-}
+-
+-static gboolean ui_write_info (ui_fragment_data *data)
+-{
+-	ssl_box_add_info(data->ui_data, UI_get0_output_string(data->uis));
+-
+-	g_slice_free (ui_fragment_data, data);
+-
+-	return FALSE;
+-}
+-#endif
+-
+ static gboolean ui_write_prompt (ui_fragment_data *data)
+ {
+ 	auth_ui_data *ui_data = _ui_data; /* FIXME global */
+@@ -418,16 +368,8 @@ static gboolean ui_write_prompt (ui_fragment_data *data)
+ 	int visible;
+ 	const char *label;
+ 
+-#ifdef OPENCONNECT_OPENSSL
+-	if (data->uis) {
+-		label = UI_get0_output_string(data->uis);
+-		visible = UI_get_input_flags(data->uis) & UI_INPUT_FLAG_ECHO;
+-	} else 
+-#endif
+-	{
+-		label = data->opt->label;
+-		visible = (data->opt->type == OC_FORM_OPT_TEXT);
+-	}
++	label = data->opt->label;
++	visible = (data->opt->type == OC_FORM_OPT_TEXT);
+ 
+ #if GTK_CHECK_VERSION(3,1,6)
+ 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+@@ -524,128 +466,6 @@ static gboolean ui_show (auth_ui_data *ui_data)
+ 	return FALSE;
+ }
+ 
+-#ifdef OPENCONNECT_OPENSSL
+-/* runs in worker thread */
+-static int ui_open(UI *ui)
+-{
+-	auth_ui_data *ui_data = _ui_data; /* FIXME global */
+-
+-	UI_add_user_data(ui, ui_data);
+-
+-	return 1;
+-}
+-
+-/* runs in worker thread */
+-static int ui_write(UI *ui, UI_STRING *uis)
+-{
+-	auth_ui_data *ui_data;
+-	ui_fragment_data *data;
+-
+-	ui_data = UI_get0_user_data(ui);
+-
+-	/* return if a new host has been selected */
+-	if (ui_data->cancelled) {
+-		return 1;
+-	}
+-
+-	data = g_slice_new0 (ui_fragment_data);
+-	data->ui_data = ui_data;
+-	data->uis = uis;
+-
+-	switch(UI_get_string_type(uis)) {
+-	case UIT_ERROR:
+-		g_idle_add ((GSourceFunc)ui_write_error, data);
+-		break;
+-
+-	case UIT_INFO:
+-		g_idle_add ((GSourceFunc)ui_write_info, data);
+-		break;
+-
+-	case UIT_PROMPT:
+-	case UIT_VERIFY:
+-		g_mutex_lock (ui_data->form_mutex);
+-		g_queue_push_head(ui_data->form_entries, data);
+-		g_mutex_unlock (ui_data->form_mutex);
+-
+-		g_idle_add ((GSourceFunc)ui_write_prompt, data);
+-		break;
+-
+-	case UIT_BOOLEAN:
+-		/* FIXME */
+-	case UIT_NONE:
+-	default:
+-		g_slice_free (ui_fragment_data, data);
+-	}
+-	return 1;
+-}
+-
+-/* runs in worker thread */
+-static int ui_flush(UI* ui)
+-{
+-	auth_ui_data *ui_data;
+-	int response;
+-
+-	ui_data = UI_get0_user_data(ui);
+-
+-	g_idle_add((GSourceFunc)ui_show, ui_data);
+-	g_mutex_lock(ui_data->form_mutex);
+-	/* wait for ui to show */
+-	while (!ui_data->form_shown) {
+-		g_cond_wait(ui_data->form_shown_changed, ui_data->form_mutex);
+-	}
+-	ui_data->form_shown = FALSE;
+-
+-	if (!ui_data->cancelled) {
+-		/* wait for form submission or cancel */
+-		while (!ui_data->form_retval) {
+-			g_cond_wait(ui_data->form_retval_changed, ui_data->form_mutex);
+-		}
+-		response = GPOINTER_TO_INT (ui_data->form_retval);
+-		ui_data->form_retval = NULL;
+-	} else
+-		response = AUTH_DIALOG_RESPONSE_CANCEL;
+-
+-	/* set entry results and free temporary data structures */
+-	while (!g_queue_is_empty (ui_data->form_entries)) {
+-		ui_fragment_data *data;
+-		data = g_queue_pop_tail (ui_data->form_entries);
+-		if (data->entry_text) {
+-			UI_set_result(ui, data->uis, data->entry_text);
+-		}
+-		if (data->find_request) {
+-			gnome_keyring_cancel_request(data->find_request);
+-		}
+-		g_slice_free (ui_fragment_data, data);
+-	}
+-	ui_data->form_grabbed = 0;
+-	g_mutex_unlock(ui_data->form_mutex);
+-
+-	/* -1 = cancel,
+-	 *  0 = failure,
+-	 *  1 = success */
+-	return (response == AUTH_DIALOG_RESPONSE_LOGIN ? 1 : -1);
+-}
+-
+-/* runs in worker thread */
+-static int ui_close(UI *ui)
+-{
+-	return 1;
+-}
+-
+-static int init_openssl_ui(void)
+-{
+-	UI_METHOD *ui_method = UI_create_method("OpenConnect VPN UI (gtk)");
+-
+-	UI_method_set_opener(ui_method, ui_open);
+-	UI_method_set_flusher(ui_method, ui_flush);
+-	UI_method_set_writer(ui_method, ui_write);
+-	UI_method_set_closer(ui_method, ui_close);
+-
+-	UI_set_default_method(ui_method);
+-	return 0;
+-}
+-#endif /* OPENCONNECT_OPENSSL */
+-
+ static char *find_form_answer(GHashTable *secrets, struct oc_auth_form *form,
+ 			      struct oc_form_opt *opt)
+ {
+@@ -723,7 +543,7 @@ static gboolean ui_form (struct oc_auth_form *form)
+ 				data->entry_text = g_strdup (find_form_answer(ui_data->secrets,
+ 									      form, opt));
+ 				if (!data->entry_text)
+-					data->entry_text = g_strdup (opt->value);
++					data->entry_text = dup_option_value(opt);
+ 			} else {
+ 				data->find_request = gnome_keyring_find_password(
+ 						OPENCONNECT_SCHEMA,
+@@ -786,8 +606,7 @@ static gboolean set_initial_authgroup (auth_ui_data *ui_data, struct oc_auth_for
+ 		for (i = 0; i < sopt->nr_choices; i++) {
+ 			struct oc_choice *ch = FORMCHOICE(sopt, i);
+ 			if (!strcmp(saved_group, ch->name) && i != AUTHGROUP_SELECTION(form)) {
+-				free(opt->value);
+-				opt->value = g_strdup(saved_group);
++				openconnect_set_option_value(opt, saved_group);
+ 				return TRUE;
+ 			}
+ 		}
+@@ -833,7 +652,7 @@ static int nm_process_auth_form (void *cbdata, struct oc_auth_form *form)
+ 				gnome_keyring_cancel_request(data->find_request);
+ 
+ 			if (data->entry_text) {
+-				data->opt->value = g_strdup (data->entry_text);
++				openconnect_set_option_value(data->opt, data->entry_text);
+ 
+ 				if (data->opt->type == OC_FORM_OPT_TEXT ||
+ 				    data->opt->type == OC_FORM_OPT_SELECT) {
+@@ -884,7 +703,7 @@ static char* get_title(const char *vpn_name)
+ 
+ typedef struct cert_data {
+ 	auth_ui_data *ui_data;
+-	OPENCONNECT_X509 *peer_cert;
++	char *cert_details;
+ 	const char *reason;
+ } cert_data;
+ 
+@@ -912,13 +731,10 @@ static gboolean user_validate_cert(cert_data *data)
+ {
+ 	auth_ui_data *ui_data = _ui_data; /* FIXME global */
+ 	char *title;
+-	char *details;
+ 	GtkWidget *dlg, *text, *scroll;
+ 	GtkTextBuffer *buffer;
+ 	int result;
+ 
+-	details = openconnect_get_cert_details(ui_data->vpninfo, data->peer_cert);
+-
+ 	title = get_title(data->ui_data->vpn_name);
+ 	dlg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION,
+ 				     GTK_BUTTONS_OK_CANCEL,
+@@ -941,8 +757,7 @@ static gboolean user_validate_cert(cert_data *data)
+ 
+ 	text = gtk_text_view_new();
+ 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+-	gtk_text_buffer_set_text(buffer, details, -1);
+-	free(details);
++	gtk_text_buffer_set_text(buffer, data->cert_details, -1);
+ 	gtk_text_view_set_editable(GTK_TEXT_VIEW(text), 0);
+ 	gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
+ 	gtk_container_add(GTK_CONTAINER(scroll), text);
+@@ -965,36 +780,40 @@ static gboolean user_validate_cert(cert_data *data)
+ 
+ /* runs in worker thread */
+ static int validate_peer_cert(void *cbdata,
+-			      OPENCONNECT_X509 *peer_cert, const char *reason)
++#if !OPENCONNECT_CHECK_VER(5,0)
++			      OPENCONNECT_X509 *peer_cert,
++#endif
++			      const char *reason)
+ {
+ 	auth_ui_data *ui_data = cbdata;
+-	char fingerprint[41];
+-	char *certs_data;
+ 	int ret = 0;
+ 	cert_data *data;
++	char *certkey;
++	char *accepted_hash = NULL;
++#if OPENCONNECT_CHECK_VER(5,0)
++	const char *fingerprint = openconnect_get_peer_cert_hash(ui_data->vpninfo);
++#else
++	char fingerprint[41];
+ 
+ 	ret = openconnect_get_cert_sha1(ui_data->vpninfo, peer_cert, fingerprint);
+ 	if (ret)
+ 		return ret;
+ 
+-	certs_data = g_hash_table_lookup (ui_data->secrets, "certsigs");
+-	if (certs_data) {
+-		char **certs = g_strsplit_set(certs_data, "\t", 0);
+-		char **this = certs;
++#define openconnect_check_peer_cert_hash(v, h) strcmp(h, fingerprint)
++#define openconnect_get_peer_cert_details(v) openconnect_get_cert_details(v, peer_cert);
++#endif
+ 
+-		while (*this) {
+-			if (!strcmp(*this, fingerprint)) {
+-				g_strfreev(certs);
+-				goto out;
+-			}
+-			this++;
+-		}
+-		g_strfreev(certs);
+-	}
++	certkey = g_strdup_printf ("certificate:%s:%d",
++				   openconnect_get_hostname(ui_data->vpninfo),
++				   openconnect_get_port(ui_data->vpninfo));
++
++	accepted_hash = g_hash_table_lookup (ui_data->secrets, certkey);
++	if (accepted_hash && !openconnect_check_peer_cert_hash(ui_data->vpninfo, accepted_hash))
++		goto accepted;
+ 
+ 	data = g_slice_new(cert_data);
+ 	data->ui_data = ui_data; /* FIXME uses global */
+-	data->peer_cert = peer_cert;
++	data->cert_details = openconnect_get_peer_cert_details(ui_data->vpninfo);
+ 	data->reason = reason;
+ 
+ 	g_mutex_lock(ui_data->form_mutex);
+@@ -1006,24 +825,25 @@ static int validate_peer_cert(void *cbdata,
+ 	while (ui_data->cert_response == CERT_USER_NOT_READY) {
+ 		g_cond_wait(ui_data->cert_response_changed, ui_data->form_mutex);
+ 	}
+-	if (ui_data->cert_response == CERT_ACCEPTED) {
+-		if (certs_data) {
+-			char *new = g_strdup_printf("%s\t%s", certs_data, fingerprint);
+-			g_hash_table_insert (ui_data->secrets,
+-					     g_strdup ("certsigs"), new);
+-		} else {
+-			g_hash_table_insert (ui_data->secrets, g_strdup ("certsigs"),
+-					     g_strdup (fingerprint));
+-		}
++
++	openconnect_free_cert_info(data->ui_data->vpninfo, data->cert_details);
++	g_slice_free(cert_data, data);
++
++	if (ui_data->cert_response == CERT_ACCEPTED)
+ 		ret = 0;
+-	} else {
++	else
+ 		ret = -EINVAL;
+-	}
++
+ 	g_mutex_unlock (ui_data->form_mutex);
+ 
+-	g_slice_free(cert_data, data);
++ accepted:
++	if (!ret) {
++		g_hash_table_insert (ui_data->secrets, certkey,
++				     g_strdup(fingerprint));
++		certkey = NULL;
++	}
+ 
+- out:
++	g_free (certkey);
+ 	return ret;
+ }
+ 
+@@ -1176,7 +996,7 @@ static int get_config (GHashTable *options, GHashTable *secrets,
+ 
+ 	cafile = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_CACERT);
+ 	if (cafile)
+-		openconnect_set_cafile(vpninfo, g_strdup (cafile));
++		openconnect_set_cafile(vpninfo, OC3DUP (cafile));
+ 
+ 	csd = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_CSD_ENABLE);
+ 	if (csd && !strcmp(csd, "yes")) {
+@@ -1186,16 +1006,16 @@ static int get_config (GHashTable *options, GHashTable *secrets,
+ 		if (csd_wrapper && !csd_wrapper[0])
+ 			csd_wrapper = NULL;
+ 
+-		openconnect_setup_csd(vpninfo, getuid(), 1, g_strdup (csd_wrapper));
++		openconnect_setup_csd(vpninfo, getuid(), 1, OC3DUP (csd_wrapper));
+ 	}
+ 
+ 	proxy = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_PROXY);
+-	if (proxy && proxy[0] && openconnect_set_http_proxy(vpninfo, g_strdup (proxy)))
++	if (proxy && proxy[0] && openconnect_set_http_proxy(vpninfo, OC3DUP (proxy)))
+ 		return -EINVAL;
+ 
+ 	cert = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_USERCERT);
+ 	sslkey = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_PRIVKEY);
+-	openconnect_set_client_cert (vpninfo, g_strdup (cert), g_strdup (sslkey));
++	openconnect_set_client_cert (vpninfo, OC3DUP (cert), OC3DUP (sslkey));
+ 
+ 	pem_passphrase_fsid = g_hash_table_lookup (options,
+ 						   NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID);
+@@ -1203,7 +1023,9 @@ static int get_config (GHashTable *options, GHashTable *secrets,
+ 		openconnect_passphrase_from_fsid(vpninfo);
+ 
+ 	token_mode = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_TOKEN_MODE);
+-	token_secret = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_TOKEN_SECRET);
++	token_secret = g_hash_table_lookup (secrets, NM_OPENCONNECT_KEY_TOKEN_SECRET);
++	if (!token_secret || !token_secret[0])
++		token_secret = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_TOKEN_SECRET);
+ 	if (token_mode) {
+ 		int ret = 0;
+ 
+@@ -1213,6 +1035,10 @@ static int get_config (GHashTable *options, GHashTable *secrets,
+ 			ret = __openconnect_set_token_mode(vpninfo, OC_TOKEN_MODE_STOKEN, NULL);
+ 		else if (!strcmp(token_mode, "totp") && token_secret)
+ 			ret = __openconnect_set_token_mode(vpninfo, OC_TOKEN_MODE_TOTP, token_secret);
++#if OPENCONNECT_CHECK_VER(3,4)
++		else if (!strcmp(token_mode, "hotp") && token_secret)
++			ret = __openconnect_set_token_mode(vpninfo, OC_TOKEN_MODE_HOTP, token_secret);
++#endif
+ 
+ 		if (ret)
+ 			fprintf(stderr, "Failed to initialize software token: %d\n", ret);
+@@ -1238,7 +1064,18 @@ static void populate_vpnhost_combo(auth_ui_data *ui_data)
+ 	}
+ }
+ 
+-static int write_new_config(void *cbdata, char *buf, int buflen)
++#if OPENCONNECT_CHECK_VER(3,4)
++static int update_token(void *cbdata, const char *tok)
++{
++	auth_ui_data *ui_data = cbdata;
++	g_hash_table_insert (ui_data->secrets, g_strdup (NM_OPENCONNECT_KEY_TOKEN_SECRET),
++			     g_strdup(tok));
++
++	return 0;
++}
++#endif
++
++static int write_new_config(void *cbdata, write_config_const char *buf, int buflen)
+ {
+ 	auth_ui_data *ui_data = cbdata;
+ 	g_hash_table_insert (ui_data->secrets, g_strdup ("xmlconfig"),
+@@ -1387,9 +1224,8 @@ static gboolean cookie_obtained(auth_ui_data *ui_data)
+ 			gtk_widget_show_all(ui_data->ssl_box);
+ 			gtk_widget_set_sensitive(ui_data->cancel_button, FALSE);
+ 		}
+-		ui_data->retval = 1;
+ 	} else if (!ui_data->cookie_retval) {
+-		OPENCONNECT_X509 *cert;
++		const void *cert;
+ 		gchar *key, *value;
+ 
+ 		/* got cookie */
+@@ -1411,26 +1247,32 @@ static gboolean cookie_obtained(auth_ui_data *ui_data)
+ 		g_hash_table_insert (ui_data->secrets, key, value);
+ 		openconnect_clear_cookie(ui_data->vpninfo);
+ 
++#if OPENCONNECT_CHECK_VER(5,0)
++		cert = openconnect_get_peer_cert_hash (ui_data->vpninfo);
++		if (cert) {
++			key = g_strdup (NM_OPENCONNECT_KEY_GWCERT);
++			value = g_strdup (cert);
++			g_hash_table_insert (ui_data->secrets, key, value);
++		}
++#else
+ 		cert = openconnect_get_peer_cert (ui_data->vpninfo);
+ 		if (cert) {
+ 			key = g_strdup (NM_OPENCONNECT_KEY_GWCERT);
+ 			value = g_malloc0 (41);
+-			openconnect_get_cert_sha1(ui_data->vpninfo, cert, value);
++			openconnect_get_cert_sha1(ui_data->vpninfo, (void *)cert, value);
+ 			g_hash_table_insert (ui_data->secrets, key, value);
+ 		}
+-
++#endif
+ 		if (get_save_passwords(ui_data->secrets)) {
+ 			g_hash_table_foreach(ui_data->success_passwords,
+ 					     keyring_store_passwords,
+ 					     NULL);
+ 		}
+-		ui_data->retval = 0;
+ 
+ 		gtk_main_quit();
+ 	} else {
+ 		/* no cookie; user cancellation */
+ 		gtk_widget_show (ui_data->no_form_label);
+-		ui_data->retval = 1;
+ 	}
+ 
+ 	g_hash_table_remove_all (ui_data->success_secrets);
+@@ -1487,11 +1329,11 @@ static void connect_host(auth_ui_data *ui_data)
+ 	if (openconnect_parse_url(ui_data->vpninfo, host->hostaddress)) {
+ 		fprintf(stderr, "Failed to parse server URL '%s'\n",
+ 			host->hostaddress);
+-		openconnect_set_hostname (ui_data->vpninfo, g_strdup(host->hostaddress));
++		openconnect_set_hostname (ui_data->vpninfo, OC3DUP (host->hostaddress));
+ 	}
+ 
+ 	if (!openconnect_get_urlpath(ui_data->vpninfo) && host->usergroup)
+-		openconnect_set_urlpath(ui_data->vpninfo, g_strdup(host->usergroup));
++		openconnect_set_urlpath(ui_data->vpninfo, OC3DUP (host->usergroup));
+ 
+ 
+ 	g_hash_table_insert (ui_data->success_secrets, g_strdup("lasthost"),
+@@ -1708,7 +1550,6 @@ static auth_ui_data *init_ui_data (char *vpn_name, GHashTable *options, GHashTab
+ 	auth_ui_data *ui_data;
+ 
+ 	ui_data = g_slice_new0(auth_ui_data);
+-	ui_data->retval = 1;
+ 
+ 	ui_data->form_entries = g_queue_new();
+ #if GLIB_CHECK_VERSION(2,31,0)
+@@ -1868,11 +1709,13 @@ int main (int argc, char **argv)
+ 		fprintf(stderr, "Failed to find VPN UUID %s\n", vpn_uuid);
+ 		return 1;
+ 	}
+-	build_main_dialog(_ui_data);
+ 
+-#ifdef OPENCONNECT_OPENSSL
+-	init_openssl_ui();
++#if OPENCONNECT_CHECK_VER(3,4)
++	openconnect_set_token_callbacks (_ui_data->vpninfo, _ui_data, NULL, update_token);
+ #endif
++
++	build_main_dialog(_ui_data);
++
+ 	openconnect_init_ssl();
+ 
+ 	/* Start connecting now if there's only one host. Or if configured to */
+@@ -1893,5 +1736,5 @@ int main (int argc, char **argv)
+ 
+ 	wait_for_quit ();
+ 
+-	return _ui_data->retval;
++	return 0;
+ }
+diff --git a/properties/nm-openconnect-dialog.ui b/properties/nm-openconnect-dialog.ui
+index b3401db..4643b73 100644
+--- a/properties/nm-openconnect-dialog.ui
++++ b/properties/nm-openconnect-dialog.ui
+@@ -766,6 +766,12 @@
+             <col id="2" translatable="no">totp</col>
+             <col id="3" translatable="no">True</col>
+           </row>
++          <row>
++            <col id="0" translatable="yes">HOTP - manually entered</col>
++            <col id="1" translatable="no">hotp</col>
++            <col id="2" translatable="no">hotp</col>
++            <col id="3" translatable="no">True</col>
++          </row>
+         </data>
+       </object>
+ </interface>
+diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c
+index 3a9f69f..dfd5f5c 100644
+--- a/properties/nm-openconnect.c
++++ b/properties/nm-openconnect.c
+@@ -95,6 +95,26 @@ typedef struct {
+ #define COL_AUTH_PAGE 1
+ #define COL_AUTH_TYPE 2
+ 
++/************** import/export **************/
++
++typedef enum {
++	NM_OPENCONNECT_IMPORT_EXPORT_ERROR_UNKNOWN = 0,
++	NM_OPENCONNECT_IMPORT_EXPORT_ERROR_NOT_OPENCONNECT,
++	NM_OPENCONNECT_IMPORT_EXPORT_ERROR_BAD_DATA,
++} NMOpenconnectImportError;
++
++#define NM_OPENCONNECT_IMPORT_EXPORT_ERROR nm_openconnect_import_export_error_quark ()
++
++static GQuark
++nm_openconnect_import_export_error_quark (void)
++{
++	static GQuark quark = 0;
++
++	if (G_UNLIKELY (quark == 0))
++		quark = g_quark_from_static_string ("nm-openconnect-import-export-error-quark");
++	return quark;
++}
++
+ static NMConnection *
+ import (NMVpnPluginUiInterface *iface, const char *path, GError **error)
+ {
+@@ -110,8 +130,12 @@ import (NMVpnPluginUiInterface *iface, const char *path, GError **error)
+ 	keyfile = g_key_file_new ();
+ 	flags = G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS;
+ 
+-	if (!g_key_file_load_from_file (keyfile, path, flags, error)) {
+-		g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)", OPENCONNECT_PLUGIN_NAME);
++	if (!g_key_file_load_from_file (keyfile, path, flags, NULL)) {
++		g_set_error (error,
++		             NM_OPENCONNECT_IMPORT_EXPORT_ERROR,
++		             NM_OPENCONNECT_IMPORT_EXPORT_ERROR_NOT_OPENCONNECT,
++		             "does not look like a %s VPN connection (parse failed)",
++		             OPENCONNECT_PLUGIN_NAME);
+ 		return NULL;
+ 	}
+ 
+@@ -131,7 +155,11 @@ import (NMVpnPluginUiInterface *iface, const char *path, GError **error)
+ 	if (buf) {
+ 		nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_GATEWAY, buf);
+ 	} else {
+-		g_set_error (error, 0, 0, "does not look like a %s VPN connection (no Host)", OPENCONNECT_PLUGIN_NAME);
++		g_set_error (error,
++		             NM_OPENCONNECT_IMPORT_EXPORT_ERROR,
++		             NM_OPENCONNECT_IMPORT_EXPORT_ERROR_BAD_DATA,
++		             "does not look like a %s VPN connection (no Host)",
++		             OPENCONNECT_PLUGIN_NAME);
+ 		g_object_unref (connection);
+ 		return NULL;
+ 	}
+@@ -186,7 +214,7 @@ import (NMVpnPluginUiInterface *iface, const char *path, GError **error)
+ 	/* Soft token secret */
+ 	buf = g_key_file_get_string (keyfile, "openconnect", "StokenString", NULL);
+ 	if (buf)
+-		nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, buf);
++		nm_setting_vpn_add_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, buf);
+ 
+ 	return connection;
+ }
+@@ -215,7 +243,10 @@ export (NMVpnPluginUiInterface *iface,
+ 
+ 	f = fopen (path, "w");
+ 	if (!f) {
+-		g_set_error (error, 0, 0, "could not open file for writing");
++		g_set_error_literal (error,
++		                     NM_OPENCONNECT_IMPORT_EXPORT_ERROR,
++		                     NM_OPENCONNECT_IMPORT_EXPORT_ERROR_UNKNOWN,
++		                     "could not open file for writing");
+ 		return FALSE;
+ 	}
+ 
+@@ -227,7 +258,10 @@ export (NMVpnPluginUiInterface *iface,
+ 	if (value && strlen (value))
+ 		gateway = value;
+ 	else {
+-		g_set_error (error, 0, 0, "connection was incomplete (missing gateway)");
++		g_set_error_literal (error,
++		                     NM_OPENCONNECT_IMPORT_EXPORT_ERROR,
++		                     NM_OPENCONNECT_IMPORT_EXPORT_ERROR_BAD_DATA,
++		                     "connection was incomplete (missing gateway)");
+ 		goto done;
+ 	}
+ 
+@@ -263,9 +297,14 @@ export (NMVpnPluginUiInterface *iface,
+ 	if (value && strlen (value))
+ 		token_mode = value;
+ 
+-	value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET);
++	value = nm_setting_vpn_get_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET);
+ 	if (value && strlen (value))
+ 		token_secret = value;
++	else {
++		value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET);
++		if (value && strlen (value))
++			token_secret = value;
++	}
+ 
+ 	fprintf (f,
+ 		 "[openconnect]\n"
+@@ -393,6 +432,9 @@ init_token_mode_options (GtkComboBox *token_mode)
+ 			iter_valid = gtk_list_store_remove (token_mode_list, &iter);
+ 		else if (!strcmp (token_type, "totp") && !openconnect_has_oath_support ())
+ 			iter_valid = gtk_list_store_remove (token_mode_list, &iter);
++		else if (!strcmp (token_type, "hotp") &&
++				 (!openconnect_has_oath_support () || !OPENCONNECT_CHECK_VER(3,4)))
++			iter_valid = gtk_list_store_remove (token_mode_list, &iter);
+ 		else {
+ 			iter_valid = gtk_tree_model_iter_next (model, &iter);
+ 			valid_rows++;
+@@ -458,7 +500,9 @@ init_token_ui (OpenconnectPluginUiWidget *self,
+ 	if (!buffer)
+ 		return FALSE;
+ 	if (s_vpn) {
+-		value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET);
++		value = nm_setting_vpn_get_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET);
++		if (!value)
++			value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET);
+ 		if (value)
+ 			gtk_text_buffer_set_text (buffer, value, -1);
+ 	}
+@@ -619,7 +663,7 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
+ 		*dst = 0;
+ 
+ 		if (strlen (str))
+-			nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, str);
++			nm_setting_vpn_add_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, str);
+ 	}
+ 
+ 	if (!check_validity (self, error))
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
index 2f2b6b1886..98cdc52f56 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for NetworkManager
 
-# Copyright 2010,2011,2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2010-2015, Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=NetworkManager-openconnect
-VERSION=${VERSION:-0.9.8.4}
+VERSION=${VERSION:-0.9.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Support openconnect-7.x
+patch -p1 < $CWD/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch
+
 # Remove mention of an extraneous user account from the dbus config file
 patch -p1 < $CWD/nm-openconnect-service.conf.diff
 
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.info b/network/NetworkManager-openconnect/NetworkManager-openconnect.info
index 2733d7beb3..d8af13bf73 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.info
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.info
@@ -1,8 +1,8 @@
 PRGNAM="NetworkManager-openconnect"
-VERSION="0.9.8.4"
+VERSION="0.9.8.6"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.4.tar.xz"
-MD5SUM="1afe9d5bfe5222d7ba2cdd88840695c9"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.6.tar.xz"
+MD5SUM="f0c8b87704af77ea764f70d5bdef91ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openconnect"
diff --git a/network/OpenDKIM/OpenDKIM.SlackBuild b/network/OpenDKIM/OpenDKIM.SlackBuild
index 5dbf17019e..8923c5528a 100644
--- a/network/OpenDKIM/OpenDKIM.SlackBuild
+++ b/network/OpenDKIM/OpenDKIM.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opendkim
-VERSION=${VERSION:-2.10.1}
+VERSION=${VERSION:-2.10.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -93,7 +93,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 if [ "${USE_MYSQL:-no}" == "yes" ]; then
-  MYSQL="--with-sql-backend"
+  MYSQL="--with-sql-backend --with-odbx"
 else
   MYSQL=""
 fi
diff --git a/network/OpenDKIM/OpenDKIM.info b/network/OpenDKIM/OpenDKIM.info
index 28ec5427b5..26a3650b05 100644
--- a/network/OpenDKIM/OpenDKIM.info
+++ b/network/OpenDKIM/OpenDKIM.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenDKIM"
-VERSION="2.10.1"
+VERSION="2.10.3"
 HOMEPAGE="http://opendkim.org/"
-DOWNLOAD="http://iweb.dl.sourceforge.net/project/opendkim/opendkim-2.10.1.tar.gz"
-MD5SUM="e75c2944634f875a301d85ab30c2d094"
+DOWNLOAD="http://downloads.sourceforge.net/opendkim/opendkim-2.10.3.tar.gz"
+MD5SUM="916e691cdd16cfabd1cd6efe745323f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libbsd"
diff --git a/network/OpenDKIM/README b/network/OpenDKIM/README
index 72784778c8..3fd62deafd 100644
--- a/network/OpenDKIM/README
+++ b/network/OpenDKIM/README
@@ -26,8 +26,10 @@ The rc.opendkim script will automatically create keys for your machine's
 domain name in /etc/opendkim/keys. Set AUTOCREATE_DKIM_KEYS=no there to 
 disable this behavior.
 
-Optional MySQL and Unbound support is provided. To enable:
+Optional MySQL and Unbound support is provided. Note that MySQL
+support requires OpenDBX installed. To enable:
 
-USE_MYSQL=yes USE_UNBOUND=yes ./OpenDKIM.SlackBuild
+USE_MYSQL=yes ./OpenDKIM.SlackBuild
+USE_UNBOUND=yes ./OpenDKIM.SlackBuild
 
 Unbound will require the unbound package which is available in SlackBuilds.
diff --git a/network/Pafy/Pafy.SlackBuild b/network/Pafy/Pafy.SlackBuild
index 58a4735858..ee0a597bab 100644
--- a/network/Pafy/Pafy.SlackBuild
+++ b/network/Pafy/Pafy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Pafy
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=Pafy
 SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-0.3.74}
+VERSION=${VERSION:-0.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/Pafy/Pafy.info b/network/Pafy/Pafy.info
index af36b9a1df..22f0193e0d 100644
--- a/network/Pafy/Pafy.info
+++ b/network/Pafy/Pafy.info
@@ -1,10 +1,10 @@
 PRGNAM="Pafy"
-VERSION="0.3.74"
+VERSION="0.4.3"
 HOMEPAGE="http://np1.github.io/pafy/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pafy/pafy-0.3.74.tar.gz"
-MD5SUM="fbf0e7f85914eaf35f87837232eec09c"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pafy/pafy-0.4.3.tar.gz"
+MD5SUM="549c429514b3d4ca92f8c5b82842dc90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="youtube-dl"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/SocksiPy/SocksiPy.info b/network/SocksiPy/SocksiPy.info
index 075b24a2c3..3dc23a8473 100644
--- a/network/SocksiPy/SocksiPy.info
+++ b/network/SocksiPy/SocksiPy.info
@@ -6,5 +6,5 @@ MD5SUM="3be8be26230bc9eca94eb3335740ed5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/aggregate/Makefile.in.patch b/network/aggregate/Makefile.in.patch
new file mode 100644
index 0000000000..13ca370931
--- /dev/null
+++ b/network/aggregate/Makefile.in.patch
@@ -0,0 +1,19 @@
+--- Makefile.in	2002-03-06 17:59:37.000000000 +0100
++++ Makefile.in.patched	2015-08-10 16:10:50.439007299 +0200
+@@ -41,10 +41,12 @@
+ 	rm -f *.o
+ 
+ install: $(PROGS)
+-	$(INSTALL) -m 0755 aggregate $(prefix)/bin/
+-	$(INSTALL) -m 0644 aggregate.1 $(prefix)/man/man1/
+-	$(INSTALL) -m 0755 aggregate-ios $(prefix)/bin/
+-	$(INSTALL) -m 0644 aggregate-ios.1 $(prefix)/man/man1/
++	$(INSTALL) -m 0755 -d $(DESTDIR)$(prefix)/bin/
++	$(INSTALL) -m 0755 -d $(DESTDIR)$(prefix)/man/man1/
++	$(INSTALL) -m 0755 aggregate $(DESTDIR)$(prefix)/bin/
++	$(INSTALL) -m 0644 aggregate.1 $(DESTDIR)$(prefix)/man/man1/
++	$(INSTALL) -m 0755 aggregate-ios $(DESTDIR)$(prefix)/bin/
++	$(INSTALL) -m 0644 aggregate-ios.1 $(DESTDIR)$(prefix)/man/man1/
+ 
+ .c.o:
+ 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
diff --git a/network/aggregate/README b/network/aggregate/README
new file mode 100644
index 0000000000..dab400845a
--- /dev/null
+++ b/network/aggregate/README
@@ -0,0 +1,11 @@
+aggregate (optimise a list of route prefixes)
+
+Takes a list of prefixes in conventional format on stdin, and
+performs two optimisations to attempt to reduce the length of the
+prefix list. The first optimisation is to remove any supplied
+prefixes which are superfluous because they are already included in
+another supplied prefix. For example, 203.97.2.0/24 would be removed
+if 203.97.0.0/17 was also supplied. The second optimisation
+identifies adjacent prefixes that can be combined under a single,
+shorter-length prefix. For example, 203.97.2.0/24 and 203.97.3.0/24
+can be combined into the single prefix 203.97.2.0/23.
diff --git a/network/aggregate/aggregate.SlackBuild b/network/aggregate/aggregate.SlackBuild
new file mode 100644
index 0000000000..f678428557
--- /dev/null
+++ b/network/aggregate/aggregate.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for aggregate
+
+# Copyright (c) 2014-2015 Thomas Szteliga <ts@websafe.pl>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+PRGNAM=aggregate
+VERSION=${VERSION:-1.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch Makefile.in $CWD/Makefile.in.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a HISTORY LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+chmod -x $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/aggregate/aggregate.info b/network/aggregate/aggregate.info
new file mode 100644
index 0000000000..3748638cc3
--- /dev/null
+++ b/network/aggregate/aggregate.info
@@ -0,0 +1,10 @@
+PRGNAM="aggregate"
+VERSION="1.6"
+HOMEPAGE="http://ftp.isc.org/isc/aggregate/"
+DOWNLOAD="http://ftp.isc.org/isc/aggregate/aggregate-1.6.tar.gz"
+MD5SUM="6fcc515388bf2c5b0c8f9f733bfee7e1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thomas Szteliga"
+EMAIL="ts@websafe.pl"
diff --git a/network/aggregate/slack-desc b/network/aggregate/slack-desc
new file mode 100644
index 0000000000..6d9a3acb26
--- /dev/null
+++ b/network/aggregate/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+aggregate: aggregate (optimise a list of route prefixes)
+aggregate: 
+aggregate: Takes a list of prefixes in conventional format on stdin, and
+aggregate: performs two optimisations to attempt to reduce the length of the
+aggregate: prefix list. The first optimisation is to remove any supplied
+aggregate: prefixes which are superfluous because they are already included in
+aggregate: another supplied prefix. For example, 203.97.2.0/24 would be removed
+aggregate: if 203.97.0.0/17 was also supplied. The second optimisation
+aggregate: identifies adjacent prefixes that can be combined under a single,
+aggregate: shorter-length prefix. For example, 203.97.2.0/24 and 203.97.3.0/24
+aggregate: can be combined into the single prefix 203.97.2.0/23.
diff --git a/network/aldryn-client/aldryn-client.SlackBuild b/network/aldryn-client/aldryn-client.SlackBuild
index e31ca12062..15675ccb19 100644
--- a/network/aldryn-client/aldryn-client.SlackBuild
+++ b/network/aldryn-client/aldryn-client.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for aldryn-client
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=aldryn-client
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-2.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/aldryn-client/aldryn-client.info b/network/aldryn-client/aldryn-client.info
index 5d65cad42c..6faf7dcbbe 100644
--- a/network/aldryn-client/aldryn-client.info
+++ b/network/aldryn-client/aldryn-client.info
@@ -1,10 +1,10 @@
 PRGNAM="aldryn-client"
-VERSION="0.9.6"
+VERSION="2.0.5"
 HOMEPAGE="http://www.aldryn.com/"
-DOWNLOAD="https://pypi.python.org/packages/source/a/aldryn-client/aldryn-client-0.9.6.tar.gz"
-MD5SUM="4fee21a549e74345cceeb3c8fe9a4c45"
+DOWNLOAD="https://pypi.python.org/packages/source/a/aldryn-client/aldryn-client-2.0.5.tar.gz"
+MD5SUM="de56d27a5dca59df0870a3259595560d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="GitPython python-requests docopt PyYAML"
+REQUIRES="python-requests click python-tabulate"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/allmydata-tahoe/allmydata-tahoe.SlackBuild b/network/allmydata-tahoe/allmydata-tahoe.SlackBuild
index 4a5ee97af2..8a958a40df 100644
--- a/network/allmydata-tahoe/allmydata-tahoe.SlackBuild
+++ b/network/allmydata-tahoe/allmydata-tahoe.SlackBuild
@@ -27,7 +27,7 @@
 # Now maintained by Markus Reichelt <slackbuilds@mareichelt.de>, 0xCCEEF115
 
 PRGNAM=allmydata-tahoe
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/allmydata-tahoe/allmydata-tahoe.info b/network/allmydata-tahoe/allmydata-tahoe.info
index 3eaebb3100..0e48e6dee3 100644
--- a/network/allmydata-tahoe/allmydata-tahoe.info
+++ b/network/allmydata-tahoe/allmydata-tahoe.info
@@ -1,10 +1,10 @@
 PRGNAM="allmydata-tahoe"
-VERSION="1.10.1"
+VERSION="1.10.2"
 HOMEPAGE="https://tahoe-lafs.org/"
-DOWNLOAD="https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.1.tar.bz2"
-MD5SUM="cc306f85cf3c8024a3d6fd65d90f5277"
+DOWNLOAD="https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.2.tar.bz2"
+MD5SUM="f51ae537af1d0eb24837dc3f48479d88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="simplejson pycrypto pycryptopp zfec mock service_identity foolscap Nevow"
+REQUIRES="simplejson pycrypto pycryptopp zfec service_identity foolscap Nevow"
 MAINTAINER="Markus Reichelt"
 EMAIL="slackbuilds@mareichelt.de"
diff --git a/network/amap/amap.info b/network/amap/amap.info
index d4ca1e03c9..bcda220719 100644
--- a/network/amap/amap.info
+++ b/network/amap/amap.info
@@ -6,5 +6,5 @@ MD5SUM="2617c13b0738455c0e61c6e980b8decc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/aria2/README b/network/aria2/README
index c48620b588..c05df676d9 100644
--- a/network/aria2/README
+++ b/network/aria2/README
@@ -1,5 +1,6 @@
-aria2 is a utility for downloading files. The supported protocols
-are HTTP(S), FTP, BitTorrent  (DHT, PEX, MSE/PE), and Metalink.
+aria2 is a lightweight multi-protocol & multi-source, cross platform
+download utility operated in command-line.
+It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.
 
 To use OpenSSL and Expat rather than GnuTLS and libxml2 run the
 script as follows:
diff --git a/network/aria2/aria2.SlackBuild b/network/aria2/aria2.SlackBuild
index 6991ac1a95..8ddd63390a 100644
--- a/network/aria2/aria2.SlackBuild
+++ b/network/aria2/aria2.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for aria2
 # Originally written by Marco Cecchetti <mrc.ildp@gmail.com>
-# Currently maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# 2015-2016 maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=${PRGNAM:-aria2}
-VERSION=${VERSION:-1.19.0}
+VERSION=${VERSION:-1.19.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/aria2/aria2.info b/network/aria2/aria2.info
index aa2adb44c5..47a7aaab89 100644
--- a/network/aria2/aria2.info
+++ b/network/aria2/aria2.info
@@ -1,8 +1,8 @@
 PRGNAM="aria2"
-VERSION="1.19.0"
-HOMEPAGE="http://aria2.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/aria2/aria2-1.19.0.tar.xz"
-MD5SUM="8417e25750928c250177f0f783b4f9b0"
+VERSION="1.19.3"
+HOMEPAGE="https://aria2.github.io/"
+DOWNLOAD="https://github.com/tatsuhiro-t/aria2/releases/download/release-1.19.3/aria2-1.19.3.tar.xz"
+MD5SUM="b6363664e3cd510a092b0d812085724b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="c-ares"
diff --git a/network/aria2/slack-desc b/network/aria2/slack-desc
index d365e0db3a..293236d88e 100644
--- a/network/aria2/slack-desc
+++ b/network/aria2/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-aria2: Aria2 (CLI Metalink/BiTorrent client)
+aria2: aria2 (CLI Metalink/BiTorrent client)
 aria2:
-aria2: aria2 is a utility for downloading files. The supported protocols
-aria2: are HTTP(S), FTP, BitTorrent, Metalink. It can download a file
-aria2: from multiple sources/protocols and tries to utilize maximum
-aria2: download bandwidth.
+aria2: aria2 is a lightweight multi-protocol & multi-source, cross platform
+aria2: download utility operated in command-line.
+aria2: It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.
 aria2:
-aria2: Homepage: http://aria2.sourceforge.net/
+aria2:
+aria2: Homepage: https://aria2.github.io/
 aria2:
 aria2:
 aria2:
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index 4c29a237a0..3a93a44d14 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for arno-iptables-firewall
 
-# Copyright 2013-2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2013-2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.info b/network/arno-iptables-firewall/arno-iptables-firewall.info
index 949313ff8b..1bd234e44e 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.info
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at bluebottle dot com"
+EMAIL="slackph at bluebottle dot com"
diff --git a/network/awscli/awscli.SlackBuild b/network/awscli/awscli.SlackBuild
index cbffacecc3..6b3e587dac 100644
--- a/network/awscli/awscli.SlackBuild
+++ b/network/awscli/awscli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for awscli
 
-# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=awscli
-VERSION=${VERSION:-1.7.39}
+VERSION=${VERSION:-1.9.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch to support new colorama version
+sed -i "10s/0.3.3/0.3.6/" setup.py
+
 python setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/awscli/awscli.info b/network/awscli/awscli.info
index ffe2432b5d..f6c448ba4c 100644
--- a/network/awscli/awscli.info
+++ b/network/awscli/awscli.info
@@ -1,8 +1,8 @@
 PRGNAM="awscli"
-VERSION="1.7.39"
+VERSION="1.9.18"
 HOMEPAGE="http://aws.amazon.com/cli/"
-DOWNLOAD="https://pypi.python.org/packages/source/a/awscli/awscli-1.7.39.tar.gz"
-MD5SUM="fc63fd2413bfa2bfc36f7a06563a4caf"
+DOWNLOAD="https://pypi.python.org/packages/source/a/awscli/awscli-1.9.18.tar.gz"
+MD5SUM="b9de31540dedd2fd034a6886545336c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="botocore colorama rsa"
diff --git a/network/b43-firmware/b43-firmware.SlackBuild b/network/b43-firmware/b43-firmware.SlackBuild
index 61b03e82ac..eb5a71f8df 100644
--- a/network/b43-firmware/b43-firmware.SlackBuild
+++ b/network/b43-firmware/b43-firmware.SlackBuild
@@ -26,7 +26,7 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=b43-firmware
-VERSION=5.100.138
+VERSION=${VERSION:-6.30.163.46}
 ARCH=fw
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -43,16 +43,14 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf broadcom-wl-$VERSION
 tar xvf $CWD/broadcom-wl-$VERSION.tar.bz2
-chown -R root:root broadcom-wl-$VERSION
+chown root:root broadcom-wl-${VERSION}.wl_apsta.o
 mkdir -p $PKG/lib/firmware
 b43-fwcutter \
   -w $PKG/lib/firmware \
-  broadcom-wl-$VERSION/linux/wl_apsta.o
+  broadcom-wl-${VERSION}.wl_apsta.o
 chmod 0755 $PKG/lib/firmware/b43
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a broadcom-wl-$VERSION/README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/b43-firmware/b43-firmware.info b/network/b43-firmware/b43-firmware.info
index 9a803a03f3..2fb73f903b 100644
--- a/network/b43-firmware/b43-firmware.info
+++ b/network/b43-firmware/b43-firmware.info
@@ -1,8 +1,8 @@
 PRGNAM="b43-firmware"
-VERSION="5.100.138"
+VERSION="6.30.163.46"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
-DOWNLOAD="http://www.lwfinger.com/b43-firmware/broadcom-wl-5.100.138.tar.bz2"
-MD5SUM="f4e357b09eaf5d8b1f1920cf3493a555"
+DOWNLOAD="http://www.lwfinger.com/b43-firmware/broadcom-wl-6.30.163.46.tar.bz2"
+MD5SUM="6fe97e9368d25342a1ab943d3cf3496d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="b43-fwcutter"
diff --git a/network/b43-fwcutter/b43-fwcutter.SlackBuild b/network/b43-fwcutter/b43-fwcutter.SlackBuild
index d65889ab72..1646b2a46a 100644
--- a/network/b43-fwcutter/b43-fwcutter.SlackBuild
+++ b/network/b43-fwcutter/b43-fwcutter.SlackBuild
@@ -26,7 +26,7 @@
 # Maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=b43-fwcutter
-VERSION=${VERSION:-018}
+VERSION=${VERSION:-019}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/b43-fwcutter/b43-fwcutter.info b/network/b43-fwcutter/b43-fwcutter.info
index 00038bb121..ce7b8d9573 100644
--- a/network/b43-fwcutter/b43-fwcutter.info
+++ b/network/b43-fwcutter/b43-fwcutter.info
@@ -1,8 +1,8 @@
 PRGNAM="b43-fwcutter"
-VERSION="018"
+VERSION="019"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
-DOWNLOAD="http://bues.ch/b43/fwcutter/b43-fwcutter-018.tar.bz2"
-MD5SUM="56fcb0c64dcc94dd2672b9ff87f8217f"
+DOWNLOAD="http://bues.ch/b43/fwcutter/b43-fwcutter-019.tar.bz2"
+MD5SUM="19d1f4226a625756726bdf7ed5dc2a0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bitcoin/README b/network/bitcoin/README
index 88ac5e5815..b5e21ec01f 100644
--- a/network/bitcoin/README
+++ b/network/bitcoin/README
@@ -13,7 +13,6 @@ If you just want to send and receive Bitcoins you should look at
 a light client like Electrum.
 
 Please make sure you read the Release notes first before upgrading:
-https://bitcoin.org/en/release/v0.11.0
+https://bitcoin.org/en/release/v0.11.2
 
 qrencode is an optional but strongly recommended dependency.
-UPNP is disabled, it requires the optional dependency miniupnpc.
diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild
index ce47fa0d02..8bc443ed5b 100644
--- a/network/bitcoin/bitcoin.SlackBuild
+++ b/network/bitcoin/bitcoin.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitcoin
-VERSION=${VERSION:-0.11.0}
+VERSION=${VERSION:-0.11.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,9 +54,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Detect miniupnpc
-if [ -x /usr/bin/upnpc ]; then UPNP="--enable-upnp-default"; else UPNP=""; fi
-
 # Detect qrencode
 if [ -x /usr/bin/qrencode ]; then QRCODE="--with-qrencode"; else QRCODE=""; fi
 
@@ -85,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  $UPNP	\
   $QRCODE \
   --with-gui=qt4 \
   --build=$ARCH-slackware-linux \
@@ -98,7 +94,7 @@ make install DESTDIR=$PKG
 # by adding "--enable-tests=no" to the above configure command.
 rm $PKG/usr/bin/test*
 
-mkdir -p $PKG/usr/{bin,man/man{1,5}}
+mkdir -p $PKG/usr/man/man{1,5}
 mkdir -p $PKG/usr/share/{applications,kde4/services,pixmaps}
 
 install -m 0644 contrib/debian/manpages/bitcoin-qt.1 $PKG/usr/man/man1/
diff --git a/network/bitcoin/bitcoin.info b/network/bitcoin/bitcoin.info
index 5fb07ee99c..ba2a33f1ae 100644
--- a/network/bitcoin/bitcoin.info
+++ b/network/bitcoin/bitcoin.info
@@ -1,8 +1,8 @@
 PRGNAM="bitcoin"
-VERSION="0.11.0"
+VERSION="0.11.2"
 HOMEPAGE="http://www.bitcoin.org"
-DOWNLOAD="https://github.com/bitcoin/bitcoin/archive/v0.11.0.tar.gz"
-MD5SUM="7463ff45ad2ece6fad1b673bb2c2afbb"
+DOWNLOAD="https://github.com/bitcoin/bitcoin/archive/v0.11.2.tar.gz"
+MD5SUM="8f55f1bddcafc7f18a28d36c3a5264b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf"
diff --git a/network/bitcoin/slack-desc b/network/bitcoin/slack-desc
index 0f5a933b54..2876efd8fe 100644
--- a/network/bitcoin/slack-desc
+++ b/network/bitcoin/slack-desc
@@ -14,6 +14,6 @@ bitcoin: server or trusted parties.  Users hold the crypto keys to their
 bitcoin: own money and transact directly with each other, with the help
 bitcoin: of a P2P network to check for double-spending.
 bitcoin:
-bitcoin: Project Website: http://www.bitcoin.org
+bitcoin: Project Website: https://www.bitcoin.org
 bitcoin:
 bitcoin:
diff --git a/network/bitlbee-steam/bitlbee-steam.SlackBuild b/network/bitlbee-steam/bitlbee-steam.SlackBuild
index 3a767e0a21..3139856c70 100644
--- a/network/bitlbee-steam/bitlbee-steam.SlackBuild
+++ b/network/bitlbee-steam/bitlbee-steam.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitlbee-steam
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/bitlbee-steam/bitlbee-steam.info b/network/bitlbee-steam/bitlbee-steam.info
index 75d4f16b1a..73908e95bb 100644
--- a/network/bitlbee-steam/bitlbee-steam.info
+++ b/network/bitlbee-steam/bitlbee-steam.info
@@ -1,8 +1,8 @@
 PRGNAM="bitlbee-steam"
-VERSION="1.2.0"
+VERSION="1.3.1"
 HOMEPAGE="https://github.com/jgeboski/bitlbee-steam/"
-DOWNLOAD="https://github.com/jgeboski/bitlbee-steam/releases/download/v1.2.0/bitlbee-steam-1.2.0.tar.gz"
-MD5SUM="63fcb2d965a679e598920b712ffd639e"
+DOWNLOAD="https://github.com/jgeboski/bitlbee-steam/releases/download/v1.3.1/bitlbee-steam-1.3.1.tar.gz"
+MD5SUM="2371d5a00bcbe6a119a0e212b9c36521"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="bitlbee"
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild
index d5298bb51b..b6b8dd2a78 100644
--- a/network/bitlbee/bitlbee.SlackBuild
+++ b/network/bitlbee/bitlbee.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitlbee
-VERSION=${VERSION:-3.2.2}
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -156,8 +156,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{oscar,skype} $PKG/var/lib/$PRGNAM
 cp -a \
   COPYING doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/INSTALL \
   doc/README doc/HACKING doc/bitlbee.xinetd doc/comic_3.0.png \
-  doc/example_plugin.c doc/user-guide/user-guide.txt doc/user-guide/user-guide.html \
-  doc/user-guide/help.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+  doc/example_plugin.c doc/user-guide/help.txt  $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a protocols/oscar/{AUTHORS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION/oscar
 cp -a protocols/skype/{HACKING,NEWS,README} $PKG/usr/doc/$PRGNAM-$VERSION/skype
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info
index 598f2816b0..71325caf07 100644
--- a/network/bitlbee/bitlbee.info
+++ b/network/bitlbee/bitlbee.info
@@ -1,8 +1,8 @@
 PRGNAM="bitlbee"
-VERSION="3.2.2"
+VERSION="3.4.1"
 HOMEPAGE="http://www.bitlbee.org"
-DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.2.2.tar.gz"
-MD5SUM="eb8cee2e6ba3c990c044bd23d1766e6f"
+DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.4.1.tar.gz"
+MD5SUM="dc2d66c0b01d450ce8b44e1f8baf0378"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bitlbee/rc.bitlbee b/network/bitlbee/rc.bitlbee
index 5f0ef7ad00..ea38ac886a 100644
--- a/network/bitlbee/rc.bitlbee
+++ b/network/bitlbee/rc.bitlbee
@@ -1,28 +1,28 @@
 #!/bin/sh
- 
+
 # /etc/rc.d/rc.bitlbee - Start/stop/restart the bitlbee daemon.
 # To make bitlbee start automatically at boot, make this
-# file executable: chmod 0755 /etc/rc.d/rc.bitlbee and add it 
+# file executable: chmod 0755 /etc/rc.d/rc.bitlbee and add it
 # to slackware's startup scripts (ie: rc.local)
 #
- 
+
 BITLBEE_CONFIG="/etc/bitlbee/bitlbee.conf"
 BITLBEE_PORT="6667"
 BITLBEE_OPTS="-F"
- 
+
 PIDFILE="/var/run/bitlbee.pid"
 SOCKFILE="/var/run/bitlbee.sock"
- 
+
 bitlbee_start() {
     echo "Starting bitlbee on port $BITLBEE_PORT..."
     CHECK=$(ps aux | grep /usr/sbin/bitlbee | grep -v grep)
     STATUS=$?
- 
+
     # make sure bitlbee isn't running yet
     if [ "$STATUS" == "1" ]; then
        touch $PIDFILE
        chown bitlbee:bitlbee $PIDFILE
- 
+
         # Start bitlbee in forked mode.
         # /usr/sbin/bitlbee -c $BITLBEE_CONFIG          # if you have configured bitlbee properly.
        /usr/sbin/bitlbee -u bitlbee -p $BITLBEE_PORT $BITLBEE_OPTS
@@ -33,7 +33,7 @@ bitlbee_start() {
         exit 1
     fi
 }
- 
+
 bitlbee_stop() {
     echo -n "Stopping bitlbee..."
     # Are we running a normal daemon or are we forked
@@ -49,7 +49,7 @@ bitlbee_stop() {
         echo "done"
     fi
 }
- 
+
 # Let's see how we are being called.
 case "$1" in
   start)
@@ -59,9 +59,9 @@ case "$1" in
     bitlbee_stop
     ;;
   restart)
-    bitlbee_start
-    sleep 3
     bitlbee_stop
+    sleep 3
+    bitlbee_start
     ;;
   *)
     echo "Usage: $(basename $0) {start|stop|restart}"
diff --git a/network/bmon/bmon.SlackBuild b/network/bmon/bmon.SlackBuild
index 5edaafcb7f..de54494ca4 100644
--- a/network/bmon/bmon.SlackBuild
+++ b/network/bmon/bmon.SlackBuild
@@ -15,7 +15,7 @@
 # - updated for 3.6
 
 PRGNAM=bmon
-VERSION=${VERSION:-3.6}
+VERSION=${VERSION:-3.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/bmon/bmon.info b/network/bmon/bmon.info
index f231a53cd4..dea89abb96 100644
--- a/network/bmon/bmon.info
+++ b/network/bmon/bmon.info
@@ -1,8 +1,8 @@
 PRGNAM="bmon"
-VERSION="3.6"
+VERSION="3.8"
 HOMEPAGE="https://github.com/tgraf/bmon/"
-DOWNLOAD="https://github.com/tgraf/bmon/archive/v3.6.tar.gz"
-MD5SUM="a78c2c75b194840036703907efd39e89"
+DOWNLOAD="https://github.com/tgraf/bmon/archive/v3.8.tar.gz"
+MD5SUM="379225656a845d4a21675f1cebe5b706"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="confuse"
diff --git a/network/bottle/README b/network/bottle/README
index 9506e8bf4e..f64ed2a768 100644
--- a/network/bottle/README
+++ b/network/bottle/README
@@ -1,4 +1,4 @@
-Bottle is a fast and simple micro-framework for small web applications. It
+bottle is a fast and simple micro-framework for small web applications. It
 offers request dispatching (Routes) with url parameter support, templates,
 a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and
 template engines - all in a single file and with no dependencies other than
diff --git a/network/bottle/bottle.SlackBuild b/network/bottle/bottle.SlackBuild
index 0597abd297..66713c749f 100644
--- a/network/bottle/bottle.SlackBuild
+++ b/network/bottle/bottle.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for Bottle
+# Slackware build script for bottle
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=bottle
 VERSION=${VERSION:-0.12.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -47,6 +47,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
+
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -55,18 +56,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-
 python setup.py install --root=$PKG
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
+# Install documentation.
 mkdir -p $PRGDOC
 cp -a README.rst PKG-INFO $PRGDOC/
 cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
diff --git a/network/bottle/bottle.info b/network/bottle/bottle.info
index 0fd2be3a0d..a79bfc2b44 100644
--- a/network/bottle/bottle.info
+++ b/network/bottle/bottle.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/network/bottle/slack-desc b/network/bottle/slack-desc
index cca52162cb..b0c8f445a0 100644
--- a/network/bottle/slack-desc
+++ b/network/bottle/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-bottle: Bottle (Python web framework)
+bottle: bottle (Python web framework)
 bottle: 
-bottle: Bottle is a fast, simple and lightweight WSGI micro web-framework
+bottle: bottle is a fast, simple and lightweight WSGI micro web-framework
 bottle: for Python. It is distributed as a single file module and has no
 bottle: dependencies other than the Python Standard Library.
 bottle:
diff --git a/network/bozohttpd/README b/network/bozohttpd/README
new file mode 100644
index 0000000000..601b51dc3d
--- /dev/null
+++ b/network/bozohttpd/README
@@ -0,0 +1,7 @@
+bozohttpd is a small and secure HTTP version 1.1 server. Its main
+feature is the lack of features, reducing the code size and improving
+verifiability. It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user
+translations, virtual hosting support, as well as multiple IP-based
+servers on a single machine. It is capable of serving pages via the
+IPv6 protocol. bozohttpd features SSL support. By design, there is no
+configuration file.
diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild
new file mode 100644
index 0000000000..d23e54d97e
--- /dev/null
+++ b/network/bozohttpd/bozohttpd.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for bozohttpd
+
+# Copyright 2015 Leonard Schmidt <lems@gmx.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=bozohttpd
+VERSION=${VERSION:-20150320}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS=""
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cp Makefile.boot Makefile
+# Fix build (from Arch Linux' AUR).
+sed -i 's/d_namlen/d_reclen/g' bozohttpd.c
+make
+
+mkdir -p $PKG/usr/{bin,man/man8}
+install -m755 bozohttpd $PKG/usr/bin
+install -m644 bozohttpd.8 $PKG/usr/man/man8
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/bozohttpd/bozohttpd.info b/network/bozohttpd/bozohttpd.info
new file mode 100644
index 0000000000..436add25d6
--- /dev/null
+++ b/network/bozohttpd/bozohttpd.info
@@ -0,0 +1,10 @@
+PRGNAM="bozohttpd"
+VERSION="20150320"
+HOMEPAGE="http://www.eterna.com.au/bozohttpd"
+DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/bozohttpd-20150320.tar.bz2"
+MD5SUM="60e2cf933d028a096523214fab8e6590"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Leonard Schmidt"
+EMAIL="lems@gmx.net"
diff --git a/network/bozohttpd/slack-desc b/network/bozohttpd/slack-desc
new file mode 100644
index 0000000000..84d5bb87dd
--- /dev/null
+++ b/network/bozohttpd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+bozohttpd: bozohttpd (simple and lightweight HTTP server)
+bozohttpd:
+bozohttpd: bozohttpd is a small and secure HTTP version 1.1 server.
+bozohttpd: Its main feature is the lack of features, reducing the code
+bozohttpd: size and improving verifiability. It supports CGI/1.1,
+bozohttpd: HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations, virtual
+bozohttpd: hosting support, as well as multiple IP-based servers on a
+bozohttpd: single machine. It is capable of serving pages via the IPv6
+bozohttpd: protocol. bozohttpd features SSL support.
+bozohttpd:
+bozohttpd: Homepage: http://www.eterna.com.au/bozohttpd/
diff --git a/network/broadcom-sta/001-null-pointer-fix.patch b/network/broadcom-sta/001-null-pointer-fix.patch
new file mode 100644
index 0000000000..adef19f30a
--- /dev/null
+++ b/network/broadcom-sta/001-null-pointer-fix.patch
@@ -0,0 +1,27 @@
+Description: Fixing null pointer crash
+
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
+Bug-Ubuntu: https://launchpad.net/bugs/1415880
+Last-Update: 2015-08-18
+
+---
+ src/wl/sys/wl_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 860b935..295156f 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
+-- 
+1.9.1
+
diff --git a/network/broadcom-sta/002-rdtscl.patch b/network/broadcom-sta/002-rdtscl.patch
new file mode 100644
index 0000000000..cfa1607540
--- /dev/null
+++ b/network/broadcom-sta/002-rdtscl.patch
@@ -0,0 +1,18 @@
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
+
+diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+--- a/src/shared/linux_osl.c	2015-09-19 01:47:15.000000000 +0300
++++ b/src/shared/linux_osl.c	2015-11-21 15:20:30.585902518 +0200
+@@ -932,7 +932,11 @@
+ 	uint cycles;
+ 
+ #if defined(__i386__)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
++	cycles = (u32)rdtsc();
++#else
+ 	rdtscl(cycles);
++#endif
+ #else
+ 	cycles = 0;
+ #endif 
diff --git a/network/broadcom-sta/README b/network/broadcom-sta/README
index b22315d640..d3331e0d8f 100644
--- a/network/broadcom-sta/README
+++ b/network/broadcom-sta/README
@@ -1,13 +1,24 @@
 The broadcom-sta package includes the kernel module 'wl', which contains
 the Broadcom-provided proprietary kernel driver that supports a number of
-their cards.  Known supported model numbers include the BCM4311, BCM4312,
-BCM4321, and BCM4322 chipsets.
+their cards.  Known supported model numbers include the listed chipsets.
 
-Read the included LICENSE.txt file (placed in /usr/doc) before using this.
+BCM4311 (PCI IDs 14e4:4311, 14e4:4312, 14e4:4313)
+BCM4312 (PCI ID 14e4:4315)
+BCM4313 (PCI ID 14e4:4727)
+BCM4321 (PCI IDs 14e4:4328, 14e4:4329, 14e4:432a)
+BCM4322 (PCI IDs 14e4:432b, 14e4:432c, 14e4:432d)
+BCM43142 (PCI ID 14e4:4365)
+BCM43224 (PCI ID 14e4:4353)
+BCM43225 (PCI ID 14e4:4357)
+BCM43227 (PCI ID 14e4:4358)
+BCM43228 (PCI ID 14e4:4359)
+BCM4331 (PCI ID 14e4:4331)
+BCM4360 (PCI ID 14e4:43a0)
+BCM4352 (PCI ID 14e4:43b1)
 
-You may also want to create /etc/modprobe.d/b43_blacklist.conf and add the 
-following lines to it:
-    blacklist b43
-    blacklist b43legacy
-    blacklist bcma
-    blacklist ssb
+Some of these devices are also supported by the free b43 and brcm80211
+drivers. In order to avoid conflicts /etc/modprobe.d/b43_blacklist.conf
+disables these drivers.
+
+Read the included LICENSE.txt file (placed in /usr/doc) before using the
+proprietary driver.
diff --git a/network/broadcom-sta/b43_blacklist.conf.new b/network/broadcom-sta/b43_blacklist.conf.new
new file mode 100644
index 0000000000..76c457bc43
--- /dev/null
+++ b/network/broadcom-sta/b43_blacklist.conf.new
@@ -0,0 +1,9 @@
+# wl module from Broadcom conflicts with the following modules:
+blacklist b43
+blacklist b43legacy
+blacklist b44
+blacklist bcma
+blacklist brcm80211
+blacklist brcmfmac
+blacklist brcmsmac
+blacklist ssb
diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild
index d3f43734eb..959eaa94eb 100644
--- a/network/broadcom-sta/broadcom-sta.SlackBuild
+++ b/network/broadcom-sta/broadcom-sta.SlackBuild
@@ -1,65 +1,109 @@
 #!/bin/sh
-# Slackware build script for broadcom-sta proprietary wireless driver
-# Written by David Matthew Jerry Koenig <koenigdavidmj@gmail.com>
-# Public domain.
+
+# Slackware build script for broadcom-sta
+
+# Copyright 2015 Andreas Voegele <andreas@andreasvoegele.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=broadcom-sta
-VERSION=6.30.223.141
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.30.223.271}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-KERNEL=${KERNEL:-$(uname -r)}
-PKG_VERSION=${VERSION}_$(echo $KERNEL | tr - _)
+KERNEL=${KERNEL:-$( uname -r )}
 
-case "$( uname -m )" in
-  i?86) ARCH=i486 ;;
-  arm*) ARCH=arm ;;
-     *) ARCH=$( uname -m ) ;;
-esac
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-WORKDIR=$TMP/build-$PRGNAM
-
-# Skipped the usual set of variables since they don't apply here
-# (libdir isn't needed, and custom CFLAGS aren't wanted).
-if [ "$ARCH" = "i486" ]; then
-  MY_ARCH=""
-elif [ "$ARCH" = "x86_64" ]; then
-  MY_ARCH="_64"
-else
-  printf "\n\n$ARCH is not supported...\n"
-  exit 1
-fi
+case "$ARCH" in
+  i?86)
+    SRCNAM=hybrid-v35-nodebug-pcoem
+    ;;
+  x86_64)
+    SRCNAM=hybrid-v35_64-nodebug-pcoem
+    ;;
+  *)
+    echo "$ARCH is not supported..."
+    exit 1
+    ;;
+esac
 
 set -e
 
-rm -rf $WORKDIR $PKG
-mkdir -p $TMP $WORKDIR $PKG $OUTPUT
-cd $WORKDIR
-tar xvf $CWD/hybrid-v35${MY_ARCH}-nodebug-pcoem-$(printf $VERSION|tr . _).tar.gz
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$( echo $VERSION | tr . _ ).tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p2 < $CWD/linux-recent.patch
+patch -p1 < $CWD/001-null-pointer-fix.patch
+patch -p1 < $CWD/002-rdtscl.patch
 
-# Build the module
-make -C /lib/modules/$KERNEL/build M=$WORKDIR clean
-make -C /lib/modules/$KERNEL/build M=$WORKDIR
+make -C /lib/modules/$KERNEL/build M=$(pwd) clean
+make -C /lib/modules/$KERNEL/build M=$(pwd)
 
-# Install the module
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/extra
 cp wl.ko $PKG/lib/modules/$KERNEL/kernel/extra
 
+mkdir -p $PKG/etc/modprobe.d
+cat $CWD/b43_blacklist.conf.new > $PKG/etc/modprobe.d/b43_blacklist.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a lib/LICENSE.txt $CWD/README_$VERSION.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $WORKDIR/lib/LICENSE.txt > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat << EOF > $PKG/install/doinst.sh
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/modprobe.d/b43_blacklist.conf.new
+
+# A good idea whenever kernel modules are added or changed:
+if [ -x sbin/depmod ]; then
+  chroot . /sbin/depmod -a $KERNEL 1> /dev/null 2> /dev/null
+fi
+EOF
 
 cd $PKG
-chown -R root:root .
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$( echo $KERNEL | tr - _ )-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/broadcom-sta/broadcom-sta.info b/network/broadcom-sta/broadcom-sta.info
index 31be73cb73..8120752d28 100644
--- a/network/broadcom-sta/broadcom-sta.info
+++ b/network/broadcom-sta/broadcom-sta.info
@@ -1,10 +1,14 @@
 PRGNAM="broadcom-sta"
-VERSION="6.30.223.141"
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-DOWNLOAD="http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz"
-MD5SUM="f4809d9149e8e60ef95021ae93a4bf21"
-DOWNLOAD_x86_64="http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz"
-MD5SUM_x86_64="039f33d2a3ff2890e42717092d1eb0c4"
+VERSION="6.30.223.271"
+HOMEPAGE="https://www.broadcom.com/support/802.11"
+DOWNLOAD="https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz \
+	  https://www.broadcom.com/docs/linux_sta/README_6.30.223.271.txt"
+MD5SUM="4e75f4cb7d87f690f9659ffc478495f0 \
+	458ea8d99c83769d4acf98137f0d46bb"
+DOWNLOAD_x86_64="https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz \
+		https://www.broadcom.com/docs/linux_sta/README_6.30.223.271.txt"
+MD5SUM_x86_64="115903050c41d466161784d4c843f4f9 \
+		458ea8d99c83769d4acf98137f0d46bb"
 REQUIRES=""
-MAINTAINER="David Matthew Jerry Koenig"
-EMAIL="koenigdavidmj@gmail.com"
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/network/broadcom-sta/doinst.sh b/network/broadcom-sta/doinst.sh
deleted file mode 100644
index 99b4a89598..0000000000
--- a/network/broadcom-sta/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# A good idea whenever kernel modules are added or changed:
-if [ -x sbin/depmod ]; then
-  /sbin/depmod -a 1> /dev/null 2> /dev/null
-fi
-
diff --git a/network/broadcom-sta/linux-recent.patch b/network/broadcom-sta/linux-recent.patch
deleted file mode 100644
index c575f289a2..0000000000
--- a/network/broadcom-sta/linux-recent.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Naur bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c
---- bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c	2013-04-23 12:31:31.011588881 +0200
-+++ bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c	2013-05-20 18:27:18.830187333 +0200
-@@ -3229,7 +3229,12 @@
- wl_tkip_printstats(wl_info_t *wl, bool group_key)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+	struct seq_file sfile;
-+	struct seq_file *debug_buf = &sfile;	
-+#else
- 	char debug_buf[512];
-+#endif
- 	int idx;
- 	if (wl->tkipmodops) {
- 		if (group_key) {
-@@ -3242,7 +3247,11 @@
- 			wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data);
- 		else
- 			return;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+		printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast");
-+#else
- 		printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast");
-+#endif
- 	}
- #endif 
- }
-@@ -3401,17 +3410,24 @@
- 	return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
-+#else
-+static ssize_t 
-+wl_proc_read (struct file *filp, char __user *buffer, size_t length, loff_t *data)
-+#endif
- {
- 	wl_info_t * wl = (wl_info_t *)data;
- 	int bcmerror, to_user;
- 	int len;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	if (offset > 0) {
- 		*eof = 1;
- 		return 0;
- 	}
-+#endif
- 
- 	if (!length) {
- 		WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
-@@ -3424,8 +3440,13 @@
- 	return len;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
-+#else
-+static ssize_t 
-+wl_proc_write (struct file *filp, const char __user *buff, size_t length, loff_t *data)
-+#endif
- {
- 	wl_info_t * wl = (wl_info_t *)data;
- 	int from_user = 0;
-@@ -3455,19 +3476,34 @@
- 	return length;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+static const struct file_operations wl_fops = {
-+     .owner	= THIS_MODULE,
-+     .read	= wl_proc_read,
-+     .write	= wl_proc_write,
-+};
-+#endif
-+
- static int
- wl_reg_proc_entry(wl_info_t *wl)
- {
- 	char tmp[32];
- 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
- 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
-+#else
-+	if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) {
-+		WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp));
-+#endif
- 		ASSERT(0);
- 		return -1;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	wl->proc_entry->read_proc = wl_proc_read;
- 	wl->proc_entry->write_proc = wl_proc_write;
- 	wl->proc_entry->data = wl;
-+#endif
- 	return 0;
- }
- #ifdef WLOFFLD
diff --git a/network/broadcom-sta/slack-desc b/network/broadcom-sta/slack-desc
index abf660e3a4..02000f4c14 100644
--- a/network/broadcom-sta/slack-desc
+++ b/network/broadcom-sta/slack-desc
@@ -8,12 +8,12 @@
             |-----handy-ruler------------------------------------------------------|
 broadcom-sta: broadcom-sta (Broadcom wireless drivers)
 broadcom-sta:
-broadcom-sta: Proprietary drivers for a number of Broadcom cards. Includes a
-broadcom-sta: kernel module named 'wl'.
+broadcom-sta: Proprietary driver for Broadcom's BCM4311, BCM4312, BCM4313, BCM4321,
+broadcom-sta: BCM4322, BCM43142, BCM43224, BCM43225, BCM43227, BCM43228, BCM4331,
+broadcom-sta: BCM4360 and BCM4352 wireless network cards. Includes a kernel module
+broadcom-sta: named 'wl'.
 broadcom-sta:
 broadcom-sta: For more information, see:
-broadcom-sta: http://www.broadcom.com/support/802.11/linux_sta.php
-broadcom-sta:
-broadcom-sta:
+broadcom-sta: https://www.broadcom.com/support/802.11
 broadcom-sta:
 broadcom-sta:
diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild
index 1a7f640431..6b0d31c2cc 100644
--- a/network/bwm-ng/bwm-ng.SlackBuild
+++ b/network/bwm-ng/bwm-ng.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for bwm-ng
 
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bwm-ng
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,7 +68,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/bwm-ng/bwm-ng.info b/network/bwm-ng/bwm-ng.info
index 9361a9d560..8a8b9160b3 100644
--- a/network/bwm-ng/bwm-ng.info
+++ b/network/bwm-ng/bwm-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="bwm-ng"
-VERSION="0.6"
+VERSION="0.6.1"
 HOMEPAGE="http://www.gropp.org/?id=projects&sub=bwm-ng"
-DOWNLOAD="http://www.gropp.org/bwm-ng/bwm-ng-0.6.tar.gz"
-MD5SUM="d3a02484fb7946371bfb4e10927cebfb"
+DOWNLOAD="http://www.gropp.org/bwm-ng/bwm-ng-0.6.1.tar.gz"
+MD5SUM="ef0c7669508e95f56250ad4f8db98b7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/cacti-spine/cacti-spine.SlackBuild b/network/cacti-spine/cacti-spine.SlackBuild
index 4378990d50..718479568e 100644
--- a/network/cacti-spine/cacti-spine.SlackBuild
+++ b/network/cacti-spine/cacti-spine.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cacti-spine
-VERSION=${VERSION:-0.8.8c}
+VERSION=${VERSION:-0.8.8f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/cacti-spine/cacti-spine.info b/network/cacti-spine/cacti-spine.info
index bb1fc6a1a1..a64d62d0b7 100644
--- a/network/cacti-spine/cacti-spine.info
+++ b/network/cacti-spine/cacti-spine.info
@@ -1,10 +1,10 @@
 PRGNAM="cacti-spine"
-VERSION="0.8.8c"
+VERSION="0.8.8f"
 HOMEPAGE="http://www.cacti.net/"
-DOWNLOAD="http://www.cacti.net/downloads/spine/cacti-spine-0.8.8c.tar.gz"
-MD5SUM="448c813422f943dc09b237bd8022002a"
+DOWNLOAD="http://www.cacti.net/downloads/spine/cacti-spine-0.8.8f.tar.gz"
+MD5SUM="4e026eedeb929d17e3b45ad43c81d4d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="cacti"
 MAINTAINER="Thibaut Notteboom"
 EMAIL="tib@tibux.org"
diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild
index f455ea929f..2fc276c86b 100644
--- a/network/cacti/cacti.SlackBuild
+++ b/network/cacti/cacti.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cacti
-VERSION=${VERSION:-0.8.8c}
+VERSION=${VERSION:-0.8.8f}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/cacti/cacti.info b/network/cacti/cacti.info
index e3841f98e0..f57dd0db0a 100644
--- a/network/cacti/cacti.info
+++ b/network/cacti/cacti.info
@@ -1,8 +1,8 @@
 PRGNAM="cacti"
-VERSION="0.8.8c"
+VERSION="0.8.8f"
 HOMEPAGE="http://www.cacti.net/"
-DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.8c.tar.gz"
-MD5SUM="11e3955c9ea494879967e19aa935e682"
+DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.8f.tar.gz"
+MD5SUM="8d90642b362f80c46c489c5531e2ba90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rrdtool"
diff --git a/network/ccnet/ccnet.SlackBuild b/network/ccnet/ccnet.SlackBuild
index 9480e1e67a..20e30699df 100644
--- a/network/ccnet/ccnet.SlackBuild
+++ b/network/ccnet/ccnet.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ccnet
-VERSION=${VERSION:-4.3.0}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/ccnet/ccnet.info b/network/ccnet/ccnet.info
index 3d95c5980d..c08cb29acd 100644
--- a/network/ccnet/ccnet.info
+++ b/network/ccnet/ccnet.info
@@ -1,8 +1,8 @@
 PRGNAM="ccnet"
-VERSION="4.3.0"
+VERSION="4.4.6"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.3.0-server.tar.gz"
-MD5SUM="1cacd6bde4ee81295357f7d328d3ab8d"
+DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server.tar.gz"
+MD5SUM="bff067e61d0af043b761027fdd840314"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libsearpc vala libzdb"
diff --git a/network/choqok/choqok.SlackBuild b/network/choqok/choqok.SlackBuild
index c609fa8c43..2eaf74fcc8 100644
--- a/network/choqok/choqok.SlackBuild
+++ b/network/choqok/choqok.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for choqok
 
-# Copyright 2010-2012  David Woodfall <dave@dawoodfall.net>
+# Copyright 2010  David Woodfall <dave@dawoodfall.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Maintained by slackmuz (petar.linog@gmail.com)
-
 PRGNAM=choqok
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/choqok/choqok.info b/network/choqok/choqok.info
index f7fbb599fb..4cd30a57ce 100644
--- a/network/choqok/choqok.info
+++ b/network/choqok/choqok.info
@@ -1,10 +1,10 @@
 PRGNAM="choqok"
-VERSION="1.4"
+VERSION="1.5"
 HOMEPAGE="http://choqok.gnufolks.org/"
-DOWNLOAD="http://sourceforge.net/projects/choqok/files/Choqok/choqok-1.4.tar.xz"
-MD5SUM="2efe34ed903b448a21d9233d8033dbdb"
+DOWNLOAD="http://sourceforge.net/projects/choqok/files/Choqok/choqok-1.5.tar.xz"
+MD5SUM="f2efdd76199f8276e8ac2f76dc600596"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qoauth"
-MAINTAINER="Petar Milojevic"
-EMAIL="petar[dot]linog[at]gmail[dot]com"
+MAINTAINER="David Woodfall"
+EMAIL="dave@dawoodfall.net"
diff --git a/network/cicb/cicb.SlackBuild b/network/cicb/cicb.SlackBuild
index f301bdaecb..bbf193eb94 100644
--- a/network/cicb/cicb.SlackBuild
+++ b/network/cicb/cicb.SlackBuild
@@ -71,6 +71,9 @@ patch -p1 < $CWD/tcl_continue_error.diff
 # --with-(readline|ssl)* and the LDFLAGS below. They don't do any harm
 # on 32-bit.
 
+# 20151117 bkw: -current needs CPPFLAGS=-P, and it does no harm on 14.1.
+
+CPPFLAGS="-P" \
 LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/claws-mail/README b/network/claws-mail/README
index 74584e336b..da18943f39 100644
--- a/network/claws-mail/README
+++ b/network/claws-mail/README
@@ -19,4 +19,3 @@ are found:
   The clamd plugin requires clamav.
   The fancy plugin requires webkitgtk.
   The gdata plugin requires gdata.
-  The geolocation plugin requires libchamplain (not available on SBo).
diff --git a/network/claws-mail/claws-mail.SlackBuild b/network/claws-mail/claws-mail.SlackBuild
index 8e9df29291..a05835d170 100644
--- a/network/claws-mail/claws-mail.SlackBuild
+++ b/network/claws-mail/claws-mail.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=claws-mail
-VERSION=${VERSION:-3.12.0}
+VERSION=${VERSION:-3.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/claws-mail/claws-mail.info b/network/claws-mail/claws-mail.info
index 60d2c893b9..1e8dceb882 100644
--- a/network/claws-mail/claws-mail.info
+++ b/network/claws-mail/claws-mail.info
@@ -1,8 +1,8 @@
 PRGNAM="claws-mail"
-VERSION="3.12.0"
+VERSION="3.13.1"
 HOMEPAGE="http://www.claws-mail.org/"
-DOWNLOAD="http://www.claws-mail.org//releases/claws-mail-3.12.0.tar.xz"
-MD5SUM="73c11bf9f260473abe0e888af19e23b8"
+DOWNLOAD="http://www.claws-mail.org//releases/claws-mail-3.13.1.tar.xz"
+MD5SUM="5bbf7e2c24ca28f05d04de07c6fb8dad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libetpan"
diff --git a/network/clipgrab/README b/network/clipgrab/README
index f0691534c3..e9a59501a6 100644
--- a/network/clipgrab/README
+++ b/network/clipgrab/README
@@ -1,8 +1,11 @@
-clipgrab (Downloading video tool)
+clipgrab (downloading video tool)
 
-ClipGrab is a GPLv3-licensed Open Source project and of course also available for Linux. 
+ClipGrab is a GPLv3-licensed Open Source project and of course
+also available for Linux.
 
-ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe, Dailymotion and
-many other online video sites, see more in: http://clipgrab.org/faqs/supported-sites
+ClipGrab is a free downloader and converter for YouTube, Vimeo,
+Metacafe, Dailymotion and many other online video sites, see
+more in: http://clipgrab.org/faqs/supported-sites
 
-It converts downloaded videos to MPEG4, MP3 or other formats in just one easy step.
+It converts downloaded videos to MPEG4, MP3 or other formats
+in just one easy step.
diff --git a/network/clipgrab/clipgrab.SlackBuild b/network/clipgrab/clipgrab.SlackBuild
index 74c95cd8f4..e5424c31f2 100644
--- a/network/clipgrab/clipgrab.SlackBuild
+++ b/network/clipgrab/clipgrab.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=clipgrab
-VERSION=${VERSION:-3.4.11}
+VERSION=${VERSION:-3.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -74,7 +74,7 @@ make DESTDIR=$PKG
 
 install -d $PKG/usr/share/{applications,pixmaps}
 install -D -m644 $CWD/clipgrab.desktop $PKG/usr/share/applications/clipgrab.desktop
-install -D -m644 $CWD/clipgrab.png $PKG/usr/share/pixmaps/clipgrab.png
+install -D -m644 icon.png $PKG/usr/share/pixmaps/clipgrab.png
 install -d $PKG/usr/bin
 install -D -m755 clipgrab $PKG/usr/bin/clipgrab
 
diff --git a/network/clipgrab/clipgrab.desktop b/network/clipgrab/clipgrab.desktop
index dad31cfddb..4129bb6229 100644
--- a/network/clipgrab/clipgrab.desktop
+++ b/network/clipgrab/clipgrab.desktop
@@ -3,9 +3,7 @@ Type=Application
 Encoding=UTF-8
 Name=ClipGrab
 GenericName=Video Downloader
-GenericName[de]=Video-Downloader
 Comment=Download videos and convert it
-Comment[de]=Videos herunterladen und konvertieren
 Icon=/usr/share/pixmaps/clipgrab.png
 Exec=clipgrab
 TryExec=clipgrab
diff --git a/network/clipgrab/clipgrab.info b/network/clipgrab/clipgrab.info
index 0db028843a..f30dc2b701 100644
--- a/network/clipgrab/clipgrab.info
+++ b/network/clipgrab/clipgrab.info
@@ -1,8 +1,8 @@
 PRGNAM="clipgrab"
-VERSION="3.4.11"
+VERSION="3.5.6"
 HOMEPAGE="http://clipgrab.org/"
-DOWNLOAD="http://download.clipgrab.de/clipgrab-3.4.11.tar.bz2"
-MD5SUM="89b1937c34d0251e1e83d914b537e85e"
+DOWNLOAD="http://download.clipgrab.de/clipgrab-3.5.6.tar.gz"
+MD5SUM="9e524fbae65fbfe31920884ab9912632"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
diff --git a/network/connman/connman.SlackBuild b/network/connman/connman.SlackBuild
index e4363b81fa..65351620ed 100644
--- a/network/connman/connman.SlackBuild
+++ b/network/connman/connman.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -24,7 +24,7 @@
 
 
 PRGNAM=connman
-VERSION=${VERSION:-1.29}
+VERSION=${VERSION:-1.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/connman/connman.info b/network/connman/connman.info
index 150b5e7fff..47b61cead9 100644
--- a/network/connman/connman.info
+++ b/network/connman/connman.info
@@ -1,8 +1,8 @@
 PRGNAM="connman"
-VERSION="1.29"
+VERSION="1.30"
 HOMEPAGE="https://01.org/connman"
-DOWNLOAD="https://www.kernel.org/pub/linux/network/connman/connman-1.29.tar.xz"
-MD5SUM="5283884504860f5fba2e6f489f517293"
+DOWNLOAD="https://www.kernel.org/pub/linux/network/connman/connman-1.30.tar.xz"
+MD5SUM="4a3efdbd6796922db9c6f66da57887fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/copy/copy.SlackBuild b/network/copy/copy.SlackBuild
index 401167e727..ebca147da0 100644
--- a/network/copy/copy.SlackBuild
+++ b/network/copy/copy.SlackBuild
@@ -5,7 +5,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/network/corkscrew/corkscrew.info b/network/corkscrew/corkscrew.info
index c1aad015f6..b26df48b64 100644
--- a/network/corkscrew/corkscrew.info
+++ b/network/corkscrew/corkscrew.info
@@ -6,5 +6,5 @@ MD5SUM="35df77e7f0e59c0ec4f80313be52c10a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/cyrus-imapd/README b/network/cyrus-imapd/README
index c276947781..fbb307120b 100644
--- a/network/cyrus-imapd/README
+++ b/network/cyrus-imapd/README
@@ -26,9 +26,10 @@ For more information on how to install and run cyrus-imapd, see
 README.SLACKWARE that came with this package (which is also installed 
 with the documentation).
 
-Two additional patches have been included, autocreate and autosieve, which
-improve cyrus' capabilities. To learn more about them, check their accompanying
-README files. To disable them, use: PATCHES=no ./cyrus-imapd.SlackBuild
+Patches for autocreate and autosieve are no longer needed so they were removed.
+
+Make sure to read the Upgrading to Cyrus IMAP 2.5.0 notes:
+  https://cyrusimap.org/imap/release-notes/2.5/x/2.5.0.html
 
 You must have a "cyrus" user and group to run this script.
 Something like this will create them:
diff --git a/network/cyrus-imapd/README.SLACKWARE b/network/cyrus-imapd/README.SLACKWARE
index 7fadb01925..ded9d6f2d5 100644
--- a/network/cyrus-imapd/README.SLACKWARE
+++ b/network/cyrus-imapd/README.SLACKWARE
@@ -8,7 +8,7 @@ a specific directory structure, you can do something like this:
 Afterwards run mkimap script to setup the enviroment:
 
 # su - cyrus
-# /usr/doc/cyrus-imapd-2.4.17/tools/mkimap
+# /usr/doc/cyrus-imapd-2.5.7/tools/mkimap
 
 You will probably also want to put this into rc.local:
 
diff --git a/network/cyrus-imapd/cyrus-imapd.SlackBuild b/network/cyrus-imapd/cyrus-imapd.SlackBuild
index ff0e9c5ce2..5ea71fd7c5 100644
--- a/network/cyrus-imapd/cyrus-imapd.SlackBuild
+++ b/network/cyrus-imapd/cyrus-imapd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cyrus-imapd
 
-# Copyright 2010, 2011, 2014  Mario Preksavec, Zagreb, HR
+# Copyright 2010, 2011, 2014, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cyrus-imapd
-VERSION=${VERSION:-2.4.17}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-PATCHES=${PATCHES:-yes}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -84,16 +82,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-if [ "$PATCHES" = yes ]; then
-# Patches for autocreate/autosieve
-  patch -p1 <$CWD/patches/cyrus-imapd-2.4.4-autocreate-0.10-0-sv1.patch
-  patch -p1 <$CWD/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch
-fi
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -110,15 +102,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-perl \
   --with-cyrus-user=cyrus \
   --with-cyrus-group=cyrus \
+  --enable-autocreate \
   --enable-idled \
-  --build=$ARCH-slackware-linux \
-  $DATABASE
+  $DATABASE \
+  --build=$ARCH-slackware-linux
 
-make -j1 PERL_MM_OPT='INSTALLDIRS=vendor'
+make PERL_MM_OPT='INSTALLDIRS=vendor'
 make install DESTDIR=$PKG
 
-# Move incorrectly installed man pages
-mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
+# Move man pages where they belong
+mv $PKG/usr/share/man $PKG/usr/
+
+# Perl might have some other stuff as well
+[ -d $PKG/usr/share/perl5/Cyrus ] \
+&& mv $PKG/usr/share/perl5/Cyrus/* $PKG/usr/lib$LIBDIRSUFFIX/perl5/Cyrus/
+
+# Cruft removal
+rm -rf $PKG/usr/share
 
 # Copy init script
 install -D -m0755 -oroot -groot $CWD/rc.cyrus-imapd $PKG/etc/rc.d/rc.cyrus-imapd.new
@@ -139,17 +139,10 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT README* doc/* master/conf tools/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README doc/* master/conf tools/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
-# Clean up the obsolete /usr/lib  on 64bit systems.
-[ "$ARCH" = "x86_64" ] && rmdir $PKG/usr/lib
-
-# Remove perllocal.pod and other special files; remove empty directories
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-find $PKG -depth -type d -empty -delete || true
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/cyrus-imapd/cyrus-imapd.info b/network/cyrus-imapd/cyrus-imapd.info
index 1101a41f3f..b8a3ebbd73 100644
--- a/network/cyrus-imapd/cyrus-imapd.info
+++ b/network/cyrus-imapd/cyrus-imapd.info
@@ -1,8 +1,8 @@
 PRGNAM="cyrus-imapd"
-VERSION="2.4.17"
+VERSION="2.5.7"
 HOMEPAGE="http://www.cyrusimap.org/"
-DOWNLOAD="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz"
-MD5SUM="c1747c6252587535d3d27f71eca8bd44"
+DOWNLOAD="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.7.tar.gz"
+MD5SUM="1b60d52348578143a4467a2beca07c4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/cyrus-imapd/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch b/network/cyrus-imapd/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch
deleted file mode 100644
index d3526669fc..0000000000
--- a/network/cyrus-imapd/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- cyrus-imapd-2.4.12.orig/README.autosievefolder	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.4.12/README.autosievefolder	2011-10-31 10:07:44.890693235 +0100
-@@ -0,0 +1,43 @@
-+Cyrus IMAP autosievefolder patch
-+----------------------------------
-+
-+NOTE : This patch has been created at the University of Athens. For more info, as well 
-+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr 
-+
-+NOTE : Patch updated to Cyrus IMAPD 2.4.x by Martin Matuska <mm@FreeBSD.org>
-+
-+  When the lmtpd daemon receives an email message prior to delivering it to the 
-+INBOX folder of the user, checks if the user has specified sieve filters. If the
-+user has specified sieve filters the filters are evaluated. If the message matches
-+any of the filters the action that is specified in the filter is executed. If the action 
-+is FileInto it is stored in the subfolder specified in the filter. If the 
-+subfolder doesn't exist then the message is sent to the INBOX folder of the user.
-+
-+  With this patch if the folder doesn't exist AND the name of the subfolder is 
-+specified in the autosievefolders option, OR the anysievefolder is set to 
-+yes in the cyrus-imap configuration file then the subfolder is created and the mail 
-+is stored there.
-+
-+
-+Check the following options of the imapd.conf file
-+==================================================
-+
-+* anysievefolder : It must be "yes" in order to permit the autocreation of any 
-+INBOX subfolder requested by a sieve filter, through the "fileinto" action. (default = no)
-+* autosievefolders : It is a "|" separated list of subfolders of INBOX that will be 
-+automatically created, if requested by a sieve filter, through the "fileinto" 
-+action. (default = null)
-+	i.e. autosievefolders: Junk | Spam
-+
-+WARNING: anysievefolder, takes precedence over autosievefolders . Which means that if 
-+anysievefolder is set to "yes", cyrus will create any INBOX subfolder requested, no-matter what the value of autosievefolders is.
-+
-+
-+Things to be done
-+=================
-+
-+1. Support cyrus wildcards in the autosievefolders option. 
-+
-+
-+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder
-+
---- cyrus-imapd-2.4.12.orig/imap/lmtp_sieve.c	2011-10-31 10:07:03.922690650 +0100
-+++ cyrus-imapd-2.4.12/imap/lmtp_sieve.c	2011-10-31 10:08:36.752691723 +0100
-@@ -88,6 +88,9 @@
-     struct auth_state *authstate;
- } script_data_t;
- 
-+static int autosieve_subfolder(char *userid, struct auth_state *auth_state,
-+                               char *subfolder, struct namespace *namespace);
-+
- static char *make_sieve_db(const char *user)
- {
-     static char buf[MAX_MAILBOX_PATH+1];
-@@ -503,7 +506,20 @@
- 			      sd->username, mdata->notifyheader,
- 			      namebuf, md->date, quotaoverride, 0);
-     }
--
-+    
-+    if (ret == IMAP_MAILBOX_NONEXISTENT) {
-+        /* if "plus" folder under INBOX, then try to create it */
-+        ret = autosieve_subfolder((char *) sd->username, sd->authstate, namebuf, mdata->namespace);
-+
-+	/* Try to deliver the mail again. */
-+        if (!ret)
-+            ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
-+                                  fc->imapflags->flag, fc->imapflags->nflags,
-+                                  (char *) sd->username, sd->authstate, md->id,
-+                                  sd->username, mdata->notifyheader,
-+                                  namebuf, md->date, quotaoverride, 0);
-+    }
-+    
-     if (!ret) {
- 	snmp_increment(SIEVE_FILEINTO, 1);
- 	return SIEVE_OK;
-@@ -973,3 +989,80 @@
-        we'll do normal delivery */
-     return r;
- }
-+
-+
-+#define SEP '|'
-+
-+static int autosieve_subfolder(char *userid, struct auth_state *auth_state,
-+                               char *subfolder, struct namespace *namespace)
-+{
-+     char option_name_external[MAX_MAILBOX_NAME + 1];
-+     char option_name_internal[MAX_MAILBOX_NAME + 1];
-+     const char *subf ;
-+     char *p, *q, *next_subf;
-+     int len, r = 0;
-+     int createsievefolder = 0;
-+
-+    /* Check if subfolder or userid are NULL */
-+    if(userid == NULL || subfolder == NULL)
-+         return IMAP_MAILBOX_NONEXISTENT;
-+
-+    syslog(LOG_DEBUG, "autosievefolder: autosieve_subfolder() was called for user %s, folder %s", 
-+		    userid, subfolder);
-+
-+    if (config_getswitch(IMAPOPT_ANYSIEVEFOLDER)) {
-+         createsievefolder = 1;
-+    } else if ((subf = config_getstring(IMAPOPT_AUTOSIEVEFOLDERS)) != NULL) {
-+         /* Roll through subf */
-+         next_subf = (char *) subf;
-+         while (*next_subf) {
-+              for (p = next_subf ; isspace((int) *p) || *p == SEP ; p++);
-+              for (next_subf = p ; *next_subf && *next_subf != SEP ; next_subf++);
-+              for (q = next_subf ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--);
-+
-+              if (!*p) continue;
-+                    
-+              len = q - p + 1;
-+             /*
-+              * This is a preliminary length check based on the assumption
-+              * that the *final* internal format will be something
-+              * like user.userid.subfolder(s).
-+              */
-+              if (len > sizeof(option_name_external) - strlen(userid) - 5)
-+                   return IMAP_MAILBOX_BADNAME;
-+
-+              strlcpy(option_name_external, namespace->prefix[NAMESPACE_INBOX], sizeof(option_name_external));
-+	      strncat(option_name_external, p, len);
-+                    
-+              /* 
-+               * Transform the option folder name to internal namespace and compare it
-+	       * with what must be created.
-+               */
-+              r = namespace->mboxname_tointernal(namespace, option_name_external, userid, option_name_internal);
-+              if (r) continue;
-+
-+              if (!strcmp(option_name_internal, subfolder)) {
-+                  createsievefolder = 1;
-+                  break;
-+              }
-+         }
-+    }
-+
-+    if (createsievefolder) {
-+        /* Folder is already in internal namespace format */
-+        r = mboxlist_createmailbox(subfolder, 0, NULL,
-+                                           1, userid, auth_state, 0, 0, 0);
-+        if (!r) {
-+            mboxlist_changesub(subfolder, userid, auth_state, 1, 1);
-+            syslog(LOG_DEBUG, "autosievefolder: User %s, folder %s creation succeeded",
-+                                                   userid, subfolder);
-+            return 0;
-+        } else {
-+            syslog(LOG_ERR, "autosievefolder: User %s, folder %s creation failed. %s",
-+                                                  userid, subfolder,error_message(r));
-+            return r;
-+        }
-+    } else
-+        return IMAP_MAILBOX_NONEXISTENT;
-+}
-+
---- cyrus-imapd-2.4.12.orig/lib/imapoptions	2011-10-31 10:07:03.969690694 +0100
-+++ cyrus-imapd-2.4.12/lib/imapoptions	2011-10-31 10:13:23.876700183 +0100
-@@ -1145,6 +1145,15 @@
- /* If enabled, lmtpd will look for Sieve scripts in user's home
-    directories: ~user/.sieve. */
- 
-+{ "anysievefolder", 0, SWITCH }
-+/* It must be "yes" in order to permit the autocreation of any INBOX subfolder 
-+   requested by a sieve filter, through the "fileinto" action. (default = no) */
-+
-+{ "autosievefolders", NULL, STRING }
-+/* It is a "|" separated list of subfolders of INBOX that will be automatically created, 
-+   if requested by a sieve filter, through the "fileinto" action. (default = null)
-+   i.e. autosievefolders: Junk | Spam */
-+
- { "singleinstancestore", 1, SWITCH }
- /* If enabled, imapd, lmtpd and nntpd attempt to only write one copy
-    of a message per partition and create hard links, resulting in a
diff --git a/network/cyrus-imapd/patches/cyrus-imapd-2.4.4-autocreate-0.10-0-sv1.patch b/network/cyrus-imapd/patches/cyrus-imapd-2.4.4-autocreate-0.10-0-sv1.patch
deleted file mode 100644
index 6864ec3dc8..0000000000
--- a/network/cyrus-imapd/patches/cyrus-imapd-2.4.4-autocreate-0.10-0-sv1.patch
+++ /dev/null
@@ -1,2164 +0,0 @@
-# Changed com_err.h to et/com_err.h for Slackware by mario@slackverse.org, 2011
-diff -Naur cyrus-imapd-2.4.4.orig/README.autocreate cyrus-imapd-2.4.4/README.autocreate
---- cyrus-imapd-2.4.4.orig/README.autocreate	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.4.4/README.autocreate	2010-11-16 08:48:37.704981331 +0100
-@@ -0,0 +1,213 @@
-+Cyrus IMAP autocreate Inbox patch
-+----------------------------------
-+
-+NOTE : This patch has been created at the University of Athens. For more info, as well 
-+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/ 
-+
-+NOTE : Patch updated for Cyrus IMAP 2.4.x by Martin Matuska <mm@FreeBSD.org>
-+
-+The design of Cyrus IMAP server does not predict the automatic creation of users'
-+INBOX folders. The creation of a user's INBOX is considered to be an external task,
-+that has to be completed as part of the user email account creation procedure. 
-+Hence, to create a new email account the site administrator has to:
-+
-+  a) Include the new account in the user database for the authentication procedure
-+     (e.g. sasldb, shadow, mysql, ldap).
-+  b) Create the corresponding INBOX folder. 
-+
-+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder,
-+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf).
-+Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't 
-+lead to the automatic INBOX folder creation by Cyrus IMAP server.
-+In fact, "autocreate" means that the IMAP clients are allowed to automatically create 
-+the user INBOX. 
-+
-+This patch adds the functionality of automatic creation of the users' INBOX folders into
-+the Cyrus IMAP server. It is implemented as two features, namely the  "create on login"
-+and "create on post".
-+ 
-+
-+
-+Create on login
-+===============
-+This feauture provides automatic creation of a user's INBOX folder when all of the 
-+following requirements are met:
-+
-+i)  The user has succesfully passed the authentication procedure.
-+
-+ii) The user's authorisation ID (typically the same as the user's
-+authentication ID)  doesn't belong to the imap_admins or admins
-+accounts (see imapd.conf).
-+
-+iii) The "autocreatequota" option in the imap configuration file 
-+has been set to a non zero value. 
-+
-+iv) The corresponding to the user's authorisation ID INBOX folder
-+does not exist.
-+
-+The user's first login is the most typical case when all four requirements are met. 
-+Note that if the authenticated ID is allowed to proxy to another account for which 
-+all of the above requirements are met, the corresponding INBOX folder for that account 
-+will be created.
-+
-+
-+
-+Create on post
-+==============
-+This feauture provides automatic creation of a user's INBOX folder when all of the 
-+following requirements are met. 
-+
-+i) An email message addressed to the user has been received.  
-+
-+ii) The recipient is not any of the imap_admins or admins accounts. 
-+Note that passing emails to admins or imap_admins accounts from 
-+the MTA to LMTP should be avoided in any case.
-+
-+iii) The recipient's INBOX does not exist.
-+
-+iv) The "autocreatequota" option in the imap configuration file 
-+has been set to a non zero value. 
-+
-+v) The "createonpost" option in the imap configuration file 
-+has been switched on. 
-+
-+
-+Besides the automatic creation of INBOX folder, additional functionalities are
-+provided:
-+
-+  (A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders"
-+configuration option. eg 
-+
-+autocreateinboxfolders: sent|drafts|spam|templates
-+
-+  (B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders"
-+configuration option. eg
-+
-+autosubscribeinboxfolders: sent|spam
-+
-+Obviously, only subscription to subfolders included in the "autocreateinboxfolder"
-+list is meaningful. 
-+
-+  (C) Automatic subscription to shared folders (bulletin boards). The user gets
-+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders"
-+configuration option in imapd.conf.
-+eg autosubscribesharedfolders: public_folder | public_folder.subfolder
-+
-+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation
-+and the user must have the appropriate permissions in order to be able to subscribe to the
-+shared folder.
-+
-+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no
-+option. When set to yes, the user is automatically subscribed to all shared folders one 
-+has permission to subscribe to. Please, note that when this option is set to yes, then
-+'autosubscribesharedfolders' option is overriden.
-+
-+  (D) Automatic creation of a predefined default sieve script.
-+
-+This is very useful when a default sieve script is used for every user. Usually, a
-+default anti-spam script may me be written in a file and copied to each user
-+sieve scripts upon the INBOX creation. The imapd.conf options that have been added
-+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and 
-+'generate_compiled_sieve_script'. 
-+
-+autocreate_sieve_script configuration option refers to the full path of the file 
-+that contains the sieve script. The default value is null and if no file is defined,
-+then no default script is created upon INBOX creation. (The feature is disabled)
-+eg autocreate_sieve_script: /etc/default_sieve_script
-+
-+autocreate_sieve_compiledscript configuration option refers to the full path of the
-+file that contains the bytecode compiled sieve script. If this filename is defined
-+in imapd.conf and the file exists, then it is automatically copied in the user's sieve
-+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled
-+by the daemon. 
-+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc
-+
-+generate_compiled_sieve_script is a boolean option that triggers the compilation of the 
-+source sieve script to bytecode sieve script. The file that the bytecode script will
-+be saved is pointed by autocreate_sieve_compiledscript.
-+
-+Ways of compiling a sieve script : 
-+1. Compile a sieve script using the standard sievec utility, distributed by CMU
-+2. Compile a sieve script using the compile_sieve utility, released by UoA. This 
-+   tool is almost identical to the sievec utility, with the difference that it 
-+   reads the input and output file from autocreate_sieve_script and 
-+   autocreate_sieve_compiledscript options in imapd.conf
-+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be
-+   instructed to save the compiled script any time a compiled script does not exist.
-+
-+NOTES : 
-+1. In order this functionality to work, the following requirements must have been met:
-+   - 'sieveusehomedir' option must be 'no' in the configuration (default).
-+   - 'sievedir' option must have a valid value.
-+2. Currently, this patch checks the validity of the source script while generating a 
-+   bytecode compiled script, but not the validity of the bytecode sieve script file.
-+   The administrator should make sure that the provided files contain a valid sieve
-+   script as well as the compiled script is updated every time the source script changes.
-+
-+
-+  (E) The administrator may control for which users and/or groups may the INBOXes 
-+automatically be created. The autocreate_users option restricts the groups
-+for which the patch will create the mailboxes. 
-+
-+The default value of autocreate_users is anyone. So, if not set at all, the patch will 
-+work for all users. However, one may set:
-+
-+autocreate_users: user1 user2 group:group1 group:group2
-+
-+In that case, the INBOX will be created only for user1, user2 and the users that belong 
-+to group1 and group2. 
-+
-+More refined control per service is provided by the options imap_autocreate_users,
-+pop3_autocreate_users and lmtp_autocreate_users. These options override the 
-+autocreate_users option and offer per service control.
-+
-+Example: 
-+One may want to restrict the create on post functionality only for a specific group
-+of users. To achieve this, the following lines must be added in the imapd.conf file:
-+
-+createonpost: yes
-+lmtp_autocreate_users: group:groupname
-+
-+
-+
-+Issues to be considered 
-+=======================
-+
-+I) In order to use the create on post feauture one should be absolutely sure that: 
-+a) The MTA checks the validity of the email recipient before sending the email to
-+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be 
-+able to use the account database as user mailbox database". 
-+b) Only authorised accounts/services can talk to LMTP.
-+
-+II) Especially in the case of imap logins, the current patch implementation checks
-+for the INBOX folder existence upon login, causing an extra mailbox lookup in most 
-+of the cases. 
-+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and
-+check if the error is associated with an INBOX folder. However, this would mess up
-+Cyrus code. The way it was implemented may not have been the most performance
-+optimised, but it produces a much cleaner and simple patch.
-+
-+
-+
-+Virtual Domains Support
-+=======================
-+
-+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and 
-+later. However, it is not possible to declare different INBOX subfolders to be created or 
-+shared folders to be subscribed to for every domain.
-+
-+
-+
-+Things to be done
-+=================
-+
-+1. Support MUPDATE
-+
-+It is within the developers' intentions to support the mupdate protocol, but serious 
-+design issues on future cyrus releases have to resolved first.
-+
-+2. Select different attributes (quota, partition, sieve filter, etc) depending on the group
-+a user belongs to. 
-+
-+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate
-+
-diff -Naur cyrus-imapd-2.4.4.orig/imap/Makefile.in cyrus-imapd-2.4.4/imap/Makefile.in
---- cyrus-imapd-2.4.4.orig/imap/Makefile.in	2010-11-16 08:48:20.817612092 +0100
-+++ cyrus-imapd-2.4.4/imap/Makefile.in	2010-11-16 08:49:21.892354019 +0100
-@@ -66,7 +66,7 @@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
--DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS = $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ 
-@@ -102,7 +102,7 @@
- 	imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
- 	sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
- 	statuscache_db.o userdeny_db.o sequence.o upgrade_index.o \
--	dlist.o version.o
-+	dlist.o version.o autosieve.o
- 
- IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o
- 
-@@ -118,7 +118,7 @@
- 	fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
- 	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
- 	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
--	unexpunge cyr_df cyr_sequence cyr_userseen @IMAP_PROGS@
-+	unexpunge compile_sieve cyr_df cyr_sequence cyr_userseen @IMAP_PROGS@
- 
- BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
- 	lmtpstats.c lmtpstats.h mupdate_err.c mupdate_err.h \
-@@ -180,9 +180,9 @@
- mupdate_err.h: mupdate_err.c
- 
- ### Services
--idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
-+idled: idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS)
- 	$(CC) $(LDFLAGS) -o idled \
--	 idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-+	 idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
- 
- lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
- 	 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-@@ -365,6 +365,10 @@
- 	sync_reset sync_reset.o sync_support.o \
- 	libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
- 
-+compile_sieve: compile_sieve.o libimap.a $(DEPLIBS) $(SIEVE_LIBS)
-+	$(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \
-+	libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS)
-+
- ### Other Misc Targets
- 
- clean:
-diff -Naur cyrus-imapd-2.4.4.orig/imap/autosieve.c cyrus-imapd-2.4.4/imap/autosieve.c
---- cyrus-imapd-2.4.4.orig/imap/autosieve.c	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.4.4/imap/autosieve.c	2010-11-16 08:48:37.722056581 +0100
-@@ -0,0 +1,590 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/uio.h>
-+#include <fcntl.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <syslog.h>
-+#include <et/com_err.h>
-+#include <config.h>
-+
-+#include "global.h"
-+#include "util.h"
-+#include "xmalloc.h"
-+#include "xstrlcpy.h"
-+#include "xstrlcat.h"
-+#include "mailbox.h"
-+#include "imap_err.h"
-+#include "sieve_interface.h"
-+#include "script.h"
-+
-+#define TIMSIEVE_FAIL 	-1
-+#define TIMSIEVE_OK 	0
-+#define MAX_FILENAME	1024
-+
-+static int get_script_name(char *sievename, size_t buflen, const char *filename);
-+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
-+int autoadd_sieve(char *userid, const char *source_script);
-+
-+//static void fatal(const char *s, int code);
-+static void foo(void);
-+static int sieve_notify(void *ac __attribute__((unused)),
-+                        void *interp_context __attribute__((unused)),
-+                        void *script_context __attribute__((unused)),
-+                        void *message_context __attribute__((unused)),
-+                        const char **errmsg __attribute__((unused)));
-+static int mysieve_error(int lineno, const char *msg,
-+                  void *i __attribute__((unused)), void *s);
-+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
-+
-+
-+sieve_vacation_t vacation2 = {
-+    0,                          /* min response */
-+    0,                          /* max response */
-+    (sieve_callback *) &foo,    /* autorespond() */
-+    (sieve_callback *) &foo     /* send_response() */
-+};
-+
-+
-+/*
-+ * Find the name of the sieve script
-+ * given the source script and compiled script names
-+ */
-+static int get_script_name(char *sievename, size_t buflen, const char *filename)
-+{
-+  char *p;
-+  int r;
-+
-+  p = strrchr(filename, '/');
-+  if (p == NULL)
-+      p = (char *) filename;
-+  else
-+      p++;
-+
-+  r = strlcpy(sievename, p, buflen) - buflen;
-+  return (r >= 0 || r == -buflen ? 1 : 0);
-+}
-+
-+
-+/*
-+ * Find the directory where the sieve scripts of the user
-+ * reside
-+ */
-+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir)
-+{
-+    char *user = NULL, *domain = NULL;
-+
-+    /* Setup the user and the domain */
-+    if(config_virtdomains && (domain = strchr(userid, '@'))) {
-+        user = (char *) xmalloc((domain - userid +1) * sizeof(char));
-+        strlcpy(user, userid, domain - userid + 1);
-+        domain++;
-+    } else
-+        user = userid;
-+
-+    /*  Find the dir path where the sieve scripts of the user will reside */   
-+    if (config_virtdomains && domain) {
-+         if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/",
-+              sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain, config_fulldirhash), domain, dir_hash_c(user,config_fulldirhash), user) >= buflen) {
-+                 free(user);
-+                 return 1;
-+ 	 }
-+    } else {
-+         if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", 
-+     	      sieve_dir, dir_hash_c(user,config_fulldirhash), user) >= buflen) 
-+                 return 1;
-+    }
-+
-+    /* Free the xmalloced user memory, reserved above */
-+    if(user != userid)
-+        free(user);
-+
-+    return 0;
-+}
-+
-+int autoadd_sieve(char *userid, const char *source_script)
-+{   
-+    sieve_script_t *s = NULL;
-+    bytecode_info_t *bc = NULL;
-+    char *err = NULL;
-+    FILE *in_stream, *out_fp;
-+    int out_fd, in_fd, r, k;
-+    int do_compile = 0;
-+    const char *sieve_dir = NULL;
-+    const char *compiled_source_script = NULL;
-+    char sievename[MAX_FILENAME];
-+    char sieve_script_name[MAX_FILENAME];
-+    char sieve_script_dir[MAX_FILENAME];
-+    char sieve_bcscript_name[MAX_FILENAME];
-+    char sieve_default[MAX_FILENAME];
-+    char sieve_tmpname[MAX_FILENAME];
-+    char sieve_bctmpname[MAX_FILENAME];
-+    char sieve_bclink_name[MAX_FILENAME];
-+    char buf[4096];
-+    mode_t oldmask;
-+    struct stat statbuf;
-+
-+    /* We don't support using the homedirectory, like timsieved */
-+    if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) {
-+        syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf");
-+        return 1;
-+    }
-+
-+    /* Check if sievedir is defined in imapd.conf */
-+    if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) { 
-+        syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf");
-+        return 1;
-+    }
-+
-+    /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */
-+    if(!(compiled_source_script  = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) {
-+        syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it");
-+        do_compile = 1;
-+    }
-+
-+    if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory");
-+        return 1;
-+    }
-+
-+    if (get_script_name(sievename, sizeof(sievename), source_script)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script);
-+        return 1;
-+    }
-+
-+    if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+        return 1;
-+    }
-+    if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+        return 1;
-+    }    
-+    if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+        return 1;
-+    }
-+    if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+        return 1;
-+    }
-+    if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+        return 1;
-+    }
-+    if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name))  {
-+        syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid);
-+        return 1;
-+    }
-+
-+    /* Check if a default sieve filter alrady exists */
-+    if(!stat(sieve_default,&statbuf)) {
-+        syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists");
-+        fclose(in_stream);
-+        return 1;
-+    }
-+
-+    /* Open the source script. if there is a problem with that exit */
-+    in_stream = fopen(source_script, "r");
-+    if(!in_stream) {
-+        syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script);
-+        return 1;
-+    }
-+    
-+    
-+    /* 
-+     * At this point we start the modifications of the filesystem 
-+     */
-+
-+    /* Create the directory where the sieve scripts will reside */
-+    r = cyrus_mkdir(sieve_script_dir, 0755);
-+    if(r == -1) {
-+        /* If this fails we just leave */
-+        syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name);
-+        return 1;
-+    }
-+
-+    /*
-+     * We open the file that will be used as the bc file. If this file exists, overwrite it 
-+     * since something bad has happened. We open the file here so that this error checking is
-+     * done before we try to open the rest of the files to start copying etc. 
-+     */
-+    out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-+    if(out_fd < 0) {
-+        if(errno == EEXIST) {
-+            syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname);
-+        } else if (errno == EACCES) {
-+            syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname);
-+            fclose(in_stream);
-+            return 1;
-+        } else {
-+            syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname);
-+            fclose(in_stream);
-+            return 1;
-+        }
-+    }
-+
-+    if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) {
-+        while((r = read(in_fd, buf, sizeof(buf))) > 0) {
-+            if((k=write(out_fd, buf,r)) < 0) {
-+                syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno);
-+                close(out_fd);
-+                close(in_fd);
-+                fclose(in_stream);
-+                unlink(sieve_bctmpname);
-+                return 1;
-+           }
-+        } 
-+
-+        if(r == 0) { /* EOF */
-+            close(out_fd);
-+            close(in_fd);
-+        } else if (r < 0) {
-+            syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", 
-+                           compiled_source_script);
-+            close(in_fd);
-+            do_compile = 1;
-+            if(lseek(out_fd, 0, SEEK_SET)) {
-+                syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting");
-+                return 1;
-+            }
-+        }
-+        close(in_fd);
-+    } else {
-+        if(compiled_source_script)
-+              syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script);
-+        do_compile = 1;
-+    }
-+
-+
-+    /* Because we failed to open a precompiled bc sieve script, we compile one */
-+    if(do_compile) {
-+       if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) {
-+            if(err && *err) {
-+               syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err);
-+               free(err);
-+            } else
-+                syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script");
-+    
-+            unlink(sieve_bctmpname);
-+            fclose(in_stream);
-+            close(out_fd);
-+            return 1;
-+        }
-+
-+        /* generate the bytecode */
-+        if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) {
-+            syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script");
-+            /* removing the copied script and cleaning up memory */
-+            unlink(sieve_bctmpname);
-+            sieve_script_free(&s);
-+            fclose(in_stream);
-+            close(out_fd);
-+            return 1;
-+        }
-+
-+        if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) {
-+            syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script");
-+            /* removing the copied script and cleaning up memory */
-+            unlink(sieve_bctmpname);
-+            sieve_free_bytecode(&bc);
-+            sieve_script_free(&s);
-+            fclose(in_stream);
-+            close(out_fd);
-+            return 1;
-+        }
-+
-+        /* clean up the memory */
-+        sieve_free_bytecode(&bc);
-+        sieve_script_free(&s);
-+    }
-+
-+    close(out_fd);
-+    rewind(in_stream);
-+
-+    /* Copy the initial script */
-+    oldmask = umask(077);
-+    if((out_fp = fopen(sieve_tmpname, "w")) == NULL) {
-+        syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname);
-+        unlink(sieve_bctmpname);
-+        umask(oldmask);
-+        fclose(in_stream);
-+        return 1;
-+    }
-+    umask(oldmask);
-+
-+    while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) {
-+        if( fwrite(buf,sizeof(char), r, out_fp) != r) {
-+            syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname);
-+            fclose(out_fp);
-+            unlink(sieve_tmpname);
-+            unlink(sieve_bctmpname);
-+            fclose(in_stream);
-+            return 1;
-+        }
-+    }
-+    
-+    if(feof(in_stream)) {
-+        fclose(out_fp);
-+    } else { /* ferror */
-+        fclose(out_fp);
-+        unlink(sieve_tmpname);
-+        unlink(sieve_bctmpname);
-+        fclose(in_stream);
-+        return 1;
-+    }
-+
-+    /* Renaming the necessary stuff */
-+    if(rename(sieve_tmpname, sieve_script_name)) {
-+        unlink(sieve_tmpname);
-+        unlink(sieve_bctmpname);
-+        return 1;
-+    }
-+
-+    if(rename(sieve_bctmpname, sieve_bcscript_name)) {
-+        unlink(sieve_bctmpname);
-+        unlink(sieve_bcscript_name);
-+        return 1;
-+    }
-+
-+    /* end now with the symlink */
-+    if(symlink(sieve_bclink_name, sieve_default)) {
-+        if(errno != EEXIST) {
-+            syslog(LOG_WARNING, "autocreate_sieve: problem making the default link.");
-+            /* Lets delete the files */
-+            unlink(sieve_script_name);
-+            unlink(sieve_bcscript_name);
-+        }
-+    }
-+
-+    /* 
-+     * If everything has succeeded AND we have compiled the script AND we have requested
-+     * to generate the global script so that it is not compiled each time then we create it.
-+     */
-+    if(do_compile && 
-+          config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) {
-+
-+        if(!compiled_source_script) {
-+            syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf");
-+            return 0;
-+        }
-+
-+        if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname))
-+            return 0;
-+
-+        /*
-+         * Copy everything from the newly created bc sieve sieve script.
-+         */
-+        if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) {
-+            return 0;
-+        }
-+
-+        if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) {
-+            if(errno == EEXIST) {
-+               /* Someone is already doing this so just bail out. */
-+               syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname);
-+                close(in_fd);
-+                return 0; 
-+            } else if (errno == EACCES) {
-+                syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname);
-+                close(in_fd);
-+                return 0;
-+            } else {
-+                syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname);
-+                close(in_fd);
-+                return 0;
-+            }
-+        }
-+
-+        while((r = read(in_fd, buf, sizeof(buf))) > 0) {
-+            if((k = write(out_fd,buf,r)) < 0) {
-+                syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno);
-+                close(out_fd);
-+                close(in_fd);
-+                unlink(sieve_tmpname);
-+                return 0;
-+           }
-+        }
-+
-+        if(r == 0 ) { /*EOF */
-+            close(out_fd);
-+            close(in_fd);
-+        } else if (r < 0) {
-+                syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno);
-+                close(out_fd);
-+                close(in_fd);
-+                unlink(sieve_tmpname);
-+                return 0;
-+        }
-+
-+        /* Rename the temporary created sieve script to its final name. */
-+        if(rename(sieve_tmpname, compiled_source_script)) {
-+            if(errno != EEXIST) {
-+               unlink(sieve_tmpname);
-+               unlink(compiled_source_script);
-+        }
-+            return 0;
-+        }
-+
-+        syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script);
-+    }
-+
-+    return 0;
-+}
-+
-+/*static void fatal(const char *s, int code)
-+{   
-+    printf("Fatal error: %s (%d)\r\n", s, code);
-+    exit(1);
-+}*/
-+
-+/* to make larry's stupid functions happy :) */
-+static void foo(void)
-+{
-+    fatal("stub function called", 0);
-+}
-+
-+static int sieve_notify(void *ac __attribute__((unused)),
-+                        void *interp_context __attribute__((unused)),
-+                        void *script_context __attribute__((unused)),
-+                        void *message_context __attribute__((unused)),
-+                        const char **errmsg __attribute__((unused)))
-+{
-+    fatal("stub function called", 0);
-+    return SIEVE_FAIL;
-+}
-+
-+static int mysieve_error(int lineno, const char *msg,
-+                  void *i __attribute__((unused)), void *s)
-+{
-+    char buf[1024];
-+    char **errstr = (char **) s;
-+
-+    snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
-+    *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
-+    syslog(LOG_DEBUG, "%s", buf);
-+    strcat(*errstr, buf);
-+
-+    return SIEVE_OK;
-+}
-+
-+/* end the boilerplate */
-+
-+/* returns TRUE or FALSE */
-+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
-+{
-+    sieve_interp_t *i;
-+    sieve_script_t *s;
-+    int res;
-+
-+    res = sieve_interp_alloc(&i, NULL);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_redirect(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_discard(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_reject(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_fileinto(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_keep(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_imapflags(i, NULL);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_size(i, (sieve_get_size *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_header(i, (sieve_get_header *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_envelope(i, (sieve_get_envelope *) &foo);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_vacation(i, &vacation2);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_notify(i, &sieve_notify);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_parse_error(i, &mysieve_error);
-+    if (res != SIEVE_OK) {
-+        syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    rewind(stream);
-+
-+    *errstr = (char *) xmalloc(20 * sizeof(char));
-+    strcpy(*errstr, "script errors:\r\n");
-+
-+    res = sieve_script_parse(i, stream, errstr, &s);
-+
-+    if (res == SIEVE_OK) {
-+        if(ret) {
-+            *ret = s;
-+        } else {
-+            sieve_script_free(&s);
-+        }
-+        free(*errstr);
-+        *errstr = NULL;
-+    }
-+
-+    /* free interpreter */
-+    sieve_interp_free(&i);
-+
-+    return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL;
-+}
-+
-+/*
-+ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of
-+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present
-+ */
-+
-diff -Naur cyrus-imapd-2.4.4.orig/imap/compile_sieve.c cyrus-imapd-2.4.4/imap/compile_sieve.c
---- cyrus-imapd-2.4.4.orig/imap/compile_sieve.c	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.4.4/imap/compile_sieve.c	2010-11-16 08:48:37.724064645 +0100
-@@ -0,0 +1,365 @@
-+/* This tool compiles the sieve script from a command
-+line so that it can be used wby the autoadd patch */
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <config.h>
-+#include <string.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/uio.h>
-+#include <fcntl.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <et/com_err.h>
-+
-+#include "global.h"
-+
-+#include "util.h"
-+#include "xmalloc.h"
-+#include "xstrlcpy.h"
-+#include "xstrlcat.h"
-+#include "mailbox.h"
-+#include "imap_err.h"
-+#include "sieve_interface.h"
-+#include "script.h"
-+
-+#include <pwd.h>
-+
-+#define TIMSIEVE_FAIL 		-1
-+#define TIMSIEVE_OK 		0
-+#define MAX_FILENAME_SIZE	100
-+
-+/* Needed by libconfig */
-+const int config_need_data = 0;
-+
-+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
-+
-+/*static void fatal(const char *s, int code)
-+{   
-+    printf("Fatal error: %s (%d)\r\n", s, code);
-+
-+    exit(1);
-+}*/
-+
-+void usage(void)
-+{
-+    fprintf(stderr,
-+            "Usage:\n\tcompile_sieve [-C <altconfig>] [-i <infile> -o <outfile>]\n");
-+    exit(-1);
-+}
-+
-+
-+int main (int argc, char **argv)
-+{   
-+
-+    sieve_script_t *s = NULL;
-+    bytecode_info_t *bc = NULL;
-+    char *err = NULL;
-+    FILE *in_stream;
-+    int  out_fd, opt;
-+    char *source_script = NULL;
-+    char *compiled_source_script = NULL;
-+    char *alt_config = NULL;
-+    extern char *optarg;
-+    char sieve_tmpname[MAX_MAILBOX_NAME+1];
-+
-+    if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
-+
-+    while((opt = getopt(argc, argv, "C:i:o:")) != EOF) {
-+        switch (opt) {
-+            case 'C': /* alt config file */
-+	        alt_config =  optarg;
-+	        break;
-+	    case 'i': /* input script file */
-+		source_script = optarg;
-+		break;
-+	    case 'o': /* output script file */
-+		compiled_source_script = optarg;
-+		break;
-+	    default:
-+	        usage();
-+		break;
-+	}
-+    }
-+
-+    if(source_script && !compiled_source_script) {
-+	    fprintf(stderr, "No output file was defined\n");
-+	    usage();
-+    } else if (!source_script && compiled_source_script) {
-+	    fprintf(stderr, "No input file was defined\n");
-+	    usage();
-+    }	
-+
-+    /*
-+     * If no <infile> has been defined, then read them from
-+     * the configuration file.
-+     */
-+    if (!source_script && !compiled_source_script) { 
-+	    cyrus_init(alt_config, "compile_sieve", 0);
-+
-+	    /* Initially check if we want to have the sieve script created */
-+	    if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) {
-+        	fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n");
-+	        return 1;
-+	    }
-+
-+	    /* Check if we have an already compiled sieve script*/
-+	    if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) {
-+	        fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n");
-+		return 1;
-+	    }
-+
-+	    if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) {
-+       		/* 
-+		 * At this point the only think that is inconsistent is the directory 
-+		 * that was created. But if the user will have any sieve scripts then 
-+		 * they will eventually go there, so no big deal 
-+		 */
-+	        fprintf(stderr, 
-+			"In imapd.conf the full path of the filenames must be defined\n");
-+	       	return 1;
-+	    }
-+    }
-+
-+    printf("input file : %s, output file : %s\n", source_script, compiled_source_script);
-+
-+
-+    if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) {
-+	    fprintf(stderr, "Filename %s is too big\n", compiled_source_script);
-+	    return 1;
-+    }
-+    	
-+    snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script);
-+
-+    in_stream = fopen(source_script,"r");
-+
-+    if(!in_stream) {
-+        fprintf(stderr,"Unable to open %s source sieve script\n",source_script);
-+        return 1; 
-+    }
-+
-+    /* 
-+     * We open the file that will be used as the bc file. If this file exists, overwrite it 
-+     * since something bad has happened. We open the file here so that this error checking is
-+     * done before we try to open the rest of the files to start copying etc. 
-+     */
-+    out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-+    if(out_fd < 0) {
-+        if(errno == EEXIST) {
-+            fprintf(stderr, "File %s already exists\n", sieve_tmpname);
-+        } else if (errno == EACCES) {
-+            fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n",
-+			    sieve_tmpname);
-+        } else {
-+            fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n", 
-+			    sieve_tmpname);
-+        }
-+	
-+	fclose(in_stream);
-+	return 1;
-+    }
-+
-+    if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) {
-+        if(err && *err) {
-+           fprintf(stderr, "Error while parsing script %s\n",err);
-+           free(err);
-+        }
-+        else
-+            fprintf(stderr,"Error while parsing script\n");
-+            unlink(sieve_tmpname);
-+	    fclose(in_stream);
-+	    close(out_fd);
-+        return 1;
-+   }
-+
-+
-+    /* generate the bytecode */
-+    if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) {
-+        fprintf(stderr,"Error occured while compiling sieve script\n");
-+        /* removing the copied script and cleaning up memory */
-+        unlink(sieve_tmpname);
-+        sieve_script_free(&s);
-+        fclose(in_stream);
-+        close(out_fd);
-+        return 1;
-+    }
-+    if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) {
-+        fprintf(stderr, "Error occured while emitting sieve script\n");
-+        unlink(sieve_tmpname);
-+        sieve_free_bytecode(&bc);
-+        sieve_script_free(&s);
-+        fclose(in_stream);
-+        close(out_fd);
-+        return 1;
-+    }
-+
-+    /* clean up the memory */
-+    sieve_free_bytecode(&bc);
-+    sieve_script_free(&s);
-+
-+    close(out_fd);
-+
-+    if(rename(sieve_tmpname, compiled_source_script)) {
-+        if(errno != EEXIST) {
-+            unlink(sieve_tmpname);
-+            unlink(compiled_source_script);
-+            return 1;
-+        }
-+    }
-+    return 0;
-+}
-+
-+
-+/* to make larry's stupid functions happy :) */
-+static void foo(void)
-+{
-+    fatal("stub function called", 0);
-+}
-+
-+extern sieve_vacation_t vacation2;/* = {
-+    0,                          / min response /
-+    0,                          / max response /
-+    (sieve_callback *) &foo,    / autorespond() /
-+    (sieve_callback *) &foo     / send_response() /
-+}; */
-+
-+static int sieve_notify(void *ac __attribute__((unused)),
-+                        void *interp_context __attribute__((unused)),
-+                        void *script_context __attribute__((unused)),
-+                        void *message_context __attribute__((unused)),
-+                        const char **errmsg __attribute__((unused)))
-+{
-+    fatal("stub function called", 0);
-+    return SIEVE_FAIL;
-+}
-+
-+static int mysieve_error(int lineno, const char *msg,
-+                  void *i __attribute__((unused)), void *s)
-+{
-+    char buf[1024];
-+    char **errstr = (char **) s;
-+
-+    snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
-+    *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
-+    fprintf(stderr, "%s\n", buf);
-+    strcat(*errstr, buf);
-+
-+    return SIEVE_OK;
-+}
-+
-+/* end the boilerplate */
-+
-+/* returns TRUE or FALSE */
-+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret)
-+{
-+    sieve_interp_t *i;
-+    sieve_script_t *s;
-+    int res;
-+
-+    res = sieve_interp_alloc(&i, NULL);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_interp_alloc() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_redirect(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_redirect() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_discard(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_discard() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_reject(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_reject() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_fileinto(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_fileinto() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+    res = sieve_register_keep(i, (sieve_callback *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_keep() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_imapflags(i, NULL);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_imapflags() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_size(i, (sieve_get_size *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_size() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_header(i, (sieve_get_header *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_header() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_envelope(i, (sieve_get_envelope *) &foo);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_envelope() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_vacation(i, &vacation2);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_vacation() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_notify(i, &sieve_notify);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_notify() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    res = sieve_register_parse_error(i, &mysieve_error);
-+    if (res != SIEVE_OK) {
-+        fprintf(stderr, "sieve_register_parse_error() returns %d\n", res);
-+        return TIMSIEVE_FAIL;
-+    }
-+
-+    rewind(stream);
-+
-+    *errstr = (char *) xmalloc(20 * sizeof(char));
-+    strcpy(*errstr, "script errors:\r\n");
-+
-+    res = sieve_script_parse(i, stream, errstr, &s);
-+
-+    if (res == SIEVE_OK) {
-+        if(ret) {
-+            *ret = s;
-+        } else {
-+            sieve_script_free(&s);
-+        }
-+        free(*errstr);
-+        *errstr = NULL;
-+    }
-+
-+    /* free interpreter */
-+    sieve_interp_free(&i);
-+
-+    return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL;
-+}
-+
-+
-+
-+
-+
-+
-diff -Naur cyrus-imapd-2.4.4.orig/imap/imapd.c cyrus-imapd-2.4.4/imap/imapd.c
---- cyrus-imapd-2.4.4.orig/imap/imapd.c	2010-11-16 08:48:20.829659918 +0100
-+++ cyrus-imapd-2.4.4/imap/imapd.c	2010-11-16 08:48:37.728081052 +0100
-@@ -269,6 +269,7 @@
- void motd_file(int fd);
- void shut_down(int code);
- void fatal(const char *s, int code);
-+void autocreate_inbox(void);
- 
- void cmdloop(void);
- void cmd_login(char *tag, char *user);
-@@ -2102,8 +2103,47 @@
-     mboxname_hiersep_tointernal(&imapd_namespace, imapd_userid,
- 				config_virtdomains ?
- 				strcspn(imapd_userid, "@") : 0);
-+
-+    autocreate_inbox();
-+}
-+
-+/*
-+ * Autocreate Inbox and subfolders upon login
-+ */
-+void autocreate_inbox()
-+{
-+    char inboxname[MAX_MAILBOX_NAME+1];
-+    int autocreatequota;
-+    int r;
-+ 
-+    /*
-+     * Exlude admin's accounts
-+     */
-+    if (imapd_userisadmin || imapd_userisproxyadmin)
-+        return;
-+ 
-+    /*
-+     * Exclude anonymous
-+     */
-+    if (!strcmp(imapd_userid, "anonymous"))
-+        return;
-+ 
-+    if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) {
-+        /* This is actyally not required
-+           as long as the lenght of userid is ok */
-+           r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace,
-+                                      "INBOX", imapd_userid, inboxname);
-+           if (!r)
-+               r = mboxlist_lookup(inboxname, NULL, NULL);
-+ 
-+           if (r == IMAP_MAILBOX_NONEXISTENT) {
-+                mboxlist_autocreateinbox(&imapd_namespace, imapd_userid,
-+                         imapd_authstate, inboxname, autocreatequota);
-+	   }
-+     }
- }
- 
-+
- /*
-  * Perform a LOGIN command
-  */
-@@ -5880,6 +5920,8 @@
- 	goto freeargs;
-     }
- 
-+    autocreate_inbox();
-+
-     return;
- 
-   freeargs:
-diff -Naur cyrus-imapd-2.4.4.orig/imap/lmtpd.c cyrus-imapd-2.4.4/imap/lmtpd.c
---- cyrus-imapd-2.4.4.orig/imap/lmtpd.c	2010-11-16 08:48:20.824640875 +0100
-+++ cyrus-imapd-2.4.4/imap/lmtpd.c	2010-11-16 08:48:37.729084805 +0100
-@@ -119,6 +119,8 @@
- static FILE *spoolfile(message_data_t *msgdata);
- static void removespool(message_data_t *msgdata);
- 
-+static int autocreate_inbox(const char *user, const char *domain);
-+
- /* current namespace */
- static struct namespace lmtpd_namespace;
- 
-@@ -976,6 +978,86 @@
-     exit(code);
- }
- 
-+
-+/*
-+ * Autocreate Inbox and subfolders upon login
-+ */
-+int autocreate_inbox(const char *user, const char *domain)
-+{
-+    struct auth_state *auth_state;
-+    char inboxname[MAX_MAILBOX_NAME+1];
-+    char *rcpt_userid = NULL;
-+    int autocreatequota;
-+    int r = 0;
-+
-+    if (user == NULL)
-+          return IMAP_MAILBOX_NONEXISTENT;
-+
-+    if (domain != NULL) {
-+	int k;
-+	
-+	rcpt_userid = (char *) xmalloc((strlen(user) + strlen(domain) + 2) * sizeof(char));
-+	k = strlcpy(rcpt_userid, user, strlen(user) + 1);
-+  	*(rcpt_userid + k) = '@';
-+       strlcpy(rcpt_userid + k + 1, domain, strlen(domain) + 1);
-+    } else {
-+	rcpt_userid = (char *) user;
-+    }
-+
-+
-+    /*
-+     * Exclude anonymous
-+     */
-+    if (!strcmp(rcpt_userid, "anonymous")) {
-+	if (rcpt_userid != user) {
-+	    free(rcpt_userid);
-+	}
-+
-+        return IMAP_MAILBOX_NONEXISTENT;
-+    }
-+    
-+    /*
-+     * Check for autocreatequota and createonpost
-+     */
-+    if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) ||
-+        !(config_getswitch(IMAPOPT_CREATEONPOST))) {
-+	    
-+	if (rcpt_userid != user) {
-+	    free(rcpt_userid);
-+	}
-+	
-+        return IMAP_MAILBOX_NONEXISTENT;
-+     }
-+
-+
-+    /*
-+     * Exclude admin's accounts
-+     */
-+     auth_state = auth_newstate(rcpt_userid);
-+     
-+     if (global_authisa(auth_state, IMAPOPT_ADMINS)) {
-+	if (rcpt_userid != user) {
-+	    free(rcpt_userid);
-+	}
-+
-+        return IMAP_MAILBOX_NONEXISTENT;
-+     }
-+     
-+     r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace,
-+                                "INBOX", rcpt_userid, inboxname);
-+     
-+     if (!r)
-+ 	r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid,
-+                         auth_state, inboxname, autocreatequota);
-+     
-+     if (rcpt_userid != user) {
-+	free(rcpt_userid);
-+     }
-+       
-+     return r;
-+}
-+
-+
- static int verify_user(const char *user, const char *domain, char *mailbox,
- 		       quota_t quotacheck, struct auth_state *authstate)
- {
-@@ -1019,6 +1101,15 @@
- 	 */
- 	r = mlookup(namebuf, &server, &acl, NULL);
- 
-+	/* If user mailbox does not exist, then invoke autocreate inbox function */
-+	if (r == IMAP_MAILBOX_NONEXISTENT) {
-+	    r = autocreate_inbox(user, domain);
-+
-+	    /* Try to locate the mailbox again */
-+	    if (!r)
-+		r = mlookup(namebuf, &server, &acl, NULL);
-+	}
-+
- 	if (r == IMAP_MAILBOX_NONEXISTENT && !user &&
- 	    config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) &&
- 	    /* see if we have a mailbox whose name is close */
-@@ -1045,6 +1136,7 @@
- 			     aclcheck, (quotacheck < 0)
- 			     || config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
- 			     quotacheck : 0);
-+
- 	}
-     }
- 
-diff -Naur cyrus-imapd-2.4.4.orig/imap/mboxlist.c cyrus-imapd-2.4.4/imap/mboxlist.c
---- cyrus-imapd-2.4.4.orig/imap/mboxlist.c	2010-11-16 08:48:20.818616124 +0100
-+++ cyrus-imapd-2.4.4/imap/mboxlist.c	2010-11-16 08:48:37.732096343 +0100
-@@ -84,6 +84,12 @@
- #include "quota.h"
- #include "sync_log.h"
- 
-+#ifdef USE_SIEVE
-+extern int autoadd_sieve(char *userid, 
-+		const char *source_script);
-+#endif
-+
-+
- #define DB config_mboxlist_db
- #define SUBDB config_subscription_db
- 
-@@ -100,6 +106,19 @@
- 			    void *rock);
- static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
- 				void *rock);
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+				char *userid, char *auth_userid,
-+				struct auth_state *auth_state);
-+
-+/*
-+ * Struct needed to be passed as void *rock to
-+ * mboxlist_autochangesub();
-+ */
-+struct changesub_rock_st {
-+	char *userid;
-+	char *auth_userid;
-+	struct auth_state *auth_state;
-+};
- 
- char *mboxlist_makeentry(int mbtype, const char *part, const char *acl)
- {
-@@ -2996,3 +3015,349 @@
- 
-     return(count);
- }
-+
-+/*
-+ * Automatically subscribe user to *ALL* shared folders,
-+ * one has permissions to be subscribed to.
-+ * INBOX subfolders are excluded.
-+ */
-+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
-+                        void *rock) {
-+
-+  struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
-+  char *userid = changesub_rock->userid;
-+  char *auth_userid = changesub_rock->auth_userid;
-+  struct auth_state *auth_state = changesub_rock->auth_state;
-+  int r;
-+
-+
-+  if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
-+     (strlen(name) > 5  && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
-+     (strlen(name) > 4  && !strncmp(name, "user.", 5)))   /* Exclude other users' folders */
-+	  return 0;
-+
-+     
-+  r = mboxlist_changesub(name, userid, auth_state, 1, 0);
-+
-+  if (r) {
-+      syslog(LOG_WARNING,
-+             "autosubscribe: User %s to folder %s, subscription failed: %s",
-+             auth_userid, name, error_message(r));
-+  } else {
-+      syslog(LOG_NOTICE,
-+             "autosubscribe: User %s to folder %s, subscription succeeded",
-+             auth_userid, name);
-+  }
-+
-+  return 0;
-+}
-+
-+#define SEP '|'
-+
-+/*
-+ * Automatically subscribe user to a shared folder.
-+ * Subscription is done successfully, if the shared
-+ * folder exists and the user has the necessary 
-+ * permissions.
-+ */
-+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
-+                        char *userid, char *auth_userid,
-+                        struct auth_state *auth_state) {
-+        
-+    const char *sub ;
-+    char *p, *q, *next_sub;
-+    char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1];
-+    int len;
-+    int r = 0;
-+    int subscribe_all_sharedfolders = 0;
-+
-+    subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS);
-+
-+    /*
-+     * If subscribeallsharedfolders is set to yes in imapd.conf, then
-+     * subscribe user to every shared folder one has the apropriate 
-+     * permissions.
-+     */
-+    if(subscribe_all_sharedfolders) {
-+       char pattern[MAX_MAILBOX_PATH+1];
-+       struct changesub_rock_st changesub_rock;
-+
-+       strcpy(pattern, "*");
-+       changesub_rock.userid = userid;
-+       changesub_rock.auth_userid = auth_userid;
-+       changesub_rock.auth_state = auth_state;
-+
-+       r = mboxlist_findall(namespace, pattern, 0, userid,
-+                            auth_state, mboxlist_autochangesub, &changesub_rock);
-+
-+       return r;
-+    }
-+
-+    if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL)
-+       return r;
-+
-+    next_sub = (char *) sub;
-+    while (*next_sub) {
-+        for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++);
-+        for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++);
-+        for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--);
-+        if (!*p ) continue;
-+
-+        len = q - p + 1;
-+        /* Check for folder length */
-+        if (len  > sizeof(folder)-1)
-+                continue;
-+
-+        if (!r) {
-+                strncpy(folder, p, len);
-+                folder[len] = '\0';
-+
-+               strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name));
-+               len = strlcat(name, folder, sizeof(name));
-+
-+               r = (namespace->mboxname_tointernal) (namespace, name, userid,
-+                                                                  mailboxname);
-+       }
-+                                                                  
-+        if (!r)
-+               r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0);
-+
-+        if (!r) {
-+                syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded", 
-+                       userid, folder);
-+        } else {
-+                syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s", 
-+                       userid, folder, error_message(r));
-+                r = 0;
-+        }
-+    }
-+
-+    return r;
-+}
-+
-+
-+
-+int mboxlist_autocreateinbox(struct namespace *namespace,
-+                        char *userid,
-+                        struct auth_state *auth_state,
-+                        char *mailboxname, int autocreatequota) {
-+    char name [MAX_MAILBOX_NAME+1];
-+    char folder [MAX_MAILBOX_NAME+1];
-+    char *auth_userid = NULL;
-+    char *partition = NULL;
-+    const char *crt;
-+    const char *sub;
-+    char *p, *q, *next_crt, *next_sub;
-+    int len;
-+    int r = 0;
-+    int numcrt = 0;
-+    int numsub = 0;
-+#ifdef USE_SIEVE
-+    const char *source_script;
-+#endif
-+
-+
-+
-+    auth_userid = auth_canonuser(auth_state);
-+    if (auth_userid == NULL) {
-+         /*
-+          * Couldn't get cannon userid
-+          */
-+          syslog(LOG_ERR,
-+                 "autocreateinbox: Could not get canonified userid for user %s", userid);
-+          return IMAP_PARTITION_UNKNOWN;
-+    }
-+
-+    /* Added this for debug information. */
-+    syslog(LOG_DEBUG, "autocreateinbox: autocreate inbox for user %s was called", auth_userid);
-+
-+   /*
-+    * While this is not needed for admins
-+    * and imap_admins accounts, it would be
-+    * better to separate *all* admins and
-+    * proxyservers from normal accounts
-+    * (accounts that have mailboxes).
-+    * UOA Specific note(1): Even if we do not
-+    * exclude these servers-classes here,
-+    * UOA specific code, will neither return
-+    * role, nor create INBOX, because none of these
-+    * administrative accounts belong to  the
-+    * mailRecipient objectclass, or have imapPartition.
-+    * UOA Specific note(2): Another good reason for doing
-+    * this, is to prevent the code, from getting into
-+    * cyrus_ldap.c because of the continues MSA logins to LMTPd.
-+    */
-+
-+   /*
-+    * admins and the coresponding imap
-+    * service, had already been excluded.
-+    */
-+
-+   /*
-+    * Do we really need group membership
-+    * for admins or service_admins?
-+    */
-+    if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0;
-+
-+   /*
-+    * Do we really need group membership
-+    * for proxyservers?
-+    */
-+    if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0;
-+
-+    /* 
-+     * Check if user belongs to the autocreate_users group. This option
-+     * controls for whom the mailbox may be automatically created. Default
-+     * value for this option is 'anyone'. So, if not declared, all mailboxes
-+     * will be created.
-+     */
-+    if (!global_authisa(auth_state, IMAPOPT_AUTOCREATE_USERS)) {
-+	    syslog(LOG_DEBUG, "autocreateinbox: User %s does not belong to the autocreate_users. No mailbox is created",
-+			    auth_userid);
-+	    return IMAP_MAILBOX_NONEXISTENT;
-+    }
-+
-+#if 0
-+        /*
-+         * Get Partition info or return.
-+         * (Here you should propably use
-+         * you own "get_partition(char *userid)"
-+         * function. Otherwise all new INBOXes will be
-+         * created into whatever partition has been declared
-+         * as default in your imapd.conf)
-+         */
-+
-+        partition = get_partition(userid);
-+        if (partition == NULL) {
-+            /*
-+             * Couldn't get partition info
-+             */
-+            syslog(LOG_ERR,
-+                   "Could not get imapPartition info for user %s", userid);
-+            return IMAP_PARTITION_UNKNOWN;
-+        }
-+#endif
-+
-+    r = mboxlist_createmailbox(mailboxname, 0, NULL,
-+                                      1, userid, auth_state, 0, 0, 0);
-+
-+    if (!r && autocreatequota > 0)
-+        r = mboxlist_setquota(mailboxname, autocreatequota, 0);
-+
-+    if (!r)
-+        r = mboxlist_changesub(mailboxname, userid,
-+                              auth_state, 1, 1);
-+
-+    if (!r) {
-+       syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s", 
-+               auth_userid, partition == NULL ? "default" : partition);
-+    } else {
-+       syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s", 
-+               auth_userid, error_message(r));
-+    }
-+
-+#if 0
-+    /* Allocated from get_partition, and not needed any more */
-+    free_partition(partition);
-+#endif
-+
-+    if (r) return r;
-+
-+    /* INBOX's subfolders */
-+    if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS)))
-+        sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS);
-+
-+    /* Roll through crt */
-+    next_crt = (char *) crt;
-+    while (next_crt!=NULL && *next_crt) {
-+          for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++);
-+          for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++);
-+          for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--);
-+
-+          if (!*p) continue;
-+
-+          len = q - p + 1;
-+
-+          /* First time we check for length */
-+          if (len > sizeof(folder) - 5)
-+              r = IMAP_MAILBOX_BADNAME;
-+
-+          if (!r) {
-+                  strncpy(folder, p, len);
-+                  folder[len] = '\0';
-+
-+                  strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name));
-+                  len = strlcat(name, folder, sizeof(name));
-+          }
-+
-+          if (!r)
-+            r = (namespace->mboxname_tointernal) (namespace, name, userid,
-+                                                 mailboxname);
-+          if (!r)
-+             r = mboxlist_createmailbox(mailboxname, 0, NULL,
-+                                            1, userid, auth_state, 0, 0, 0);
-+
-+          if (!r) {
-+            numcrt++;
-+            syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", 
-+               auth_userid, name);
-+         } else {
-+             syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", 
-+               auth_userid, name, error_message(r));
-+             r=0;
-+             continue;
-+          }
-+
-+          /* Roll through sub */
-+          next_sub = (char *) sub;
-+          while (next_sub!=NULL && *next_sub) {
-+                for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++);
-+                for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++);
-+                for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--);
-+                if (!*p ) continue;
-+
-+                len = q - p + 1;
-+
-+                if (len != strlen(folder) || strncmp(folder, p, len))
-+                    continue;
-+
-+                r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1);
-+
-+               if (!r) {
-+                   numsub++;
-+                   syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded",
-+                       auth_userid, name);
-+               } else
-+                    syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to  %s failed. %s",
-+                       auth_userid, name, error_message(r));
-+
-+                break;
-+         }
-+    }
-+
-+    if (crt!=NULL && *crt)
-+       syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", 
-+               auth_userid, numcrt, numsub);
-+
-+    /*
-+     * Check if shared folders are available for subscription.
-+     */
-+    mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state);
-+
-+#ifdef USE_SIEVE
-+    /*
-+     * Here the autocreate sieve script feature is iniated from.
-+     */
-+    source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT);
-+ 
-+    if (source_script) {
-+        if (!autoadd_sieve(userid, source_script))
-+            syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid);
-+        else
-+            syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid);
-+    }
-+#endif
-+
-+    return r;
-+}
-+
-diff -Naur cyrus-imapd-2.4.4.orig/imap/mboxlist.h cyrus-imapd-2.4.4/imap/mboxlist.h
---- cyrus-imapd-2.4.4.orig/imap/mboxlist.h	2010-11-16 08:48:20.828655886 +0100
-+++ cyrus-imapd-2.4.4/imap/mboxlist.h	2010-11-16 08:48:37.732096343 +0100
-@@ -221,4 +221,9 @@
- 			     const char *userid,
- 			     struct auth_state *authstate);
- 
-+int mboxlist_autocreateinbox(struct namespace *namespace,char *userid,
-+				struct auth_state *auth_state, char *mailboxname, 
-+			       int autocreatequota);
-+
-+
- #endif
-diff -Naur cyrus-imapd-2.4.4.orig/imap/pop3d.c cyrus-imapd-2.4.4/imap/pop3d.c
---- cyrus-imapd-2.4.4.orig/imap/pop3d.c	2010-11-16 08:48:20.820623909 +0100
-+++ cyrus-imapd-2.4.4/imap/pop3d.c	2010-11-16 08:48:37.734104407 +0100
-@@ -181,6 +181,8 @@
- static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */
- static void cmd_apop(char *response);
- 
-+static int autocreate_inbox(char *inboxname, char *userid);
-+
- static void cmd_auth(char *arg);
- static void cmd_capa(void);
- static void cmd_pass(char *pass);
-@@ -1389,6 +1391,7 @@
- 	popd_userid = xstrdup(userbuf);
- 	prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
-     }
-+
- }
- 
- void cmd_pass(char *pass)
-@@ -1692,6 +1695,43 @@
- }
- 
- /*
-+ * Autocreate Inbox and subfolders upon login
-+ */
-+int autocreate_inbox(char *inboxname, char *auth_userid)
-+{
-+    struct auth_state *auth_state;
-+    int autocreatequota;
-+    int r;
-+
-+    if (inboxname == NULL || auth_userid == NULL)
-+	    return IMAP_MAILBOX_NONEXISTENT;
-+    
-+    /*
-+     * Exclude anonymous
-+     */
-+    if (!strcmp(popd_userid, "anonymous"))
-+        return IMAP_MAILBOX_NONEXISTENT;
-+
-+    /*
-+     * Check for autocreatequota
-+     */
-+    if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)))
-+        return IMAP_MAILBOX_NONEXISTENT;
-+
-+    /*
-+     * Exclude admin's accounts
-+     */
-+     auth_state = auth_newstate(popd_userid);
-+     if (global_authisa(auth_state, IMAPOPT_ADMINS))
-+          return IMAP_MAILBOX_NONEXISTENT;
-+
-+     r = mboxlist_autocreateinbox(&popd_namespace, auth_userid,
-+                         auth_state, inboxname, autocreatequota);
-+     return r;
-+}
-+
-+
-+/*
-  * Complete the login process by opening and locking the user's inbox
-  */
- int openinbox(void)
-@@ -1720,6 +1760,12 @@
- 					      userid, inboxname);
- 
-     if (!r) r = mboxlist_lookup(inboxname, &mbentry, NULL);
-+
-+    /* Try once again after autocreate_inbox */
-+    if (r == IMAP_MAILBOX_NONEXISTENT && 
-+      !(r = autocreate_inbox(inboxname, userid)))
-+	r = mboxlist_lookup(inboxname, &mbentry, NULL);
-+
-     if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
- 	(!mbentry.acl ||
- 	 !((myrights = cyrus_acl_myrights(popd_authstate, mbentry.acl)) & ACL_READ))) {
-diff -Naur cyrus-imapd-2.4.4.orig/lib/auth.c cyrus-imapd-2.4.4/lib/auth.c
---- cyrus-imapd-2.4.4.orig/lib/auth.c	2010-11-16 08:48:20.875850421 +0100
-+++ cyrus-imapd-2.4.4/lib/auth.c	2010-11-16 08:48:37.755228749 +0100
-@@ -118,3 +118,11 @@
- 
-     auth->freestate(auth_state);
- }
-+
-+char *auth_canonuser(struct auth_state *auth_state)
-+{
-+    struct auth_mech *auth = auth_fromname();
-+
-+    return auth->auth_canonuser(auth_state);
-+}
-+
-diff -Naur cyrus-imapd-2.4.4.orig/lib/auth.h cyrus-imapd-2.4.4/lib/auth.h
---- cyrus-imapd-2.4.4.orig/lib/auth.h	2010-11-16 08:48:20.881874054 +0100
-+++ cyrus-imapd-2.4.4/lib/auth.h	2010-11-16 08:48:37.755228749 +0100
-@@ -55,6 +55,7 @@
-              const char *identifier);
-     struct auth_state *(*newstate)(const char *identifier);
-     void (*freestate)(struct auth_state *auth_state);
-+    char *(*auth_canonuser)(struct auth_state *auth_state);
- };
- 
- extern struct auth_mech *auth_mechs[];
-@@ -77,5 +78,6 @@
-  	 const char *identifier);
- struct auth_state *auth_newstate(const char *identifier);
- void auth_freestate(struct auth_state *auth_state);
-+char *auth_canonuser(struct auth_state *auth_state);
- 
- #endif /* INCLUDED_AUTH_H */
-diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_krb.c cyrus-imapd-2.4.4/lib/auth_krb.c
---- cyrus-imapd-2.4.4.orig/lib/auth_krb.c	2010-11-16 08:48:20.885889903 +0100
-+++ cyrus-imapd-2.4.4/lib/auth_krb.c	2010-11-16 08:48:37.756232781 +0100
-@@ -341,6 +341,15 @@
-     free((char *)auth_state);
- }
- 
-+static char *mycanonuser(struct auth_state *auth_state)
-+{
-+    if (auth_state)
-+       return auth_state->userid;
-+
-+    return NULL;
-+}
-+
-+
- #else /* HAVE_KRB */
- 
- static int mymemberof(
-@@ -372,6 +381,13 @@
- 	fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
- }
- 
-+static char *mycanonuser(
-+    struct auth_state *auth_state __attribute__((unused)))
-+{
-+        fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
-+}
-+
-+
- #endif
- 
- struct auth_mech auth_krb = 
-@@ -382,4 +398,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
-diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_krb5.c cyrus-imapd-2.4.4/lib/auth_krb5.c
---- cyrus-imapd-2.4.4.orig/lib/auth_krb5.c	2010-11-16 08:48:20.877858205 +0100
-+++ cyrus-imapd-2.4.4/lib/auth_krb5.c	2010-11-16 08:48:37.756232781 +0100
-@@ -199,6 +199,14 @@
-     free(auth_state);
- }
- 
-+static char *mycanonuser(struct auth_state *auth_state)
-+{
-+    if (auth_state)
-+       return auth_state->userid;
-+
-+    return NULL;
-+}
-+
- #else /* HAVE_GSSAPI_H */
- 
- static int mymemberof(
-@@ -230,6 +238,13 @@
- 	fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
- }
- 
-+static char *mycanonuser(
-+    struct auth_state *auth_state __attribute__((unused)))
-+{
-+        fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
-+	return NULL;
-+}
-+
- #endif
- 
- struct auth_mech auth_krb5 = 
-@@ -240,4 +255,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
-diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_pts.c cyrus-imapd-2.4.4/lib/auth_pts.c
---- cyrus-imapd-2.4.4.orig/lib/auth_pts.c	2010-11-16 08:48:20.877858205 +0100
-+++ cyrus-imapd-2.4.4/lib/auth_pts.c	2010-11-16 08:48:37.757236534 +0100
-@@ -512,6 +512,14 @@
-     free(auth_state);
- }
- 
-+static char *mycanonuser(struct auth_state *auth_state)
-+{
-+    if (auth_state)
-+       return auth_state->userid.id;
-+
-+    return NULL;
-+}
-+
- struct auth_mech auth_pts = 
- {
-     "pts",		/* name */
-@@ -520,4 +528,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
-diff -Naur cyrus-imapd-2.4.4.orig/lib/auth_unix.c cyrus-imapd-2.4.4/lib/auth_unix.c
---- cyrus-imapd-2.4.4.orig/lib/auth_unix.c	2010-11-16 08:48:20.880870301 +0100
-+++ cyrus-imapd-2.4.4/lib/auth_unix.c	2010-11-16 08:48:37.757236534 +0100
-@@ -315,6 +315,16 @@
-     free((char *)auth_state);
- }
- 
-+static char *mycanonuser(auth_state)
-+    struct auth_state *auth_state;
-+{
-+    if (auth_state)
-+         return auth_state->userid;
-+
-+    return NULL;
-+}
-+
-+
- 
- struct auth_mech auth_unix = 
- {
-@@ -324,4 +334,5 @@
-     &mymemberof,
-     &mynewstate,
-     &myfreestate,
-+    &mycanonuser,
- };
-diff -Naur cyrus-imapd-2.4.4.orig/lib/imapoptions cyrus-imapd-2.4.4/lib/imapoptions
---- cyrus-imapd-2.4.4.orig/lib/imapoptions	2010-11-16 08:48:20.878862238 +0100
-+++ cyrus-imapd-2.4.4/lib/imapoptions	2010-11-16 08:48:37.759244877 +0100
-@@ -245,6 +245,55 @@
- /* Time in seconds. Any imap command that takes longer than this
-    time is logged. */
- 
-+{ "createonpost", 0, SWITCH }
-+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist,
-+   then the INBOX is automatically created by lmtpd. */
-+
-+{ "autocreateinboxfolders", NULL, STRING }
-+/* If a user does not have an INBOX created then the INBOX as well as some INBOX 
-+   subfolders are created under two conditions.
-+     1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value)
-+     2. A message arrives for the user through the LMTPD protocol.(createonpost option must be yes)
-+   autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that 
-+   are automatically created by the server under the previous two situations. */
-+
-+{ "autosubscribeinboxfolders", NULL, STRING }
-+/* A list of folder names, separated by "|", that the users get automatically subscribed to, 
-+   when their INBOX is created. These folder names must have been included in the 
-+   autocreateinboxfolders option of the imapd.conf. */
-+
-+{ "autosubscribesharedfolders", NULL, STRING }
-+/* A list of shared folders (bulletin boards), separated by "|", that the users get
-+   automatically subscribed to, after their INBOX is created. The shared folder must 
-+   have been created and the user must have the required permissions to get subscribed 
-+   to it. Otherwise, subscribing to the shared folder fails. */
-+
-+{ "autosubscribe_all_sharedfolders", 0, SWITCH }
-+/* If set to yes, the user is automatically subscribed to all shared folders, one has permission
-+   to subscribe to. */
-+
-+{ "autocreate_sieve_script", NULL, STRING }
-+/* The full path of a file that contains a sieve script. This script automatically becomes a
-+   user's initial default sieve filter script. When this option is not defined, no default 
-+   sieve filter is created. The file must be readable by the cyrus daemon. */
-+
-+{ "autocreate_sieve_compiledscript", NULL, STRING }
-+/* The full path of a file that contains a compiled in bytecode sieve script. This script 
-+   automatically becomes a user's initial default sieve filter script.  If this option is 
-+   not specified, or the filename doesn't exist then the script defined by 
-+   autocreate_sieve_script is compiled on the fly and installed as the user's default
-+   sieve script */
-+
-+{ "generate_compiled_sieve_script", 0, SWITCH }
-+/* If set to yes and no compiled sieve script file exists, the sieve script which is 
-+   compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript 
-+   option points to. In order a compiled script to be generated, autocreate_sieve_script and 
-+   autocreate_sieve_compiledscript must have valid values */
-+
-+{ "autocreate_users", "anyone", STRING }
-+/* A space separated list of users and/or groups that are allowed their INBOX to be
-+   automatically created. */
-+
- { "configdirectory", NULL, STRING }
- /* The pathname of the IMAP configuration directory.  This field is
-    required. */
-diff -Naur cyrus-imapd-2.4.4.orig/notifyd/Makefile.in cyrus-imapd-2.4.4/notifyd/Makefile.in
---- cyrus-imapd-2.4.4.orig/notifyd/Makefile.in	2010-11-16 08:48:20.897937729 +0100
-+++ cyrus-imapd-2.4.4/notifyd/Makefile.in	2010-11-16 08:48:37.769295255 +0100
-@@ -71,10 +71,11 @@
- SERVICE=../master/service.o
- 
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
--DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
- PURIFY=/usr/local/bin/purify
- PUREOPT=-best-effort
-diff -Naur cyrus-imapd-2.4.4.orig/notifyd/notifyd.c cyrus-imapd-2.4.4/notifyd/notifyd.c
---- cyrus-imapd-2.4.4.orig/notifyd/notifyd.c	2010-11-16 08:48:20.897937729 +0100
-+++ cyrus-imapd-2.4.4/notifyd/notifyd.c	2010-11-16 08:48:37.770300684 +0100
-@@ -98,7 +98,7 @@
- 
- #define NOTIFY_MAXSIZE 8192
- 
--int do_notify()
-+static int do_notify()
- {
-     struct sockaddr_un sun_data;
-     socklen_t sunlen = sizeof(sun_data);
-diff -Naur cyrus-imapd-2.4.4.orig/ptclient/Makefile.in cyrus-imapd-2.4.4/ptclient/Makefile.in
---- cyrus-imapd-2.4.4.orig/ptclient/Makefile.in	2010-11-16 08:48:20.800544944 +0100
-+++ cyrus-imapd-2.4.4/ptclient/Makefile.in	2010-11-16 08:48:37.770300684 +0100
-@@ -57,10 +57,11 @@
- AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
- AFS_LIBS = @AFS_LIBS@
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
- LIB_SASL = @LIB_SASL@
- LIB_WRAP = @LIB_WRAP@
--DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ 
- UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
- 
- LDAP_LIBS=@LDAP_LIBS@
diff --git a/network/cyrus-imapd/rc.cyrus-imapd b/network/cyrus-imapd/rc.cyrus-imapd
index c148183bbf..99cd26b926 100644
--- a/network/cyrus-imapd/rc.cyrus-imapd
+++ b/network/cyrus-imapd/rc.cyrus-imapd
@@ -1,10 +1,11 @@
 #!/bin/sh
 # Start/stop/restart the Cyrus IMAP daemon.
-# Written by mario <mario@slackverse.org>.
+# Written by Mario Preksavec <mario@slackware.hr>
 
 cyrus_start() {
   if [ -x /usr/libexec/cyrus/master ]; then
-    if [ -f /var/run/cyrus-master.pid ] && kill -0 $(cat /var/run/cyrus-master.pid) 2> /dev/null; then
+    if [ -f /var/run/cyrus-master.pid ] \
+    && kill -0 $(cat /var/run/cyrus-master.pid) 2> /dev/null; then
       echo "Cyrus IMAP daemon already running."
       return
     fi
@@ -16,7 +17,8 @@ cyrus_start() {
 cyrus_stop() {
   if [ -f /var/run/cyrus-master.pid ]; then
     echo "Stopping Cyrus IMAP daemon"
-    kill $(cat /var/run/cyrus-master.pid) 2> /dev/null && rm -f /var/run/cyrus-master.pid
+    kill $(cat /var/run/cyrus-master.pid) 2> /dev/null \
+    && rm -f /var/run/cyrus-master.pid
   else
     echo "Cyrus IMAP daemon already stopped."
   fi
diff --git a/network/darkhttpd/darkhttpd.SlackBuild b/network/darkhttpd/darkhttpd.SlackBuild
index e542ef3bb0..7483206047 100644
--- a/network/darkhttpd/darkhttpd.SlackBuild
+++ b/network/darkhttpd/darkhttpd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=darkhttpd
-VERSION=${VERSION:-1.10}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/darkhttpd/darkhttpd.info b/network/darkhttpd/darkhttpd.info
index 1dad7ffae3..b4aee76b75 100644
--- a/network/darkhttpd/darkhttpd.info
+++ b/network/darkhttpd/darkhttpd.info
@@ -1,8 +1,8 @@
 PRGNAM="darkhttpd"
-VERSION="1.10"
+VERSION="1.11"
 HOMEPAGE="https://unix4lyfe.org/darkhttpd/"
-DOWNLOAD="https://unix4lyfe.org/darkhttpd/darkhttpd-1.10.tar.bz2"
-MD5SUM="652968ca104e57235519cadd2d6fdda2"
+DOWNLOAD="https://unix4lyfe.org/darkhttpd/darkhttpd-1.11.tar.bz2"
+MD5SUM="050e5a821b1fa71a82c6efba7fda1323"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/davmail/README b/network/davmail/README
new file mode 100644
index 0000000000..46905d5527
--- /dev/null
+++ b/network/davmail/README
@@ -0,0 +1,7 @@
+DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange gateway
+allowing users to use any mail/calendar client with an Exchange
+server, even from the internet or behind a firewall through Outlook
+Web Access. DavMail now includes an LDAP gateway to Exchange global
+address book and user personal contacts to allow recipient address
+completion in mail compose window and full calendar support with
+attendees free/busy display.
diff --git a/network/davmail/davmail.SlackBuild b/network/davmail/davmail.SlackBuild
new file mode 100644
index 0000000000..44a2109bf6
--- /dev/null
+++ b/network/davmail/davmail.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for DavMail
+
+# Copyright (c) 2015 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Written by Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+
+PRGNAM=davmail
+VERSION=${VERSION:-4.6.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=x86 ;;
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-linux-$ARCH-$VERSION*
+tar xvf $CWD/$PRGNAM-linux-$ARCH-$VERSION*.tgz
+cd $PRGNAM-linux-$ARCH-$VERSION*
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/$PRGNAM/lib
+
+cp -a davmail.jar $PKG/usr/share/$PRGNAM
+cp -a lib $PKG/usr/share/$PRGNAM
+
+mkdir -p $PKG/usr/share/applications
+
+unzip -q davmail.jar tray2.png tray32.png tray48.png
+
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps/
+
+install -Dm644 tray2.png $PKG/usr/share/icons/hicolor/16x16/apps/davmail.png
+install -Dm644 tray32.png $PKG/usr/share/icons/hicolor/32x32/apps/davmail.png
+install -Dm644 tray48.png $PKG/usr/share/icons/hicolor/48x48/apps/davmail.png
+
+cp $CWD/davmail.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/usr/bin
+install -Dm755 $CWD/davmail.sh $PKG/usr/share/davmail
+( cd $PKG/usr/bin ; ln -s /usr/share/davmail/davmail.sh davmail)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/davmail/davmail.desktop b/network/davmail/davmail.desktop
new file mode 100644
index 0000000000..7b806b006a
--- /dev/null
+++ b/network/davmail/davmail.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=DavMail
+GenericName=DavMail
+Comment=DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
+Categories=Network;
+Exec=davmail
+Icon=davmail
+Terminal=false
+Type=Application
diff --git a/network/davmail/davmail.info b/network/davmail/davmail.info
new file mode 100644
index 0000000000..3e47b5f9d2
--- /dev/null
+++ b/network/davmail/davmail.info
@@ -0,0 +1,10 @@
+PRGNAM="davmail"
+VERSION="4.6.2"
+HOMEPAGE="http://davmail.sourceforge.net"
+DOWNLOAD="http://sourceforge.net/projects/davmail/files/davmail/4.6.2/davmail-linux-x86-4.6.2-2377.tgz"
+MD5SUM="fc7f8b95b6d1f3206194cadc706d913d"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/davmail/files/davmail/4.6.2/davmail-linux-x86_64-4.6.2-2377.tgz"
+MD5SUM_x86_64="86fcfa8d651b4bb2a3512db839c75900"
+REQUIRES="jdk"
+MAINTAINER="Giuseppe Di Terlizzi"
+EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/network/davmail/davmail.sh b/network/davmail/davmail.sh
new file mode 100644
index 0000000000..c41a4fde7c
--- /dev/null
+++ b/network/davmail/davmail.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+DAVMAIL_HOME=/usr/share/davmail
+for name in $DAVMAIL_HOME/lib/*.jar ; do
+  CP=$CP:$name
+done
+CP=$CP:$DAVMAIL_HOME/davmail.jar
+exec "$JAVA_HOME/bin/java" -cp $CP 'davmail.DavGateway' "$@"
diff --git a/network/davmail/slack-desc b/network/davmail/slack-desc
new file mode 100644
index 0000000000..4afeafab1a
--- /dev/null
+++ b/network/davmail/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name,
+# and the '|'on the right side marks the last column you can put a
+# character in. You must make exactly 11 lines for the formatting to be
+# correct. It's also customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+davmail: DavMail (POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway)
+davmail:
+davmail: DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange gateway
+davmail: allowing users to use any mail/calendar client with an Exchange
+davmail: server, even from the internet or behind a firewall through Outlook
+davmail: Web Access. DavMail now includes an LDAP gateway to Exchange global
+davmail: address book and user personal contacts to allow recipient address
+davmail: completion in mail compose window and full calendar support with
+davmail: attendees free/busy display.
+davmail:
+davmail: Home-Page: http://davmail.sourceforge.net/  
diff --git a/network/deluge/deluge.SlackBuild b/network/deluge/deluge.SlackBuild
index 6e9f9347fd..418aeaa60c 100644
--- a/network/deluge/deluge.SlackBuild
+++ b/network/deluge/deluge.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=deluge
-VERSION=${VERSION:-1.3.6}
+VERSION=${VERSION:-1.3.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/deluge/deluge.info b/network/deluge/deluge.info
index 70b6b5b294..92e6393056 100644
--- a/network/deluge/deluge.info
+++ b/network/deluge/deluge.info
@@ -1,10 +1,10 @@
 PRGNAM="deluge"
-VERSION="1.3.6"
+VERSION="1.3.12"
 HOMEPAGE="http://www.deluge-torrent.org/"
-DOWNLOAD="http://download.deluge-torrent.org/source/deluge-1.3.6.tar.bz2"
-MD5SUM="dfcf6023ac860e5f0beba8dfa5ee4f0c"
+DOWNLOAD="http://download.deluge-torrent.org/source/deluge-1.3.12.tar.bz2"
+MD5SUM="d37714daf1e859e570a9446baa027dd3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Mako libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Gerardo Zamduio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/dnscrypt-wrapper/Makefile.patch b/network/dnscrypt-wrapper/Makefile.patch
deleted file mode 100644
index f3ad6ca159..0000000000
--- a/network/dnscrypt-wrapper/Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2015-06-20 10:56:49.000000000 -0400
-+++ Makefile	2015-06-22 11:05:36.003617280 -0400
-@@ -165,7 +165,6 @@
- 	@$(MAKE) -C argparse libargparse.a
- 
- argparse/argparse.h:
--	git submodule update --init argparse
- 
- $(LIB_OBJS): $(LIB_H)
- 
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.8 b/network/dnscrypt-wrapper/dnscrypt-wrapper.8
index 8f800106b1..3e5bca2c9a 100644
--- a/network/dnscrypt-wrapper/dnscrypt-wrapper.8
+++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH DNSCRYPT-WRAPPER "8" "July 2015" "dnscrypt-wrapper 0.1.17" "System Administration Utilities"
+.TH DNSCRYPT-WRAPPER "8" "August 2015" "dnscrypt-wrapper 0.2" "System Administration Utilities"
 .SH NAME
 dnscrypt-wrapper \- A server-side DNSCrypt proxy that adds DNSCrypt support to any name resolver.
 .SH SYNOPSIS
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
index a22ea80be0..4c7a9a29de 100644
--- a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
+++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
@@ -26,7 +26,7 @@
 # suggestion.
 
 PRGNAM=dnscrypt-wrapper
-VERSION=${VERSION:-0.1.17}
+VERSION=${VERSION:-0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,27 +57,17 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# argparse is a git submodule required for building...
-ARGPARSEVERSION=${ARGPARSEVERSION:-e1277bf1e3f47663fad54f84ca723db7688630d4}
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION argparse-$ARGPARSEVERSION
+rm -rf $PRGNAM-$VERSION
 if [ -e $CWD/v$VERSION.tar.gz ]; then
   tar xvf $CWD/v$VERSION.tar.gz
 else
   tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 fi
-if [ -e $CWD/$ARGPARSEVERSION.tar.gz ]; then
-  tar xvf $CWD/$ARGPARSEVERSION.tar.gz
-else
-  tar xvf $CWD/argparse-$ARGPARSEVERSION.tar.gz
-fi
-# argparse source is expected in dnscrypt source...
-mv argparse-$ARGPARSEVERSION/* $PRGNAM-$VERSION/argparse/
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -86,10 +76,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patch out git submodule init. Already have argparse anyway, and this is not
-# a git repo (so it would fail)...
-patch -p0 < $CWD/Makefile.patch
-
 make configure
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.info b/network/dnscrypt-wrapper/dnscrypt-wrapper.info
index c31fd24114..6b6b45d16c 100644
--- a/network/dnscrypt-wrapper/dnscrypt-wrapper.info
+++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.info
@@ -1,10 +1,8 @@
 PRGNAM="dnscrypt-wrapper"
-VERSION="0.1.17"
+VERSION="0.2"
 HOMEPAGE="https://github.com/Cofyc/dnscrypt-wrapper"
-DOWNLOAD="https://github.com/Cofyc/dnscrypt-wrapper/archive/v0.1.17.tar.gz \
-          https://github.com/Cofyc/argparse/archive/e1277bf1e3f47663fad54f84ca723db7688630d4.tar.gz"
-MD5SUM="68612a6ba9d333899713d9bf45e3e268 \
-        761c42af45d67aa2a58f27d32dd56240"
+DOWNLOAD="https://github.com/Cofyc/dnscrypt-wrapper/archive/v0.2.tar.gz"
+MD5SUM="82a5cdc237be25309544db64cbd4c87b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libsodium"
diff --git a/network/dokuwiki/doinst.sh b/network/dokuwiki/doinst.sh
new file mode 100644
index 0000000000..698828834d
--- /dev/null
+++ b/network/dokuwiki/doinst.sh
@@ -0,0 +1,5 @@
+sed -i "s:#Include /etc/httpd/mod_php.conf:Include /etc/httpd/mod_php.conf:g" etc/httpd/httpd.conf 
+grep -q -e 'Dokuwiki' etc/httpd/httpd.conf || cat >> etc/httpd/httpd.conf <<'EOF'
+# Dokuwiki
+Include /etc/httpd/extra/httpd-dokuwiki.conf
+EOF
diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild
index 13d2926e6a..89f16ce8b5 100644
--- a/network/dokuwiki/dokuwiki.SlackBuild
+++ b/network/dokuwiki/dokuwiki.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for dokuwiki
 
-# Copyright 2014  Giorgio Peron <giorgio.peron@gmail.com>, Campodarsego, PD, Italy
+# Copyright 2015  Giorgio Peron <giorgio.peron@gmail.com>, Campodarsego, PD, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=${PRGNAM:-dokuwiki}
-VERSION=${VERSION:-20140505a}
-SRCVERSION=${SRCVERSION:-2014-05-05a}
+VERSION=${VERSION:-20150810a}
+SRCVERSION=${SRCVERSION:-2015-08-10a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,11 +50,17 @@ mkdir -p $PKG/etc/httpd/extra
 cat > $PKG/etc/httpd/extra/httpd-dokuwiki.conf <<'EOF'
 Alias /dokuwiki /srv/www/dokuwiki
 <Directory /srv/www/dokuwiki/>
+    DirectoryIndex index.php
     Options +FollowSymLinks
     AllowOverride All
     Require all granted
     php_admin_value open_basedir "/srv/www/:/srv/www/dokuwiki/lib/"
 </Directory>
+<LocationMatch "/srv/www/dokuwiki/(data|conf|bin|inc)/">
+    order allow,deny
+    deny from all
+    satisfy all
+</LocationMatch>
 EOF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -62,6 +68,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dokuwiki/dokuwiki.info b/network/dokuwiki/dokuwiki.info
index 7cf72f0fae..0de76b4903 100644
--- a/network/dokuwiki/dokuwiki.info
+++ b/network/dokuwiki/dokuwiki.info
@@ -1,8 +1,8 @@
 PRGNAM="dokuwiki"
-VERSION="20140505a"
+VERSION="20150810a"
 HOMEPAGE="https://www.dokuwiki.org/dokuwiki"
-DOWNLOAD="http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-05-05a.tgz"
-MD5SUM="fb44f206d1550921c640757599e90bb9"
+DOWNLOAD="http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2015-08-10a.tgz"
+MD5SUM="a4b8ae00ce94e42d4ef52dd8f4ad30fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/dovecot-pigeonhole/README b/network/dovecot-pigeonhole/README
index b3c26aec1b..84995d1dd3 100644
--- a/network/dovecot-pigeonhole/README
+++ b/network/dovecot-pigeonhole/README
@@ -1,21 +1,21 @@
-Pigeonhole is the name of the project that adds support for
-the Sieve language (RFC 5228) and the ManageSieve protocol
-(RFC 5804) to the Dovecot Secure IMAP/POP3 Server.
+Pigeonhole is the name of the project that adds support for the Sieve language
+(RFC 5228) and the ManageSieve protocol (RFC 5804) to the Dovecot Secure
+IMAP/POP3 Server.
 
-Sieve language specification and scripts provide mail filtering
-capabilities on the server side for individual users.  Each user
-can edit and upload (using ManageSieve) sieve scripts to filter
-mails based on supported Sieve language extensions by pigeonhole.
+Sieve language specification and scripts provide mail filtering capabilities on
+the server side for individual users. Each user can edit and upload (using
+ManageSieve) sieve scripts to filter mail based on supported Sieve language
+extensions within pigeonhole.
 
-Pigeonhole project provides Sieve support as a plugin to Dovecot's
-Local Delivery Agent (LDA).
+The Pigeonhole project provides Sieve support as a plugin to Dovecot's Local
+Delivery Agent (LDA). The ManageSieve protocol is provided is an additional
+service, next to Dovecot's own POP3 and IMAP services.
 
-Configuration:
-sieve and managesieve config files are placed with dovecot
-documentation.  Copy over 20-managesieve.conf and 90-sieve.conf
-to /etc/dovecot/conf.d and edit accordingly.
+To configure pigeonhole, use sieve and managesieve config files installed with
+dovecot documentation. Copy 20-managesieve.conf and 90-sieve.conf files to
+/etc/dovecot/conf.d and edit them according to your needs.
 
-For additional configuration help, see:
+For additional help with configuration, see:
 
-http://wiki2.dovecot.org/Pigeonhole/Sieve
-http://wiki2.dovecot.org/Pigeonhole/ManageSieve
+  http://wiki2.dovecot.org/Pigeonhole/Sieve
+  http://wiki2.dovecot.org/Pigeonhole/ManageSieve
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
index 7aa803eedd..d7d5b39cc3 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
@@ -1,34 +1,30 @@
 #!/bin/sh
 
 # Slackware Package Build Script for pigeonhole
-# Home Page: http://pigeonhole.dovecot.org/
 
-# Copyright (c) 2010-2013, Nishant Limbachia, Hoffman Estates, IL, USA
-# <nishant _AT_ mnspace _DOT_ net>
+# Copyright 2010, 2011, 2013  Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright 2013, 2014, 2015  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
-
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
-# 1. Redistributions of script must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Mario Preksavec <mario@slackware.hr>
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="dovecot-pigeonhole"
-VERSION=${VERSION:-0.4.3}
+VERSION=${VERSION:-0.4.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,13 +65,11 @@ cd $TMP
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
 chown -R root.root .
-
-find -L . \
-\( -perm 664 -o -perm 666 -o -perm 640 -o -perm 600 -o -perm 440 -o -perm 444 \
-  -o -perm 400 \) -exec chmod 644 {} \;
 find -L . \
-\( -perm 777 -o -perm 755 -o -perm 750 -o -perm 711 -o -perm 700 -o -perm 555 \
-  -o -perm 511 -o -perm 500 \) -exec chmod 755 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
   ./configure \
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.info b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
index 9206e8b358..03298b90e2 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.info
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
@@ -1,10 +1,10 @@
 PRGNAM="dovecot-pigeonhole"
-VERSION="0.4.3"
+VERSION="0.4.9"
 HOMEPAGE="http://pigeonhole.dovecot.org/"
-DOWNLOAD="http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.3.tar.gz"
-MD5SUM="b52858c0016b9ad7dabccf01f0098dbd"
+DOWNLOAD="http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.9.tar.gz"
+MD5SUM="3a2d856c1c50557d098536b687efc5f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dovecot"
-MAINTAINER="Nishant Limbachia"
-EMAIL="nishant@mnspace.net"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/dovecot-pigeonhole/slack-desc b/network/dovecot-pigeonhole/slack-desc
index e2cac2e80a..4c59c2bf9f 100644
--- a/network/dovecot-pigeonhole/slack-desc
+++ b/network/dovecot-pigeonhole/slack-desc
@@ -7,11 +7,11 @@
                   |-----handy-ruler------------------------------------------------------|
 dovecot-pigeonhole: dovecot-pigeonhole (Sieve & Managesieve support for Dovecot)
 dovecot-pigeonhole:
-dovecot-pigeonhole: dovecot-pigeonhole project provides Sieve language support and
-dovecot-pigeonhole: ManageSieve protocol support for Dovecot imap/pop3 server.
-dovecot-pigeonhole:
-dovecot-pigeonhole: Home Page: http://pigeonhole.dovecot.org/
+dovecot-pigeonhole: Pigeonhole is the name of the project that adds support for the Sieve
+dovecot-pigeonhole: language and the ManageSieve protocol to the Dovecot Secure IMAP/POP3
+dovecot-pigeonhole: Server.
 dovecot-pigeonhole:
+dovecot-pigeonhole: Homepage: http://pigeonhole.dovecot.org/
 dovecot-pigeonhole:
 dovecot-pigeonhole:
 dovecot-pigeonhole:
diff --git a/network/dovecot/README b/network/dovecot/README
index 533ab1e36a..16e081ed54 100644
--- a/network/dovecot/README
+++ b/network/dovecot/README
@@ -1,10 +1,12 @@
-This script builds dovecot with support for SSL. As such, you must have
-openssl installed - openssl-solibs is not enough in itself to meet this
-requirement.  Additionally, dovecot will be compiled with POP3 support.
+Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like
+systems, written with security primarily in mind. Dovecot is an excellent choice
+for both small and large installations. It's fast, simple to set up, requires no
+special administration and it uses very little memory.
 
-You should create a dovecot user to run the login processes on your server. 
-Something like this should work:
-[root@host] # groupadd -g 202 dovecot
-[root@host] # useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot
+This script builds dovecot with support for SSL. As such, you must have openssl
+installed - openssl-solibs is not enough in itself to meet this requirement.
 
-See the documentation in /usr/doc/dovecot-2.2.13/ to get started.
+This script doesn't add dovecot users and groups, instead it offers sane defaults
+that won't conflict with system users and groups, and other scripts from the SBo.
+
+See the documentation in /usr/doc/dovecot-2.2.19/ to get started.
diff --git a/network/dovecot/doinst.sh b/network/dovecot/doinst.sh
index f39fc6ebd4..03c21fc848 100644
--- a/network/dovecot/doinst.sh
+++ b/network/dovecot/doinst.sh
@@ -10,6 +10,7 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
+
 preserve_perms() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -20,5 +21,6 @@ preserve_perms() {
   fi
   config $NEW
 }
+
 preserve_perms etc/rc.d/rc.dovecot.new
 
diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
index 0b804cc3eb..dd83424220 100644
--- a/network/dovecot/dovecot.SlackBuild
+++ b/network/dovecot/dovecot.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright 2006, Alan Hicks, Lizella, GA
+# Copyright 2006, 2010  Alan Hicks, Lizella, GA
+# Copyright 2013, 2014, 2015  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +21,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Mario Preksavec <mario@slackware.hr>
-
 PRGNAM=dovecot
-VERSION=${VERSION:-2.2.13}
+VERSION=${VERSION:-2.2.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/dovecot/dovecot.info b/network/dovecot/dovecot.info
index 4b68009b5c..510afbe531 100644
--- a/network/dovecot/dovecot.info
+++ b/network/dovecot/dovecot.info
@@ -1,10 +1,10 @@
 PRGNAM="dovecot"
-VERSION="2.2.13"
+VERSION="2.2.19"
 HOMEPAGE="http://www.dovecot.org/"
-DOWNLOAD="http://www.dovecot.org/releases/2.2/dovecot-2.2.13.tar.gz"
-MD5SUM="a3eb1c0b1822c4f2b0fe9247776baa71"
+DOWNLOAD="http://www.dovecot.org/releases/2.2/dovecot-2.2.19.tar.gz"
+MD5SUM="95591b6556413edc2f0b160fb469d04c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alan Hicks"
-EMAIL="alan@lizella.net"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild
index cac600b6cd..0282241143 100644
--- a/network/dropbox/dropbox.SlackBuild
+++ b/network/dropbox/dropbox.SlackBuild
@@ -23,6 +23,12 @@
 
 # Public changelog: https://www.dropbox.com/release_notes
 # Changelog:
+# 23/Dec/2015 * Updated to latest version 3.12.6
+# 03/Nov/2015 * Updated to latest version 3.10.9
+# 02/Nov/2015 * Updated to latest version 3.10.9
+# 18/Oct/2015 * Updated to latest version 3.10.8
+# 06/Oct/2015 * Updated to latest version 3.10.7
+# 23/Aug/2015 * Updated to latest version 3.8.8
 # 26/Jul/2015 * Updated to latest version 3.8.5
 #             * Non-Linux users get to use gmail integration.
 #             * Most DEs I have tested have working tray icons, XFCE's
@@ -89,7 +95,7 @@
 PRGNAM=dropbox
 PACKNAM=dropbox-lnx
 
-VERSION=${VERSION:-3.8.5}
+VERSION=${VERSION:-3.12.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info
index b5dc9135e0..34bca60637 100644
--- a/network/dropbox/dropbox.info
+++ b/network/dropbox/dropbox.info
@@ -1,10 +1,10 @@
 PRGNAM="dropbox"
-VERSION="3.8.5"
+VERSION="3.12.6"
 HOMEPAGE="http://www.dropbox.com"
-DOWNLOAD="https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.x86-3.8.5.tar.gz"
-MD5SUM="f3d83c0b893ce24d5b31f63fc916fe99"
-DOWNLOAD_x86_64="https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.x86_64-3.8.5.tar.gz"
-MD5SUM_x86_64="e78eb2d14ec6be7b127a28fe8f733111"
+DOWNLOAD="https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.x86-3.12.6.tar.gz"
+MD5SUM="0006713c6bb9ab326a8261fb2bb9be8d"
+DOWNLOAD_x86_64="https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.x86_64-3.12.6.tar.gz"
+MD5SUM_x86_64="d0eaaeb073682b63641caad756e37e2f"
 REQUIRES=""
 MAINTAINER="Amit Ugol"
 EMAIL="amit.ugol@gmail.com"
diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild
index f55dbdb26b..764025181b 100644
--- a/network/dsniff/dsniff.SlackBuild
+++ b/network/dsniff/dsniff.SlackBuild
@@ -26,7 +26,7 @@
 PRGNAM=dsniff
 VERSION=${VERSION:-2.4b1}
 SRCVER=${SRCVER:-2.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -76,7 +76,10 @@ find -L . \
 # This patch adds support for libnet 1.1.x, it's heavily based on Gentoo ebuild
 # which, in turn, is heavily based on Debian patch set. And I added a couple
 # of bits myself in the mix too... - sid77
-patch -p1 < $CWD/libnet11$LIBDIRSUFFIX.patch
+patch -p1 < $CWD/patches/libnet11$LIBDIRSUFFIX.patch
+
+patch -p1 < $CWD/patches/arpspoof-r-switch.patch
+patch -p1 < $CWD/patches/rewrite-and-modernize-POP-decoder.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/dsniff/dsniff.info b/network/dsniff/dsniff.info
index 02e8846cfe..cd49e00221 100644
--- a/network/dsniff/dsniff.info
+++ b/network/dsniff/dsniff.info
@@ -6,5 +6,5 @@ MD5SUM="2f761fa3475682a7512b0b43568ee7d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libnids"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/dsniff/patches/arpspoof-r-switch.patch b/network/dsniff/patches/arpspoof-r-switch.patch
new file mode 100644
index 0000000000..df81ce3241
--- /dev/null
+++ b/network/dsniff/patches/arpspoof-r-switch.patch
@@ -0,0 +1,166 @@
+
+Debian bug #650749
+arpspoof: add -r switch to poison both directions
+
+diff --git a/arpspoof.8 b/arpspoof.8
+index a05b5d3..544e06c 100644
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -9,7 +9,7 @@ intercept packets on a switched LAN
+ .na
+ .nf
+ .fi
+-\fBarpspoof\fR [\fB-i \fIinterface\fR] [\fB-t \fItarget\fR] \fIhost\fR
++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -26,6 +26,9 @@ Specify the interface to use.
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+ on the LAN).
++.IP "\fB\-r\fR"
++Poison both hosts (host and target) to capture traffic in both directions.
++(only valid in conjuntion with \-t)
+ .IP \fIhost\fR
+ Specify the host you wish to intercept packets for (usually the local
+ gateway).
+diff --git a/arpspoof.c b/arpspoof.c
+index 7cdbbf8..f51b699 100644
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -7,6 +7,8 @@
+  * Copyright (c) 1999 Dug Song <dugsong@monkey.org>
+  *
+  * $Id: arpspoof.c,v 1.5 2001/03/15 08:32:58 dugsong Exp $
++ *
++ * Improved 2011 by Stefan Tomanek <stefa@pico.ruhr.de>
+  */
+ 
+ #include "config.h"
+@@ -31,12 +33,13 @@ static libnet_t *l;
+ static struct ether_addr spoof_mac, target_mac;
+ static in_addr_t spoof_ip, target_ip;
+ static char *intf;
++static int poison_reverse;
+ 
+ static void
+ usage(void)
+ {
+ 	fprintf(stderr, "Version: " VERSION "\n"
+-		"Usage: arpspoof [-i interface] [-t target] host\n");
++		"Usage: arpspoof [-i interface] [-t target] [-r] host\n");
+ 	exit(1);
+ }
+ 
+@@ -133,18 +136,30 @@ arp_find(in_addr_t ip, struct ether_addr *mac)
+ static void
+ cleanup(int sig)
+ {
++	int fw = arp_find(spoof_ip, &spoof_mac);
++	int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac);
+ 	int i;
+-	
+-	if (arp_find(spoof_ip, &spoof_mac)) {
+-		for (i = 0; i < 3; i++) {
+-			/* XXX - on BSD, requires ETHERSPOOF kernel. */
++
++	fprintf(stderr, "Cleaning up and re-arping targets...\n");
++	for (i = 0; i < 5; i++) {
++		/* XXX - on BSD, requires ETHERSPOOF kernel. */
++		if (fw) {
+ 			arp_send(l, ARPOP_REPLY,
+ 				 (u_int8_t *)&spoof_mac, spoof_ip,
+ 				 (target_ip ? (u_int8_t *)&target_mac : NULL),
+ 				 target_ip);
++			/* we have to wait a moment before sending the next packet */
++			sleep(1);
++		}
++		if (bw) {
++			arp_send(l, ARPOP_REPLY,
++				 (u_int8_t *)&target_mac, target_ip,
++				 (u_int8_t *)&spoof_mac,
++				 spoof_ip);
+ 			sleep(1);
+ 		}
+ 	}
++
+ 	exit(0);
+ }
+ 
+@@ -156,11 +171,12 @@ main(int argc, char *argv[])
+ 	char pcap_ebuf[PCAP_ERRBUF_SIZE];
+ 	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	int c;
+-	
++
+ 	intf = NULL;
+ 	spoof_ip = target_ip = 0;
+-	
+-	while ((c = getopt(argc, argv, "i:t:h?V")) != -1) {
++	poison_reverse = 0;
++
++	while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			intf = optarg;
+@@ -169,6 +185,9 @@ main(int argc, char *argv[])
+ 			if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ 				usage();
+ 			break;
++		case 'r':
++			poison_reverse = 1;
++			break;
+ 		default:
+ 			usage();
+ 		}
+@@ -178,7 +197,12 @@ main(int argc, char *argv[])
+ 	
+ 	if (argc != 1)
+ 		usage();
+-	
++
++	if (poison_reverse && !target_ip) {
++		errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t).");
++		usage();
++	}
++
+ 	if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
+@@ -191,18 +215,29 @@ main(int argc, char *argv[])
+ 	if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+ 		errx(1, "couldn't arp for host %s",
+ 		     libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
+-	
++
++	if (poison_reverse) {
++		if (!arp_find(spoof_ip, &spoof_mac)) {
++			errx(1, "couldn't arp for spoof host %s",
++			     libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE));
++		}
++	}
++
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+ 	signal(SIGTERM, cleanup);
+-	
++
+ 	for (;;) {
+ 		arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
+ 			 (target_ip ? (u_int8_t *)&target_mac : NULL),
+ 			 target_ip);
++		if (poison_reverse) {
++			arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip);
++		}
++
+ 		sleep(2);
+ 	}
+ 	/* NOTREACHED */
+-	
++
+ 	exit(0);
+ }
+-- 
+1.7.5.4
+
diff --git a/network/dsniff/libnet11.patch b/network/dsniff/patches/libnet11.patch
index 61a98ef91a..61a98ef91a 100644
--- a/network/dsniff/libnet11.patch
+++ b/network/dsniff/patches/libnet11.patch
diff --git a/network/dsniff/libnet1164.patch b/network/dsniff/patches/libnet1164.patch
index be11e6e2e5..be11e6e2e5 100644
--- a/network/dsniff/libnet1164.patch
+++ b/network/dsniff/patches/libnet1164.patch
diff --git a/network/dsniff/patches/rewrite-and-modernize-POP-decoder.patch b/network/dsniff/patches/rewrite-and-modernize-POP-decoder.patch
new file mode 100644
index 0000000000..1203a47c91
--- /dev/null
+++ b/network/dsniff/patches/rewrite-and-modernize-POP-decoder.patch
@@ -0,0 +1,128 @@
+
+Debian bug #647583
+Rewrite and modernize POP decoder
+
+diff --git a/decode_pop.c b/decode_pop.c
+index 04044f5..767da41 100644
+--- a/decode_pop.c
++++ b/decode_pop.c
+@@ -6,6 +6,8 @@
+  * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+  *
+  * $Id: decode_pop.c,v 1.4 2001/03/15 08:33:02 dugsong Exp $
++ *
++ * Rewritten by Stefan Tomanek 2011 <stefan@pico.ruhr.de>
+  */
+ 
+ #include "config.h"
+@@ -45,32 +47,88 @@ int
+ decode_pop(u_char *buf, int len, u_char *obuf, int olen)
+ {
+ 	char *p;
++	char *s;
++	int n;
+ 	int i, j;
++	char *user;
++	char *password;
++	enum {
++		NONE,
++		AUTHPLAIN,
++		AUTHLOGIN,
++		USERPASS
++	} mode = NONE;
++
+ 	
+ 	obuf[0] = '\0';
+ 	
+ 	for (p = strtok(buf, "\r\n"); p != NULL; p = strtok(NULL, "\r\n")) {
+-		if (strncasecmp(p, "AUTH PLAIN", 10) == 0 ||
+-		    strncasecmp(p, "AUTH LOGIN", 10) == 0) {
+-			strlcat(obuf, p, olen);
+-			strlcat(obuf, "\n", olen);
+-			
+-			/* Decode SASL auth. */
+-			for (i = 0; i < 2 && (p = strtok(NULL, "\r\n")); i++) {
+-				strlcat(obuf, p, olen);
+-				j = base64_pton(p, p, strlen(p));
+-				p[j] = '\0';
+-				strlcat(obuf, " [", olen);
+-				strlcat(obuf, p, olen);
+-				strlcat(obuf, "]\n", olen);
++		if (mode == NONE) {
++			user = NULL;
++			password = NULL;
++			if (strncasecmp(p, "AUTH PLAIN", 10) == 0) {
++				mode = AUTHPLAIN;
++				continue;
++			}
++			if (strncasecmp(p, "AUTH LOGIN", 10) == 0) {
++				mode = AUTHLOGIN;
++				continue;
++			}
++			if (strncasecmp(p, "USER ", 5) == 0) {
++				mode = USERPASS;
++				/* the traditional login cuts right to the case,
++				 * so no continue here
++				 */
+ 			}
+ 		}
+-		/* Save regular POP2, POP3 auth info. */
+-		else if (strncasecmp(p, "USER ", 5) == 0 ||
+-			 strncasecmp(p, "PASS ", 5) == 0 ||
+-			 strncasecmp(p, "HELO ", 5) == 0) {
+-			strlcat(obuf, p, olen);
+-			strlcat(obuf, "\n", olen);
++		printf("(%d) %s\n", mode, p);
++		if (mode == USERPASS) {
++			if (strncasecmp(p, "USER ", 5) == 0) {
++				user = &p[5];
++			} else if (strncasecmp(p, "PASS ", 5) == 0) {
++				password = &p[5];
++			}
++		}
++
++		if (mode == AUTHPLAIN) {
++			j = base64_pton(p, p, strlen(p));
++			p[j] = '\0';
++			n = 0;
++			s = p;
++			/* p consists of three parts, divided by \0 */
++			while (s <= &p[j] && n<=3) {
++				if (n == 0) {
++					/* we do not process this portion yet */
++				} else if (n == 1) {
++					user = s;
++				} else if (n == 2) {
++					password = s;
++				}
++				n++;
++				while (*s) s++;
++				s++;
++			}
++		}
++
++		if (mode == AUTHLOGIN) {
++			j = base64_pton(p, p, strlen(p));
++			p[j] = '\0';
++			if (! user) {
++				user = p;
++			} else {
++				password = p;
++				/* got everything we need :-) */
++			}
++		}
++
++		if (user && password) {
++			strlcat(obuf, "\nusername [", olen);
++			strlcat(obuf, user, olen);
++			strlcat(obuf, "] password [", olen);
++			strlcat(obuf, password, olen);
++			strlcat(obuf, "]\n", olen);
++
++			mode = NONE;
+ 		}
+ 	}
+ 	return (strlen(obuf));
+-- 
+1.7.5.4
+
diff --git a/network/econnman/econnman.SlackBuild b/network/econnman/econnman.SlackBuild
index 3171ce67e6..f0078caf98 100644
--- a/network/econnman/econnman.SlackBuild
+++ b/network/econnman/econnman.SlackBuild
@@ -8,7 +8,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/network/elemental-ircd/README b/network/elemental-ircd/README
new file mode 100644
index 0000000000..2603265d13
--- /dev/null
+++ b/network/elemental-ircd/README
@@ -0,0 +1,36 @@
+Elemental-IRCd is a high performance, lightweight, and scalable IRC daemon. It
+is a fork of the now-defunct ShadowIRCD and seeks to continue in the direction
+ShadowIRCD was headed.
+
+An `/etc/rc.d/rc.elemental-ircd` script is supplied which supports
+start/stop/restart/reload, which you can call from your rc.local:
+
+    # /etc/rc.d/rc.local
+    # ==================
+    if [ -x /etc/rc.d/rc.elemental-ircd ]; then
+        /etc/rc.d/rc.elemental-ircd start
+    fi
+
+The `reload` parameter will make an already running ircd reload its
+configuration file.
+
+The elemental-ircd will refuse to run as root, so you need to create a user
+for it:
+    groupadd -g 315 elemental-ircd
+    useradd -u 315 -g 315 -d /var/lib/elemental-ircd elemental-ircd
+By default we name the user `elemental-ircd` with UID 315, and put it in the
+`elemental-ircd` group (GID 315). If you want to give it a different name, uid
+or gid, you can give
+    IRCD_UNAME=elemental-ircd
+    IRCD_UID=315
+    IRCD_GID=315
+different values when running the slackbuild script.
+
+Before starting the ircd, you'll need to create a configuration file for it.
+It should be named `/etc/elemental-ircd/ircd.conf`. In that directory there
+is already an `example.conf` and a `reference.conf`.
+
+Note: elemental-ircd comes with a binary called `/usr/bin/mkpasswd`, which is
+used to create passwords for o-lines, but it creates a conflict with
+`/usr/bin/mkpasswd` from expect, so the `mkpasswd` supplied by elemental-ircd
+is renamed to `ircd-mkpasswd` by the SlackBuild script.
diff --git a/network/elemental-ircd/doinst.sh b/network/elemental-ircd/doinst.sh
new file mode 100644
index 0000000000..e8bbf30335
--- /dev/null
+++ b/network/elemental-ircd/doinst.sh
@@ -0,0 +1,39 @@
+
+IRCD_UNAME="@UNAME@"
+IRCD_UID="@UID@"
+IRCD_GID="@GID@"
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.elemental-ircd.new
+config etc/logrotate.d/elemental-ircd.new
+config etc/elemental-ircd/ircd.motd.new
+
+# Set up user/group permissions
+groupadd -g $IRCD_GID $IRCD_UNAME 2>/dev/null
+useradd -u $IRCD_UID -g $IRCD_GID -d /var/lib/elemental-ircd $IRCD_UNAME 2>/dev/null
+chown $IRCD_UID:$IRCD_GID /var/run/elemental-ircd
+chown $IRCD_UID:$IRCD_GID /var/log/elemental-ircd
+chown $IRCD_UID:$IRCD_GID /var/lib/elemental-ircd
+chown $IRCD_UID:$IRCD_GID /var/state/elemental-ircd
diff --git a/network/elemental-ircd/elemental-ircd.SlackBuild b/network/elemental-ircd/elemental-ircd.SlackBuild
new file mode 100644
index 0000000000..0b8876132d
--- /dev/null
+++ b/network/elemental-ircd/elemental-ircd.SlackBuild
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Slackware build script for elemental-ircd
+
+# Copyright 2015 Andreas Guldstrand <andreas.guldstrand@gmail.com>
+# Copyright 2007-2015 Adis Nezirovic <adis_at_linux.org.ba> for doinst.sh
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="elemental-ircd"
+VERSION=${VERSION:-6.6.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+IRCD_UID=${IRCD_UID:-315}
+IRCD_GID=${IRCD_GID:-315}
+IRCD_UNAME=${IRCD_UNAME:-elemental-ircd}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/$PRGNAM \
+  --localstatedir=/var/state \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-helpdir="/usr/doc/$PRGNAM-$VERSION/help" \
+  --build=$ARCH-slackware-linux \
+  --enable-ipv6 \
+  --enable-epoll \
+  --with-logdir="/var/log/$PRGNAM" \
+  --with-rundir=/var/run
+
+make
+make install DESTDIR=$PKG
+
+# /usr/bin/mkpasswd already exists in expect, so rename this one
+mv $PKG/usr/bin/mkpasswd $PKG/usr/bin/ircd-mkpasswd
+
+# Rename /etc/elemental-ircd/ircd.motd to .new so we don't clobber it
+mv $PKG/etc/$PRGNAM/ircd.motd $PKG/etc/$PRGNAM/ircd.motd.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTING.md CREDITS Dockerfile INSTALL LICENSE NEWS README.md TODO.markdown \
+  doc/*.txt doc/example.conf doc/Hybrid-team doc/Ratbox-team doc/README.cidr_bans \
+  doc/reference.charybdis.conf doc/reference.conf doc/server-version-info \
+  doc/Tao-of-IRC.940110 doc/technical tools/README.mkpasswd \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a extensions/README $PKG/usr/doc/$PRGNAM-$VERSION/README.extensions
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
+
+# Create /var/lib/elemental-ircd directory
+mkdir -p $PKG/var/lib/$PRGNAM
+
+# Copy rc.elemental-ircd into /etc/rc.d
+mkdir -p $PKG/etc/rc.d
+sed -e "s/@USER@/$IRCD_UNAME/" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
+
+# Copy logrotate script into /etc/logrotate.d
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
+
+# Copy slackware-specific example conf to /etc/elemental-ircd
+mkdir -p $PKG/etc/$PRGNAM
+sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \
+    $CWD/slackware.conf > $PKG/etc/$PRGNAM/slackware.conf
+
+# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s/@UNAME@/$IRCD_UNAME/" \
+    -e "s/@UID@/$IRCD_UID/" \
+    -e "s/@GID@/$IRCD_GID/" \
+    $CWD/doinst.sh > $PKG/install/doinst.sh
+chmod 755 $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/elemental-ircd/elemental-ircd.info b/network/elemental-ircd/elemental-ircd.info
new file mode 100644
index 0000000000..404b9e465b
--- /dev/null
+++ b/network/elemental-ircd/elemental-ircd.info
@@ -0,0 +1,10 @@
+PRGNAM="elemental-ircd"
+VERSION="6.6.3"
+HOMEPAGE="http://elemental-ircd.com/"
+DOWNLOAD="https://github.com/Elemental-IRCd/elemental-ircd/archive/elemental-ircd-6.6.3.tar.gz"
+MD5SUM="4e0aa3b2692252a6b467e07f1de8ab34"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andreas Guldstrand"
+EMAIL="andreas.guldstrand@gmail.com"
diff --git a/network/elemental-ircd/elemental-ircd.logrotate b/network/elemental-ircd/elemental-ircd.logrotate
new file mode 100644
index 0000000000..16c989becc
--- /dev/null
+++ b/network/elemental-ircd/elemental-ircd.logrotate
@@ -0,0 +1,15 @@
+/var/log/elemental-ircd/* {
+    daily
+    rotate 7
+    copytruncate
+    delaycompress
+    compress
+    notifempty
+    missingok
+    postrotate
+        if [ -x /etc/rc.d/rc.elemental-ircd ]
+        then
+            /etc/rc.d/rc.elemental-ircd reload > /dev/null 2>&1
+        fi
+    endscript
+}
diff --git a/network/elemental-ircd/rc.elemental-ircd b/network/elemental-ircd/rc.elemental-ircd
new file mode 100644
index 0000000000..9af9f68ef9
--- /dev/null
+++ b/network/elemental-ircd/rc.elemental-ircd
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# elemental-ircd startup script for Slackware
+
+USER="@USER@"
+PIDFILE="/var/run/elemental-ircd/ircd.pid"
+PID=`cat $PIDFILE 2>/dev/null`
+
+ircd_start() {
+  echo "Starting elemental-ircd."
+  su - $USER -c "/usr/bin/ircd -pidfile $PIDFILE"
+}
+
+ircd_stop() {
+  echo -n "Stopping elemental-ircd..."
+  kill -TERM $PID 2>/dev/null
+  echo " done."
+}
+
+ircd_reload() {
+	echo -n "Sending signal to elemental-ircd to reload its configuration..."
+	if kill -CHLD $PID 2>/dev/null; then
+		kill -HUP $PID
+		echo " done."
+	else
+		echo "ircd doesn't seem to be running."
+		exit 1
+	fi
+}
+
+ircd_restart() {
+  ircd_stop
+  sleep 1
+  ircd_start
+}
+
+case "$1" in
+  start)
+    ircd_start
+    ;;
+  stop)
+    ircd_stop
+    ;;
+  restart)
+    ircd_restart
+    ;;
+  reload)
+	ircd_reload
+	;;
+  *)
+    echo "Usage: $0 {start|stop|restart|reload}"
+    exit 1
+esac
diff --git a/network/elemental-ircd/slack-desc b/network/elemental-ircd/slack-desc
new file mode 100644
index 0000000000..8d84e8e549
--- /dev/null
+++ b/network/elemental-ircd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+elemental-ircd: elemental-ircd (high performance irc daemon)
+elemental-ircd:
+elemental-ircd: Elemental-IRCd is a high performance, lightweight, and scalable IRC
+elemental-ircd: daemon. It is a fork of the now-defunct ShadowIRCD and seeks to
+elemental-ircd: continue in the direction ShadowIRCD was headed.
+elemental-ircd:
+elemental-ircd: http://elemental-ircd.com/
+elemental-ircd:
+elemental-ircd:
+elemental-ircd:
+elemental-ircd:
diff --git a/network/elemental-ircd/slackware.conf b/network/elemental-ircd/slackware.conf
new file mode 100644
index 0000000000..fc9d8401ba
--- /dev/null
+++ b/network/elemental-ircd/slackware.conf
@@ -0,0 +1,609 @@
+/* /etc/elemental-ircd/slackware.conf - brief example configuration file
+ *
+ * Copyright (C) 2000-2002 Hybrid Development Team
+ * Copyright (C) 2002-2005 ircd-ratbox development team
+ * Copyright (C) 2005-2006 charybdis development team
+ * Copyright (C) 2014      Elemental-IRCd development team
+ *
+ * $Id: example.conf 3582 2007-11-17 21:55:48Z jilles $
+ *
+ * See reference.conf for more information.
+ */
+
+/* Extensions */
+#loadmodule "extensions/chm_adminonly.so";
+loadmodule "extensions/chm_operonly.so";
+#loadmodule "extensions/chm_sslonly.so";
+#loadmodule "extensions/chm_operonly_compat.so";
+#loadmodule "extensions/chm_quietunreg_compat.so";
+#loadmodule "extensions/chm_sslonly_compat.so";
+#loadmodule "extensions/createauthonly.so";
+loadmodule "extensions/extb_account.so";
+loadmodule "extensions/extb_canjoin.so";
+loadmodule "extensions/extb_channel.so";
+loadmodule "extensions/extb_extgecos.so";
+loadmodule "extensions/extb_oper.so";
+loadmodule "extensions/extb_realname.so";
+#loadmodule "extensions/extb_server.so";
+#loadmodule "extensions/extb_ssl.so";
+#loadmodule "extensions/hurt.so";
+loadmodule "extensions/ip_cloaking.so";
+#loadmodule "extensions/m_findforwards.so";
+loadmodule "extensions/m_identify.so";
+loadmodule "extensions/m_mkpasswd.so";
+loadmodule "extensions/m_webirc.so";
+#loadmodule "extensions/m_cycle.so";
+#loadmodule "extensions/m_oaccept.so";
+#loadmodule "extensions/m_opme.so";
+#loadmodule "extensions/m_ojoin.so";
+#loadmodule "extensions/m_omode.so";
+#loadmodule "extensions/m_olist.so";
+#loadmodule "extensions/m_okick.so";
+#loadmodule "extensions/m_force.so";
+#loadmodule "extensions/m_roleplay.so";
+#loadmodule "extensions/no_oper_invis.so";
+loadmodule "extensions/sno_farconnect.so";
+loadmodule "extensions/sno_globalkline.so";
+loadmodule "extensions/sno_globaloper.so";
+#loadmodule "extensions/sno_whois.so";
+
+serverinfo {
+	name = "hostname.domain.tld";
+	sid = "42X";
+	description = "elemental-ircd test server";
+	network_name = "ShadowNET";
+	network_desc = "Your IRC network.";
+	helpchan = "#help";
+	helpurl = "http://www.mynet.net/help";
+	hub = yes;
+
+	/* On multi-homed hosts you may need the following. These define
+	 * the addresses we connect from to other servers. */
+	/* for IPv4 */
+	#vhost = "192.169.0.1";
+	/* for IPv6 */
+	#vhost6 = "3ffe:80e8:546::2";
+
+	/* ssl_private_key: our ssl private key */
+	ssl_private_key = "etc/ssl.key";
+
+	/* ssl_cert: certificate for our ssl server */
+	ssl_cert = "etc/ssl.cert";
+
+	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
+	ssl_dh_params = "etc/dh.pem";
+
+	/* ssld_count: number of ssld processes you want to start, if you
+	 * have a really busy server, using N-1 where N is the number of
+	 * cpu/cpu cores you have might be useful. A number greater than one
+	 * can also be useful in case of bugs in ssld and because ssld needs
+	 * two file descriptors per SSL connection.
+	 */
+	ssld_count = 1;
+
+	/* default max clients: the default maximum number of clients
+	 * allowed to connect.  This can be changed once ircd has started by
+	 * issuing:
+	 *   /quote set maxclients <limit>
+	 */
+	default_max_clients = 1024;
+};
+
+admin {
+	name = "Lazy admin (lazya)";
+	description = "ShadowNET client server";
+	email = "nobody@127.0.0.1";
+};
+
+log {
+	fname_userlog = "/var/log/elemental-ircd/userlog";
+	#fname_fuserlog = "/var/log/elemental-ircd/fuserlog";
+	fname_operlog = "/var/log/elemental-ircd/operlog";
+	#fname_foperlog = "/var/log/elemental-ircd/foperlog";
+	fname_serverlog = "/var/log/elemental-ircd/serverlog";
+	#fname_klinelog = "/var/log/elemental-ircd/klinelog";
+	fname_killlog = "/var/log/elemental-ircd/killlog";
+	fname_operspylog = "/var/log/elemental-ircd/operspylog";
+	#fname_ioerrorlog = "/var/log/elemental-ircd/ioerror";
+};
+
+/* class {} blocks MUST be specified before anything that uses them.  That
+ * means they must be defined before auth {} and before connect {}.
+ */
+class "users" {
+	ping_time = 2 minutes;
+	number_per_ident = 10;
+	number_per_ip = 10;
+	number_per_ip_global = 50;
+	cidr_ipv4_bitlen = 24;
+	cidr_ipv6_bitlen = 64;
+	number_per_cidr = 200;
+	max_number = 3000;
+	sendq = 400 kbytes;
+};
+
+class "opers" {
+	ping_time = 5 minutes;
+	number_per_ip = 10;
+	max_number = 1000;
+	sendq = 1 megabyte;
+};
+
+class "server" {
+	ping_time = 5 minutes;
+	connectfreq = 5 minutes;
+	max_number = 1;
+	sendq = 4 megabytes;
+};
+
+listen {
+	/* defer_accept: wait for clients to send IRC handshake data before
+	 * accepting them.  if you intend to use software which depends on the
+	 * server replying first, such as BOPM, you should disable this feature.
+	 * otherwise, you probably want to leave it on. Disabling this will not
+	 * update on a rehash.
+	 */
+	defer_accept = yes;
+
+	/* If you want to listen on a specific IP only, specify host.
+	 * host definitions apply only to the following port line.
+	 */
+	#host = "192.169.0.1";
+	port = 5000, 6665 .. 6669;
+	sslport = 6697;
+
+	/* Listen on IPv6 (if you used host= above). */
+	#host = "3ffe:1234:a:b:c::d";
+	#port = 5000, 6665 .. 6669;
+	#sslport = 9999;
+};
+
+/* auth {}: allow users to connect to the ircd (OLD I:)
+ * auth {} blocks MUST be specified in order of precedence.  The first one
+ * that matches a user will be used.  So place spoofs first, then specials,
+ * then general access, then restricted.
+ */
+auth {
+	/* user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
+	 * lines are permitted per auth block.  This is matched against the
+	 * hostname and IP address (using :: shortening for IPv6 and
+	 * prepending a 0 if it starts with a colon) and can also use CIDR
+	 * masks.
+	 */
+	user = "*@172.16.0.0/12";
+	user = "*test@123D:B567:*";
+
+	/* auth_user: The username (authenticated via SASL or PASS) allowed
+	 * to connect. You are able to put multiple auth_user lines. If people
+	 * are authenticating via SASL in this way, it is recommended to comment
+	 * out the password option below. You will also *NEED* to specify a user
+	 * line above auth_user, this can safely be "*@*", however.
+	 */
+	auth_user = "jilles";
+	auth_user = "jdhore";
+
+	/* password: an optional password that is required to use this block.
+	 * By default this is not encrypted, specify the flag "encrypted" in
+	 * flags = ...; below if it is.
+	 */
+	password = "letmein";
+
+	/* spoof: fake the users user@host to be be this.  You may either
+	 * specify a host or a user@host to spoof to.  This is free-form,
+	 * just do everyone a favour and dont abuse it. (OLD I: = flag)
+	 */
+        spoof = "I.still.hate.packets";
+
+	/* autojoin: Channel (or channels, comma-seperated) to join users
+	 * in this auth block to on connect. Note that this won't join
+	 * the user through any bans or otherwise restrictive chmodes.
+	 */
+	autojoin = "#shadowircd,#test";
+
+	/* Possible flags in auth:
+	 *
+	 * encrypted                  | password is encrypted with mkpasswd
+	 * spoof_notice               | give a notice when spoofing hosts
+	 * exceed_limit (old > flag)  | allow user to exceed class user limits
+	 * kline_exempt (old ^ flag)  | exempt this user from k/g/xlines&dnsbls
+	 * dnsbl_exempt		      | exempt this user from dnsbls
+	 * spambot_exempt	      | exempt this user from spambot checks
+	 * shide_exempt		      | exempt this user from serverhiding
+	 * jupe_exempt                | exempt this user from generating
+	 *                              warnings joining juped channels
+	 * resv_exempt		      | exempt this user from resvs
+	 * flood_exempt               | exempt this user from flood limits
+	 *                                     USE WITH CAUTION.
+	 * no_tilde     (old - flag)  | don't prefix ~ to username if no ident
+	 * need_ident   (old + flag)  | require ident for user in this class
+	 * need_ssl                   | require SSL/TLS for user in this class
+	 * need_sasl                  | require SASL id for user in this class
+	 */
+	flags = kline_exempt, exceed_limit;
+
+	/* class: the class the user is placed in */
+	class = "opers";
+};
+
+/* Example WEBIRC authblock */
+auth {
+	/* user: webirc@IP.OF.YOUR.WEBIRC . the webirc@ part is required */
+	user = "webirc@192.168.1.1";
+
+	/* password: password the webirc client sends in the WEBIRC command.
+	 * You can use a encrypted password here (see above auth block).
+	 */
+	password = "<password>";
+
+	/* spoof: This is required to keep it what it is currently if you
+	 * want the webirc client to show the users' real host as their
+	 * host on IRC.
+	 */
+	spoof = "webirc.";
+	class = "users";
+};
+
+auth {
+	user = "*@*";
+	class = "users";
+	flags = no_tilde;
+};
+
+/* privset {} blocks MUST be specified before anything that uses them.  That
+ * means they must be defined before operator {}.
+ */
+privset "local_op" {
+	privs = oper:local_kill, oper:operwall;
+};
+
+privset "server_bot" {
+	extends = "local_op";
+	privs = oper:kline, oper:remoteban, snomask:nick_changes;
+};
+
+privset "global_op" {
+	extends = "local_op";
+	privs = oper:global_kill, oper:routing, oper:kline, oper:unkline, oper:xline,
+		oper:resv, oper:mass_notice, oper:remoteban;
+};
+
+privset "admin" {
+	extends = "global_op";
+	privs = oper:admin, oper:die, oper:rehash, oper:spy, oper:override;
+};
+
+operator "god" {
+	/* name: the name of the oper must go above */
+
+	/* user: the user@host required for this operator.  CIDR *is*
+	 * supported now. auth{} spoofs work here, other spoofs do not.
+ 	 * multiple user="" lines are supported.
+	 */
+	user = "*god@127.0.0.1";
+
+	/* password: the password required to oper.  Unless ~encrypted is
+	 * contained in flags = ...; this will need to be encrypted using
+	 * mkpasswd, MD5 is supported
+	 */
+	password = "etcnjl8juSU1E";
+
+	/* rsa key: the public key for this oper when using Challenge.
+	 * A password should not be defined when this is used, see
+	 * doc/challenge.txt for more information.
+	 */
+	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
+
+	/* umodes: the specific umodes this oper gets when they oper.
+	 * If this is specified an oper will not be given oper_umodes
+	 * These are described above oper_only_umodes in general {};
+	 */
+	#umodes = locops, servnotice, operwall, wallop;
+
+	/* fingerprint: if specified, the oper's client certificate
+	 * fingerprint will be checked against the specified fingerprint
+	 * below.
+	 */
+	#fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b";
+
+	/* snomask: specific server notice mask on oper up.
+	 * If this is specified an oper will not be given oper_snomask.
+	 */
+	snomask = "+Zbfkrsuy";
+
+	/* vhost: defines the vhost that this oper will get on oper up.
+	 * this must be a valid hostmask. If this is specified the oper
+	 * will not be given default_operhost.
+	 */
+	vhost = "is.an.oper";
+
+	/* swhois: defines an additional line that will be displayed
+	 * whenever someone does /whois on the oper in question.
+	 */
+	swhois = "is wearing pants.";
+
+	/* operstring: defines a custom operstring for this oper,
+	 * which will be shown in whois instead of default_operstring
+	 * or default_adminstring.
+	 */
+	operstring = "is a lazy IRC Operator";
+
+	/* flags: misc options for the operator.  You may prefix an option
+	 * with ~ to disable it, e.g. ~encrypted.
+	 *
+	 * Default flags are encrypted.
+	 *
+	 * Available options:
+	 *
+	 * encrypted:    the password above is encrypted [DEFAULT]
+	 * need_ssl:     must be using SSL/TLS to oper up
+         */
+	flags = encrypted;
+
+	/* privset: privileges set to grant */
+	privset = "admin";
+};
+
+connect "irc.uplink.com" {
+	host = "192.168.0.1";
+	send_password = "password";
+	accept_password = "anotherpassword";
+	port = 6666;
+	hub_mask = "*";
+	class = "server";
+	flags = compressed, topicburst;
+
+	#fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b";
+
+	/* If the connection is IPv6, uncomment below.
+	 * Use 0::1, not ::1, for IPv6 localhost. */
+	#aftype = ipv6;
+};
+
+connect "ssl.uplink.com" {
+	host = "192.168.0.1";
+	send_password = "password";
+	accept_password = "anotherpassword";
+	port = 9999;
+	hub_mask = "*";
+	class = "server";
+	flags = ssl, topicburst;
+};
+
+service {
+	name = "services.int";
+};
+
+cluster {
+	name = "*";
+	flags = kline, tkline, unkline, xline, txline, unxline, resv, tresv, unresv;
+};
+
+shared {
+	oper = "*@*", "*";
+	flags = all;
+};
+
+/* exempt {}: IPs that are exempt from Dlines and rejectcache. (OLD d:) */
+exempt {
+	ip = "127.0.0.1";
+};
+
+channel {
+	#disabledmodes = "ME";
+	autochanmodes = "nt";
+	admin_on_channel_create = no;
+	exemptchanops = "NT";
+	use_halfop = yes;
+	use_admin = yes;
+	use_owner = yes;
+	use_knock = yes;
+	use_local_channels = yes;
+	knock_delay = 5 minutes;
+	knock_delay_channel = 1 minute;
+	max_chans_per_user = 15;
+	max_bans = 100;
+	max_bans_large = 500;
+	default_split_user_count = 0;
+	default_split_server_count = 0;
+	no_create_on_split = no;
+	no_join_on_split = no;
+	burst_topicwho = yes;
+	kick_on_split_riding = no;
+	only_ascii_channels = no;
+	cycle_host_change = yes;
+	host_in_topic = yes;
+	resv_forcepart = yes;
+	channel_target_change = yes;
+};
+
+serverhide {
+	flatten_links = yes;
+	links_delay = 5 minutes;
+        hidden = no;
+	disable_hidden = no;
+};
+
+/* These are the blacklist settings.
+ * You can have multiple combinations of host and rejection reasons.
+ * They are used in pairs of one host/rejection reason.
+ *
+ * These settings should be adequate for most networks, and are (presently)
+ * required for use on ShadowNet.
+ *
+ * Word to the wise: Do not use blacklists like SPEWS for blocking IRC
+ * connections.
+ *
+ * As of charybdis 2.1.3, you can do some keyword substitution on the rejection
+ * reason. The available keyword substitutions are:
+ *
+ *   ${ip}           - the user's IP
+ *   ${host}         - the user's canonical hostname
+ *   ${dnsbl-host}   - the dnsbl hostname the lookup was done against
+ *   ${nick}         - the user's nickname
+ *   ${network-name} - the name of the network
+ *
+ */
+blacklist {
+	host = "rbl.efnetrbl.org";
+	reject_reason = "${nick}, your IP (${ip}) is listed in EFnet's RBL. For assistance, see http://efnetrbl.org/?i=${ip}";
+
+	host = "dnsbl.dronebl.org";
+	reject_reason = "${nick}, your IP (${ip}) is listed in DroneBL. For assistance, see http://dronebl.org/lookup_branded.do?ip=${ip}&network=${network-name}";
+
+	host = "torexit.dan.me.uk";
+	reject_reason = "${nick}, your IP (${ip}) is listed as a TOR exit node. In order to protect ${network-name} from TOR-based abuse, we are not allowing TOR exit nodes to connect to our network.";
+};
+
+alias "NickServ" {
+	target = "NickServ";
+};
+
+alias "ChanServ" {
+	target = "ChanServ";
+};
+
+alias "OperServ" {
+	target = "OperServ";
+};
+
+alias "MemoServ" {
+	target = "MemoServ";
+};
+
+alias "HostServ" {
+	target = "HostServ";
+};
+
+alias "BotServ" {
+	target = "BotServ";
+};
+
+alias "InfoServ" {
+	target = "InfoServ";
+};
+
+alias "GroupServ" {
+	target = "GroupServ";
+};
+
+alias "NS" {
+	target = "NickServ";
+};
+
+alias "CS" {
+	target = "ChanServ";
+};
+
+alias "OS" {
+	target = "OperServ";
+};
+
+alias "MS" {
+	target = "MemoServ";
+};
+
+alias "HS" {
+	target = "HostServ";
+};
+
+alias "BS" {
+	target = "BotServ";
+};
+
+alias "IS" {
+	target = "InfoServ";
+};
+
+alias "GS" {
+	target = "GroupServ";
+};
+
+general {
+	hide_error_messages = opers;
+	hide_spoof_ips = yes;
+
+	/*
+	 * default umodes: umodes to set upon connection
+	 * If you have enabled the ip_cloaking extension, and you wish for
+	 * incoming clients to be cloaked upon connection, +x must be in
+	 * the umode string below.
+	 */
+	default_umodes = "+ix";
+
+	default_operstring = "is an IRC Operator";
+	default_adminstring = "is a Server Administrator";
+	#default_operhost = "staff.testnet.net";
+	#static_quit = "I like turtles!";
+	servicestring = "is a Network Service";
+	disable_fake_channels = no;
+	hide_channel_below_users = 3;
+	tkline_expire_notices = no;
+	default_floodcount = 10;
+	failed_oper_notice = yes;
+	dots_in_ident=2;
+	min_nonwildcard = 4;
+	min_nonwildcard_simple = 3;
+	max_accept = 100;
+	max_monitor = 100;
+	anti_nick_flood = yes;
+	max_nick_time = 20 seconds;
+	max_nick_changes = 5;
+	anti_spam_exit_message_time = 5 minutes;
+	use_part_messages = yes;
+	ts_warn_delta = 30 seconds;
+	ts_max_delta = 5 minutes;
+	client_exit = yes;
+	collision_fnc = yes;
+	global_snotices = yes;
+	dline_with_reason = yes;
+	kline_delay = 0 seconds;
+	kline_with_reason = yes;
+	kline_reason = "K-Lined";
+	identify_service = "NickServ@services.int";
+	identify_command = "IDENTIFY";
+	non_redundant_klines = yes;
+	warn_no_nline = yes;
+	use_propagated_bans = yes;
+	stats_e_disabled = no;
+	stats_c_oper_only=no;
+	stats_h_oper_only=no;
+	stats_y_oper_only=no;
+	stats_o_oper_only=yes;
+	stats_P_oper_only=no;
+	stats_i_oper_only=masked;
+	stats_k_oper_only=masked;
+	map_oper_only = no;
+	operspy_admin_only = no;
+	operspy_dont_care_user_info = no;
+	secret_channels_in_whois = no;
+	caller_id_wait = 1 minute;
+	pace_wait_simple = 1 second;
+	pace_wait = 10 seconds;
+	short_motd = no;
+	ping_cookie = no;
+	connect_timeout = 30 seconds;
+	default_ident_timeout = 5;
+	disable_auth = no;
+	no_oper_flood = yes;
+	true_no_oper_flood = no;
+	max_targets = 4;
+	client_flood = 20;
+	use_whois_actually = no;
+	oper_only_umodes = operwall, locops, servnotice;
+	oper_umodes = locops, servnotice, operwall, wallop;
+	oper_snomask = "+s";
+	burst_away = yes;
+	nick_delay = 0 seconds; # 15 minutes if you want to enable this
+	reject_ban_time = 1 minute;
+	reject_after_count = 3;
+	reject_duration = 5 minutes;
+	throttle_duration = 60;
+	throttle_count = 4;
+	expire_override_time = 5 minutes;
+	away_interval = 30;
+};
+
+modules {
+	path = "/usr/lib@LIBDIRSUFFIX@/elemental-ircd/modules";
+	path = "/usr/lib@LIBDIRSUFFIX@/elemental-ircd/modules/autoload";
+};
diff --git a/network/flexget/README b/network/flexget/README
index 7f27fda0a8..a58676d423 100644
--- a/network/flexget/README
+++ b/network/flexget/README
@@ -9,3 +9,6 @@ watch directory support, such as rtorrent.
 Optional dependencies: Flask - for web interface
                        CherryPy - for web interface
                        guppy - for memusage plugin
+
+Note: FlexGet provide some special version from dependencies such as:
+- BeautifulSoup4 >=4.1, !=4.2.0, <4.4
diff --git a/network/flexget/flexget.SlackBuild b/network/flexget/flexget.SlackBuild
index b503afc6f9..4d7ad25158 100644
--- a/network/flexget/flexget.SlackBuild
+++ b/network/flexget/flexget.SlackBuild
@@ -28,7 +28,7 @@
 
 SRCNAM=FlexGet
 PRGNAM=${SRCNAM,,}
-VERSION=${VERSION:-1.2.338}
+VERSION=${VERSION:-1.2.358}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/flexget/flexget.info b/network/flexget/flexget.info
index 80975a896a..9cca2450ce 100644
--- a/network/flexget/flexget.info
+++ b/network/flexget/flexget.info
@@ -1,10 +1,10 @@
 PRGNAM="flexget"
-VERSION="1.2.338"
+VERSION="1.2.358"
 HOMEPAGE="http://flexget.com/"
-DOWNLOAD="https://pypi.python.org/packages/source/F/FlexGet/FlexGet-1.2.338.tar.gz"
-MD5SUM="a5ee505dbd75345a1450f995e76a4fc5"
+DOWNLOAD="https://pypi.python.org/packages/source/F/FlexGet/FlexGet-1.2.358.tar.gz"
+MD5SUM="4d140cf39139d7a99dc213e70687c5bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Paver feedparser SQLAlchemy PyYAML BeautifulSoup4 html5lib PyRSS2Gen pynzb progressbar python-requests python-dateutil jsonschema python-tvrage tmdb3 rpyc path.py guessit APScheduler"
+REQUIRES="Jinja2 feedparser SQLAlchemy PyYAML BeautifulSoup4 html5lib PyRSS2Gen pynzb progressbar jsonschema python-tvrage tmdb3 rpyc path.py guessit APScheduler"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/freerapid/README b/network/freerapid/README
index 0ac58f37b1..dbb98772b0 100644
--- a/network/freerapid/README
+++ b/network/freerapid/README
@@ -4,6 +4,16 @@ Facebook, Picasa and other file-sharing services, include the new ones like mega
 Simply copy and paste your links from a browser to this application.
 FreeRapid Downloader will handle the rest itself. No more clicking or uncomfortable waiting.
 
+To use smooth fonts (better appearance), the options " -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true " should be used.
+
+In some distros, the options " -Djava.net.preferIPv4Stack=true -Xmx160m " should be used.
+
+To reduce CPU usage, the option " -Dsun.java2d.opengl=true " should be used.
+
+The options mentioned were added in /usr/bin/freerapid for convenience, simply uncomment the desired option.
+
+Please add /usr/lib{64}/java/bin into your $PATH.
+
 Main Features:
 
 * support for concurrent downloading from multiple services;
diff --git a/network/freerapid/doinst.sh b/network/freerapid/doinst.sh
index 9424ce43ff..9081430537 100644
--- a/network/freerapid/doinst.sh
+++ b/network/freerapid/doinst.sh
@@ -1,3 +1,9 @@
+set -e
+
+# create links for compatibility with new JDK versions...
+ln -sf /usr/lib/java/bin/java /usr/bin/java
+ln -sf /usr/lib/java/bin/javaws /usr/bin/javaws
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/network/freerapid/frd.sh b/network/freerapid/frd.sh
index 20a8bb1daf..a2b989ddbc 100644
--- a/network/freerapid/frd.sh
+++ b/network/freerapid/frd.sh
@@ -1,79 +1,26 @@
 #!/bin/sh
-# FRD requires Sun Java 6, NO Shity GCJ, NO buggy OpenJDK, but Sun Java 6!
-# some crappy distros needed to add switch -Djava.net.preferIPv4Stack=true
-# Look for java in these directories
-LOOKUP_JRE_DIRS="/usr/lib/jvm/* /opt/java* /opt/jre*"
-#Created by Petris 2009 -> Many thanks!
-# Required version
-REQ_JVER1=1
-REQ_JVER2=6
-REQ_JVER3=0
-REQ_JVER4=5
 
-check_java_version () {
-	JVER1=`echo $JAVA_VERSION_OUTPUT | sed 's/java version "\([0-9]*\)\.[0-9]*\.[0-9]*_[0-9]*".*/\1/'`
-	JVER2=`echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.\([0-9]*\)\.[0-9]*_[0-9]*".*/\1/'`
-	JVER3=`echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.[0-9]*\.\([0-9]*\)_[0-9]*".*/\1/'`
-	JVER4=`echo $JAVA_VERSION_OUTPUT | sed 's/java version "[0-9]*\.[0-9]*\.[0-9]*_\([0-9]*\)".*/\1/'`
-
-	if [ $JVER1 -gt $REQ_JVER1 ]; then
-		return 0
-	elif [ $JVER1 -lt $REQ_JVER1 ]; then
-		return 1
-	fi
-
-	if [ $JVER2 -gt $REQ_JVER2 ]; then
-		return 0
-	elif [ $JVER2 -lt $REQ_JVER2 ]; then
-		return 1
-	fi
-
-	if [ $JVER3 -gt $REQ_JVER3 ]; then
-		return 0
-	elif [ $JVER3 -lt $REQ_JVER3 ]; then
-		return 1
-	fi
-
-	if [ $JVER4 -lt $REQ_JVER4 ]; then
-		return 1
-	fi
-
-	return 0
-}
-
-# Handle symlinks
-PROGRAM="$0"
-while [ -L "$PROGRAM" ]; do
-	PROGRAM=`readlink -f "$PROGRAM"`
-done
-cd "`dirname \"$PROGRAM\"`"
-
-# Check default java
+# default option.
 if [ -x "`which java`" ]; then
-	JAVA_VERSION_OUTPUT=`java -version 2>&1`
-	check_java_version && cd /usr/share/freerapid-0.9.4/ && exec java -Djava.net.preferIPv4Stack=true -Xmx160m -jar frd.jar "$@"
-fi
-
-# Test other possible Java locations
-for JRE_PATH in $LOOKUP_JRE_DIRS; do
-	if [ -x "$JRE_PATH/bin/java" ]; then
-		JAVA_VERSION_OUTPUT=`"$JRE_PATH/bin/java" -version 2>&1`
-		check_java_version && {
-			export JRE_PATH
-			cd /usr/share/freerapid-0.94/ && exec $JRE_PATH/bin/java -Djava.net.preferIPv4Stack=true -Xmx160m -jar frd.jar "$@"
-		}
-	fi
-done
-
-# Failed
-if [ -x "`which xmessage`" ]; then
-	xmessage -nearmouse -file - <<EOF
-Failed to find a suitable java version.
-Required: $REQ_JVER1.$REQ_JVER2.$REQ_JVER3_$REQ_JVER4 or newer.
-EOF
-else
-	echo Failed to find a suitable java version.
-	echo Required: $REQ_JVER1.$REQ_JVER2.$REQ_JVER3_$REQ_JVER4 or newer.
+  cd /usr/share/freerapid-0.9.4/ && exec java -jar frd.jar "$@"
 fi
 
-exit 1
+# less CPU usage.
+#if [ -x "`which java`" ]; then
+#  cd /usr/share/freerapid-0.9.4/ && exec java -Dsun.java2d.opengl=true -jar frd.jar "$@"
+#fi
+
+# needed for some distros.
+#if [ -x "`which java`" ]; then
+#  cd /usr/share/freerapid-0.9.4/ && exec java -Djava.net.preferIPv4Stack=true -Xmx160m -jar frd.jar "$@"
+#fi
+
+# better fonts appearance (smooth fonts).
+#if [ -x "`which java`" ]; then
+#  cd /usr/share/freerapid-0.9.4/ && exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.preferIPv4Stack=true -Xmx160m -jar frd.jar "$@"
+#fi
+
+# all options combined.
+#if [ -x "`which java`" ]; then
+#  cd /usr/share/freerapid-0.9.4/ && exec java -Dsun.java2d.opengl=true -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.preferIPv4Stack=true -Xmx160m -jar frd.jar "$@"
+#fi
diff --git a/network/freerapid/freerapid.SlackBuild b/network/freerapid/freerapid.SlackBuild
index 6517a88166..a1fbf1c331 100644
--- a/network/freerapid/freerapid.SlackBuild
+++ b/network/freerapid/freerapid.SlackBuild
@@ -26,7 +26,7 @@ PRGNAM=freerapid
 SRCNAM=FreeRapid
 VERSION=${VERSION:-0.9.4}
 SRCVER=${SRCVER:-0.9u4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
diff --git a/network/freerapid/freerapid.desktop b/network/freerapid/freerapid.desktop
index ac8233d8d6..e27da579c2 100644
--- a/network/freerapid/freerapid.desktop
+++ b/network/freerapid/freerapid.desktop
@@ -5,5 +5,7 @@ Comment=Java based download manager
 Exec=/usr/bin/freerapid
 StartupNotify=true
 Icon=freerapid
+Terminal=false
+X-MultipleArgs=false
 Type=Application
 Categories=Network;
diff --git a/network/ftp-cloudfs/README b/network/ftp-cloudfs/README
new file mode 100644
index 0000000000..c0a491dff9
--- /dev/null
+++ b/network/ftp-cloudfs/README
@@ -0,0 +1,9 @@
+ftp-cloudfs is a ftp server acting as a proxy to OpenStack Object
+Storage (swift). It allow you to connect via any FTP client to do
+upload/download or create containers.
+
+By default the server will bind to port 2021 which allow to be run as a non
+root/administrator user.
+
+It supports pseudo-hierarchical folders/directories as described in the
+OpenStack Object Storage API.
diff --git a/network/ftp-cloudfs/doinst.sh b/network/ftp-cloudfs/doinst.sh
new file mode 100644
index 0000000000..d7adcd9842
--- /dev/null
+++ b/network/ftp-cloudfs/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/ftpcloudfs.config.new
diff --git a/network/ftp-cloudfs/ftp-cloudfs.SlackBuild b/network/ftp-cloudfs/ftp-cloudfs.SlackBuild
new file mode 100644
index 0000000000..6ba5ad19c5
--- /dev/null
+++ b/network/ftp-cloudfs/ftp-cloudfs.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for "ftp-cloudfs".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ftp-cloudfs
+SRCNAM=ftpcloudfs
+VERSION=${VERSION:-0.34}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root $PKG
+
+mkdir -p $PKG/etc
+install -m 0644 $SRCNAM.conf.example $PKG/etc/$SRCNAM.conf.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ftp-cloudfs/ftp-cloudfs.info b/network/ftp-cloudfs/ftp-cloudfs.info
new file mode 100644
index 0000000000..950eea8196
--- /dev/null
+++ b/network/ftp-cloudfs/ftp-cloudfs.info
@@ -0,0 +1,10 @@
+PRGNAM="ftp-cloudfs"
+VERSION="0.34"
+HOMEPAGE="https://github.com/cloudfs/ftp-cloudfs/"
+DOWNLOAD="https://github.com/cloudfs/ftp-cloudfs/archive/0.34.tar.gz"
+MD5SUM="f49d59b4fec7a23660fe4b311cceb5c7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pyftpdlib python-daemon python-memcached python-swiftclient"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/ftp-cloudfs/slack-desc b/network/ftp-cloudfs/slack-desc
new file mode 100644
index 0000000000..e9e4aa8b41
--- /dev/null
+++ b/network/ftp-cloudfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+ftp-cloudfs: ftp-cloudfs (FTP interface to OpenStack Object Storage (Swift))
+ftp-cloudfs:
+ftp-cloudfs: ftp-cloudfs is a ftp server acting as a proxy to OpenStack Object
+ftp-cloudfs: Storage (swift). It allow you to connect via any FTP client to do
+ftp-cloudfs: upload/download or create containers.
+ftp-cloudfs:
+ftp-cloudfs: Homepage: https://github.com/cloudfs/ftp-cloudfs/
+ftp-cloudfs:
+ftp-cloudfs:
+ftp-cloudfs:
+ftp-cloudfs:
diff --git a/network/gajim/gajim.SlackBuild b/network/gajim/gajim.SlackBuild
index 08da07b2b8..976380b9a8 100644
--- a/network/gajim/gajim.SlackBuild
+++ b/network/gajim/gajim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Gajim
 #
-# Copyright 2014 Ruben Schuller <ruben@orgizm.net>
+# Copyright 2014-2016 Ruben Schuller
 #
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gajim
-VERSION=${VERSION:-0.16}
+VERSION=${VERSION:-0.16.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/gajim/gajim.info b/network/gajim/gajim.info
index c5352520e1..f90ad2545d 100644
--- a/network/gajim/gajim.info
+++ b/network/gajim/gajim.info
@@ -1,10 +1,10 @@
 PRGNAM="gajim"
-VERSION="0.16"
+VERSION="0.16.5"
 HOMEPAGE="http://www.gajim.org"
-DOWNLOAD="http://gajim.org/downloads/0.16/gajim-0.16.tar.bz2"
-MD5SUM="850c8fa9a41d3550eaa00641e6f61132"
+DOWNLOAD="http://gajim.org/downloads/0.16/gajim-0.16.5.tar.bz2"
+MD5SUM="615a7fe21feeea932b230e72641b7485"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyOpenSSL python-nbxmpp"
 MAINTAINER="Ruben Schuller"
-EMAIL="ruben@orgizm.net"
+EMAIL="sb@rbn.im"
diff --git a/network/glassfish/glassfish.info b/network/glassfish/glassfish.info
index 2d899a65c6..0bb5e4c03b 100644
--- a/network/glassfish/glassfish.info
+++ b/network/glassfish/glassfish.info
@@ -1,7 +1,7 @@
 PRGNAM="glassfish"
 VERSION="4.1"
 HOMEPAGE="http://glassfish.java.net"
-DOWNLOAD="http://dlc.sun.com.edgesuite.net/glassfish/4.1/release/glassfish-4.1-web.zip"
+DOWNLOAD="http://download.java.net/glassfish/4.1/release/glassfish-4.1-web.zip"
 MD5SUM="252ab55a3ce890570092009df5fc6e6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/google-cli/README b/network/google-cli/README
new file mode 100644
index 0000000000..901e7d24d2
--- /dev/null
+++ b/network/google-cli/README
@@ -0,0 +1,9 @@
+google-cli (Google Search from command line).
+
+google-cli  is a command line tool to search Google (Web & News) from the terminal.
+It shows the title, URL and text context for each result. Results are fetched in pages.
+Next or previous page navigation is possible using keyboard shortcuts.
+Results are indexed and a result URL can be opened in a browser using the index number.
+Supports sequential searches in a single instance.
+
+google-cli is GPLv3 licensed. It doesn't have any affiliation to Google in any way.
diff --git a/network/google-cli/google-cli.SlackBuild b/network/google-cli/google-cli.SlackBuild
new file mode 100644
index 0000000000..9d4fb46e65
--- /dev/null
+++ b/network/google-cli/google-cli.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+#
+# Slackware build script for google-cli.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=google-cli
+VERSION=${VERSION:-1.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCVER="v1.9"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCVER.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+install -d $PKG/usr/{bin,doc,man/man1}
+install -D -m755 googler $PKG/usr/bin/googler
+install -D -m644 googler.1 $PKG/usr/man/man1/googler.1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING google-cli.png README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/google-cli/google-cli.info b/network/google-cli/google-cli.info
new file mode 100644
index 0000000000..acc6b072ef
--- /dev/null
+++ b/network/google-cli/google-cli.info
@@ -0,0 +1,10 @@
+PRGNAM="google-cli"
+VERSION="1.9"
+HOMEPAGE="https://github.com/jarun/google-cli/"
+DOWNLOAD="https://github.com/jarun/google-cli/archive/v1.9.tar.gz"
+MD5SUM="4d23bf9f3b01eda68145d718c5a7f507"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/network/google-cli/slack-desc b/network/google-cli/slack-desc
new file mode 100644
index 0000000000..8e5c91f72f
--- /dev/null
+++ b/network/google-cli/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+google-cli: google-cli (Google Search from command line)
+google-cli:
+google-cli: google-cli  is a command line tool to search Google (Web & News) from
+google-cli: the terminal. It shows the title, URL and text context for each
+google-cli: result. Results are fetched in pages.
+google-cli:
+google-cli: Home page: http://sourceforge.net/projects/google-cli/
+google-cli:
+google-cli:
+google-cli:
+google-cli:
diff --git a/network/greenbone-security-assistant/README b/network/greenbone-security-assistant/README
index 82c8f6f5bb..30a9d5b984 100644
--- a/network/greenbone-security-assistant/README
+++ b/network/greenbone-security-assistant/README
@@ -6,16 +6,6 @@ This is the UI the Open Vulnerability Assessment System (OpenVAS).
 
 - PDF report generation is broken.  This may get fixed in a future slackbuild.
 
-- The libssh-0.5.4 shipped with Slackware (at the time of this writing) is
-  broken. If you need to run "credentialed" scans against targets running
-  OpenSSH 6.7 or beyond (including Slackware), you have 2 options:
-    1. Enable diffie-hellman-group1-sha1 as a KexAlgorithm in the sshd_config
-       of your targets.
-    2. Update your libssh to the latest.
-  You also may have problems with targets running Dropbear SSH server.  See
-  this thread on LinuxQuestions for more information:
-    http://www.linuxquestions.org/questions/showthread.php?t=4175533193
-
 - All the daemons run as root.  There's no (working) configuration options
   or documentation to change this behavior.
 
@@ -113,7 +103,7 @@ refer to http://slackbuilds.org/howto/ .
 
 20. Point your browser at https://<YOUR IP OR HOSTNAME>:9392
     You'll get a certificate error, of course (fixing this is left as an 
-    excercise for the reader). Log in with your username/password from #10.
+    excercise for the reader). Log in with your username/password from #12.
 
 21. [Optional] Build and install openvas-cli.  You'll need this if you ever
     want to script tests.
diff --git a/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild b/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild
index 67bf51f1f5..230a386ebd 100644
--- a/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild
+++ b/network/greenbone-security-assistant/greenbone-security-assistant.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=greenbone-security-assistant
-VERSION=${VERSION:-6.0.1}
+VERSION=${VERSION:-6.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/greenbone-security-assistant/greenbone-security-assistant.info b/network/greenbone-security-assistant/greenbone-security-assistant.info
index f5a385496a..0dfc6cbd41 100644
--- a/network/greenbone-security-assistant/greenbone-security-assistant.info
+++ b/network/greenbone-security-assistant/greenbone-security-assistant.info
@@ -1,8 +1,8 @@
 PRGNAM="greenbone-security-assistant"
-VERSION="6.0.1"
+VERSION="6.0.5"
 HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2018/greenbone-security-assistant-6.0.1.tar.gz"
-MD5SUM="907eb7afd1734463abc2530a35dd6f39"
+DOWNLOAD="http://wald.intevation.org/frs/download.php/2173/greenbone-security-assistant-6.0.5.tar.gz"
+MD5SUM="ee69ddbd449401ca85a25f50f28291ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openvas-libraries libmicrohttpd"
diff --git a/network/gtk-gnutella/gtk-gnutella.SlackBuild b/network/gtk-gnutella/gtk-gnutella.SlackBuild
index 0ad1767383..3ed0611a4c 100644
--- a/network/gtk-gnutella/gtk-gnutella.SlackBuild
+++ b/network/gtk-gnutella/gtk-gnutella.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Zbigniew Baniewski <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
 PRGNAM=gtk-gnutella
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/gtk-gnutella/gtk-gnutella.info b/network/gtk-gnutella/gtk-gnutella.info
index 356f8c2b89..da84352fb3 100644
--- a/network/gtk-gnutella/gtk-gnutella.info
+++ b/network/gtk-gnutella/gtk-gnutella.info
@@ -1,8 +1,8 @@
 PRGNAM="gtk-gnutella"
-VERSION="1.0.1"
+VERSION="1.1.8"
 HOMEPAGE="http://sourceforge.net/projects/gtk-gnutella/"
-DOWNLOAD="http://downloads.sourceforge.net/gtk-gnutella/gtk-gnutella-1.0.1.tar.bz2"
-MD5SUM="0ff4036ec275eb41e9b310a521c15732"
+DOWNLOAD="http://downloads.sourceforge.net/gtk-gnutella/gtk-gnutella-1.1.8.tar.bz2"
+MD5SUM="c2de55dcefa3177c8c00642898c4e356"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/guacamole-client/README b/network/guacamole-client/README
new file mode 100644
index 0000000000..b63f2b72ae
--- /dev/null
+++ b/network/guacamole-client/README
@@ -0,0 +1,5 @@
+guacamole-client contains all Java and JavaScript components
+of Guacamole (guacamole, guacamole-common, guacamole-ext,
+and guacamole-common-js).
+
+NOTE: This package will download lots of packages during building.
diff --git a/network/guacamole-client/guacamole-client.SlackBuild b/network/guacamole-client/guacamole-client.SlackBuild
new file mode 100644
index 0000000000..34b708c07a
--- /dev/null
+++ b/network/guacamole-client/guacamole-client.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# Slackware build script for guacamole-client
+
+# Copyright 2015 Zhu Qun-Ying
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guacamole-client
+VERSION=${VERSION:-0.9.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+MAVEN=/usr/share/maven/bin/mvn
+TOMCATUSER=${TOMCATUSER:-tomcat}
+TOMCATGROUP=${TOMCATGROUP:-tomcat}
+
+if ! grep ^$TOMCATUSER: /etc/passwd 2>&1 > /dev/null; then
+    echo "AAA"
+    cat <<EOF
+There is no tomcat user "$TOMCATUSER" found. Please set the user name in
+environment variable \$TOMECATUSER.
+EOF
+exit 1
+fi
+
+if ! grep $TOMCATGROUP: /etc/passwd 2>&1 > /dev/null; then
+    cat <<EOF
+There is no tomcat group "$TOMCATGROUP" found. Please set the group name in
+environment variable \$TOMECATGROUP.
+EOF
+exit 1
+fi
+
+TOMCATHOME=`grep $TOMCATUSER /etc/passwd | awk -F : '{print $6}'`
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+$MAVEN package
+mkdir -p $PKG/usr/share/lib/guacamole
+cp guacamole/target/guacamole-${VERSION}.war $PKG/usr/share/lib/guacamole
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README LICENSE CONTRIBUTING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/etc/guacamole/
+cat $CWD/user-mapping.xml-sample > $PKG/etc/guacamole/user-mapping.xml-sample
+
+# setup war file and guacamole config directory
+mkdir -p ${PKG}$TOMCATHOME/webapps
+(cd  ${PKG}$TOMCATHOME/; ln -s /etc/guacamole .guacamole)
+(cd ${PKG}$TOMCATHOME/webapps; \
+ ln -s /usr/share/lib/guacamole/guacamole-$VERSION.war guacamole.war)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/guacamole-client/guacamole-client.info b/network/guacamole-client/guacamole-client.info
new file mode 100644
index 0000000000..d6905982c7
--- /dev/null
+++ b/network/guacamole-client/guacamole-client.info
@@ -0,0 +1,10 @@
+PRGNAM="guacamole-client"
+VERSION="0.9.8"
+HOMEPAGE="http://guac-dev.org"
+DOWNLOAD="http://sourceforge.net/projects/guacamole/files/current/source/guacamole-client-0.9.8.tar.gz"
+MD5SUM="588ac66f02c5f28a87be1ca562c5ccef"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="apache-tomcat apache-maven"
+MAINTAINER="Zhu Qun-Ying"
+EMAIL="zhu.qunying@gmail.com"
diff --git a/network/guacamole-client/slack-desc b/network/guacamole-client/slack-desc
new file mode 100644
index 0000000000..40c2b2a36d
--- /dev/null
+++ b/network/guacamole-client/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler----------------------------------------------|
+guacamole-client: guacamole-client (Guacamole client)
+guacamole-client:
+guacamole-client: guacamole-client contains all Java and JavaScript components
+guacamole-client: of Guacamole (guacamole, guacamole-common, guacamole-ext,
+guacamole-client: and guacamole-common-js).
+guacamole-client:
+guacamole-client: http://guac-dev.org
+guacamole-client:
+guacamole-client:
+guacamole-client:
+guacamole-client:
diff --git a/network/guacamole-client/user-mapping.xml-sample b/network/guacamole-client/user-mapping.xml-sample
new file mode 100644
index 0000000000..2b7b74e312
--- /dev/null
+++ b/network/guacamole-client/user-mapping.xml-sample
@@ -0,0 +1,36 @@
+<user-mapping>
+	
+    <!-- Per-user authentication and config information -->
+    <authorize username="USERNAME" password="PASSWORD">
+        <protocol>vnc</protocol>
+        <param name="hostname">localhost</param>
+        <param name="port">5900</param>
+        <param name="password">VNCPASS</param>
+    </authorize>
+
+    <!-- Another user, but using md5 to hash the password
+         (example below uses the md5 hash of "PASSWORD") -->
+    <authorize 
+            username="USERNAME2"
+            password="319f4d26e3c536b5dd871bb2c52e3178"
+            encoding="md5">
+
+        <!-- First authorized connection -->
+        <connection name="localhost">
+            <protocol>vnc</protocol>
+            <param name="hostname">localhost</param>
+            <param name="port">5901</param>
+            <param name="password">VNCPASS</param>
+        </connection>
+
+        <!-- Second authorized connection -->
+        <connection name="otherhost">
+            <protocol>vnc</protocol>
+            <param name="hostname">otherhost</param>
+            <param name="port">5900</param>
+            <param name="password">VNCPASS</param>
+        </connection>
+
+    </authorize>
+
+</user-mapping>
diff --git a/network/guacamole-server/README b/network/guacamole-server/README
new file mode 100644
index 0000000000..e6a77bad72
--- /dev/null
+++ b/network/guacamole-server/README
@@ -0,0 +1,11 @@
+guacamole-server - Guacamole server
+
+guacamole-server contains all the native, server-side
+components required by Guacamole to connect to remote
+desktops.  It provides a common C library, libguac, which all
+other native components depend on, as well as separate
+libraries for each supported protocol, and guacd, the heart
+of Guacamole.
+
+The dependency for the libraries of freerdp, libtelnet, libssh2 are
+optional, as Slackware by default has libvncserver installed.
diff --git a/network/guacamole-server/doinst.sh b/network/guacamole-server/doinst.sh
new file mode 100644
index 0000000000..79f3952787
--- /dev/null
+++ b/network/guacamole-server/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.guacd.new
diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild
new file mode 100644
index 0000000000..2ba44b72e9
--- /dev/null
+++ b/network/guacamole-server/guacamole-server.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for guacamole-server
+
+# Copyright 2015 Zhu Qun-Ying
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guacamole-server
+VERSION=${VERSION:-0.9.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# use system uuid library from util-linux instead of OSSP uuid
+patch -p1 < $CWD/uuid.patch
+autoreconf -fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --with-init-dir=/etc/rc.d \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+# Compile the application and install it into the $PKG directory
+make
+make install-strip DESTDIR=$PKG
+
+# Compress man pages
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README LICENSE ChangeLog AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+mv $PKG/etc/rc.d/guacd $PKG/etc/rc.d/rc.guacd.new
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/guacamole-server/guacamole-server.info b/network/guacamole-server/guacamole-server.info
new file mode 100644
index 0000000000..664e66e52e
--- /dev/null
+++ b/network/guacamole-server/guacamole-server.info
@@ -0,0 +1,10 @@
+PRGNAM="guacamole-server"
+VERSION="0.9.8"
+HOMEPAGE="http://guac-dev.org"
+DOWNLOAD="http://sourceforge.net/projects/guacamole/files/current/source/guacamole-server-0.9.8.tar.gz"
+MD5SUM="5b85fcf9db744788d4aa578e20d5e181"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Zhu Qun-Ying"
+EMAIL="zhu.qunying@gmail.com"
diff --git a/network/guacamole-server/slack-desc b/network/guacamole-server/slack-desc
new file mode 100644
index 0000000000..6ebd2f9835
--- /dev/null
+++ b/network/guacamole-server/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler----------------------------------------------|
+guacamole-server: guacamole-server (Guacamole server)
+guacamole-server:
+guacamole-server: guacamole-server contains all the native, server-side
+guacamole-server: components required by Guacamole to connect to remote
+guacamole-server: desktops.  It provides a common C library, libguac, which all
+guacamole-server: other native components depend on, as well as separate
+guacamole-server: libraries for each supported protocol, and guacd, the heart
+guacamole-server: of Guacamole.
+guacamole-server:
+guacamole-server: http://guac-dev.org
+guacamole-server:
diff --git a/network/guacamole-server/uuid.patch b/network/guacamole-server/uuid.patch
new file mode 100644
index 0000000000..e3c165ee31
--- /dev/null
+++ b/network/guacamole-server/uuid.patch
@@ -0,0 +1,75 @@
+--- guacamole-server-0.9.8/configure.ac	2015-09-04 17:36:05.000000000 -0700
++++ guacamole-server-0.9.8.new/configure.ac	2015-11-27 16:36:00.229847035 -0800
+@@ -68,19 +68,25 @@
+ 
+ # OSSP UUID
+ AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid],
+-             AC_CHECK_LIB([uuid], [uuid_make], [UUID_LIBS=-luuid],
++             AC_CHECK_LIB([uuid], [uuid_generate], [UUID_LIBS=-luuid],
+                           AC_MSG_ERROR("The OSSP UUID library is required")))
+ 
+ # Check for and validate OSSP uuid.h header
+-AC_CHECK_HEADERS([ossp/uuid.h])
+-AC_CHECK_DECL([uuid_make],,
+-              AC_MSG_ERROR("No OSSP uuid.h found in include path"),
++AC_CHECK_HEADERS([ossp/uuid.h], [uuid/uuid.h])
++AC_CHECK_DECL([uuid_make],, ,
+               [#ifdef HAVE_OSSP_UUID_H
+                #include <ossp/uuid.h>
+                #else
+                #include <uuid.h>
+                #endif
+                ])
++AC_CHECK_DECL([uuid_generate],, ,
++              [#ifdef HAVE_OSSP_UUID_H
++               #include <ossp/uuid.h>
++               #else
++               #include <uuid/uuid.h>
++               #endif
++               ])
+ 
+ # cunit
+ AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
+--- guacamole-server-0.9.8/src/libguac/client.c	2015-09-04 17:36:05.000000000 -0700
++++ guacamole-server-0.9.8.new/src/libguac/client.c	2015-11-27 16:36:00.230847035 -0800
+@@ -39,7 +39,7 @@
+ #ifdef HAVE_OSSP_UUID_H
+ #include <ossp/uuid.h>
+ #else
+-#include <uuid.h>
++#include <uuid/uuid.h>
+ #endif
+ 
+ #include <stdarg.h>
+@@ -170,8 +170,8 @@
+ 
+     char* buffer;
+     char* identifier;
++#ifdef HAVE_OSSP_UUID_H
+     size_t identifier_length;
+-
+     uuid_t* uuid;
+ 
+     /* Attempt to create UUID object */
+@@ -211,6 +211,21 @@
+     }
+ 
+     uuid_destroy(uuid);
++#else
++    uuid_t uuid;
++#define UUID_LEN_STR 36
++
++    buffer = malloc (UUID_LEN_STR + 2);
++    if (buffer == NULL) {
++        guac_error = GUAC_STATUS_NO_MEMORY;
++        guac_error_message = "Could not allocate memory for connection ID";
++        return NULL;
++    }
++    identifier = buffer + 1;
++
++    uuid_generate (uuid);
++    uuid_unparse (uuid, identifier);
++#endif
+ 
+     buffer[0] = '$';
+     buffer[UUID_LEN_STR + 1] = '\0';
diff --git a/network/gui-ufw/README b/network/gui-ufw/README
new file mode 100644
index 0000000000..c2890ef653
--- /dev/null
+++ b/network/gui-ufw/README
@@ -0,0 +1,3 @@
+A very user-friendly way to manage ufw.
+
+Note: This uses an older release as it requires less dependencies and has the same functionality.
diff --git a/network/gui-ufw/binfix.diff b/network/gui-ufw/binfix.diff
new file mode 100644
index 0000000000..d2208b5075
--- /dev/null
+++ b/network/gui-ufw/binfix.diff
@@ -0,0 +1,12 @@
+--- gui-ufw-12.04.1/bin/gufw	2012-01-12 11:43:02.000000000 -0700
++++ gui-ufw-12.04.1-fix/bin/gufw	2016-01-12 18:50:01.738311270 -0700
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ LOCATIONS=(
+-"/usr/lib/python2.7/site-packages/gufw/gufw.py"
+-"/usr/lib/python2.6/site-packages/gufw/gufw.py"
++"/usr/lib64/python2.7/site-packages/gufw/gufw.py"
++"/usr/lib64/python2.6/site-packages/gufw/gufw.py"
+ "/usr/lib/python2.7/dist-packages/gufw/gufw.py"
+ "/usr/lib/python2.6/dist-packages/gufw/gufw.py"
+ )
diff --git a/network/gui-ufw/gufw.desktop b/network/gui-ufw/gufw.desktop
new file mode 100644
index 0000000000..65d0569c04
--- /dev/null
+++ b/network/gui-ufw/gufw.desktop
@@ -0,0 +1,72 @@
+[Desktop Entry]
+Version=1.0
+Name=Firewall Configuration
+Name[zh_TW]=防�牆設定
+Name[vi]=Cấu hình tư�ng lửa
+Name[uk]=Конфігураці� брандмауера
+Name[tr]=Güvenlik Duvarı Yapılandırması
+Name[sv]=Brandväggskonfiguration
+Name[sr]=Подешавање мрежне баријере
+Name[sq]=Konfigurimi i Murit mbrojtës
+Name[sl]=Nastavitev požarnega zidu
+Name[sk]=Nastavenia firewall
+Name[ru]=�а�тройка меж�етевого �крана
+Name[pt_BR]=Configuração do Firewall
+Name[pl]=Konfiguracja zapory sieciowej
+Name[nl]=Firewall-instellingen
+Name[nb]=Konfigurasjon av brannmur
+Name[lv]=Ugunsmūra konfigur�cija
+Name[id]=Konfigurasi firewall
+Name[hu]=Tűzfalbeállítás
+Name[hrx]=Fajř-vannt-ʃtelluŋŋ
+Name[hr]=Postavke vatrozida
+Name[gl]=Configuración da devasa
+Name[fr]=Configuration du pare-feu
+Name[fi]=Palomuurin asetukset
+Name[es]=Configuración del cortafuegos
+Name[en_AU]=Firewall Configuration
+Name[el]=Ρ�θμιση τείχους π�οστασίας
+Name[de]=Firewall-Konfiguration
+Name[cs]=Nastavení firewallu
+Name[bg]=Конфигуриране на защитна �тена
+Name[ast]=Configuración del tornafueos
+Name[ar]=إعدادات الجدار الناري
+Comment=Allows you to configure ufw firewall
+Comment[zh_TW]=�許您設定 ufw 防�牆
+Comment[vi]=Cho phép bạn cấu hình tư�ng lửa ufw
+Comment[uk]=Дозвол�є налаштувати брандмауер uwf
+Comment[tr]=Ufw güvenlik duvarı uygulamasını yapılandırmanıza yardımcı olur
+Comment[sv]=Låter dig konfigurera ufw-brandväggen
+Comment[sr]=Омогућава вам да поде�ите уфв мрежну баријеру
+Comment[sq]=Ju lejon te configuroni murin mbrojtes
+Comment[sl]=Omogo�a nastavitev požarnega zidu ufw
+Comment[sk]=Umožní vám nastaviť ufw firewall
+Comment[ru]=Графиче�ка� оболочка дл� на�тройки меж�етевого �крана ufw
+Comment[pt_BR]=Permite você configurar o firewall ufw
+Comment[pl]=Pozwala skonfigurować zaporę ufw
+Comment[nl]=Hiermee kunt u de ufw-firewall instellen
+Comment[nb]=Lar deg konfigurere ufw-brannmuren
+Comment[lv]=Ļauj jums konfigurēt ufw ugunsmūri
+Comment[id]=Memudahkan anda untuk mengkonfigurasi firewall ufw
+Comment[hu]=Az ufw tűzfal beállítása
+Comment[hrx]=Losst’tyģģ’ən ufw fajř-vannt ʃtellë
+Comment[hr]=Omogućava vam konfiguraciju ufw vatrozida
+Comment[gl]=Permítelle configurar a súa devasa ufw
+Comment[fr]=Vous permet de configurer le pare-feu « ufw »
+Comment[fi]=Graafinen käyttöliittymä ufw-palomuurin hallintaan
+Comment[es]=Permite configurar el cortafuegos ufw
+Comment[en_AU]=Allows you to configure ufw firewall
+Comment[el]=Σας επιτ�έπει να �υθμίσετε το τείχος π�οστασίας ufw
+Comment[de]=Erlaubt Ihnen, die ufw-Firewall zu konfigurieren
+Comment[cs]=Umožňuje nastavení firewallu ufw
+Comment[bg]=Дава ви възможно�т за на�тройка на защитната �тена ufw
+Comment[ast]=Permite configurar el tornafuéu ufw
+Comment[ar]=يسٌمح لك بإعداد الجدار الناري UFW
+Categories=GNOME;GTK;Settings;Security;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
+Exec=gufw
+Icon=gufw
+Terminal=false
+Type=Application
+X-GNOME-Settings-Panel=gufw
+X-Unity-Settings-Panel=gufw
+X-Ubuntu-Gettext-Domain=gufw
diff --git a/network/gui-ufw/gui-ufw.SlackBuild b/network/gui-ufw/gui-ufw.SlackBuild
new file mode 100644
index 0000000000..73b25c41fe
--- /dev/null
+++ b/network/gui-ufw/gui-ufw.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for gui-ufw
+#
+# Copyright 2016 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gui-ufw
+VERSION=${VERSION:-12.04.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/"$PRGNAM"_"$VERSION".orig.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fixes paths in bin script
+patch -p1 < $CWD/binfix.diff
+
+python setup.py install --root=$PKG
+
+# Fix paths and cleanup
+mv $PKG/usr/share/man $PKG/usr/man
+install -D -m 0644 $PKG/usr/share/icons/hicolor/48x48/apps/gufw.png $PKG/usr/share/pixmaps/gufw.png
+rm -rf $PKG/usr/share/doc
+
+# Desktop file modded to be like newer releases of gufw
+install -D -m 0644 $CWD/gufw.desktop $PKG/usr/share/applications/gufw.desktop
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.GPL3 INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/gui-ufw/gui-ufw.info b/network/gui-ufw/gui-ufw.info
new file mode 100644
index 0000000000..ed5670ab1a
--- /dev/null
+++ b/network/gui-ufw/gui-ufw.info
@@ -0,0 +1,10 @@
+PRGNAM="gui-ufw"
+VERSION="12.04.1"
+HOMEPAGE="http://gufw.org/"
+DOWNLOAD="http://archive.ubuntu.com/ubuntu/pool/universe/g/gui-ufw/gui-ufw_12.04.1.orig.tar.gz"
+MD5SUM="0f8e27ccac4957195eb74da4c4cb1b74"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pygobject3 python-distutils-extra ufw"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/network/gui-ufw/slack-desc b/network/gui-ufw/slack-desc
new file mode 100644
index 0000000000..3aee27511e
--- /dev/null
+++ b/network/gui-ufw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+gui-ufw: gui-ufw (GUI for Uncomplicated Firewall)
+gui-ufw:      
+gui-ufw: A very user-friendly way to manage ufw.
+gui-ufw:
+gui-ufw: Homepage: http://gufw.org/
+gui-ufw:
+gui-ufw:
+gui-ufw:
+gui-ufw:
+gui-ufw:
+gui-ufw:
diff --git a/network/haproxy/README b/network/haproxy/README
index dc8ef46728..271fffc62c 100644
--- a/network/haproxy/README
+++ b/network/haproxy/README
@@ -1,3 +1,7 @@
 HAProxy is a free, very fast and reliable solution offering high
 availability, load balancing, and proxying for TCP and HTTP-based
 applications. It is particularly suited for very high traffic web sites.
+
+Note that a default configuration file is no longer provided at
+/etc/haproxy/haproxy.cfg. See /usr/doc/haproxy-*/examples for some
+sample configuration files.
diff --git a/network/haproxy/doinst.sh b/network/haproxy/doinst.sh
index 0b42c37468..fd839dfb11 100644
--- a/network/haproxy/doinst.sh
+++ b/network/haproxy/doinst.sh
@@ -23,4 +23,3 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.haproxy.new
-config etc/haproxy/haproxy.cfg.new
diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index f866940f10..878709c089 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haproxy
-VERSION=${VERSION:-1.5.14}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,14 +80,14 @@ make \
     USE_PCRE=1 \
     USE_OPENSSL=1 \
     USE_ZLIB=1 \
+    USE_NS=1 \
     EXTRA=""
-make install-man \
+make install \
     PREFIX=/usr \
     MANDIR=/usr/man \
+    DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    EXTRA="" \
     DESTDIR=$PKG
-# A Makefile bug builds/installs a systemd wrapper during the
-# install/install-bin step even with EXTRA=""...
-install -D -m 0755 haproxy $PKG/usr/sbin/haproxy
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -96,11 +96,10 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-install -D -m 0644 examples/$PRGNAM.cfg $PKG/etc/haproxy/$PRGNAM.cfg.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG LICENSE README ROADMAP SUBVERS VERDATE VERSION doc examples \
+cp -a CHANGELOG CONTRIBUTING LICENSE MAINTAINERS README ROADMAP SUBVERS VERDATE VERSION examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/etc/haproxy
 mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/errorfiles $PKG/etc/haproxy/errors
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/haproxy/haproxy.info b/network/haproxy/haproxy.info
index c6f48ab87f..bce4deb4a1 100644
--- a/network/haproxy/haproxy.info
+++ b/network/haproxy/haproxy.info
@@ -1,8 +1,8 @@
 PRGNAM="haproxy"
-VERSION="1.5.14"
+VERSION="1.6.2"
 HOMEPAGE="http://www.haproxy.org/"
-DOWNLOAD="http://www.haproxy.org/download/1.5/src/haproxy-1.5.14.tar.gz"
-MD5SUM="ad9d7262b96ba85a0f8c6acc6cb9edde"
+DOWNLOAD="http://www.haproxy.org/download/1.6/src/haproxy-1.6.2.tar.gz"
+MD5SUM="d0ebd3d123191a8136e2e5eb8aaff039"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hipchat/hipchat.SlackBuild b/network/hipchat/hipchat.SlackBuild
index b968a750af..48ee3be935 100644
--- a/network/hipchat/hipchat.SlackBuild
+++ b/network/hipchat/hipchat.SlackBuild
@@ -10,7 +10,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild
index 0b2ba1ddd0..86ec88e9e2 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -26,7 +26,7 @@
 # Fixed doinst.sh by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=hostapd
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info
index 2b4194ed2d..f874ad363d 100644
--- a/network/hostapd/hostapd.info
+++ b/network/hostapd/hostapd.info
@@ -1,8 +1,8 @@
 PRGNAM="hostapd"
-VERSION="2.4"
+VERSION="2.5"
 HOMEPAGE="http://w1.fi/hostapd/"
-DOWNLOAD="http://w1.fi/releases/hostapd-2.4.tar.gz"
-MD5SUM="04578f3f2c3eb1bec1adf30473813912"
+DOWNLOAD="http://w1.fi/releases/hostapd-2.5.tar.gz"
+MD5SUM="69f9cec3f76d74f402864a43e4f8624f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index 1dbd7e8093..0dc5671a3f 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -1,7 +1,10 @@
 #!/bin/sh
 
 # Slackware build script for hping3 TCP/IP packet assembler/analyzer
-
+#
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
 # Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
@@ -24,7 +27,7 @@
 
 PRGNAM=hping3
 VERSION=${VERSION:-20051105}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -79,6 +82,12 @@ patch -p1 < $CWD/patches/spelling.diff
 patch -p1 < $CWD/patches/personality.diff
 patch -p1 < $CWD/patches/tcl.diff
 patch -p1 < $CWD/patches/ip_id_field.diff
+patch -p1 < $CWD/patches/dontfrag_offbyone.diff
+patch -p1 < $CWD/patches/rtt_icmp_unreachable.diff
+patch -p1 < $CWD/patches/spelling_error_in_binary.diff
+patch -p1 < $CWD/patches/data_size_udp.diff
+patch -p1 < $CWD/patches/tcp_mss.diff
+patch -p1 < $CWD/patches/ip_optlen_conflicting_types.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/hping3/hping3.info b/network/hping3/hping3.info
index abbc4ab53c..327463b0e8 100644
--- a/network/hping3/hping3.info
+++ b/network/hping3/hping3.info
@@ -6,5 +6,5 @@ MD5SUM="ca4ea4e34bcc2162aedf25df8b2d1747"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/hping3/patches/data_size_udp.diff b/network/hping3/patches/data_size_udp.diff
new file mode 100644
index 0000000000..b10c243eb8
--- /dev/null
+++ b/network/hping3/patches/data_size_udp.diff
@@ -0,0 +1,20 @@
+
+Fix incorrect data size check for UDP.
+
+--- a/parseoptions.c
++++ b/parseoptions.c
+@@ -569,9 +573,12 @@
+ 	if (opt_numeric == TRUE) opt_gethost = FALSE;
+ 
+ 	/* some error condition */
+-	if (data_size+IPHDR_SIZE+TCPHDR_SIZE > 65535) {
++	if (data_size+IPHDR_SIZE+
++	    (opt_udpmode?UDPHDR_SIZE:TCPHDR_SIZE) > 65535) {
+ 		printf("Option error: sorry, data size must be <= %lu\n",
+-			(unsigned long)(65535-IPHDR_SIZE+TCPHDR_SIZE));
++			(unsigned long)(65535-(IPHDR_SIZE+
++					(opt_udpmode?UDPHDR_SIZE:TCPHDR_SIZE)))
++				       );
+ 		exit(1);
+ 	}
+ 	else if (count <= 0 && count != -1) {
diff --git a/network/hping3/patches/dontfrag_offbyone.diff b/network/hping3/patches/dontfrag_offbyone.diff
new file mode 100644
index 0000000000..d0be06e436
--- /dev/null
+++ b/network/hping3/patches/dontfrag_offbyone.diff
@@ -0,0 +1,14 @@
+
+Fixes Off-by-one error with --dontfrag
+
+--- a/sendip_handler.c
++++ b/sendip_handler.c
+@@ -19,7 +19,7 @@
+ {
+ 	ip_optlen = ip_opt_build(ip_opt);
+ 
+-	if (!opt_fragment && (size+ip_optlen+20 >= h_if_mtu))
++	if (!opt_fragment && (size+ip_optlen+20 > h_if_mtu))
+ 	{
+ 		/* auto-activate fragmentation */
+ 		virtual_mtu = h_if_mtu-20;
diff --git a/network/hping3/patches/ip_optlen_conflicting_types.diff b/network/hping3/patches/ip_optlen_conflicting_types.diff
new file mode 100644
index 0000000000..b31b744730
--- /dev/null
+++ b/network/hping3/patches/ip_optlen_conflicting_types.diff
@@ -0,0 +1,18 @@
+
+Fixes complicting declarations of variables ip_optlen in:
+
+globals.h: extern char ip_optlen
+and
+main.c: unsigned ip_optlen
+
+--- hping3.git.orig/main.c
++++ hping3.git/main.c
+@@ -152,7 +152,7 @@ unsigned char
+ 	lsr		[255] = {0},
+ 	ssr		[255] = {0};
+ 
+-unsigned
++char
+ 	ip_optlen	= 0;
+ 
+ struct sockaddr_in
diff --git a/network/hping3/patches/rtt_icmp_unreachable.diff b/network/hping3/patches/rtt_icmp_unreachable.diff
new file mode 100644
index 0000000000..81fa6c194e
--- /dev/null
+++ b/network/hping3/patches/rtt_icmp_unreachable.diff
@@ -0,0 +1,32 @@
+
+Adds RTT handling for ICMP destination unreachable packets
+
+--- a/waitpacket.c
++++ b/waitpacket.c
+@@ -229,6 +229,7 @@
+ {
+ 	struct myicmphdr icmp;
+ 	struct myiphdr quoted_ip;
++	struct myudphdr quoted_udp;
+ 
+ 	/* Check if the packet can contain the ICMP header */
+ 	if (size < ICMPHDR_SIZE) {
+@@ -286,6 +287,18 @@
+ 		case 3:
+ 			if (!opt_quiet)
+ 				log_icmp_unreach(inet_ntoa(src), icmp.code);
++			if (quoted_ip.protocol == IPPROTO_UDP)
++			{
++				int sequence = 0, status;
++				float ms_delay = 0.0;
++				unsigned short port;
++
++				/* Get RTT for UDP packet */
++				memcpy(&quoted_udp, packet+ICMPHDR_SIZE+(quoted_ip.ihl<<2), sizeof(quoted_udp));
++				port = ntohs(quoted_udp.uh_sport);
++				status = rtt(&sequence, port, &ms_delay);
++				printf("status=%d port=%d seq=%d\n", status, port, sequence);
++			}
+ 			return 1;
+ 		case 11:
+ 			if (opt_traceroute)
diff --git a/network/hping3/patches/spelling_error_in_binary.diff b/network/hping3/patches/spelling_error_in_binary.diff
new file mode 100644
index 0000000000..a7ac1f12d3
--- /dev/null
+++ b/network/hping3/patches/spelling_error_in_binary.diff
@@ -0,0 +1,153 @@
+
+Fixes spelling errors in binary
+
+--- a/parseoptions.c
++++ b/parseoptions.c
+@@ -174,7 +174,7 @@
+                         str[j++] = '/';
+                     break;
+                 }
+-                fprintf(stderr, "invalid IP adress in route\n");
++                fprintf(stderr, "invalid IP address in route\n");
+                 fail_parse_route();
+             case ':':
+                 if ((!i) && j && j < 4)
+--- a/getifname.c
++++ b/getifname.c
+@@ -206,7 +206,7 @@
+                                 printf("DEBUG: Output interface address: %s\n",
+                                         inet_ntoa(output_if_addr.sin_addr));
+ 			/* Put something in saved_ifname in order to tell
+-			   that the output adress is known */
++			   that the output address is known */
+ 			saved_ifname[0] = 'X'; saved_ifname[1] = 0;
+                 } else {
+                         fprintf(stderr, "Warning: Unable to guess the output "
+--- a/usage.c
++++ b/usage.c
+@@ -50,7 +50,7 @@
+ "  -r  --rel        relativize id field          (to estimate host traffic)\n"
+ "  -f  --frag       split packets in more frag.  (may pass weak acl)\n"
+ "  -x  --morefrag   set more fragments flag\n"
+-"  -y  --dontfrag   set dont fragment flag\n"
++"  -y  --dontfrag   set don't fragment flag\n"
+ "  -g  --fragoff    set the fragment offset\n"
+ "  -m  --mtu        set virtual mtu, implies --frag if packet size > mtu\n"
+ "  -o  --tos        type of service (default 0x00), try --tos help\n"
+@@ -126,8 +126,8 @@
+ "ICMP help:\n"
+ " ICMP concerned packet options:\n"
+ "  --icmp-ipver     set ip version               ( default 4 )\n"
+-"  --icmp-iphlen    set ip header lenght         ( default IPHDR_SIZE >> 2)\n"
+-"  --icmp-iplen     set ip total lengtht         ( default real lenght )\n"
++"  --icmp-iphlen    set ip header length         ( default IPHDR_SIZE >> 2)\n"
++"  --icmp-iplen     set ip total length          ( default real length )\n"
+ "  --icmp-ipid      set ip id                    ( default random )\n"
+ "  --icmp-ipproto   set ip protocol              ( default IPPROTO_TCP )\n"
+ "  --icmp-ipsrc     set ip source                ( default 0.0.0.0 )\n"
+--- a/sendtcp.c
++++ b/sendtcp.c
+@@ -50,7 +50,7 @@
+ 	memcpy(&pseudoheader->saddr, &local.sin_addr.s_addr, 4);
+ 	memcpy(&pseudoheader->daddr, &remote.sin_addr.s_addr, 4);
+ 	pseudoheader->protocol		= 6; /* tcp */
+-	pseudoheader->lenght		= htons(TCPHDR_SIZE+tcp_opt_size+data_size);
++	pseudoheader->length		= htons(TCPHDR_SIZE+tcp_opt_size+data_size);
+ 
+ 	/* tcp header */
+ 	tcp->th_dport	= htons(dst_port);
+--- a/sendudp.c
++++ b/sendudp.c
+@@ -46,7 +46,7 @@
+ 	memcpy(&pseudoheader->saddr, &local.sin_addr.s_addr, 4);
+ 	memcpy(&pseudoheader->daddr, &remote.sin_addr.s_addr, 4);
+ 	pseudoheader->protocol		= 17; /* udp */
+-	pseudoheader->lenght		= htons(packet_size);
++	pseudoheader->length		= htons(packet_size);
+ 
+ 	/* udp header */
+ 	udp->uh_dport	= htons(dst_port);
+--- a/sendicmp.c
++++ b/sendicmp.c
+@@ -243,7 +243,7 @@
+ 	memcpy(&pseudoheader->saddr, &icmp_ip_src.sin_addr.s_addr, 4);
+ 	memcpy(&pseudoheader->daddr, &icmp_ip_dst.sin_addr.s_addr, 4);
+ 	pseudoheader->protocol = icmp_ip.protocol;
+-	pseudoheader->lenght = icmp_ip.tot_len;
++	pseudoheader->length = icmp_ip.tot_len;
+ 	icmp_udp->uh_sport = htons(icmp_ip_srcport);
+ 	icmp_udp->uh_dport = htons(icmp_ip_dstport);
+ 	icmp_udp->uh_ulen  = htons(UDPHDR_SIZE + udp_data_len);
+--- a/hping2.h
++++ b/hping2.h
+@@ -134,7 +134,7 @@
+ 	
+ /* fragmentation defines */
+ #define MF ((unsigned short)0x2000)	/* more fragments */
+-#define DF ((unsigned short)0x4000)	/* dont fragment */
++#define DF ((unsigned short)0x4000)	/* don't fragment */
+ #define NF ((unsigned short)0x0000)	/* no more fragments */
+ 
+ /* ip options defines */
+@@ -337,7 +337,7 @@
+ 	__u32 daddr;
+ 	__u8  zero;
+ 	__u8  protocol;
+-	__u16 lenght;
++	__u16 length;
+ };
+ 
+ #define PSEUDOHDR_SIZE sizeof(struct pseudohdr)
+--- a/ars.c
++++ b/ars.c
+@@ -698,7 +698,7 @@
+ 	memcpy(&pseudo.daddr, &ip->daddr, 4);
+ 	pseudo.protocol = (pkt->p_layer[layer].l_type == ARS_TYPE_TCP)
+ 		? ARS_IPPROTO_TCP : ARS_IPPROTO_UDP;
+-	pseudo.lenght = htons(ars_relative_size(pkt, layer));
++	pseudo.length = htons(ars_relative_size(pkt, layer));
+ 
+ 	/* Finally do the checksum */
+ 	ars_multi_cksum(&mc, ARS_MC_INIT, NULL, 0);
+--- a/datahandler.c
++++ b/datahandler.c
+@@ -26,7 +26,7 @@
+ 	}
+ 
+ 	if (opt_sign) {
+-		memcpy(data, sign, signlen); /* lenght pre-checked */
++		memcpy(data, sign, signlen); /* length pre-checked */
+ 		data+=signlen;
+ 		data_size-=signlen;
+ 	}
+--- a/ars.h
++++ b/ars.h
+@@ -67,7 +67,7 @@
+ #define ARS_MAX_IP_SIZE		65535
+ 
+ #define ARS_IP_MF ((unsigned short)0x2000)	/* more fragments */
+-#define ARS_IP_DF ((unsigned short)0x4000)	/* dont fragment */
++#define ARS_IP_DF ((unsigned short)0x4000)	/* don't fragment */
+ #define ARS_IP_RF ((unsigned short)0x8000)	/* reserved fragment flag */
+ 
+ #define ARS_IPOPT_COPY		0x80
+@@ -308,7 +308,7 @@
+ 	__u32 daddr;
+ 	__u8  zero;
+ 	__u8  protocol;
+-	__u16 lenght;
++	__u16 length;
+ };
+ 
+ /* The IGRP header structure */
+--- a/sendip_handler.c
++++ b/sendip_handler.c
+@@ -35,7 +35,7 @@
+ 		unsigned short fragment_flag = 0;
+ 
+ 		if (opt_mf) fragment_flag |= MF; /* more fragments */
+-		if (opt_df) fragment_flag |= DF; /* dont fragment */
++		if (opt_df) fragment_flag |= DF; /* don't fragment */
+ 		send_ip((char*)&local.sin_addr,
+ 			(char*)&remote.sin_addr,
+ 			packet, size, fragment_flag, ip_frag_offset,
diff --git a/network/hping3/patches/tcp_mss.diff b/network/hping3/patches/tcp_mss.diff
new file mode 100644
index 0000000000..37113dc8da
--- /dev/null
+++ b/network/hping3/patches/tcp_mss.diff
@@ -0,0 +1,180 @@
+Add tcp-mss support.
+
+--- a/main.c
++++ b/main.c
+@@ -44,7 +44,8 @@
+ 	signlen,
+ 	lsr_length = 0,
+ 	ssr_length = 0,
+-	tcp_ack;
++	tcp_ack,
++	tcp_mss;
+ 
+ 
+ unsigned short int
+@@ -95,6 +96,7 @@
+ 	opt_tcpexitcode	= FALSE,
+ 	opt_badcksum	= FALSE,
+ 	opt_tr_keep_ttl = FALSE,
++	opt_tcp_mss	= FALSE,
+ 	opt_tcp_timestamp = FALSE,
+ 	opt_tr_stop	= FALSE,
+ 	opt_tr_no_rtt	= FALSE,
+--- a/globals.h
++++ b/globals.h
+@@ -32,7 +32,8 @@
+ 		tcp_seqnum,
+ 		set_ack,
+ 		ip_header_length,
+-		tcp_ack;
++		tcp_ack,
++		tcp_mss;
+ 
+ extern unsigned short int
+ 		data_size;
+@@ -77,6 +78,7 @@
+ 		opt_tcpexitcode,
+ 		opt_badcksum,
+ 		opt_tr_keep_ttl,
++		opt_tcp_mss,
+ 		opt_tcp_timestamp,
+ 		opt_tr_stop,
+ 		opt_tr_no_rtt,
+--- a/parseoptions.c
++++ b/parseoptions.c
+@@ -31,7 +31,7 @@
+ 	OPT_RROUTE, OPT_IPPROTO, OPT_ICMP_IPVER, OPT_ICMP_IPHLEN,
+ 	OPT_ICMP_IPLEN, OPT_ICMP_IPID, OPT_ICMP_IPPROTO, OPT_ICMP_CKSUM,
+ 	OPT_ICMP_TS, OPT_ICMP_ADDR, OPT_TCPEXITCODE, OPT_FAST, OPT_TR_KEEP_TTL,
+-	OPT_TCP_TIMESTAMP, OPT_TR_STOP, OPT_TR_NO_RTT, OPT_ICMP_HELP,
++	OPT_TCP_TIMESTAMP, OPT_TCP_MSS, OPT_TR_STOP, OPT_TR_NO_RTT, OPT_ICMP_HELP,
+ 	OPT_RAND_DEST, OPT_RAND_SOURCE, OPT_LSRR, OPT_SSRR, OPT_ROUTE_HELP,
+ 	OPT_ICMP_IPSRC, OPT_ICMP_IPDST, OPT_ICMP_SRCPORT, OPT_ICMP_DSTPORT,
+ 	OPT_ICMP_GW, OPT_FORCE_ICMP, OPT_APD_SEND, OPT_SCAN, OPT_FASTER,
+@@ -124,6 +124,7 @@
+ 	{ '\0', "force-icmp",	OPT_FORCE_ICMP,		AGO_NOARG },
+ 	{ '\0', "beep",		OPT_BEEP,		AGO_NOARG },
+ 	{ '\0', "flood",	OPT_FLOOD,		AGO_NOARG },
++	{ '\0', "tcp-mss",	OPT_TCP_MSS,		AGO_NEEDARG|AGO_EXCEPT0 },
+ 	AGO_LIST_TERM
+ };
+ 
+@@ -556,6 +557,10 @@
+ 		case OPT_FLOOD:
+ 			opt_flood = TRUE;
+ 			break;
++		case OPT_TCP_MSS:
++			opt_tcp_mss = TRUE;
++			tcp_mss = strtoul(ago_optarg, NULL, 0);
++			break;
+ 		}
+ 	}
+ 
+--- a/usage.c
++++ b/usage.c
+@@ -87,6 +87,7 @@
+ "  -X  --xmas       set X unused flag (0x40)\n"
+ "  -Y  --ymas       set Y unused flag (0x80)\n"
+ "  --tcpexitcode    use last tcp->th_flags as exit code\n"
++"  --tcp-mss        enable the TCP MSS option with the given value\n"
+ "  --tcp-timestamp  enable the TCP timestamp option to guess the HZ/uptime\n"
+ "Common\n"
+ "  -d  --data       data size                    (default is 0)\n"
+--- a/sendtcp.c
++++ b/sendtcp.c
+@@ -28,10 +28,12 @@
+ 	char			*packet, *data;
+ 	struct mytcphdr		*tcp;
+ 	struct pseudohdr	*pseudoheader;
+-	unsigned char		*tstamp;
++	unsigned char		*opts;
+ 
++	if (opt_tcp_mss)
++		tcp_opt_size += 4;
+ 	if (opt_tcp_timestamp)
+-		tcp_opt_size = 12;
++		tcp_opt_size += 12;
+ 
+ 	packet_size = TCPHDR_SIZE + tcp_opt_size + data_size;
+ 	packet = malloc(PSEUDOHDR_SIZE + packet_size);
+@@ -41,7 +43,7 @@
+ 	}
+ 	pseudoheader = (struct pseudohdr*) packet;
+ 	tcp =  (struct mytcphdr*) (packet+PSEUDOHDR_SIZE);
+-	tstamp = (unsigned char*) (packet+PSEUDOHDR_SIZE+TCPHDR_SIZE);
++	opts = (unsigned char*) (packet+PSEUDOHDR_SIZE+TCPHDR_SIZE);
+ 	data = (char*) (packet+PSEUDOHDR_SIZE+TCPHDR_SIZE+tcp_opt_size);
+ 	
+ 	memset(packet, 0, PSEUDOHDR_SIZE+packet_size);
+@@ -64,14 +66,24 @@
+ 	tcp->th_win	= htons(src_winsize);
+ 	tcp->th_flags	= tcp_th_flags;
+ 
++	/* tcp MSS option */
++	if (opt_tcp_mss) {
++		opts[0] = 2;
++		opts[1] = 4;  /* 4 bytes, kind+len+MSS */
++		opts[2] = tcp_mss >> 8;
++		opts[3] = tcp_mss & 0xff;
++		opts += 4;
++	}
++
+ 	/* tcp timestamp option */
+ 	if (opt_tcp_timestamp) {
+ 		__u32 randts = rand() ^ (rand() << 16);
+-		tstamp[0] = tstamp[1] = 1; /* NOOP */
+-		tstamp[2] = 8;
+-		tstamp[3] = 10; /* 10 bytes, kind+len+T1+T2 */
+-		memcpy(tstamp+4, &randts, 4); /* random */
+-		memset(tstamp+8, 0, 4); /* zero */
++		opts[0] = opts[1] = 1; /* NOOP */
++		opts[2] = 8;
++		opts[3] = 10; /* 10 bytes, kind+len+T1+T2 */
++		memcpy(opts+4, &randts, 4); /* random */
++		memset(opts+8, 0, 4); /* zero */
++		opts += 12;
+ 	}
+ 
+ 	/* data */
+--- a/docs/hping3.8
++++ b/docs/hping3.8
+@@ -98,6 +98,8 @@
+ ] [
+ .B \-\-tcpexitcode
+ ] [
++.B \-\-tcp-mss
++] [
+ .B \-\-tcp-timestamp
+ ] [
+ .B \-\-tr-stop
+@@ -510,6 +512,9 @@
+ .I -b --badcksum
+ Send packets with a bad UDP/TCP checksum.
+ .TP
++.I --tcp-mss
++Enable the TCP MSS option and set it to the given value.
++.TP
+ .I --tcp-timestamp
+ Enable the TCP timestamp option, and try to guess the timestamp update
+ frequency and the remote system uptime.
+--- a/docs/french/hping2-fr.8
++++ b/docs/french/hping2-fr.8
+@@ -99,6 +99,8 @@
+ ] [
+ .B \-\-tcpexitcode
+ ] [
++.B \-\-tcp-mss
++] [
+ .B \-\-tcp-timestamp
+ ] [
+ .B \-\-tr-stop
+@@ -549,6 +551,9 @@
+ .I -b --badcksum
+ Envoie des paquets avec une mauvaise somme de contrôle UDP/TCP
+ .TP
++.I --tcp-mss
++Active l'option TCP MSS et la fixe avec la valeur donnée.
++.TP
+ .I --tcp-timestamp
+ Active l'option TCP timestamp, et essaye de deviner la fréquence de mise à
+ jour du timestamp et l'uptime du système distant.
diff --git a/network/httptunnel/httptunnel.info b/network/httptunnel/httptunnel.info
index 7451982706..7a02800b43 100644
--- a/network/httptunnel/httptunnel.info
+++ b/network/httptunnel/httptunnel.info
@@ -1,7 +1,7 @@
 PRGNAM="httptunnel"
 VERSION="3.0.5"
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
-DOWNLOAD="http://www.nocrew.org/software/httptunnel/httptunnel-3.0.5.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/httptunnel-3.0.5.tar.gz"
 MD5SUM="2a710f377c82ab4eb201458f7b9f99c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/hylafax+/README b/network/hylafax+/README
index cb69ea0c13..61906f0a5c 100644
--- a/network/hylafax+/README
+++ b/network/hylafax+/README
@@ -6,4 +6,4 @@ an outbound job from any other machine on the network.
 
 HylaFAX+ is a more feature rich fork of the HylaFAX project.
 
-See /usr/doc/hylafax-5.5.3/README.SLACKWARE for configuration hints.
+See /usr/doc/hylafax-5.5.7/README.SLACKWARE for configuration hints.
diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild
index 05c3402162..8854bfa896 100644
--- a/network/hylafax+/hylafax+.SlackBuild
+++ b/network/hylafax+/hylafax+.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=hylafax+
 SRCNAM=hylafax
-VERSION=${VERSION:-5.5.3}
+VERSION=${VERSION:-5.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/hylafax+/hylafax+.info b/network/hylafax+/hylafax+.info
index 856c14f0fd..0cb0e3c097 100644
--- a/network/hylafax+/hylafax+.info
+++ b/network/hylafax+/hylafax+.info
@@ -1,8 +1,8 @@
 PRGNAM="hylafax+"
-VERSION="5.5.3"
+VERSION="5.5.7"
 HOMEPAGE="http://hylafax.sourceforge.net"
-DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-5.5.3.tar.gz"
-MD5SUM="5318b605f21843d418114ccac10ae7dd"
+DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-5.5.7.tar.gz"
+MD5SUM="6497db7fec4b96b919567d6ef38402bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/icecat/README b/network/icecat/README
index b41acfed99..cb978146f1 100644
--- a/network/icecat/README
+++ b/network/icecat/README
@@ -4,27 +4,24 @@ ethical one: it is entirely free software. While the Firefox source
 code from the Mozilla project is free software, they distribute and
 recommend non-free software as plug-ins and addons. Also their
 trademark license restricts distribution in several ways incompatible
-with freedom 0. Icecat includes the following privacy protection
-features:
+with freedom 0.
 
-LibreJS: GNU LibreJS aims to address the JavaScript problem described
-in Richard Stallman's article The JavaScript Trap.
+Icecat's additional privacy features are in form of browser addons.
+This SlackBuild unbundles them so that users can install the ones they
+want in the usual way:
 
-Https-Everywhere: Extension that encrypts your communications with
-many major websites, making your browsing more secure.
+* SpyBlock is a fork of Adblock Plus with extra privacy features.
 
-SpyBlock: Blocks privacy trackers while in normal browsing mode, and
-all third party requests when in private browsing mode. Based on
-Adblock Plus.
+* Https Everywhere automatically encrypts your communications with
+  many major websites, making your browsing more secure.
 
-AboutIceCat: Adds a custom "about:icecat" homepage with links to
-information about the free software and privacy features in IceCat,
-and checkboxes to enable and disable the ones more prone to break
-websites.
+* HTML5 Video Everywhere enables popular video sites to use the
+  browser's built-in video player.
 
-Fingerprinting countermeasures: Fingerprinting is a series of
-techniques allowing to uniquely identify a browser based on specific
-characterisics of that particular instance (like what fonts are
-available in that machine). Unlike cookies the user cannot opt-out of
-being tracked this way, so the browser has to avoid giving away that
-kind of hints.
+* LibreJS blocks javascript scripts unless they are tagged as free
+  software [EXPERIMENTAL]
+
+* AboutIceCat adds a custom "about:icecat" homepage with links to
+  information about the free software and privacy features in IceCat,
+  and checkboxes to enable and disable the ones more prone to break
+  websites. [COSMETIC]
diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild
index 63945b42b5..deb053854a 100644
--- a/network/icecat/icecat.SlackBuild
+++ b/network/icecat/icecat.SlackBuild
@@ -25,10 +25,10 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM="icecat"
-VERSION=${VERSION:-31.8.0}
+VERSION=${VERSION:-38.5.0}
 RELEASEVER="$VERSION"
 RELEASEVERMAJ=$(echo $RELEASEVER | cut -f 1 -d .)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -169,6 +169,13 @@ rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/icecat-devel-$RELEASEVER
 # Nor these:
 rm -rf $PKG/usr/include
 
+# OK, this is just awkward. Only OS-dependent addons should be in the
+# OS software channel, and the rest should be installed by the user,
+# or else the user gets stuck with unremovable addons. This especially
+# affects the adblockers, since some of them are incompatible.
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/icecat-$RELEASEVER/browser/extensions \
+  && rm -rf spyblock* jid1* https* html5* abouticecat* )
+
 # Desktop integration
 mkdir -p $PKG/usr/share/applications
 cat $CWD/icecat.desktop > $PKG/usr/share/applications/icecat.desktop
diff --git a/network/icecat/icecat.info b/network/icecat/icecat.info
index 8d27a6997c..1d84b356e2 100644
--- a/network/icecat/icecat.info
+++ b/network/icecat/icecat.info
@@ -1,8 +1,8 @@
 PRGNAM="icecat"
-VERSION="31.8.0"
+VERSION="38.5.0"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-DOWNLOAD="http://ftp.gnu.org/gnu/gnuzilla/31.8.0/icecat-31.8.0-gnu1.tar.bz2"
-MD5SUM="5ab9759aa19fda6e277f87c5081c4acd"
+DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/38.5.0/icecat-38.5.0-gnu1.tar.bz2"
+MD5SUM="45eda8c22a5ae4497ec990ed63ce4c00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/icinga2/icinga2.SlackBuild b/network/icinga2/icinga2.SlackBuild
index 96dee8fce4..269b98fd10 100644
--- a/network/icinga2/icinga2.SlackBuild
+++ b/network/icinga2/icinga2.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icinga2
-VERSION=${VERSION:-2.3.5}
+VERSION=${VERSION:-2.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,7 +90,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -119,11 +119,14 @@ cd ..
 # Where precision tools fail, the hammer succeeds
 mv $PKG/usr/share/man $PKG/usr/man
 
+# Dislexya is fun!
+sed -e 's# >/dev/null 2&>1; # >/dev/null 2>&1; #' -i $PKG/usr/lib/icinga2/prepare-dirs
+
 # Match config with monitoring-plugins, manubulon-snmp-plugins & nagios-plugins packages
-sed -i -e 's#^\(const ManubulonPluginDir =\).*#\1 "/usr/libexec/manubulon-snmp-plugins"#' \
-       -e 's#^\(const PluginDir =\).*#\1 "/usr/libexec/monitoring-plugins"#' \
-       -e 's#^\(const PluginContribDir =\).*#\1 "/usr/libexec/nagios"#' \
-  $PKG/etc/$PRGNAM/constants.conf
+sed -e 's#^\(const ManubulonPluginDir =\).*#\1 "/usr/libexec/manubulon-snmp-plugins"#' \
+    -e 's#^\(const PluginDir =\).*#\1 "/usr/libexec/monitoring-plugins"#' \
+    -e 's#^\(const PluginContribDir =\).*#\1 "/usr/libexec/nagios"#' \
+    -i $PKG/etc/$PRGNAM/constants.conf
 
 # Convert SYSV init script to BSD style
 mv $PKG/etc/init.d $PKG/etc/rc.d
@@ -134,6 +137,10 @@ chmod -R 0775 $PKG/var/{cache,log,lib,run,spool}/$PRGNAM
 chown -R icinga:icinga $PKG/var/{cache,log,lib,run,spool}/$PRGNAM
 chown icinga:icingacmd $PKG/var/{log/$PRGNAM,run/$PRGNAM/cmd}
 
+# The logrotate script also needs some love
+sed -e 's#service icinga2#/etc/rc.d/rc.icinga2#' \
+    -i $PKG/etc/logrotate.d/$PRGNAM
+
 # Finally, append .new to files
 find $PKG/etc $PKG/usr/share/$PRGNAM -type f ! -name "README" -exec mv {} {}.new \;
 
diff --git a/network/icinga2/icinga2.info b/network/icinga2/icinga2.info
index cfe6cdfe2d..cf3794b5fa 100644
--- a/network/icinga2/icinga2.info
+++ b/network/icinga2/icinga2.info
@@ -1,8 +1,8 @@
 PRGNAM="icinga2"
-VERSION="2.3.5"
+VERSION="2.4.0"
 HOMEPAGE="https://www.icinga.org/"
-DOWNLOAD="https://github.com/Icinga/icinga2/archive/v2.3.5.tar.gz"
-MD5SUM="c739cdf969dfbc5c105c4bd31a8917a3"
+DOWNLOAD="https://github.com/Icinga/icinga2/archive/v2.4.0.tar.gz"
+MD5SUM="fba998d5da10f95c512ac3e41616c264"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yajl"
diff --git a/network/ii/README b/network/ii/README
new file mode 100644
index 0000000000..defeb9ef8e
--- /dev/null
+++ b/network/ii/README
@@ -0,0 +1,5 @@
+Irc it is a minimalist FIFO and filesystem-based IRC client. It creates
+an irc directory tree with server, channel and nick name directories. In
+every directory a FIFO in file and a normal out file is created. The in
+files are used to communicate with servers and the out files contain
+server messages. This allows IRC communication from the command line.
diff --git a/network/ii/ii.SlackBuild b/network/ii/ii.SlackBuild
new file mode 100644
index 0000000000..e508856f60
--- /dev/null
+++ b/network/ii/ii.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for ii
+
+# Copyright 2015 T3slider
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ii
+VERSION=${VERSION:-1.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i -e "s/-O.\>/$SLKCFLAGS/" -e "s/\<lib\>/$LIBDIRSUFFIX/" config.mk
+
+make PREFIX=/usr MANDIR=/usr/man DOCDIR=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ii/ii.info b/network/ii/ii.info
new file mode 100644
index 0000000000..010ec5edf7
--- /dev/null
+++ b/network/ii/ii.info
@@ -0,0 +1,10 @@
+PRGNAM="ii"
+VERSION="1.7"
+HOMEPAGE="http://tools.suckless.org/ii/"
+DOWNLOAD="http://dl.suckless.org/tools/ii-1.7.tar.gz"
+MD5SUM="6191008ca09770873d84f40270493d0e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="T3slider"
+EMAIL="t3slider@gmail.com"
diff --git a/network/ii/slack-desc b/network/ii/slack-desc
new file mode 100644
index 0000000000..67a8aa2902
--- /dev/null
+++ b/network/ii/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+ii: Irc it (minimalist FIFO and filesystem-based IRC client)
+ii:
+ii: Irc it creates an irc directory tree with server, channel and nick
+ii: name directories. In every directory a FIFO in file and a normal out
+ii: file is created. The in files are used to communicate with servers
+ii: and the out files contain server messages. This allows IRC
+ii: communication from the command line.
+ii:
+ii: http://tools.suckless.org/ii/
+ii:
+ii:
diff --git a/network/imapproxy/README b/network/imapproxy/README
new file mode 100644
index 0000000000..f2c5997a7a
--- /dev/null
+++ b/network/imapproxy/README
@@ -0,0 +1,11 @@
+imapproxy (SquirrelMail's IMAP Proxy server)
+
+SquirrelMail's IMAP Proxy is a caching IMAP proxy server intended
+for use with webmail clients that cannot maintain persistent
+connections to an IMAP server.
+IMAP Proxy simply sits between your webmail server and your IMAP
+server. It accepts connections from your webmail server for each
+client login, then proxies that connection to your real IMAP server.
+When your webmail client disconnects, IMAP Proxy will leave the
+connection open to the IMAP server such that when your webmail client
+reconnects, the existing connection may be re-used.
diff --git a/network/imapproxy/doinst.sh b/network/imapproxy/doinst.sh
new file mode 100644
index 0000000000..82b58a530c
--- /dev/null
+++ b/network/imapproxy/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/imapproxy.conf.new
+preserve_perms etc/rc.d/rc.imapproxy.new
diff --git a/network/imapproxy/imapproxy.SlackBuild b/network/imapproxy/imapproxy.SlackBuild
new file mode 100644
index 0000000000..c95e426c51
--- /dev/null
+++ b/network/imapproxy/imapproxy.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for imapproxy
+
+# Copyright (c) 2014-2015 Thomas Szteliga <ts@websafe.pl>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+PRGNAM=imapproxy
+VERSION=${VERSION:-1.2.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/squirrelmail-imap_proxy-$VERSION.tar.gz
+cd squirrelmail-imap_proxy-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+install -m 0755 -d $PKG/etc
+install -m 0755 -d $PKG/etc/init.d
+install -m 0755 -d $PKG/usr/sbin
+make prefix=$PKG/usr rpm_prefix=$PKG rpm-install
+
+sed -i \
+  -e 's#/usr/local/sbin#/usr/sbin#g' \
+  -e 's#\t\$PROXY_BIN#\t\$PROXY_BIN \&#g' \
+  $PKG/etc/init.d/imapproxy
+mv $PKG/etc/init.d $PKG/etc/rc.d
+mv $PKG/etc/rc.d/imapproxy $PKG/etc/rc.d/rc.imapproxy.new
+mv $PKG/etc/imapproxy.conf $PKG/etc/imapproxy.conf.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog README README.known_issues README.ssl $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/imapproxy/imapproxy.info b/network/imapproxy/imapproxy.info
new file mode 100644
index 0000000000..589084f064
--- /dev/null
+++ b/network/imapproxy/imapproxy.info
@@ -0,0 +1,10 @@
+PRGNAM="imapproxy"
+VERSION="1.2.7"
+HOMEPAGE="http://www.imapproxy.org/"
+DOWNLOAD="http://downloads.sourceforge.net/project/squirrelmail/imap_proxy/1.2.7/squirrelmail-imap_proxy-1.2.7.tar.gz"
+MD5SUM="02fb038a13efaf991917f87862c714fb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thomas Szteliga"
+EMAIL="ts@websafe.pl"
diff --git a/network/imapproxy/slack-desc b/network/imapproxy/slack-desc
new file mode 100644
index 0000000000..1c70395971
--- /dev/null
+++ b/network/imapproxy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+imapproxy: imapproxy (SquirrelMail's IMAP Proxy server)
+imapproxy:
+imapproxy: SquirrelMail's IMAP Proxy is a caching IMAP proxy server intended
+imapproxy: for use with webmail clients that cannot maintain persistent
+imapproxy: connections to an IMAP server.
+imapproxy: IMAP Proxy simply sits between your webmail server and your IMAP
+imapproxy: server. It accepts connections from your webmail server for each
+imapproxy: client login, then proxies that connection to your real IMAP server.
+imapproxy: When your webmail client disconnects, IMAP Proxy will leave the
+imapproxy: connection open to the IMAP server such that when your webmail client
+imapproxy: reconnects, the existing connection may be re-used.
diff --git a/network/insync/insync.SlackBuild b/network/insync/insync.SlackBuild
index 96076c8eab..1a33022941 100644
--- a/network/insync/insync.SlackBuild
+++ b/network/insync/insync.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=insync
 DEBNAM=wheezy
-VERSION=${VERSION:-1.2.17.35187}
+VERSION=${VERSION:-1.3.3.36056}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/insync/insync.info b/network/insync/insync.info
index 983c1ab3d5..6b5bc724c3 100644
--- a/network/insync/insync.info
+++ b/network/insync/insync.info
@@ -1,10 +1,10 @@
 PRGNAM="insync"
-VERSION="1.2.17.35187"
+VERSION="1.3.3.36056"
 HOMEPAGE="http://www.insynchq.com/"
-DOWNLOAD="http://s.insynchq.com/builds/insync_1.2.17.35187-wheezy_i386.deb"
-MD5SUM="1cc0bed0481f4f969770e79b36afdfdf"
-DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_1.2.17.35187-wheezy_amd64.deb"
-MD5SUM_x86_64="a6e3afdb69ec228823d314af3ec9a249"
+DOWNLOAD="http://s.insynchq.com/builds/insync_1.3.3.36056-wheezy_i386.deb"
+MD5SUM="9468a58f8f21dc945a8f55e1cd713236"
+DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_1.3.3.36056-wheezy_amd64.deb"
+MD5SUM_x86_64="83a0ac8ddbfa9fe9b7d1285db9b90cd4"
 REQUIRES=""
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/iojs/README b/network/iojs/README
index eb67696fbf..056a8b11aa 100644
--- a/network/iojs/README
+++ b/network/iojs/README
@@ -1,7 +1,5 @@
-io.js is a JavaScript platform built on Chrome's V8 runtime. 
-This project began as a fork of Joyent's Node.jsâ„¢ and is compatible with the 
-npm ecosystem.
+io.js is a JavaScript platform built on Chrome's V8 runtime.
+This project began as a fork of Joyent's Node.jsâ„¢ and is compatible with the npm ecosystem.
 
-WARNING: iojs will conflict with node.
-Either install the node package, or iojs from SBo, but not both. Both packages 
-include npm.
+WARNING: iojs will conflict with node and nodejs.
+Either install the nodejs package (recommended), node, or iojs from SBo, but not both. All packages include npm. nodejs is the most current package.
diff --git a/network/iojs/iojs.SlackBuild b/network/iojs/iojs.SlackBuild
index 0d15bf860d..d29d2afd6d 100644
--- a/network/iojs/iojs.SlackBuild
+++ b/network/iojs/iojs.SlackBuild
@@ -1,14 +1,13 @@
 #!/bin/sh
 
 # Slackware build script for iojs
-
 # Thanks to Audrius Kažukauskas
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -22,13 +21,15 @@
 
 # You may have received a copy of the GNU General Public License
 # along with this program (most likely, a file named COPYING). If
-# not, see <http://www.gnu.org/licenses/>.
+# not, see <https://www.gnu.org/licenses/>.
 
 PRGNAM=iojs
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+DOCS="AUTHORS CHANGELOG.md COLLABORATOR_GUIDE.md CONTRIBUTING.md GOVERNANCE.md LICENSE README.md ROADMAP.md WORKING_GROUPS.md"
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -101,18 +102,18 @@ find $PKG/usr \( -name '.git*' \) -exec rm -f {} \;
 
 # Set NODE_PATH to look for globally installed modules.
 mkdir -p $PKG/etc/profile.d
-cat > $PKG/etc/profile.d/iojs.csh << EOF
+cat > $PKG/etc/profile.d/${PRGNAM}.csh << EOF
 #!/bin/csh
 setenv NODE_PATH /usr/lib${LIBDIRSUFFIX}/node_modules
 EOF
-cat > $PKG/etc/profile.d/iojs.sh << EOF
+cat > $PKG/etc/profile.d/${PRGNAM}.sh << EOF
 #!/bin/sh
 export NODE_PATH=/usr/lib${LIBDIRSUFFIX}/node_modules
 EOF
 chmod 0755 $PKG/etc/profile.d/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/iojs/iojs.info b/network/iojs/iojs.info
index bd4a4199b7..6503f3a6ff 100644
--- a/network/iojs/iojs.info
+++ b/network/iojs/iojs.info
@@ -1,8 +1,8 @@
 PRGNAM="iojs"
-VERSION="2.5.0"
+VERSION="3.3.1"
 HOMEPAGE="https://iojs.org/"
-DOWNLOAD="https://iojs.org/dist/v2.5.0/iojs-v2.5.0.tar.xz"
-MD5SUM="130be814d3f0a6fe1db5dd56b8c1ad22"
+DOWNLOAD="https://iojs.org/dist/v3.3.1/iojs-v3.3.1.tar.xz"
+MD5SUM="58b581e57a57822b9639d781c41ea697"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/iojs/npm.sh b/network/iojs/npm.sh
index 3c7a3590d8..c0a293c917 100644
--- a/network/iojs/npm.sh
+++ b/network/iojs/npm.sh
@@ -7,17 +7,21 @@
 # Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm
 #
 
-COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
-COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
-export COMP_WORDBREAKS
-
 if type complete &>/dev/null; then
   _npm_completion () {
+    local words cword
+    if type _get_comp_words_by_ref &>/dev/null; then
+      _get_comp_words_by_ref -n = -n @ -w words -i cword
+    else
+      cword="$COMP_CWORD"
+      words=("${COMP_WORDS[@]}")
+    fi
+
     local si="$IFS"
-    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \
+    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$cword" \
                            COMP_LINE="$COMP_LINE" \
                            COMP_POINT="$COMP_POINT" \
-                           npm completion -- "${COMP_WORDS[@]}" \
+                           npm completion -- "${words[@]}" \
                            2>/dev/null)) || return $?
     IFS="$si"
   }
@@ -52,3 +56,4 @@ elif type compctl &>/dev/null; then
   compctl -K _npm_completion npm
 fi
 ###-end-npm-completion-###
+
diff --git a/network/ipscan/README b/network/ipscan/README
new file mode 100644
index 0000000000..419fb4568e
--- /dev/null
+++ b/network/ipscan/README
@@ -0,0 +1,20 @@
+ipscan (fast and friendly network scanner)
+
+Angry IP Scanner (or simply ipscan) is an open-source and cross-platform network scanner
+designed to be fast and simple to use. It scans IP addresses and ports as well as has many other features. 
+
+It is widely used by network administrators and just curious users around the world
+including large and small enterprises, banks, and government agencies. 
+
+It runs on Linux, Windows, and Mac OS X, possibly supporting other platforms as well.
+
+Angry IP scanner simply pings each IP address to check if it’s alive, then optionally it is
+resolving its hostname, determines the MAC address, scans ports, etc.
+The amount of gathered data about each host can be extended with plugins.
+
+It also has additional features, like NetBIOS information (computer name, workgroup name, and
+currently logged in Windows user), favorite IP address ranges, web server detection, customizable openers, etc.
+
+Scanning results can be saved to CSV, TXT, XML or IP-Port list files.
+With help of plugins, Angry IP Scanner can gather any information about scanned IPs.
+Anybody who can write Java code is able to write plugins and extend functionality of Angry IP Scanner.
diff --git a/network/ipscan/copyright b/network/ipscan/copyright
new file mode 100644
index 0000000000..38cd386048
--- /dev/null
+++ b/network/ipscan/copyright
@@ -0,0 +1,22 @@
+Angry IP Scanner is copyright 2004-2011 Anton Keks and others.
+Development is hosted on http://ipscan.sourceforge.net
+
+License: GPLv2+
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
diff --git a/network/ipscan/doinst.sh b/network/ipscan/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/network/ipscan/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/ipscan/ipscan b/network/ipscan/ipscan
new file mode 100644
index 0000000000..51f6ca2f53
--- /dev/null
+++ b/network/ipscan/ipscan
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/ipscan/ipscan*.jar "$@"
diff --git a/network/ipscan/ipscan.SlackBuild b/network/ipscan/ipscan.SlackBuild
new file mode 100644
index 0000000000..f65e5f9564
--- /dev/null
+++ b/network/ipscan/ipscan.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+# Slackware build script for ipscan.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ipscan
+VERSION=${VERSION:-3.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="ipscan-linux"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+install -d $PKG/usr/bin
+install -D -m755 $CWD/ipscan $PKG/usr/bin/ipscan
+install -d $PKG/usr/share/{applications,pixmaps,$PRGNAM}
+install -D -m644 $CWD/ipscan.desktop $PKG/usr/share/applications/ipscan.desktop
+install -D -m644 $CWD/ipscan.png $PKG/usr/share/pixmaps/ipscan.png
+
+if [ "$ARCH" = "i486" ]; then
+   cp $CWD/$SRCNAM-$VERSION.jar $PKG/usr/share/$PRGNAM
+elif [ "$ARCH" = "x86_64" ]; then
+   cp $CWD/$SRCNAM$LIBDIRSUFFIX-$VERSION.jar $PKG/usr/share/$PRGNAM
+fi
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $CWD/copyright $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ipscan/ipscan.desktop b/network/ipscan/ipscan.desktop
new file mode 100644
index 0000000000..742c30a954
--- /dev/null
+++ b/network/ipscan/ipscan.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Angry IP Scanner
+Comment=Fast and friendly network scanner
+GenericName=Fast and friendly network scanner
+Exec=/usr/bin/ipscan
+Terminal=false
+Type=Application
+Icon=ipscan
+Categories=Application;Network;Internet;
+StartupWMClass=Angry IP Scanner
+StartupNotify=true
diff --git a/network/ipscan/ipscan.info b/network/ipscan/ipscan.info
new file mode 100644
index 0000000000..26570427b4
--- /dev/null
+++ b/network/ipscan/ipscan.info
@@ -0,0 +1,10 @@
+PRGNAM="ipscan"
+VERSION="3.4"
+HOMEPAGE="http://www.angryip.org/"
+DOWNLOAD="http://sourceforge.net/projects/ipscan/files/ipscan3-binary/3.4/ipscan-linux-3.4.jar"
+MD5SUM="7c2bad1551a544d4e111788846c8018b"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/ipscan/files/ipscan3-binary/3.4/ipscan-linux64-3.4.jar"
+MD5SUM_x86_64="06f5ddb34c62f257b41553bb8df81015"
+REQUIRES="jdk"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/network/ipscan/ipscan.png b/network/ipscan/ipscan.png
new file mode 100644
index 0000000000..ec9059f9e1
--- /dev/null
+++ b/network/ipscan/ipscan.png
diff --git a/network/ipscan/slack-desc b/network/ipscan/slack-desc
new file mode 100644
index 0000000000..0d4c913314
--- /dev/null
+++ b/network/ipscan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ipscan: ipscan (fast and friendly network scanner)
+ipscan:
+ipscan: Angry IP Scanner (or simply ipscan) is an open-source and  
+ipscan: cross-platform network scanner designed to be fast and simple to use.
+ipscan: It scans IP addresses and ports as well as has many other features.  
+ipscan:
+ipscan: Home page: http://www.angryip.org/
+ipscan:
+ipscan:
+ipscan:
+ipscan:
diff --git a/network/irssi_otr/irssi_otr.SlackBuild b/network/irssi_otr/irssi_otr.SlackBuild
index c085bb4609..9f10a9ca5c 100644
--- a/network/irssi_otr/irssi_otr.SlackBuild
+++ b/network/irssi_otr/irssi_otr.SlackBuild
@@ -12,6 +12,9 @@
 # - upstream switched from cmake to autoconf, rewrite most of script.
 # - xchat support was dropped by upstream, so remove all references.
 
+# 20150907 bkw:
+# - handle case where file was saved as v1.0.0.tar.gz
+
 PRGNAM=irssi_otr
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
@@ -52,7 +55,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TARNAM-$VERSION
-tar xvf $CWD/$TARNAM-$VERSION.tar.gz
+tar xvf $CWD/$TARNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $TARNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/isync/isync.SlackBuild b/network/isync/isync.SlackBuild
index 30e00e9ab1..fa92938334 100644
--- a/network/isync/isync.SlackBuild
+++ b/network/isync/isync.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for isync
 
 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# All rights reserved.
+# All rights reserved. tcanich@canich.net
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,9 +28,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 PRGNAM=isync
-VERSION=${VERSION:-1.0.4}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/isync/isync.info b/network/isync/isync.info
index ba4cab2ac8..ebe6b9d4ee 100644
--- a/network/isync/isync.info
+++ b/network/isync/isync.info
@@ -1,10 +1,10 @@
 PRGNAM="isync"
-VERSION="1.0.4"
+VERSION="1.2.1"
 HOMEPAGE="http://isync.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.0.4.tar.gz"
-MD5SUM="8a836a6f4b43cd38a8b8153048417616"
+DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.2.1.tar.gz"
+MD5SUM="7ba1a07c7b487a3ab5fef54d0071f1dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Tom Canich"
-EMAIL="tcanich@canich.net"
+MAINTAINER="Manuel Argüelles"
+EMAIL="manuel.arguelles@gmail.com"
diff --git a/network/jabberd2/jabberd2.SlackBuild b/network/jabberd2/jabberd2.SlackBuild
index 74eebb310f..642107b5e7 100644
--- a/network/jabberd2/jabberd2.SlackBuild
+++ b/network/jabberd2/jabberd2.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=jabberd2
 VERSION=${VERSION:-2.2.17}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/jabberd2/rc.jabberd2 b/network/jabberd2/rc.jabberd2
index 5319a8eea8..ca328a6df3 100644
--- a/network/jabberd2/rc.jabberd2
+++ b/network/jabberd2/rc.jabberd2
@@ -34,6 +34,7 @@ restart)
   jabberd2_stop
   sleep 2
   jabberd2_start
+  ;;
 *)
   echo "Usage $0 (start|stop|restart|status)"
 esac
diff --git a/network/kasp_updater/kasp_updater.info b/network/kasp_updater/kasp_updater.info
index df30946d7c..65a50b8872 100644
--- a/network/kasp_updater/kasp_updater.info
+++ b/network/kasp_updater/kasp_updater.info
@@ -1,7 +1,7 @@
 PRGNAM="kasp_updater"
 VERSION="r2.0.1.2015.1"
 HOMEPAGE="http://support.kaspersky.com/updater2"
-DOWNLOAD="http://products.kaspersky-labs.com/products/english/special/kasp_updater/updater2.0.1.2015.1_linux_en.tar.gz"
+DOWNLOAD="ftp://ftp.antivirus.lv/products/english/special/kasp_updater/updater2.0.1.2015.1_linux_en.tar.gz"
 MD5SUM="b6480feafd35ed8a717d1bf4bc4114f5"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64="UNSUPPORTED"
diff --git a/network/kcm_ufw/kcm_ufw.info b/network/kcm_ufw/kcm_ufw.info
index a1a664efb6..a0db7e8ed1 100644
--- a/network/kcm_ufw/kcm_ufw.info
+++ b/network/kcm_ufw/kcm_ufw.info
@@ -1,7 +1,7 @@
 PRGNAM="kcm_ufw"
 VERSION="0.4.3"
 HOMEPAGE="http://kde-apps.org/content/show.php/UFW+KControl+Module?content=137789"
-DOWNLOAD="http://craigd.wikispaces.com/file/view/kcm_ufw-0.4.3.tar.bz2"
+DOWNLOAD="ftp://mirror.nl.leaseweb.net/gentoo/distfiles/kcm_ufw-0.4.3.tar.bz2"
 MD5SUM="97de867481948e3f54d76ca3678ffd2e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild b/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild
index 800c488c8c..c7f8ee73dc 100644
--- a/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild
+++ b/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kde-networkmanagement-openconnect
 
-# Copyright 2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2013-2015  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kde-networkmanagement-openconnect
-VERSION=${VERSION:-0.9.0.9}
+VERSION=${VERSION:-0.9.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.info b/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.info
index d1d0412dc9..a93c924c1e 100644
--- a/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.info
+++ b/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.info
@@ -1,8 +1,8 @@
 PRGNAM="kde-networkmanagement-openconnect"
-VERSION="0.9.0.9"
+VERSION="0.9.0.12"
 HOMEPAGE="http://userbase.kde.org/NetworkManagement"
-DOWNLOAD="http://mirrors.slackware.com/slackware/slackware-14.1/source/kde/src/extragear/networkmanagement-0.9.0.9.tar.xz"
-MD5SUM="ea4f6ced61a93af98814a6b110c447e5"
+DOWNLOAD="http://download.kde.org/unstable/networkmanagement/0.9.0.12/src/networkmanagement-0.9.0.12.tar.xz"
+MD5SUM="3a2b0b8f3545727cf0ded82e82a936b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openconnect"
diff --git a/network/konversation/konversation.info b/network/konversation/konversation.info
index 06b9508fcf..c2e1f1592e 100644
--- a/network/konversation/konversation.info
+++ b/network/konversation/konversation.info
@@ -1,7 +1,7 @@
 PRGNAM="konversation"
 VERSION="1.5"
 HOMEPAGE="http://konversation.kde.org"
-DOWNLOAD="ftp://ftp.kde.org/pub/kde/stable/konversation/1.5/src/konversation-1.5.tar.xz"
+DOWNLOAD="http://download.kde.org/stable/konversation/1.5/src/konversation-1.5.tar.xz"
 MD5SUM="c65c97012854f334d87b3a8df32b38f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/leafnode/leafnode.SlackBuild b/network/leafnode/leafnode.SlackBuild
index fb9b523808..797c4ff0fc 100644
--- a/network/leafnode/leafnode.SlackBuild
+++ b/network/leafnode/leafnode.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=leafnode
-VERSION=2.0.0.alpha20110807a
+VERSION=${VERSION:-2.0.0.alpha20140727b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/leafnode/leafnode.info b/network/leafnode/leafnode.info
index e1db494554..e884f7d054 100644
--- a/network/leafnode/leafnode.info
+++ b/network/leafnode/leafnode.info
@@ -1,10 +1,10 @@
 PRGNAM="leafnode"
-VERSION="2.0.0.alpha20110807a"
+VERSION="2.0.0.alpha20140727b"
 HOMEPAGE="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/"
-DOWNLOAD="http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20110807a.tar.bz2"
-MD5SUM="14bbaf19edd7ce0de7c30c3dfe87f520"
+DOWNLOAD="http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20140727b.tar.bz2"
+MD5SUM="df6c726ecec18e7753293be8ad952fde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andrew Strong"
-EMAIL="andrew@andrews-corner.org"
+MAINTAINER="Robby Workman"
+EMAIL="rworkman@slackbuilds.org"
diff --git a/network/libnftnl/libnftnl.SlackBuild b/network/libnftnl/libnftnl.SlackBuild
index 6a357b8512..d8be93ab1f 100644
--- a/network/libnftnl/libnftnl.SlackBuild
+++ b/network/libnftnl/libnftnl.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libnftnl
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/libnftnl/libnftnl.info b/network/libnftnl/libnftnl.info
index f8af9ec470..8a66dbb634 100644
--- a/network/libnftnl/libnftnl.info
+++ b/network/libnftnl/libnftnl.info
@@ -1,8 +1,8 @@
 PRGNAM="libnftnl"
-VERSION="1.0.3"
+VERSION="1.0.5"
 HOMEPAGE="http://www.netfilter.org/projects/libnftnl/"
-DOWNLOAD="http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.0.3.tar.bz2"
-MD5SUM="203701a73cc3c51ca751d7cb2e176250"
+DOWNLOAD="http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.0.5.tar.bz2"
+MD5SUM="af0c62ce6bbd7a7d39def0996c1c17c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/licq/licq.SlackBuild b/network/licq/licq.SlackBuild
index e8c1f6debf..887f073b84 100644
--- a/network/licq/licq.SlackBuild
+++ b/network/licq/licq.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/network/linphone/linphone.SlackBuild b/network/linphone/linphone.SlackBuild
index a6145a2415..0f5753c58e 100644
--- a/network/linphone/linphone.SlackBuild
+++ b/network/linphone/linphone.SlackBuild
@@ -25,10 +25,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=linphone
-VERSION=${VERSION:-3.7.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.9.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+MOD1NAME=ortp
+MOD1VERSION=0.25.0
+MOD1DIRNAME=oRTP
+
+MOD2NAME=mediastreamer
+MOD2VERSION=2.12.1
+MOD2DIRNAME=mediastreamer2
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -88,6 +96,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+tar xvf $CWD/$MOD1NAME-$MOD1VERSION.tar.gz
+mv $MOD1NAME-$MOD1VERSION $MOD1DIRNAME
+tar xvf $CWD/$MOD2NAME-$MOD2VERSION.tar.gz
+mv $MOD2NAME-$MOD2VERSION $MOD2DIRNAME
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -112,6 +124,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-alsa \
   --enable-ldap \
   --enable-zrtp \
+  --with-included-gettext \
   $do_truespeech \
   $do_video \
   $do_upnp \
diff --git a/network/linphone/linphone.info b/network/linphone/linphone.info
index 9130a733c1..77b64a99d9 100644
--- a/network/linphone/linphone.info
+++ b/network/linphone/linphone.info
@@ -1,10 +1,14 @@
 PRGNAM="linphone"
-VERSION="3.7.0"
+VERSION="3.9.1"
 HOMEPAGE="http://www.linphone.org/"
-DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/linphone/3.7.x/sources/linphone-3.7.0.tar.gz"
-MD5SUM="6978492712bdacd452e375254d6033ae"
+DOWNLOAD="http://download-mirror.savannah.gnu.org/releases/linphone/3.9.x/sources/linphone-3.9.1.tar.gz \
+	  http://download-mirror.savannah.gnu.org/releases/linphone/ortp/sources/ortp-0.25.0.tar.gz \
+	  http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-2.12.1.tar.gz"
+MD5SUM="c1c3a63b7ee963360e0e89cf5e5ff406 \
+	f44b4ab2a8de32c19abfa584c4426f76 \
+	1ca115e94a718638fbecf8352c169861"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="speex ffmpeg belle-sip linphone-srtp libzrtpcpp libupnp"
+REQUIRES="speex ffmpeg belle-sip linphone-srtp bzrtp libupnp"
 MAINTAINER="Euan Thoms"
 EMAIL="euan at potensol dot com"
diff --git a/network/loiq/loiq.info b/network/loiq/loiq.info
index e2601d87d1..7064acaedc 100644
--- a/network/loiq/loiq.info
+++ b/network/loiq/loiq.info
@@ -1,7 +1,7 @@
 PRGNAM="loiq"
 VERSION="0.3.1a"
 HOMEPAGE="http://loiq.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/loiq/loiq-0.3.1a.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/loiq/loiq-0.3.1a.tar.bz2"
 MD5SUM="74bf705cb96dd2929b02a92bab3e0140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/mailman/mailman.SlackBuild b/network/mailman/mailman.SlackBuild
index a6615a3768..3fe7610ad4 100644
--- a/network/mailman/mailman.SlackBuild
+++ b/network/mailman/mailman.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Eugene Suter (easuter@gmail.com)
 
 PRGNAM=mailman
-VERSION=${VERSION:-2.1.17}
+VERSION=${VERSION:-2.1.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/mailman/mailman.info b/network/mailman/mailman.info
index 4edafd421b..f97b2cb72a 100644
--- a/network/mailman/mailman.info
+++ b/network/mailman/mailman.info
@@ -1,10 +1,10 @@
 PRGNAM="mailman"
-VERSION="2.1.17"
+VERSION="2.1.21"
 HOMEPAGE="http://www.gnu.org/software/mailman/index.html"
-DOWNLOAD="http://ftp.gnu.org/gnu/mailman/mailman-2.1.17.tgz"
-MD5SUM="39043257f91eb876082fa90470aa8d28"
+DOWNLOAD="http://ftp.gnu.org/gnu/mailman/mailman-2.1.21.tgz"
+MD5SUM="848fcb250ca1461445d07b8a30c07376"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="dnspython"
 MAINTAINER="Steven King"
 EMAIL="kingrst@gmail.com"
diff --git a/network/malheur/README b/network/malheur/README
new file mode 100644
index 0000000000..f6fe50b2a1
--- /dev/null
+++ b/network/malheur/README
@@ -0,0 +1,10 @@
+A novel tool for malware analysis
+
+Malheur is a tool for the automatic analysis of malware behavior
+(program behavior recorded from malicious software in a sandbox environment).
+
+It has been designed to support the regular analysis of malicious software and
+the development of detection and defense measures.
+
+Malheur allows for identifying novel classes of malware with similar behavior and
+assigning unknown malware to discovered classes.
diff --git a/network/malheur/doinst.sh b/network/malheur/doinst.sh
new file mode 100644
index 0000000000..4d8216e62c
--- /dev/null
+++ b/network/malheur/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/malheur.cfg.new
diff --git a/network/malheur/malheur.SlackBuild b/network/malheur/malheur.SlackBuild
new file mode 100644
index 0000000000..7f8bdde0f2
--- /dev/null
+++ b/network/malheur/malheur.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for malheur
+
+# Written by Arief JR 2015 <4ipxxx@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=malheur
+VERSION=${VERSION:-0.5.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mv $PKG/etc/malheur.cfg $PKG/etc/malheur.cfg.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/malheur/malheur.info b/network/malheur/malheur.info
new file mode 100644
index 0000000000..eb60c74988
--- /dev/null
+++ b/network/malheur/malheur.info
@@ -0,0 +1,10 @@
+PRGNAM="malheur"
+VERSION="0.5.4"
+HOMEPAGE="http://www.mlsec.org/malheur/"
+DOWNLOAD="http://www.mlsec.org/malheur/files/malheur-0.5.4.tar.gz"
+MD5SUM="4fb8acff52cb5fd2c5922bc2cfc9b2ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="uthash libconfig"
+MAINTAINER="Arief JR"
+EMAIL="4ipxxx@gmail.com"
diff --git a/network/malheur/slack-desc b/network/malheur/slack-desc
new file mode 100644
index 0000000000..75d0f4a302
--- /dev/null
+++ b/network/malheur/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+malheur: malheur (automatic analysis of malware behaviour)
+malheur:
+malheur: Malheur is a tool for the automatic analysis of malware behavior 
+malheur: (program behavior recorded from malicious software in a sandbox
+malheur: environment).
+malheur: It has been designed to support the regular analysis of malicious
+malheur: software and the development of detection and defense measures.
+malheur: Malheur allows for identifying novel classes of malware with similar
+malheur: behaviour and assigning unknown malware to discovered classes.
+malheur:
+malheur: Homepage: http://www.mlsec.org/malheur/
diff --git a/network/masscan/README b/network/masscan/README
new file mode 100644
index 0000000000..aaef5aa0bd
--- /dev/null
+++ b/network/masscan/README
@@ -0,0 +1,4 @@
+MASSCAN: Mass IP port scanner
+
+Masscan provides simple, fast TCP port scanning.  It's usage is similar to 
+nmap, but much faster.
diff --git a/network/masscan/masscan.SlackBuild b/network/masscan/masscan.SlackBuild
new file mode 100644
index 0000000000..e8c68bbc85
--- /dev/null
+++ b/network/masscan/masscan.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for masscan
+
+# Copyright 2015 Kent Fritz Mountain View CA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=masscan
+VERSION=${VERSION:-1.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+make install DESTDIR=$PKG
+install -pDm644 doc/masscan.8 $PKG/usr/man/man8/masscan.8
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md VULNINFO.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/masscan/masscan.info b/network/masscan/masscan.info
new file mode 100644
index 0000000000..124d2afddb
--- /dev/null
+++ b/network/masscan/masscan.info
@@ -0,0 +1,10 @@
+PRGNAM="masscan"
+VERSION="1.0.3"
+HOMEPAGE="https://github.com/robertdavidgraham/masscan"
+DOWNLOAD="https://github.com/robertdavidgraham/masscan/archive/1.0.3.tar.gz"
+MD5SUM="ca88d1ec4b58dd165dbc0d66dbf026c5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Kent Fritz"
+EMAIL="fritz.kent@gmail.com"
diff --git a/network/masscan/slack-desc b/network/masscan/slack-desc
new file mode 100644
index 0000000000..306bb9e4de
--- /dev/null
+++ b/network/masscan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+masscan: masscan (Mass IP port scanner)
+masscan:
+masscan: Masscan provides simple, fast TCP port scanning.  It's usage is
+masscan: similar to nmap, but much faster.
+masscan:
+masscan:
+masscan:
+masscan:
+masscan:
+masscan:
+masscan:
diff --git a/network/megasync/megasync.SlackBuild b/network/megasync/megasync.SlackBuild
index 6bd0156788..1a9b8f7e2f 100644
--- a/network/megasync/megasync.SlackBuild
+++ b/network/megasync/megasync.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=megasync
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/megasync/megasync.info b/network/megasync/megasync.info
index 835c7b9aa4..a101c89ede 100644
--- a/network/megasync/megasync.info
+++ b/network/megasync/megasync.info
@@ -1,10 +1,10 @@
 PRGNAM="megasync"
-VERSION="2.1.0"
+VERSION="2.3.1"
 HOMEPAGE="https://mega.co.nz"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/megasync/2.1.0/megasync-Debian_7.0_i386.deb"
-MD5SUM="b70ae6ffcc6403da367f1e2c779006fc"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/slackbuildsdirectlinks/files/megasync/2.1.0/megasync-Debian_7.0_amd64.deb"
-MD5SUM_x86_64="1cd1fb442568ba3cc6f0cbad46e3ac0a"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/megasync/2.3.1/megasync-Debian_7.0_i386.deb"
+MD5SUM="77191e2b83be6bf0fb6118309ccc5f46"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/slackbuildsdirectlinks/files/megasync/2.3.1/megasync-Debian_7.0_amd64.deb"
+MD5SUM_x86_64="29ef7419d187e9960f74c04ccc26a3fd"
 REQUIRES="c-ares cryptopp"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/memcached-init/README b/network/memcached-init/README
new file mode 100644
index 0000000000..7cb4c24982
--- /dev/null
+++ b/network/memcached-init/README
@@ -0,0 +1,14 @@
+Free & open source, high-performance, distributed memory object
+caching system, generic in nature, but intended for use in speeding
+up dynamic web applications by alleviating database load.
+
+Memcached is an in-memory key-value store for small chunks of
+arbitrary data (strings, objects) from results of database calls,
+API calls, or page rendering.
+
+Memcached is simple yet powerful. Its simple design promotes quick
+deployment, ease of development, and solves many problems facing
+large data caches. Its API is available for most popular languages.
+
+This package extends `memcached' by an init-script and (sane)
+configuration file for Slackware.
diff --git a/network/memcached-init/doinst.sh b/network/memcached-init/doinst.sh
new file mode 100644
index 0000000000..ba3b6f9de7
--- /dev/null
+++ b/network/memcached-init/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.memcached.new
+config etc/memcached.conf.new
diff --git a/network/memcached-init/memcached-init.SlackBuild b/network/memcached-init/memcached-init.SlackBuild
new file mode 100644
index 0000000000..5309bce0db
--- /dev/null
+++ b/network/memcached-init/memcached-init.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for "memcached-init".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=memcached-init
+DESTNAM=memcached
+VERSION=${VERSION:-1.0.1}
+ARCH=noarch
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/etc/rc.d
+cat etc/${DESTNAM}.conf > $PKG/etc/${DESTNAM}.conf.new
+cat etc/rc.d/rc.${DESTNAM} > $PKG/etc/rc.d/rc.${DESTNAM}.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/memcached-init/memcached-init.info b/network/memcached-init/memcached-init.info
new file mode 100644
index 0000000000..2832a24f7f
--- /dev/null
+++ b/network/memcached-init/memcached-init.info
@@ -0,0 +1,10 @@
+PRGNAM="memcached-init"
+VERSION="1.0.1"
+HOMEPAGE="https://github.com/swmarc/memcached-init/"
+DOWNLOAD="https://github.com/swmarc/memcached-init/archive/1.0.1.tar.gz"
+MD5SUM="a0eea7c339db0358bb3cc2dbc7b5646f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="memcached"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/memcached-init/slack-desc b/network/memcached-init/slack-desc
new file mode 100644
index 0000000000..c91ea7fc76
--- /dev/null
+++ b/network/memcached-init/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+memcached-init: memcached-init (memcached init and config for Slackware)
+memcached-init:
+memcached-init: Memcached is an in-memory key-value store for small chunks of
+memcached-init: arbitrary data (strings, objects) from results of database calls,
+memcached-init: API calls, or page rendering.
+memcached-init:
+memcached-init: This package extends `memcached' by an init-script and (sane)
+memcached-init: configuration file for Slackware.
+memcached-init:
+memcached-init: Homepage: https://github.com/swmarc/memcached-init/
+memcached-init:
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index 89b6b127c3..234f0c3a8a 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -29,7 +29,7 @@
 # Added rc startup script contributed by Miguel De Anda
 
 PRGNAM="memcached"
-VERSION=${VERSION:-1.4.24}
+VERSION=${VERSION:-1.4.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/memcached/memcached.info b/network/memcached/memcached.info
index 591a2f9a2c..7a03eedb37 100644
--- a/network/memcached/memcached.info
+++ b/network/memcached/memcached.info
@@ -1,8 +1,8 @@
 PRGNAM="memcached"
-VERSION="1.4.24"
+VERSION="1.4.25"
 HOMEPAGE="http://memcached.org/"
-DOWNLOAD="http://www.memcached.org/files/memcached-1.4.24.tar.gz"
-MD5SUM="4d6e8c90e2068580526c7579dd7f37f6"
+DOWNLOAD="http://www.memcached.org/files/memcached-1.4.25.tar.gz"
+MD5SUM="55ca94e02639365fef3eac2b3f96de7c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/mod_bw/README b/network/mod_bw/README
new file mode 100644
index 0000000000..36f4f5ccb9
--- /dev/null
+++ b/network/mod_bw/README
@@ -0,0 +1,10 @@
+The httpd web server doesn't really have a way to control how much
+resources a given virtual host can have or a user can request.
+
+This module should be able to limit access to certain areas
+of the website and to limit mailicious users
+
+You will need to add the following line to /etc/httpd/httpd.conf:
+LoadModule bw_module          lib{64}/httpd/modules/mod_bw.so
+
+See mod_bw-0.7.txt for configuration
diff --git a/network/mod_bw/apache24.patch b/network/mod_bw/apache24.patch
new file mode 100644
index 0000000000..7554aea1d3
--- /dev/null
+++ b/network/mod_bw/apache24.patch
@@ -0,0 +1,29 @@
+--- mod_bw.c.NEW	2014-10-06 12:14:47.963722589 +1100
++++ mod_bw.c	2014-10-06 12:15:44.767721163 +1100
+@@ -472,7 +472,7 @@
+             return e[i].rate;
+ 
+         case T_IP:
+-            if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++            if (apr_ipsubnet_test(e[i].x.ip, r->connection->client_addr)) {
+                 return e[i].rate;
+             }
+             break;
+@@ -555,7 +555,7 @@
+             return e[i].max;
+ 
+         case T_IP:
+-            if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++            if (apr_ipsubnet_test(e[i].x.ip, r->connection->client_addr)) {
+                 return e[i].max;
+             }
+             break;
+@@ -600,7 +600,7 @@
+             return e[i].sid;
+ 
+         case T_IP:
+-            if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++            if (apr_ipsubnet_test(e[i].x.ip, r->connection->client_addr)) {
+                 return e[i].sid;
+             }
+             break;
diff --git a/network/mod_bw/apr_atomic_fix.patch b/network/mod_bw/apr_atomic_fix.patch
new file mode 100644
index 0000000000..4cc2dd5817
--- /dev/null
+++ b/network/mod_bw/apr_atomic_fix.patch
@@ -0,0 +1,18 @@
+--- mod_bw.c.orig	2009-12-09 12:56:13.629281024 +1100
++++ mod_bw.c	2009-12-09 12:56:30.598862905 +1100
+@@ -58,15 +58,6 @@
+ #define BANDWIDTH_ENABLED              1<<1
+ #define SHARED_FILENAME "logs/bwmod_runtime_status"
+ 
+-/* Compatibility for ARP < 1 */
+-#if (APR_MAJOR_VERSION < 1)
+-    #define apr_atomic_inc32 apr_atomic_inc
+-    #define apr_atomic_dec32 apr_atomic_dec
+-    #define apr_atomic_add32 apr_atomic_add
+-    #define apr_atomic_cas32 apr_atomic_cas
+-    #define apr_atomic_set32 apr_atomic_set
+-#endif
+-
+ /* Enum types of "from address" */
+ enum from_type {
+     T_ALL,
diff --git a/network/mod_bw/mod_bw.SlackBuild b/network/mod_bw/mod_bw.SlackBuild
new file mode 100644
index 0000000000..c08a48a602
--- /dev/null
+++ b/network/mod_bw/mod_bw.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for mod_bw
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mod_bw
+VERSION=${VERSION:-0.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Patches from AUR
+patch < $CWD/apr_atomic_fix.patch
+patch < $CWD/apache24.patch
+
+apxs -c -o $PRGNAM.so $PRGNAM.c
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules
+install -m 755 .libs/$PRGNAM.so $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/mod_bw/mod_bw.info b/network/mod_bw/mod_bw.info
new file mode 100644
index 0000000000..4e0caaca82
--- /dev/null
+++ b/network/mod_bw/mod_bw.info
@@ -0,0 +1,10 @@
+PRGNAM="mod_bw"
+VERSION="0.7"
+HOMEPAGE="http://bwmod.sourceforge.net"
+DOWNLOAD="http://bwmod.sourceforge.net/files/mod_bw-0.7.tgz"
+MD5SUM="d792a892517ca89f21ac2a6c01e6ccb2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/network/mod_bw/slack-desc b/network/mod_bw/slack-desc
new file mode 100644
index 0000000000..1766341283
--- /dev/null
+++ b/network/mod_bw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+mod_bw: mod_bw (apache module)
+mod_bw:
+mod_bw: The httpd web server doesn't really have a way to control how much
+mod_bw: resources a given virtual host can have or a user can request.
+mod_bw: This module should be able to limit access to certain areas
+mod_bw: of the website and to limit mailicious users.
+mod_bw:
+mod_bw: Developer : Ivan Barrera A.
+mod_bw: Project URL: http://bwmod.sourceforge.net/
+mod_bw:
+mod_bw:
diff --git a/network/mps-youtube/mps-youtube.SlackBuild b/network/mps-youtube/mps-youtube.SlackBuild
index a7c181721c..dc58d11f2c 100644
--- a/network/mps-youtube/mps-youtube.SlackBuild
+++ b/network/mps-youtube/mps-youtube.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mps-youtube
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mps-youtube
-VERSION=${VERSION:-0.2.5}
+VERSION=${VERSION:-0.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/mps-youtube/mps-youtube.info b/network/mps-youtube/mps-youtube.info
index 7c8187c4de..462bbdc727 100644
--- a/network/mps-youtube/mps-youtube.info
+++ b/network/mps-youtube/mps-youtube.info
@@ -1,8 +1,8 @@
 PRGNAM="mps-youtube"
-VERSION="0.2.5"
+VERSION="0.2.6"
 HOMEPAGE="http://github.com/np1/mps-youtube"
-DOWNLOAD="https://github.com/np1/mps-youtube/archive/v0.2.5.tar.gz"
-MD5SUM="99016b53b7dfb440080d8429443aea9b"
+DOWNLOAD="https://github.com/np1/mps-youtube/archive/v0.2.6.tar.gz"
+MD5SUM="c9899be2d0a11ff4194af7bdeab6d15e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3 Pafy"
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index d6f7cf5f77..44d4396e46 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -26,7 +26,7 @@
 # New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
 
 PRGNAM=mumble
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 16fece1356..56c62b2dbc 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,8 +1,8 @@
 PRGNAM="mumble"
-VERSION="1.2.10"
-HOMEPAGE="http://mumble.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mumble/mumble-1.2.10.tar.gz"
-MD5SUM="228fff5975a61872b83052be97e2eabf"
+VERSION="1.2.11"
+HOMEPAGE="https://github.com/mumble-voip/mumble/releases"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.11/mumble-1.2.11.tar.gz"
+MD5SUM="bd1f15c6c8c8950e1d02452689759d38"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf opus speex"
diff --git a/network/munge/README b/network/munge/README
new file mode 100644
index 0000000000..3f2a3ad795
--- /dev/null
+++ b/network/munge/README
@@ -0,0 +1,17 @@
+MUNGE (MUNGE Uid 'N' Gid Emporium) is an authentication service for creating and validating credentials. 
+
+It is designed to be highly scalable for use in an HPC cluster environment. 
+It allows a process to authenticate the UID and GID of another local or remote process 
+within a group of hosts having common users and groups. These hosts form a security realm 
+that is defined by a shared cryptographic key. Clients within this security realm can create 
+and validate credentials without the use of root privileges, reserved ports, or platform-specific methods.
+
+On most platforms, the munged daemon does not require root privileges to run. 
+If possible, you should run the daemon as a non-privileged user. 
+This can be specified in the init script /etc/rc.d/rc.munge.
+
+# groupadd -g 310 munge
+# useradd -u 310 -d /var/lib/munge -s /bin/false -g munge munge
+
+After installation a secret key file needs to be created. Follow instructions from:
+https://github.com/dun/munge/wiki/Installation-Guide#creating-a-secret-key
diff --git a/network/munge/doinst.sh b/network/munge/doinst.sh
new file mode 100644
index 0000000000..c38dbdaa81
--- /dev/null
+++ b/network/munge/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.munge.new
+config etc/default/munge.new
diff --git a/network/munge/munge.SlackBuild b/network/munge/munge.SlackBuild
new file mode 100644
index 0000000000..1caf5b2b4e
--- /dev/null
+++ b/network/munge/munge.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh -e
+
+# Slackware build script for Munge
+
+# Copyright 2015 Emmanuel N. Millán, Mendoza, Argentina.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=munge
+VERSION=${VERSION:-0.5.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+DOCS="AUTHORS COPYING COPYING.LESSER DISCLAIMER.LLNS DISCLAIMER.UC \
+      HISTORY INSTALL JARGON META NEWS PLATFORMS QUICKSTART README README.MULTILIB"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Remove systemd files
+rm -rf $PKG/usr/lib/systemd/
+
+mv $PKG/etc/rc.d/init.d/munge $PKG/etc/rc.d/rc.munge.new
+mv $PKG/etc/default/munge $PKG/etc/default/munge.new
+rm -rf $PKG/etc/rc.d/init.d/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/munge/munge.info b/network/munge/munge.info
new file mode 100644
index 0000000000..f923cca364
--- /dev/null
+++ b/network/munge/munge.info
@@ -0,0 +1,10 @@
+PRGNAM="munge"
+VERSION="0.5.11"
+HOMEPAGE="http://dun.github.io/munge/"
+DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.11/munge-0.5.11.tar.bz2"
+MD5SUM="bd8fca8d5f4c1fcbef1816482d49ee01"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Emmanuel N. Millán"
+EMAIL="emmanueln@gmail.com"
diff --git a/network/munge/slack-desc b/network/munge/slack-desc
new file mode 100644
index 0000000000..00aa144489
--- /dev/null
+++ b/network/munge/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+munge: munge (an authentication service)
+munge:
+munge: MUNGE is an authentication service for creating and validating
+munge: credentials. It is designed to be highly scalable for use in an HPC
+munge: cluster environment. It allows a process to authenticate the UID and
+munge: GID of another local or remote process within a group of hosts having
+munge: common users and groups.
+munge:
+munge:
+munge:
+munge: http://dun.github.io/munge/
diff --git a/network/murmur/murmur.SlackBuild b/network/murmur/murmur.SlackBuild
index b3ea8ba2ff..ec18070b22 100644
--- a/network/murmur/murmur.SlackBuild
+++ b/network/murmur/murmur.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for murmur
 
-# Copyright 2014 Edward W. Koenig <kingbeowulf@gmail.com>
+# Copyright 2014, 2015 Edward W. Koenig <kingbeowulf@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=murmur
 SRCNAM=mumble
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/murmur/murmur.info b/network/murmur/murmur.info
index 390bd6b588..5d74d595a8 100644
--- a/network/murmur/murmur.info
+++ b/network/murmur/murmur.info
@@ -1,8 +1,8 @@
 PRGNAM="murmur"
-VERSION="1.2.10"
-HOMEPAGE="http://mumble.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mumble/mumble-1.2.10.tar.gz"
-MD5SUM="228fff5975a61872b83052be97e2eabf"
+VERSION="1.2.11"
+HOMEPAGE="https://github.com/mumble-voip/mumble/releases"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.11/mumble-1.2.11.tar.gz"
+MD5SUM="bd1f15c6c8c8950e1d02452689759d38"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf"
diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild
index 317d2741cb..b581e5552a 100644
--- a/network/nagios/nagios.SlackBuild
+++ b/network/nagios/nagios.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for nagios
 
 # Copyright 2009-2013 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2014, 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2014, 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nagios
-VERSION=${VERSION:-4.0.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/nagios/nagios.info b/network/nagios/nagios.info
index a8223e677d..e746266bb4 100644
--- a/network/nagios/nagios.info
+++ b/network/nagios/nagios.info
@@ -1,8 +1,8 @@
 PRGNAM="nagios"
-VERSION="4.0.8"
+VERSION="4.1.1"
 HOMEPAGE="http://www.nagios.org/"
-DOWNLOAD="http://downloads.sourceforge.net/nagios/nagios-4.0.8.tar.gz"
-MD5SUM="4bba4eef427cfb113fb513b6166a6af6"
+DOWNLOAD="http://downloads.sourceforge.net/nagios/nagios-4.1.1.tar.gz"
+MD5SUM="47e348d0da05893e0ce584306200d4ea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nbd/nbd.SlackBuild b/network/nbd/nbd.SlackBuild
index 8ab796df18..6ef5375ec9 100644
--- a/network/nbd/nbd.SlackBuild
+++ b/network/nbd/nbd.SlackBuild
@@ -32,7 +32,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nbd
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-3.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/nbd/nbd.info b/network/nbd/nbd.info
index 417adec6bd..2d19ab5bb1 100644
--- a/network/nbd/nbd.info
+++ b/network/nbd/nbd.info
@@ -1,10 +1,10 @@
 PRGNAM="nbd"
-VERSION="3.8"
+VERSION="3.12.1"
 HOMEPAGE="http://nbd.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/nbd/nbd-3.8.tar.xz"
-MD5SUM="e9bcdb3e18af815573880ccbaee02646"
+DOWNLOAD="http://downloads.sourceforge.net/nbd/nbd-3.12.1.tar.xz"
+MD5SUM="055eb1c5a95cc6976256dcc84ae63abb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/network/netperf/netperf.info b/network/netperf/netperf.info
index dcea2a8e30..9b55ca6679 100644
--- a/network/netperf/netperf.info
+++ b/network/netperf/netperf.info
@@ -1,7 +1,7 @@
 PRGNAM="netperf"
 VERSION="2.6.0"
 HOMEPAGE="http://www.netperf.org/netperf"
-DOWNLOAD="ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2"
+DOWNLOAD="ftp://ftp.netperf.org/netperf/archive/netperf-2.6.0.tar.bz2"
 MD5SUM="9654ffdfd4c4f2c93ce3733cd9ed9236"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/nft/README b/network/nft/README
index c057392d9a..653e9c0d9f 100644
--- a/network/nft/README
+++ b/network/nft/README
@@ -7,6 +7,10 @@ nftables is built upon the building blocks of the Netfilter infrastructure such
 as the existing hooks, the connection tracking system, the userspace queueing
 component and the logging subsystem.
 
-In order to use nft, you need a Linux kernel >= 3.14 with nftables configured.
+In order to use nft, you need a Linux kernel >= 3.14 with nftables configured;
+however at least one feature of nft 0.5 requires >= 4.2.
+
+There is a comprehensive HOWTO for nftables at
+http://wiki.nftables.org/wiki-nftables/index.php/Main_Page
 
 nftables is currently under development, so for experimenters only!
diff --git a/network/nft/nft.SlackBuild b/network/nft/nft.SlackBuild
index 411f6a9cb5..7da9ef1c67 100644
--- a/network/nft/nft.SlackBuild
+++ b/network/nft/nft.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=nft
 PKGNAM=nftables
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/nft/nft.info b/network/nft/nft.info
index 9da48ed502..6636469aea 100644
--- a/network/nft/nft.info
+++ b/network/nft/nft.info
@@ -1,8 +1,8 @@
 PRGNAM="nft"
-VERSION="0.4"
+VERSION="0.5"
 HOMEPAGE="http://www.netfilter.org/projects/nftables/"
-DOWNLOAD="http://www.netfilter.org/projects/nftables/files/nftables-0.4.tar.bz2"
-MD5SUM="09b686c489ff10db670ca60dbed7ff43"
+DOWNLOAD="http://www.netfilter.org/projects/nftables/files/nftables-0.5.tar.bz2"
+MD5SUM="94bfe1c54bcb9f6ed974835f2fca8069"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libnftnl"
diff --git a/network/nginx/CVE-2016-4450.diff b/network/nginx/CVE-2016-4450.diff
new file mode 100644
index 0000000000..6f2c25b0c4
--- /dev/null
+++ b/network/nginx/CVE-2016-4450.diff
@@ -0,0 +1,15 @@
+--- src/os/unix/ngx_files.c
++++ src/os/unix/ngx_files.c
+@@ -183,6 +183,12 @@ ngx_write_chain_to_file(ngx_file_t *file
+         /* create the iovec and coalesce the neighbouring bufs */
+ 
+         while (cl && vec.nelts < IOV_MAX) {
++
++            if (ngx_buf_special(cl->buf)) {
++                cl = cl->next;
++                continue;
++            }
++
+             if (prev == cl->buf->pos) {
+                 iov->iov_len += cl->buf->last - cl->buf->pos;
+ 
diff --git a/network/nginx/nginx.SlackBuild b/network/nginx/nginx.SlackBuild
index de05bf525b..e2e2af9435 100644
--- a/network/nginx/nginx.SlackBuild
+++ b/network/nginx/nginx.SlackBuild
@@ -28,7 +28,7 @@
 # Special thanks to Thomas Morper for some configuration adjustments tips
 
 PRGNAM=nginx
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,6 +74,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Apply CVE-2016-4450 patch (NULL pointer dereference when writing client
+# request body)
+patch -p0 < $CWD/CVE-2016-4450.diff
+
 # Fix the nginx.conf file for html and virtual server directory.
 sed -i \
   -e '/root[ ]*html/s|html;|/var/www/&|' \
diff --git a/network/nginx/nginx.info b/network/nginx/nginx.info
index b981b76735..48e5d053a7 100644
--- a/network/nginx/nginx.info
+++ b/network/nginx/nginx.info
@@ -1,8 +1,8 @@
 PRGNAM="nginx"
-VERSION="1.8.0"
+VERSION="1.8.1"
 HOMEPAGE="http://nginx.org/"
-DOWNLOAD="http://nginx.org/download/nginx-1.8.0.tar.gz"
-MD5SUM="3ca4a37931e9fa301964b8ce889da8cb"
+DOWNLOAD="https://nginx.org/download/nginx-1.8.1.tar.gz"
+MD5SUM="2e91695074dbdfbf1bcec0ada9fda462"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nikto/nikto.SlackBuild b/network/nikto/nikto.SlackBuild
index dbafff9c9a..f9617fe26c 100644
--- a/network/nikto/nikto.SlackBuild
+++ b/network/nikto/nikto.SlackBuild
@@ -2,6 +2,9 @@
 
 # Slackware build script for Nikto Web Scanner
 #
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
@@ -23,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nikto
-VERSION=${VERSION:-2.1.4}
+VERSION=${VERSION:-2.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,41 +56,39 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Most of the packaging techniques for this strange program comes from Debian
-# rules file; next time you'll be at the pub with your friendly debianist,
-# buy him a beer ;-)
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
-# Fix nikto.pl paths
-patch -p1 --verbose < $CWD/nikto.diff
-## Fix config.txt (keeping two patches a time sux, but they're simple and I
-# think that using sed here will just be worst)
-#patch -p1 --verbose < $CWD/patches/config$LIBDIRSUFFIX.diff
-# sed is better, really :-P
-sed -i -e "s:/usr/local/bin/nmap:/usr/bin/nmap:g" nikto.conf
-sed -i -e "s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/lib$LIBDIRSUFFIX/nikto:g" nikto.conf
-
-# Install the program. Revert back to nikto.pl as it looks like the official
-# name, at least OpenVAS looks for it instead of the debianized nikto ;-)
+# Fix nikto.pl paths to use libwhisker2 from SBo.
+patch -p1 --verbose < $CWD/patches/nikto-2.1.5/nikto.pl.diff
+
+# Set the correct EXECDIR for nikto based on $ARCH
+if [ "$ARCH" = "x86_64" ]; then
+	patch -p1 --verbose < $CWD/patches/nikto-2.1.5/nikto64.conf.diff
+else
+	patch -p1 --verbose < $CWD/patches/nikto-2.1.5/nikto.conf.diff
+fi
+
+# Install the program
 install -d \
   $PKG/etc/ \
   $PKG/usr/bin/ \
   $PKG/usr/lib$LIBDIRSUFFIX/nikto/docs/ \
   $PKG/usr/lib$LIBDIRSUFFIX/nikto/plugins/ \
-  $PKG/usr/lib$LIBDIRSUFFIX/nikto/templates/
+  $PKG/usr/lib$LIBDIRSUFFIX/nikto/templates/ \
+	$PKG/usr/lib$LIBDIRSUFFIX/nikto/databases/
 install -m 0644 nikto.conf $PKG/etc/nikto.conf.new
 install -m 0644 docs/CHANGES.txt $PKG/usr/lib$LIBDIRSUFFIX/nikto/docs/
 install -m 0644 plugins/* $PKG/usr/lib$LIBDIRSUFFIX/nikto/plugins/
 install -m 0644 templates/* $PKG/usr/lib$LIBDIRSUFFIX/nikto/templates/
+install -m 0644 databases/* $PKG/usr/lib$LIBDIRSUFFIX/nikto/databases/
 install -m 0755 nikto.pl $PKG/usr/bin/
 
 ## However, be compatible with any users' scripts
diff --git a/network/nikto/nikto.info b/network/nikto/nikto.info
index e0f1e3caea..d3604d22e8 100644
--- a/network/nikto/nikto.info
+++ b/network/nikto/nikto.info
@@ -1,10 +1,10 @@
 PRGNAM="nikto"
-VERSION="2.1.4"
+VERSION="2.1.5"
 HOMEPAGE="http://cirt.net/nikto2"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/nikto-2.1.4.tar.bz2"
-MD5SUM="0d58d9ca27b9f387b60130e125db8687"
+DOWNLOAD="https://cirt.net/nikto/nikto-2.1.5.tar.gz"
+MD5SUM="efcc98a918becb77471ee9a5df0a7b1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Net-SSLeay libwhisker2"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/nikto/patches/nikto-2.1.4/README b/network/nikto/patches/nikto-2.1.4/README
new file mode 100644
index 0000000000..4f9c30e667
--- /dev/null
+++ b/network/nikto/patches/nikto-2.1.4/README
@@ -0,0 +1,3 @@
+This directory and its file is kept as a reference to 
+how the last maintainer patched nikto.pl.  Will be 
+deleted eventually.
diff --git a/network/nikto/patches/nikto-2.1.4/nikto.diff b/network/nikto/patches/nikto-2.1.4/nikto.diff
new file mode 100644
index 0000000000..1c3774db92
--- /dev/null
+++ b/network/nikto/patches/nikto-2.1.4/nikto.diff
@@ -0,0 +1,21 @@
+diff -Naur nikto-2.1.4.orig/nikto.pl nikto-2.1.4/nikto.pl
+--- nikto-2.1.4.orig/nikto.pl	2011-02-19 03:53:23.000000000 +0100
++++ nikto-2.1.4/nikto.pl	2011-02-21 17:50:11.978245864 +0100
+@@ -6,7 +6,7 @@
+ use Getopt::Long;
+ Getopt::Long::Configure('no_ignore_case');
+ 
+-# use LW2;                   ### Change this line to use a different installed version
++use LW2;                   ### Change this line to use a different installed version
+ 
+ ###############################################################################
+ #                               Nikto                                         #
+@@ -85,7 +85,7 @@
+ require "$CONFIGFILE{'PLUGINDIR'}/nikto_core.plugin";
+ nprint("T:" . localtime($COUNTERS{'scan_start'}) . ": Starting", "d");
+ require "$CONFIGFILE{'PLUGINDIR'}/nikto_single.plugin";
+-require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
++#require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
+ 
+ my ($a, $b) = split(/\./, $LW2::VERSION);
+ die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);
diff --git a/network/nikto/patches/nikto-2.1.5/nikto.conf.diff b/network/nikto/patches/nikto-2.1.5/nikto.conf.diff
new file mode 100644
index 0000000000..c07f565022
--- /dev/null
+++ b/network/nikto/patches/nikto-2.1.5/nikto.conf.diff
@@ -0,0 +1,14 @@
+
+Set the EXECDIR for nikto to /usr/lib/nikto
+
+--- nikto-2.1.5.orig/nikto.conf	2015-11-07 19:48:17.854292534 -0700
++++ nikto-2.1.5/nikto.conf	2015-11-07 19:49:23.270289730 -0700
+@@ -61,7 +61,7 @@
+ CHECKMETHODS=HEAD GET
+ 
+ # If you want to specify the location of any of the files, specify them here
+-# EXECDIR=/opt/nikto				# Location of Nikto
++EXECDIR=/usr/lib/nikto				# Location of Nikto
+ # PLUGINDIR=/opt/nikto/plugins			# Location of plugin dir
+ # DBDIR=/opt/nikto/databases			# Location of database dir
+ # TEMPLATEDIR=/opt/nikto/templates		# Location of template dir
diff --git a/network/nikto/patches/nikto-2.1.5/nikto.pl.diff b/network/nikto/patches/nikto-2.1.5/nikto.pl.diff
new file mode 100644
index 0000000000..676ada3a9f
--- /dev/null
+++ b/network/nikto/patches/nikto-2.1.5/nikto.pl.diff
@@ -0,0 +1,23 @@
+
+Fix nikto.pl paths to use libwhisker2 from SBo.
+
+--- nikto-2.1.5.orig/nikto.pl	2012-09-10 02:22:36.000000000 -0600
++++ nikto-2.1.5/nikto.pl	2015-11-07 22:14:55.380915446 -0700
+@@ -56,14 +56,14 @@
+ setup_dirs();
+ require "$CONFIGFILE{'PLUGINDIR'}/nikto_core.plugin";
+ nprint("T:" . localtime($COUNTERS{'scan_start'}) . ": Starting", "d");
+-require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
++#require "$CONFIGFILE{'PLUGINDIR'}/LW2.pm";
+ require "$CONFIGFILE{'PLUGINDIR'}/JSON-PP.pm";
+ $VARIABLES{'GMTOFFSET'} = gmt_offset();
+ 
+-# use LW2;                   ### Change this line to use a different installed version
++use LW2;                   ### Change this line to use a different installed version
+ 
+ #set SSL Engine
+-LW2::init_ssl_engine($CONFIGFILE{'LW_SSL_ENGINE'});
++#LW2::init_ssl_engine($CONFIGFILE{'LW_SSL_ENGINE'});
+ 
+ my ($a, $b) = split(/\./, $LW2::VERSION);
+ die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);
diff --git a/network/nikto/patches/nikto-2.1.5/nikto64.conf.diff b/network/nikto/patches/nikto-2.1.5/nikto64.conf.diff
new file mode 100644
index 0000000000..35709331f6
--- /dev/null
+++ b/network/nikto/patches/nikto-2.1.5/nikto64.conf.diff
@@ -0,0 +1,14 @@
+
+Set the EXECDIR for nikto to /usr/lib64/nikto
+
+--- nikto-2.1.5.orig/nikto.conf	2015-11-07 19:48:17.854292534 -0700
++++ nikto-2.1.5/nikto.conf	2015-11-07 19:50:49.311286043 -0700
+@@ -61,7 +61,7 @@
+ CHECKMETHODS=HEAD GET
+ 
+ # If you want to specify the location of any of the files, specify them here
+-# EXECDIR=/opt/nikto				# Location of Nikto
++EXECDIR=/usr/lib64/nikto				# Location of Nikto
+ # PLUGINDIR=/opt/nikto/plugins			# Location of plugin dir
+ # DBDIR=/opt/nikto/databases			# Location of database dir
+ # TEMPLATEDIR=/opt/nikto/templates		# Location of template dir
diff --git a/network/node/node.SlackBuild b/network/node/node.SlackBuild
index 9131cb44c5..b40841603b 100644
--- a/network/node/node.SlackBuild
+++ b/network/node/node.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=node
-VERSION=${VERSION:-0.12.6}
+VERSION=${VERSION:-0.12.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/node/node.info b/network/node/node.info
index e84335e921..352ad56ffa 100644
--- a/network/node/node.info
+++ b/network/node/node.info
@@ -1,8 +1,8 @@
 PRGNAM="node"
-VERSION="0.12.6"
+VERSION="0.12.7"
 HOMEPAGE="https://nodejs.org/"
-DOWNLOAD="https://nodejs.org/dist/v0.12.6/node-v0.12.6.tar.gz"
-MD5SUM="698ebd8ecd5c9c61091875bbd54401f4"
+DOWNLOAD="https://nodejs.org/dist/v0.12.7/node-v0.12.7.tar.gz"
+MD5SUM="5523ec4347d7fe6b0f6dda1d1c7799d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/ocsync/README b/network/ocsync/README
deleted file mode 100644
index 45dbc275bf..0000000000
--- a/network/ocsync/README
+++ /dev/null
@@ -1 +0,0 @@
-ocsync is a fork of csync that is modified to work with ownCloud.
diff --git a/network/ocsync/doinst.sh b/network/ocsync/doinst.sh
deleted file mode 100644
index 53ac515548..0000000000
--- a/network/ocsync/doinst.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config "etc/ocsync/ocsync.conf.new"
-config "etc/ocsync/ocsync_exclude.conf.new"
diff --git a/network/ocsync/ocsync.SlackBuild b/network/ocsync/ocsync.SlackBuild
deleted file mode 100644
index 3487e505b8..0000000000
--- a/network/ocsync/ocsync.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ocsync
-
-# Copyright 2013 Christopher Walker Copperas Cove, TX
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ocsync
-VERSION=${VERSION:-0.90.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-    -DLIB_SUFFIX=64 \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=MinSizeRel ..
-  make VERBOSE=1
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mv $PKG/usr/share/doc/ocsync/userguide $PKG/usr/doc/$PRGNAM-$VERSION
-rm -r $PKG/usr/share/doc/ocsync
-
-mv $PKG/etc/$PRGNAM/ocsync.conf $PKG/etc/$PRGNAM/ocsync.conf.new
-mv $PKG/etc/$PRGNAM/ocsync_exclude.conf $PKG/etc/$PRGNAM/ocsync_exclude.conf.new
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ocsync/ocsync.info b/network/ocsync/ocsync.info
deleted file mode 100644
index 8085d4ad65..0000000000
--- a/network/ocsync/ocsync.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ocsync"
-VERSION="0.90.0"
-HOMEPAGE="http://owncloud.org/sync-clients/"
-DOWNLOAD="http://download.owncloud.com/download/ocsync-0.90.0.tar.bz2"
-MD5SUM="6f1cfe47d6a7741c6e8df8642de52c0f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="check iniparser"
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
diff --git a/network/ocsync/slack-desc b/network/ocsync/slack-desc
deleted file mode 100644
index 25472a2843..0000000000
--- a/network/ocsync/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-ocsync: ocsync (file synchronizer)
-ocsync:
-ocsync: ocsync is a fork of csync that is modified to work with ownCloud.
-ocsync:
-ocsync: Homepage: http://owncloud.org/sync-clients/
-ocsync:
-ocsync:
-ocsync:
-ocsync:
-ocsync:
-ocsync:
diff --git a/network/offlineimap/offlineimap.SlackBuild b/network/offlineimap/offlineimap.SlackBuild
index 68094a8c03..4735a11454 100644
--- a/network/offlineimap/offlineimap.SlackBuild
+++ b/network/offlineimap/offlineimap.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for OfflineIMAP
 # Home Page http://offlineimap.org/
 
-# Copyright (c) 2008-2014, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="offlineimap"
-VERSION=${VERSION:-6.5.6}
+VERSION=${VERSION:-6.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,8 +65,7 @@ find -L . \
 python setup.py install --root=$PKG
 
 ### make and install docs
-make man
-mkdir -p $PKG/usr/{man/man1,doc/$PRGNAM-$VERSION/html} $PKG/etc
+mkdir -p $PKG/usr/{man/man1,doc/$PRGNAM-$VERSION} $PKG/etc
 
 ### install config file
 install -m 0644 -D $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
@@ -78,7 +77,6 @@ install -m 0644 docs/$PRGNAM.1 $PKG/usr/man/man1
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 cp -a COPYING README* $PRGNAM.conf* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/INSTALL.html docs/MANUAL.html $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/offlineimap/offlineimap.info b/network/offlineimap/offlineimap.info
index 4e475f7aa8..5a2dcb0253 100644
--- a/network/offlineimap/offlineimap.info
+++ b/network/offlineimap/offlineimap.info
@@ -1,8 +1,8 @@
 PRGNAM="offlineimap"
-VERSION="6.5.6"
+VERSION="6.5.7"
 HOMEPAGE="http://offlineimap.org/"
-DOWNLOAD="https://www.dropbox.com/s/3u78n6c7fcivpnk/offlineimap-6.5.6.tar.xz"
-MD5SUM="441ddeec52c23c915e45ae065ef3707c"
+DOWNLOAD="https://www.dropbox.com/s/604tlyht5ich2d3/offlineimap-6.5.7.tar.xz"
+MD5SUM="4bf6d45d3b0d81d3bd8b514613ee4e58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="docutils"
diff --git a/network/offlineimap/slack-desc b/network/offlineimap/slack-desc
index eb5d22154d..52650e7a80 100644
--- a/network/offlineimap/slack-desc
+++ b/network/offlineimap/slack-desc
@@ -14,6 +14,6 @@ offlineimap: mailboxes between imap servers.
 offlineimap:
 offlineimap:
 offlineimap:
-offlineimap: Homepage: https://github.com/nicolas33/offlineimap
+offlineimap: Homepage: http://offlineimap.org/
 offlineimap:
 offlineimap:
diff --git a/network/openconnect/openconnect.SlackBuild b/network/openconnect/openconnect.SlackBuild
index bbfd574d23..ecc4bbaa1f 100644
--- a/network/openconnect/openconnect.SlackBuild
+++ b/network/openconnect/openconnect.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openconnect
 
-# Copyright 2010-2014  Robby Workman, Northport, Alabama, USA
+# Copyright 2010-2015  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openconnect
-VERSION=${VERSION:-5.03}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.06}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/network/openconnect/openconnect.info b/network/openconnect/openconnect.info
index c59418174b..cc8cba5a74 100644
--- a/network/openconnect/openconnect.info
+++ b/network/openconnect/openconnect.info
@@ -1,8 +1,8 @@
 PRGNAM="openconnect"
-VERSION="5.03"
+VERSION="7.06"
 HOMEPAGE="http://www.infradead.org/openconnect.html"
-DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-5.03.tar.gz"
-MD5SUM="ff43ed1dbaccd2537fd7c5bfb04295a6"
+DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz"
+MD5SUM="80f397911e1fed43d897d99be3d5f1a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openl2tp/openl2tp.SlackBuild b/network/openl2tp/openl2tp.SlackBuild
index 68b43b448b..a16d787436 100644
--- a/network/openl2tp/openl2tp.SlackBuild
+++ b/network/openl2tp/openl2tp.SlackBuild
@@ -45,13 +45,12 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/Makefile.diff
 
@@ -59,7 +58,7 @@ make OPT_CFLAGS="$SLKCFLAGS -Wno-error=unused-but-set-variable" \
   SYS_LIBDIR=/usr/lib${LIBDIRSUFFIX}
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Move and fix perms on manpages
@@ -78,9 +77,7 @@ sed -e "s,^OPENL2TPD_CONFIG_FILE=.*$,OPENL2TPD_CONFIG_FILE=/etc/openl2tpd.conf,"
 cat $CWD/sample.conf > $PKG/etc/openl2tpd.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README CHANGES LICENSE COPYING INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README CHANGES LICENSE COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild
index c30f512a1d..8687cdb2b5 100644
--- a/network/opensmtpd/opensmtpd.SlackBuild
+++ b/network/opensmtpd/opensmtpd.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensmtpd
-VERSION=${VERSION:-5.7.1p1}
+VERSION=${VERSION:-5.7.3p1}
 EXTRAS=${EXTRAS:-5.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info
index 40c6f42b23..128d948d0f 100644
--- a/network/opensmtpd/opensmtpd.info
+++ b/network/opensmtpd/opensmtpd.info
@@ -1,8 +1,8 @@
 PRGNAM="opensmtpd"
-VERSION="5.7.1p1"
+VERSION="5.7.3p1"
 HOMEPAGE="http://www.opensmtpd.org/"
-DOWNLOAD="http://www.opensmtpd.org/archives/opensmtpd-5.7.1p1.tar.gz"
-MD5SUM="bf81fdc691808efa6acd7bdde5df757f"
+DOWNLOAD="http://www.opensmtpd.org/archives/opensmtpd-5.7.3p1.tar.gz"
+MD5SUM="754abb7f08c094273f098d761c8c2221"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libasr"
diff --git a/network/openvas-cli/openvas-cli.SlackBuild b/network/openvas-cli/openvas-cli.SlackBuild
index c75ad02143..945c2b199e 100644
--- a/network/openvas-cli/openvas-cli.SlackBuild
+++ b/network/openvas-cli/openvas-cli.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvas-cli
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openvas-cli/openvas-cli.info b/network/openvas-cli/openvas-cli.info
index 78f445afcd..cbbfc005f0 100644
--- a/network/openvas-cli/openvas-cli.info
+++ b/network/openvas-cli/openvas-cli.info
@@ -1,8 +1,8 @@
 PRGNAM="openvas-cli"
-VERSION="1.4.0"
+VERSION="1.4.2"
 HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/1987/openvas-cli-1.4.0.tar.gz"
-MD5SUM="421cc8ef112feeabbfeeb6ff64d93a53"
+DOWNLOAD="http://wald.intevation.org/frs/download.php/2141/openvas-cli-1.4.2.tar.gz"
+MD5SUM="0ce5efb7826b886a58598b40acca9626"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openvas-libraries"
diff --git a/network/openvas-libraries/openvas-libraries.SlackBuild b/network/openvas-libraries/openvas-libraries.SlackBuild
index 2fbf9d80e4..18f6457724 100644
--- a/network/openvas-libraries/openvas-libraries.SlackBuild
+++ b/network/openvas-libraries/openvas-libraries.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvas-libraries
-VERSION=${VERSION:-8.0.1}
+VERSION=${VERSION:-8.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openvas-libraries/openvas-libraries.info b/network/openvas-libraries/openvas-libraries.info
index 77afd3c242..c31391f130 100644
--- a/network/openvas-libraries/openvas-libraries.info
+++ b/network/openvas-libraries/openvas-libraries.info
@@ -1,8 +1,8 @@
 PRGNAM="openvas-libraries"
-VERSION="8.0.1"
+VERSION="8.0.4"
 HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2015/openvas-libraries-8.0.1.tar.gz"
-MD5SUM="57990a7d8666387d7a2fccc65effa5b8"
+DOWNLOAD="http://wald.intevation.org/frs/download.php/2125/openvas-libraries-8.0.4.tar.gz"
+MD5SUM="5d7f149d2363d2221e128fc4c5d89de0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="hiredis"
diff --git a/network/openvas-manager/openvas-manager.SlackBuild b/network/openvas-manager/openvas-manager.SlackBuild
index a4505f5ffe..0b9a92ad8d 100644
--- a/network/openvas-manager/openvas-manager.SlackBuild
+++ b/network/openvas-manager/openvas-manager.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvas-manager
-VERSION=${VERSION:-6.0.1}
+VERSION=${VERSION:-6.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openvas-manager/openvas-manager.info b/network/openvas-manager/openvas-manager.info
index 9c635178c1..fedc266186 100644
--- a/network/openvas-manager/openvas-manager.info
+++ b/network/openvas-manager/openvas-manager.info
@@ -1,8 +1,8 @@
 PRGNAM="openvas-manager"
-VERSION="6.0.1"
+VERSION="6.0.5"
 HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2017/openvas-manager-6.0.1.tar.gz"
-MD5SUM="04d9648962975a5c969b80a1dcbc5459"
+DOWNLOAD="http://wald.intevation.org/frs/download.php/2169/openvas-manager-6.0.5.tar.gz"
+MD5SUM="01c1220e91ad8a49cde4e90c32668f9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openvas-libraries"
diff --git a/network/openvas-scanner/openvas-scanner.SlackBuild b/network/openvas-scanner/openvas-scanner.SlackBuild
index 0d57a950c5..69f49052b9 100644
--- a/network/openvas-scanner/openvas-scanner.SlackBuild
+++ b/network/openvas-scanner/openvas-scanner.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvas-scanner
-VERSION=${VERSION:-5.0.1}
+VERSION=${VERSION:-5.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/openvas-scanner/openvas-scanner.info b/network/openvas-scanner/openvas-scanner.info
index d742f7afaf..a509dcfe09 100644
--- a/network/openvas-scanner/openvas-scanner.info
+++ b/network/openvas-scanner/openvas-scanner.info
@@ -1,8 +1,8 @@
 PRGNAM="openvas-scanner"
-VERSION="5.0.1"
+VERSION="5.0.4"
 HOMEPAGE="http://www.openvas.org"
-DOWNLOAD="http://wald.intevation.org/frs/download.php/2016/openvas-scanner-5.0.1.tar.gz"
-MD5SUM="ed1cd36a642bfcf06eb2dad071f83135"
+DOWNLOAD="http://wald.intevation.org/frs/download.php/2129/openvas-scanner-5.0.4.tar.gz"
+MD5SUM="22f9a2fe4e030319ac37b1cee4a5b65e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openvas-libraries"
diff --git a/network/openvswitch/openvswitch.SlackBuild b/network/openvswitch/openvswitch.SlackBuild
index 18229adba0..389bef4bf9 100644
--- a/network/openvswitch/openvswitch.SlackBuild
+++ b/network/openvswitch/openvswitch.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openvswitch
-VERSION=${VERSION:-2.3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.3.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
diff --git a/network/openvswitch/openvswitch.info b/network/openvswitch/openvswitch.info
index b61073006d..3ccf422da6 100644
--- a/network/openvswitch/openvswitch.info
+++ b/network/openvswitch/openvswitch.info
@@ -1,8 +1,8 @@
 PRGNAM="openvswitch"
-VERSION="2.3.1"
+VERSION="2.3.2"
 HOMEPAGE="http://openvswitch.org"
-DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.3.1.tar.gz"
-MD5SUM="c008c1de0a8b6363b37afa599105d6d6"
+DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.3.2.tar.gz"
+MD5SUM="5a5739ed82f1accac1c2d8d7553dc88f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/openvswitch/xen/README b/network/openvswitch/xen/README
deleted file mode 100644
index 93889615e7..0000000000
--- a/network/openvswitch/xen/README
+++ /dev/null
@@ -1,39 +0,0 @@
-Here are some scripts that I've written for use with Xen at my site.
-In order to use these scripts with your Xen installation you'll need to copy
-both the network-openvswitch and vif-openvswitch files to your
-/etc/xen/scripts directory.  You can instruct Xen to use these scripts by
-editing your /etc/xen/xend-config.sxp file and specifying these scripts as
-the default network-script and vif-script.
-
-For example, here are the entries in my xend-config.sxp file:
-
-  (network-script 'network-openvswitch netdev=eth2 bridge=ovs0')
-
-  (vif-script 'vif-openvswitch bridge=ovs0')
-
-If your network interface card and attached network switch support VLAN
-tagged traffic, you can place virtual machines within a seperate VLAN by
-appending a '.' and the VLAN tag number you wish the domain to use.  For
-example, to have all domains default to VLAN 2 you can do the following:
-
-  (vif-script 'vif-openvswitch bridge=ovs0.2')
-
-You can also specify tagged traffic in the domain configuration file.
-
-If you are hosting a hardware virtualized domain understand that the
-/etc/xen/scripts/qemu-ifup script is run instead of the vif-script specified
-in the xend-config.sxp file.  You'll need to edit this file to add the port
-to the vswitch instead of using the brctl (unless of course you are using
-the appropriate kernel module to control the vswitch using brctl.)  Here is
-a snippet from my qemu-ifup to handle hardware virtualized ports:
-
-  if lsmod | grep -c openvswitch_mod 1> /dev/null && ! lsmod | grep -c brcompat_mod 1> /dev/null
-  then
-      ovs-vsctl -- --may-exist add-port $bridge $1
-  else
-      brctl addif $bridge $1 || true
-  fi
-
-This doesn't handle tagged traffic.  I'll leave that as an exercise for you.
-
-Enjoy.
diff --git a/network/openvswitch/xen/network-openvswitch b/network/openvswitch/xen/network-openvswitch
deleted file mode 100644
index 45cda0b195..0000000000
--- a/network/openvswitch/xen/network-openvswitch
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-#============================================================================
-# Default Xen network start/stop script.
-# Xend calls a network script when it starts.
-# The script name to use is defined in ${XEN_CONFIG_DIR}/xend-config.sxp
-# in the network-script field.
-#
-# This script creates a virtual switch (default ${netdev}) and adds a
-# device (defaults to eth0) to it.  The interface that this Open vSwitch
-# is created on should not have a working IP address and will be used as
-# a switch for Xen domU's.
-#
-# Usage:
-# network-openvswitch (start|stop|status) {VAR=VAL}*
-#
-# Vars:
-# bridge     The bridge to use (default xenvs0).
-# netdev     The interface to add to the bridge (default eth0).  This
-#            device should not be configured with an IP address.  If so
-#            this script will tear down the interface and bring it back up
-#            without an IP address.
-#
-# start:
-# Creates the bridge as bridge
-# Enslaves netdev to bridge
-#
-# stop:
-# Removes netdev from the bridge
-# Deletes bridge
-#
-# status:
-# Print addresses, interfaces
-#
-#============================================================================
-
-dir=$(dirname "$0")
-. "$dir/logging.sh"
-. "$dir/xen-script-common.sh"
-. "$dir/xen-network-common.sh"
-. "$dir/locking.sh"
-
-findCommand "$@"
-evalVariables "$@"
-
-netdev=${netdev:-eth0}
-bridge=${bridge:-ovs0}
-
-addr=`ip addr show dev ${netdev} | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
-if [ -n "$addr" ]; then
-    echo "Invalid device: ${netdev} is up and has a valid IP address!" >&2
-    exit 1
-fi
-
-show_status () {
-    local dev=$1
-    local bridge=$2
-    
-    echo '============================================================'
-    echo 'vSwitch interfaces'
-    ovs-vsctl list-ifaces ${bridge}
-    echo ' '
-    echo 'vSwitch ports'
-    ovs-vsctl list-ports ${bridge}
-    echo '============================================================'
-}
-
-op_start () {
-    if [ "${bridge}" = "null" ] ; then
-	return
-    fi
-
-    ifconfig "${netdev}" down
-    ifconfig "${netdev}" 0.0.0.0 up
-    ovs-vsctl -- --may-exist add-br ${bridge}
-    ifconfig "${bridge}" 0.0.0.0 up
-    ovs-vsctl -- --may-exist add-port ${bridge} ${netdev}
-
-    # Remove any stale ports from last time virtual switch was running.
-    # Open vSwitch has the habit of remembering port settings between
-    # runs.
-    for port in $(ovs-vsctl list-ports ${bridge})
-    do
-	if [ "${port}" != "${netdev}" ]
-	then
-	    ifconfig "${port}" down
-	    ovs-vsctl del-port ${port}
-	fi
-    done
-}
-
-op_stop () {
-    if [ "${bridge}" = "null" ]; then
-	return
-    fi
-
-    # Remove all ports from virtual switch.
-    for port in $(ovs-vsctl list-ports ${bridge})
-    do
-	ifconfig "${port}" down
-	ovs-vsctl del-port ${port}
-    done
-
-    ifconfig "${bridge}" down
-    ovs-vsctl -- --if-exists del-br ${bridge}
-}
-
-case "$command" in
-    start)
-	op_start
-	;;
-    
-    stop)
-	op_stop
-	;;
-
-    status)
-	show_status ${netdev} ${bridge}
-	;;
-
-    *)
-	echo "Unknown command: $command" >&2
-	echo 'Valid commands are: start, stop, status' >&2
-	exit 1
-esac
diff --git a/network/openvswitch/xen/vif-openvswitch b/network/openvswitch/xen/vif-openvswitch
deleted file mode 100644
index 4374d41d02..0000000000
--- a/network/openvswitch/xen/vif-openvswitch
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-#============================================================================
-# ${XEN_SCRIPT_DIR}/vif-openvswitch
-#
-# Script for configuring a vif using Open vSwitch.
-#
-# Usage:
-# vif-openvswitch (add|remove|online|offline)
-#
-# Environment vars:
-# vif         vif interface name (required).
-# XENBUS_PATH path to this device's details in the XenStore (required).
-#
-# Read from the store:
-# bridge  bridge to add the vif to (optional).  Defaults to searching for the
-#         bridge itself.
-#
-# up:
-# Enslaves the vif interface to the bridge.
-#
-# down:
-# Removes the vif interface from the bridge.
-#============================================================================
-
-dir=$(dirname "$0")
-. "$dir/vif-common.sh"
-
-bridge=${bridge:-}
-bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge")
-
-if [ -z "${bridge}" ]
-then
-    bridge=$(ovs-vsctl list-br | cut -d "
-" -f 1)
-
-    if [ -z "${bridge}" ]
-    then
-	fatal "Could not find bridge and none was specified"
-    fi
-fi
-
-tag=${tag:-}
-
-# Domain on VLAN tagged bridge?
-RET=0
-ovs-vsctl list-br | grep -c ${bridge} 1>/dev/null 2>&1 || RET=1
-if [ $RET -eq 1 ]
-then
-    if [[ $bridge =~ \.[[:digit:]]{1,4}$ ]]
-    then
-	tag=$(echo ${bridge} | cut -d "." -f 2)
-	bridge=$(echo ${bridge} | cut -d "." -f 1)
-    else
-	fatal "Could not find bridge device ${bridge}"
-    fi
-fi
-
-RET=0
-ovs-vsctl list-br | grep -c ${bridge} 1>/dev/null 2>&1 || RET=1
-if [ $RET -eq 1 ]
-then
-    fatal "Could not find bridge device ${bridge}"
-fi
-
-log debug "Successful vif-bridge $command for ${vif}, bridge ${bridge}."
-case "$command" in
-    online)
-	ifconfig "${vif}" 0.0.0.0 up
-	if [ -z $tag ]
-	then
-            ovs-vsctl -- --may-exist add-port ${bridge} ${vif}
-	else
-	    ovs-vsctl -- --may-exist add-port ${bridge} ${vif} tag=${tag}
-	fi
-        ;;
-
-    offline)
-	ovs-vsctl -- --if-exists del-port ${bridge} ${vif}
-	ifconfig "$vif" 0.0.0.0 down
-        ;;
-esac
-
-if [ "$command" == "online" ]
-then
-  success
-fi
diff --git a/network/otter/otter.SlackBuild b/network/otter/otter.SlackBuild
index 0e65bd1773..0aa18bbb1a 100644
--- a/network/otter/otter.SlackBuild
+++ b/network/otter/otter.SlackBuild
@@ -24,8 +24,8 @@
 
 SRCNAM=otter-browser
 PRGNAM=$(echo $SRCNAM | cut -c1-5)
-VERSION=${VERSION:-0.9.06}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.9.07}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix font size for non-OpenDesktop window managers
+export QT_STYLE_OVERRIDE=gtk
+
 mkdir -p build
 cd build
   cmake \
diff --git a/network/otter/otter.info b/network/otter/otter.info
index 92284bb0c9..4775414ccd 100644
--- a/network/otter/otter.info
+++ b/network/otter/otter.info
@@ -1,8 +1,8 @@
 PRGNAM="otter"
-VERSION="0.9.06"
+VERSION="0.9.07"
 HOMEPAGE="http://otter-browser.org/"
-DOWNLOAD="https://github.com/OtterBrowser/otter-browser/archive/v0.9.06.tar.gz"
-MD5SUM="8c13ed4c4080923903f3ffe240264e5b"
+DOWNLOAD="https://github.com/OtterBrowser/otter-browser/archive/v0.9.07.tar.gz"
+MD5SUM="82198cedb0d817932d556b80c2676040"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/network/owncloud-client/README b/network/owncloud-client/README
index 88e9282f01..8df71fadbb 100644
--- a/network/owncloud-client/README
+++ b/network/owncloud-client/README
@@ -3,3 +3,11 @@ You specify one or more directories on the local machine to sync with your
 ownCloud server, and always have your latest files wherever you are.  Make
 a change to the files on one computer, it will flow across the others using
 the desktop sync clients.
+
+This package will build against qt5 libraries if they are present on your
+system.  This will cause issue with qtkeychain as it will build against qt4
+by default.  One way to work around this is to uninstall qt5 before building
+the owncloud-client package.
+
+This package optionally requires the Sphinx package in order to create its
+man pages.
diff --git a/network/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild
index 90e03d3ab8..a7bdeaafcf 100644
--- a/network/owncloud-client/owncloud-client.SlackBuild
+++ b/network/owncloud-client/owncloud-client.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for owncloud-client
 
-# Copyright 2013-2014 Christopher Walker Copperas Cove, TX
+# Copyright 2013-2015 Christopher Walker Copperas Cove, TX
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,11 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=owncloud-client
-VERSION=${VERSION:-1.6.4}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=mirall
+SRCNAM=owncloudclient
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -62,14 +62,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
@@ -78,10 +78,12 @@ cd build
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc/$PRGNAM \
     -DCMAKE_BUILD_TYPE="Release" \
     ..
   make VERBOSE=1
+  make doc
   make install DESTDIR=$PKG
 cd ..
 
@@ -89,11 +91,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CONTRIBUTING.md COPYING COPYING.documentation ChangeLog README.md \
+cp -a CONTRIBUTING.md COPYING COPYING.documentation ChangeLog README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+[ -d "$PKG/usr/man" ] && find $PKG/usr/man -type f -exec gzip -9 '{}' \;
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/owncloud-client/owncloud-client.info b/network/owncloud-client/owncloud-client.info
index e5f6e22b03..744aef21a0 100644
--- a/network/owncloud-client/owncloud-client.info
+++ b/network/owncloud-client/owncloud-client.info
@@ -1,8 +1,8 @@
 PRGNAM="owncloud-client"
-VERSION="1.6.4"
+VERSION="2.1.0"
 HOMEPAGE="http://owncloud.org/"
-DOWNLOAD="https://download.owncloud.com/desktop/stable/mirall-1.6.4.tar.bz2"
-MD5SUM="9fae1bdbd7a248cbe32614f2a0a62906"
+DOWNLOAD="https://download.owncloud.com/desktop/stable/owncloudclient-2.1.0.tar.xz"
+MD5SUM="6ab37353c8de73bd268aba6abb1f4020"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qtkeychain"
diff --git a/network/owncloud-server/README b/network/owncloud-server/README
index 014e51aefb..3e3e9ce0d6 100644
--- a/network/owncloud-server/README
+++ b/network/owncloud-server/README
@@ -34,7 +34,23 @@ Configuration
 "LoadModule rewrite_module ..." and "Include /etc/httpd/mod_php.conf",
 then restart httpd.
 
-(3) After installation, **and after every upgrade**, you need to complete
+(3) After installation, you must set up the names that clients will use to
+access the server as "trusted domains".
+
+You must also do this if you are upgrading an older owncloud installation.
+
+To do this, you will need to edit /srv/httpd/htdocs/owncloud/config/config.php
+as follows (please use your own server name instead of myserver.local or
+owncloud.example.com):
+
+    'trusted_domains' =>
+    array (
+      0 => 'localhost',
+      1 => 'myserver.local',
+      2 => 'owncloud.example.com',
+    ),
+
+(4) After installation, **and after every upgrade**, you need to complete
 setup by visiting this page:
 
   http://localhost/owncloud/
diff --git a/network/owncloud-server/owncloud-server.SlackBuild b/network/owncloud-server/owncloud-server.SlackBuild
index aca0368bea..2ca674ea10 100644
--- a/network/owncloud-server/owncloud-server.SlackBuild
+++ b/network/owncloud-server/owncloud-server.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=owncloud-server
 SRCNAM=owncloud
-VERSION=${VERSION:-8.0.4}
+VERSION=${VERSION:-8.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/owncloud-server/owncloud-server.info b/network/owncloud-server/owncloud-server.info
index a6a190abb2..071da6f5a4 100644
--- a/network/owncloud-server/owncloud-server.info
+++ b/network/owncloud-server/owncloud-server.info
@@ -1,8 +1,8 @@
 PRGNAM="owncloud-server"
-VERSION="8.0.4"
+VERSION="8.2.1"
 HOMEPAGE="http://owncloud.org/"
-DOWNLOAD="http://download.owncloud.org/community/owncloud-8.0.4.tar.bz2"
-MD5SUM="b49c20123cc955b7d85a55b86d099282"
+DOWNLOAD="http://download.owncloud.org/community/owncloud-8.2.1.tar.bz2"
+MD5SUM="c9d642c1747b1ebcc0065b3b1acea6b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/packETH/README b/network/packETH/README
new file mode 100644
index 0000000000..d13a1bb178
--- /dev/null
+++ b/network/packETH/README
@@ -0,0 +1,10 @@
+packETH is GUI and CLI packet generator tool for ethernet.
+It allows you to create and send any possible packet or sequence 
+of packets on the ethernet link. 
+It is very simple to use, powerful and supports many adjustments 
+of parameters while sending sequence of packets. 
+
+NOTE: To run the application you don't need the superuser rights, 
+however you need superuser rights if you want to send a packet on 
+the link. For more details refer to the homepage of the project, 
+in particular see the "GUI VERSION" section.
diff --git a/network/packETH/packETH.SlackBuild b/network/packETH/packETH.SlackBuild
new file mode 100644
index 0000000000..8148a7eb46
--- /dev/null
+++ b/network/packETH/packETH.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for packETH
+
+# Copyright (c) 2015 Cristiano Urban, Gonars, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=packETH
+VERSION=${VERSION:-1.8.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cp CHANGELOG ChangeLog
+sed -i 's/^LIBS=/LIBS+=/' Makefile.am
+autoreconf
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING CHANGELOG INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/packETH/packETH.info b/network/packETH/packETH.info
new file mode 100644
index 0000000000..8644866789
--- /dev/null
+++ b/network/packETH/packETH.info
@@ -0,0 +1,10 @@
+PRGNAM="packETH"
+VERSION="1.8.1"
+HOMEPAGE="http://packeth.sourceforge.net/packeth"
+DOWNLOAD="http://sourceforge.net/projects/packeth/files/packETH-1.8.1.tar.bz2"
+MD5SUM="90a05c12df7f5c02ef4a3e5324149f40"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Cristiano Urban"
+EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/network/packETH/slack-desc b/network/packETH/slack-desc
new file mode 100644
index 0000000000..45cfaf61b9
--- /dev/null
+++ b/network/packETH/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+packETH: packETH (A Linux GUI packet generator tool for ethernet)
+packETH:
+packETH: packETH is GUI and CLI packet generator tool for ethernet. 
+packETH: It allows you to create and send any possible packet or sequence
+packETH: of packets on the ethernet link.
+packETH:
+packETH: Homepage: http://packeth.sourceforge.net/packeth 
+packETH:
+packETH:
+packETH: 
+packETH:
diff --git a/network/packit/packit.info b/network/packit/packit.info
index d849bce925..0aa94a0af0 100644
--- a/network/packit/packit.info
+++ b/network/packit/packit.info
@@ -1,10 +1,10 @@
 PRGNAM="packit"
 VERSION="1.0"
-HOMEPAGE="http://www.packetfactory.net/projects/packit/"
-DOWNLOAD="http://slackbuilds.org/sources/13.0/packit-1.0.tgz"
+HOMEPAGE="http://packetfactory.openwall.net/projects/packit/"
+DOWNLOAD="http://packetfactory.openwall.net/projects/packit/downloads/packit-1.0.tgz"
 MD5SUM="270594ff97f6c203131136208bb4d2ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libnet"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/palemoon/README b/network/palemoon/README
new file mode 100644
index 0000000000..05c5bc5d30
--- /dev/null
+++ b/network/palemoon/README
@@ -0,0 +1,12 @@
+Pale Moon is a fork of pre-Australis Mozilla Firefox aiming to be fast,
+efficient and easy to use.
+
+This SlackBuild just installs a binary package provided by the project. It
+doesn't attempt to build the browser from source.
+
+You can force Pale Moon to use system-provided hunspell instead of its own
+dictionary by passing the USE_SYSTEM_SPELLCHECK=yes variable to the script.
+
+If you need to change the GUI language, please visit
+https://www.palemoon.org/langpacks.shtml and follow the installation
+instructions.
diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
new file mode 100644
index 0000000000..3ae195dabc
--- /dev/null
+++ b/network/palemoon/palemoon.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for palemoon
+
+# Copyright 2015 pomfland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=palemoon
+VERSION=${VERSION:-25.8.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i686) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# we don't need cflags since nothing is being compiled here.
+# we do need to check the architecture though and abort when it's not
+# supported.
+if [ ! "$ARCH" = "i686" ] && [ ! "$ARCH" = "x86_64" ]; then
+  echo "Sorry, binary packages are available only for i686 and x86_64. Aborting."
+  exit 1
+fi
+
+# check for sse2 flag and abort if not found
+[[ $(cat /proc/cpuinfo|grep sse2) ]] || {
+  echo "No required SSE2 support detected. Aborting."
+  exit 1; }
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.en-US.linux-$ARCH.tar.bz2
+chown -R root:root $PRGNAM
+find -L . \
+\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+-o -perm 511 \) -exec chmod 755 {} \; -o \
+\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# use system hunspell if user wants it
+if [[ $USE_SYSTEM_SPELLCHECK == "yes" ]]; then
+  rm -rf palemoon/dictionaries
+  ln -sv /usr/share/hunspell palemoon/dictionaries
+fi
+
+# create directories
+mkdir -p $PKG/opt
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,128x128}/apps
+mkdir -p $PKG/usr/share/applications
+
+# install pale moon into /opt
+cp -vr palemoon $PKG/opt
+
+# link stuff
+## binary
+ln -s /opt/palemoon/palemoon $PKG/usr/bin/palemoon
+## icons
+ln -s /opt/palemoon/browser/chrome/icons/default/default16.png $PKG/usr/share/icons/hicolor/16x16/apps/palemoon.png
+ln -s /opt/palemoon/browser/chrome/icons/default/default32.png $PKG/usr/share/icons/hicolor/32x32/apps/palemoon.png
+ln -s /opt/palemoon/browser/chrome/icons/default/default48.png $PKG/usr/share/icons/hicolor/48x48/apps/palemoon.png
+ln -s /opt/palemoon/browser/icons/mozicon128.png $PKG/usr/share/icons/hicolor/128x128/apps/palemoon.png
+
+# install .desktop file
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/palemoon/palemoon.desktop b/network/palemoon/palemoon.desktop
new file mode 100644
index 0000000000..2538f4601b
--- /dev/null
+++ b/network/palemoon/palemoon.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Pale Moon Web Browser
+Comment=Browse the World Wide Web
+Keywords=Internet;WWW;Browser;Web;Explorer
+Exec=palemoon %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=palemoon
+Categories=Network;WebBrowser;Internet
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
+StartupNotify=true
diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info
new file mode 100644
index 0000000000..9002b62a65
--- /dev/null
+++ b/network/palemoon/palemoon.info
@@ -0,0 +1,10 @@
+PRGNAM="palemoon"
+VERSION="25.8.1"
+HOMEPAGE="http://www.palemoon.org/"
+DOWNLOAD="http://linux.palemoon.org/files/25.8.1/palemoon-25.8.1.en-US.linux-i686.tar.bz2"
+MD5SUM="0214e11aff49a4bd84cd1adcf4bbe1ce"
+DOWNLOAD_x86_64="http://linux.palemoon.org/files/25.8.1/palemoon-25.8.1.en-US.linux-x86_64.tar.bz2"
+MD5SUM_x86_64="fcd7fdf3e91c77cdfafdbfec6582a7e8"
+REQUIRES=""
+MAINTAINER="pomfland"
+EMAIL="pomfland@tfwno.gf"
diff --git a/network/palemoon/slack-desc b/network/palemoon/slack-desc
new file mode 100644
index 0000000000..f241961cd3
--- /dev/null
+++ b/network/palemoon/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+palemoon: palemoon (Web browser)
+palemoon:
+palemoon: Pale Moon is a fork of pre-Australis Mozilla Firefox aiming to be
+palemoon: fast, efficient and easy to use.
+palemoon:
+palemoon: Homepage: http://www.palemoon.org/
+palemoon:
+palemoon:
+palemoon:
+palemoon:
diff --git a/network/pentadactyl/pentadactyl.SlackBuild b/network/pentadactyl/pentadactyl.SlackBuild
index 7fba6c6a29..562a3db53a 100644
--- a/network/pentadactyl/pentadactyl.SlackBuild
+++ b/network/pentadactyl/pentadactyl.SlackBuild
@@ -25,8 +25,8 @@
 SRCNAM=dactyl
 PRGNAM=pentadactyl
 SRCVER=1.2pre
-SRCREV=174b8ae0b67b501509494ba4462c077010955915
-VERSION=${VERSION:-20150723}
+SRCREV=4904fb5bff72e0d45fea353372ccf9c3061722f8
+VERSION=${VERSION:-20160101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,6 +64,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s/maxVersion=\"41/maxVersion=\"43/g" pentadactyl/install.rdf
 make -C $PRGNAM xpi
 
 # Get the currently installed Firefox version (handle the case where multiple versions
diff --git a/network/pentadactyl/pentadactyl.info b/network/pentadactyl/pentadactyl.info
index 2ad63aff0b..b007ec7cd5 100644
--- a/network/pentadactyl/pentadactyl.info
+++ b/network/pentadactyl/pentadactyl.info
@@ -1,8 +1,8 @@
 PRGNAM="pentadactyl"
-VERSION="20150723"
+VERSION="20160101"
 HOMEPAGE="http://5digits.org/pentadactyl"
-DOWNLOAD="https://github.com/5digits/dactyl/archive/174b8ae0b67b501509494ba4462c077010955915.zip"
-MD5SUM="d26241710a39e2607dfb72aef4cf9182"
+DOWNLOAD="https://github.com/5digits/dactyl/archive/4904fb5bff72e0d45fea353372ccf9c3061722f8.zip"
+MD5SUM="3c098e0cf989424d1f64bbe028d3e0b6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/phpmyadmin/phpmyadmin.SlackBuild b/network/phpmyadmin/phpmyadmin.SlackBuild
index a4095c328e..6a6164bfa6 100644
--- a/network/phpmyadmin/phpmyadmin.SlackBuild
+++ b/network/phpmyadmin/phpmyadmin.SlackBuild
@@ -28,7 +28,7 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM="phpmyadmin"
-VERSION=${VERSION:-4.4.11}
+VERSION=${VERSION:-4.4.15}
 ARCH="noarch" 	# hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/phpmyadmin/phpmyadmin.info b/network/phpmyadmin/phpmyadmin.info
index 5d1cd79664..62e2de05ad 100644
--- a/network/phpmyadmin/phpmyadmin.info
+++ b/network/phpmyadmin/phpmyadmin.info
@@ -1,8 +1,8 @@
 PRGNAM="phpmyadmin"
-VERSION="4.4.11"
+VERSION="4.4.15"
 HOMEPAGE="http://www.phpmyadmin.net/home_page/index.php"
-DOWNLOAD="https://files.phpmyadmin.net/phpMyAdmin/4.4.11/phpMyAdmin-4.4.11-all-languages.tar.xz"
-MD5SUM="d66cba6e3c12bea239cde38b2388f1f1"
+DOWNLOAD="https://files.phpmyadmin.net/phpMyAdmin/4.4.15/phpMyAdmin-4.4.15-all-languages.tar.xz"
+MD5SUM="d03c1fb3c20b3fb0d301759525730cea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild b/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild
index 838d9f44ac..a73d131ef2 100644
--- a/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild
+++ b/network/pidgin-opensteamworks/pidgin-opensteamworks.SlackBuild
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-# Slackware build script for pidgin-nudge
+# Slackware build script for pidgin-opensteamworks
 
 # Written by Ronny Schmatzler <schmatzler@hirnschwund.net>
 
 # Based on http://slackbuilds.org/template.SlackBuild
 
 PRGNAM=pidgin-opensteamworks
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,23 +40,28 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION/
-tar xvjf $CWD/steam-mobile-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION/steam-mobile
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 make
 
+# Copy the library
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
 cp libsteam.so $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
 
-mkdir -p $PKG/usr/share/pixmaps/pidgin/protocols
-unzip $CWD/icons.zip -d $PKG/usr/share/pixmaps/pidgin/protocols
+# Copy the images
+mkdir -p $PKG/usr/share/pixmaps/pidgin/protocols/16
+mkdir -p $PKG/usr/share/pixmaps/pidgin/protocols/22
+mkdir -p $PKG/usr/share/pixmaps/pidgin/protocols/48
+cp steam16.png $PKG/usr/share/pixmaps/pidgin/protocols/16/steam.png
+cp steam22.png $PKG/usr/share/pixmaps/pidgin/protocols/22/steam.png
+cp steam48.png $PKG/usr/share/pixmaps/pidgin/protocols/48/steam.png
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/network/pidgin-opensteamworks/pidgin-opensteamworks.info b/network/pidgin-opensteamworks/pidgin-opensteamworks.info
index 7473403ee0..bc607aab77 100644
--- a/network/pidgin-opensteamworks/pidgin-opensteamworks.info
+++ b/network/pidgin-opensteamworks/pidgin-opensteamworks.info
@@ -1,10 +1,8 @@
 PRGNAM="pidgin-opensteamworks"
-VERSION="1.5"
-HOMEPAGE="http://code.google.com/p/pidgin-opensteamworks/"
-DOWNLOAD="http://pidgin-opensteamworks.googlecode.com/svn/trunk/steam-mobile/releases/steam-mobile-1.5.tar.bz2 \
-	  http://pidgin-opensteamworks.googlecode.com/svn/trunk/steam-mobile/releases/icons.zip"
-MD5SUM="a74caa8a047aae6ae1ed5c43728b0099 \
-	1e27be6c208d4bf543533e49edd48b6d"
+VERSION="1.6.1"
+HOMEPAGE="https://github.com/EionRobb/pidgin-opensteamworks"
+DOWNLOAD="https://github.com/EionRobb/pidgin-opensteamworks/archive/1.6.1.tar.gz"
+MD5SUM="a397dbb2fd1d58769506567bd2aa6f1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-glib"
diff --git a/network/pidgin-opensteamworks/slack-desc b/network/pidgin-opensteamworks/slack-desc
index d11ede6515..feea1c822e 100644
--- a/network/pidgin-opensteamworks/slack-desc
+++ b/network/pidgin-opensteamworks/slack-desc
@@ -15,5 +15,5 @@ pidgin-opensteamworks:
 pidgin-opensteamworks:
 pidgin-opensteamworks:
 pidgin-opensteamworks:
-pidgin-opensteamworks: Home: http://code.google.com/p/pidgin-opensteamworks/
+pidgin-opensteamworks: Home: https://github.com/EionRobb/pidgin-opensteamworks
 pidgin-opensteamworks:
diff --git a/network/pidgin-skypeweb/README b/network/pidgin-skypeweb/README
index 2e23cb4ac7..4ad7338fa1 100644
--- a/network/pidgin-skypeweb/README
+++ b/network/pidgin-skypeweb/README
@@ -1,6 +1,2 @@
 Adds Skype client-less chat (text only) to Pidgin using the SkypeWeb protocol. Has many features already,
 such as group chat.
-
-A copy of the of the GitHub repo is hosted on my website, dated with the last commit date (will be updated
-weekly). I only have mirrored it and made a tarball of the skypeweb folder (rather than the whole repo).
-Nothing else was changed.
diff --git a/network/pidgin-skypeweb/pidgin-skypeweb.SlackBuild b/network/pidgin-skypeweb/pidgin-skypeweb.SlackBuild
index b166309726..db2a6daa77 100644
--- a/network/pidgin-skypeweb/pidgin-skypeweb.SlackBuild
+++ b/network/pidgin-skypeweb/pidgin-skypeweb.SlackBuild
@@ -6,9 +6,10 @@
 # All rights reserved.
 #
 # Based on:
-# Chunks from Facebook Chat for Pidgin's Slackbuild by Erik W. Hanson Copyright 2009-2010
 # SBo's cmake-template
 #
+# Previously used chunks from Erik W. Hanson's FaceBook SlackBuild.
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -27,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pidgin-skypeweb
-VERSION=${VERSION:-18072015}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,9 +64,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf skype4pidgin-$VERSION
+tar xvf $CWD/skype4pidgin-$VERSION.tar.gz || tar xvf  $CWD/$VERSION.tar.gz
+cd skype4pidgin-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,20 +74,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Build plugin
-make
 
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/purple-2
-install -m 0755 libskypeweb.so $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/libskypeweb.so
+# Go to skypeweb folder, since there is two plugins in this archive
+cd skypeweb
 
-# Move protocol icons into place
-mkdir -p $PKG/usr/share/pixmaps/pidgin/protocols/{16,22,48}
-install -m 0644 icons/16/skype.png $PKG/usr/share/pixmaps/pidgin/protocols/16/skype.png
-install -m 0644 icons/22/skype.png $PKG/usr/share/pixmaps/pidgin/protocols/22/skype.png
-install -m 0644 icons/48/skype.png $PKG/usr/share/pixmaps/pidgin/protocols/48/skype.png
-install -m 0644 icons/16/skypeout.png $PKG/usr/share/pixmaps/pidgin/protocols/16/skypeout.png
-install -m 0644 icons/22/skypeout.png $PKG/usr/share/pixmaps/pidgin/protocols/22/skypeout.png
-install -m 0644 icons/48/skypeout.png $PKG/usr/share/pixmaps/pidgin/protocols/48/skypeout.png
+# Let's compile!
+make
+make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md gpl3.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/pidgin-skypeweb/pidgin-skypeweb.info b/network/pidgin-skypeweb/pidgin-skypeweb.info
index 8b74e3469b..027a9458ca 100644
--- a/network/pidgin-skypeweb/pidgin-skypeweb.info
+++ b/network/pidgin-skypeweb/pidgin-skypeweb.info
@@ -1,8 +1,8 @@
 PRGNAM="pidgin-skypeweb"
-VERSION="18072015"
+VERSION="1.1"
 HOMEPAGE="https://github.com/EionRobb/skype4pidgin/tree/master/skypeweb"
-DOWNLOAD="http://www.bloodbathsoftworks.com/xylemon/uploads/sbomirrors/pidgin-skypeweb-18072015.tar.gz"
-MD5SUM="293e5496ea107bfff9c15e5f2935dd12"
+DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.1.tar.gz"
+MD5SUM="232303e24eb8435a47ee7e9e54cdcdc5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-glib"
diff --git a/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild b/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild
index 804ef7816e..bebd38de44 100644
--- a/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild
+++ b/network/pidgin-whatsapp/pidgin-whatsapp.SlackBuild
@@ -7,7 +7,7 @@
 # Based on http://slackbuilds.org/template.SlackBuild
 
 PRGNAM=pidgin-whatsapp
-VERSION=${VERSION:-0.8.5}
+VERSION=${VERSION:-0.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -44,7 +44,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf whatsapp-purple-$VERSION
-tar xvzf $CWD/whatsapp-purple-$VERSION.tar.gz
+# Make sure sbopkg can extract the original filename
+tar xvzf $CWD/whatsapp-purple-$VERSION.tar.gz || tar xvzf $CWD/v$VERSION.tar.gz
 cd whatsapp-purple-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/pidgin-whatsapp/pidgin-whatsapp.info b/network/pidgin-whatsapp/pidgin-whatsapp.info
index 23c54b7b6f..e442c22075 100644
--- a/network/pidgin-whatsapp/pidgin-whatsapp.info
+++ b/network/pidgin-whatsapp/pidgin-whatsapp.info
@@ -1,10 +1,10 @@
 PRGNAM="pidgin-whatsapp"
-VERSION="0.8.5"
+VERSION="0.8.6"
 HOMEPAGE="https://github.com/davidgfnet/whatsapp-purple"
-DOWNLOAD="https://github.com/davidgfnet/whatsapp-purple/archive/v0.8.5.tar.gz"
-MD5SUM="21ce4824f223f2aa5a7f9665062960ce"
+DOWNLOAD="https://github.com/davidgfnet/whatsapp-purple/archive/v0.8.6.tar.gz"
+MD5SUM="1aff0445ec9960b67082c0992ce21b45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="FreeImage"
 MAINTAINER="Ronny Schmatzler"
 EMAIL="schmatzler@hirnschwund.net"
diff --git a/network/policyd2/policyd2.info b/network/policyd2/policyd2.info
index a8e325fd9b..f5680fd28b 100644
--- a/network/policyd2/policyd2.info
+++ b/network/policyd2/policyd2.info
@@ -1,7 +1,7 @@
 PRGNAM="policyd2"
 VERSION="2.0.14"
 HOMEPAGE="http://www.policyd.org/"
-DOWNLOAD="http://devlabs.linuxassist.net/attachments/download/320/cluebringer-v2.0.14.tar.xz"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cluebringer-v2.0.14.tar.xz"
 MD5SUM="e75cd25a836b316846f5ad8bf09a69a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/polipo/polipo.SlackBuild b/network/polipo/polipo.SlackBuild
index a29abeeef5..217e9378c8 100644
--- a/network/polipo/polipo.SlackBuild
+++ b/network/polipo/polipo.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for Polipo
-#
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
 # Copyright 2009-2012 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
@@ -24,7 +25,7 @@
 
 
 PRGNAM=polipo
-VERSION=${VERSION:-1.0.4.1}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,12 +63,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$PRGNAM-$VERSION
 
 # Fix Makefile
-cat $CWD/makefile.diff | patch -p1 --verbose
+patch -p1 < $CWD/makefile.diff
 
 chown -R root:root .
 find -L . \
@@ -82,14 +83,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/man -type f -exec gzip -9 {} \; || true
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done || true
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
@@ -97,10 +92,14 @@ gzip -9 $PKG/usr/info/*.info*
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.polipo > $PKG/etc/rc.d/rc.polipo.new
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s /usr/share/polipo/www $PKG/usr/doc/$PRGNAM-$VERSION/html
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/network/polipo/polipo.info b/network/polipo/polipo.info
index 417d0102fd..7f8de43505 100644
--- a/network/polipo/polipo.info
+++ b/network/polipo/polipo.info
@@ -1,10 +1,10 @@
 PRGNAM="polipo"
-VERSION="1.0.4.1"
+VERSION="1.1.1"
 HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-DOWNLOAD="http://freehaven.net/~chrisd/polipo/polipo-1.0.4.1.tar.gz"
-MD5SUM="bfc5c85289519658280e093a270d6703"
+DOWNLOAD="https://github.com/jech/polipo/archive/polipo-1.1.1.tar.gz"
+MD5SUM="bfbe3222a517d7c4153c4dc7cd9fd2ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/polipo/rc.polipo b/network/polipo/rc.polipo
index c08ae73250..419e9b0fad 100644
--- a/network/polipo/rc.polipo
+++ b/network/polipo/rc.polipo
@@ -5,12 +5,13 @@ PIDFILE="/var/run/polipo/polipo.pid"
 
 start() {
   echo "Starting polipo..."
+  mkdir -p $(dirname $PIDFILE)
   polipo daemonise=true pidFile=$PIDFILE
 }
 
 stop() {
   echo "Stopping polipo..."
-  kill `cat $PIDFILE`
+  kill $(cat $PIDFILE)
 }
 
 case "$1" in
diff --git a/network/postfix/README b/network/postfix/README
index 1004bc808c..c5eada0ee6 100644
--- a/network/postfix/README
+++ b/network/postfix/README
@@ -1,33 +1,33 @@
-What is Postfix? It is Wietse Venema's mailer that started life as an
-alternative to the widely-used Sendmail program.
-
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time, being sendmail compatible enough to not upset existing
-users. Thus, the outside has a sendmail-ish flavor, but the inside is
-completely different. 
-
-This script builds postfix with support for Dovecot SASL but does not
-include any support for Cyrus-SASL. If you need to enable support for
-Cyrus see SASL_README in the source code. You can also enable support
-for MySQL and Postgres. This script should find support for BerkleyDB
-and PCRE automagically, so no special options are required.  Further,
-this script builds postfix with TLS support and requires that openssl
-be installed. openssl-solibs is not enough. You can find a SlackBuild
-script for Dovecot at http://www.SlackBuilds.org/ but you do not need
-to install it to use this package without SASL.
-
-A couple things to remember about postfix:
-    - this script doesn't add the necessary postfix user and postdrop
-      group, but exits if they do not exist. Add these before running
-      this script. They should have no special permission and postfix
-      should NOT be a member of the postdrop group. The script *WILL*
-      offer some sane defaults that won't conflict with the canonical
-      users and groups, and shouldn't conflict with any other scripts
-      downloaded from SlackBuilds.org that require their own uids and
-      gids
-    - many of the utilities in postfix have multiple manpages such as
-      postconf(5) and postconf(8).  Use man -k to find them.
-    - subscribe to the postfix-users mailing list
-
-If you have any questions or comments about this script, you are free
-to contact me via e-mail at <alan@lizella.net>.  Thanks!
+Postfix is Wietse Venema's mailer that started life as an alternative to the
+widely-used Sendmail program. It attempts to be fast, easy to administer, and
+secure, while at the same time, being sendmail compatible enough to not upset
+existing users. Thus, the outside has a sendmail-ish flavor, but the inside is
+completely different.
+
+This script builds postfix with optional support for Dovecot SASL, Cyrus SASL
+can be enabled with:
+
+  SASL=cyrus ./postfix.SlackBuild
+
+You can also enable support for MySQL:
+
+  DATABASE=mysql ./postfix.SlackBuild
+
+This script will find support for BerkleyDB and PCRE automagically; TLS support
+requires openssl package, openssl-solibs alone is not enough. Additionally, this
+script doesn't add postfix user and groups, instead it offers sane defaults that
+won't conflict with system users and groups, and other scripts from the SBo.
+
+Package created with this script will conflict with stock sendmail package, you
+*should* remove sendmail before installing postfix, otherwise sendmail updates
+could break your postfix instance.
+
+When upgrading from an older postfix version, make sure the variables such as
+html_directory and readme_directory in /etc/postfix/main.cf point to the new
+location. These can also be fixed later, afterwards make sure to run:
+
+  postfix set-permissions
+
+Furthermore, many of the utilities in postfix have multiple manpages such as
+postconf(5) and postconf(8). Use man -k to find them, and don't forget to
+subscribe to the postfix-users mailing list!
diff --git a/network/postfix/doinst.sh b/network/postfix/doinst.sh
index 88fe4d3932..97e6510432 100644
--- a/network/postfix/doinst.sh
+++ b/network/postfix/doinst.sh
@@ -6,7 +6,8 @@ config() {
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
@@ -23,19 +24,8 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/postfix/access.new
-config etc/postfix/aliases.new
-config etc/postfix/canonical.new
-config etc/postfix/generic.new
-config etc/postfix/header_checks.new
-config etc/postfix/main.cf.default.new
-config etc/postfix/main.cf.new
-config etc/postfix/makedefs.out.new
-config etc/postfix/master.cf.new
-config etc/postfix/relocated.new
-config etc/postfix/transport.new
-config etc/postfix/virtual.new
-config etc/rc.d/rc.postfix.new
+find etc/postfix -type f -name '*.new' \
+  | while read new ; do config $new ; done
 
 preserve_perms etc/rc.d/rc.postfix.new
 
diff --git a/network/postfix/patches/postconf.diff b/network/postfix/patches/postconf.diff
new file mode 100644
index 0000000000..c51c1822fe
--- /dev/null
+++ b/network/postfix/patches/postconf.diff
@@ -0,0 +1,31 @@
+--- postfix-3.0.3/postfix-install.orig	2015-01-29 23:15:30.000000000 +0100
++++ postfix-3.0.3/postfix-install	2015-10-17 03:57:42.269896095 +0200
+@@ -248,7 +248,7 @@
+     case "$junk" in
+     *MAIL_VERSION*) 
+ 	case "$mail_version" in
+-	"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
++	"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
+ 	esac
+ 	val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
+ 	case "$val" in
+@@ -810,7 +810,7 @@
+ # the wrong place when Postfix is being upgraded.
+ 
+ case "$mail_version" in
+-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
++"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
+ esac
+ 
+ # Undo MAIL_VERSION expansion at the end of a parameter value. If
+--- postfix-3.0.3/Makefile.in.orig	2014-09-25 21:16:29.000000000 +0200
++++ postfix-3.0.3/Makefile.in	2015-10-17 04:01:27.170920308 +0200
+@@ -20,7 +20,7 @@
+ EXPAND	= sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
+ 	    -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
+ SHLIB_DIR_OVERRIDE = \
+-	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
++	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -c conf -dhx shlib_directory`}
+ 
+ default: update
+ 
diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild
index 011a5f2def..fede621f0a 100644
--- a/network/postfix/postfix.SlackBuild
+++ b/network/postfix/postfix.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2006, 2011 Alan Hicks, Lizella, GA
+# Copyright 2006, 2011  Alan Hicks, Lizella, GA
+# Copyright 2010, 2011, 2013, 2014, 2015  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +21,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Mario Preksavec <mario@slackware.hr>
-
 PRGNAM=postfix
-VERSION=${VERSION:-2.11.4}
+VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,7 +36,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG="$TMP/package-$PRGNAM"
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -54,7 +53,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Build with dovecot sasl by default, cyrus/dovecot are supported
+# Build with dovecot sasl support by default
 SASL=${SASL:-dovecot}
 case "$SASL" in
      dovecot) SASLARGS="-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
@@ -95,26 +94,10 @@ cat << EOF
   # mv /usr/include/mysql/events.h /usr/include/mysql/events.h.bak
 
 EOF
+
   exit
 fi
 
-set -e
-
-CFLAGS=${CFLAGS:-$SLKCFLAGS}
-
-config_directory=/etc/postfix
-daemon_directory=/usr/libexec/postfix
-command_directory=/usr/sbin
-queue_directory=/var/spool/postfix
-sendmail_path=/usr/sbin/sendmail
-newaliases_path=/usr/bin/newaliases
-mailq_path=/usr/bin/mailq
-html_directory=/usr/doc/$PRGNAM-$VERSION/html
-manpage_directory=/usr/man
-readme_directory=/usr/doc/$PRGNAM-$VERSION/README_FILES
-mail_owner=postfix
-setgid_group=postdrop
-
 # Bail if user or group isn't valid on your system
 if ! grep ^postfix: /etc/passwd 2>&1 > /dev/null; then
 
@@ -141,82 +124,70 @@ EOF
   exit
 fi
 
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+set -e
+
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Use config files from build tree, not system ones
+# This should probably go to upstream...
+patch -p1 <$CWD/patches/postconf.diff
 
-# TLS, and SASL support
-# Postfix unfortunately does not use a handy ./configure script so you
-# must generate the makefiles using (what else?) "make makefiles". The
-# following includes support for TLS, SASL and MYSQL if you setup your
-# variables properly (see the README file). It should
-# automatically find PCRE and DB3 support. The docs have information
-# for adding additional support such as LDAP.
+# Postfix does not use a ./configure script
 
-make makefiles \
+make makefiles shared=yes \
   CCARGS="-DUSE_SASL_AUTH -DUSE_TLS $SASLARGS $DBARGS $LDAPARGS" \
   AUXLIBS="-lssl -lcrypto $SASLLIBS $DBLIBS $LDAPLIBS" \
   OPT="$SLKCFLAGS" DEBUG=""
 
-make
-
 make non-interactive-package \
   install_root=$PKG \
   tempdir=$TMP/$PRGNAM-temp \
-  config_directory=$config_directory \
-  daemon_directory=$daemon_directory \
-  command_directory=$command_directory \
-  queue_directory=$queue_directory \
-  sendmail_path=$sendmail_path \
-  newaliases_path=$newaliases \
-  mailq_path=$mailq_path \
-  mail_owner=$mail_owner \
-  setgid_group=$setgid_group \
-  html_directory=$html_directory \
-  manpage_directory=$manpage_directory \
-  readme_directory=$readme_directory
-
-mkdir -p $PKG/install $PKG/etc/rc.d $PKG/usr/doc/$PRGNAM-$VERSION
-
-cp -r AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE \
-  PORTING RELEASE_NOTES TLS_ACKNOWLEDGEMENTS TLS_CHANGES TLS_LICENSE \
-  US_PATENT_6321267 implementation-notes examples \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/postfix.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/postfix.SlackBuild
-
-install -m 0644 $CWD/rc.postfix  $PKG/etc/rc.d/rc.postfix.new
+  config_directory=/etc/postfix \
+  daemon_directory=/usr/libexec/postfix \
+  command_directory=/usr/sbin \
+  queue_directory=/var/spool/postfix \
+  sendmail_path=/usr/sbin/sendmail \
+  newaliases_path=/usr/bin/newaliases \
+  mailq_path=/usr/bin/mailq \
+  mail_owner=postfix \
+  setgid_group=postdrop \
+  html_directory=/usr/doc/$PRGNAM-$VERSION/html \
+  manpage_directory=/usr/man \
+  readme_directory=/usr/doc/$PRGNAM-$VERSION/README_FILES
+
+install -D -m 0644 -oroot -groot $CWD/rc.postfix $PKG/etc/rc.d/rc.postfix.new
+find $PKG/etc/postfix -type f ! -name "*.default" ! -name "*.proto" ! -name "*.out" \
+  ! -name "postfix-files" -exec mv {} {}.new \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+sed -i 's#\($manpage_directory/man[158]/.\+\.[158]\)\(:.*\)#\1.gz\2#' \
+  $PKG/etc/postfix/postfix-files
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE PORTING \
+  RELEASE_NOTES TLS_ACKNOWLEDGEMENTS TLS_CHANGES TLS_LICENSE US_PATENT_6321267 \
+  examples implementation-notes $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-find $PKG -type f | \
- ( while read LINE; do
-  if file $LINE | egrep "ELF.*(executable|shared object).*not stripped" \
-    &> /dev/null; then
-  strip $LINE
-  fi
- done )
-
-gzip -9 $PKG/usr/man/*/*
-
-cd $PKG/etc/postfix
-# Since we gzip the manpages, let's fix the postfix-files to reflect that
-# so it won't throw errors during post-install
-( cd $PKG/usr/libexec/postfix
-grep manpage postfix-files | while read line;
-do MANPAGE="$(echo "$line" | cut -d: -f1)"
-  sed -i s#"$MANPAGE"#"$MANPAGE.gz"# postfix-files ;
-done
-)
-
-# Create .new files
-for i in \
-  access aliases canonical generic header_checks main.cf main.cf.default \
-  makedefs.out master.cf relocated transport virtual ;
-do \
-  mv $i $i.new ;
-done
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/postfix/postfix.info b/network/postfix/postfix.info
index e08598f42a..bad4531276 100644
--- a/network/postfix/postfix.info
+++ b/network/postfix/postfix.info
@@ -1,10 +1,10 @@
 PRGNAM="postfix"
-VERSION="2.11.4"
+VERSION="3.0.3"
 HOMEPAGE="http://www.postfix.org/"
-DOWNLOAD="http://postfix.cs.utah.edu/source/official/postfix-2.11.4.tar.gz"
-MD5SUM="7f1f67b205992f3e8acc98d597a4deef"
+DOWNLOAD="http://de.postfix.org/ftpmirror/official/postfix-3.0.3.tar.gz"
+MD5SUM="61caffae689c11d09b4c972a394ae3b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Alan Hicks"
-EMAIL="alan@lizella.net"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/network/pptpd/patches/fix_plugins_patchlevel_h.diff b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
index dbcf995f79..cc02ad767a 100644
--- a/network/pptpd/patches/fix_plugins_patchlevel_h.diff
+++ b/network/pptpd/patches/fix_plugins_patchlevel_h.diff
@@ -1,6 +1,6 @@
-diff -Nur pptpd-1.3.4.orig//plugins/patchlevel.h pptpd-1.3.4/plugins/patchlevel.h
---- pptpd-1.3.4.orig//plugins/patchlevel.h	2005-02-23 19:25:34.000000000 -0600
-+++ pptpd-1.3.4/plugins/patchlevel.h	2010-11-08 22:26:18.989688208 -0600
+diff -Nur pptpd-1.4.0.orig/plugins/patchlevel.h pptpd-1.4.0/plugins/patchlevel.h
+--- pptpd-1.4.0.orig/plugins/patchlevel.h	2013-02-18 16:05:46.000000000 -0600
++++ pptpd-1.4.0/plugins/patchlevel.h	2016-01-10 23:24:22.095247474 -0600
 @@ -1,5 +1,5 @@
  /* upstream patchlevel.h,v 1.60 2004/01/13 04:46:52 paulus Exp */
  /* $Id: patchlevel.h,v 1.4 2005/02/24 01:25:34 quozl Exp $ */
diff --git a/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff b/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
index d2ebfa99b3..b70bb73369 100644
--- a/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
+++ b/network/pptpd/patches/fix_pptpctrl_c_for_x86_64.diff
@@ -1,7 +1,7 @@
-diff -Nur pptpd-1.3.4.orig//pptpctrl.c pptpd-1.3.4/pptpctrl.c
---- pptpd-1.3.4.orig//pptpctrl.c	2006-12-07 18:01:40.000000000 -0600
-+++ pptpd-1.3.4/pptpctrl.c	2010-11-08 22:29:50.111138505 -0600
-@@ -773,7 +773,7 @@
+diff -Nur pptpd-1.4.0.orig/pptpctrl.c pptpd-1.4.0/pptpctrl.c
+--- pptpd-1.4.0.orig/pptpctrl.c	2013-10-22 23:53:19.000000000 -0500
++++ pptpd-1.4.0/pptpctrl.c	2016-01-10 23:26:25.182409723 -0600
+@@ -786,7 +786,7 @@
  
          if (pptp_logwtmp) {
                   pppd_argv[an++] = "plugin";
diff --git a/network/pptpd/patches/plugins_Makefile.diff b/network/pptpd/patches/plugins_Makefile.diff
index 52d4134a90..9275a340b7 100644
--- a/network/pptpd/patches/plugins_Makefile.diff
+++ b/network/pptpd/patches/plugins_Makefile.diff
@@ -1,5 +1,6 @@
---- pptpd-1.3.4/plugins/Makefile	2008-07-20 01:46:35.836374075 -0500
-+++ pptpd-1.3.4/plugins/Makefile	2008-07-20 01:48:48.729656656 -0500
+diff -Nur pptpd-1.4.0.orig/plugins/Makefile pptpd-1.4.0/plugins/Makefile
+--- pptpd-1.4.0.orig/plugins/Makefile	2013-02-18 16:05:46.000000000 -0600
++++ pptpd-1.4.0/plugins/Makefile	2016-01-10 23:23:06.816535697 -0600
 @@ -3,7 +3,7 @@
  CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
  LDFLAGS	= -shared
diff --git a/network/pptpd/patches/pptpctl_fix.patch b/network/pptpd/patches/pptpctl_fix.patch
deleted file mode 100644
index 86011c275e..0000000000
--- a/network/pptpd/patches/pptpctl_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.new/pptpctrl.c
---- pptpd-1.3.4/pptpctrl.c	2006-12-08 13:01:40.000000000 +1300
-+++ pptpd-1.3.4.new/pptpctrl.c	2012-09-14 11:16:38.646659399 +1200
-@@ -759,8 +759,8 @@ static void launch_pppd(char **pppaddrs,
- 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
- 	}
- 	
-+	char pppInterfaceIPs[33];
- 	if (*pppaddrs[0] || *pppaddrs[1]) {
--		char pppInterfaceIPs[33];
- 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
- 		pppd_argv[an++] = pppInterfaceIPs;
- 	}
diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild
index bd4e5040b6..9b1bc16774 100644
--- a/network/pptpd/pptpd.SlackBuild
+++ b/network/pptpd/pptpd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pptpd
 
-# Copyright 2007-2012  Robby Workman, Northport, Alabama, USA
+# Copyright 2007-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pptpd
-VERSION=${VERSION:-1.3.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -79,9 +79,6 @@ patch -p1 < $CWD/patches/fix_plugins_patchlevel_h.diff
 # Fix hardcoded /usr/lib/pptpd/ in pptpctrl.c if ARCH=x86_64
 [ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/patches/fix_pptpctrl_c_for_x86_64.diff
 
-# Thanks to Swaz for the patch to fix an invalid declaration of pppInterfaceIPs
-patch -p1 < $CWD/patches/pptpctl_fix.patch
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/network/pptpd/pptpd.info b/network/pptpd/pptpd.info
index cc73ed9085..a3b7583ec1 100644
--- a/network/pptpd/pptpd.info
+++ b/network/pptpd/pptpd.info
@@ -1,8 +1,8 @@
 PRGNAM="pptpd"
-VERSION="1.3.4"
+VERSION="1.4.0"
 HOMEPAGE="http://poptop.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/poptop/pptpd-1.3.4.tar.gz"
-MD5SUM="b38df9c431041922c997c1148bedf591"
+DOWNLOAD="http://downloads.sourceforge.net/poptop/pptpd-1.4.0.tar.gz"
+MD5SUM="36f9f45c6ffa92bc3b6e24ae2d053505"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/prosody/doinst.sh b/network/prosody/doinst.sh
index 330cafc8a7..58d9be9f5b 100644
--- a/network/prosody/doinst.sh
+++ b/network/prosody/doinst.sh
@@ -8,6 +8,17 @@ config() {
   fi
 }
 
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
 config etc/prosody/prosody.cfg.lua.new
 config etc/prosody/migrator.cfg.lua.new
 config etc/prosody/certs/openssl.cnf.new
@@ -18,3 +29,5 @@ config etc/prosody/certs/Makefile.new
 config etc/prosody/certs/localhost.cnf.new
 config etc/prosody/certs/example.com.cnf.new
 config etc/prosody/certs/localhost.crt.new
+
+preserve_perms etc/rc.d/rc.prosody.new
diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild
index fad92e6637..6cfc70ff34 100644
--- a/network/prosody/prosody.SlackBuild
+++ b/network/prosody/prosody.SlackBuild
@@ -21,9 +21,11 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
 
 PRGNAM=prosody
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -112,6 +114,10 @@ cd tools/migration
     MAN="${PKG}/usr/man"
 cd -
 
+# Install rc.prosody
+mkdir -p $PKG/etc/rc.d
+install -m 0644 $CWD/rc.prosody $PKG/etc/rc.d/rc.prosody.new
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/network/prosody/prosody.info b/network/prosody/prosody.info
index 24bc3fd0da..34b241fe37 100644
--- a/network/prosody/prosody.info
+++ b/network/prosody/prosody.info
@@ -1,10 +1,10 @@
 PRGNAM="prosody"
-VERSION="0.9.4"
+VERSION="0.9.8"
 HOMEPAGE="http://prosody.im/"
-DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.4.tar.gz"
-MD5SUM="94f9a613c834c276352ac5b142fb72e0"
+DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.8.tar.gz"
+MD5SUM="5144cd832a1860443e21e336dc560ee7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua luasocket luaexpat lua-filesystem"
-MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/prosody/rc.prosody b/network/prosody/rc.prosody
new file mode 100644
index 0000000000..f713110ed5
--- /dev/null
+++ b/network/prosody/rc.prosody
@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Copyright 2015, Niki Kovacs <info@microlinux.fr>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+prosody_start()
+  {
+    lua /usr/bin/prosodyctl start
+  }
+
+prosody_stop()
+  {
+    lua /usr/bin/prosodyctl stop
+  }
+
+prosody_restart()
+  {
+    prosody_stop
+    prosody_start
+  }
+
+prosody_reload()
+  {
+    lua /usr/bin/prosodyctl reload
+  }
+
+prosody_status()
+  {
+    lua /usr/bin/prosodyctl status
+  }
+
+case $1 in
+  'start')
+    prosody_start ;;
+  'stop')
+    prosody_stop ;;
+  'restart')
+    prosody_restart ;;
+  'reload')
+    prosody_reload ;;
+  'status')
+    prosody_status ;;
+  *)
+    echo "usage $0 start|stop|restart|reload|status"
+esac
diff --git a/network/pure-ftpd/pure-ftpd.SlackBuild b/network/pure-ftpd/pure-ftpd.SlackBuild
index ab713f3341..7ee59eae7c 100644
--- a/network/pure-ftpd/pure-ftpd.SlackBuild
+++ b/network/pure-ftpd/pure-ftpd.SlackBuild
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pure-ftpd
-VERSION=${VERSION:-1.0.41}
+VERSION=${VERSION:-1.0.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/pure-ftpd/pure-ftpd.info b/network/pure-ftpd/pure-ftpd.info
index db1d7f5147..144e44f550 100644
--- a/network/pure-ftpd/pure-ftpd.info
+++ b/network/pure-ftpd/pure-ftpd.info
@@ -1,8 +1,8 @@
 PRGNAM="pure-ftpd"
-VERSION="1.0.41"
+VERSION="1.0.42"
 HOMEPAGE="http://www.pureftpd.org/"
-DOWNLOAD="http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.41.tar.gz"
-MD5SUM="28a0d0a9384f9e9be289febc7f4b8244"
+DOWNLOAD="http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.42.tar.gz"
+MD5SUM="4195af8f0e5ee2a798b1014071dae3a3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/purple-facebook/purple-facebook.SlackBuild b/network/purple-facebook/purple-facebook.SlackBuild
index 4360fe31e2..c256638a09 100644
--- a/network/purple-facebook/purple-facebook.SlackBuild
+++ b/network/purple-facebook/purple-facebook.SlackBuild
@@ -26,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=purple-facebook
-VERSION=${VERSION:-7c454f51b56b}
+VERSION=${VERSION:-ad2ee74b913a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/purple-facebook/purple-facebook.info b/network/purple-facebook/purple-facebook.info
index e159a2618f..3574477ed6 100644
--- a/network/purple-facebook/purple-facebook.info
+++ b/network/purple-facebook/purple-facebook.info
@@ -1,8 +1,8 @@
 PRGNAM="purple-facebook"
-VERSION="7c454f51b56b"
+VERSION="ad2ee74b913a"
 HOMEPAGE="https://github.com/jgeboski/purple-facebook/"
-DOWNLOAD="https://github.com/jgeboski/purple-facebook/releases/download/7c454f51b56b/purple-facebook-7c454f51b56b.tar.gz"
-MD5SUM="8cdb2b04d16cfffb8ed979740d3aa818"
+DOWNLOAD="https://github.com/jgeboski/purple-facebook/releases/download/ad2ee74b913a/purple-facebook-ad2ee74b913a.tar.gz"
+MD5SUM="e39bef27bb9f6843ce70bb6f3719939f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-glib"
diff --git a/network/putty/putty.SlackBuild b/network/putty/putty.SlackBuild
index e3a22174b3..b4281c6d6c 100644
--- a/network/putty/putty.SlackBuild
+++ b/network/putty/putty.SlackBuild
@@ -31,7 +31,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=putty
-VERSION=${VERSION:-0.65}
+VERSION=${VERSION:-0.66}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/putty/putty.info b/network/putty/putty.info
index 3627710b24..944f424b80 100644
--- a/network/putty/putty.info
+++ b/network/putty/putty.info
@@ -1,8 +1,8 @@
 PRGNAM="putty"
-VERSION="0.65"
+VERSION="0.66"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-DOWNLOAD="ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-0.65/putty-0.65.tar.gz"
-MD5SUM="fe7220d2c1afc27805f976fc21afffd0"
+DOWNLOAD="ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-0.66/putty-0.66.tar.gz"
+MD5SUM="af8e1c64dd064aa33d4a47baa3d80614"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/network/python-onedrive/README b/network/python-onedrive/README
new file mode 100644
index 0000000000..769adb38b5
--- /dev/null
+++ b/network/python-onedrive/README
@@ -0,0 +1,3 @@
+Python and command-line interface for MS OneDrive (formerly known as SkyDrive) API v5.0.
+
+Optional dependencies: PyYAML, python-requests
diff --git a/network/python-onedrive/python-onedrive.SlackBuild b/network/python-onedrive/python-onedrive.SlackBuild
new file mode 100644
index 0000000000..b93e707a0a
--- /dev/null
+++ b/network/python-onedrive/python-onedrive.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for python-onedrive
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-onedrive
+VERSION=${VERSION:-15.10.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/python-onedrive/python-onedrive.info b/network/python-onedrive/python-onedrive.info
new file mode 100644
index 0000000000..5bb5d26172
--- /dev/null
+++ b/network/python-onedrive/python-onedrive.info
@@ -0,0 +1,10 @@
+PRGNAM="python-onedrive"
+VERSION="15.10.5"
+HOMEPAGE="https://github.com/mk-fg/python-onedrive"
+DOWNLOAD="https://pypi.python.org/packages/source/p/python-onedrive/python-onedrive-15.10.5.tar.gz"
+MD5SUM="ae3161084be31c5d8b6a14a71706391a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/python-onedrive/slack-desc b/network/python-onedrive/slack-desc
new file mode 100644
index 0000000000..e1a24d85ef
--- /dev/null
+++ b/network/python-onedrive/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python-onedrive: python-onedrive (CLI interface for MS OneDrive)
+python-onedrive:
+python-onedrive: Python and command-line interface for Microsoft LiveConnect
+python-onedrive: OneDrive REST API v5.0 (formerly known as SkyDrive).
+python-onedrive:
+python-onedrive: Homepage: https://github.com/mk-fg/python-onedrive
+python-onedrive:
+python-onedrive:
+python-onedrive:
+python-onedrive:
+python-onedrive:
diff --git a/network/pyzor/pyzor.SlackBuild b/network/pyzor/pyzor.SlackBuild
index 6cb6dd8aae..d58444fd2d 100644
--- a/network/pyzor/pyzor.SlackBuild
+++ b/network/pyzor/pyzor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyzor
 
-# Copyright 2009-2014 LukenShiro, Italy
+# Copyright 2009-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Thanks to Carlos Xavier for a patch with better compatibility against Python 2.7
 
 PRGNAM=pyzor
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/pyzor/pyzor.info b/network/pyzor/pyzor.info
index 3de68587f9..26a0486476 100644
--- a/network/pyzor/pyzor.info
+++ b/network/pyzor/pyzor.info
@@ -1,8 +1,8 @@
 PRGNAM="pyzor"
-VERSION="0.8.0"
+VERSION="1.0.0"
 HOMEPAGE="http://www.pyzor.org"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyzor/pyzor-0.8.0.tar.gz"
-MD5SUM="88a4c48fcc085f26f20e5f35bc48011f"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyzor/pyzor-1.0.0.tar.gz"
+MD5SUM="e77b1cd0afd3884e6f2aa585cb423b46"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild
index aa07f52152..288adaf4c9 100644
--- a/network/qTox/qTox.SlackBuild
+++ b/network/qTox/qTox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qTox
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qTox
-VERSION=${VERSION:-20150722}
+VERSION=${VERSION:-20160619_fd2e585}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,7 +86,7 @@ make
 install -D -m0755 -oroot -groot -s qtox $PKG/usr/bin/qtox
 install -D -m0644 -oroot -groot $PRGNAM.desktop \
   $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m0644 -oroot -groot img/icons/qtox-64x64.png \
+install -D -m0644 -oroot -groot img/icons/64x64/qtox.png \
   $PKG/usr/share/icons/hicolor/64x64/apps/qtox.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/qTox/qTox.info b/network/qTox/qTox.info
index 9efe60ec85..dfaf1893d7 100644
--- a/network/qTox/qTox.info
+++ b/network/qTox/qTox.info
@@ -1,10 +1,10 @@
 PRGNAM="qTox"
-VERSION="20150722"
+VERSION="20160619_fd2e585"
 HOMEPAGE="https://github.com/tux3/qTox"
-DOWNLOAD="http://mirror.slackware.hr/sources/qTox/qTox-20150722.tar.bz2"
-MD5SUM="56ff7316d6928924e39ebb72cb51981f"
+DOWNLOAD="http://mirror.slackware.hr/sources/qTox/qTox-20160619_fd2e585.tar.bz2"
+MD5SUM="bec8cdae329c6fb313e49fda20ecc494"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="toxcore libfilteraudio qt5 ffmpeg qrencode libxkbcommon"
+REQUIRES="toxcore libfilteraudio qt5 ffmpeg qrencode libxkbcommon sqlcipher"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/network/qbittorrent/README.nox b/network/qbittorrent/README.nox
new file mode 100644
index 0000000000..15193a85ab
--- /dev/null
+++ b/network/qbittorrent/README.nox
@@ -0,0 +1,17 @@
+An rc init script is provided and has the following features:
+
+Runs qbittorrent-nox webui under user who started the script.
+
+Usage:
+/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status
+Port defaults to 8080 if not provided.
+
+To run this script from rc.local you must run it as a non-root user.
+
+Example:
+/bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
+
+Program output is sent to /tmp/qbittorrent-nox-$USER
+
+The status command can be run as root, in which case you should see
+all process of qbittorrent-nox, otherwise you will just see $USER's.
diff --git a/network/qbittorrent/doinst.sh b/network/qbittorrent/doinst.sh
index 3e5691a052..48fc6d14ef 100644
--- a/network/qbittorrent/doinst.sh
+++ b/network/qbittorrent/doinst.sh
@@ -1,3 +1,18 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/rc.d/rc.qbittorrent-nox.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild
index 72ed69b606..73a4f56275 100644
--- a/network/qbittorrent/qbittorrent.SlackBuild
+++ b/network/qbittorrent/qbittorrent.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=qbittorrent
 VERSION=${VERSION:-3.1.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,16 +77,31 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install INSTALL_ROOT=$PKG
+make clean
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --disable-gui
+
+make
+mv src/qbittorrent-nox $PKG/usr/bin
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+
 mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mkdir -p $PKG/etc/rc.d
+cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
+    $CWD/README.nox \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/qbittorrent/rc.qbittorrent-nox.new b/network/qbittorrent/rc.qbittorrent-nox.new
new file mode 100644
index 0000000000..f2c3c6218b
--- /dev/null
+++ b/network/qbittorrent/rc.qbittorrent-nox.new
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# /etc/rc.d/rc.qbittorrent-nox
+# Runs qbittorrent webui under user who started the script.
+# Usage: /etc/rc.d/rc.qbittorrent-nox start <PORT>|stop|restart <PORT>|status
+# Port defaults to 8080 if not provided.
+#
+# To run this script from rc.local you must run it as a non-root user.
+#
+# Example:
+# /bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
+# Program output is sent to /tmp/qbittorrent-nox-$USER
+
+# First some checks to see what's what.
+
+if [ "$USER" = "root" ] && [ "$1" = "start" ]; then
+    echo "Do not start the daemon as root." >/dev/stderr
+    exit 1
+fi
+
+
+if [ -n "$2" ]; then
+    UIPORT="$2"
+else
+    UIPORT="8080"
+fi
+
+LOG="/tmp/qbittorrent-nox-$USER"
+APP="/usr/bin/qbittorrent-nox"
+
+do_start()
+{
+    if [ -n "$(/bin/netstat -nta | awk '{print $4}' \
+         | cut -d: -f2 | grep $UIPORT | grep 0.0.0.0)" ]; then
+
+        echo "Port $UIPORT is already in use." >/dev/stderr
+        exit 1
+    fi
+
+    $APP --webui-port=$UIPORT 1>$LOG 2>&1 &
+}
+
+do_stop()
+{
+    PID="$(pgrep -u $USER qbittorrent-nox)"
+
+    if [ -n "$PID" ]; then
+        echo "Killing PID $PID"
+        kill $PID
+    else
+        echo "No process found." >/dev/stderr
+    fi
+}
+
+do_status()
+{
+    echo "Local Address	Foreign Address	State	PID/Program name"
+    /bin/netstat -pntl 2>&1 | grep qbittorrent-n \
+    | awk '{print $4 "	" $5 "	" $6 "	" $7}'
+}
+
+case "$1" in
+    'start')
+        do_start
+    ;;
+
+    'stop')
+        do_stop
+    ;;
+    'restart')
+        do_stop
+        sleep 1
+        do_start
+    ;;
+    'status')
+        do_status
+    ;;
+    *)
+        echo "Usage: $0 {start <PORT>|stop|restart <PORT>|status}" >/dev/stderr
+        exit 1
+    ;;
+esac
diff --git a/network/r8168/README b/network/r8168/README
new file mode 100644
index 0000000000..b3c7e01525
--- /dev/null
+++ b/network/r8168/README
@@ -0,0 +1,12 @@
+This is the Linux device driver released for RealTek RTL8168B/8111B, RTL8168C/8111C,
+RTL8168CP/8111CP, RTL8168D/8111D, RTL8168DP/8111DP, and RTL8168E/8111E Gigabit
+Ethernet controllers with PCI-Express interface.
+
+To build the module for a kernel that isn't currently running on the system pass
+that kernel's "uname -r" ouput such as:  KERNEL=4.4.0" ./r8168.SlackBuild
+
+To use this module blacklist the r8169 driver in /etc/modprobe.d/blacklist.conf:
+
+blacklist r8169
+
+This will need to be rebuilt for every new kernel installed.
diff --git a/network/r8168/doinst.sh b/network/r8168/doinst.sh
new file mode 100644
index 0000000000..d335d682c8
--- /dev/null
+++ b/network/r8168/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x sbin/depmod ]; then
+  chroot . /sbin/depmod -a @KERNEL@ 1> /dev/null 2> /dev/null
+fi
diff --git a/network/r8168/r8168.SlackBuild b/network/r8168/r8168.SlackBuild
new file mode 100644
index 0000000000..b580d8e5f6
--- /dev/null
+++ b/network/r8168/r8168.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for r8168
+
+# Copyright 2016 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=r8168
+VERSION=${VERSION:-8.041.00}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=$(echo ${VERSION}_$KERNEL)
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make -C /lib/modules/$KERNEL/build \
+  SUBDIRS="$TMP/$PRGNAM-$VERSION/src" \
+  EXTRA_CFLAGS="$SLKCFLAGS" \
+  modules
+
+install -Dm0644 src/$PRGNAM.ko \
+  $PKG/lib/modules/$KERNEL/kernel/drivers/net/ethernet/realtek/$PRGNAM.ko
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/r8168/r8168.info b/network/r8168/r8168.info
new file mode 100644
index 0000000000..8cf64324bd
--- /dev/null
+++ b/network/r8168/r8168.info
@@ -0,0 +1,10 @@
+PRGNAM="r8168"
+VERSION="8.041.00"
+HOMEPAGE="https://github.com/mtorromeo/r8168"
+DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.041.00.tar.gz"
+MD5SUM="f2092a58f812c34a9071ffa985eab42d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/network/r8168/slack-desc b/network/r8168/slack-desc
new file mode 100644
index 0000000000..64d7a016c6
--- /dev/null
+++ b/network/r8168/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+r8168: r8168 (Linux device driver for Realtek Ethernet controllers)
+r8168:
+r8168: This is the Linux device driver released for RealTek RTL8168B/8111B,
+r8168: RTL8168C/8111C, RTL8168CP/8111CP, RTL8168D/8111D, RTL8168DP/8111DP,
+r8168: and RTL8168E/8111E Gigabit Ethernet controllers with PCI-Express
+r8168: interface.
+r8168:
+r8168: Homepage: https://github.com/mtorromeo/r8168
+r8168:
+r8168:
+r8168:
diff --git a/network/razor-agents/makefile_quoted_vars.diff b/network/razor-agents/makefile_quoted_vars.diff
new file mode 100644
index 0000000000..1099e9f18c
--- /dev/null
+++ b/network/razor-agents/makefile_quoted_vars.diff
@@ -0,0 +1,13 @@
+Recent MakeMaker versions quote variables.
+diff -ur razor-agents-2.85.orig/Makefile.PL razor-agents-2.85/Makefile.PL
+--- razor-agents-2.85.orig/Makefile.PL	2007-05-09 00:47:53.000000000 +0200
++++ razor-agents-2.85/Makefile.PL	2015-08-19 06:35:39.000000000 +0200
+@@ -142,7 +142,7 @@
+   my $man5 = q{ \\
+ 		$(INST_MAN5DIR) $(INSTALLMAN5DIR)};
+ 
+-  $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm;
++  $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\)"?)/$1$man5/gm;
+ 
+   return $inherited;
+ }
diff --git a/network/razor-agents/razor-agents.SlackBuild b/network/razor-agents/razor-agents.SlackBuild
index d647e55c19..136e3278d9 100644
--- a/network/razor-agents/razor-agents.SlackBuild
+++ b/network/razor-agents/razor-agents.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for razor-agents
 
-# Copyright 2013 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2013-2015 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,7 @@
 
 PRGNAM=razor-agents
 VERSION=${VERSION:-2.85}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=$PRGNAM
@@ -60,10 +60,12 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 <$CWD/makefile_quoted_vars.diff
 
 perl Makefile.PL \
   PREFIX=/usr \
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 8ce1eb99b6..80f30cabef 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -30,7 +30,7 @@ BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=Remmina
-TARVERSION=${VERSION/_/-}
+TARVERSION=$(echo $VERSION | tr _ -)
 
 AVAHI=${AVAHI:-OFF}
 TELEPATHY=${TELEPATHY:-OFF}
@@ -68,18 +68,18 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-${TARVERSION#v}
-tar xvf $CWD/v$TARVERSION.tar.?z*
-cd $SRCNAM-${TARVERSION#v}
+rm -rf $SRCNAM-$TARVERSION
+tar xvf $CWD/$SRCNAM-$TARVERSION.tar.gz || tar xvf $CWD/v$TARVERSION.tar.gz
+cd $SRCNAM-$TARVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix libdirsuffix in CMakeLists.txt
-sed "s|/lib/remmina|/lib$LIBDIRSUFFIX/remmina|g" -i CMakeLists.txt || exit 1
+sed "s|/lib/remmina|/lib$LIBDIRSUFFIX/remmina|g" -i CMakeLists.txt
 
 # Apply a whole lotta patches (if available)...
 [ -d $CWD/patches ] && for i in $CWD/patches/*; do patch -p1 -i $i ; done
diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info
index 947494e3b5..7776da2433 100644
--- a/network/remmina/remmina.info
+++ b/network/remmina/remmina.info
@@ -3,7 +3,7 @@ VERSION="1.2.0_rcgit.1"
 HOMEPAGE="http://remmina.sourceforge.net"
 DOWNLOAD="https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.1.tar.gz \
           http://pkgs.fedoraproject.org/repo/pkgs/libssh/libssh-0.6.4.tar.gz/5d092f911492e3ee4cd7b473f09a0196/libssh-0.6.4.tar.gz"
-MD5SUM="bd92d1beb5c0c3acb6e32ad546e30d84 \
+MD5SUM="7b5df647a9fb0be206cfabd273bc91f4 \
         5d092f911492e3ee4cd7b473f09a0196"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/rtorrent/rtorrent.SlackBuild b/network/rtorrent/rtorrent.SlackBuild
index 8fbd35bcbe..2ea4277a72 100644
--- a/network/rtorrent/rtorrent.SlackBuild
+++ b/network/rtorrent/rtorrent.SlackBuild
@@ -11,8 +11,8 @@
 # Updated to 0.9.0 by Brian Kysela 2011-12-12
 
 PRGNAM=rtorrent
-VERSION=${VERSION:-0.9.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,11 +71,6 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Taken out as developer removed "out-of-date man page". If you want it back
-# in you will need to edit doc/Makefile.am in the source and uncomment
-# 'man_MANS = rtorrent.1' as well as the line below.
-#gzip -9 $PKG/usr/man/man?/*.?
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/network/rtorrent/rtorrent.info b/network/rtorrent/rtorrent.info
index 5eed759854..8a62df8ffa 100644
--- a/network/rtorrent/rtorrent.info
+++ b/network/rtorrent/rtorrent.info
@@ -1,10 +1,10 @@
 PRGNAM="rtorrent"
-VERSION="0.9.4"
+VERSION="0.9.6"
 HOMEPAGE="https://github.com/rakshasa/rtorrent"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/rtorrent/rtorrent-0.9.4.tar.gz/fd9490a2ac67d0fa2a567c6267845876/rtorrent-0.9.4.tar.gz"
-MD5SUM="fd9490a2ac67d0fa2a567c6267845876"
+DOWNLOAD="http://rtorrent.net/downloads/rtorrent-0.9.6.tar.gz"
+MD5SUM="5e7550f74e382a6245412c615f45444d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libtorrent"
-MAINTAINER="Brian Kysela"
-EMAIL="brian.kysela@gmail.com"
+MAINTAINER="bkysela"
+EMAIL="bkysela@gmail.com"
diff --git a/network/scapy/scapy.SlackBuild b/network/scapy/scapy.SlackBuild
index 15c5867390..9ee7548593 100644
--- a/network/scapy/scapy.SlackBuild
+++ b/network/scapy/scapy.SlackBuild
@@ -2,28 +2,29 @@
 #
 # Slackware build script for scapy (http://www.secdev.org/projects/scapy/)
 #
-# Copyright 2008 Corrado Franco (http://www.conraid.net)
+# Copyright 2008-2015 Corrado Franco (http://conraid.net)
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted.
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License along
+# with this program (most likely, a file named COPYING).  If not, see
+# <http://www.gnu.org/licenses/>.
 
 PRGNAM=${PRGNAM:-scapy}
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,26 +47,26 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patch setup.py for man path
-sed -i "s%share/man/man1%man/man1%g" setup.py
 
+sed -i "s%share/man/man1%man/man1%g" setup.py
+python setup.py build
 python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/scapy/scapy.info b/network/scapy/scapy.info
index 6227f7345b..2650146761 100644
--- a/network/scapy/scapy.info
+++ b/network/scapy/scapy.info
@@ -1,10 +1,10 @@
 PRGNAM="scapy"
-VERSION="2.0.1"
-HOMEPAGE="http://www.secdev.org/projects/scapy"
-DOWNLOAD="http://www.secdev.org/projects/scapy/files/scapy-2.0.1.tar.gz"
-MD5SUM="eaf09bce872c835135a8c66327f920cb"
+VERSION="2.3.1"
+HOMEPAGE="http://www.secdev.org/projects/scapy/"
+DOWNLOAD="http://www.secdev.org/projects/scapy/files/scapy-2.3.1.zip"
+MD5SUM="46f4ef88b676daebd3053bbd2ee16425"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Corrado Franco"
-EMAIL="conraid@gmail.com"
+EMAIL="conraid (at) linux (dot) it"
diff --git a/network/seafile-client/seafile-client.SlackBuild b/network/seafile-client/seafile-client.SlackBuild
index a9f3a62b06..205c0af148 100644
--- a/network/seafile-client/seafile-client.SlackBuild
+++ b/network/seafile-client/seafile-client.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=seafile-client
 SRCNAM=seafile
-VERSION=${VERSION:-4.3.0}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/seafile-client/seafile-client.info b/network/seafile-client/seafile-client.info
index d8777acd75..ef875c1f8f 100644
--- a/network/seafile-client/seafile-client.info
+++ b/network/seafile-client/seafile-client.info
@@ -1,8 +1,8 @@
 PRGNAM="seafile-client"
-VERSION="4.3.0"
+VERSION="4.4.6"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.3.0-server.tar.gz"
-MD5SUM="f259c5f64f83bcc6fa6c870886d0324d"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
+MD5SUM="753db8ec00c8f4e43270afff097a23af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ccnet libevhtp"
diff --git a/network/seafile-server/seafile-server.SlackBuild b/network/seafile-server/seafile-server.SlackBuild
index 05b380b28e..959cbc15c4 100644
--- a/network/seafile-server/seafile-server.SlackBuild
+++ b/network/seafile-server/seafile-server.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=seafile-server
 SRCNAM=seafile
-VERSION=${VERSION:-4.3.0}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/seafile-server/seafile-server.info b/network/seafile-server/seafile-server.info
index 2a96dfd76f..568008a660 100644
--- a/network/seafile-server/seafile-server.info
+++ b/network/seafile-server/seafile-server.info
@@ -1,8 +1,8 @@
 PRGNAM="seafile-server"
-VERSION="4.3.0"
+VERSION="4.4.6"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.3.0-server.tar.gz"
-MD5SUM="f259c5f64f83bcc6fa6c870886d0324d"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
+MD5SUM="753db8ec00c8f4e43270afff097a23af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ccnet libevhtp seahub"
diff --git a/network/seahub/seahub.SlackBuild b/network/seahub/seahub.SlackBuild
index a57bfead22..086d44c1c1 100644
--- a/network/seahub/seahub.SlackBuild
+++ b/network/seahub/seahub.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=seahub
 SRCNAM=seafile-server
-VERSION=${VERSION:-4.3.0}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/seahub/seahub.info b/network/seahub/seahub.info
index 69683639ab..6a8609fbf9 100644
--- a/network/seahub/seahub.info
+++ b/network/seahub/seahub.info
@@ -1,10 +1,10 @@
 PRGNAM="seahub"
-VERSION="4.3.0"
+VERSION="4.4.6"
 HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://s.mos6581.de/static/slackbuilds.org/sources/seafile/seafile-server_4.3.0_i386.tar.gz"
-MD5SUM="50364d642e11ab821f8dafd217296482"
-DOWNLOAD_x86_64="https://s.mos6581.de/static/slackbuilds.org/sources/seafile/seafile-server_4.3.0_x86-64.tar.gz"
-MD5SUM_x86_64="ff3f2c93acede628f5149196df84e5dd"
+DOWNLOAD="https://bintray.com/artifact/download/seafile-org/seafile/seafile-server_4.4.6_i386.tar.gz"
+MD5SUM="4269313cca5e52c82b099a51c0bfbe89"
+DOWNLOAD_x86_64="http://download-cn.seafile.com/seafile-server_4.4.6_x86-64.tar.gz"
+MD5SUM_x86_64="9257ae7e926e498cd3c1e0caaedc765f"
 REQUIRES=""
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/network/sftp-cloudfs/README b/network/sftp-cloudfs/README
new file mode 100644
index 0000000000..c42ac6eaab
--- /dev/null
+++ b/network/sftp-cloudfs/README
@@ -0,0 +1,13 @@
+This is a SFTP (Secure File Transfer Protocol) interface to OpenStack
+Object Storage, providing a service that acts as a proxy between a
+SFTP client and a storage service.
+
+The username/password pair used to open the SFTP session is validated
+using the authentication service of the files/storage service to get
+an authentication token.
+
+The communication between the client and the SFTP daemon is encrypted
+all the time, and the SFTP service supports HTTPS communication with
+the remote files/storage service.
+
+There's limited SCP support since 0.10.
diff --git a/network/sftp-cloudfs/doinst.sh b/network/sftp-cloudfs/doinst.sh
new file mode 100644
index 0000000000..ba4a70f16f
--- /dev/null
+++ b/network/sftp-cloudfs/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/sftpcloudfs.conf.new
diff --git a/network/sftp-cloudfs/sftp-cloudfs.SlackBuild b/network/sftp-cloudfs/sftp-cloudfs.SlackBuild
new file mode 100644
index 0000000000..1ebb31b016
--- /dev/null
+++ b/network/sftp-cloudfs/sftp-cloudfs.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for "sftp-cloudfs".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=sftp-cloudfs
+SRCNAM=sftpcloudfs
+VERSION=${VERSION:-0.18}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root $PKG
+
+mkdir -p $PKG/etc
+install -m 0644 $SRCNAM.conf.example $PKG/etc/$SRCNAM.conf.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog QuickStart.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/sftp-cloudfs/sftp-cloudfs.info b/network/sftp-cloudfs/sftp-cloudfs.info
new file mode 100644
index 0000000000..9dcd0de1aa
--- /dev/null
+++ b/network/sftp-cloudfs/sftp-cloudfs.info
@@ -0,0 +1,10 @@
+PRGNAM="sftp-cloudfs"
+VERSION="0.18"
+HOMEPAGE="https://github.com/Memset/sftpcloudfs/"
+DOWNLOAD="https://github.com/Memset/sftpcloudfs/archive/0.18.tar.gz"
+MD5SUM="dfd746a86ed4b9712c1cb3de418813b3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ftp-cloudfs paramiko"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/sftp-cloudfs/slack-desc b/network/sftp-cloudfs/slack-desc
new file mode 100644
index 0000000000..05ae8897b0
--- /dev/null
+++ b/network/sftp-cloudfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+sftp-cloudfs: sftp-cloudfs (SFTP interface to OpenStack Object Storage (Swift))
+sftp-cloudfs:
+sftp-cloudfs: This is a SFTP (Secure File Transfer Protocol) interface to OpenStack
+sftp-cloudfs: Object Storage, providing a service that acts as a proxy between a
+sftp-cloudfs: SFTP client and a storage service.
+sftp-cloudfs:
+sftp-cloudfs: Homepage: https://github.com/Memset/sftpcloudfs/
+sftp-cloudfs:
+sftp-cloudfs:
+sftp-cloudfs:
+sftp-cloudfs:
diff --git a/network/shibboleth-sp/README b/network/shibboleth-sp/README
index 3eae149df7..d52fbb8bd0 100644
--- a/network/shibboleth-sp/README
+++ b/network/shibboleth-sp/README
@@ -5,6 +5,4 @@ exchange of rich attributes subject to privacy controls.
 This package contains the Shibboleth Service Provider runtime libraries,
 daemon, default plugins, and Apache module.
 
-For some basic setup instructions, check the included 'README.SLACKWARE'
-file. Lots of information is available on the shibboleth wiki:
-https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration
+For some basic setup instructions, check the included 'README.SLACKWARE'.
diff --git a/network/shibboleth-sp/README.SLACKWARE b/network/shibboleth-sp/README.SLACKWARE
index 68f032d04b..b62e830259 100644
--- a/network/shibboleth-sp/README.SLACKWARE
+++ b/network/shibboleth-sp/README.SLACKWARE
@@ -12,13 +12,13 @@ You will need to add the following line to /etc/httpd/httpd.conf:
 To start shibboleth automatically at system startup, add the following to
 your /etc/rc.d/rc.local:
 
-  if [ -x /etc/rc.d/rc.shibboleth ]; then
-    /etc/rc.d/rc.shibboleth start
+  if [ -x /etc/rc.d/rc.shibd ]; then
+    /etc/rc.d/rc.shibd start
   fi
 
 To stop shibboleth automatically at system shutdown, add the following to
 your /etc/rc.d/rc.local_shutdown:
 
-  if [ -x /etc/rc.d/rc.shibboleth ]; then
-    /etc/rc.d/rc.shibboleth stop
+  if [ -x /etc/rc.d/rc.shibd ]; then
+    /etc/rc.d/rc.shibd stop
   fi
diff --git a/network/shibboleth-sp/doinst.sh b/network/shibboleth-sp/doinst.sh
index 62214b7f2a..a7cb2d3911 100644
--- a/network/shibboleth-sp/doinst.sh
+++ b/network/shibboleth-sp/doinst.sh
@@ -22,7 +22,7 @@ preserve_perms() {
   config $NEW
 }
 
-preserve_perms etc/rc.d/rc.shibboleth.new
+preserve_perms etc/rc.d/rc.shibd.new
 config etc/httpd/extra/mod_shib.conf.new
 find etc/shibboleth/ -name *.html.new | while read cfg ; do config $cfg ; done
 find etc/shibboleth/ -name *.logger.new | while read cfg ; do config $cfg ; done
diff --git a/network/shibboleth-sp/mod_shib.conf b/network/shibboleth-sp/mod_shib.conf
deleted file mode 100644
index 815b2be7ac..0000000000
--- a/network/shibboleth-sp/mod_shib.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Load the Shibboleth module.
-#
-LoadModule mod_shib /usr/@baselibdir@/shibboleth/mod_shib_24.so
-
-#
-# Used for example style sheet in error templates.
-#
-<IfModule mod_alias.c>
-  <Location /shibboleth-sp>
-    Require all granted
-  </Location>
-  Alias /shibboleth-sp/main.css /usr/share/shibboleth/main.css
-</IfModule>
-
-#
-# Configure the module for content.
-#
-# You MUST enable AuthType shibboleth for the module to process
-# any requests, and there MUST be a require command as well. To
-# enable Shibboleth but not specify any session/access requirements
-# use "require shibboleth".
-#
-
-#<Location /secure>
-#  AuthType shibboleth
-#  ShibRequestSetting requireSession 1
-#  require valid-user
-#</Location>
-
diff --git a/network/shibboleth-sp/rc.shibboleth b/network/shibboleth-sp/rc.shibboleth
deleted file mode 100644
index 8854433a97..0000000000
--- a/network/shibboleth-sp/rc.shibboleth
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-shibd_start() {
-  echo "Starting the shibd service:  /usr/sbin/shibd"
-  /usr/sbin/shibd -f -u shibd -g shibd
-}
-
-shibd_stop() {
-  echo "Stoping the shibd service:  /usr/sbin/shibd"
-  killall shibd
-}
-
-shibd_restart() {
-  shibd_stop
-  sleep 1
-  shibd_start
-}
-
-shibd_configtest() {
-  /usr/sbin/shibd -t
-}
-
-case "$1" in
-  'start')
-    shibd_start
-  ;;
-  'stop')
-    shibd_stop
-  ;;
-  'restart')
-    shibd_restart
-  ;;
-  'configtest')
-    shibd_configtest
-  ;;
-  *)
-    echo "Usage: $0 start|stop|restart|configtest"
-  ;;
-esac
diff --git a/network/shibboleth-sp/rc.shibd b/network/shibboleth-sp/rc.shibd
new file mode 100644
index 0000000000..db154529fa
--- /dev/null
+++ b/network/shibboleth-sp/rc.shibd
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+SHIBD_USER=shibd
+SHIBD_WAIT=30
+SHIBD_PID=/var/run/shibboleth/shibd.pid
+
+DAEMON_OPTS="-f -u $SHIBD_USER -g $SHIBD_USER -w $SHIBD_WAIT -p $SHIBD_PID"
+
+shibd_start() {
+  if [ -f $SHIBD_PID ]; then
+    echo "The shibd service is already running"
+  else
+    echo "Starting the shibd service:  /usr/sbin/shibd"
+    /usr/sbin/shibd $DAEMON_OPTS -p $SHIBD_PID
+  fi
+}
+
+shibd_stop() {
+  echo "Stoping the shibd service:  /usr/sbin/shibd"
+  killall shibd
+}
+
+shibd_restart() {
+  shibd_stop
+  sleep 1
+  shibd_start
+}
+
+shibd_configtest() {
+  /usr/sbin/shibd -t
+}
+
+case "$1" in
+  'start')
+    shibd_start
+  ;;
+  'stop')
+    shibd_stop
+  ;;
+  'restart')
+    shibd_restart
+  ;;
+  'configtest')
+    shibd_configtest
+  ;;
+  *)
+    echo "Usage: $0 start|stop|restart|configtest"
+  ;;
+esac
diff --git a/network/shibboleth-sp/shibboleth-sp.SlackBuild b/network/shibboleth-sp/shibboleth-sp.SlackBuild
index d78d3e27b7..bcb942a844 100644
--- a/network/shibboleth-sp/shibboleth-sp.SlackBuild
+++ b/network/shibboleth-sp/shibboleth-sp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Shibboleth Service Provider.
 
-# Copyright 2013 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2013-2015 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shibboleth-sp
-VERSION=${VERSION:-2.5.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -58,8 +58,8 @@ set -e
 
 if [ "$(grep ^shibd /etc/passwd)" = "" -o "$(grep ^shibd /etc/group)" = "" ] ; then
   printf "\nYou must have a shibd user and group.\n\nExample:\n"
-  printf "\t# groupadd -g 267 shibd\n"
-  printf "\t# useradd -d /var/run/shibboleth -s /bin/false -u 267 -g shibd shibd\n\n"
+  printf "\t# groupadd -g 312 shibd\n"
+  printf "\t# useradd -d /var/run/shibboleth -s /bin/false -u 312 -g shibd shibd\n\n"
   exit 1
 fi
 
@@ -71,10 +71,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,16 +89,15 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/etc/httpd/extra
-sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%" $CWD/mod_shib.conf > \
-  $PKG/etc/httpd/extra/mod_shib.conf.new
+install -m 644 configs/apache24.config $PKG/etc/httpd/extra/mod_shib.conf.new
 
 chown shibd:shibd $PKG/var/cache/shibboleth $PKG/var/log/shibboleth/ $PKG/var/run/shibboleth
 
 mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.shibboleth > $PKG/etc/rc.d/rc.shibboleth.new
+cat $CWD/rc.shibd > $PKG/etc/rc.d/rc.shibd.new
 
 # Remove useless stuffs
-rm -f $PKG/etc/shibboleth/shibd-* $PKG/etc/shibboleth/*.dist
+rm -f $PKG/etc/shibboleth/shibd-* $PKG/etc/shibboleth/*.dist $PKG/etc/shibboleth/apache*.config
 
 # Change configuration files to .new
 find $PKG/etc/shibboleth/ -name *.html | while read cfg ; do mv $cfg $cfg.new ; done
diff --git a/network/shibboleth-sp/shibboleth-sp.info b/network/shibboleth-sp/shibboleth-sp.info
index b828b4f18e..6cf8244999 100644
--- a/network/shibboleth-sp/shibboleth-sp.info
+++ b/network/shibboleth-sp/shibboleth-sp.info
@@ -1,8 +1,8 @@
 PRGNAM="shibboleth-sp"
-VERSION="2.5.2"
+VERSION="2.5.5"
 HOMEPAGE="http://shibboleth.net/"
-DOWNLOAD="http://shibboleth.net/downloads/service-provider/2.5.2/shibboleth-sp-2.5.2.tar.gz"
-MD5SUM="ce1af8e3a9bf0b921fb04ac886870056"
+DOWNLOAD="http://shibboleth.net/downloads/service-provider/2.5.5/shibboleth-sp-2.5.5.tar.gz"
+MD5SUM="7dc27a9876a7cef281995075d62e16ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="opensaml"
diff --git a/network/shibboleth-sp/slack-desc b/network/shibboleth-sp/slack-desc
index 7cdcce7ae0..d2ecbd627d 100644
--- a/network/shibboleth-sp/slack-desc
+++ b/network/shibboleth-sp/slack-desc
@@ -9,11 +9,11 @@
 shibboleth-sp: shibboleth-sp (Shibboleth Service Provider)
 shibboleth-sp:
 shibboleth-sp: Shibboleth is a Web Single Sign-On implementations based on OpenSAML
-shibboleth-sp: that supports multiple protocols, federated identity, and the extensible
-shibboleth-sp: exchange of rich attributes subject to privacy controls.
+shibboleth-sp: that supports multiple protocols, federated identity, and the
+shibboleth-sp: extensible exchange of rich attributes subject to privacy controls.
 shibboleth-sp:
-shibboleth-sp: This package contains the Shibboleth Service Provider runtime libraries,
-shibboleth-sp: daemon, default plugins, and Apache module.
+shibboleth-sp: This package contains the Shibboleth Service Provider runtime
+shibboleth-sp: libraries, daemon, default plugins, and Apache module.
 shibboleth-sp:
 shibboleth-sp:
 shibboleth-sp:
diff --git a/network/shorewall-core/shorewall-core.SlackBuild b/network/shorewall-core/shorewall-core.SlackBuild
index d5bcb0c57d..9101f978ed 100644
--- a/network/shorewall-core/shorewall-core.SlackBuild
+++ b/network/shorewall-core/shorewall-core.SlackBuild
@@ -24,11 +24,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall-core
-VERSION=${VERSION:-4.6.11}
+VERSION=${VERSION:-4.6.13.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=4.6.11
+BASEVERS=4.6.13
 
 ARCH=noarch
 
@@ -74,9 +74,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-# Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
-  rm -rf $TMP/$PRGNAM-$BASEVERS
-  rm -rf $PKG
-fi
diff --git a/network/shorewall-core/shorewall-core.info b/network/shorewall-core/shorewall-core.info
index 0e641cfd71..ef8cfd1ea7 100644
--- a/network/shorewall-core/shorewall-core.info
+++ b/network/shorewall-core/shorewall-core.info
@@ -1,8 +1,12 @@
 PRGNAM="shorewall-core"
-VERSION="4.6.11"
+VERSION="4.6.13.2"
 HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.11/base/shorewall-core-4.6.11.tar.bz2"
-MD5SUM="9e266bb33df66811895ffb7b9cfdded5"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/base/shorewall-core-4.6.13.tar.bz2 \
+	http://shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/patch-core-4.6.13.1 \
+	http://shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/patch-core-4.6.13.2"
+MD5SUM="69b418ca83ce815be73c13fad2140896 \
+	3559fb28398fe010e7e79e9c809c57dd \
+	62952a6128191ec929f63d33c96c3329"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/shorewall/shorewall.SlackBuild b/network/shorewall/shorewall.SlackBuild
index ac48ac3d55..850a8eb3d1 100644
--- a/network/shorewall/shorewall.SlackBuild
+++ b/network/shorewall/shorewall.SlackBuild
@@ -24,12 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall
-VERSION=${VERSION:-4.6.11}
+VERSION=${VERSION:-4.6.13.2}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=4.6.11
+BASEVERS=4.6.13
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
diff --git a/network/shorewall/shorewall.info b/network/shorewall/shorewall.info
index c34ebdeef6..dd0dbbdbec 100644
--- a/network/shorewall/shorewall.info
+++ b/network/shorewall/shorewall.info
@@ -1,8 +1,12 @@
 PRGNAM="shorewall"
-VERSION="4.6.11"
+VERSION="4.6.13.2"
 HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.11/base/shorewall-4.6.11.tar.bz2"
-MD5SUM="27c1c71d8038be6f4eaa282c59ebb3c9"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/base/shorewall-4.6.13.tar.bz2 \
+	http://shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/patch-4.6.13.1 \
+	http://shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/patch-4.6.13.2"
+MD5SUM="12ee6cabb5d9118d5da664f7a192797f \
+	b8fc24b8a48f7676d5f9bfadbf6a8364 \
+	fa944c7ccbb5cec5a85014a15e1e0f4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"
diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index ff1d500933..f7cd92adb6 100644
--- a/network/shorewall6/shorewall6.SlackBuild
+++ b/network/shorewall6/shorewall6.SlackBuild
@@ -24,12 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall6
-VERSION=${VERSION:-4.6.11}
+VERSION=${VERSION:-4.6.13.2}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=4.6.11
+BASEVERS=4.6.13
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info
index 6ead067e60..31eb4637f7 100644
--- a/network/shorewall6/shorewall6.info
+++ b/network/shorewall6/shorewall6.info
@@ -1,8 +1,12 @@
 PRGNAM="shorewall6"
-VERSION="4.6.11"
+VERSION="4.6.13.2"
 HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.11/base/shorewall6-4.6.11.tar.bz2"
-MD5SUM="3637c944546f12ef963126e5553aad2d"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/base/shorewall6-4.6.13.tar.bz2 \
+	http://shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/patch-6-4.6.13.1 \
+	http://shorewall.net/pub/shorewall/4.6/shorewall-4.6.13/patch-6-4.6.13.2"
+MD5SUM="341ed02ef8f3682bc6eec63acc14ec53 \
+	52e95a4b2875a72e170cebf9682fab23 \
+	1adcbb1e36bbaca2d9f6e8fd8510bfc3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"
diff --git a/network/skylable-sx/patch/skylable-sx-1.2-fix-curl-7.45.patch b/network/skylable-sx/patch/skylable-sx-1.2-fix-curl-7.45.patch
new file mode 100644
index 0000000000..00d9f683c3
--- /dev/null
+++ b/network/skylable-sx/patch/skylable-sx-1.2-fix-curl-7.45.patch
@@ -0,0 +1,13 @@
+diff --git a/libsxclient/src/openssl.c b/libsxclient/src/openssl.c
+index 62bfc01..666430a 100644
+--- a/libsxclient/src/openssl.c
++++ b/libsxclient/src/openssl.c
+@@ -98,6 +98,8 @@ int sxi_sslctxfun(sxc_client_t *sx, curlev_t *ev, const struct curl_tlssessionin
+         return -1;
+     }
+     SSL_CTX *ctx = (SSL_CTX*)info->internals;
++    if (!ctx)
++        return -EAGAIN;
+     SSL_CTX_set_cert_verify_callback(ctx, ssl_verify_hostname, ev);
+     return 0;
+ }
diff --git a/network/skylable-sx/skylable-sx.SlackBuild b/network/skylable-sx/skylable-sx.SlackBuild
index 20cdfd94d5..cd16f14cc3 100644
--- a/network/skylable-sx/skylable-sx.SlackBuild
+++ b/network/skylable-sx/skylable-sx.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=skylable-sx
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix a curl-7.45 compatibility issue
+patch -p1 < $CWD/patch/skylable-sx-1.2-fix-curl-7.45.patch
+
 # CLIENT_ONLY="--disable-server"
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/network/skylable-sx/skylable-sx.info b/network/skylable-sx/skylable-sx.info
index 311f38af6d..bd3f143e60 100644
--- a/network/skylable-sx/skylable-sx.info
+++ b/network/skylable-sx/skylable-sx.info
@@ -1,8 +1,8 @@
 PRGNAM="skylable-sx"
-VERSION="1.1"
+VERSION="1.2"
 HOMEPAGE="http://www.skylable.com"
-DOWNLOAD="http://cdn.skylable.com/source/sx-1.1.tar.gz"
-MD5SUM="d8ac16ad3afbe6fe5489b926ee7ae914"
+DOWNLOAD="http://cdn.skylable.com/source/sx-1.2.tar.gz"
+MD5SUM="1a23ff4fc1a8f8d60306f55d8af2ae50"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yajl fcgi"
diff --git a/network/slurm/README b/network/slurm/README
new file mode 100644
index 0000000000..3aa4f86a18
--- /dev/null
+++ b/network/slurm/README
@@ -0,0 +1,22 @@
+Slurm Workload Manager
+
+Slurm is an open-source workload manager designed for Linux clusters of all sizes. 
+It provides three key functions. First it allocates exclusive and/or non-exclusive 
+access to resources (computer nodes) to users for some duration of time so they can 
+perform work. Second, it provides a framework for starting, executing, and monitoring 
+work (typically a parallel job) on a set of allocated nodes. Finally, it arbitrates 
+contention for resources by managing a queue of pending work.
+
+The SLURM controller (slurmctld) can run without elevated privileges, 
+so it is recommended that a user "slurm" be created for it before Slurm is executed. 
+
+# groupadd -g 311 slurm
+# useradd -u 311 -d /var/lib/slurm -s /bin/false -g slurm slurm
+
+Next, a configuration file can be build using your favorite web browser and the 
+file /usr/doc/slurm-14.11.8/html/configurator.html.
+
+Optional dependencies:
+HWLOC=yes|no (default: no), requires hwloc
+RRDTOOL=yes|no (default: no), requires rrdtool
+NUMA auto-detected, requires numactl
diff --git a/network/slurm/doinst.sh b/network/slurm/doinst.sh
new file mode 100644
index 0000000000..5995843bc0
--- /dev/null
+++ b/network/slurm/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.slurm.new
+preserve_perms etc/rc.d/rc.slurmdbd.new
diff --git a/network/slurm/slack-desc b/network/slurm/slack-desc
new file mode 100644
index 0000000000..819790444f
--- /dev/null
+++ b/network/slurm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+slurm: slurm (workload manager)
+slurm:
+slurm: Slurm is an open-source workload manager designed for Linux clusters
+slurm: of all sizes. It provides three key functions. First it allocates
+slurm: exclusive and/or non-exclusive access to resources (computer nodes)
+slurm: to users for some duration of time so they can perform work. Second,
+slurm: It provides a framework for starting, executing, and monitoring work
+slurm: (typically a parallel job) on a set of allocated nodes. Finally, it
+slurm: arbitrates contention for resources by managing a queue of pending
+slurm: work.
+slurm: http://slurm.schedmd.com/
diff --git a/network/slurm/slurm.SlackBuild b/network/slurm/slurm.SlackBuild
new file mode 100644
index 0000000000..e37fc7fd99
--- /dev/null
+++ b/network/slurm/slurm.SlackBuild
@@ -0,0 +1,123 @@
+#!/bin/sh -e
+
+# Slackware build script for Slurm
+
+# Copyright 2015 Emmanuel N. Millán, Mendoza, Argentina.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=slurm
+VERSION=${VERSION:-14.11.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+DOCS="AUTHORS BUILD.NOTES COPYING DISCLAIMER INSTALL LICENSE.OpenSSL \
+      META NEWS README.rst RELEASE_NOTES"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+HWLOC=${HWLOC:-no}
+HWLOC_SUPPORT=""
+[ "$HWLOC" = "yes" ] && HWLOC_SUPPORT="--with-hwloc"
+
+RRDTOOL=${RRDTOOL:-no}
+RRDTOOL_SUPPORT=""
+[ "$RRDTOOL" = "yes" ] && RRDTOOL_SUPPORT="--with-rrdtool"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --datarootdir=/usr \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --enable-static=no \
+  $HWLOC_SUPPORT \
+  $RRDTOOL_SUPPORT \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/etc/slurm
+mkdir -p $PKG/etc/rc.d/
+cp -a etc/slurm.conf.example $PKG/etc/slurm/slurm.conf.example
+cp -a etc/slurmdbd.conf.example $PKG/etc/slurm/slurmdbd.conf.example
+cp -a etc/init.d.slurm $PKG/etc/rc.d/rc.slurm.new
+cp -a etc/init.d.slurmdbd $PKG/etc/rc.d/rc.slurmdbd.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/slurm/slurm.info b/network/slurm/slurm.info
new file mode 100644
index 0000000000..4984565e50
--- /dev/null
+++ b/network/slurm/slurm.info
@@ -0,0 +1,10 @@
+PRGNAM="slurm"
+VERSION="14.11.8"
+HOMEPAGE="http://slurm.schedmd.com/"
+DOWNLOAD="http://www.schedmd.com/download/latest/slurm-14.11.8.tar.bz2"
+MD5SUM="6bd8b788aa91e3e88c57858cc9c4d3bf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="munge"
+MAINTAINER="Emmanuel N. Millán"
+EMAIL="emmanueln@gmail.com"
diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild
index 724c4e1dc0..6646f0ad8c 100644
--- a/network/socat/socat.SlackBuild
+++ b/network/socat/socat.SlackBuild
@@ -3,7 +3,7 @@
 
 # Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com>
 # Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
-# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -22,7 +22,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=socat
-VERSION=${VERSION:-1.7.2.4}
+VERSION=${VERSION:-1.7.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,10 +63,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,7 +89,8 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ README* SECURITY doc/*.{css,html} \
+  BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ PORTING \
+  README* SECURITY doc/*.{css,html} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/socat/socat.info b/network/socat/socat.info
index b4c8bf2262..847eee4e2d 100644
--- a/network/socat/socat.info
+++ b/network/socat/socat.info
@@ -1,8 +1,8 @@
 PRGNAM="socat"
-VERSION="1.7.2.4"
+VERSION="1.7.3.0"
 HOMEPAGE="http://www.dest-unreach.org/socat"
-DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.2.4.tar.bz2"
-MD5SUM="69b8155dd442a6f24e28ef5407d868eb"
+DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.0.tar.bz2"
+MD5SUM="b607edb65bc6c57f4a43f06247504274"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild
index 148dff6280..814f6b1115 100644
--- a/network/spamassassin/spamassassin.SlackBuild
+++ b/network/spamassassin/spamassassin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for spamassassin
 
-# Copyright 2008-2014 LukenShiro, Italy
+# Copyright 2008-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@
 # spamassassin database, and most of spamassassin dependencies' scripts.
 
 PRGNAM=spamassassin
-VERSION=${VERSION:-3.4.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.4.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,13 +70,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# patch for bug in DnsResolver.pm (thanks to Edgars for pointing it out)
-# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=7057
-cd lib
-patch -p0 < $CWD/patch-dnsresolver_3.4.0.diff
-cd ..
-
-echo "y" | perl Makefile.PL \
+perl Makefile.PL \
   PREFIX=/usr \
   INSTALLDIRS=vendor \
   INSTALLVENDORMAN1DIR=/usr/man/man1 \
diff --git a/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info
index 5a3de16984..ad427e451f 100644
--- a/network/spamassassin/spamassassin.info
+++ b/network/spamassassin/spamassassin.info
@@ -1,8 +1,8 @@
 PRGNAM="spamassassin"
-VERSION="3.4.0"
+VERSION="3.4.1"
 HOMEPAGE="http://spamassassin.apache.org/"
-DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.bz2"
-MD5SUM="46e99adc0affebbe5f3524b4834e0345"
+DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2"
+MD5SUM="0db5d27d7b782ff5eadee12b95eae84c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwww-perl perl-Crypt-OpenSSL-Bignum perl-Encode-Detect perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-IP-Country perl-Image-Info perl-Mail-DKIM perl-Mail-SPF perl-Net-Ident perl-Net-Server pyzor re2c"
diff --git a/network/speedtest-cli/speedtest-cli.SlackBuild b/network/speedtest-cli/speedtest-cli.SlackBuild
index 7d72b1fc28..9f65fd3884 100644
--- a/network/speedtest-cli/speedtest-cli.SlackBuild
+++ b/network/speedtest-cli/speedtest-cli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for speedtest-cli
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=speedtest-cli
-VERSION=${VERSION:-0.3.2}
+VERSION=${VERSION:-0.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/speedtest-cli/speedtest-cli.info b/network/speedtest-cli/speedtest-cli.info
index 760b2fdadc..08b2df36d3 100644
--- a/network/speedtest-cli/speedtest-cli.info
+++ b/network/speedtest-cli/speedtest-cli.info
@@ -1,8 +1,8 @@
 PRGNAM="speedtest-cli"
-VERSION="0.3.2"
+VERSION="0.3.4"
 HOMEPAGE="https://github.com/sivel/speedtest-cli"
-DOWNLOAD="https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-0.3.2.tar.gz"
-MD5SUM="7198a5e10d79fe3b408b553a7e59d484"
+DOWNLOAD="https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-0.3.4.tar.gz"
+MD5SUM="b31705b6fd47fa7e1f0f930b4446c731"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/network/sphinx/sphinx.SlackBuild b/network/sphinx/sphinx.SlackBuild
index 626e98b68b..eb154f1ccd 100644
--- a/network/sphinx/sphinx.SlackBuild
+++ b/network/sphinx/sphinx.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sphinx
-VERSION=${VERSION:-2.2.9}
+VERSION=${VERSION:-2.2.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/sphinx/sphinx.info b/network/sphinx/sphinx.info
index 9a1ee1fed6..72216d88c1 100644
--- a/network/sphinx/sphinx.info
+++ b/network/sphinx/sphinx.info
@@ -1,8 +1,8 @@
 PRGNAM="sphinx"
-VERSION="2.2.9"
+VERSION="2.2.10"
 HOMEPAGE="http://www.sphinxsearch.com/"
-DOWNLOAD="http://sphinxsearch.com/files/sphinx-2.2.9-release.tar.gz"
-MD5SUM="1fcc3d180c0559bdeb93602ef248caf4"
+DOWNLOAD="http://sphinxsearch.com/files/sphinx-2.2.10-release.tar.gz"
+MD5SUM="dda52b24d8348fc09e26d8a649a231d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sqlmap/README b/network/sqlmap/README
index fa2b395a1a..fc2fba4f23 100644
--- a/network/sqlmap/README
+++ b/network/sqlmap/README
@@ -1,8 +1,7 @@
-sqlmap is an open source command-line automatic SQL injection tool developed
-in Python. Its goal is to detect and take advantage of SQL injection
-vulnerabilities on web applications. Once it detects one or more SQL
-injections on the target host, the user can choose among a variety of options
-to perform an extensive back-end database management system fingerprint,
-retrieve DBMS session user and database, enumerate users, password hashes,
-privileges, databases, dump entire or user's specific DBMS tables/columns, run
-his own SQL statement, read specific files on the file system and more.
+sqlmap is an open source penetration testing tool that automates the
+process of detecting and exploiting SQL injection flaws and taking over
+of database servers. It comes with a powerful detection engine, many
+niche features for the ultimate penetration tester and a broad range of
+switches lasting from database fingerprinting, over data fetching from
+the database, to accessing the underlying file system and executing
+commands on the operating system via out-of-band connections.
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index dc509f8c30..90281cc73e 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for sqlmap.
-#
+
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -40,24 +41,28 @@ mkdir -p $TMP $PKG $OUTPUT
 
 # Install sqlmap in /opt
 mkdir -p $PKG/opt
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PKG/opt
-cd $PKG/opt/$PRGNAM
-chown -R root:root .
-find -L . \
+tar xvf $CWD/$VERSION.tar.gz -C $PKG/opt
+chown -R root:root $PKG/opt/$PRGNAM-$VERSION
+find -L $PKG/opt/$PRGNAM-$VERSION \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
+
+# Make the wrapper script less prone to maintainer forgetfulness...
+ln -s $PRGNAM-$VERSION $PKG/opt/$PRGNAM
+
 # rename sqlmap.conf
-mv sqlmap.conf sqlmap.conf.new
+mv $PKG/opt/$PRGNAM-$VERSION/sqlmap.conf $PKG/opt/$PRGNAM-$VERSION/sqlmap.conf.new
 
 # Install an application launcher
 mkdir -p $PKG/usr/bin
 install -m 0755 $CWD/sqlmap $PKG/usr/bin/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/$PRGNAM/doc/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/$PRGNAM/doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/$PRGNAM-$VERSION/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/opt/$PRGNAM-$VERSION/doc
+ln -s /usr/doc/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -65,4 +70,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info
index 50bc9b72d0..3e6321107a 100644
--- a/network/sqlmap/sqlmap.info
+++ b/network/sqlmap/sqlmap.info
@@ -1,10 +1,10 @@
 PRGNAM="sqlmap"
 VERSION="0.9"
-HOMEPAGE="http://sqlmap.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlmap/sqlmap-0.9.tar.gz"
-MD5SUM="608d5773e0925e96e618171829d679b9"
+HOMEPAGE="http://sqlmap.org/"
+DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/0.9.tar.gz"
+MD5SUM="e1fbb448379b1bc3af5b0be31fc505c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
index f4669d4c61..e07f0cc591 100644
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ b/network/sshfs-fuse/sshfs-fuse.info
@@ -1,7 +1,7 @@
 PRGNAM="sshfs-fuse"
 VERSION="2.5"
-HOMEPAGE="http://fuse.sourceforge.net/sshfs.html"
-DOWNLOAD="http://downloads.sourceforge.net/fuse/sshfs-fuse-2.5.tar.gz"
+HOMEPAGE="https://github.com/libfuse/sshfs"
+DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2_5/sshfs-fuse-2.5.tar.gz"
 MD5SUM="17494910db8383a366b1301e5f5148a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/strongswan/strongswan.SlackBuild b/network/strongswan/strongswan.SlackBuild
index 748f38d30e..549b1652ff 100644
--- a/network/strongswan/strongswan.SlackBuild
+++ b/network/strongswan/strongswan.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=strongswan
-VERSION=${VERSION:-5.3.2}
+VERSION=${VERSION:-5.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/strongswan/strongswan.info b/network/strongswan/strongswan.info
index ae27ff1dc0..cbe3cdb468 100644
--- a/network/strongswan/strongswan.info
+++ b/network/strongswan/strongswan.info
@@ -1,8 +1,8 @@
 PRGNAM="strongswan"
-VERSION="5.3.2"
+VERSION="5.3.4"
 HOMEPAGE="http://www.strongswan.org"
-DOWNLOAD="http://download.strongswan.org/strongswan-5.3.2.tar.bz2"
-MD5SUM="fab014be1477ef4ebf9a765e10f8802c"
+DOWNLOAD="http://download.strongswan.org/strongswan-5.3.4.tar.bz2"
+MD5SUM="c2a99ae6b0a9c2c50b59a9c9d31a629f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/suricata/suricata.SlackBuild b/network/suricata/suricata.SlackBuild
index e49930a78f..90401c4073 100644
--- a/network/suricata/suricata.SlackBuild
+++ b/network/suricata/suricata.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for suricata
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=suricata
-VERSION=${VERSION:-2.0.8}
+VERSION=${VERSION:-2.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/suricata/suricata.info b/network/suricata/suricata.info
index 64898fcce5..afaf4de0fa 100644
--- a/network/suricata/suricata.info
+++ b/network/suricata/suricata.info
@@ -1,8 +1,8 @@
 PRGNAM="suricata"
-VERSION="2.0.8"
+VERSION="2.0.11"
 HOMEPAGE="http://suricata-ids.org/"
-DOWNLOAD="http://www.openinfosecfoundation.org/download/suricata-2.0.8.tar.gz"
-MD5SUM="a9553ccf942c0c4aa1e1a188ec1f7d93"
+DOWNLOAD="http://www.openinfosecfoundation.org/download/suricata-2.0.11.tar.gz"
+MD5SUM="4c05eebfb87c3c1ff51460f4e6318b9a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libcap-ng libnet jansson"
diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild
index cc185f0fb4..e3b7606254 100644
--- a/network/synergy/synergy.SlackBuild
+++ b/network/synergy/synergy.SlackBuild
@@ -25,9 +25,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=synergy
-VERSION=${VERSION:-1.7.3}
-REV=${REV:-stable-efd0108}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.5}
+REV=${REV:-stable-fa85a24}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-Source
+rm -rf $PRGNAM-v$VERSION-$REV-Source
 tar xvf $CWD/$PRGNAM-v$VERSION-$REV-Source.tar.gz
-cd $PRGNAM-$VERSION-Source
+cd $PRGNAM-v$VERSION-$REV-Source
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -83,27 +83,27 @@ mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 \
 $PKG/usr/share/icons/hicolor/256x256 $PKG/usr/share/applications
 
 for file in synergy synergyc synergyd synergys syntool usynergy ; do
-  install -s -m 0755 $TMP/$PRGNAM-$VERSION-Source/bin/$file $PKG/usr/bin
+  install -s -m 0755 $TMP/$PRGNAM-v$VERSION-$REV-Source/bin/$file $PKG/usr/bin
 done
 
 for file in synergy.conf.example synergy.conf.example-advanced synergy.conf.example-basic ; do
-  install -m 0644 $TMP/$PRGNAM-$VERSION-Source/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
+  install -m 0644 $TMP/$PRGNAM-v$VERSION-$REV-Source/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
 done
 
 for file in COMPILE ChangeLog INSTALL LICENSE README ; do
-  install -m 0644 $TMP/$PRGNAM-$VERSION-Source/$file $PKG/usr/doc/$PRGNAM-$VERSION
+  install -m 0644 $TMP/$PRGNAM-v$VERSION-$REV-Source/$file $PKG/usr/doc/$PRGNAM-$VERSION
 done
 
 for file in synergyc.man synergys.man ; do
-  install -m 0644 $TMP/$PRGNAM-$VERSION-Source/doc/$file $PKG/usr/man/man1
+  install -m 0644 $TMP/$PRGNAM-v$VERSION-$REV-Source/doc/$file $PKG/usr/man/man1
 done
 find $PKG/usr/man/man1 -type f -name "*.man" -exec rename '.man' '.1' {} \;
 find $PKG/usr/man/man1 -type f -name "*.?" -exec gzip -9f {} \;
 
-install -m 0644 $TMP/$PRGNAM-$VERSION-Source/res/synergy.ico \
+install -m 0644 $TMP/$PRGNAM-v$VERSION-$REV-Source/res/synergy.ico \
 $PKG/usr/share/icons/hicolor/256x256
 
-install -D -m 0644 $TMP/$PRGNAM-$VERSION-Source/res/synergy.desktop \
+install -D -m 0644 $TMP/$PRGNAM-v$VERSION-$REV-Source/res/synergy.desktop \
 $PKG/usr/share/applications
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/synergy/synergy.info b/network/synergy/synergy.info
index 80f83d5862..1c5d7303df 100644
--- a/network/synergy/synergy.info
+++ b/network/synergy/synergy.info
@@ -1,8 +1,8 @@
 PRGNAM="synergy"
-VERSION="1.7.3"
+VERSION="1.7.5"
 HOMEPAGE="http://synergy-foss.org/"
-DOWNLOAD="http://synergy-project.org/files/packages/synergy-v1.7.3-stable-efd0108-Source.tar.gz"
-MD5SUM="09ab1f82f19949b4dff2e76c34a19a6a"
+DOWNLOAD="http://synergy-project.org/files/packages/synergy-v1.7.5-stable-fa85a24-Source.tar.gz"
+MD5SUM="a1a8d233622212b911cd29078bd68d81"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="avahi"
diff --git a/network/t38modem/README b/network/t38modem/README
new file mode 100644
index 0000000000..8b80ff7d18
--- /dev/null
+++ b/network/t38modem/README
@@ -0,0 +1,10 @@
+What is t38modem?
+
+ * From your fax or voice application view point it's a fax/voice modem pool.
+ * From IP network view point it's a H.323/SIP endpoint with T.38 fax support.
+ * From your view point it's a gateway between an application and IP network.
+
+This package requires both the OPAL and ptlib packages (both available on
+SlackBuilds.)  After building and installing OPAL package keep the OPAL source
+tree on disk.  This package will point to OPAL source tree and use files created
+during its build processes to create this package.
diff --git a/network/t38modem/slack-desc b/network/t38modem/slack-desc
new file mode 100644
index 0000000000..6863a3b734
--- /dev/null
+++ b/network/t38modem/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+t38modem: t38modem (H.323/SIP endpoint with T.38 fax support)
+t38modem:
+t38modem: What is t38modem?
+t38modem:  * From your fax or voice application view point it's a fax/voice
+t38modem:    modem pool
+t38modem:  * From IP network view point it's a H.323/SIP endpoint with T.38 fax
+t38modem:    support
+t38modem:  * From your view point it's a gateway between an application and IP
+t38modem:    network
+t38modem:
+t38modem: Homepage: http://sourceforge.net/projects/t38modem/
diff --git a/network/t38modem/t38modem.SlackBuild b/network/t38modem/t38modem.SlackBuild
new file mode 100644
index 0000000000..b473225267
--- /dev/null
+++ b/network/t38modem/t38modem.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# Slackware build script for t38modem
+
+# Copyright 2015  Christopher Walker Copperas Cove, TX
+# All rights reserved.
+# 
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=t38modem
+VERSION=${VERSION:-2.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}-4.debian.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+#
+# Apply patches
+#
+#patch -p1 <$TMP/debian/patches/simplify-makefile-new
+patch -p1 <$TMP/debian/patches/t38modem-opal3.10-patch
+patch -p1 <$TMP/debian/patches/spelling-error-fix
+patch -p1 <$TMP/debian/patches/opal-3.10.7.patch
+patch -p1 <$TMP/debian/patches/opal-3.10.9.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+PTLIBDIR=/usr/share/ptlib \
+OPALDIR=$TMP/opal-${OPALVER:-3.10.10} \
+  make USE_UNIX98_PTY=1 USE_LEGACY_PTY=1 USE_OPAL=1 opt
+
+# Install binaries, READMEs, etc.,
+mkdir -p $PKG/usr/bin
+install -o root -g root obj_linux_*_opal/t38modem $PKG/usr/bin
+
+# Strip binaries and libraries
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Install documentation
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX
+cp -a \
+  $TMP/$PRGNAM-$VERSION/Changes.txt \
+  $TMP/$PRGNAM-$VERSION/ReadMe.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  $TMP/$PRGNAM-$VERSION/HylaFAX/config.ttyx \
+  $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Copy slack-desc to ./install
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Create package
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/t38modem/t38modem.info b/network/t38modem/t38modem.info
new file mode 100644
index 0000000000..f5dbd31d78
--- /dev/null
+++ b/network/t38modem/t38modem.info
@@ -0,0 +1,12 @@
+PRGNAM="t38modem"
+VERSION="2.0.0"
+HOMEPAGE="http://sourceforge.net/projects/t38modem/"
+DOWNLOAD="http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0.orig.tar.gz \
+          http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0-4.debian.tar.gz"
+MD5SUM="ffcb224ac414693f2d0a5af720d4952a \
+        8072c6645a33f2660a58acd6f651d42a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="opal"
+MAINTAINER="Christopher Walker"
+EMAIL="kris240376@gmail.com"
diff --git a/network/teamviewer/README b/network/teamviewer/README
index 12b5ea45e8..977dc3b4eb 100644
--- a/network/teamviewer/README
+++ b/network/teamviewer/README
@@ -20,4 +20,3 @@ The same things goes to meetings (version 7 and above).
 may change on each major release.
 
 3. If you are running 64-bit machines, you will need a multilib system.
-it requires these 32-bit packages: glibc, zlib, freetype, alsa-lib, GConf.
diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild
index 771acc9816..2aedab9446 100644
--- a/network/teamviewer/teamviewer.SlackBuild
+++ b/network/teamviewer/teamviewer.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for teamviewer
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
-# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=teamviewer
-VERSION=${VERSION:-10.0.41499}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-11.0.53191}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -44,9 +44,6 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   DEBARCH="i386"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  DEBARCH="amd64"
-  LIBDIRSUFFIX="64"
 else
   echo "Package for $(uname -m) architecture is not available."
   exit 1
@@ -55,7 +52,7 @@ fi
 set -eu
 
 # Get the real version
-REAL_VER=$(ar p teamviewer_${VERSION}_${DEBARCH}.deb control.tar.gz | tar xzO ./control | grep Version | cut -d\  -f2 | cut -d- -f1)
+REAL_VER=$(ar p teamviewer_${DEBARCH}.deb control.tar.gz | tar xzO ./control | grep Version | cut -d\  -f2 | cut -d- -f1)
 if [ "$VERSION" != "$REAL_VER" ]; then
   echo "Version of downloaded source [$REAL_VER] does not match version of SlackBuild [$VERSION]"
   exit 1
@@ -64,7 +61,7 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/teamviewer_${VERSION}_${DEBARCH}.deb data.tar.gz | gzip -d | tar xv
+ar p $CWD/teamviewer_${DEBARCH}.deb data.tar.bz2 | tar xjv
 
 chown -R root:root .
 find -L . \
@@ -78,12 +75,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 # Make a .desktop file
 mkdir -p $PKG/usr/share/applications
-cat $PKG/opt/teamviewer/tv_bin/desktop/teamviewer-teamviewer10.desktop \
+cat $PKG/opt/teamviewer/tv_bin/desktop/teamviewer-teamviewer11.desktop \
   | sed -e 's/EXEC/teamviewer/' -e 's/ICON/teamviewer/' \
   > $PKG/usr/share/applications/teamviewer.desktop
 
 # Remove the dangling symlink first
-rm $PKG/usr/bin/teamviewer
+rm -f $PKG/usr/bin/teamviewer
 
 # Re-create the generic executable
 ( cd $PKG/usr/bin; ln -s /opt/teamviewer/tv_bin/script/teamviewer teamviewer )
@@ -104,10 +101,9 @@ install -m 0644 $CWD/rc.teamviewerd $PKG/etc/rc.d/rc.teamviewerd.new
 
 # Let's flip-flop the actual locations vs. symlinks of a couple of things:
 # First remove the dangling symlink made by Debian packages:
-rm -f $PKG/var/log/teamviewer $PKG/etc/teamviewer
-mkdir -p $PKG/var/log/teamviewer $PKG/etc/teamviewer
+rm -rf $PKG/var/log/teamviewer* $PKG/etc/teamviewer
+mkdir -p $PKG/var/log/teamviewer11 $PKG/etc/teamviewer
 rm -rf $PKG/opt/teamviewer/logfiles/ $PKG/opt/teamviewer/config/
-ln -s /var/log/teamviewer $PKG/opt/teamviewer/logfiles
 ln -s /etc/teamviewer $PKG/opt/teamviewer/config
 
 mkdir -p $PKG/install
diff --git a/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info
index 921204f918..fcde90e2a3 100644
--- a/network/teamviewer/teamviewer.info
+++ b/network/teamviewer/teamviewer.info
@@ -1,8 +1,8 @@
 PRGNAM="teamviewer"
-VERSION="10.0.41499"
+VERSION="11.0.53191"
 HOMEPAGE="http://www.teamviewer.com/"
-DOWNLOAD="http://downloadap1.teamviewer.com/download/version_10x/teamviewer_10.0.41499_i386.deb"
-MD5SUM="5aa2ce43cd9aea23ff3b64bfd498fcf3"
+DOWNLOAD="http://download.teamviewer.com/download/teamviewer_i386.deb"
+MD5SUM="4992459f75bad9f1d3da3c4ecda57902"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/telegram/telegram.SlackBuild b/network/telegram/telegram.SlackBuild
index daf48613b2..d221ebaf7a 100644
--- a/network/telegram/telegram.SlackBuild
+++ b/network/telegram/telegram.SlackBuild
@@ -27,7 +27,7 @@
 PRGNAM=telegram
 SRCNAM=tsetup
 SRCDIR=Telegram
-VERSION=${VERSION:-0.7.10}
+VERSION=${VERSION:-0.9.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/telegram/telegram.desktop b/network/telegram/telegram.desktop
index 224c0c836e..67a885b7f1 100644
--- a/network/telegram/telegram.desktop
+++ b/network/telegram/telegram.desktop
@@ -3,8 +3,8 @@ Name=Telegram
 GenericName=Internet
 Comment=Telegram Desktop Chat Client
 Icon=telegram
-Exec=Telegram
+Exec=Telegram -- %u
 TryExec=Telegram
 Terminal=false
 Type=Application
-Categories=Internet; Network
+Categories=Internet;Network
diff --git a/network/telegram/telegram.info b/network/telegram/telegram.info
index f33079bf86..1cd2b504a7 100644
--- a/network/telegram/telegram.info
+++ b/network/telegram/telegram.info
@@ -1,10 +1,10 @@
 PRGNAM="telegram"
-VERSION="0.7.10"
+VERSION="0.9.18"
 HOMEPAGE="http://telegram.org"
-DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.0.7.10.tar.xz"
-MD5SUM="aef0d8dc5c6313ba14617bffb106318e"
-DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.0.7.10.tar.xz"
-MD5SUM_x86_64="7b4e974978b5814c28f656d631c1b1c6"
+DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.0.9.18.tar.xz"
+MD5SUM="1d554e497b21ebc64305470b2972c5b1"
+DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.0.9.18.tar.xz"
+MD5SUM_x86_64="d53ab1cbfd996f5dc4d62c90cfcda280"
 REQUIRES=""
-MAINTAINER="Marco Ferraioli"
-EMAIL="marcoferraioli@live.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/network/tixati/README b/network/tixati/README
new file mode 100644
index 0000000000..6abe75dc24
--- /dev/null
+++ b/network/tixati/README
@@ -0,0 +1,4 @@
+Tixati is a peer-to-peer file sharing program that uses the popular 
+BitTorrent protocol. This protocol allows many peers to form a 
+cooperative swarm and download very large files with great 
+efficiency.
diff --git a/network/tixati/doinst.sh b/network/tixati/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/network/tixati/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/network/tixati/slack-desc b/network/tixati/slack-desc
new file mode 100644
index 0000000000..86e1154cbe
--- /dev/null
+++ b/network/tixati/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+tixati: tixati (P2P client)
+tixati:
+tixati: Tixati is a peer-to-peer file sharing program that uses the popular
+tixati: BitTorrent protocol. This protocol allows many peers to form a
+tixati: cooperative swarm and download very large files with great
+tixati: efficiency.
+tixati:
+tixati: Homepage: http://www.tixati.com/
+tixati:
+tixati:
+tixati:
diff --git a/network/tixati/tixati.SlackBuild b/network/tixati/tixati.SlackBuild
new file mode 100644
index 0000000000..af47e84507
--- /dev/null
+++ b/network/tixati/tixati.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for tixati
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tixati
+VERSION=${VERSION:-2.31_1}
+SRCVER=$(echo $VERSION | tr _ -)
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRC="i686.manualinstall"
+if [ "$ARCH" = "x86_64" ]; then
+  SRC="x86_64.manualinstall"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER.$SRC
+tar xvf $CWD/$PRGNAM-$SRCVER.$SRC.tar.gz
+cd $PRGNAM-$SRCVER.$SRC
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin
+install -D -m755 $PRGNAM $PKG/usr/bin
+
+mkdir -p $PKG/usr/share/applications
+install -D -m644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/share/pixmaps/
+install -D -m644 $PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.svg
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/tixati/tixati.info b/network/tixati/tixati.info
new file mode 100644
index 0000000000..5608937e1d
--- /dev/null
+++ b/network/tixati/tixati.info
@@ -0,0 +1,10 @@
+PRGNAM="tixati"
+VERSION="2.31_1"
+HOMEPAGE="http://www.tixati.com/"
+DOWNLOAD="http://www.tixati.com/download/tixati-2.31-1.i686.manualinstall.tar.gz"
+MD5SUM="518e86b617ac095790cfccf8774eef48"
+DOWNLOAD_x86_64="http://www.tixati.com/download/tixati-2.31-1.x86_64.manualinstall.tar.gz"
+MD5SUM_x86_64="4e08e20c7ef66a17830d4ddb5bd0b5d1"
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/tmate/README b/network/tmate/README
new file mode 100644
index 0000000000..8a704c4bfd
--- /dev/null
+++ b/network/tmate/README
@@ -0,0 +1,6 @@
+tmate is a fork of tmux. It provides instant terminal sharing (either read-write
+or read-only) through the server at tmate.io, or through your own server.
+
+You can think of tmate as a reverse ssh tunnel accessible from anywhere.
+
+tmate and tmux can coexist on the same system, they do not conflict.
diff --git a/network/tmate/slack-desc b/network/tmate/slack-desc
new file mode 100644
index 0000000000..c132b31385
--- /dev/null
+++ b/network/tmate/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+tmate: tmate (instant terminal sharing)
+tmate:
+tmate: tmate is a fork of tmux. It provides instant terminal sharing
+tmate: (either read-write or read-only) through the server at tmate.io
+tmate: or through your own server (not included in this SlackBuild).
+tmate:
+tmate: You can think of tmate as a reverse ssh tunnel accessible from
+tmate: anywhere.
+tmate:
+tmate: tmate and tmux can coexist on the same system, they do not conflict.
+tmate:
diff --git a/network/tmate/tmate.SlackBuild b/network/tmate/tmate.SlackBuild
new file mode 100644
index 0000000000..d4c2b86804
--- /dev/null
+++ b/network/tmate/tmate.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for tmate
+
+# Copyright 2015 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tmate
+VERSION=${VERSION:-1.8.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -f $CWD/$VERSION.tar.gz ]; then
+  tar xvf $CWD/$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES FAQ README-tmux README.md SYNCING TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/tmate/tmate.info b/network/tmate/tmate.info
new file mode 100644
index 0000000000..bee1a2c575
--- /dev/null
+++ b/network/tmate/tmate.info
@@ -0,0 +1,10 @@
+PRGNAM="tmate"
+VERSION="1.8.10"
+HOMEPAGE="http://tmate.io/"
+DOWNLOAD="https://github.com/nviennot/tmate/archive/1.8.10.tar.gz"
+MD5SUM="bfe6cc7e7e0232c7199a83f5c06494ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/network/tnftp/tnftp.SlackBuild b/network/tnftp/tnftp.SlackBuild
index 879d2c0678..408f6d3114 100644
--- a/network/tnftp/tnftp.SlackBuild
+++ b/network/tnftp/tnftp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tnftp
 
-# Copyright (c) 2014, Leonard Schmidt <lems@gmx.net>
+# Copyright (c) 2014, 2015 Leonard Schmidt <lems@gmx.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tnftp
-VERSION=${VERSION:-20141104}
+VERSION=${VERSION:-20151004}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/tnftp/tnftp.info b/network/tnftp/tnftp.info
index e345209b85..9c7213d9b5 100644
--- a/network/tnftp/tnftp.info
+++ b/network/tnftp/tnftp.info
@@ -1,8 +1,8 @@
 PRGNAM="tnftp"
-VERSION="20141104"
+VERSION="20151004"
 HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp"
-DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20141104.tar.gz"
-MD5SUM="9a2870e5718abb1edb51f044c07dac0e"
+DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20151004.tar.gz"
+MD5SUM="a49fbe752318d5a7893f900046ea00d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tor-browser/mozicon128.png b/network/tor-browser/mozicon128.png
new file mode 100644
index 0000000000..8fc3530cff
--- /dev/null
+++ b/network/tor-browser/mozicon128.png
diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild
index edd1b2fa52..85c43c5e63 100644
--- a/network/tor-browser/tor-browser.SlackBuild
+++ b/network/tor-browser/tor-browser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tor-browser
 
-# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tor-browser
-VERSION=${VERSION:-4.5.3}
+VERSION=${VERSION:-5.0.7}
 PRGLANG=${PRGLANG:-en-US}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -41,21 +41,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-  SRCARCH=32
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  SRCARCH=32
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+if [ "$ARCH" = "x86_64" ]; then
   SRCARCH=64
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
   SRCARCH=32
 fi
 
@@ -64,18 +52,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_${PRGLANG}
-tar xvf $CWD/${PRGNAM}-linux${SRCARCH}-${VERSION}_${PRGLANG}.tar.xz
-cd ${PRGNAM}_${PRGLANG}
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/
-mv * $PKG/opt/
 
 mkdir -p $PKG/usr/bin
 install -m 0755 $CWD/tor-browser.sh $PKG/usr/bin/tor-browser
@@ -89,7 +67,7 @@ mkdir -p $PKG/opt/$PRGNAM
 install -m 0644 $CWD/${PRGNAM}-linux${SRCARCH}-${VERSION}_${PRGLANG}.tar.xz $PKG/opt/$PRGNAM
 
 mkdir -p $PKG/usr/share/pixmaps
-install -m 0644 $PKG/opt/Browser/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/tor-browser.png
+install -m 0644 $CWD/mozicon128.png $PKG/usr/share/pixmaps/tor-browser.png
 
 mkdir -p $PKG/usr/share/applications/
 install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
diff --git a/network/tor-browser/tor-browser.info b/network/tor-browser/tor-browser.info
index dfe3209a2c..b6951d2bbe 100644
--- a/network/tor-browser/tor-browser.info
+++ b/network/tor-browser/tor-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="tor-browser"
-VERSION="4.5.3"
+VERSION="5.0.7"
 HOMEPAGE="https://www.torproject.org"
-DOWNLOAD="https://dist.torproject.org/torbrowser/4.5.3/tor-browser-linux32-4.5.3_en-US.tar.xz"
-MD5SUM="c21114fed9f5bf892550b30cd1c959bb"
-DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/4.5.3/tor-browser-linux64-4.5.3_en-US.tar.xz"
-MD5SUM_x86_64="8cada85a7f156399e6c4869e21e49299"
+DOWNLOAD="https://dist.torproject.org/torbrowser/5.0.7/tor-browser-linux32-5.0.7_en-US.tar.xz"
+MD5SUM="44a587d0295fa1431d73c9f9a2eae4fd"
+DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/5.0.7/tor-browser-linux64-5.0.7_en-US.tar.xz"
+MD5SUM_x86_64="4031722ddb101a5c7731d9100cd9ff28"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild
index 3350448e10..e54f02a725 100644
--- a/network/tor/tor.SlackBuild
+++ b/network/tor/tor.SlackBuild
@@ -25,7 +25,7 @@
 # Updated by Donald Cooley dfc@warpmail.net
 
 PRGNAM=tor
-VERSION=${VERSION:-0.2.6.10}
+VERSION=${VERSION:-0.2.7.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/tor/tor.info b/network/tor/tor.info
index 179393a6fd..ddc2dca8c6 100644
--- a/network/tor/tor.info
+++ b/network/tor/tor.info
@@ -1,8 +1,8 @@
 PRGNAM="tor"
-VERSION="0.2.6.10"
+VERSION="0.2.7.6"
 HOMEPAGE="https://www.torproject.org/"
-DOWNLOAD="https://www.torproject.org/dist/tor-0.2.6.10.tar.gz"
-MD5SUM="04f919e7882d1ca80f835545af562bad"
+DOWNLOAD="https://www.torproject.org/dist/tor-0.2.7.6.tar.gz"
+MD5SUM="cc19107b57136a68e8c563bf2d35b072"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tornado/tornado.SlackBuild b/network/tornado/tornado.SlackBuild
index 6953371680..f8ccb2807e 100644
--- a/network/tornado/tornado.SlackBuild
+++ b/network/tornado/tornado.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tornado
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/tornado/tornado.info b/network/tornado/tornado.info
index a6c7893caa..0bfde786b0 100644
--- a/network/tornado/tornado.info
+++ b/network/tornado/tornado.info
@@ -1,8 +1,8 @@
 PRGNAM="tornado"
-VERSION="4.1"
+VERSION="4.2.1"
 HOMEPAGE="http://www.tornadoweb.org"
-DOWNLOAD="https://pypi.python.org/packages/source/t/tornado/tornado-4.1.tar.gz"
-MD5SUM="a06ea343375f2247344257ef691641f9"
+DOWNLOAD="https://pypi.python.org/packages/source/t/tornado/tornado-4.2.1.tar.gz"
+MD5SUM="d523204389cfb70121bb69709f551b20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="backports-ssl-match-hostname"
diff --git a/network/toxcore/toxcore.SlackBuild b/network/toxcore/toxcore.SlackBuild
index 50b133a1c9..f650ccf112 100644
--- a/network/toxcore/toxcore.SlackBuild
+++ b/network/toxcore/toxcore.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for toxcore
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=toxcore
-VERSION=${VERSION:-20150722}
+VERSION=${VERSION:-20160319_532629d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/toxcore/toxcore.info b/network/toxcore/toxcore.info
index ed27913a66..998fd8559a 100644
--- a/network/toxcore/toxcore.info
+++ b/network/toxcore/toxcore.info
@@ -1,8 +1,8 @@
 PRGNAM="toxcore"
-VERSION="20150722"
+VERSION="20160319_532629d"
 HOMEPAGE="http://tox.chat/"
-DOWNLOAD="http://mirror.slackware.hr/sources/toxcore/toxcore-20150722.tar.bz2"
-MD5SUM="bbe06ce6f41fbcdefd0f7eee37e4ae65"
+DOWNLOAD="http://mirror.slackware.hr/sources/toxcore/toxcore-20160319_532629d.tar.bz2"
+MD5SUM="e1a54bf922f9be92fb155602b61a4b04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libsodium libvpx opus"
diff --git a/network/uTox/README b/network/uTox/README
new file mode 100644
index 0000000000..240e2d591d
--- /dev/null
+++ b/network/uTox/README
@@ -0,0 +1,5 @@
+Lightweight Tox client that uses Xlib. Supports many features and is on-par with other Tox clients.
+
+By default, it builds with GTK2. If you want to build with GTK3 support, do:
+
+GTK3=YES ./uTox.Slackbuild
diff --git a/network/uTox/gtk2.diff b/network/uTox/gtk2.diff
new file mode 100644
index 0000000000..7dc1379691
--- /dev/null
+++ b/network/uTox/gtk2.diff
@@ -0,0 +1,11 @@
+--- uTox-0.5.0/xlib/gtk.c	2015-12-20 00:57:28.000000000 -0700
++++ uTox-0.5.0-fix/xlib/gtk.c	2015-12-24 10:59:28.346223121 -0700
+@@ -2,7 +2,7 @@
+ #include <stdlib.h>
+ #include <dlfcn.h>
+ 
+-#define LIBGTK_FILENAME "libgtk-3.so.0"
++#define LIBGTK_FILENAME "libgtk-x11-2.0.so.0"
+ 
+ #define GTK_FILE_CHOOSER_ACTION_OPEN 0
+ #define GTK_FILE_CHOOSER_ACTION_SAVE 1
diff --git a/network/uTox/locationfix.diff b/network/uTox/locationfix.diff
new file mode 100644
index 0000000000..bb74652ea2
--- /dev/null
+++ b/network/uTox/locationfix.diff
@@ -0,0 +1,13 @@
+--- uTox-0.5.0/Makefile	2015-12-20 00:57:28.000000000 -0700
++++ uTox-0.5.0-fix/Makefile	2015-12-24 10:57:21.787213435 -0700
+@@ -127,8 +127,8 @@
+ 	install -m 644 utox.desktop $(DESTDIR)$(PREFIX)/share/applications/utox.desktop
+ 	if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(PREFIX)/share/applications/utox.desktop; fi
+ 
+-	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 644 utox.1 $(DESTDIR)$(PREFIX)/share/man/man1/utox.1
++	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
++	install -m 644 utox.1 $(DESTDIR)$(PREFIX)/man/man1/utox.1
+ 
+ $(OBJ): %.o: %.c $(HEADERS)
+ 	@echo "  CC    $@"
diff --git a/network/uTox/slack-desc b/network/uTox/slack-desc
new file mode 100644
index 0000000000..53cd9630b2
--- /dev/null
+++ b/network/uTox/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler--------------------------------------------------------|
+uTox: uTox (The lightest and fluffiest Tox client)
+uTox:
+uTox: Lightweight Tox client that uses Xlib. Supports many features and is
+uTox: on-par with other Tox clients.
+uTox: 
+uTox: Homepage: https://github.com/GrayHatter/utox
+uTox:
+uTox:
+uTox:
+uTox:
+uTox:
diff --git a/network/uTox/uTox.SlackBuild b/network/uTox/uTox.SlackBuild
new file mode 100644
index 0000000000..967b6407e8
--- /dev/null
+++ b/network/uTox/uTox.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for uTox
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Tiny bit of shell from:
+# Wine SlackBuild by David Woodfall Copyright 2011
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+PRGNAM=uTox
+VERSION=${VERSION:-0.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fixes man install directory
+patch -p1 < $CWD/locationfix.diff
+
+# Build with GTK2 by default
+GTK3=${GTK3:-NO}
+
+if [ "$GTK3" = "NO" ]; then
+    patch -p1 < $CWD/gtk2.diff
+fi
+
+make
+make DESTDIR=$PKG \
+  PREFIX=/usr \
+  install
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md utox_theme.ini $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/uTox/uTox.info b/network/uTox/uTox.info
new file mode 100644
index 0000000000..5295fa27f5
--- /dev/null
+++ b/network/uTox/uTox.info
@@ -0,0 +1,10 @@
+PRGNAM="uTox"
+VERSION="0.5.0"
+HOMEPAGE="https://github.com/GrayHatter/utox"
+DOWNLOAD="https://github.com/GrayHatter/uTox/archive/v0.5.0.tar.gz"
+MD5SUM="de906e2a5dad1b1da0465462429bb037"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="toxcore libfilteraudio"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/network/uget/README b/network/uget/README
index fc4085983b..f36f64944b 100644
--- a/network/uget/README
+++ b/network/uget/README
@@ -3,6 +3,12 @@ uGet is a Free and Open Source download manager.
 It allows for queuing downloads, file type-based classification of
 downloads, and is lightweight.
 
-Optionally, uget can be compiled with support for the optional
-dependency aria2. This is autodetected at build time. You can
-forcibly disable aria2 support by passing ARIA2=no to the script.
+Optionally, uget can be compiled with support for the optional dependency
+aria2. This is autodetected at build time. You can forcibly disable
+aria2 support by passing ARIA2=no to the script.
+
+uGet can also be compiled without support for notifications. To do this,
+pass LIBNOTIFY=no to the script.
+
+If you're upgrading from uGet 1.x, run "uget-gtk-1to2" to convert your
+old settings in ~/.config/uGet to the format used by uGet 2.x.
diff --git a/network/uget/curlopt_nosignal.diff b/network/uget/curlopt_nosignal.diff
deleted file mode 100644
index 5310970fdb..0000000000
--- a/network/uget/curlopt_nosignal.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur uget-1.8.0/uglib/UgXmlrpc.c uget-1.8.0.patched//uglib/UgXmlrpc.c
---- uget-1.8.0/uglib/UgXmlrpc.c	2011-04-28 21:34:25.000000000 -0400
-+++ uget-1.8.0.patched//uglib/UgXmlrpc.c	2012-01-02 15:00:39.000000000 -0500
-@@ -111,6 +111,7 @@
- 	xmlrpc->user_agent = g_strdup (user_agent ? user_agent : "uGet/1.7");
- 
- 	curl_easy_setopt (xmlrpc->curl, CURLOPT_URL, xmlrpc->uri);
-+	curl_easy_setopt (xmlrpc->curl, CURLOPT_NOSIGNAL , 1);
- 	curl_easy_setopt (xmlrpc->curl, CURLOPT_USERAGENT, xmlrpc->user_agent);
- }
- 
diff --git a/network/uget/slack-desc b/network/uget/slack-desc
index a2a031e60c..99c42282d6 100644
--- a/network/uget/slack-desc
+++ b/network/uget/slack-desc
@@ -13,7 +13,7 @@ uget:
 uget: It allows for queuing downloads, file type-based classification of
 uget: downloads, and is lightweight.
 uget:
-uget:
+uget: Build options: ARIA2=@A, LIBNOTIFY=@L
 uget:
 uget:
 uget:
diff --git a/network/uget/uget.SlackBuild b/network/uget/uget.SlackBuild
index 470207863c..250e50eea8 100644
--- a/network/uget/uget.SlackBuild
+++ b/network/uget/uget.SlackBuild
@@ -1,13 +1,23 @@
 #!/bin/sh
 
-# Slackware build script for Uget
-# Written by Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>
+# Slackware build script for uget
+# Originally written by Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>
 # Updated by B. Watson <yalhcru@gmail.com>
 
-# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20150910 bkw:
+# - upgrade to 2.0.1
+# - get rid of curlopt_nosignal.diff (no longer needed)
+# - fix WTFPL URL
+# - add LIBNOTIFY=no
+# - document build options in slack-desc
+# - cleanup README
+# - install developer docs doc/*.txt
+# - don't install empty AUTHORS and ChangeLog
 
 PRGNAM=uget
-VERSION=${VERSION:-1.10.4}
+VERSION=${VERSION:-2.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,18 +63,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Prevent segfaults in Curl_resolv_timeout(). This patch has been accepted
-# by upstream and will be in the next release.
-patch -p1 < $CWD/curlopt_nosignal.diff
+ARIA2="${ARIA2:-yes}"
+LIBNOTIFY="${LIBNOTIFY:-yes}"
 
-if [ "${ARIA2:-yes}" = "no" ]; then
-  ARIAFLAG="--disable-plugin-aria2"
-fi
+[ "$ARIA2" = "no" ] && ARIAFLAG="--disable-plugin-aria2"
+[ "$LIBNOTIFY" = "no" ] && NOTIFYFLAG="--disable-notify"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   $ARIAFLAG \
+  $NOTIFYFLAG \
   --disable-gstreamer \
   --prefix=/usr \
   --build=$ARCH-slackware-linux
@@ -72,11 +81,15 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
+# 20150910 bkw: AUTHORS and ChangeLog are 0-byte placeholders in uget-2.0.1,
+# add them back if this changes in future releases.
+cp -a COPYING README doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@A,$ARIA2," \
+    -e "s,@L,$LIBNOTIFY," \
+    $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/network/uget/uget.info b/network/uget/uget.info
index 7650b34280..e7bbbad449 100644
--- a/network/uget/uget.info
+++ b/network/uget/uget.info
@@ -1,8 +1,8 @@
 PRGNAM="uget"
-VERSION="1.10.4"
+VERSION="2.0.1"
 HOMEPAGE="http://ugetdm.com"
-DOWNLOAD="http://downloads.sourceforge.net/urlget/uget-1.10.4.tar.gz"
-MD5SUM="58139de0bd043cfeae0f22c239f4bbc5"
+DOWNLOAD="http://downloads.sourceforge.net/project/urlget/uget%20%28stable%29/2.0.1/uget-2.0.1.tar.gz"
+MD5SUM="b4249ae706dc57a3c08c78a5f3125b26"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/unicornscan/unicornscan.info b/network/unicornscan/unicornscan.info
index 8d2877d261..aa9de1edb4 100644
--- a/network/unicornscan/unicornscan.info
+++ b/network/unicornscan/unicornscan.info
@@ -1,7 +1,7 @@
 PRGNAM="unicornscan"
 VERSION="0.4.7_2"
 HOMEPAGE="http://unicornscan.org"
-DOWNLOAD="http://unicornscan.org/releases/unicornscan-0.4.7-2.tar.bz2"
+DOWNLOAD="ftp://sourceforge.mirrorservice.org/sites/downloads.sourceforge.net/o/os/osace/unicornscan/unicornscan%20-%200.4.7%20source/unicornscan-0.4.7-2.tar.bz2"
 MD5SUM="4c5f272eb38c333c0094c32317edf758"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/verlihub/verlihub.info b/network/verlihub/verlihub.info
index 9c78eb5d31..a2a1ca1e6f 100644
--- a/network/verlihub/verlihub.info
+++ b/network/verlihub/verlihub.info
@@ -1,7 +1,7 @@
 PRGNAM="verlihub"
 VERSION="0.9.8e_r2"
 HOMEPAGE="http://www.verlihub-project.org"
-DOWNLOAD="http://www.verlihub-project.org/download/verlihub-0.9.8e-r2.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/verlihub/verlihub-0.9.8e-r2.tar.bz2"
 MD5SUM="8d2bc96d4b58a38076958395fc9a0ea9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/viber/viber.SlackBuild b/network/viber/viber.SlackBuild
index fcf94a5809..5f23a34200 100644
--- a/network/viber/viber.SlackBuild
+++ b/network/viber/viber.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Viber
 
-# Copyright 2009-2010  Roberto Metere, Cagliari (CA), Italy
+# Copyright 2014-2015  Roberto Metere, Cagliari (CA), Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=viber
 VERSION=${VERSION:-4.2.2.6}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 case "$(uname -m)" in
@@ -51,18 +51,23 @@ ar p $CWD/${PRGNAM}.deb data.tar.gz | gunzip | tar xv
 mv $PKG/opt/viber/* $PKG/usr/share/viber
 rm -r $PKG/opt
 # Fix desktop launcher
-sed -i 's/\/opt\/viber\/Viber/\/usr\/bin\/viber/' $PKG/usr/share/applications/viber.desktop
+sed -i 's/\/opt\/viber\/Viber/\/usr\/bin\/ViberPC/' $PKG/usr/share/applications/viber.desktop
 
 #
 # Make a shell launcher
 #
 # In my opinion, it's a bug... that is, Viber must be called from installation path
 # or with complete path to installation path, because it looks for other files.
-# Any symbolic link or hard copy of main binary to /usr/bin would yeld to a
+# Any symbolic link or hard copy of main binary to /usr/bin would yield a
 # non-working launcher.
 #
+# ViberPC is the name of the window (it is better to call it as such for a better
+# integration with docks, like cairo-dock)
+# Anyway for compatibility with previous version a link to /usr/bin/viber is created.
+#
 mkdir -p $PKG/usr/bin
-printf "#!/bin/sh\n/usr/share/viber/Viber\n" > $PKG/usr/bin/viber
+printf "#!/bin/sh\n/usr/share/viber/Viber\n" > $PKG/usr/bin/ViberPC
+ln -s ViberPC $PKG/usr/bin/viber
 
 # Adjust ownerships and permissions
 chown -R root:root .
@@ -71,7 +76,7 @@ find -L . \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-chmod +x $PKG/usr/bin/viber
+chmod +x $PKG/usr/bin/ViberPC
 cd
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$REAL_VER
diff --git a/network/vimb/vimb.SlackBuild b/network/vimb/vimb.SlackBuild
index 6305aca7f2..0d551625b9 100644
--- a/network/vimb/vimb.SlackBuild
+++ b/network/vimb/vimb.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vimb
 
-# Copyright 2015 Leonard Schmidt <lems@gmx.net>
+# Copyright 2015-2016 Leonard Schmidt <lems@gmx.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vimb
-VERSION=${VERSION:-2.10}
+VERSION=${VERSION:-2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/vimb/vimb.info b/network/vimb/vimb.info
index 00b3185b90..860b06c6bc 100644
--- a/network/vimb/vimb.info
+++ b/network/vimb/vimb.info
@@ -1,8 +1,8 @@
 PRGNAM="vimb"
-VERSION="2.10"
+VERSION="2.11"
 HOMEPAGE="http://fanglingsu.github.io/vimb"
-DOWNLOAD="https://github.com/fanglingsu/vimb/archive/2.10.tar.gz"
-MD5SUM="74ff7458e89406fd3537c89507bf6596"
+DOWNLOAD="https://github.com/fanglingsu/vimb/archive/2.11.tar.gz"
+MD5SUM="9ffc6e01e0af8c2db6949d27455cc919"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkitgtk"
diff --git a/network/vivaldi/README b/network/vivaldi/README
index 7245e7e6c1..e32c6bcc38 100644
--- a/network/vivaldi/README
+++ b/network/vivaldi/README
@@ -1,5 +1,9 @@
 vivaldi (web browser).
 
-A Browser for Our Friends.
+A Browser for Our Friends. An advanced browser made with the power user in
+mind. Finally you can surf your way.
 
-An advanced browser made with the power user in mind. Finally you can surf your way.
+To use Flash Player (PepperFlash) or Widevine plugins, Google Chrome from
+Slackware 'extra' or AlienBob's Chromium packages needs to be installed.
+
+Optional dependencies: ffmpeg, vivaldi-codecs-ffmpeg-extra
diff --git a/network/vivaldi/doinst.sh b/network/vivaldi/doinst.sh
index f608d70b4c..9424ce43ff 100644
--- a/network/vivaldi/doinst.sh
+++ b/network/vivaldi/doinst.sh
@@ -1,68 +1,13 @@
-set -e
-
-# make links...
-ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot /usr/bin/vivaldi-snapshot
-ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot /opt/vivaldi-snapshot/vivaldi
-
-# chmod vivaldi_sandbox.
-chmod 4755 /opt/vivaldi-snapshot/vivaldi-sandbox
-
-# modify .desktop file.
-sed -i 's/TargetEnvironment/X-TargetEnvironment/g' /usr/share/applications/vivaldi-snapshot.desktop
-
-# Add icons to the system icons
-XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null || true`"
-if [ ! -x "$XDG_ICON_RESOURCE" ]; then
-  echo "Error: Could not find xdg-icon-resource" >&2
-  exit 1
-fi
-for icon in "/opt/vivaldi-snapshot/product_logo_"*.png; do
-  size="${icon##*/product_logo_}"
-  "$XDG_ICON_RESOURCE" install --novendor --size "${size%.png}" "$icon" "vivaldi-snapshot"
-done
-
-# begin SlackBuild options.
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-# end SlackBuild options.
-
-# Updates defaults.list file if present.
-update_defaults_list() {
-  # $1: name of the .desktop file
-
-  local DEFAULTS_FILE="/usr/share/applications/defaults.list"
-
-  if [ ! -f "${DEFAULTS_FILE}" ]; then
-    return
-  fi
-
-  # Split key-value pair out of MimeType= line from the .desktop file,
-  # then split semicolon-separated list of mime types (they should not contain
-  # spaces).
-  mime_types="$(grep MimeType= /usr/share/applications/${1} |
-                cut -d '=' -f 2- |
-                tr ';' ' ')"
-  for mime_type in ${mime_types}; do
-    if egrep -q "^${mime_type}=" "${DEFAULTS_FILE}"; then
-      if ! egrep -q "^${mime_type}=.*${1}" "${DEFAULTS_FILE}"; then
-        default_apps="$(grep ${mime_type}= "${DEFAULTS_FILE}" |
-                        cut -d '=' -f 2-)"
-        egrep -v "^${mime_type}=" "${DEFAULTS_FILE}" > "${DEFAULTS_FILE}.new"
-        echo "${mime_type}=${default_apps};${1}" >> "${DEFAULTS_FILE}.new"
-        mv "${DEFAULTS_FILE}.new" "${DEFAULTS_FILE}"
-      fi
-    else
-      # If there's no mention of the mime type in the file, add it.
-      echo "${mime_type}=${1};" >> "${DEFAULTS_FILE}"
-    fi
-  done
-}
-
-update_defaults_list "vivaldi-snapshot.desktop"
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index ff93544970..89f73c1bb7 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -23,9 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="vivaldi"
+VERSION=${VERSION:-1.0.365.3}
 SRCNAM="vivaldi-snapshot"
-VERSION=${VERSION:-1.0.231.3}
-SRCVER=${SRCVER:-1.0.231.3-1}
+SRCVER=${SRCVER:-1.0.365.3-1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,8 +79,22 @@ mv opt usr $PKG/
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+(
+ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot $PKG/usr/bin/vivaldi-snapshot
+ln -sf /opt/vivaldi-snapshot/vivaldi-snapshot $PKG/opt/vivaldi-snapshot/vivaldi
+)
+
+chown root:root $PKG/opt/vivaldi-snapshot/vivaldi-sandbox
+chmod 4755 $PKG/opt/vivaldi-snapshot/vivaldi-sandbox
+
+for res in 16 22 24 32 48 64 128 256; do
+   install -Dm644 "$PKG/opt/vivaldi-snapshot/product_logo_${res}.png" \
+"$PKG/usr/share/icons/hicolor/${res}x${res}/apps/vivaldi-snapshot.png"
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-gzip -dc $PKG/usr/share/doc/vivaldi-snapshot/changelog.gz > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog; rm -rf $PKG/usr/share/doc
+gzip -dc $PKG/usr/share/doc/vivaldi-snapshot/changelog.gz > \
+$PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog; rm -rf $PKG/usr/share/doc
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index abf0f885cd..838f7574c4 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,10 +1,10 @@
 PRGNAM="vivaldi"
-VERSION="1.0.231.3_1"
+VERSION="1.0.365.3_1"
 HOMEPAGE="https://vivaldi.com/"
-DOWNLOAD="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.231.3-1_i386.deb"
-MD5SUM="e6fc849a4e43071219a8f0d326d2e8e3"
-DOWNLOAD_x86_64="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.231.3-1_amd64.deb"
-MD5SUM_x86_64="7e45c30bb6dcff64a078b4997397017f"
+DOWNLOAD="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.365.3-1_i386.deb"
+MD5SUM="ff6d3f9b08f98cf6af9dfec6d1680eb0"
+DOWNLOAD_x86_64="http://repo.vivaldi.com/archive/deb/pool/main/vivaldi-snapshot_1.0.365.3-1_amd64.deb"
+MD5SUM_x86_64="acb7ae0f1405e57e2ac81c81d0a607a0"
 REQUIRES=""
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/vmware-horizon-client/README b/network/vmware-horizon-client/README
new file mode 100644
index 0000000000..87bcbbceb5
--- /dev/null
+++ b/network/vmware-horizon-client/README
@@ -0,0 +1,28 @@
+The VMware Horizon Client for Linux, allowing you to use your Slackware box as a
+thin client and lets you connect to your company's Virtual Desktop
+Infrastructure using the proprietary VMware View 6 PCoIP protocol.
+
+*ATTENTION*: This build script installs binary, proprietary software. Only use
+it if you need the proprietary parts and you are ok with installing and using
+proprietary software. By installing this SlackBuild you agree to the EULA you'll
+find installed in /usr/doc/vmware-horizon-client-4.3.0/. If you do not agree,
+uninstall the package.
+
+This SlackBuild installs multiple components. At the moment only the PCoIP and
+the Smart Card component seem to work. USB redirection and Virtual Printing
+won't work. 
+
+To deactivate one of the working components, use the installation options
+
+PCOIP="NO"
+
+and 
+
+SMARTCRD="NO"
+
+You could try to activate USB support by setting USB="YES". But there will be a
+problem with libcrypto. If you find a fix, please email me.
+
+This application is a 32bit application. It won't work on a Slackware64 system
+without multilib capability. But it has been tested and works with a multilib
+setup.
diff --git a/network/vmware-horizon-client/slack-desc b/network/vmware-horizon-client/slack-desc
new file mode 100644
index 0000000000..361b7dbd0e
--- /dev/null
+++ b/network/vmware-horizon-client/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+vmware-view-client: vmware-horizon-client (VMWare Horizon Client with PCoIP support) 
+vmware-view-client:
+vmware-view-client: The VMware Horizon Client for Linux, optimised for VMware View 6,
+vmware-view-client: allowing you to use your Slackware box as a thin client and connects 
+vmware-view-client: you to your company's Virtual Desktop Infrastructure, even if they 
+vmware-view-client: use the proprietary VMware Horizon 6 PCoIP protocol.
+vmware-view-client: Only use this package if you need the proprietary parts. 
+vmware-view-client: 
+vmware-view-client:
+vmware-view-client: 
+vmware-view-client:
diff --git a/network/vmware-horizon-client/vmware-bundle.eclass b/network/vmware-horizon-client/vmware-bundle.eclass
new file mode 100644
index 0000000000..261b6e1cae
--- /dev/null
+++ b/network/vmware-horizon-client/vmware-bundle.eclass
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-bundle.eclass,v 1.2 2011/08/22 04:46:32 vapier Exp $
+
+# @ECLASS: vmware-bundle.eclass
+# @MAINTAINER:
+# vmware@gentoo.org
+# @AUTHOR:
+# Matt Whitlock <matt@whitlock.name>
+# @BLURB: Provides extract functionality for vmware products bundles
+
+# This version of the file has been modified to work as part of the vmware SlackBuild. Since the
+# modifications are limited to renaming functions, we'll keep the original header
+
+extract_bundle_component() {
+	local bundle=${1:?} component=${2:?} dest=${3:-${2}}
+	cat > "${CWD}"/list-bundle-components.xsl <<-EOF
+		<?xml version="1.0" encoding="ISO-8859-1"?>
+		<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+			<xsl:output omit-xml-declaration="yes"/>
+			<xsl:template match="text()"/>
+			<xsl:template match="/bundle/components/component">
+				<xsl:value-of select="@offset"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="@size"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="@name"/>
+				<xsl:text>&#10;</xsl:text>
+			</xsl:template>
+		</xsl:stylesheet>
+		EOF
+	local -i bundle_size=$(stat -L -c'%s' "${bundle}")
+	local -i bundle_manifestOffset=$(od -An -j$((bundle_size-36)) -N4 -tu4 "${bundle}")
+	local -i bundle_manifestSize=$(od -An -j$((bundle_size-40)) -N4 -tu4 "${bundle}")
+	local -i bundle_dataOffset=$(od -An -j$((bundle_size-44)) -N4 -tu4 "${bundle}")
+	local -i bundle_dataSize=$(od -An -j$((bundle_size-52)) -N8 -tu8 "${bundle}")
+	tail -c+$((bundle_manifestOffset+1)) "${bundle}" 2> /dev/null | head -c$((bundle_manifestSize)) |
+		xsltproc "${CWD}"/list-bundle-components.xsl - |
+		while read -r component_offset component_size component_name ; do
+			if [[ ${component_name} == ${component} ]] ; then
+				echo "Extracting '${component_name}' component from '$(basename "${bundle}")'"
+				extract_component "${bundle}" "${dest}" $((bundle_dataOffset+component_offset))
+			        echo "Done."	
+			fi
+		done
+}
+
+extract_component() {
+	local component=${1:?} dest=${2:-.}
+	local -i offset=${3}
+	cat > "${CWD}"/list-component-files.xsl <<-EOF
+		<?xml version="1.0" encoding="ISO-8859-1"?>
+		<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+			<xsl:output omit-xml-declaration="yes"/>
+			<xsl:template match="text()"/>
+			<xsl:template match="/component/fileset/file">
+				<xsl:value-of select="@offset"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="@compressedSize"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="@uncompressedSize"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="@path"/>
+				<xsl:text>&#10;</xsl:text>
+			</xsl:template>
+		</xsl:stylesheet>
+		EOF
+	local -i component_manifestOffset=$(od -An -j$((offset+9)) -N4 -tu4 "${component}")
+	local -i component_manifestSize=$(od -An -j$((offset+13)) -N4 -tu4 "${component}")
+	local -i component_dataOffset=$(od -An -j$((offset+17)) -N4 -tu4 "${component}")
+	local -i component_dataSize=$(od -An -j$((offset+21)) -N8 -tu8 "${component}")
+	tail -c+$((offset+component_manifestOffset+1)) "${component}" 2> /dev/null |
+		head -c$((component_manifestSize)) | xsltproc "${CWD}"/list-component-files.xsl - |
+		while read -r file_offset file_compressedSize file_uncompressedSize file_path ; do
+			if [[ ${file_path} ]] ; then
+				echo -n '.'
+				file_path="${dest}/${file_path}"
+				mkdir -p "$(dirname "${file_path}")" || die
+				tail -c+$((offset+component_dataOffset+file_offset+1)) "${component}" 2> /dev/null |
+					head -c$((file_compressedSize)) | gzip -cd > "${file_path}" || die
+			fi
+		done
+	echo
+}
diff --git a/network/vmware-horizon-client/vmware-horizon-client.SlackBuild b/network/vmware-horizon-client/vmware-horizon-client.SlackBuild
new file mode 100644
index 0000000000..15f2e2a220
--- /dev/null
+++ b/network/vmware-horizon-client/vmware-horizon-client.SlackBuild
@@ -0,0 +1,160 @@
+#!/bin/sh
+
+# Slackware build script for vmware-horizon-client
+
+# Copyright 2015 Beni Keller, Schwyz, Switzerland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=vmware-horizon-client
+VERSION=${VERSION:-3.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=i486
+_BUILD=2769709
+
+# Install PCOIP component
+PCOIP=${PCOIP:-YES}
+# Install USB-redirection component
+# This is deactivated by default because
+# It's not working with the current version of libcrypto.
+USB=${USB:-NO}
+# Install Smartcard component
+SMARTCRD=${SMARTCRD:-YES}
+# Install Real Time Audio and Video component
+RTAV=${RTAV:-YES}
+
+echo $PCOIP
+break
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+BUNDLE=$CWD/VMware-Horizon-Client-$VERSION-$_BUILD.x86.bundle
+# All the components we support with this SlackBuild. The
+# 'virtual-printing' support is excluded because I have no
+# way to test whether it's working.
+COMPONENTS="client pcoip usb smartcard rtav"
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+
+# We use the Gentoo eclass to extract components from the bundle.
+# These are the settings needed for these functions.
+
+
+
+
+export T="$CWD"
+
+ebegin() {
+    echo -n "Begin ${1}: "
+}
+eend() {
+    echo 'done'
+}
+
+source "$CWD/vmware-bundle.eclass"
+
+# Extracting the components from the bundle
+for COMPONENT in $COMPONENTS; do
+    extract_bundle_component $BUNDLE "vmware-horizon-$COMPONENT" "$CWD/extract/vmware-horizon-$COMPONENT"
+done
+
+cd $CWD/extract
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+# Dirty hack copied from Arch PKGBUILD
+# https://aur.archlinux.org/packages/vm/vmware-horizon-client
+# Helps linking to the correct version of the OpenSSL libs
+for FILE in $(find "$CWD/extract/" -type f); do
+	# executables and libraries only
+	file --mime "${FILE}" | egrep -q "(application/x-(executable|sharedlib)|text/x-shellscript)" || continue
+
+	# make executable
+	chmod +x "${FILE}"
+
+	# link against libudev.so.1
+	#sed -i -e 's/libudev.so.0/libudev.so.1/' "${FILE}"
+
+	# even openssl 1.0.1.x has library file names ending in .so.1.0.0
+	sed -i -e 's/libssl.so.1.0.1/libssl.so.1.0.0/' \
+		-e 's/libcrypto.so.1.0.1/libcrypto.so.1.0.0/' \
+		"${FILE}"
+done
+# Delete these libraries. We'll recreate these files later as links
+rm "$CWD"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/lib{crypto,ssl}.so.1.0.1
+
+# We install the client without the other components
+# Since it's a binary distribution we just copy the files
+cd $CWD/extract/vmware-horizon-client
+
+mkdir -p "$PKG/usr/"
+mkdir -p "$PKG/usr/doc/"
+
+cp -a bin/ "$PKG/usr/"
+cp -a lib/ "$PKG/usr/"
+cp -a share/ "$PKG/usr/"
+cp -a doc/ "$PKG/usr/doc/$PRGNAM-$VERSION/"
+cp -a debug/ "$PKG/usr/doc/$PRGNAM-$VERSION/"
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# We install the components
+if [ "$PCOIP" == "YES" ]; then
+    cd ../vmware-horizon-pcoip
+    cp -a pcoip/lib/* "$PKG/usr/lib/"
+    cp -a pcoip/bin/* "$PKG/usr/bin/"
+    # We create the symbolic links for the libraries
+    ln -sf ../../lib/libcrypto.so.1.0.0 "$PKG/usr/lib/vmware/libcrypto.so.1.0.0"
+    ln -sf ../../lib/libssl.so.1.0.0 "$PKG/usr/lib/vmware/libssl.so.1.0.0"
+fi
+
+if [ "$USB" == "YES" ]; then
+    cd ../vmware-horizon-usb
+    cp -a bin/* "$PKG/usr/bin/"
+fi
+
+if [ "$SMARTCRD" == "YES" ]; then
+    cd ../vmware-horizon-smartcard
+    cp -a lib/* "$PKG/usr/lib/"
+fi
+
+if [ "$RTAV" == "YES" ]; then
+    cd ../vmware-horizon-rtav
+    cp -a lib/* "$PKG/usr/lib/"
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/vmware-horizon-client/vmware-horizon-client.info b/network/vmware-horizon-client/vmware-horizon-client.info
new file mode 100644
index 0000000000..f5b507edfe
--- /dev/null
+++ b/network/vmware-horizon-client/vmware-horizon-client.info
@@ -0,0 +1,10 @@
+PRGNAM="vmware-horizon-client"
+VERSION="3.4.0"
+HOMEPAGE="https://my.vmware.com/web/vmware/info/slug/desktop_end_user_computing/vmware_horizon_clients/3_0"
+DOWNLOAD="https://download3.vmware.com/software/view/viewclients/CART15Q1/VMware-Horizon-Client-3.4.0-2769709.x86.bundle"
+MD5SUM="8f963a6b4eea7b2625e1e9aecd130234"
+DOWNLOAD_x86_64="UNTESTED"
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Navigium"
+EMAIL="beni.nospam@sdf.org"
diff --git a/network/vmware-view-client/README b/network/vmware-view-client/README
deleted file mode 100644
index 81cd1915b1..0000000000
--- a/network/vmware-view-client/README
+++ /dev/null
@@ -1,17 +0,0 @@
-The VMware Horizon View Client for Linux, optimized for VMware View 5,
-allowing you to use your Slackware box as a thin client and lets 
-you to your company's Virtual Desktop Infrastructure usind the 
-propietary VMware View 5 PCoIP protocol.
-
-*ATTENTION*: This build script installs binary, proprietary software. 
-Only use it if you need the proprietary parts and you are ok with
-installing and using proprietary software.
-
-There is a problem with the GTK 3 icons. If you want to fix the icons
-in you client, you need to add the following line to the gtk3 
-configuration file /etc/gtk-3.0/gtkrc 
-
-gtk-fallback-icon-theme = gnome
-
-NOTE:
-You need multilib system if you are running x86_64 machines.
diff --git a/network/vmware-view-client/slack-desc b/network/vmware-view-client/slack-desc
deleted file mode 100644
index 8af6ec498b..0000000000
--- a/network/vmware-view-client/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                  |-----handy-ruler------------------------------------------------------|
-vmware-view-client: vmware-view-client (VMWare View Client) 
-vmware-view-client:
-vmware-view-client: The VMware Horizon View Client for Linux, optimized for VMware View 5
-vmware-view-client: allowing you to use your Slackware box asa thin client and connects
-vmware-view-client: you to your company's Virtual Desktop Infrastructure, even if they
-vmware-view-client: use the propietary VMware View 5 PCoIP protocol.
-vmware-view-client: Only use this package if you need the proprietary parts.
-vmware-view-client: The client can be downloaded on the Ubuntu launchpad
-vmware-view-client:
-vmware-view-client:
-vmware-view-client:
diff --git a/network/vmware-view-client/vmware-view-client.SlackBuild b/network/vmware-view-client/vmware-view-client.SlackBuild
deleted file mode 100644
index 03a987785c..0000000000
--- a/network/vmware-view-client/vmware-view-client.SlackBuild
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for vmware-view-client
-
-# Copyright 2014 Beni Keller, Schwyz, Switzerland
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=vmware-view-client
-VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH=i486
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Since it's a binary distributed package, all we need to do is copy the
-# contents of the tar to the apropriate places.
-cp -r * $PKG
-mkdir $PKG/usr/doc
-mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/vmware-view-client/vmware-view-client.info b/network/vmware-view-client/vmware-view-client.info
deleted file mode 100644
index b2575adb41..0000000000
--- a/network/vmware-view-client/vmware-view-client.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="vmware-view-client"
-VERSION="2.2.0"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/vmware-view-client/2.2.0-0ubuntu0.14.04"
-DOWNLOAD="https://launchpad.net/ubuntu/+archive/partner/+files/vmware-view-client_2.2.0.orig.tar.gz"
-MD5SUM="2c734aad1d27006c2059e18372e0cb4f"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Navigium"
-EMAIL="beni.nospam@sdf.org"
diff --git a/network/weathercli/weathercli.SlackBuild b/network/weathercli/weathercli.SlackBuild
index 06e772c35c..2073cb7c1c 100644
--- a/network/weathercli/weathercli.SlackBuild
+++ b/network/weathercli/weathercli.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for weathercli
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 PRGNAM=weathercli
 VERSION=${VERSION:-2.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,6 +70,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# rename executable
+sed -i "s/bin\/weather/bin\/weathercli/" setup.py
+mv bin/weather bin/weathercli
+
 python setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild
index d73764b818..03832b54e2 100644
--- a/network/weechat/weechat.SlackBuild
+++ b/network/weechat/weechat.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=weechat
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/weechat/weechat.info b/network/weechat/weechat.info
index c93d017330..d69faf579e 100644
--- a/network/weechat/weechat.info
+++ b/network/weechat/weechat.info
@@ -1,8 +1,8 @@
 PRGNAM="weechat"
-VERSION="1.2"
+VERSION="1.4"
 HOMEPAGE="http://www.weechat.org"
-DOWNLOAD="http://weechat.org/files/src/weechat-1.2.tar.bz2"
-MD5SUM="3458efd51cdc1abfb6a5c33cc5ef7713"
+DOWNLOAD="http://weechat.org/files/src/weechat-1.4.tar.bz2"
+MD5SUM="24e23908fc6fb4b55b86ead2c03aa8b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/wmnd/README b/network/wmnd/README
new file mode 100644
index 0000000000..dc039fe64b
--- /dev/null
+++ b/network/wmnd/README
@@ -0,0 +1,10 @@
+WMND is a dockapp for monitoring network interfaces under WindowMaker and other compatible window
+managers. WMND currently works on Linux, FreeBSD, NetBSD, Solaris, OpenSolaris, Darwin and IRIX.
+
+WMND can monitor multiple interfaces at the same time, sports several display modes and can also monitor
+remote interfaces through SNMP.
+
+An optional dep is "Trend" (not on SBo) which can be used to zoom in on the bars inside the DockApp.
+
+Note: This dockapp has an automatically generated RC file in the home folder. You can see an example of
+how to customize it in the /usr/doc folder. 
diff --git a/network/wmnd/slack-desc b/network/wmnd/slack-desc
new file mode 100644
index 0000000000..21508ba4cc
--- /dev/null
+++ b/network/wmnd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler--------------------------------------------------------|
+wmnd: wmnd (WindowMaker Network Devices DockApp)
+wmnd:
+wmnd: WMND is a dockapp for monitoring network interfaces under WindowMaker
+wmnd: and other compatible window managers.
+wmnd:
+wmnd: WMND can monitor multiple interfaces at the same time, sports several
+wmnd: display modes and can also monitor remote interfaces through SNMP.
+wmnd:
+wmnd: Homepage: http://www.thregr.org/~wavexx/software/wmnd/
+wmnd:
+wmnd:
diff --git a/network/wmnd/wmnd.SlackBuild b/network/wmnd/wmnd.SlackBuild
new file mode 100644
index 0000000000..8b9e7f21e8
--- /dev/null
+++ b/network/wmnd/wmnd.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for wmnd
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmnd
+VERSION=${VERSION:-0.4.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Compresses man page
+gzip -9 $PKG/usr/man/man1/wmnd.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog ChangeLog.0 COPYING examples INSTALL NEWS README THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/wmnd/wmnd.info b/network/wmnd/wmnd.info
new file mode 100644
index 0000000000..7b668e30b4
--- /dev/null
+++ b/network/wmnd/wmnd.info
@@ -0,0 +1,10 @@
+PRGNAM="wmnd"
+VERSION="0.4.17"
+HOMEPAGE="http://www.thregr.org/~wavexx/software/wmnd/"
+DOWNLOAD="http://www.thregr.org/~wavexx/software/wmnd/releases/wmnd-0.4.17.tar.gz"
+MD5SUM="dbf6d6c42ab3e036388d261d2e7bea16"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/network/wput/wput.info b/network/wput/wput.info
index 4ac0831252..63bf907724 100644
--- a/network/wput/wput.info
+++ b/network/wput/wput.info
@@ -1,7 +1,7 @@
 PRGNAM="wput"
 VERSION="0.6.1"
 HOMEPAGE="http://wput.sourceforge.net/"
-DOWNLOAD="http://garr.dl.sourceforge.net/sourceforge/wput/wput-0.6.1.tgz"
+DOWNLOAD="http://sourceforge.net/projects/wput/files/wput/0.6.1/wput-0.6.1.tgz"
 MD5SUM="92b41efed4db8eb4f3443c23bf7ceecf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/xdman/README b/network/xdman/README
new file mode 100644
index 0000000000..2f163fbd4d
--- /dev/null
+++ b/network/xdman/README
@@ -0,0 +1,21 @@
+xdman (download manager)
+
+Xtreme Download Manager is a powerful tool to increase download speed up-to 500%, 
+save videos from video sharing sites and integration with ANY browser.
+
+On Google Chrome|Chromium|Vivaldi,Opera >12.16, type on URL bar: chrome://extensions
+Check "Developer mode", click on "Load Unpacked extension" and select ~/xdm-helper folder.
+
+On Mozilla Firefox, simply drag and drop file ~/xdm-helper/xdmff.xpi.
+
+For other browsers, go to Tools/Browser Integration.
+
+On this version, Java (openjdk,jdk, etc) is not a dependency!
+
+Some features present in Xtreme Download Manager are:
+
+ * Superfast speed;
+ * Save video from any website;
+ * Supports any browser;
+ * Runs on any Operating system;
+ * Free, No-Adware and Open source.
diff --git a/network/xdman/doinst.sh b/network/xdman/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/network/xdman/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/xdman/slack-desc b/network/xdman/slack-desc
new file mode 100644
index 0000000000..0f6f85f05f
--- /dev/null
+++ b/network/xdman/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xdman: xdman (download manager)
+xdman:
+xdman: Xtreme Download Manager is a powerful tool to increase download speed
+xdman: up-to 500%, save videos from video sharing sites and integration 
+xdman: with ANY browser.
+xdman:
+xdman: Home page: http://xdman.sourceforge.net/index.html
+xdman:
+xdman:
+xdman:
+xdman:
diff --git a/network/xdman/xdman b/network/xdman/xdman
new file mode 100644
index 0000000000..343ae12155
--- /dev/null
+++ b/network/xdman/xdman
@@ -0,0 +1,3 @@
+#!/bin/bash
+DIR="/usr/share/xdman"
+$DIR/jre/bin/java -jar $DIR/xdm.jar
diff --git a/network/xdman/xdman.SlackBuild b/network/xdman/xdman.SlackBuild
new file mode 100644
index 0000000000..2151d6ef26
--- /dev/null
+++ b/network/xdman/xdman.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# Slackware build script for xdman.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=xdman
+VERSION=${VERSION:-5.0.47}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="xdm"
+SUFFIX="jre"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+
+if [ "$ARCH" = "i486" ]; then
+   tar xvf $CWD/$SRCNAM-$SUFFIX-32bit.tar.xz
+elif [ "$ARCH" = "x86_64" ]; then
+   tar xvf $CWD/$SRCNAM-$SUFFIX-64bit.tar.xz
+fi
+
+mv $SRCNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+install -d $PKG/usr/bin
+install -D -m755 $CWD/xdman $PKG/usr/bin/xdman
+install -d $PKG/usr/share/{applications,pixmaps,$PRGNAM}
+install -D -m644 $CWD/xdman.desktop $PKG/usr/share/applications/xdman.desktop
+install -D -m644 icon.png $PKG/usr/share/pixmaps/xdman.png
+cp -a jre xdm.jar $PKG/usr/share/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/xdman/xdman.desktop b/network/xdman/xdman.desktop
new file mode 100644
index 0000000000..0a7e777879
--- /dev/null
+++ b/network/xdman/xdman.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Xdman
+GenericName=Xtreme Download Manager
+Comment=Powerfull download accelarator and video downloader
+Icon=/usr/share/pixmaps/xdman.png
+Exec=xdman
+TryExec=xdman
+Terminal=false
+Categories=Network;
\ No newline at end of file
diff --git a/network/xdman/xdman.info b/network/xdman/xdman.info
new file mode 100644
index 0000000000..39c677149a
--- /dev/null
+++ b/network/xdman/xdman.info
@@ -0,0 +1,10 @@
+PRGNAM="xdman"
+VERSION="5.0.47"
+HOMEPAGE="http://xdman.sourceforge.net/index.html"
+DOWNLOAD="http://sourceforge.net/projects/xdman/files/xdm-jre-32bit.tar.xz"
+MD5SUM="1db7d588dddc7f6e4c7a4f1d4a8e73e3"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/xdman/files/xdm-jre-64bit.tar.xz"
+MD5SUM_x86_64="00096f8c8a50f93c9f4d02687474e9b0"
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/network/xtables-addons/xtables-addons.SlackBuild b/network/xtables-addons/xtables-addons.SlackBuild
index 8f9b70b33b..09f1320e1c 100644
--- a/network/xtables-addons/xtables-addons.SlackBuild
+++ b/network/xtables-addons/xtables-addons.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xtables-addons
 
-# Copyright 2008-2014  Robby Workman, Northport, Alabama, USA
+# Copyright 2008-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xtables-addons
-VERSION=${VERSION:-2.5}
+VERSION=${VERSION:-2.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/xtables-addons/xtables-addons.info b/network/xtables-addons/xtables-addons.info
index 8d4a081ff1..76fba02b12 100644
--- a/network/xtables-addons/xtables-addons.info
+++ b/network/xtables-addons/xtables-addons.info
@@ -1,8 +1,8 @@
 PRGNAM="xtables-addons"
-VERSION="2.5"
+VERSION="2.10"
 HOMEPAGE="http://xtables-addons.sf.net/"
-DOWNLOAD="http://download.sourceforge.net/xtables-addons/xtables-addons-2.5.tar.xz"
-MD5SUM="335663ece5fb17c7d0bb24dbdc697eb1"
+DOWNLOAD="http://download.sourceforge.net/xtables-addons/xtables-addons-2.10.tar.xz"
+MD5SUM="727bf0dd4a3d9c65724267bd0d5d80b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/you-get/README b/network/you-get/README
index b77336afbf..1907deaf36 100644
--- a/network/you-get/README
+++ b/network/you-get/README
@@ -2,4 +2,5 @@ You-Get is a video downloader runs on Python 3. It aims at easing
 the download of videos on YouTube, Youku/Tudou (biggest online
 video providers in China), Niconico, etc., in one script.
 
-Optional dependency : ffmpeg (Used for converting and joining video files)
+Optional dependency : ffmpeg or libav (Used for converting and joining video files)
+
diff --git a/network/you-get/you-get.SlackBuild b/network/you-get/you-get.SlackBuild
index 495a1abd72..68555de84d 100644
--- a/network/you-get/you-get.SlackBuild
+++ b/network/you-get/you-get.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for you-get
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=you-get
-VERSION=${VERSION:-0.3.32}
+VERSION=${VERSION:-0.4.245}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/you-get/you-get.info b/network/you-get/you-get.info
index db86eb54db..7946f4b014 100644
--- a/network/you-get/you-get.info
+++ b/network/you-get/you-get.info
@@ -1,8 +1,8 @@
 PRGNAM="you-get"
-VERSION="0.3.32"
+VERSION="0.4.245"
 HOMEPAGE="http://www.soimort.org/you-get/"
-DOWNLOAD="https://pypi.python.org/packages/source/y/you-get/you-get-0.3.32.tar.gz"
-MD5SUM="c174c66404e188aac39dd68bd2bf442b"
+DOWNLOAD="https://pypi.python.org/packages/source/y/you-get/you-get-0.4.245.tar.gz"
+MD5SUM="6e9f9e566449c64a858be07ed5a6d8b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/network/youtube-dl/setup.patch b/network/youtube-dl/setup.patch
index 8bfd6f0a33..1ffdd77d59 100644
--- a/network/youtube-dl/setup.patch
+++ b/network/youtube-dl/setup.patch
@@ -1,11 +1,11 @@
---- youtube-dl-2015.05.20/Makefile.orig	2015-05-25 04:09:16.056234902 +0300
-+++ youtube-dl-2015.05.20/Makefile	2015-05-25 04:13:42.180907886 +0300
-@@ -4,22 +4,22 @@
- 	rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+--- youtube-dl-2016.06.23.1/Makefile.orig	2016-06-23 05:42:56.000000000 +0300
++++ youtube-dl-2016.06.23.1/Makefile	2016-06-24 06:06:24.990732349 +0300
+@@ -5,14 +5,22 @@
  	find . -name "*.pyc" -delete
+ 	find . -name "*.class" -delete
  
 -PREFIX ?= /usr/local
-+PREFIX ?= 
++PREFIX ?= /usr
  BINDIR ?= $(PREFIX)/bin
  MANDIR ?= $(PREFIX)/man
  SHAREDIR ?= $(PREFIX)/share
@@ -13,28 +13,20 @@
 +PYTHON ?= /usr/bin/python
  
  # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
--ifeq ($(PREFIX),/usr)
--	SYSCONFDIR=/etc
--else
--	ifeq ($(PREFIX),/usr/local)
--		SYSCONFDIR=/etc
--	else
--		SYSCONFDIR=$(PREFIX)/etc
--	endif
--endif
-+#ifeq ($(PREFIX),/usr)
-+#SYSCONFDIR=/etc
-+#else
-+#	ifeq ($(PREFIX),/usr/local)
-+#		SYSCONFDIR=/etc
-+#	else
-+#		SYSCONFDIR=$(PREFIX)/etc
-+#	endif
-+#endif
+-SYSCONFDIR != if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi
++ifeq ($(PREFIX),/usr)
++        SYSCONFDIR=/etc
++else
++        ifeq ($(PREFIX),/usr/local)
++                SYSCONFDIR=/etc
++        else
++                SYSCONFDIR=$(PREFIX)/etc
++        endif
++endif
  
  install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
  	install -d $(DESTDIR)$(BINDIR)
-@@ -50,7 +50,7 @@
+@@ -43,7 +51,7 @@
  
  .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
  
@@ -43,41 +35,32 @@
  
  youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
  	zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py
-@@ -70,11 +70,11 @@
- 	python devscripts/make_supportedsites.py docs/supportedsites.md
+@@ -66,11 +74,11 @@
+ 	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
  
  README.txt: README.md
 -	pandoc -f markdown -t plain README.md -o README.txt
-+	#pandoc -f markdown -t plain README.md -o README.txt
++	# pandoc -f markdown -t plain README.md -o README.txt
  
  youtube-dl.1: README.md
- 	python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
+ 	$(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
 -	pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
-+	#pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
++	# pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
  	rm -f youtube-dl.1.temp.md
  
  youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
-@@ -92,7 +92,7 @@
+@@ -90,7 +98,7 @@
  
- fish-completion: youtube-dl.fish
+ lazy-extractors: youtube_dl/extractor/lazy_extractors.py
  
--youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
-+youtube-dl.tar.gz: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
- 	@tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
- 		--exclude '*.DS_Store' \
- 		--exclude '*.kate-swp' \
-@@ -105,7 +105,7 @@
- 		--exclude 'docs/_build' \
- 		-- \
- 		bin devscripts test youtube_dl docs \
--		LICENSE README.md README.txt \
-+		LICENSE README.md \
- 		Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
- 		youtube-dl.zsh youtube-dl.fish setup.py \
- 		youtube-dl
---- youtube-dl-2015.05.20/setup.orig.py	2015-05-25 04:08:00.477179771 +0300
-+++ youtube-dl-2015.05.20/setup.py	2015-05-25 04:18:55.835986658 +0300
-@@ -46,10 +46,8 @@
+-_EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py'
++	_EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py'
+ youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
+ 	$(PYTHON) devscripts/make_lazy_extractors.py $@
+ 
+--- youtube-dl-2016.06.23.1/setup.py.orig	2016-06-24 06:06:54.071368791 +0300
++++ youtube-dl-2016.06.23.1/setup.py	2016-06-24 06:07:18.516063191 +0300
+@@ -47,10 +47,10 @@
      params = py2exe_params
  else:
      files_spec = [
@@ -87,6 +70,8 @@
 -        ('share/man/man1', ['youtube-dl.1'])
 +        ('/etc/bash_completion.d', ['youtube-dl.bash-completion']),
 +        ('/etc/fish/completions', ['youtube-dl.fish']),
++        ('/usr/doc/youtube_dl', ['README.txt']),
++        ('/usr/man/man1', ['youtube-dl.1'])
      ]
      root = os.path.dirname(os.path.abspath(__file__))
      data_files = []
diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1
index cde2abf571..321792e884 100644
--- a/network/youtube-dl/youtube-dl.1
+++ b/network/youtube-dl/youtube-dl.1
@@ -7,270 +7,891 @@ youtube\-dl \- download videos from youtube.com or other video platforms
 \f[B]youtube\-dl\f[] [OPTIONS] URL [URL...]
 .SH DESCRIPTION
 .PP
-\f[B]youtube\-dl\f[] is a small command\-line program to download videos
-from YouTube.com and a few more sites.
+\f[B]youtube\-dl\f[] is a command\-line program to download videos from
+YouTube.com and a few more sites.
 It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is
 not platform specific.
 It should work on your Unix box, on Windows or on Mac OS X.
 It is released to the public domain, which means you can modify it,
 redistribute it or use it however you like.
 .SH OPTIONS
-.IP
-.nf
-\f[C]
-\-h,\ \-\-help\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Print\ this\ help\ text\ and\ exit
-\-\-version\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Print\ program\ version\ and\ exit
-\-U,\ \-\-update\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update\ this\ program\ to\ latest\ version.\ Make\ sure\ that\ you\ have\ sufficient\ permissions\ (run\ with\ sudo\ if\ needed)
-\-i,\ \-\-ignore\-errors\ \ \ \ \ \ \ \ \ \ \ \ \ \ Continue\ on\ download\ errors,\ for\ example\ to\ skip\ unavailable\ videos\ in\ a\ playlist
-\-\-abort\-on\-error\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Abort\ downloading\ of\ further\ videos\ (in\ the\ playlist\ or\ the\ command\ line)\ if\ an\ error\ occurs
-\-\-dump\-user\-agent\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Display\ the\ current\ browser\ identification
-\-\-list\-extractors\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ List\ all\ supported\ extractors
-\-\-extractor\-descriptions\ \ \ \ \ \ \ \ \ Output\ descriptions\ of\ all\ supported\ extractors
-\-\-force\-generic\-extractor\ \ \ \ \ \ \ \ Force\ extraction\ to\ use\ the\ generic\ extractor
-\-\-default\-search\ PREFIX\ \ \ \ \ \ \ \ \ \ Use\ this\ prefix\ for\ unqualified\ URLs.\ For\ example\ "gvsearch2:"\ downloads\ two\ videos\ from\ google\ videos\ for\ youtube\-dl\ "large\ apple".
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ the\ value\ "auto"\ to\ let\ youtube\-dl\ guess\ ("auto_warning"\ to\ emit\ a\ warning\ when\ guessing).\ "error"\ just\ throws\ an\ error.\ The
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ default\ value\ "fixup_error"\ repairs\ broken\ URLs,\ but\ emits\ an\ error\ if\ this\ is\ not\ possible\ instead\ of\ searching.
-\-\-ignore\-config\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ read\ configuration\ files.\ When\ given\ in\ the\ global\ configuration\ file\ /etc/youtube\-dl.conf:\ Do\ not\ read\ the\ user\ configuration
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ in\ ~/.config/youtube\-dl/config\ (%APPDATA%/youtube\-dl/config.txt\ on\ Windows)
-\-\-flat\-playlist\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ extract\ the\ videos\ of\ a\ playlist,\ only\ list\ them.
-\-\-no\-color\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ emit\ color\ codes\ in\ output
-\f[]
-.fi
+.TP
+.B \-h, \-\-help
+Print this help text and exit
+.RS
+.RE
+.TP
+.B \-\-version
+Print program version and exit
+.RS
+.RE
+.TP
+.B \-U, \-\-update
+Update this program to latest version.
+Make sure that you have sufficient permissions (run with sudo if needed)
+.RS
+.RE
+.TP
+.B \-i, \-\-ignore\-errors
+Continue on download errors, for example to skip unavailable videos in a
+playlist
+.RS
+.RE
+.TP
+.B \-\-abort\-on\-error
+Abort downloading of further videos (in the playlist or the command
+line) if an error occurs
+.RS
+.RE
+.TP
+.B \-\-dump\-user\-agent
+Display the current browser identification
+.RS
+.RE
+.TP
+.B \-\-list\-extractors
+List all supported extractors
+.RS
+.RE
+.TP
+.B \-\-extractor\-descriptions
+Output descriptions of all supported extractors
+.RS
+.RE
+.TP
+.B \-\-force\-generic\-extractor
+Force extraction to use the generic extractor
+.RS
+.RE
+.TP
+.B \-\-default\-search \f[I]PREFIX\f[]
+Use this prefix for unqualified URLs.
+For example "gvsearch2:" downloads two videos from google videos for
+youtube\-dl "large apple".
+Use the value "auto" to let youtube\-dl guess ("auto_warning" to emit a
+warning when guessing).
+"error" just throws an error.
+The default value "fixup_error" repairs broken URLs, but emits an error
+if this is not possible instead of searching.
+.RS
+.RE
+.TP
+.B \-\-ignore\-config
+Do not read configuration files.
+When given in the global configuration file /etc/youtube\-dl.conf: Do
+not read the user configuration in ~/.config/youtube\- dl/config
+(%APPDATA%/youtube\-dl/config.txt on Windows)
+.RS
+.RE
+.TP
+.B \-\-flat\-playlist
+Do not extract the videos of a playlist, only list them.
+.RS
+.RE
+.TP
+.B \-\-mark\-watched
+Mark videos watched (YouTube only)
+.RS
+.RE
+.TP
+.B \-\-no\-mark\-watched
+Do not mark videos watched (YouTube only)
+.RS
+.RE
+.TP
+.B \-\-no\-color
+Do not emit color codes in output
+.RS
+.RE
 .SS Network Options:
-.IP
-.nf
-\f[C]
-\-\-proxy\ URL\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ the\ specified\ HTTP/HTTPS\ proxy.\ Pass\ in\ an\ empty\ string\ (\-\-proxy\ "")\ for\ direct\ connection
-\-\-socket\-timeout\ SECONDS\ \ \ \ \ \ \ \ \ Time\ to\ wait\ before\ giving\ up,\ in\ seconds
-\-\-source\-address\ IP\ \ \ \ \ \ \ \ \ \ \ \ \ \ Client\-side\ IP\ address\ to\ bind\ to\ (experimental)
-\-4,\ \-\-force\-ipv4\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Make\ all\ connections\ via\ IPv4\ (experimental)
-\-6,\ \-\-force\-ipv6\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Make\ all\ connections\ via\ IPv6\ (experimental)
-\-\-cn\-verification\-proxy\ URL\ \ \ \ \ \ Use\ this\ proxy\ to\ verify\ the\ IP\ address\ for\ some\ Chinese\ sites.\ The\ default\ proxy\ specified\ by\ \-\-proxy\ (or\ none,\ if\ the\ options\ is
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ not\ present)\ is\ used\ for\ the\ actual\ downloading.\ (experimental)
-\f[]
-.fi
+.TP
+.B \-\-proxy \f[I]URL\f[]
+Use the specified HTTP/HTTPS/SOCKS proxy.
+To enable experimental SOCKS proxy, specify a proper scheme.
+For example socks5://127.0.0.1:1080/.
+Pass in an empty string (\-\-proxy "") for direct connection
+.RS
+.RE
+.TP
+.B \-\-socket\-timeout \f[I]SECONDS\f[]
+Time to wait before giving up, in seconds
+.RS
+.RE
+.TP
+.B \-\-source\-address \f[I]IP\f[]
+Client\-side IP address to bind to (experimental)
+.RS
+.RE
+.TP
+.B \-4, \-\-force\-ipv4
+Make all connections via IPv4 (experimental)
+.RS
+.RE
+.TP
+.B \-6, \-\-force\-ipv6
+Make all connections via IPv6 (experimental)
+.RS
+.RE
+.TP
+.B \-\-cn\-verification\-proxy \f[I]URL\f[]
+Use this proxy to verify the IP address for some Chinese sites.
+The default proxy specified by \-\-proxy (or none, if the options is not
+present) is used for the actual downloading.
+(experimental)
+.RS
+.RE
 .SS Video Selection:
-.IP
-.nf
-\f[C]
-\-\-playlist\-start\ NUMBER\ \ \ \ \ \ \ \ \ \ Playlist\ video\ to\ start\ at\ (default\ is\ 1)
-\-\-playlist\-end\ NUMBER\ \ \ \ \ \ \ \ \ \ \ \ Playlist\ video\ to\ end\ at\ (default\ is\ last)
-\-\-playlist\-items\ ITEM_SPEC\ \ \ \ \ \ \ Playlist\ video\ items\ to\ download.\ Specify\ indices\ of\ the\ videos\ in\ the\ playlist\ separated\ by\ commas\ like:\ "\-\-playlist\-items\ 1,2,5,8"
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ if\ you\ want\ to\ download\ videos\ indexed\ 1,\ 2,\ 5,\ 8\ in\ the\ playlist.\ You\ can\ specify\ range:\ "\-\-playlist\-items\ 1\-3,7,10\-13",\ it\ will
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ download\ the\ videos\ at\ index\ 1,\ 2,\ 3,\ 7,\ 10,\ 11,\ 12\ and\ 13.
-\-\-match\-title\ REGEX\ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ only\ matching\ titles\ (regex\ or\ caseless\ sub\-string)
-\-\-reject\-title\ REGEX\ \ \ \ \ \ \ \ \ \ \ \ \ Skip\ download\ for\ matching\ titles\ (regex\ or\ caseless\ sub\-string)
-\-\-max\-downloads\ NUMBER\ \ \ \ \ \ \ \ \ \ \ Abort\ after\ downloading\ NUMBER\ files
-\-\-min\-filesize\ SIZE\ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ download\ any\ videos\ smaller\ than\ SIZE\ (e.g.\ 50k\ or\ 44.6m)
-\-\-max\-filesize\ SIZE\ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ download\ any\ videos\ larger\ than\ SIZE\ (e.g.\ 50k\ or\ 44.6m)
-\-\-date\ DATE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ only\ videos\ uploaded\ in\ this\ date
-\-\-datebefore\ DATE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ only\ videos\ uploaded\ on\ or\ before\ this\ date\ (i.e.\ inclusive)
-\-\-dateafter\ DATE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ only\ videos\ uploaded\ on\ or\ after\ this\ date\ (i.e.\ inclusive)
-\-\-min\-views\ COUNT\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ download\ any\ videos\ with\ less\ than\ COUNT\ views
-\-\-max\-views\ COUNT\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ download\ any\ videos\ with\ more\ than\ COUNT\ views
-\-\-match\-filter\ FILTER\ \ \ \ \ \ \ \ \ \ \ \ Generic\ video\ filter\ (experimental).\ Specify\ any\ key\ (see\ help\ for\ \-o\ for\ a\ list\ of\ available\ keys)\ to\ match\ if\ the\ key\ is\ present,
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ !key\ to\ check\ if\ the\ key\ is\ not\ present,key\ >\ NUMBER\ (like\ "comment_count\ >\ 12",\ also\ works\ with\ >=,\ <,\ <=,\ !=,\ =)\ to\ compare\ against
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ a\ number,\ and\ &\ to\ require\ multiple\ matches.\ Values\ which\ are\ not\ known\ are\ excluded\ unless\ you\ put\ a\ question\ mark\ (?)\ after\ the
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ operator.For\ example,\ to\ only\ match\ videos\ that\ have\ been\ liked\ more\ than\ 100\ times\ and\ disliked\ less\ than\ 50\ times\ (or\ the\ dislike
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ functionality\ is\ not\ available\ at\ the\ given\ service),\ but\ who\ also\ have\ a\ description,\ use\ \ \-\-match\-filter\ "like_count\ >\ 100\ &
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ dislike_count\ <?\ 50\ &\ description"\ .
-\-\-no\-playlist\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ only\ the\ video,\ if\ the\ URL\ refers\ to\ a\ video\ and\ a\ playlist.
-\-\-yes\-playlist\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ the\ playlist,\ if\ the\ URL\ refers\ to\ a\ video\ and\ a\ playlist.
-\-\-age\-limit\ YEARS\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ only\ videos\ suitable\ for\ the\ given\ age
-\-\-download\-archive\ FILE\ \ \ \ \ \ \ \ \ \ Download\ only\ videos\ not\ listed\ in\ the\ archive\ file.\ Record\ the\ IDs\ of\ all\ downloaded\ videos\ in\ it.
-\-\-include\-ads\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ advertisements\ as\ well\ (experimental)
-\f[]
-.fi
+.TP
+.B \-\-playlist\-start \f[I]NUMBER\f[]
+Playlist video to start at (default is 1)
+.RS
+.RE
+.TP
+.B \-\-playlist\-end \f[I]NUMBER\f[]
+Playlist video to end at (default is last)
+.RS
+.RE
+.TP
+.B \-\-playlist\-items \f[I]ITEM_SPEC\f[]
+Playlist video items to download.
+Specify indices of the videos in the playlist separated by commas like:
+"\-\-playlist\-items 1,2,5,8" if you want to download videos indexed 1,
+2, 5, 8 in the playlist.
+You can specify range: "\-\-playlist\-items 1\-3,7,10\-13", it will
+download the videos at index 1, 2, 3, 7, 10, 11, 12 and 13.
+.RS
+.RE
+.TP
+.B \-\-match\-title \f[I]REGEX\f[]
+Download only matching titles (regex or caseless sub\-string)
+.RS
+.RE
+.TP
+.B \-\-reject\-title \f[I]REGEX\f[]
+Skip download for matching titles (regex or caseless sub\-string)
+.RS
+.RE
+.TP
+.B \-\-max\-downloads \f[I]NUMBER\f[]
+Abort after downloading NUMBER files
+.RS
+.RE
+.TP
+.B \-\-min\-filesize \f[I]SIZE\f[]
+Do not download any videos smaller than SIZE (e.g.
+50k or 44.6m)
+.RS
+.RE
+.TP
+.B \-\-max\-filesize \f[I]SIZE\f[]
+Do not download any videos larger than SIZE (e.g.
+50k or 44.6m)
+.RS
+.RE
+.TP
+.B \-\-date \f[I]DATE\f[]
+Download only videos uploaded in this date
+.RS
+.RE
+.TP
+.B \-\-datebefore \f[I]DATE\f[]
+Download only videos uploaded on or before this date (i.e.
+inclusive)
+.RS
+.RE
+.TP
+.B \-\-dateafter \f[I]DATE\f[]
+Download only videos uploaded on or after this date (i.e.
+inclusive)
+.RS
+.RE
+.TP
+.B \-\-min\-views \f[I]COUNT\f[]
+Do not download any videos with less than COUNT views
+.RS
+.RE
+.TP
+.B \-\-max\-views \f[I]COUNT\f[]
+Do not download any videos with more than COUNT views
+.RS
+.RE
+.TP
+.B \-\-match\-filter \f[I]FILTER\f[]
+Generic video filter (experimental).
+Specify any key (see help for \-o for a list of available keys) to match
+if the key is present, !key to check if the key is not present,key >
+NUMBER (like "comment_count > 12", also works with >=, <, <=, !=, =) to
+compare against a number, and & to require multiple matches.
+Values which are not known are excluded unless you put a question mark
+(?) after the operator.For example, to only match videos that have been
+liked more than 100 times and disliked less than 50 times (or the
+dislike functionality is not available at the given service), but who
+also have a description, use \-\-match\-filter "like_count > 100 &
+dislike_count <?
+50 & description" .
+.RS
+.RE
+.TP
+.B \-\-no\-playlist
+Download only the video, if the URL refers to a video and a playlist.
+.RS
+.RE
+.TP
+.B \-\-yes\-playlist
+Download the playlist, if the URL refers to a video and a playlist.
+.RS
+.RE
+.TP
+.B \-\-age\-limit \f[I]YEARS\f[]
+Download only videos suitable for the given age
+.RS
+.RE
+.TP
+.B \-\-download\-archive \f[I]FILE\f[]
+Download only videos not listed in the archive file.
+Record the IDs of all downloaded videos in it.
+.RS
+.RE
+.TP
+.B \-\-include\-ads
+Download advertisements as well (experimental)
+.RS
+.RE
 .SS Download Options:
-.IP
-.nf
-\f[C]
-\-r,\ \-\-rate\-limit\ LIMIT\ \ \ \ \ \ \ \ \ \ \ Maximum\ download\ rate\ in\ bytes\ per\ second\ (e.g.\ 50K\ or\ 4.2M)
-\-R,\ \-\-retries\ RETRIES\ \ \ \ \ \ \ \ \ \ \ \ Number\ of\ retries\ (default\ is\ 10),\ or\ "infinite".
-\-\-buffer\-size\ SIZE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Size\ of\ download\ buffer\ (e.g.\ 1024\ or\ 16K)\ (default\ is\ 1024)
-\-\-no\-resize\-buffer\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ automatically\ adjust\ the\ buffer\ size.\ By\ default,\ the\ buffer\ size\ is\ automatically\ resized\ from\ an\ initial\ value\ of\ SIZE.
-\-\-playlist\-reverse\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ playlist\ videos\ in\ reverse\ order
-\-\-xattr\-set\-filesize\ \ \ \ \ \ \ \ \ \ \ \ \ Set\ file\ xattribute\ ytdl.filesize\ with\ expected\ filesize\ (experimental)
-\-\-hls\-prefer\-native\ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ the\ native\ HLS\ downloader\ instead\ of\ ffmpeg\ (experimental)
-\-\-external\-downloader\ COMMAND\ \ \ \ Use\ the\ specified\ external\ downloader.\ Currently\ supports\ aria2c,curl,httpie,wget
-\-\-external\-downloader\-args\ ARGS\ \ Give\ these\ arguments\ to\ the\ external\ downloader
-\f[]
-.fi
+.TP
+.B \-r, \-\-limit\-rate \f[I]RATE\f[]
+Maximum download rate in bytes per second (e.g.
+50K or 4.2M)
+.RS
+.RE
+.TP
+.B \-R, \-\-retries \f[I]RETRIES\f[]
+Number of retries (default is 10), or "infinite".
+.RS
+.RE
+.TP
+.B \-\-fragment\-retries \f[I]RETRIES\f[]
+Number of retries for a fragment (default is 10), or "infinite" (DASH
+only)
+.RS
+.RE
+.TP
+.B \-\-buffer\-size \f[I]SIZE\f[]
+Size of download buffer (e.g.
+1024 or 16K) (default is 1024)
+.RS
+.RE
+.TP
+.B \-\-no\-resize\-buffer
+Do not automatically adjust the buffer size.
+By default, the buffer size is automatically resized from an initial
+value of SIZE.
+.RS
+.RE
+.TP
+.B \-\-playlist\-reverse
+Download playlist videos in reverse order
+.RS
+.RE
+.TP
+.B \-\-xattr\-set\-filesize
+Set file xattribute ytdl.filesize with expected filesize (experimental)
+.RS
+.RE
+.TP
+.B \-\-hls\-prefer\-native
+Use the native HLS downloader instead of ffmpeg
+.RS
+.RE
+.TP
+.B \-\-hls\-prefer\-ffmpeg
+Use ffmpeg instead of the native HLS downloader
+.RS
+.RE
+.TP
+.B \-\-hls\-use\-mpegts
+Use the mpegts container for HLS videos, allowing to play the video
+while downloading (some players may not be able to play it)
+.RS
+.RE
+.TP
+.B \-\-external\-downloader \f[I]COMMAND\f[]
+Use the specified external downloader.
+Currently supports aria2c,avconv,axel,curl,ffmpeg,httpie,wget
+.RS
+.RE
+.TP
+.B \-\-external\-downloader\-args \f[I]ARGS\f[]
+Give these arguments to the external downloader
+.RS
+.RE
 .SS Filesystem Options:
-.IP
-.nf
-\f[C]
-\-a,\ \-\-batch\-file\ FILE\ \ \ \ \ \ \ \ \ \ \ \ File\ containing\ URLs\ to\ download\ (\[aq]\-\[aq]\ for\ stdin)
-\-\-id\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ only\ video\ ID\ in\ file\ name
-\-o,\ \-\-output\ TEMPLATE\ \ \ \ \ \ \ \ \ \ \ \ Output\ filename\ template.\ Use\ %(title)s\ to\ get\ the\ title,\ %(uploader)s\ for\ the\ uploader\ name,\ %(uploader_id)s\ for\ the\ uploader
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ nickname\ if\ different,\ %(autonumber)s\ to\ get\ an\ automatically\ incremented\ number,\ %(ext)s\ for\ the\ filename\ extension,\ %(format)s\ for
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ the\ format\ description\ (like\ "22\ \-\ 1280x720"\ or\ "HD"),\ %(format_id)s\ for\ the\ unique\ id\ of\ the\ format\ (like\ YouTube\[aq]s\ itags:\ "137"),
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(upload_date)s\ for\ the\ upload\ date\ (YYYYMMDD),\ %(extractor)s\ for\ the\ provider\ (youtube,\ metacafe,\ etc),\ %(id)s\ for\ the\ video\ id,
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(playlist_title)s,\ %(playlist_id)s,\ or\ %(playlist)s\ (=title\ if\ present,\ ID\ otherwise)\ for\ the\ playlist\ the\ video\ is\ in,
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(playlist_index)s\ for\ the\ position\ in\ the\ playlist.\ %(height)s\ and\ %(width)s\ for\ the\ width\ and\ height\ of\ the\ video\ format.
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(resolution)s\ for\ a\ textual\ description\ of\ the\ resolution\ of\ the\ video\ format.\ %%\ for\ a\ literal\ percent.\ Use\ \-\ to\ output\ to\ stdout.
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Can\ also\ be\ used\ to\ download\ to\ a\ different\ directory,\ for\ example\ with\ \-o\ \[aq]/my/downloads/%(uploader)s/%(title)s\-%(id)s.%(ext)s\[aq]\ .
-\-\-autonumber\-size\ NUMBER\ \ \ \ \ \ \ \ \ Specify\ the\ number\ of\ digits\ in\ %(autonumber)s\ when\ it\ is\ present\ in\ output\ filename\ template\ or\ \-\-auto\-number\ option\ is\ given
-\-\-restrict\-filenames\ \ \ \ \ \ \ \ \ \ \ \ \ Restrict\ filenames\ to\ only\ ASCII\ characters,\ and\ avoid\ "&"\ and\ spaces\ in\ filenames
-\-A,\ \-\-auto\-number\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [deprecated;\ use\ \ \-o\ "%(autonumber)s\-%(title)s.%(ext)s"\ ]\ Number\ downloaded\ files\ starting\ from\ 00000
-\-t,\ \-\-title\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [deprecated]\ Use\ title\ in\ file\ name\ (default)
-\-l,\ \-\-literal\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [deprecated]\ Alias\ of\ \-\-title
-\-w,\ \-\-no\-overwrites\ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ overwrite\ files
-\-c,\ \-\-continue\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Force\ resume\ of\ partially\ downloaded\ files.\ By\ default,\ youtube\-dl\ will\ resume\ downloads\ if\ possible.
-\-\-no\-continue\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ resume\ partially\ downloaded\ files\ (restart\ from\ beginning)
-\-\-no\-part\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ use\ .part\ files\ \-\ write\ directly\ into\ output\ file
-\-\-no\-mtime\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ use\ the\ Last\-modified\ header\ to\ set\ the\ file\ modification\ time
-\-\-write\-description\ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ description\ to\ a\ .description\ file
-\-\-write\-info\-json\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ metadata\ to\ a\ .info.json\ file
-\-\-write\-annotations\ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ annotations\ to\ a\ .annotations.xml\ file
-\-\-load\-info\ FILE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ JSON\ file\ containing\ the\ video\ information\ (created\ with\ the\ "\-\-write\-info\-json"\ option)
-\-\-cookies\ FILE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ File\ to\ read\ cookies\ from\ and\ dump\ cookie\ jar\ in
-\-\-cache\-dir\ DIR\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Location\ in\ the\ filesystem\ where\ youtube\-dl\ can\ store\ some\ downloaded\ information\ permanently.\ By\ default\ $XDG_CACHE_HOME/youtube\-dl
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ or\ ~/.cache/youtube\-dl\ .\ At\ the\ moment,\ only\ YouTube\ player\ files\ (for\ videos\ with\ obfuscated\ signatures)\ are\ cached,\ but\ that\ may
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ change.
-\-\-no\-cache\-dir\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Disable\ filesystem\ caching
-\-\-rm\-cache\-dir\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Delete\ all\ filesystem\ cache\ files
-\f[]
-.fi
+.TP
+.B \-a, \-\-batch\-file \f[I]FILE\f[]
+File containing URLs to download (\[aq]\-\[aq] for stdin)
+.RS
+.RE
+.TP
+.B \-\-id
+Use only video ID in file name
+.RS
+.RE
+.TP
+.B \-o, \-\-output \f[I]TEMPLATE\f[]
+Output filename template.
+Use %(title)s to get the title, %(uploader)s for the uploader name,
+%(uploader_id)s for the uploader nickname if different, %(autonumber)s
+to get an automatically incremented number, %(ext)s for the filename
+extension, %(format)s for the format description (like "22 \- 1280x720"
+or "HD"), %(format_id)s for the unique id of the format (like
+YouTube\[aq]s itags: "137"), %(upload_date)s for the upload date
+(YYYYMMDD), %(extractor)s for the provider (youtube, metacafe, etc),
+%(id)s for the video id, %(playlist_title)s, %(playlist_id)s, or
+%(playlist)s (=title if present, ID otherwise) for the playlist the
+video is in, %(playlist_index)s for the position in the playlist.
+%(height)s and %(width)s for the width and height of the video format.
+%(resolution)s for a textual description of the resolution of the video
+format.
+%% for a literal percent.
+Use \- to output to stdout.
+Can also be used to download to a different directory, for example with
+\-o \[aq]/my/downloads/%(uploader)s /%(title)s\-%(id)s.%(ext)s\[aq] .
+.RS
+.RE
+.TP
+.B \-\-autonumber\-size \f[I]NUMBER\f[]
+Specify the number of digits in %(autonumber)s when it is present in
+output filename template or \-\-auto\-number option is given
+.RS
+.RE
+.TP
+.B \-\-restrict\-filenames
+Restrict filenames to only ASCII characters, and avoid "&" and spaces in
+filenames
+.RS
+.RE
+.TP
+.B \-A, \-\-auto\-number
+[deprecated; use \-o "%(autonumber)s\-%(title)s.%(ext)s" ] Number
+downloaded files starting from 00000
+.RS
+.RE
+.TP
+.B \-t, \-\-title
+[deprecated] Use title in file name (default)
+.RS
+.RE
+.TP
+.B \-l, \-\-literal
+[deprecated] Alias of \-\-title
+.RS
+.RE
+.TP
+.B \-w, \-\-no\-overwrites
+Do not overwrite files
+.RS
+.RE
+.TP
+.B \-c, \-\-continue
+Force resume of partially downloaded files.
+By default, youtube\-dl will resume downloads if possible.
+.RS
+.RE
+.TP
+.B \-\-no\-continue
+Do not resume partially downloaded files (restart from beginning)
+.RS
+.RE
+.TP
+.B \-\-no\-part
+Do not use .part files \- write directly into output file
+.RS
+.RE
+.TP
+.B \-\-no\-mtime
+Do not use the Last\-modified header to set the file modification time
+.RS
+.RE
+.TP
+.B \-\-write\-description
+Write video description to a .description file
+.RS
+.RE
+.TP
+.B \-\-write\-info\-json
+Write video metadata to a .info.json file
+.RS
+.RE
+.TP
+.B \-\-write\-annotations
+Write video annotations to a .annotations.xml file
+.RS
+.RE
+.TP
+.B \-\-load\-info\-json \f[I]FILE\f[]
+JSON file containing the video information (created with the
+"\-\-write\-info\-json" option)
+.RS
+.RE
+.TP
+.B \-\-cookies \f[I]FILE\f[]
+File to read cookies from and dump cookie jar in
+.RS
+.RE
+.TP
+.B \-\-cache\-dir \f[I]DIR\f[]
+Location in the filesystem where youtube\-dl can store some downloaded
+information permanently.
+By default $XDG_CACHE_HOME/youtube\-dl or ~/.cache/youtube\-dl .
+At the moment, only YouTube player files (for videos with obfuscated
+signatures) are cached, but that may change.
+.RS
+.RE
+.TP
+.B \-\-no\-cache\-dir
+Disable filesystem caching
+.RS
+.RE
+.TP
+.B \-\-rm\-cache\-dir
+Delete all filesystem cache files
+.RS
+.RE
 .SS Thumbnail images:
-.IP
-.nf
-\f[C]
-\-\-write\-thumbnail\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ thumbnail\ image\ to\ disk
-\-\-write\-all\-thumbnails\ \ \ \ \ \ \ \ \ \ \ Write\ all\ thumbnail\ image\ formats\ to\ disk
-\-\-list\-thumbnails\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate\ and\ list\ all\ available\ thumbnail\ formats
-\f[]
-.fi
+.TP
+.B \-\-write\-thumbnail
+Write thumbnail image to disk
+.RS
+.RE
+.TP
+.B \-\-write\-all\-thumbnails
+Write all thumbnail image formats to disk
+.RS
+.RE
+.TP
+.B \-\-list\-thumbnails
+Simulate and list all available thumbnail formats
+.RS
+.RE
 .SS Verbosity / Simulation Options:
-.IP
-.nf
-\f[C]
-\-q,\ \-\-quiet\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Activate\ quiet\ mode
-\-\-no\-warnings\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Ignore\ warnings
-\-s,\ \-\-simulate\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ download\ the\ video\ and\ do\ not\ write\ anything\ to\ disk
-\-\-skip\-download\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ download\ the\ video
-\-g,\ \-\-get\-url\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ URL
-\-e,\ \-\-get\-title\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ title
-\-\-get\-id\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ id
-\-\-get\-thumbnail\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ thumbnail\ URL
-\-\-get\-description\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ video\ description
-\-\-get\-duration\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ video\ length
-\-\-get\-filename\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ output\ filename
-\-\-get\-format\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ output\ format
-\-j,\ \-\-dump\-json\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ JSON\ information.\ See\ \-\-output\ for\ a\ description\ of\ available\ keys.
-\-J,\ \-\-dump\-single\-json\ \ \ \ \ \ \ \ \ \ \ Simulate,\ quiet\ but\ print\ JSON\ information\ for\ each\ command\-line\ argument.\ If\ the\ URL\ refers\ to\ a\ playlist,\ dump\ the\ whole\ playlist
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ information\ in\ a\ single\ line.
-\-\-print\-json\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Be\ quiet\ and\ print\ the\ video\ information\ as\ JSON\ (video\ is\ still\ being\ downloaded).
-\-\-newline\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Output\ progress\ bar\ as\ new\ lines
-\-\-no\-progress\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ print\ progress\ bar
-\-\-console\-title\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Display\ progress\ in\ console\ titlebar
-\-v,\ \-\-verbose\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Print\ various\ debugging\ information
-\-\-dump\-pages\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Print\ downloaded\ pages\ encoded\ using\ base64\ to\ debug\ problems\ (very\ verbose)
-\-\-write\-pages\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ downloaded\ intermediary\ pages\ to\ files\ in\ the\ current\ directory\ to\ debug\ problems
-\-\-print\-traffic\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Display\ sent\ and\ read\ HTTP\ traffic
-\-C,\ \-\-call\-home\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Contact\ the\ youtube\-dl\ server\ for\ debugging
-\-\-no\-call\-home\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ NOT\ contact\ the\ youtube\-dl\ server\ for\ debugging
-\f[]
-.fi
+.TP
+.B \-q, \-\-quiet
+Activate quiet mode
+.RS
+.RE
+.TP
+.B \-\-no\-warnings
+Ignore warnings
+.RS
+.RE
+.TP
+.B \-s, \-\-simulate
+Do not download the video and do not write anything to disk
+.RS
+.RE
+.TP
+.B \-\-skip\-download
+Do not download the video
+.RS
+.RE
+.TP
+.B \-g, \-\-get\-url
+Simulate, quiet but print URL
+.RS
+.RE
+.TP
+.B \-e, \-\-get\-title
+Simulate, quiet but print title
+.RS
+.RE
+.TP
+.B \-\-get\-id
+Simulate, quiet but print id
+.RS
+.RE
+.TP
+.B \-\-get\-thumbnail
+Simulate, quiet but print thumbnail URL
+.RS
+.RE
+.TP
+.B \-\-get\-description
+Simulate, quiet but print video description
+.RS
+.RE
+.TP
+.B \-\-get\-duration
+Simulate, quiet but print video length
+.RS
+.RE
+.TP
+.B \-\-get\-filename
+Simulate, quiet but print output filename
+.RS
+.RE
+.TP
+.B \-\-get\-format
+Simulate, quiet but print output format
+.RS
+.RE
+.TP
+.B \-j, \-\-dump\-json
+Simulate, quiet but print JSON information.
+See \-\-output for a description of available keys.
+.RS
+.RE
+.TP
+.B \-J, \-\-dump\-single\-json
+Simulate, quiet but print JSON information for each command\-line
+argument.
+If the URL refers to a playlist, dump the whole playlist information in
+a single line.
+.RS
+.RE
+.TP
+.B \-\-print\-json
+Be quiet and print the video information as JSON (video is still being
+downloaded).
+.RS
+.RE
+.TP
+.B \-\-newline
+Output progress bar as new lines
+.RS
+.RE
+.TP
+.B \-\-no\-progress
+Do not print progress bar
+.RS
+.RE
+.TP
+.B \-\-console\-title
+Display progress in console titlebar
+.RS
+.RE
+.TP
+.B \-v, \-\-verbose
+Print various debugging information
+.RS
+.RE
+.TP
+.B \-\-dump\-pages
+Print downloaded pages encoded using base64 to debug problems (very
+verbose)
+.RS
+.RE
+.TP
+.B \-\-write\-pages
+Write downloaded intermediary pages to files in the current directory to
+debug problems
+.RS
+.RE
+.TP
+.B \-\-print\-traffic
+Display sent and read HTTP traffic
+.RS
+.RE
+.TP
+.B \-C, \-\-call\-home
+Contact the youtube\-dl server for debugging
+.RS
+.RE
+.TP
+.B \-\-no\-call\-home
+Do NOT contact the youtube\-dl server for debugging
+.RS
+.RE
 .SS Workarounds:
-.IP
-.nf
-\f[C]
-\-\-encoding\ ENCODING\ \ \ \ \ \ \ \ \ \ \ \ \ \ Force\ the\ specified\ encoding\ (experimental)
-\-\-no\-check\-certificate\ \ \ \ \ \ \ \ \ \ \ Suppress\ HTTPS\ certificate\ validation
-\-\-prefer\-insecure\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ an\ unencrypted\ connection\ to\ retrieve\ information\ about\ the\ video.\ (Currently\ supported\ only\ for\ YouTube)
-\-\-user\-agent\ UA\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Specify\ a\ custom\ user\ agent
-\-\-referer\ URL\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Specify\ a\ custom\ referer,\ use\ if\ the\ video\ access\ is\ restricted\ to\ one\ domain
-\-\-add\-header\ FIELD:VALUE\ \ \ \ \ \ \ \ \ Specify\ a\ custom\ HTTP\ header\ and\ its\ value,\ separated\ by\ a\ colon\ \[aq]:\[aq].\ You\ can\ use\ this\ option\ multiple\ times
-\-\-bidi\-workaround\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Work\ around\ terminals\ that\ lack\ bidirectional\ text\ support.\ Requires\ bidiv\ or\ fribidi\ executable\ in\ PATH
-\-\-sleep\-interval\ SECONDS\ \ \ \ \ \ \ \ \ Number\ of\ seconds\ to\ sleep\ before\ each\ download.
-\f[]
-.fi
+.TP
+.B \-\-encoding \f[I]ENCODING\f[]
+Force the specified encoding (experimental)
+.RS
+.RE
+.TP
+.B \-\-no\-check\-certificate
+Suppress HTTPS certificate validation
+.RS
+.RE
+.TP
+.B \-\-prefer\-insecure
+Use an unencrypted connection to retrieve information about the video.
+(Currently supported only for YouTube)
+.RS
+.RE
+.TP
+.B \-\-user\-agent \f[I]UA\f[]
+Specify a custom user agent
+.RS
+.RE
+.TP
+.B \-\-referer \f[I]URL\f[]
+Specify a custom referer, use if the video access is restricted to one
+domain
+.RS
+.RE
+.TP
+.B \-\-add\-header \f[I]FIELD:VALUE\f[]
+Specify a custom HTTP header and its value, separated by a colon
+\[aq]:\[aq].
+You can use this option multiple times
+.RS
+.RE
+.TP
+.B \-\-bidi\-workaround
+Work around terminals that lack bidirectional text support.
+Requires bidiv or fribidi executable in PATH
+.RS
+.RE
+.TP
+.B \-\-sleep\-interval \f[I]SECONDS\f[]
+Number of seconds to sleep before each download.
+.RS
+.RE
 .SS Video Format Options:
-.IP
-.nf
-\f[C]
-\-f,\ \-\-format\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ \ \ Video\ format\ code,\ see\ the\ "FORMAT\ SELECTION"\ for\ all\ the\ info
-\-\-all\-formats\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ all\ available\ video\ formats
-\-\-prefer\-free\-formats\ \ \ \ \ \ \ \ \ \ \ \ Prefer\ free\ video\ formats\ unless\ a\ specific\ one\ is\ requested
-\-F,\ \-\-list\-formats\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ List\ all\ available\ formats
-\-\-youtube\-skip\-dash\-manifest\ \ \ \ \ Do\ not\ download\ the\ DASH\ manifests\ and\ related\ data\ on\ YouTube\ videos
-\-\-merge\-output\-format\ FORMAT\ \ \ \ \ If\ a\ merge\ is\ required\ (e.g.\ bestvideo+bestaudio),\ output\ to\ given\ container\ format.\ One\ of\ mkv,\ mp4,\ ogg,\ webm,\ flv.\ Ignored\ if\ no
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge\ is\ required
-\f[]
-.fi
+.TP
+.B \-f, \-\-format \f[I]FORMAT\f[]
+Video format code, see the "FORMAT SELECTION" for all the info
+.RS
+.RE
+.TP
+.B \-\-all\-formats
+Download all available video formats
+.RS
+.RE
+.TP
+.B \-\-prefer\-free\-formats
+Prefer free video formats unless a specific one is requested
+.RS
+.RE
+.TP
+.B \-F, \-\-list\-formats
+List all available formats of requested videos
+.RS
+.RE
+.TP
+.B \-\-youtube\-skip\-dash\-manifest
+Do not download the DASH manifests and related data on YouTube videos
+.RS
+.RE
+.TP
+.B \-\-merge\-output\-format \f[I]FORMAT\f[]
+If a merge is required (e.g.
+bestvideo+bestaudio), output to given container format.
+One of mkv, mp4, ogg, webm, flv.
+Ignored if no merge is required
+.RS
+.RE
 .SS Subtitle Options:
-.IP
-.nf
-\f[C]
-\-\-write\-sub\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ subtitle\ file
-\-\-write\-auto\-sub\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ automatic\ subtitle\ file\ (YouTube\ only)
-\-\-all\-subs\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ all\ the\ available\ subtitles\ of\ the\ video
-\-\-list\-subs\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ List\ all\ available\ subtitles\ for\ the\ video
-\-\-sub\-format\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ \ \ Subtitle\ format,\ accepts\ formats\ preference,\ for\ example:\ "srt"\ or\ "ass/srt/best"
-\-\-sub\-lang\ LANGS\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Languages\ of\ the\ subtitles\ to\ download\ (optional)\ separated\ by\ commas,\ use\ IETF\ language\ tags\ like\ \[aq]en,pt\[aq]
-\f[]
-.fi
+.TP
+.B \-\-write\-sub
+Write subtitle file
+.RS
+.RE
+.TP
+.B \-\-write\-auto\-sub
+Write automatically generated subtitle file (YouTube only)
+.RS
+.RE
+.TP
+.B \-\-all\-subs
+Download all the available subtitles of the video
+.RS
+.RE
+.TP
+.B \-\-list\-subs
+List all available subtitles for the video
+.RS
+.RE
+.TP
+.B \-\-sub\-format \f[I]FORMAT\f[]
+Subtitle format, accepts formats preference, for example: "srt" or
+"ass/srt/best"
+.RS
+.RE
+.TP
+.B \-\-sub\-lang \f[I]LANGS\f[]
+Languages of the subtitles to download (optional) separated by commas,
+use \-\-list\- subs for available language tags
+.RS
+.RE
 .SS Authentication Options:
-.IP
-.nf
-\f[C]
-\-u,\ \-\-username\ USERNAME\ \ \ \ \ \ \ \ \ \ Login\ with\ this\ account\ ID
-\-p,\ \-\-password\ PASSWORD\ \ \ \ \ \ \ \ \ \ Account\ password.\ If\ this\ option\ is\ left\ out,\ youtube\-dl\ will\ ask\ interactively.
-\-2,\ \-\-twofactor\ TWOFACTOR\ \ \ \ \ \ \ \ Two\-factor\ auth\ code
-\-n,\ \-\-netrc\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ .netrc\ authentication\ data
-\-\-video\-password\ PASSWORD\ \ \ \ \ \ \ \ Video\ password\ (vimeo,\ smotri)
-\f[]
-.fi
+.TP
+.B \-u, \-\-username \f[I]USERNAME\f[]
+Login with this account ID
+.RS
+.RE
+.TP
+.B \-p, \-\-password \f[I]PASSWORD\f[]
+Account password.
+If this option is left out, youtube\-dl will ask interactively.
+.RS
+.RE
+.TP
+.B \-2, \-\-twofactor \f[I]TWOFACTOR\f[]
+Two\-factor auth code
+.RS
+.RE
+.TP
+.B \-n, \-\-netrc
+Use .netrc authentication data
+.RS
+.RE
+.TP
+.B \-\-video\-password \f[I]PASSWORD\f[]
+Video password (vimeo, smotri, youku)
+.RS
+.RE
 .SS Post\-processing Options:
+.TP
+.B \-x, \-\-extract\-audio
+Convert video files to audio\-only files (requires ffmpeg or avconv and
+ffprobe or avprobe)
+.RS
+.RE
+.TP
+.B \-\-audio\-format \f[I]FORMAT\f[]
+Specify audio format: "best", "aac", "vorbis", "mp3", "m4a", "opus", or
+"wav"; "best" by default
+.RS
+.RE
+.TP
+.B \-\-audio\-quality \f[I]QUALITY\f[]
+Specify ffmpeg/avconv audio quality, insert a value between 0 (better)
+and 9 (worse) for VBR or a specific bitrate like 128K (default 5)
+.RS
+.RE
+.TP
+.B \-\-recode\-video \f[I]FORMAT\f[]
+Encode the video to another format if necessary (currently supported:
+mp4|flv|ogg|webm|mkv|avi)
+.RS
+.RE
+.TP
+.B \-\-postprocessor\-args \f[I]ARGS\f[]
+Give these arguments to the postprocessor
+.RS
+.RE
+.TP
+.B \-k, \-\-keep\-video
+Keep the video file on disk after the post\- processing; the video is
+erased by default
+.RS
+.RE
+.TP
+.B \-\-no\-post\-overwrites
+Do not overwrite post\-processed files; the post\-processed files are
+overwritten by default
+.RS
+.RE
+.TP
+.B \-\-embed\-subs
+Embed subtitles in the video (only for mp4, webm and mkv videos)
+.RS
+.RE
+.TP
+.B \-\-embed\-thumbnail
+Embed thumbnail in the audio as cover art
+.RS
+.RE
+.TP
+.B \-\-add\-metadata
+Write metadata to the video file
+.RS
+.RE
+.TP
+.B \-\-metadata\-from\-title \f[I]FORMAT\f[]
+Parse additional metadata like song title / artist from the video title.
+The format syntax is the same as \-\-output, the parsed parameters
+replace existing values.
+Additional templates: %(album)s, %(artist)s.
+Example: \-\-metadata\-from\-title "%(artist)s \- %(title)s" matches a
+title like "Coldplay \- Paradise"
+.RS
+.RE
+.TP
+.B \-\-xattrs
+Write metadata to the video file\[aq]s xattrs (using dublin core and xdg
+standards)
+.RS
+.RE
+.TP
+.B \-\-fixup \f[I]POLICY\f[]
+Automatically correct known faults of the file.
+One of never (do nothing), warn (only emit a warning), detect_or_warn
+(the default; fix file if we can, warn otherwise)
+.RS
+.RE
+.TP
+.B \-\-prefer\-avconv
+Prefer avconv over ffmpeg for running the postprocessors (default)
+.RS
+.RE
+.TP
+.B \-\-prefer\-ffmpeg
+Prefer ffmpeg over avconv for running the postprocessors
+.RS
+.RE
+.TP
+.B \-\-ffmpeg\-location \f[I]PATH\f[]
+Location of the ffmpeg/avconv binary; either the path to the binary or
+its containing directory.
+.RS
+.RE
+.TP
+.B \-\-exec \f[I]CMD\f[]
+Execute a command on the file after downloading, similar to find\[aq]s
+\-exec syntax.
+Example: \-\-exec \[aq]adb push {} /sdcard/Music/ && rm {}\[aq]
+.RS
+.RE
+.TP
+.B \-\-convert\-subs \f[I]FORMAT\f[]
+Convert the subtitles to other format (currently supported: srt|ass|vtt)
+.RS
+.RE
+.SH CONFIGURATION
+.PP
+You can configure youtube\-dl by placing any supported command line
+option to a configuration file.
+On Linux and OS X, the system wide configuration file is located at
+\f[C]/etc/youtube\-dl.conf\f[] and the user wide configuration file at
+\f[C]~/.config/youtube\-dl/config\f[].
+On Windows, the user wide configuration file locations are
+\f[C]%APPDATA%\\youtube\-dl\\config.txt\f[] or
+\f[C]C:\\Users\\<user\ name>\\youtube\-dl.conf\f[].
+.PP
+For example, with the following configuration file youtube\-dl will
+always extract the audio, not copy the mtime, use a proxy and save all
+videos under \f[C]Movies\f[] directory in your home directory:
 .IP
 .nf
 \f[C]
-\-x,\ \-\-extract\-audio\ \ \ \ \ \ \ \ \ \ \ \ \ \ Convert\ video\ files\ to\ audio\-only\ files\ (requires\ ffmpeg\ or\ avconv\ and\ ffprobe\ or\ avprobe)
-\-\-audio\-format\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ Specify\ audio\ format:\ "best",\ "aac",\ "vorbis",\ "mp3",\ "m4a",\ "opus",\ or\ "wav";\ "best"\ by\ default
-\-\-audio\-quality\ QUALITY\ \ \ \ \ \ \ \ \ \ Specify\ ffmpeg/avconv\ audio\ quality,\ insert\ a\ value\ between\ 0\ (better)\ and\ 9\ (worse)\ for\ VBR\ or\ a\ specific\ bitrate\ like\ 128K\ (default
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 5)
-\-\-recode\-video\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ Encode\ the\ video\ to\ another\ format\ if\ necessary\ (currently\ supported:\ mp4|flv|ogg|webm|mkv|avi)
-\-\-postprocessor\-args\ ARGS\ \ \ \ \ \ \ \ Give\ these\ arguments\ to\ the\ postprocessor
-\-k,\ \-\-keep\-video\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Keep\ the\ video\ file\ on\ disk\ after\ the\ post\-processing;\ the\ video\ is\ erased\ by\ default
-\-\-no\-post\-overwrites\ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ overwrite\ post\-processed\ files;\ the\ post\-processed\ files\ are\ overwritten\ by\ default
-\-\-embed\-subs\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Embed\ subtitles\ in\ the\ video\ (only\ for\ mkv\ and\ mp4\ videos)
-\-\-embed\-thumbnail\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Embed\ thumbnail\ in\ the\ audio\ as\ cover\ art
-\-\-add\-metadata\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ metadata\ to\ the\ video\ file
-\-\-metadata\-from\-title\ FORMAT\ \ \ \ \ Parse\ additional\ metadata\ like\ song\ title\ /\ artist\ from\ the\ video\ title.\ The\ format\ syntax\ is\ the\ same\ as\ \-\-output,\ the\ parsed
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ parameters\ replace\ existing\ values.\ Additional\ templates:\ %(album)s,\ %(artist)s.\ Example:\ \-\-metadata\-from\-title\ "%(artist)s\ \-
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(title)s"\ matches\ a\ title\ like\ "Coldplay\ \-\ Paradise"
-\-\-xattrs\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ metadata\ to\ the\ video\ file\[aq]s\ xattrs\ (using\ dublin\ core\ and\ xdg\ standards)
-\-\-fixup\ POLICY\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Automatically\ correct\ known\ faults\ of\ the\ file.\ One\ of\ never\ (do\ nothing),\ warn\ (only\ emit\ a\ warning),\ detect_or_warn\ (the\ default;
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ fix\ file\ if\ we\ can,\ warn\ otherwise)
-\-\-prefer\-avconv\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Prefer\ avconv\ over\ ffmpeg\ for\ running\ the\ postprocessors\ (default)
-\-\-prefer\-ffmpeg\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Prefer\ ffmpeg\ over\ avconv\ for\ running\ the\ postprocessors
-\-\-ffmpeg\-location\ PATH\ \ \ \ \ \ \ \ \ \ \ Location\ of\ the\ ffmpeg/avconv\ binary;\ either\ the\ path\ to\ the\ binary\ or\ its\ containing\ directory.
-\-\-exec\ CMD\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Execute\ a\ command\ on\ the\ file\ after\ downloading,\ similar\ to\ find\[aq]s\ \-exec\ syntax.\ Example:\ \-\-exec\ \[aq]adb\ push\ {}\ /sdcard/Music/\ &&\ rm
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ {}\[aq]
-\-\-convert\-subtitles\ FORMAT\ \ \ \ \ \ \ Convert\ the\ subtitles\ to\ other\ format\ (currently\ supported:\ srt|ass|vtt)
+\-x
+\-\-no\-mtime
+\-\-proxy\ 127.0.0.1:3128
+\-o\ ~/Movies/%(title)s.%(ext)s
 \f[]
 .fi
-.SH CONFIGURATION
 .PP
-You can configure youtube\-dl by placing default arguments (such as
-\f[C]\-\-extract\-audio\ \-\-no\-mtime\f[] to always extract the audio
-and not copy the mtime) into \f[C]/etc/youtube\-dl.conf\f[] and/or
-\f[C]~/.config/youtube\-dl/config\f[].
-On Windows, the configuration file locations are
-\f[C]%APPDATA%\\youtube\-dl\\config.txt\f[] and
-\f[C]C:\\Users\\<user\ name>\\youtube\-dl.conf\f[].
+Note that options in configuration file are just the same options aka
+switches used in regular command line calls thus there \f[B]must be no
+whitespace\f[] after \f[C]\-\f[] or \f[C]\-\-\f[], e.g.
+\f[C]\-o\f[] or \f[C]\-\-proxy\f[] but not \f[C]\-\ o\f[] or
+\f[C]\-\-\ proxy\f[].
+.PP
+You can use \f[C]\-\-ignore\-config\f[] if you want to disable the
+configuration file for a particular youtube\-dl run.
 .SS Authentication with \f[C]\&.netrc\f[] file
 .PP
 You may also want to configure automatic credentials storage for
 extractors that support authentication (by providing login and password
 with \f[C]\-\-username\f[] and \f[C]\-\-password\f[]) in order not to
 pass credentials as command line arguments on every youtube\-dl
-execution and prevent tracking plain text passwords in shell command
+execution and prevent tracking plain text passwords in the shell command
 history.
-You can achieve this using \f[C]\&.netrc\f[]
+You can achieve this using a \f[C]\&.netrc\f[]
 file (http://stackoverflow.com/tags/.netrc/info) on per extractor basis.
-For that you will need to create \f[C]\&.netrc\f[] file in your
+For that you will need to create a \f[C]\&.netrc\f[] file in your
 \f[C]$HOME\f[] and restrict permissions to read/write by you only:
 .IP
 .nf
@@ -298,52 +919,174 @@ machine\ twitch\ login\ my_twitch_account_name\ password\ my_twitch_password
 \f[]
 .fi
 .PP
-To activate authentication with \f[C]\&.netrc\f[] file you should pass
-\f[C]\-\-netrc\f[] to youtube\-dl or to place it in configuration
+To activate authentication with the \f[C]\&.netrc\f[] file you should
+pass \f[C]\-\-netrc\f[] to youtube\-dl or place it in the configuration
 file (#configuration).
 .PP
-On Windows you may also need to setup \f[C]%HOME%\f[] environment
+On Windows you may also need to setup the \f[C]%HOME%\f[] environment
 variable manually.
 .SH OUTPUT TEMPLATE
 .PP
 The \f[C]\-o\f[] option allows users to indicate a template for the
 output file names.
+.PP
+\f[B]tl;dr:\f[] navigate me to examples (#output-template-examples).
+.PP
 The basic usage is not to set any template arguments when downloading a
 single file, like in
 \f[C]youtube\-dl\ \-o\ funny_video.flv\ "http://some/video"\f[].
 However, it may contain special sequences that will be replaced when
 downloading each video.
 The special sequences have the format \f[C]%(NAME)s\f[].
-To clarify, that is a percent symbol followed by a name in parenthesis,
+To clarify, that is a percent symbol followed by a name in parentheses,
 followed by a lowercase S.
 Allowed names are:
 .IP \[bu] 2
-\f[C]id\f[]: The sequence will be replaced by the video identifier.
+\f[C]id\f[]: Video identifier
+.IP \[bu] 2
+\f[C]title\f[]: Video title
 .IP \[bu] 2
-\f[C]url\f[]: The sequence will be replaced by the video URL.
+\f[C]url\f[]: Video URL
 .IP \[bu] 2
-\f[C]uploader\f[]: The sequence will be replaced by the nickname of the
-person who uploaded the video.
+\f[C]ext\f[]: Video filename extension
 .IP \[bu] 2
-\f[C]upload_date\f[]: The sequence will be replaced by the upload date
-in YYYYMMDD format.
+\f[C]alt_title\f[]: A secondary title of the video
 .IP \[bu] 2
-\f[C]title\f[]: The sequence will be replaced by the video title.
+\f[C]display_id\f[]: An alternative identifier for the video
 .IP \[bu] 2
-\f[C]ext\f[]: The sequence will be replaced by the appropriate extension
-(like flv or mp4).
+\f[C]uploader\f[]: Full name of the video uploader
 .IP \[bu] 2
-\f[C]epoch\f[]: The sequence will be replaced by the Unix epoch when
-creating the file.
+\f[C]license\f[]: License name the video is licensed under
 .IP \[bu] 2
-\f[C]autonumber\f[]: The sequence will be replaced by a five\-digit
-number that will be increased with each download, starting at zero.
+\f[C]creator\f[]: The creator of the video
 .IP \[bu] 2
-\f[C]playlist\f[]: The name or the id of the playlist that contains the
-video.
+\f[C]release_date\f[]: The date (YYYYMMDD) when the video was released
 .IP \[bu] 2
-\f[C]playlist_index\f[]: The index of the video in the playlist, a
-five\-digit number.
+\f[C]timestamp\f[]: UNIX timestamp of the moment the video became
+available
+.IP \[bu] 2
+\f[C]upload_date\f[]: Video upload date (YYYYMMDD)
+.IP \[bu] 2
+\f[C]uploader_id\f[]: Nickname or id of the video uploader
+.IP \[bu] 2
+\f[C]location\f[]: Physical location where the video was filmed
+.IP \[bu] 2
+\f[C]duration\f[]: Length of the video in seconds
+.IP \[bu] 2
+\f[C]view_count\f[]: How many users have watched the video on the
+platform
+.IP \[bu] 2
+\f[C]like_count\f[]: Number of positive ratings of the video
+.IP \[bu] 2
+\f[C]dislike_count\f[]: Number of negative ratings of the video
+.IP \[bu] 2
+\f[C]repost_count\f[]: Number of reposts of the video
+.IP \[bu] 2
+\f[C]average_rating\f[]: Average rating give by users, the scale used
+depends on the webpage
+.IP \[bu] 2
+\f[C]comment_count\f[]: Number of comments on the video
+.IP \[bu] 2
+\f[C]age_limit\f[]: Age restriction for the video (years)
+.IP \[bu] 2
+\f[C]format\f[]: A human\-readable description of the format
+.IP \[bu] 2
+\f[C]format_id\f[]: Format code specified by \f[C]\-\-format\f[]
+.IP \[bu] 2
+\f[C]format_note\f[]: Additional info about the format
+.IP \[bu] 2
+\f[C]width\f[]: Width of the video
+.IP \[bu] 2
+\f[C]height\f[]: Height of the video
+.IP \[bu] 2
+\f[C]resolution\f[]: Textual description of width and height
+.IP \[bu] 2
+\f[C]tbr\f[]: Average bitrate of audio and video in KBit/s
+.IP \[bu] 2
+\f[C]abr\f[]: Average audio bitrate in KBit/s
+.IP \[bu] 2
+\f[C]acodec\f[]: Name of the audio codec in use
+.IP \[bu] 2
+\f[C]asr\f[]: Audio sampling rate in Hertz
+.IP \[bu] 2
+\f[C]vbr\f[]: Average video bitrate in KBit/s
+.IP \[bu] 2
+\f[C]fps\f[]: Frame rate
+.IP \[bu] 2
+\f[C]vcodec\f[]: Name of the video codec in use
+.IP \[bu] 2
+\f[C]container\f[]: Name of the container format
+.IP \[bu] 2
+\f[C]filesize\f[]: The number of bytes, if known in advance
+.IP \[bu] 2
+\f[C]filesize_approx\f[]: An estimate for the number of bytes
+.IP \[bu] 2
+\f[C]protocol\f[]: The protocol that will be used for the actual
+download
+.IP \[bu] 2
+\f[C]extractor\f[]: Name of the extractor
+.IP \[bu] 2
+\f[C]extractor_key\f[]: Key name of the extractor
+.IP \[bu] 2
+\f[C]epoch\f[]: Unix epoch when creating the file
+.IP \[bu] 2
+\f[C]autonumber\f[]: Five\-digit number that will be increased with each
+download, starting at zero
+.IP \[bu] 2
+\f[C]playlist\f[]: Name or id of the playlist that contains the video
+.IP \[bu] 2
+\f[C]playlist_index\f[]: Index of the video in the playlist padded with
+leading zeros according to the total length of the playlist
+.IP \[bu] 2
+\f[C]playlist_id\f[]: Playlist identifier
+.IP \[bu] 2
+\f[C]playlist_title\f[]: Playlist title
+.PP
+Available for the video that belongs to some logical chapter or section:
+\- \f[C]chapter\f[]: Name or title of the chapter the video belongs to
+\- \f[C]chapter_number\f[]: Number of the chapter the video belongs to
+\- \f[C]chapter_id\f[]: Id of the chapter the video belongs to
+.PP
+Available for the video that is an episode of some series or programme:
+\- \f[C]series\f[]: Title of the series or programme the video episode
+belongs to \- \f[C]season\f[]: Title of the season the video episode
+belongs to \- \f[C]season_number\f[]: Number of the season the video
+episode belongs to \- \f[C]season_id\f[]: Id of the season the video
+episode belongs to \- \f[C]episode\f[]: Title of the video episode \-
+\f[C]episode_number\f[]: Number of the video episode within a season \-
+\f[C]episode_id\f[]: Id of the video episode
+.PP
+Available for the media that is a track or a part of a music album: \-
+\f[C]track\f[]: Title of the track \- \f[C]track_number\f[]: Number of
+the track within an album or a disc \- \f[C]track_id\f[]: Id of the
+track \- \f[C]artist\f[]: Artist(s) of the track \- \f[C]genre\f[]:
+Genre(s) of the track \- \f[C]album\f[]: Title of the album the track
+belongs to \- \f[C]album_type\f[]: Type of the album \-
+\f[C]album_artist\f[]: List of all artists appeared on the album \-
+\f[C]disc_number\f[]: Number of the disc or other physical medium the
+track belongs to \- \f[C]release_year\f[]: Year (YYYY) when the album
+was released
+.PP
+Each aforementioned sequence when referenced in output template will be
+replaced by the actual value corresponding to the sequence name.
+Note that some of the sequences are not guaranteed to be present since
+they depend on the metadata obtained by particular extractor, such
+sequences will be replaced with \f[C]NA\f[].
+.PP
+For example for \f[C]\-o\ %(title)s\-%(id)s.%(ext)s\f[] and mp4 video
+with title \f[C]youtube\-dl\ test\ video\f[] and id
+\f[C]BaW_jenozKcj\f[] this will result in a
+\f[C]youtube\-dl\ test\ video\-BaW_jenozKcj.mp4\f[] file created in the
+current directory.
+.PP
+Output template can also contain arbitrary hierarchical path, e.g.
+\f[C]\-o\ \[aq]%(playlist)s/%(playlist_index)s\ \-\ %(title)s.%(ext)s\[aq]\f[]
+that will result in downloading each video in a directory corresponding
+to this path template.
+Any missing directory will be automatically created for you.
+.PP
+To specify percent literal in output template use \f[C]%%\f[].
+To output to stdout use \f[C]\-o\ \-\f[].
 .PP
 The current default template is \f[C]%(title)s\-%(id)s.%(ext)s\f[].
 .PP
@@ -352,60 +1095,170 @@ or &, such as when transferring the downloaded filename to a Windows
 system or the filename through an 8bit\-unsafe channel.
 In these cases, add the \f[C]\-\-restrict\-filenames\f[] flag to get a
 shorter title:
+.SS Output template and Windows batch files
+.PP
+If you are using output template inside a Windows batch file then you
+must escape plain percent characters (\f[C]%\f[]) by doubling, so that
+\f[C]\-o\ "%(title)s\-%(id)s.%(ext)s"\f[] should become
+\f[C]\-o\ "%%(title)s\-%%(id)s.%%(ext)s"\f[].
+However you should not touch \f[C]%\f[]\[aq]s that are not plain
+characters, e.g.
+environment variables for expansion should stay intact:
+\f[C]\-o\ "C:\\%HOMEPATH%\\Desktop\\%%(title)s.%%(ext)s"\f[].
+.SS Output template examples
+.PP
+Note on Windows you may need to use double quotes instead of single.
 .IP
 .nf
 \f[C]
-$\ youtube\-dl\ \-\-get\-filename\ \-o\ "%(title)s.%(ext)s"\ BaW_jenozKc
+$\ youtube\-dl\ \-\-get\-filename\ \-o\ \[aq]%(title)s.%(ext)s\[aq]\ BaW_jenozKc
 youtube\-dl\ test\ video\ \[aq]\[aq]_ä↭�.mp4\ \ \ \ #\ All\ kinds\ of\ weird\ characters
-$\ youtube\-dl\ \-\-get\-filename\ \-o\ "%(title)s.%(ext)s"\ BaW_jenozKc\ \-\-restrict\-filenames
+
+$\ youtube\-dl\ \-\-get\-filename\ \-o\ \[aq]%(title)s.%(ext)s\[aq]\ BaW_jenozKc\ \-\-restrict\-filenames
 youtube\-dl_test_video_.mp4\ \ \ \ \ \ \ \ \ \ #\ A\ simple\ file\ name
+
+#\ Download\ YouTube\ playlist\ videos\ in\ separate\ directory\ indexed\ by\ video\ order\ in\ a\ playlist
+$\ youtube\-dl\ \-o\ \[aq]%(playlist)s/%(playlist_index)s\ \-\ %(title)s.%(ext)s\[aq]\ https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re
+
+#\ Download\ all\ playlists\ of\ YouTube\ channel/user\ keeping\ each\ playlist\ in\ separate\ directory:
+$\ youtube\-dl\ \-o\ \[aq]%(uploader)s/%(playlist)s/%(playlist_index)s\ \-\ %(title)s.%(ext)s\[aq]\ https://www.youtube.com/user/TheLinuxFoundation/playlists
+
+#\ Download\ Udemy\ course\ keeping\ each\ chapter\ in\ separate\ directory\ under\ MyVideos\ directory\ in\ your\ home
+$\ youtube\-dl\ \-u\ user\ \-p\ password\ \-o\ \[aq]~/MyVideos/%(playlist)s/%(chapter_number)s\ \-\ %(chapter)s/%(title)s.%(ext)s\[aq]\ https://www.udemy.com/java\-tutorial/
+
+#\ Download\ entire\ series\ season\ keeping\ each\ series\ and\ each\ season\ in\ separate\ directory\ under\ C:/MyVideos
+$\ youtube\-dl\ \-o\ "C:/MyVideos/%(series)s/%(season_number)s\ \-\ %(season)s/%(episode_number)s\ \-\ %(episode)s.%(ext)s"\ http://videomore.ru/kino_v_detalayah/5_sezon/367617
+
+#\ Stream\ the\ video\ being\ downloaded\ to\ stdout
+$\ youtube\-dl\ \-o\ \-\ BaW_jenozKc
 \f[]
 .fi
 .SH FORMAT SELECTION
 .PP
-By default youtube\-dl tries to download the best quality, but sometimes
-you may want to download other format.
-The simplest case is requesting a specific format, for example
-\f[C]\-f\ 22\f[].
-You can get the list of available formats using
-\f[C]\-\-list\-formats\f[], you can also use a file extension (currently
-it supports aac, m4a, mp3, mp4, ogg, wav, webm) or the special names
-\f[C]best\f[], \f[C]bestvideo\f[], \f[C]bestaudio\f[] and
-\f[C]worst\f[].
+By default youtube\-dl tries to download the best available quality,
+i.e.
+if you want the best quality you \f[B]don\[aq]t need\f[] to pass any
+special options, youtube\-dl will guess it for you by \f[B]default\f[].
+.PP
+But sometimes you may want to download in a different format, for
+example when you are on a slow or intermittent connection.
+The key mechanism for achieving this is so called \f[I]format
+selection\f[] based on which you can explicitly specify desired format,
+select formats based on some criterion or criteria, setup precedence and
+much more.
+.PP
+The general syntax for format selection is \f[C]\-\-format\ FORMAT\f[]
+or shorter \f[C]\-f\ FORMAT\f[] where \f[C]FORMAT\f[] is a \f[I]selector
+expression\f[], i.e.
+an expression that describes format or formats you would like to
+download.
+.PP
+\f[B]tl;dr:\f[] navigate me to examples (#format-selection-examples).
+.PP
+The simplest case is requesting a specific format, for example with
+\f[C]\-f\ 22\f[] you can download the format with format code equal to
+22.
+You can get the list of available format codes for particular video
+using \f[C]\-\-list\-formats\f[] or \f[C]\-F\f[].
+Note that these format codes are extractor specific.
+.PP
+You can also use a file extension (currently \f[C]3gp\f[], \f[C]aac\f[],
+\f[C]flv\f[], \f[C]m4a\f[], \f[C]mp3\f[], \f[C]mp4\f[], \f[C]ogg\f[],
+\f[C]wav\f[], \f[C]webm\f[] are supported) to download best quality
+format of particular file extension served as a single file, e.g.
+\f[C]\-f\ webm\f[] will download best quality format with \f[C]webm\f[]
+extension served as a single file.
+.PP
+You can also use special names to select particular edge case format: \-
+\f[C]best\f[]: Select best quality format represented by single file
+with video and audio \- \f[C]worst\f[]: Select worst quality format
+represented by single file with video and audio \- \f[C]bestvideo\f[]:
+Select best quality video only format (e.g.
+DASH video), may not be available \- \f[C]worstvideo\f[]: Select worst
+quality video only format, may not be available \- \f[C]bestaudio\f[]:
+Select best quality audio only format, may not be available \-
+\f[C]worstaudio\f[]: Select worst quality audio only format, may not be
+available
+.PP
+For example, to download worst quality video only format you can use
+\f[C]\-f\ worstvideo\f[].
 .PP
 If you want to download multiple videos and they don\[aq]t have the same
 formats available, you can specify the order of preference using
-slashes, as in \f[C]\-f\ 22/17/18\f[].
-You can also filter the video results by putting a condition in
+slashes.
+Note that slash is left\-associative, i.e.
+formats on the left hand side are preferred, for example
+\f[C]\-f\ 22/17/18\f[] will download format 22 if it\[aq]s available,
+otherwise it will download format 17 if it\[aq]s available, otherwise it
+will download format 18 if it\[aq]s available, otherwise it will
+complain that no suitable formats are available for download.
+.PP
+If you want to download several formats of the same video use comma as a
+separator, e.g.
+\f[C]\-f\ 22,17,18\f[] will download all these three formats, of course
+if they are available.
+Or more sophisticated example combined with precedence feature
+\f[C]\-f\ 136/137/mp4/bestvideo,140/m4a/bestaudio\f[].
+.PP
+You can also filter the video formats by putting a condition in
 brackets, as in \f[C]\-f\ "best[height=720]"\f[] (or
 \f[C]\-f\ "[filesize>10M]"\f[]).
-This works for filesize, height, width, tbr, abr, vbr, asr, and fps and
-the comparisons <, <=, >, >=, =, != and for ext, acodec, vcodec,
-container, and protocol and the comparisons =, != .
+.PP
+The following numeric meta fields can be used with comparisons
+\f[C]<\f[], \f[C]<=\f[], \f[C]>\f[], \f[C]>=\f[], \f[C]=\f[] (equals),
+\f[C]!=\f[] (not equals): \- \f[C]filesize\f[]: The number of bytes, if
+known in advance \- \f[C]width\f[]: Width of the video, if known \-
+\f[C]height\f[]: Height of the video, if known \- \f[C]tbr\f[]: Average
+bitrate of audio and video in KBit/s \- \f[C]abr\f[]: Average audio
+bitrate in KBit/s \- \f[C]vbr\f[]: Average video bitrate in KBit/s \-
+\f[C]asr\f[]: Audio sampling rate in Hertz \- \f[C]fps\f[]: Frame rate
+.PP
+Also filtering work for comparisons \f[C]=\f[] (equals), \f[C]!=\f[]
+(not equals), \f[C]^=\f[] (begins with), \f[C]$=\f[] (ends with),
+\f[C]*=\f[] (contains) and following string meta fields: \-
+\f[C]ext\f[]: File extension \- \f[C]acodec\f[]: Name of the audio codec
+in use \- \f[C]vcodec\f[]: Name of the video codec in use \-
+\f[C]container\f[]: Name of the container format \- \f[C]protocol\f[]:
+The protocol that will be used for the actual download, lower\-case.
+\f[C]http\f[], \f[C]https\f[], \f[C]rtsp\f[], \f[C]rtmp\f[],
+\f[C]rtmpe\f[], \f[C]m3u8\f[], or \f[C]m3u8_native\f[] \-
+\f[C]format_id\f[]: A short description of the format
+.PP
+Note that none of the aforementioned meta fields are guaranteed to be
+present since this solely depends on the metadata obtained by particular
+extractor, i.e.
+the metadata offered by video hoster.
+.PP
 Formats for which the value is not known are excluded unless you put a
-question mark (?) after the operator.
+question mark (\f[C]?\f[]) after the operator.
 You can combine format filters, so
 \f[C]\-f\ "[height\ <=?\ 720][tbr>500]"\f[] selects up to 720p videos
 (or videos where the height is not known) with a bitrate of at least 500
 KBit/s.
-Use commas to download multiple formats, such as
-\f[C]\-f\ 136/137/mp4/bestvideo,140/m4a/bestaudio\f[].
+.PP
 You can merge the video and audio of two formats into a single file
 using \f[C]\-f\ <video\-format>+<audio\-format>\f[] (requires ffmpeg or
-avconv), for example \f[C]\-f\ bestvideo+bestaudio\f[].
+avconv installed), for example \f[C]\-f\ bestvideo+bestaudio\f[] will
+download best video only format, best audio only format and mux them
+together with ffmpeg/avconv.
+.PP
+Format selectors can also be grouped using parentheses, for example if
+you want to download the best mp4 and webm formats with a height lower
+than 480 you can use \f[C]\-f\ \[aq](mp4,webm)[height<480]\[aq]\f[].
 .PP
 Since the end of April 2015 and version 2015.04.26 youtube\-dl uses
 \f[C]\-f\ bestvideo+bestaudio/best\f[] as default format selection (see
-#5447, #5456).
+#5447 (https://github.com/rg3/youtube-dl/issues/5447),
+#5456 (https://github.com/rg3/youtube-dl/issues/5456)).
 If ffmpeg or avconv are installed this results in downloading
 \f[C]bestvideo\f[] and \f[C]bestaudio\f[] separately and muxing them
 together into a single file giving the best overall quality available.
-Otherwise it falls back to \f[C]best\f[] and results in downloading best
-available quality served as a single file.
+Otherwise it falls back to \f[C]best\f[] and results in downloading the
+best available quality served as a single file.
 \f[C]best\f[] is also needed for videos that don\[aq]t come from YouTube
 because they don\[aq]t provide the audio and video in two different
 files.
-If you want to only download some dash formats (for example if you are
+If you want to only download some DASH formats (for example if you are
 not interested in getting videos with a resolution higher than 1080p),
 you can add \f[C]\-f\ bestvideo[height<=?1080]+bestaudio/best\f[] to
 your configuration file.
@@ -418,15 +1271,34 @@ delivery immediately to your player and not to wait until
 .PP
 If you want to preserve the old format selection behavior (prior to
 youtube\-dl 2015.04.26), i.e.
-you want to download best available quality media served as a single
+you want to download the best available quality media served as a single
 file, you should explicitly specify your choice with \f[C]\-f\ best\f[].
 You may want to add it to the configuration file (#configuration) in
 order not to type it every time you run youtube\-dl.
+.SS Format selection examples
+.PP
+Note on Windows you may need to use double quotes instead of single.
+.IP
+.nf
+\f[C]
+#\ Download\ best\ mp4\ format\ available\ or\ any\ other\ best\ if\ no\ mp4\ available
+$\ youtube\-dl\ \-f\ \[aq]bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best\[aq]
+
+#\ Download\ best\ format\ available\ but\ not\ better\ that\ 480p
+$\ youtube\-dl\ \-f\ \[aq]bestvideo[height<=480]+bestaudio/best[height<=480]\[aq]
+
+#\ Download\ best\ video\ only\ format\ but\ no\ bigger\ that\ 50\ MB
+$\ youtube\-dl\ \-f\ \[aq]best[filesize<50M]\[aq]
+
+#\ Download\ best\ format\ available\ via\ direct\ link\ over\ HTTP/HTTPS\ protocol
+$\ youtube\-dl\ \-f\ \[aq](bestvideo+bestaudio/best)[protocol^=http]\[aq]
+\f[]
+.fi
 .SH VIDEO SELECTION
 .PP
 Videos can be filtered by their upload date using the options
-\f[C]\-\-date\f[], \f[C]\-\-datebefore\f[] or \f[C]\-\-dateafter\f[],
-they accept dates in two formats:
+\f[C]\-\-date\f[], \f[C]\-\-datebefore\f[] or \f[C]\-\-dateafter\f[].
+They accept dates in two formats:
 .IP \[bu] 2
 Absolute dates: Dates in the format \f[C]YYYYMMDD\f[].
 .IP \[bu] 2
@@ -443,7 +1315,7 @@ $\ youtube\-dl\ \-\-dateafter\ now\-6months
 #\ Download\ only\ the\ videos\ uploaded\ on\ January\ 1,\ 1970
 $\ youtube\-dl\ \-\-date\ 19700101
 
-$\ #\ will\ only\ download\ the\ videos\ uploaded\ in\ the\ 200x\ decade
+$\ #\ Download\ only\ the\ videos\ uploaded\ in\ the\ 200x\ decade
 $\ youtube\-dl\ \-\-dateafter\ 20000101\ \-\-datebefore\ 20091231
 \f[]
 .fi
@@ -466,7 +1338,7 @@ As a rule of thumb, youtube\-dl releases at least once a month, and
 often weekly or even daily.
 Simply go to http://yt\-dl.org/ to find out the current version.
 Unfortunately, there is nothing we youtube\-dl developers can do if your
-distributions serves a really outdated version.
+distribution serves a really outdated version.
 You can (and should) complain to your distribution in their bugtracker
 or support forum.
 .PP
@@ -493,6 +1365,10 @@ hash\ \-r
 .PP
 Again, from then on you\[aq]ll be able to update with
 \f[C]sudo\ youtube\-dl\ \-U\f[].
+.SS youtube\-dl is extremely slow to start on Windows
+.PP
+Add a file exclusion for \f[C]youtube\-dl.exe\f[] in Windows Defender
+settings.
 .SS I\[aq]m getting an error
 \f[C]Unable\ to\ extract\ OpenGraph\ title\f[] on YouTube playlists
 .PP
@@ -511,6 +1387,14 @@ guys (mailto:ubuntu-motu@lists.ubuntu.com?subject=outdated%20version%20of%20yout
 \- all they have to do is update the package to a somewhat recent
 version.
 See above for a way to update.
+.SS I\[aq]m getting an error when trying to use output template:
+\f[C]error:\ using\ output\ template\ conflicts\ with\ using\ title,\ video\ ID\ or\ auto\ number\f[]
+.PP
+Make sure you are not using \f[C]\-o\f[] with any of these options
+\f[C]\-t\f[], \f[C]\-\-title\f[], \f[C]\-\-id\f[], \f[C]\-A\f[] or
+\f[C]\-\-auto\-number\f[] set in command line or in a configuration
+file.
+Remove the latter if any.
 .SS Do I always have to pass \f[C]\-citw\f[]?
 .PP
 By default, youtube\-dl intends to have the best options (incidentally,
@@ -520,7 +1404,7 @@ Therefore, it is unnecessary and sometimes harmful to copy long option
 strings from webpages.
 In particular, the only option out of \f[C]\-citw\f[] that is regularly
 useful is \f[C]\-i\f[].
-.SS Can you please put the \-b option back?
+.SS Can you please put the \f[C]\-b\f[] option back?
 .PP
 Most people asking this question are not aware that youtube\-dl now
 defaults to downloading the highest available quality as reported by
@@ -539,12 +1423,27 @@ We\[aq]re considering to provide a way to let you solve the
 CAPTCHA (https://github.com/rg3/youtube-dl/issues/154), but at the
 moment, your best course of action is pointing a webbrowser to the
 youtube URL, solving the CAPTCHA, and restart youtube\-dl.
+.SS Do I need any other programs?
+.PP
+youtube\-dl works fine on its own on most sites.
+However, if you want to convert video/audio, you\[aq]ll need
+avconv (https://libav.org/) or ffmpeg (https://www.ffmpeg.org/).
+On some sites \- most notably YouTube \- videos can be retrieved in a
+higher quality format without sound.
+youtube\-dl will detect whether avconv/ffmpeg is present and
+automatically pick the best option.
+.PP
+Videos or video formats streamed via RTMP protocol can only be
+downloaded when rtmpdump (https://rtmpdump.mplayerhq.hu/) is installed.
+Downloading MMS and RTSP videos requires either
+mplayer (http://mplayerhq.hu/) or mpv (https://mpv.io/) to be installed.
 .SS I have downloaded a video but how can I play it?
 .PP
 Once the video is fully downloaded, use any video player, such as
-vlc (http://www.videolan.org) or mplayer (http://www.mplayerhq.hu/).
-.SS I extracted a video URL with \-g, but it does not play on another
-machine / in my webbrowser.
+mpv (https://mpv.io/), vlc (http://www.videolan.org) or
+mplayer (http://www.mplayerhq.hu/).
+.SS I extracted a video URL with \f[C]\-g\f[], but it does not play on
+another machine / in my webbrowser.
 .PP
 It depends a lot on the service.
 In many cases, requests for the video (to download/play it) must come
@@ -562,7 +1461,8 @@ exception rather than the rule.
 .PP
 Please bear in mind that some URL protocols are \f[B]not\f[] supported
 by browsers out of the box, including RTMP.
-If you are using \-g, your own downloader must support these as well.
+If you are using \f[C]\-g\f[], your own downloader must support these as
+well.
 .PP
 If you want to play the video on a machine that is not running
 youtube\-dl, you can relay the video content from the machine that runs
@@ -586,7 +1486,7 @@ output \f[C][1]\ 2839\f[] or
 .PP
 That\[aq]s actually the output from your shell.
 Since ampersand is one of the special shell characters it\[aq]s
-interpreted by shell preventing you from passing the whole URL to
+interpreted by the shell preventing you from passing the whole URL to
 youtube\-dl.
 To disable your shell from interpreting the ampersands (or any other
 special characters) you have to either put the whole URL in quotes or
@@ -634,17 +1534,18 @@ means you\[aq]re using an outdated version of Python.
 Please update to Python 2.6 or 2.7.
 .SS What is this binary file? Where has the code gone?
 .PP
-Since June 2012 (#342) youtube\-dl is packed as an executable zipfile,
-simply unzip it (might need renaming to \f[C]youtube\-dl.zip\f[] first
-on some systems) or clone the git repository, as laid out above.
+Since June 2012 (#342 (https://github.com/rg3/youtube-dl/issues/342))
+youtube\-dl is packed as an executable zipfile, simply unzip it (might
+need renaming to \f[C]youtube\-dl.zip\f[] first on some systems) or
+clone the git repository, as laid out above.
 If you modify the code, you can run it by executing the
 \f[C]__main__.py\f[] file.
 To recompile the executable, run \f[C]make\ youtube\-dl\f[].
-.SS The exe throws a \f[I]Runtime error from Visual C++\f[]
+.SS The exe throws an error due to missing \f[C]MSVCR100.dll\f[]
 .PP
-To run the exe you need to install first the Microsoft Visual C++ 2008
-Redistributable
-Package (http://www.microsoft.com/en-us/download/details.aspx?id=29).
+To run the exe you need to install first the Microsoft Visual C++ 2010
+Redistributable Package
+(x86) (https://www.microsoft.com/en-US/download/details.aspx?id=5555).
 .SS On Windows, how should I set up ffmpeg and youtube\-dl? Where should
 I put the exe files?
 .PP
@@ -669,7 +1570,7 @@ Use the \f[C]\-o\f[] to specify an output template (#output-template),
 for example \f[C]\-o\ "/home/user/videos/%(title)s\-%(id)s.%(ext)s"\f[].
 If you want this for all of your downloads, put the option into your
 configuration file (#configuration).
-.SS How do I download a video starting with a \f[C]\-\f[] ?
+.SS How do I download a video starting with a \f[C]\-\f[]?
 .PP
 Either prepend \f[C]http://www.youtube.com/watch?v=\f[] or separate the
 ID from the options with \f[C]\-\-\f[]:
@@ -680,6 +1581,28 @@ youtube\-dl\ \-\-\ \-wNyEUrxzFU
 youtube\-dl\ "http://www.youtube.com/watch?v=\-wNyEUrxzFU"
 \f[]
 .fi
+.SS How do I pass cookies to youtube\-dl?
+.PP
+Use the \f[C]\-\-cookies\f[] option, for example
+\f[C]\-\-cookies\ /path/to/cookies/file.txt\f[].
+Note that the cookies file must be in Mozilla/Netscape format and the
+first line of the cookies file must be either
+\f[C]#\ HTTP\ Cookie\ File\f[] or
+\f[C]#\ Netscape\ HTTP\ Cookie\ File\f[].
+Make sure you have correct newline
+format (https://en.wikipedia.org/wiki/Newline) in the cookies file and
+convert newlines if necessary to correspond with your OS, namely
+\f[C]CRLF\f[] (\f[C]\\r\\n\f[]) for Windows, \f[C]LF\f[] (\f[C]\\n\f[])
+for Linux and \f[C]CR\f[] (\f[C]\\r\f[]) for Mac OS.
+\f[C]HTTP\ Error\ 400:\ Bad\ Request\f[] when using \f[C]\-\-cookies\f[]
+is a good sign of invalid newline format.
+.PP
+Passing cookies to youtube\-dl is a good way to workaround login when a
+particular extractor does not implement it explicitly.
+Another use case is working around
+CAPTCHA (https://en.wikipedia.org/wiki/CAPTCHA) some websites require
+you to solve in particular cases in order to get access (e.g.
+YouTube, CloudFlare).
 .SS Can you add support for this anime video site, or site which shows
 current movies for free?
 .PP
@@ -761,6 +1684,27 @@ to a video or unsupported.
 You can find out which by examining the output (if you run youtube\-dl
 on the console) or catching an \f[C]UnsupportedError\f[] exception if
 you run it from a Python program.
+.SH Why do I need to go through that much red tape when filing bugs?
+.PP
+Before we had the issue template, despite our extensive bug reporting
+instructions (#bugs), about 80% of the issue reports we got were
+useless, for instance because people used ancient versions hundreds of
+releases old, because of simple syntactic errors (not in youtube\-dl but
+in general shell usage), because the problem was alrady reported
+multiple times before, because people did not actually read an error
+message, even if it said "please install ffmpeg", because people did not
+mention the URL they were trying to download and many more simple,
+easy\-to\-avoid problems, many of whom were totally unrelated to
+youtube\-dl.
+.PP
+youtube\-dl is an open\-source project manned by too few volunteers, so
+we\[aq]d rather spend time fixing bugs where we are certain none of
+those simple problems apply, and where we can be reasonably confident to
+be able to reproduce the issue without asking the reporter repeatedly.
+As such, the output of \f[C]youtube\-dl\ \-v\ YOUR_URL_HERE\f[] is
+really all that\[aq]s required to file an issue.
+The issue template also guides you through some basic steps you can do,
+such as checking that your version of youtube\-dl is current.
 .SH DEVELOPER INSTRUCTIONS
 .PP
 Most users do not need to build youtube\-dl and can download the
@@ -792,7 +1736,7 @@ If you want to create a build of youtube\-dl yourself, you\[aq]ll need
 .IP \[bu] 2
 python
 .IP \[bu] 2
-make
+make (both GNU make and BSD make are supported)
 .IP \[bu] 2
 pandoc
 .IP \[bu] 2
@@ -801,8 +1745,15 @@ zip
 nosetests
 .SS Adding support for a new site
 .PP
-If you want to add support for a new site, you can follow this quick
-list (assuming your service is called \f[C]yourextractor\f[]):
+If you want to add support for a new site, first of all \f[B]make
+sure\f[] this site is \f[B]not dedicated to copyright
+infringement (#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)\f[].
+youtube\-dl does \f[B]not support\f[] such sites thus pull requests
+adding support for them \f[B]will be rejected\f[].
+.PP
+After you have ensured this site is distributing it\[aq]s content
+legally, you can follow this quick list (assuming your service is called
+\f[C]yourextractor\f[]):
 .IP " 1." 4
 Fork this repository (https://github.com/rg3/youtube-dl/fork)
 .IP " 2." 4
@@ -847,12 +1798,13 @@ class\ YourExtractorIE(InfoExtractor):
 \ \ \ \ \ \ \ \ webpage\ =\ self._download_webpage(url,\ video_id)
 
 \ \ \ \ \ \ \ \ #\ TODO\ more\ code\ goes\ here,\ for\ example\ ...
-\ \ \ \ \ \ \ \ title\ =\ self._html_search_regex(r\[aq]<h1>(.*?)</h1>\[aq],\ webpage,\ \[aq]title\[aq])
+\ \ \ \ \ \ \ \ title\ =\ self._html_search_regex(r\[aq]<h1>(.+?)</h1>\[aq],\ webpage,\ \[aq]title\[aq])
 
 \ \ \ \ \ \ \ \ return\ {
 \ \ \ \ \ \ \ \ \ \ \ \ \[aq]id\[aq]:\ video_id,
 \ \ \ \ \ \ \ \ \ \ \ \ \[aq]title\[aq]:\ title,
 \ \ \ \ \ \ \ \ \ \ \ \ \[aq]description\[aq]:\ self._og_search_description(webpage),
+\ \ \ \ \ \ \ \ \ \ \ \ \[aq]uploader\[aq]:\ self._search_regex(r\[aq]<div[^>]+id="uploader"[^>]*>([^<]+)<\[aq],\ webpage,\ \[aq]uploader\[aq],\ fatal=False),
 \ \ \ \ \ \ \ \ \ \ \ \ #\ TODO\ more\ properties\ (see\ youtube_dl/extractor/common.py)
 \ \ \ \ \ \ \ \ }
 \f[]
@@ -860,7 +1812,7 @@ class\ YourExtractorIE(InfoExtractor):
 .RE
 .IP " 5." 4
 Add an import in
-\f[C]youtube_dl/extractor/__init__.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/__init__.py).
+\f[C]youtube_dl/extractor/extractors.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 .IP " 6." 4
 Run
 \f[C]python\ test/test_download.py\ TestDownload.test_YourExtractor\f[].
@@ -868,21 +1820,43 @@ This \f[I]should fail\f[] at first, but you can continually re\-run it
 until you\[aq]re done.
 If you decide to add more than one test, then rename \f[C]_TEST\f[] to
 \f[C]_TESTS\f[] and make it into a list of dictionaries.
-The tests will be then be named
-\f[C]TestDownload.test_YourExtractor\f[],
+The tests will then be named \f[C]TestDownload.test_YourExtractor\f[],
 \f[C]TestDownload.test_YourExtractor_1\f[],
 \f[C]TestDownload.test_YourExtractor_2\f[], etc.
 .IP " 7." 4
 Have a look at
-\f[C]youtube_dl/common/extractor/common.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py)
+\f[C]youtube_dl/extractor/common.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py)
 for possible helper methods and a detailed description of what your
-extractor should
-return (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py#L38).
+extractor should and may
+return (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py#L74-L252).
 Add tests and code for as many as you want.
 .IP " 8." 4
-If you can, check the code with
-flake8 (https://pypi.python.org/pypi/flake8).
+Keep in mind that the only mandatory fields in info dict for successful
+extraction process are \f[C]id\f[], \f[C]title\f[] and either
+\f[C]url\f[] or \f[C]formats\f[], i.e.
+these are the critical data the extraction does not make any sense
+without.
+This means that any
+field (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/common.py#L148-L252)
+apart from aforementioned mandatory ones should be treated \f[B]as
+optional\f[] and extraction should be \f[B]tolerate\f[] to situations
+when sources for these fields can potentially be unavailable (even if
+they always available at the moment) and \f[B]future\-proof\f[] in order
+not to break the extraction of general purpose mandatory fields.
+For example, if you have some intermediate dict \f[C]meta\f[] that is a
+source of metadata and it has a key \f[C]summary\f[] that you want to
+extract and put into resulting info dict as \f[C]description\f[], you
+should be ready that this key may be missing from the \f[C]meta\f[]
+dict, i.e.
+you should extract it as \f[C]meta.get(\[aq]summary\[aq])\f[] and not
+\f[C]meta[\[aq]summary\[aq]]\f[].
+Similarly, you should pass \f[C]fatal=False\f[] when extracting data
+from a webpage with \f[C]_search_regex/_html_search_regex\f[].
 .IP " 9." 4
+Check the code with flake8 (https://pypi.python.org/pypi/flake8).
+Also make sure your code works under all Python (http://www.python.org/)
+versions claimed supported by youtube\-dl, namely 2.6, 2.7, and 3.2+.
+.IP "10." 4
 When the tests pass, add (http://git-scm.com/docs/git-add) the new files
 and commit (http://git-scm.com/docs/git-commit) them and
 push (http://git-scm.com/docs/git-push) the result, like this:
@@ -890,14 +1864,14 @@ push (http://git-scm.com/docs/git-push) the result, like this:
 .IP
 .nf
 \f[C]
-$\ git\ add\ youtube_dl/extractor/__init__.py
+$\ git\ add\ youtube_dl/extractor/extractors.py
 $\ git\ add\ youtube_dl/extractor/yourextractor.py
 $\ git\ commit\ \-m\ \[aq][yourextractor]\ Add\ new\ extractor\[aq]
 $\ git\ push\ origin\ yourextractor
 \f[]
 .fi
 .RE
-.IP "10." 4
+.IP "11." 4
 Finally, create a pull
 request (https://help.github.com/articles/creating-a-pull-request).
 We\[aq]ll then review and merge it.
@@ -925,8 +1899,8 @@ with\ youtube_dl.YoutubeDL(ydl_opts)\ as\ ydl:
 .fi
 .PP
 Most likely, you\[aq]ll want to use various options.
-For a list of what can be done, have a look at
-youtube_dl/YoutubeDL.py (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/YoutubeDL.py#L69).
+For a list of options available, have a look at
+\f[C]youtube_dl/YoutubeDL.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/YoutubeDL.py#L128-L278).
 For a start, if you want to intercept youtube\-dl\[aq]s output, set a
 \f[C]logger\f[] object.
 .PP
@@ -973,16 +1947,41 @@ with\ youtube_dl.YoutubeDL(ydl_opts)\ as\ ydl:
 .SH BUGS
 .PP
 Bugs and suggestions should be reported at:
-<https://github.com/rg3/youtube-dl/issues> .
+<https://github.com/rg3/youtube-dl/issues>.
 Unless you were prompted so or there is another pertinent reason (e.g.
 GitHub fails to accept the bug report), please do not send bug reports
 via personal email.
-For discussions, join us in the irc channel #youtube\-dl on freenode.
+For discussions, join us in the IRC channel
+#youtube\-dl (irc://chat.freenode.net/#youtube-dl) on freenode
+(webchat (http://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
 .PP
 \f[B]Please include the full output of youtube\-dl when run with
-\f[C]\-v\f[]\f[].
+\f[C]\-v\f[]\f[], i.e.
+\f[B]add\f[] \f[C]\-v\f[] flag to \f[B]your command line\f[], copy the
+\f[B]whole\f[] output and post it in the issue body wrapped in ``` for
+better formatting.
+It should look similar to this:
+.IP
+.nf
+\f[C]
+$\ youtube\-dl\ \-v\ <your\ command\ line>
+[debug]\ System\ config:\ []
+[debug]\ User\ config:\ []
+[debug]\ Command\-line\ args:\ [u\[aq]\-v\[aq],\ u\[aq]http://www.youtube.com/watch?v=BaW_jenozKcj\[aq]]
+[debug]\ Encodings:\ locale\ cp1251,\ fs\ mbcs,\ out\ cp866,\ pref\ cp1251
+[debug]\ youtube\-dl\ version\ 2015.12.06
+[debug]\ Git\ HEAD:\ 135392e
+[debug]\ Python\ version\ 2.6.6\ \-\ Windows\-2003Server\-5.2.3790\-SP2
+[debug]\ exe\ versions:\ ffmpeg\ N\-75573\-g1d0487f,\ ffprobe\ N\-75573\-g1d0487f,\ rtmpdump\ 2.4
+[debug]\ Proxy\ map:\ {}
+\&...
+\f[]
+.fi
+.PP
+\f[B]Do not post screenshots of verbose log only plain text is
+acceptable.\f[]
 .PP
-The output (including the first lines) contain important debugging
+The output (including the first lines) contains important debugging
 information.
 Issues without the full output are often not reproducible and therefore
 do not get solved in short order, if ever.
@@ -1012,17 +2011,18 @@ If your report is shorter than two lines, it is almost certainly missing
 some of these, which makes it hard for us to respond to it.
 We\[aq]re often too polite to close the issue outright, but the missing
 info makes misinterpretation likely.
-As a commiter myself, I often get frustrated by these issues, since the
+As a committer myself, I often get frustrated by these issues, since the
 only possible way for me to move forward on them is to ask for
 clarification over and over.
 .PP
 For bug reports, this means that your report should contain the
-\f[I]complete\f[] output of youtube\-dl when called with the \-v flag.
+\f[I]complete\f[] output of youtube\-dl when called with the
+\f[C]\-v\f[] flag.
 The error message you get for (most) bugs even says so, but you would
 not believe how many of our bug reports do not contain this information.
 .PP
 If your server has multiple IPs or you suspect censorship, adding
-\-\-call\-home may be a good idea to get more diagnostics.
+\f[C]\-\-call\-home\f[] may be a good idea to get more diagnostics.
 If the error is \f[C]ERROR:\ Unable\ to\ extract\ ...\f[] and you cannot
 reproduce it from multiple countries, add \f[C]\-\-dump\-pages\f[]
 (warning: this will yield a rather large output, redirect it to the file
@@ -1032,14 +2032,14 @@ command\-line) or upload the \f[C]\&.dump\f[] files you get when you add
 .PP
 \f[B]Site support requests must contain an example URL\f[].
 An example URL is a URL you might want to download, like
-http://www.youtube.com/watch?v=BaW_jenozKc .
+\f[C]http://www.youtube.com/watch?v=BaW_jenozKc\f[].
 There should be an obvious video present.
 Except under very special circumstances, the main page of a video
 service (e.g.
-http://www.youtube.com/ ) is \f[I]not\f[] an example URL.
+\f[C]http://www.youtube.com/\f[]) is \f[I]not\f[] an example URL.
 .SS Are you using the latest version?
 .PP
-Before reporting any issue, type youtube\-dl \-U.
+Before reporting any issue, type \f[C]youtube\-dl\ \-U\f[].
 This should report that you\[aq]re up\-to\-date.
 About 20% of the reports we receive are already fixed, but people are
 using outdated versions.
@@ -1048,8 +2048,9 @@ This goes for feature requests as well.
 .PP
 Make sure that someone has not already opened the issue you\[aq]re
 trying to open.
-Search at the top of the window or at
-https://github.com/rg3/youtube\-dl/search?type=Issues .
+Search at the top of the window or browse the GitHub
+Issues (https://github.com/rg3/youtube-dl/search?type=Issues) of this
+repository.
 If there is an issue, feel free to write something along the lines of
 "This affects me as well, with version 2015.01.01.
 Here is some more information on the issue: ...".
@@ -1126,6 +2127,6 @@ bug.
 .PP
 youtube\-dl is released into the public domain by the copyright holders.
 .PP
-This README file was originally written by Daniel Bolton
-(<https://github.com/dbbolton>) and is likewise released into the public
-domain.
+This README file was originally written by Daniel
+Bolton (https://github.com/dbbolton) and is likewise released into the
+public domain.
diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild
index 085b23a814..6eeaf53600 100644
--- a/network/youtube-dl/youtube-dl.SlackBuild
+++ b/network/youtube-dl/youtube-dl.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for youtube-dl
 # Copyright 2010 GPLeo <gpleomail@gmail.com>
 # Copyright 2010-2012 byteframe <byteframe@gmail.com>
-# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=youtube-dl
-VERSION=${VERSION:-2015.07.28}
+VERSION=${VERSION:-2016.06.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,6 +77,11 @@ patch -p1 < $CWD/setup.patch
 make
 python setup.py install --root=$PKG
 
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+    python3 setup.py install --root=$PKG
+fi
+
 # enable bash and fish completion file
 chmod 0755 $PKG/etc/bash_completion.d/${PRGNAM}.bash-completion
 chmod 0755 $PKG/etc/fish/completions/${PRGNAM}.fish
diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info
index bc01dc1c6d..d8c17134ac 100644
--- a/network/youtube-dl/youtube-dl.info
+++ b/network/youtube-dl/youtube-dl.info
@@ -1,8 +1,8 @@
 PRGNAM="youtube-dl"
-VERSION="2015.07.28"
+VERSION="2016.06.26"
 HOMEPAGE="https://rg3.github.io/youtube-dl"
-DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.07.28.tar.gz"
-MD5SUM="3436d7889391b3808fc00ec91b5e520a"
+DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.06.26.tar.gz"
+MD5SUM="9203858d68c45620e00e0ef8aef8d325"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/youtube-upload/README b/network/youtube-upload/README
new file mode 100644
index 0000000000..fae729bbbe
--- /dev/null
+++ b/network/youtube-upload/README
@@ -0,0 +1,2 @@
+Youtube-upload is a command line Python script that uploads videos
+to Youtube using the YouTube APIv3.
\ No newline at end of file
diff --git a/network/youtube-upload/slack-desc b/network/youtube-upload/slack-desc
new file mode 100644
index 0000000000..e17eeedb0d
--- /dev/null
+++ b/network/youtube-upload/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+youtube-upload: youtube-upload (YouTube command-line upload utility)
+youtube-upload:
+youtube-upload: Youtube-upload is a command line Python script that uploads videos
+youtube-upload: to Youtube using the YouTube APIv3.
+youtube-upload:
+youtube-upload: Homepage: https://github.com/tokland/youtube-upload/
+youtube-upload:
+youtube-upload:
+youtube-upload:
+youtube-upload:
+youtube-upload:
diff --git a/network/youtube-upload/youtube-upload.SlackBuild b/network/youtube-upload/youtube-upload.SlackBuild
new file mode 100644
index 0000000000..261103bfa8
--- /dev/null
+++ b/network/youtube-upload/youtube-upload.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for "youtube-upload".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=youtube-upload
+VERSION=${VERSION:-0.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root $PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/youtube-upload/youtube-upload.info b/network/youtube-upload/youtube-upload.info
new file mode 100644
index 0000000000..7706a92636
--- /dev/null
+++ b/network/youtube-upload/youtube-upload.info
@@ -0,0 +1,10 @@
+PRGNAM="youtube-upload"
+VERSION="0.8.0"
+HOMEPAGE="https://github.com/tokland/youtube-upload/"
+DOWNLOAD="https://github.com/tokland/youtube-upload/archive/0.8.0.tar.gz"
+MD5SUM="71c7c31f340b3b3ae30ffbe8dd23b0c1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="progressbar google-api-python-client six"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/yturl/README b/network/yturl/README
index d060345c51..cbf181691a 100644
--- a/network/yturl/README
+++ b/network/yturl/README
@@ -3,4 +3,4 @@ yturl (get direct URLs to YouTube videos)
 yturl is a simple command-line utility written in Python. It converts
 youtube URLs or video IDs into directly-watchable URLs. Example use:
 
-mplayer "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
+mpv "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
diff --git a/network/yturl/slack-desc b/network/yturl/slack-desc
index b291dcaf58..e02591739e 100644
--- a/network/yturl/slack-desc
+++ b/network/yturl/slack-desc
@@ -11,7 +11,7 @@ yturl:
 yturl: yturl is a simple command-line utility written in Python. It converts
 yturl: youtube URLs or video IDs into directly-watchable URLs. Example use:
 yturl:
-yturl: mplayer "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
+yturl: mpv "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
 yturl:
 yturl:
 yturl:
diff --git a/network/yturl/yturl.1 b/network/yturl/yturl.1
index 6201f0f820..fe3c5eb244 100644
--- a/network/yturl/yturl.1
+++ b/network/yturl/yturl.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "YTURL 1"
-.TH YTURL 1 "2015-01-20" "1.17.0" "SlackBuilds.org"
+.TH YTURL 1 "2015-09-10" "1.20.0" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -145,6 +145,30 @@ yturl \- Get direct URLs to YouTube videos.
 yturl [\-h] [\-q \s-1QUALITY\s0] videoID/url
 .PP
 videoID/url is a YouTube url or bare video \s-1ID.\s0
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+By default, yturl prints the media \s-1URL\s0 to standard output.
+.PP
+.Vb 3
+\&    $ yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq
+\&    Using itag 43.
+\&    http://r2\-\-\-sn\-uphxqvujvh\-30al.googlevideo.com/videoplayback?source=[...]
+.Ve
+.PP
+This means that you can do something like the following to watch it in
+mpv:
+.PP
+.Vb 1
+\&    $ mpv "$(yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq)"
+.Ve
+.PP
+(also works with vlc, but for some reason not with mplayer)
+.PP
+Or something like the following to download it (using curl):
+.PP
+.Vb 1
+\&    $ curl \-Lo bill "$(yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq)"
+.Ve
 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .IP "\-h, \-\-help" 4
diff --git a/network/yturl/yturl.SlackBuild b/network/yturl/yturl.SlackBuild
index 84795ef6ee..9997f9d97e 100644
--- a/network/yturl/yturl.SlackBuild
+++ b/network/yturl/yturl.SlackBuild
@@ -17,18 +17,16 @@
 # Use "python setup.py" since upstream has started requiring it.
 # Get rid of unused SLKCFLAGS and LIBDIRSUFFIX variables.
 
+# 20150910 bkw: upgrade to 1.20.0.
+# ARCH=noarch, there's no object code in the package.
+# Add DESCRIPTION section to man page.
+
 PRGNAM=yturl
-VERSION=${VERSION:-1.17.0}
+VERSION=${VERSION:-1.20.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+ARCH=noarch
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -56,7 +54,7 @@ mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md LICENSE.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/yturl/yturl.info b/network/yturl/yturl.info
index 8a845fd0ff..128cf5a260 100644
--- a/network/yturl/yturl.info
+++ b/network/yturl/yturl.info
@@ -1,8 +1,8 @@
 PRGNAM="yturl"
-VERSION="1.17.0"
+VERSION="1.20.0"
 HOMEPAGE="https://github.com/cdown/yturl"
-DOWNLOAD="https://github.com/cdown/yturl/archive/1.17.0.tar.gz"
-MD5SUM="99c6c66e01ca25a47af229f8fb0e8bae"
+DOWNLOAD="https://github.com/cdown/yturl/archive/1.20.0.tar.gz"
+MD5SUM="46e3328a9e6c754b8bd2f8b5cf21c1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/yturl/yturl.pod b/network/yturl/yturl.pod
index b1f75a1a4b..51a47b4a19 100644
--- a/network/yturl/yturl.pod
+++ b/network/yturl/yturl.pod
@@ -1,5 +1,5 @@
 # POD source for yturl man page. Convert with:
-# pod2man --stderr -s1 -cSlackBuilds.org -r1.17.0 yturl.pod > yturl.1
+# pod2man --stderr -s1 -cSlackBuilds.org -r1.20.0 yturl.pod > yturl.1
 
 =pod
 
@@ -13,6 +13,25 @@ yturl [-h] [-q QUALITY] videoID/url
 
 videoID/url is a YouTube url or bare video ID.
 
+=head1 DESCRIPTION
+
+By default, yturl prints the media URL to standard output.
+
+    $ yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ'
+    Using itag 43.
+    http://r2---sn-uphxqvujvh-30al.googlevideo.com/videoplayback?source=[...]
+
+This means that you can do something like the following to watch it in
+mpv:
+
+    $ mpv "$(yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ')"
+
+(also works with vlc, but for some reason not with mplayer)
+
+Or something like the following to download it (using curl):
+
+    $ curl -Lo bill "$(yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ')"
+
 =head1 OPTIONS
 
 =over 4
diff --git a/network/zmap/zmap.SlackBuild b/network/zmap/zmap.SlackBuild
index a65b5270a6..82c1713eea 100644
--- a/network/zmap/zmap.SlackBuild
+++ b/network/zmap/zmap.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zmap
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|install(SCRIPT InstallConfFiles.cmake)|#install(SCRIPT InstallConfFiles.cmake)|" CMakeLists.txt
+
 mkdir -p build
 cd build
   cmake \
@@ -77,7 +79,7 @@ cd build
     -DENABLE_DEVELOPMENT=OFF \
     -DWITH_JSON=ON \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
@@ -89,11 +91,12 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 rm -rf $PKG/usr/share
 
-mv $PKG/etc/zmap/zmap.conf $PKG/etc/zmap/zmap.conf.new
-mv $PKG/etc/zmap/blacklist.conf $PKG/etc/zmap/blacklist.conf.new
+mkdir -p $PKG/etc/zmap/
+cp conf/zmap.conf $PKG/etc/zmap/zmap.conf.new
+cp conf/blacklist.conf $PKG/etc/zmap/blacklist.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/zmap/zmap.info b/network/zmap/zmap.info
index 58acf59d72..961d392ced 100644
--- a/network/zmap/zmap.info
+++ b/network/zmap/zmap.info
@@ -1,8 +1,8 @@
 PRGNAM="zmap"
-VERSION="1.2.1"
+VERSION="2.1.0"
 HOMEPAGE="https://zmap.io"
-DOWNLOAD="https://github.com/zmap/zmap/archive/v1.2.1.tar.gz"
-MD5SUM="3e740b54c88c29bb03494b986f440b51"
+DOWNLOAD="https://github.com/zmap/zmap/archive/v2.1.0.tar.gz"
+MD5SUM="0e6b9b0628eb1d3360fbd9ea56e36693"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="byacc gengetopt json-c"
diff --git a/network/znc/slack-desc b/network/znc/slack-desc
index 297e8f7176..e81f779876 100644
--- a/network/znc/slack-desc
+++ b/network/znc/slack-desc
@@ -11,9 +11,9 @@ znc:
 znc: ZNC will remain connected to an IPv4 or IPv6 IRC server even while you
 znc: are offline. You can reattach your client at a later time and catch up
 znc: with what happened while you were gone via the history buffer. You can
-znc: add additional users under one running process, which is useful for
-znc: public shells that limit background processes. ZNC also supports the
-znc: dynamic loading of C++ and Perl modules.
+znc: add additional users under one running process, useful for public
+znc: shells that limit background processes. ZNC also supports the dynamic
+znc: loading of C++ and Perl modules.
 znc:
-znc: Homepage: http://en.znc.in/wiki/ZNC
+znc: Homepage: http://wiki.znc.in/ZNC
 znc:
diff --git a/network/znc/znc.SlackBuild b/network/znc/znc.SlackBuild
index b192ab18b1..02ae5b7d00 100644
--- a/network/znc/znc.SlackBuild
+++ b/network/znc/znc.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=znc
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 if [ "$WITH_SSL" != "yes" ]; then
   do_openssl="--disable-openssl"
diff --git a/network/znc/znc.info b/network/znc/znc.info
index 6c1ed0287e..8666fa8d1f 100644
--- a/network/znc/znc.info
+++ b/network/znc/znc.info
@@ -1,8 +1,8 @@
 PRGNAM="znc"
-VERSION="1.2"
+VERSION="1.6.1"
 HOMEPAGE="http://wiki.znc.in/ZNC"
-DOWNLOAD="http://znc.in/releases/archive/znc-1.2.tar.gz"
-MD5SUM="ef18e5402a82cc3fcab5c2ac5c2e6f3b"
+DOWNLOAD="http://znc.in/releases/znc-1.6.1.tar.gz"
+MD5SUM="8e29289e6229b6d2473de202170745ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/CherryTree/CherryTree.SlackBuild b/office/CherryTree/CherryTree.SlackBuild
index 4889a29588..17d64d5796 100644
--- a/office/CherryTree/CherryTree.SlackBuild
+++ b/office/CherryTree/CherryTree.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=CherryTree
 SRCNAM=${PRGNAM,,}
-VERSION=${VERSION:-0.35.9}
+VERSION=${VERSION:-0.36.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/CherryTree/CherryTree.info b/office/CherryTree/CherryTree.info
index e5e24cd81e..66bbab80f0 100644
--- a/office/CherryTree/CherryTree.info
+++ b/office/CherryTree/CherryTree.info
@@ -1,8 +1,8 @@
 PRGNAM="CherryTree"
-VERSION="0.35.9"
+VERSION="0.36.1"
 HOMEPAGE="http://www.giuspen.com/cherrytree"
-DOWNLOAD="http://www.giuspen.com/software/cherrytree-0.35.9.tar.xz"
-MD5SUM="89123100a960cfc9bfe999b953e6f525"
+DOWNLOAD="http://www.giuspen.com/software/cherrytree-0.36.1.tar.xz"
+MD5SUM="58df263c22f64afb189dc6ac099bdd1a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygtksourceview"
diff --git a/office/JabRef/JabRef.info b/office/JabRef/JabRef.info
index e5629a9bac..362c617c2a 100644
--- a/office/JabRef/JabRef.info
+++ b/office/JabRef/JabRef.info
@@ -1,7 +1,7 @@
 PRGNAM="JabRef"
 VERSION="2.9.2"
 HOMEPAGE="http://jabref.sourceforge.net/"
-DOWNLOAD="downloads.sourceforge.net/project/jabref/jabref/2.9.2/JabRef-2.9.2.jar"
+DOWNLOAD="http://downloads.sourceforge.net/project/jabref/jabref/2.9.2/JabRef-2.9.2.jar"
 MD5SUM="62575e9f6921c904fe8c2e4be2a34081"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/LanguageTool/LanguageTool.SlackBuild b/office/LanguageTool/LanguageTool.SlackBuild
index b7c9a6be51..4dd24e523b 100644
--- a/office/LanguageTool/LanguageTool.SlackBuild
+++ b/office/LanguageTool/LanguageTool.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=LanguageTool
-VERSION=${VERSION:-3.0}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/LanguageTool/LanguageTool.info b/office/LanguageTool/LanguageTool.info
index eaa68f0318..395899dcf9 100644
--- a/office/LanguageTool/LanguageTool.info
+++ b/office/LanguageTool/LanguageTool.info
@@ -1,8 +1,8 @@
 PRGNAM="LanguageTool"
-VERSION="3.0"
+VERSION="3.1"
 HOMEPAGE="https://www.languagetool.org/"
-DOWNLOAD="https://www.languagetool.org/download/LanguageTool-3.0.zip"
-MD5SUM="931c9852dde0e14adcc5b22f3c311131"
+DOWNLOAD="https://www.languagetool.org/download/LanguageTool-3.1.zip"
+MD5SUM="c2fdcddd653481cd9edf2eb90477f516"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
index 8407e0dab6..b17ca575d9 100644
--- a/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
+++ b/office/MasterPDFEditor/MasterPDFEditor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MasterPDFEditor
 
-# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=MasterPDFEditor
 SRCNAM=master-pdf-editor
-VERSION=${VERSION:-3.2.81}
+VERSION=${VERSION:-3.7.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,6 +65,13 @@ mkdir -p $TMP $PKG $OUTPUT $PKG/opt
 cd $TMP
 rm -rf $SRCNAM-3
 tar xvf $CWD/${SRCNAM}-${VERSION}_${SOURCEARCH}.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
 mv $SRCNAM-3 $PKG/opt
 cd $PKG/opt/$SRCNAM-3
 
diff --git a/office/MasterPDFEditor/MasterPDFEditor.info b/office/MasterPDFEditor/MasterPDFEditor.info
index f7e87bcd54..12e6d63ee1 100644
--- a/office/MasterPDFEditor/MasterPDFEditor.info
+++ b/office/MasterPDFEditor/MasterPDFEditor.info
@@ -1,10 +1,10 @@
 PRGNAM="MasterPDFEditor"
-VERSION="3.2.81"
+VERSION="3.7.10"
 HOMEPAGE="http://code-industry.net/"
-DOWNLOAD="http://get.code-industry.net/public/master-pdf-editor-3.2.81_i386.tar.gz"
-MD5SUM="fd3699179ff9ec033fd4db41c2784ad6"
-DOWNLOAD_x86_64="http://get.code-industry.net/public/master-pdf-editor-3.2.81_amd64.tar.gz"
-MD5SUM_x86_64="8853028ae210c19d41445f566d11877f"
+DOWNLOAD="http://get.code-industry.net/public/master-pdf-editor-3.7.10_i386.tar.gz"
+MD5SUM="f9a15a8fe067c51462926b82b97f0392"
+DOWNLOAD_x86_64="http://get.code-industry.net/public/master-pdf-editor-3.7.10_amd64.tar.gz"
+MD5SUM_x86_64="23fe41819fabf797d71bf601b369d276"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/ProjectLibre/ProjectLibre.SlackBuild b/office/ProjectLibre/ProjectLibre.SlackBuild
index 29f4b3abd4..9b8da7b99c 100644
--- a/office/ProjectLibre/ProjectLibre.SlackBuild
+++ b/office/ProjectLibre/ProjectLibre.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SlackBuild Script for ProjectLibre
 
-# Copyright 2012-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2012-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ProjectLibre
-VERSION=${VERSION:-1.5.9}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/ProjectLibre/ProjectLibre.info b/office/ProjectLibre/ProjectLibre.info
index 505b8bb55f..13978c11d7 100644
--- a/office/ProjectLibre/ProjectLibre.info
+++ b/office/ProjectLibre/ProjectLibre.info
@@ -1,8 +1,8 @@
 PRGNAM="ProjectLibre"
-VERSION="1.5.9"
+VERSION="1.6.2"
 HOMEPAGE="http://sourceforge.net/projects/projectlibre/"
-DOWNLOAD="http://downloads.sourceforge.net/projectlibre/projectlibre-1.5.9.tar.gz"
-MD5SUM="37e179a27c64ee3188f1e865afb9e415"
+DOWNLOAD="http://downloads.sourceforge.net/projectlibre/projectlibre-1.6.2.tar.gz"
+MD5SUM="d2a29965d3ed06c54fa247c7ee7aafc2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 692375f067..298d4edfa3 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -27,9 +27,9 @@
 # Now maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=abiword
-VERSION=3.0.0
+VERSION=3.0.1
 DOCSVER=$VERSION	# version of abiword-docs
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -76,11 +76,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix http://bugzilla.abisource.com/show_bug.cgi?id=13586
-# svn co http://svn.abisource.com/abiword/trunk abiword
-# svn diff -r 33659:33662 > fix-segfault-on-save-pdf.patch
-patch -p0 < $CWD/fix-segfault-on-save-pdf.patch
-
 CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index 6c95d6b9da..3eb2982699 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,10 +1,10 @@
 PRGNAM="abiword"
-VERSION="3.0.0"
+VERSION="3.0.1"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://abisource.com/downloads/abiword/3.0.0/source/abiword-3.0.0.tar.gz \
-          http://abisource.com/downloads/abiword/3.0.0/source/abiword-docs-3.0.0.tar.gz"
-MD5SUM="8d9c41cff3a8fbef8d0c835c65600e65 \
-        ed73d0743a19eb85e46b59464e0ef2bb"
+DOWNLOAD="http://abisource.com/downloads/abiword/3.0.1/source/abiword-3.0.1.tar.gz \
+          http://abisource.com/downloads/abiword/3.0.1/source/abiword-docs-3.0.1.tar.gz"
+MD5SUM="f3f8052e7b4979a43b75775a381e6cb8 \
+        c9b78cb5f9c415ed63ce1cf9874fa8a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wv"
diff --git a/office/abiword/fix-segfault-on-save-pdf.patch b/office/abiword/fix-segfault-on-save-pdf.patch
deleted file mode 100644
index 95eef0b189..0000000000
--- a/office/abiword/fix-segfault-on-save-pdf.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
-===================================================================
---- src/text/fmt/gtk/fv_UnixSelectionHandles.cpp	(revision 33659)
-+++ src/text/fmt/gtk/fv_UnixSelectionHandles.cpp	(revision 33662)
-@@ -36,42 +36,60 @@
- 
- 	mode = _fv_text_handle_get_mode (handle);
- 
--	if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START)
-+	if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START) {
- 		handles->updateSelectionStart ((UT_sint32)x, (UT_sint32)y);
-+        }
- 	else {
--		if (mode == FV_TEXT_HANDLE_MODE_SELECTION)
-+		if (mode == FV_TEXT_HANDLE_MODE_SELECTION) {
- 			handles->updateSelectionEnd ((UT_sint32)x, (UT_sint32)y);
--                else
-+                }
-+                else {
- 			handles->updateCursor((UT_sint32)x, (UT_sint32)y);
-+                }
- 	}
- }
- 
- FV_UnixSelectionHandles::FV_UnixSelectionHandles(FV_View *view, FV_Selection selection)
- 	: FV_SelectionHandles (view, selection)
-+	, m_text_handle(NULL)
- {
- 	XAP_Frame * pFrame = static_cast<XAP_Frame*>(m_pView->getParentData());
--	XAP_UnixFrameImpl * pFrameImpl =static_cast<XAP_UnixFrameImpl *>( pFrame->getFrameImpl());
--	GtkWidget * pWidget = pFrameImpl->getViewWidget();
-+	// When saving to PDF (and printing) we don't have a frame
-+	// See bug 13586
-+	if (pFrame) {
-+		XAP_UnixFrameImpl * pFrameImpl = static_cast<XAP_UnixFrameImpl *>(pFrame->getFrameImpl());
-+		GtkWidget * pWidget = pFrameImpl->getViewWidget();
- 
--	m_text_handle = _fv_text_handle_new (pWidget);
--        _fv_text_handle_set_relative_to (m_text_handle,
--                                         gtk_widget_get_window (pWidget));
--        g_signal_connect (m_text_handle, "handle-dragged",
--                          G_CALLBACK(handle_dragged_cb), this);
-+		m_text_handle = _fv_text_handle_new (pWidget);
-+		_fv_text_handle_set_relative_to (m_text_handle,
-+						 gtk_widget_get_window (pWidget));
-+		g_signal_connect (m_text_handle, "handle-dragged",
-+				  G_CALLBACK(handle_dragged_cb), this);
-+	}
- }
- 
- FV_UnixSelectionHandles::~FV_UnixSelectionHandles()
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
- 	g_object_unref (m_text_handle);
- }
- 
- void FV_UnixSelectionHandles::hide()
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
- 	_fv_text_handle_set_mode (m_text_handle, FV_TEXT_HANDLE_MODE_NONE);
- }
- 
- void FV_UnixSelectionHandles::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint32 height, bool visible)
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
-+
- 	GdkRectangle rect;
- 
- 	_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_CURSOR);
-@@ -92,6 +110,10 @@
- void FV_UnixSelectionHandles::setSelectionCoords(UT_sint32 start_x, UT_sint32 start_y, UT_uint32 start_height, bool start_visible,
-                                                  UT_sint32 end_x, UT_sint32 end_y, UT_uint32 end_height, bool end_visible)
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
-+
- 	GdkRectangle rect;
- 
- 	_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_SELECTION);
diff --git a/office/dymo-cups-drivers/README b/office/dymo-cups-drivers/README
new file mode 100644
index 0000000000..1621093dce
--- /dev/null
+++ b/office/dymo-cups-drivers/README
@@ -0,0 +1,11 @@
+dymo-cups-drivers (CUPS drivers and filters for DYMO Label Printers)
+
+Supported DYMO label makers and printers:
+LabelMANAGER 400, LabelMANAGER 450, LabelMANAGER PC,
+LabelMANAGER PC II, LabelManager PnP, LabelPOINT 350, LabelWriter 300
+LabelWriter 310, LabelWriter 315, LabelWriter 320, LabelWriter 330,
+LabelWriter 330 Turbo, LabelWriter 400, LabelWriter 400 Turbo,
+LabelWriter 450, LabelWriter 450 DUO Label, LabelWriter 450 DUO Tape,
+LabelWriter 450 Turbo, LabelWriter 450 Twin Turbo, LabelWriter 4XL,
+LabelWriter DUO Label, LabelWriter DUO Tape,
+LabelWriter DUO Tape 128, LabelWriter SE450, LabelWriter Twin Turbo.
diff --git a/office/dymo-cups-drivers/dymo-cups-drivers.SlackBuild b/office/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
new file mode 100644
index 0000000000..44c23b3910
--- /dev/null
+++ b/office/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for dymo-cups-drivers
+
+# Copyright (c) 2015 Thomas Szteliga <ts@websafe.pl>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+PRGNAM=dymo-cups-drivers
+VERSION=${VERSION:-1.4.0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-1.4.0.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE README docs/DYMO_SDK_for_Linux.rtf \
+  docs/SAMPLES docs/TestImage.png docs/longtest.txt docs/test.ps docs/test.txt \
+  docs/testprint.ps $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/dymo-cups-drivers/dymo-cups-drivers.info b/office/dymo-cups-drivers/dymo-cups-drivers.info
new file mode 100644
index 0000000000..7ae50f6c00
--- /dev/null
+++ b/office/dymo-cups-drivers/dymo-cups-drivers.info
@@ -0,0 +1,10 @@
+PRGNAM="dymo-cups-drivers"
+VERSION="1.4.0.5"
+HOMEPAGE="http://www.dymo.com/en-US/dymo-label-sdk-and-cups-drivers-for-linux-dymo-label-sdk-cups-linux-p--1"
+DOWNLOAD="http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/dymo-cups-drivers-1.4.0.tar.gz"
+MD5SUM="8774f98bbe8d57f5b337019ae86a23f0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thomas Szteliga"
+EMAIL="ts@websafe.pl"
diff --git a/office/dymo-cups-drivers/slack-desc b/office/dymo-cups-drivers/slack-desc
new file mode 100644
index 0000000000..2fa0f2f5f1
--- /dev/null
+++ b/office/dymo-cups-drivers/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+dymo-cups-drivers: dymo-cups-drivers (CUPS drivers and filters for DYMO Label Printers)
+dymo-cups-drivers:
+dymo-cups-drivers: Supported DYMO label makers and printers:
+dymo-cups-drivers: LabelMANAGER 400, LabelMANAGER 450, LabelMANAGER PC,
+dymo-cups-drivers: LabelMANAGER PC II, LabelManager PnP, LabelPOINT 350, LabelWriter 300
+dymo-cups-drivers: LabelWriter 310, LabelWriter 315, LabelWriter 320, LabelWriter 330,
+dymo-cups-drivers: LabelWriter 330 Turbo, LabelWriter 400, LabelWriter 400 Turbo,
+dymo-cups-drivers: LabelWriter 450, LabelWriter 450 DUO Label, LabelWriter 450 DUO Tape,
+dymo-cups-drivers: LabelWriter 450 Turbo, LabelWriter 450 Twin Turbo, LabelWriter 4XL,
+dymo-cups-drivers: LabelWriter DUO Label, LabelWriter DUO Tape,
+dymo-cups-drivers: LabelWriter DUO Tape 128, LabelWriter SE450, LabelWriter Twin Turbo.
diff --git a/office/fbpdf/fbpdf.SlackBuild b/office/fbpdf/fbpdf.SlackBuild
index 02891669f2..33b522be1a 100644
--- a/office/fbpdf/fbpdf.SlackBuild
+++ b/office/fbpdf/fbpdf.SlackBuild
@@ -10,7 +10,7 @@
 
 PRGNAM=fbpdf
 VERSION=${VERSION:-20140822}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,9 +57,13 @@ find -L . \
 
 # This patch has been sent upstream. In my opinion, fbpdf is needlessly
 # difficult to use without it.
+# ...a year later, and upstream never responded to my email (not even to
+# say "no"). It's staying here though.
 [ "${PRISTINE:-no}" != "yes" ] && \
   patch -p1 < $CWD/navigation.diff
 
+# mupdf API keeps changing
+
 sed -i \
   -e 's,-lmupdf -lmujs,`pkg-config --libs mupdf`,' \
   -e 's,-lopenjpeg,-lopenjp2,' \
@@ -72,11 +76,16 @@ make ${PRGNAM}2 fbdjvu
 install -s -m0755 ${PRGNAM}2 $PKG/usr/bin
 install -s -m0755 fbdjvu $PKG/usr/bin
 
-# autodetect mupdf.
-pkg-config --exists mupdf && \
-  make clean && \
-  make $PRGNAM && \
+# autodetect mupdf, apply patch if needed.
+if pkg-config --exists mupdf; then
+  MUPDFVER="$( pkg-config --modversion mupdf 2>/dev/null | \
+            sed 's,^[0-9]*\.\([0-9][0-9]*\).*,\1,' )"
+  [ "$MUPDFVER" != "" -a "$MUPDFVER" -gt "6" ] &&
+    patch -p1 < $CWD/mupdf-1.7a.diff
+  make clean
+  make $PRGNAM
   install -s -m0755 $PRGNAM $PKG/usr/bin
+fi
 
 # man page written for this build.
 mkdir -p $PKG/usr/man/man1
diff --git a/office/fbpdf/mupdf-1.7a.diff b/office/fbpdf/mupdf-1.7a.diff
new file mode 100644
index 0000000000..b51d4141c3
--- /dev/null
+++ b/office/fbpdf/mupdf-1.7a.diff
@@ -0,0 +1,65 @@
+diff -Naur fbpdf-20140822/mupdf.c fbpdf-20140822.patched/mupdf.c
+--- fbpdf-20140822/mupdf.c	2014-08-21 21:12:00.000000000 -0400
++++ fbpdf-20140822.patched/mupdf.c	2015-09-12 03:24:40.000000000 -0400
+@@ -23,11 +23,11 @@
+ 	int h, w;
+ 	int x, y;
+ 
+-	if (!(page = fz_load_page(doc->pdf, p - 1)))
++	if (!(page = fz_load_page(doc->ctx, doc->pdf, p - 1)))
+ 		return 1;
+ 	fz_rotate(&ctm, rotate);
+ 	fz_pre_scale(&ctm, (float) zoom / 10, (float) zoom / 10);
+-	fz_bound_page(doc->pdf, page, &rect);
++	fz_bound_page(doc->ctx, page, &rect);
+ 	fz_transform_rect(&rect, &ctm);
+ 	fz_round_rect(&bbox, &rect);
+ 	w = MIN_(*cols, rect.x1 - rect.x0);
+@@ -37,8 +37,8 @@
+ 	fz_clear_pixmap_with_value(doc->ctx, pix, 0xff);
+ 
+ 	dev = fz_new_draw_device(doc->ctx, pix);
+-	fz_run_page(doc->pdf, page, dev, &ctm, NULL);
+-	fz_free_device(dev);
++	fz_run_page(doc->ctx, page, dev, &ctm, NULL);
++	fz_drop_device(doc->ctx, dev);
+ 
+ 	for (y = 0; y < h; y++) {
+ 		int xs = y * *cols + (*cols - w) / 2;
+@@ -50,7 +50,7 @@
+ 		}
+ 	}
+ 	fz_drop_pixmap(doc->ctx, pix);
+-	fz_free_page(doc->pdf, page);
++	fz_drop_page(doc->ctx, page);
+ 	*cols = w;
+ 	*rows = h;
+ 	return 0;
+@@ -58,7 +58,7 @@
+ 
+ int doc_pages(struct doc *doc)
+ {
+-	return fz_count_pages(doc->pdf);
++	return fz_count_pages(doc->ctx, doc->pdf);
+ }
+ 
+ struct doc *doc_open(char *path)
+@@ -69,7 +69,7 @@
+ 	fz_try (doc->ctx) {
+ 		doc->pdf = fz_open_document(doc->ctx, path);
+ 	} fz_catch (doc->ctx) {
+-		fz_free_context(doc->ctx);
++		fz_drop_context(doc->ctx);
+ 		free(doc);
+ 		return NULL;
+ 	}
+@@ -78,7 +78,7 @@
+ 
+ void doc_close(struct doc *doc)
+ {
+-	fz_close_document(doc->pdf);
+-	fz_free_context(doc->ctx);
++	fz_drop_document(doc->ctx, doc->pdf);
++	fz_drop_context(doc->ctx);
+ 	free(doc);
+ }
diff --git a/office/fop/fop.SlackBuild b/office/fop/fop.SlackBuild
index 0b7e2f712a..1205679527 100644
--- a/office/fop/fop.SlackBuild
+++ b/office/fop/fop.SlackBuild
@@ -23,24 +23,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fop
-VERSION=${VERSION:-1.1}	
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}		
+TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -56,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -75,9 +73,9 @@ find -L . \
 sed -i '\@</javad@i<arg value="-Xdoclint:none"/>' build.xml
 
 # Compiles with apache-ant:
-ant compile 
-ant jar-main 
-ant javadocs 
+ant compile
+ant jar-main
+ant javadocs
 
 mv build/javadocs .
 
@@ -86,21 +84,19 @@ install -v -d -m755 $PKG/opt/$PRGNAM-$VERSION/
 
 cp -va build conf examples fop* javadocs lib status.xml \
  $PKG/opt/$PRGNAM-$VERSION
- 
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- 
+
 # Create fop symlink to /usr/bin:
 mkdir -p $PKG/usr/bin
 ( ln -sf /opt/${PRGNAM}-${VERSION}/${PRGNAM} $PKG/usr/bin/ )
-  
+
 # Symlink it all to /opt/fop so the .foprc won't need edited every update:
-( cd $PKG/opt ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM} ) 
+( cd $PKG/opt ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM} )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README NOTICE LICENSE KEYS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README NOTICE LICENSE KEYS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/fop/fop.info b/office/fop/fop.info
index 6fa2af1035..668f994117 100644
--- a/office/fop/fop.info
+++ b/office/fop/fop.info
@@ -1,10 +1,10 @@
 PRGNAM="fop"
-VERSION="1.1"
+VERSION="2.0"
 HOMEPAGE="www.apache.org"
-DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-1.1-src.tar.gz"
-MD5SUM="7b63af514b28c06fe710a794cbf4d68e"
+DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.0-src.tar.gz"
+MD5SUM="754e5307a73433afb5c4c9b11d45e302"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant jai"
 MAINTAINER="Thorn Inurcide"
-EMAIL="thorn-inurcide@hotmail.com"
+EMAIL="thorn-inurcide@yandex.com"
diff --git a/office/gummi/gummi.SlackBuild b/office/gummi/gummi.SlackBuild
index 81932dd51e..287b3e13ae 100644
--- a/office/gummi/gummi.SlackBuild
+++ b/office/gummi/gummi.SlackBuild
@@ -2,11 +2,29 @@
 
 # Slackware build script for gummi
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gummi
 VERSION=${VERSION:-0.6.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -46,15 +64,16 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --disable-dependency-tracking \
   --build=$ARCH-slackware-linux
@@ -62,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/office/gummi/gummi.info b/office/gummi/gummi.info
index 8942e32317..e51e05181e 100644
--- a/office/gummi/gummi.info
+++ b/office/gummi/gummi.info
@@ -1,7 +1,7 @@
 PRGNAM="gummi"
 VERSION="0.6.5"
 HOMEPAGE="http://gummi.midnightcoding.org/"
-DOWNLOAD="http://dev.midnightcoding.org/attachments/download/301/gummi-0.6.5.tar.gz"
+DOWNLOAD="https://github.com/alexandervdm/gummi/releases/download/0.6.5/gummi-0.6.5.tar.gz"
 MD5SUM="da6b8736fd42ab3f5a9703a7a7917a7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/hunspell-pl/README b/office/hunspell-pl/README
new file mode 100644
index 0000000000..2bb24e3c2d
--- /dev/null
+++ b/office/hunspell-pl/README
@@ -0,0 +1 @@
+Polish hunspell dictionary.
diff --git a/office/hunspell-pl/hunspell-pl.SlackBuild b/office/hunspell-pl/hunspell-pl.SlackBuild
new file mode 100644
index 0000000000..8d95e6636a
--- /dev/null
+++ b/office/hunspell-pl/hunspell-pl.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Slackware build script for hunspell-pl
+
+# Copyright 2015 pomfland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hunspell-pl
+VERSION=${VERSION:-20150428}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH="noarch"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+bsdtar xvCf $PRGNAM-$VERSION $CWD/sjp-myspell-pl-$VERSION.zip
+cd $PRGNAM-$VERSION
+bsdtar xvf pl_PL.zip
+chown -R root:root .
+find -L . \
+\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+-o -perm 511 \) -exec chmod 755 {} \; -o \
+\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/{hunspell,myspell/dicts}
+cp pl_PL.{aff,dic} $PKG/usr/share/hunspell
+for extension in aff dic; do
+  ln -sv ../../hunspell/pl_PL.$extension $PKG/usr/share/myspell/dicts/pl_PL.$extension
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README_pl_PL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/hunspell-pl/hunspell-pl.info b/office/hunspell-pl/hunspell-pl.info
new file mode 100644
index 0000000000..06b1e2a3df
--- /dev/null
+++ b/office/hunspell-pl/hunspell-pl.info
@@ -0,0 +1,10 @@
+PRGNAM="hunspell-pl"
+VERSION="20150428"
+HOMEPAGE="http://sjp.pl"
+DOWNLOAD="http://sjp.pl/slownik/ort/sjp-myspell-pl-20150428.zip"
+MD5SUM="d6de61e0eac87ed9a12e8bbe123800bd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="pomfland"
+EMAIL="pomfland@tfwno.gf"
diff --git a/office/hunspell-pl/slack-desc b/office/hunspell-pl/slack-desc
new file mode 100644
index 0000000000..318d2c4fcb
--- /dev/null
+++ b/office/hunspell-pl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+hunspell-pl: hunspell-pl (Polish hunspell dictionary)
+hunspell-pl:
+hunspell-pl: Polish hunspell dictionary.
+hunspell-pl:
+hunspell-pl: Homepage: http://sjp.pl
+hunspell-pl:
+hunspell-pl:
+hunspell-pl:
+hunspell-pl:
+hunspell-pl:
+hunspell-pl:
diff --git a/office/impressive/impressive.SlackBuild b/office/impressive/impressive.SlackBuild
index cc02b7cf7b..ca22e8ecfe 100644
--- a/office/impressive/impressive.SlackBuild
+++ b/office/impressive/impressive.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for impressive
 
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2015  Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=impressive
-VERSION=${VERSION:-0.11.0b}
+VERSION=${VERSION:-0.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/impressive/impressive.info b/office/impressive/impressive.info
index ba9083ea56..574f48b2c9 100644
--- a/office/impressive/impressive.info
+++ b/office/impressive/impressive.info
@@ -1,10 +1,10 @@
 PRGNAM="impressive"
-VERSION="0.11.0b"
+VERSION="0.11.1"
 HOMEPAGE="http://impressive.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/impressive/files/Impressive/0.11.0/Impressive-0.11.0b.tar.gz"
-MD5SUM="09633d3d67c8425f7cc2aad7dd09ebda"
+DOWNLOAD="http://sourceforge.net/projects/impressive/files/Impressive/0.11.1/Impressive-0.11.1.tar.gz"
+MD5SUM="0fdac7431208ff5866a6443bbdddeaee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="PyOpenGL pygame"
+REQUIRES="pygame pilkit"
 MAINTAINER="Brenton Earl"
 EMAIL="brent@exitstatusone.com"
diff --git a/office/kate-latex-plugin/README b/office/kate-latex-plugin/README
new file mode 100644
index 0000000000..23d2f135f2
--- /dev/null
+++ b/office/kate-latex-plugin/README
@@ -0,0 +1,8 @@
+This is a plugin for Kate which adds two buttons on the toolbar: "Run LaTeX" and
+optionally "View Output" (of course you can add or remove these buttons in the
+"Configure Toolbars" dialog). The first button runs LaTeX (and runs BibTeX,
+MakeIndex, and reruns LaTeX if necessary; optionally the viewer is launched
+after this), the second button opens the output in the viewer of your choice. 
+
+The paths to the executables can be modified in the Settings
+dialog (see second screenshot).
diff --git a/office/kate-latex-plugin/kate-latex-plugin.SlackBuild b/office/kate-latex-plugin/kate-latex-plugin.SlackBuild
new file mode 100644
index 0000000000..a41a044590
--- /dev/null
+++ b/office/kate-latex-plugin/kate-latex-plugin.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for katelatexplugin
+
+# Copyright 2015 Guilherme Calandrini, Madrid, Spain
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PRGNAM=katelatexplugin
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar jxvf $CWD/84772-$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog INSTALL LICENSE.GPL3 README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/kate-latex-plugin.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/kate-latex-plugin.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/kate-latex-plugin/kate-latex-plugin.info b/office/kate-latex-plugin/kate-latex-plugin.info
new file mode 100644
index 0000000000..d49edf75fd
--- /dev/null
+++ b/office/kate-latex-plugin/kate-latex-plugin.info
@@ -0,0 +1,10 @@
+PRGNAM="kate-latex-plugin"
+VERSION="0.5"
+HOMEPAGE="http://kde-apps.org/content/show.php/Kate+LaTeX+typesetting+plugin?content=84772"
+DOWNLOAD="http://kde-apps.org/CONTENT/content-files/84772-katelatexplugin-0.5.tar.bz2"
+MD5SUM="d6e30aa41da5279300f5d638ff595a77"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini@hotmail.es"
diff --git a/office/kate-latex-plugin/slack-desc b/office/kate-latex-plugin/slack-desc
new file mode 100644
index 0000000000..9265553ea8
--- /dev/null
+++ b/office/kate-latex-plugin/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+kate-latex-plugin: kate-latex-plugin (LaTeX plugin for Kate)
+kate-latex-plugin:
+kate-latex-plugin: This is a plugin for Kate which adds two buttons on the
+kate-latex-plugin: toolbar: "Run LaTeX" and optionally "View Output" (of
+kate-latex-plugin: course you can add or remove these buttons in the "Configure
+kate-latex-plugin: Toolbars" dialog).  The first button runs LaTeX (and runs
+kate-latex-plugin: BibTeX, MakeIndex, and reruns LaTeX if necessary; optionally
+kate-latex-plugin: the viewer is launched after this), the second button opens
+kate-latex-plugin: the output in the viewer of your choice.
+kate-latex-plugin: 
diff --git a/office/keepassx/keepassx.SlackBuild b/office/keepassx/keepassx.SlackBuild
index 372d40d79a..88ee918599 100644
--- a/office/keepassx/keepassx.SlackBuild
+++ b/office/keepassx/keepassx.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keepassx
-VERSION=0.4.3
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,10 +64,10 @@ tar xvf $CWD/keepassx-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/keepassx-0.4.3-gcc47.patch
 
@@ -78,14 +78,11 @@ qmake \
 make
 make install INSTALL_ROOT=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# there is no manpage
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL changelog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL changelog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/keepassx/keepassx.info b/office/keepassx/keepassx.info
index 2cbddc04ff..f6d9b693cf 100644
--- a/office/keepassx/keepassx.info
+++ b/office/keepassx/keepassx.info
@@ -1,8 +1,8 @@
 PRGNAM="keepassx"
-VERSION="0.4.3"
+VERSION="0.4.4"
 HOMEPAGE="http:///www.keepassx.org/"
-DOWNLOAD="http://downloads.sourceforge.net/keepassx/keepassx-0.4.3.tar.gz"
-MD5SUM="1df67bb22b2e08df49f09e61d156f508"
+DOWNLOAD="https://www.keepassx.org/releases/0.4.4/keepassx-0.4.4.tar.gz"
+MD5SUM="6022ffe1e2c59fc6f1a47544417bb0b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild
index e549e6a010..eedd1838cf 100644
--- a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild
+++ b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for LibreOffice Help Packs
 
 # Copyright 2013-2014 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libreoffice-helppack
-VERSION=${VERSION:-"4.4.5"}
+VERSION=${VERSION:-"5.1.4"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/libreoffice-helppack/libreoffice-helppack.info b/office/libreoffice-helppack/libreoffice-helppack.info
index 7a7b1778b5..c38af0745f 100644
--- a/office/libreoffice-helppack/libreoffice-helppack.info
+++ b/office/libreoffice-helppack/libreoffice-helppack.info
@@ -1,10 +1,10 @@
 PRGNAM="libreoffice-helppack"
-VERSION="4.4.5"
+VERSION="5.1.4"
 HOMEPAGE="http://www.libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/4.4.5/rpm/x86/LibreOffice_4.4.5_Linux_x86_rpm_helppack_en-US.tar.gz"
-MD5SUM="6493312bcc30c764e13251515a16d49c"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/4.4.5/rpm/x86_64/LibreOffice_4.4.5_Linux_x86-64_rpm_helppack_en-US.tar.gz"
-MD5SUM_x86_64="3c3d6b66458376ba4abb6a1378afb506"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/5.1.4/rpm/x86/LibreOffice_5.1.4_Linux_x86_rpm_helppack_en-US.tar.gz"
+MD5SUM="5d8b6e3e3e761b1da4f4b8b7e605d3fc"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/5.1.4/rpm/x86_64/LibreOffice_5.1.4_Linux_x86-64_rpm_helppack_en-US.tar.gz"
+MD5SUM_x86_64="10fa3d0a2b3fb5d9b5024b52e2196ab2"
 REQUIRES="libreoffice"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/libreoffice-langpack/README b/office/libreoffice-langpack/README
index a69d7cdaa7..f3c8a8b64f 100644
--- a/office/libreoffice-langpack/README
+++ b/office/libreoffice-langpack/README
@@ -7,10 +7,13 @@ To build other locales, download your language pack from:
 
 and start the SlackBuild as follows:
 
-  # LOLANG=xx-YY ./libreoffice-langpack.SlackBuild
+  # LOLANG=xx ./libreoffice-langpack.SlackBuild
 
 This package was prepared for LibreOffice built from here at
 SlackBuilds.org. if you want to build a package compatible with LibreOffice
 built from source (like AlienBOB's packages), start the script as follows:
 
-  # LOLANG=xx-YY ALIEN=yes ./libreoffice-langpack.SlackBuild
+  # LOLANG=xx ALIEN=yes ./libreoffice-langpack.SlackBuild
+
+Note:
+For language used in multiple locale, please replace xx with xx-YY
diff --git a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild
index 38d9c9fb90..bd93793148 100644
--- a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild
+++ b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for LibreOffice Language Packs
 
 # Copyright 2010-2014 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libreoffice-langpack
-VERSION=${VERSION:-"4.4.5"}
+VERSION=${VERSION:-"5.1.4"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/libreoffice-langpack/libreoffice-langpack.info b/office/libreoffice-langpack/libreoffice-langpack.info
index ec827a2378..6c7d528385 100644
--- a/office/libreoffice-langpack/libreoffice-langpack.info
+++ b/office/libreoffice-langpack/libreoffice-langpack.info
@@ -1,10 +1,10 @@
 PRGNAM="libreoffice-langpack"
-VERSION="4.4.5"
+VERSION="5.1.4"
 HOMEPAGE="http://www.libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/4.4.5/rpm/x86/LibreOffice_4.4.5_Linux_x86_rpm_langpack_en-GB.tar.gz"
-MD5SUM="6bc92b5dbf209e2b5bfb09634b4eac1f"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/4.4.5/rpm/x86_64/LibreOffice_4.4.5_Linux_x86-64_rpm_langpack_en-GB.tar.gz"
-MD5SUM_x86_64="5e1e39f9e07df1ca162b658e09e261fe"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/5.1.4/rpm/x86/LibreOffice_5.1.4_Linux_x86_rpm_langpack_en-GB.tar.gz"
+MD5SUM="9d1a7ca4bcbe76ab331d19819f2d221c"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/5.1.4/rpm/x86_64/LibreOffice_5.1.4_Linux_x86-64_rpm_langpack_en-GB.tar.gz"
+MD5SUM_x86_64="b6b7bda10f366b7a1a9fad81e187a202"
 REQUIRES="libreoffice"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild
index e87eac9c57..bb81102a52 100644
--- a/office/libreoffice/libreoffice.SlackBuild
+++ b/office/libreoffice/libreoffice.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2006,2007,2008,2009,2010  Robby Workman, Northport, Alabama, USA
 # Copyright 2010-2014 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libreoffice
-VERSION=${VERSION:-"4.4.5"}
+VERSION=${VERSION:-"5.1.4"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -147,7 +147,7 @@ cp $CWD/open-libre-together.sh $PKG/usr/doc/$PRGNAM-$VERSION/
 
 # Disable Java support if desired (see above)
 if [ "$DISABLE_JAVA" = "YES" ]; then
-  chmod -x $PKG/opt/libreoffice$SRCSHORT/ure/bin/javaldx
+  chmod -x $PKG/opt/libreoffice$SRCSHORT/program/javaldx
 fi
 
 mkdir -p $PKG/install
diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info
index 7a7ad68dfb..607c392e16 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -1,10 +1,10 @@
 PRGNAM="libreoffice"
-VERSION="4.4.5"
+VERSION="5.1.4"
 HOMEPAGE="http://www.libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/4.4.5/rpm/x86/LibreOffice_4.4.5_Linux_x86_rpm.tar.gz"
-MD5SUM="062aa68677f1b34543b78eb884aa2ff8"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/4.4.5/rpm/x86_64/LibreOffice_4.4.5_Linux_x86-64_rpm.tar.gz"
-MD5SUM_x86_64="913ae73cf9ee06f0ac7def5f2478e26d"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/5.1.4/rpm/x86/LibreOffice_5.1.4_Linux_x86_rpm.tar.gz"
+MD5SUM="ad370ddba453b20dd9264c462947f4c4"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/5.1.4/rpm/x86_64/LibreOffice_5.1.4_Linux_x86-64_rpm.tar.gz"
+MD5SUM_x86_64="7c6037441c0eb11cce13bc1a9382ba13"
 REQUIRES="jdk"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/office/lyx/lyx.SlackBuild b/office/lyx/lyx.SlackBuild
index 72c0d5dc92..a79d997ff3 100644
--- a/office/lyx/lyx.SlackBuild
+++ b/office/lyx/lyx.SlackBuild
@@ -5,7 +5,7 @@
 # Now maintained by R. S. Ananda Murthy (rsamurti@gmail.com)
 
 PRGNAM=lyx
-VERSION=${VERSION:-2.1.3}
+VERSION=${VERSION:-2.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/lyx/lyx.info b/office/lyx/lyx.info
index 2519b8a3eb..7ade84f6b4 100644
--- a/office/lyx/lyx.info
+++ b/office/lyx/lyx.info
@@ -1,8 +1,8 @@
 PRGNAM="lyx"
-VERSION="2.1.3"
+VERSION="2.1.4"
 HOMEPAGE="http://www.lyx.org"
-DOWNLOAD="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-2.1.3.tar.gz"
-MD5SUM="6ce312717b914ff8dcda194583a2d073"
+DOWNLOAD="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-2.1.4.tar.gz"
+MD5SUM="459637fb980c108c743537c8102ab22c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/mathtex/mathtex.SlackBuild b/office/mathtex/mathtex.SlackBuild
index e74b84bbb2..493150896c 100644
--- a/office/mathtex/mathtex.SlackBuild
+++ b/office/mathtex/mathtex.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mathtex
 
-# Copyright (c) 2012, Written by Roberto Metere <roberto@metere.it>
+# Copyright (c) 2015, Written by Roberto Metere <roberto@metere.it>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/office/mathtex/mathtex.info b/office/mathtex/mathtex.info
index b7eacbbffc..44f8a41628 100644
--- a/office/mathtex/mathtex.info
+++ b/office/mathtex/mathtex.info
@@ -2,7 +2,7 @@ PRGNAM="mathtex"
 VERSION="1.05"
 HOMEPAGE="http://www.forkosh.com/mathtex.html"
 DOWNLOAD="http://www.forkosh.com/mathtex.zip"
-MD5SUM="d501ea00851319861eb5b8d7cb394b31"
+MD5SUM="2b32537b141245acc469c45e0b1a06bf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/mdp/mdp.SlackBuild b/office/mdp/mdp.SlackBuild
index cd19ffe3d3..a47d4925b4 100644
--- a/office/mdp/mdp.SlackBuild
+++ b/office/mdp/mdp.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/office/mined/README b/office/mined/README
new file mode 100644
index 0000000000..7915791394
--- /dev/null
+++ b/office/mined/README
@@ -0,0 +1,3 @@
+mined is a terminal-based text editor providing extensive Unicode and CJK support.
+It has user-friendly interface, mouse control and menus.
+MinEd runs in a text-mode environment like xterm or mintty.
diff --git a/office/mined/doinst.sh b/office/mined/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/office/mined/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/office/mined/mined.SlackBuild b/office/mined/mined.SlackBuild
new file mode 100644
index 0000000000..c25e12366b
--- /dev/null
+++ b/office/mined/mined.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for MinEd
+
+# Copyright 2015  CCHsu, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mined
+VERSION=${VERSION:-2015.25}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COMPILE.DOC DESCR *.DOC LICENCE.GPL VERSION README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/mined/mined.info b/office/mined/mined.info
new file mode 100644
index 0000000000..eca8e0df19
--- /dev/null
+++ b/office/mined/mined.info
@@ -0,0 +1,10 @@
+PRGNAM="mined"
+VERSION="2015.25"
+HOMEPAGE="http://towo.net/mined/"
+DOWNLOAD="http://downloads.sourceforge.net/project/mined/mined/mined%202015.25/mined-2015.25.tar.gz"
+MD5SUM="92c25368a0d81d1cc2aa01b46742a28e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="CCHsu"
+EMAIL="a12321aabb@gmail.com"
diff --git a/office/mined/slack-desc b/office/mined/slack-desc
new file mode 100644
index 0000000000..9a366454ca
--- /dev/null
+++ b/office/mined/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+mined: mined (A terminal-based text editor)
+mined:
+mined: mined is a terminal-based text editor providing extensive Unicode and
+mined: CJK support. It features with menus and mouse control support, and
+mined: key bindings optimized for intuitive and fast navigation.
+mined:
+mined:
+mined:
+mined: Homepage: http://towo.net/mined/
+mined:
+mined:
diff --git a/office/minidjvu/README b/office/minidjvu/README
new file mode 100644
index 0000000000..c61205d059
--- /dev/null
+++ b/office/minidjvu/README
@@ -0,0 +1,9 @@
+Minidjvu is a command line utility which encodes and decodes single page
+black-and-white DjVu files, and can compress multiple pages, taking advantage
+from similarities between pages.
+
+Supported bitmap formats are PBM, Windows BMP, and TIFF (through libtiff).
+
+Minidjvu is based on DjVuLibre, which is the primary DjVu support library.
+Minidjvu is not going to support all DjVu functionality; the idea is rather to
+take the black-and-white part (also called JB2) and experiment with it.
diff --git a/office/minidjvu/minidjvu.SlackBuild b/office/minidjvu/minidjvu.SlackBuild
new file mode 100644
index 0000000000..47ccb4982c
--- /dev/null
+++ b/office/minidjvu/minidjvu.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for minidjvu
+
+# Copyright 2015, Alexander Verbovetsky, Moscow, Russia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=minidjvu
+VERSION=${VERSION:-0.8.svn.2010.05.06}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/minidjvu.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/minidjvu/minidjvu.info b/office/minidjvu/minidjvu.info
new file mode 100644
index 0000000000..e611279858
--- /dev/null
+++ b/office/minidjvu/minidjvu.info
@@ -0,0 +1,10 @@
+PRGNAM="minidjvu"
+VERSION="0.8.svn.2010.05.06"
+HOMEPAGE="http://minidjvu.sourceforge.net"
+DOWNLOAD="http://ftp.ubuntu.com/ubuntu/pool/universe/m/minidjvu/minidjvu_0.8.svn.2010.05.06.orig.tar.gz"
+MD5SUM="c29f5c86267824f6c9047f2759a4ad5f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/office/minidjvu/minidjvu.patch b/office/minidjvu/minidjvu.patch
new file mode 100644
index 0000000000..fc3111422b
--- /dev/null
+++ b/office/minidjvu/minidjvu.patch
@@ -0,0 +1,66 @@
+diff -Naur minidjvu-0.8.svn.2010.05.06.orig/include/minidjvu/alg/smooth.h minidjvu-0.8.svn.2010.05.06/include/minidjvu/alg/smooth.h
+--- minidjvu-0.8.svn.2010.05.06.orig/include/minidjvu/alg/smooth.h	2010-08-02 17:15:58.000000000 +0400
++++ minidjvu-0.8.svn.2010.05.06/include/minidjvu/alg/smooth.h	2015-12-02 03:12:43.000000000 +0300
+@@ -4,7 +4,7 @@
+ 
+ 
+ /*
+- * `smooth' is applied to a bitmap even before it's splitted.
++ * `smooth' is applied to a bitmap even before it's split.
+  * 
+  * Right now, the algorithm flips pixels which are surrounded
+  * by at least 3 of 4 neighboring pixels of another color.
+diff -Naur minidjvu-0.8.svn.2010.05.06.orig/Makefile.in minidjvu-0.8.svn.2010.05.06/Makefile.in
+--- minidjvu-0.8.svn.2010.05.06.orig/Makefile.in	2010-08-02 17:15:58.000000000 +0400
++++ minidjvu-0.8.svn.2010.05.06/Makefile.in	2015-12-02 02:18:36.000000000 +0300
+@@ -8,7 +8,7 @@
+ manpage:=@PACKAGE_NAME@
+ 
+ DOCDIR:=doc
+-MANDIR:=$(prefix)/share/man/man1
++MANDIR:=$(prefix)/man/man1
+ INCLUDEDIR:=$(prefix)/include
+ SUBDIRS:=src \
+          po \
+@@ -71,7 +71,7 @@
+ 	${GZIP} -nf -9 ${DESTDIR}$(MANDIR)/$(manpage).1
+ 	for dir in $(DOCDIR)/*/; do \
+ 	  if [ -f $${dir}$(manpage).1 ]; then \
+-	    LOCMANDIR=${DESTDIR}$(prefix)/share/man$${dir#$(DOCDIR)}/man1 &&\
++	    LOCMANDIR=${DESTDIR}$(prefix)/man$${dir#$(DOCDIR)}/man1 &&\
+ 	    ${INSTALL} -d $${LOCMANDIR} &&\
+ 	    ${INSTALL_DATA} $${dir}$(manpage).1 $${LOCMANDIR} && \
+ 	    ${GZIP} -nf -9 $${LOCMANDIR}/$(manpage).1; \
+@@ -91,7 +91,7 @@
+ 	${RM} ${DESTDIR}$(MANDIR)/$(manpage).1.gz
+ 	for dir in $(DOCDIR)/*/; do \
+ 	  if [ -f $${dir}$(manpage).1 ]; then \
+-	    LOCMANDIR=${DESTDIR}$(prefix)/share/man$${dir#$(DOCDIR)}/man1 &&\
++	    LOCMANDIR=${DESTDIR}$(prefix)/man$${dir#$(DOCDIR)}/man1 &&\
+ 	    ${RM} $${LOCMANDIR}/$(manpage).1.gz; \
+ 	  fi; \
+ 	done
+diff -Naur minidjvu-0.8.svn.2010.05.06.orig/po/ru.po minidjvu-0.8.svn.2010.05.06/po/ru.po
+--- minidjvu-0.8.svn.2010.05.06.orig/po/ru.po	2010-08-02 17:15:58.000000000 +0400
++++ minidjvu-0.8.svn.2010.05.06/po/ru.po	2015-12-02 03:12:43.000000000 +0300
+@@ -239,7 +239,7 @@
+ 
+ #: minidjvu.c:361
+ #, c-format
+-msgid "the splitted image has %d pieces\n"
++msgid "the split image has %d pieces\n"
+ msgstr "по�ле разбиени� картинка �о�тоит из %d уча�тков\n"
+ 
+ #: minidjvu.c:366
+diff -Naur minidjvu-0.8.svn.2010.05.06.orig/tools/minidjvu.c minidjvu-0.8.svn.2010.05.06/tools/minidjvu.c
+--- minidjvu-0.8.svn.2010.05.06.orig/tools/minidjvu.c	2010-08-02 17:15:58.000000000 +0400
++++ minidjvu-0.8.svn.2010.05.06/tools/minidjvu.c	2015-12-02 03:12:43.000000000 +0300
+@@ -360,7 +360,7 @@
+     mdjvu_bitmap_destroy(bitmap);
+     if (verbose)
+     {
+-        printf(_("the splitted image has %d pieces\n"),
++        printf(_("the split image has %d pieces\n"),
+                 mdjvu_image_get_blit_count(image));
+     }
+     if (clean)
diff --git a/office/minidjvu/slack-desc b/office/minidjvu/slack-desc
new file mode 100644
index 0000000000..0cfa52cc0d
--- /dev/null
+++ b/office/minidjvu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+minidjvu: minidjvu (bitonal DjVu encoder/decoder)
+minidjvu:
+minidjvu: Minidjvu is a command line utility which encodes and decodes single
+minidjvu: page black-and-white DjVu files, and can compress multiple pages,
+minidjvu: taking advantage from similarities between pages.  Supported bitmap
+minidjvu: formats are PBM, Windows BMP, and TIFF (through libtiff).  Minidjvu
+minidjvu: is based on DjVuLibre, which is the primary DjVu support library.
+minidjvu: Minidjvu is not going to support all DjVu functionality; the idea is
+minidjvu: rather to take the black-and-white part (also called JB2) and
+minidjvu: experiment with it.
+minidjvu: Homepage: http://minidjvu.sourceforge.net
diff --git a/office/moneydance/moneydance.SlackBuild b/office/moneydance/moneydance.SlackBuild
index adec73589b..961b03ba51 100644
--- a/office/moneydance/moneydance.SlackBuild
+++ b/office/moneydance/moneydance.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for moneydance
 
-# Copyright 2008-2014  Robby Workman, Northport, AL, USA
+# Copyright 2008-2016  Robby Workman, Tuscaloosa, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=moneydance
-VERSION=${VERSION:-2014.967}
+VERSION=${VERSION:-2015.1299}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/moneydance/moneydance.info b/office/moneydance/moneydance.info
index 2f195770ad..424bcb4c8c 100644
--- a/office/moneydance/moneydance.info
+++ b/office/moneydance/moneydance.info
@@ -1,10 +1,10 @@
 PRGNAM="moneydance"
-VERSION="2014.967"
+VERSION="2015.1299"
 HOMEPAGE="http://moneydance.com"
-DOWNLOAD="http://infinitekind-md967.s3.amazonaws.com/Moneydance_linux_x86.tar.gz"
-MD5SUM="72c412ecf07f46cc713848883f78b925"
-DOWNLOAD_x86_64="http://infinitekind-md967.s3.amazonaws.com/Moneydance_linux_amd64.tar.gz"
-MD5SUM_x86_64="e83c789c8e4bcbdb61f822a584366d9b"
+DOWNLOAD="http://infinitekind.com/stabledl/2015/Moneydance_linux_x86.tar.gz"
+MD5SUM="f730b6649412854a936e86930f4238eb"
+DOWNLOAD_x86_64="http://infinitekind.com/stabledl/2015/Moneydance_linux_amd64.tar.gz"
+MD5SUM_x86_64="2ef0edce4d23d43f89deb2110c5f6f1f"
 REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/office/mu/mu.SlackBuild b/office/mu/mu.SlackBuild
index 0725ac6ce1..6810328401 100644
--- a/office/mu/mu.SlackBuild
+++ b/office/mu/mu.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Jostein Berntsen <jbernts@broadpark.no>
 
 PRGNAM=mu
-VERSION=${VERSION:-0.9.9.6}
+VERSION=${VERSION:-0.9.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,9 +75,7 @@ gzip -9 $PKG/usr/info/*
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog COPYING HACKING INSTALL README NEWS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING HACKING INSTALL README NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/mu/mu.info b/office/mu/mu.info
index 435187aa9b..812b3f6e6c 100644
--- a/office/mu/mu.info
+++ b/office/mu/mu.info
@@ -1,8 +1,8 @@
 PRGNAM="mu"
-VERSION="0.9.9.6"
+VERSION="0.9.15"
 HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-DOWNLOAD="https://github.com/djcb/mu/archive/v0.9.9.6.tar.gz"
-MD5SUM="639a3b4c46c8373b79f4e570422f2500"
+DOWNLOAD="https://github.com/djcb/mu/archive/0.9.15.tar.gz"
+MD5SUM="afbd704c8eb0bf2218a44bd4475cc457"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xapian-core"
diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild
index 57c2a7627f..5f228359ad 100644
--- a/office/mupdf/mupdf.SlackBuild
+++ b/office/mupdf/mupdf.SlackBuild
@@ -5,6 +5,9 @@
 # Originally written by Hubert Hesse (slackbuilds@hubertscorner.de).
 # Heavily modified by B. Watson (yalhcru@gmail.com).
 
+# 20150915 bkw BUILD=2:
+# - add -DJBIG_NO_MEMENTO, needed for building with jbig2dec-0.12.
+
 # 20150511 bkw:
 # - version bump to 1.7a.
 # - remembered to reset BUILD to 1, yay.
@@ -69,7 +72,7 @@
 
 PRGNAM=mupdf
 VERSION=${VERSION:-1.7a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -144,7 +147,7 @@ sed -i 's,libopenjpeg1,libopenjp2,g' Makerules
 # it and spewing harmless but scary 'fatal: Not a git repository' errors.
 sed -i "/^VERSION/s,=.*,= $VERSION," Makefile
 
-make build=release prefix=/usr XCFLAGS="$SLKCFLAGS"
+make build=release prefix=/usr XCFLAGS="$SLKCFLAGS -DJBIG_NO_MEMENTO"
 make \
   build=release \
   prefix=/usr \
diff --git a/office/mythes/README b/office/mythes/README
new file mode 100644
index 0000000000..44bec8c1be
--- /dev/null
+++ b/office/mythes/README
@@ -0,0 +1,10 @@
+MyThes is a simple thesaurus that uses a structured
+text data file and an index file with binary search
+to lookup words and phrases and return information
+on part of speech, meanings, and synonyms
+
+MyThes was originall written to provide a thesaurus
+for the OpenOffice.org project 
+
+MyThes comes with a simple example program that looks up some words and returns
+meanings and synonyms.
diff --git a/office/mythes/mythes.SlackBuild b/office/mythes/mythes.SlackBuild
new file mode 100644
index 0000000000..a99732dd90
--- /dev/null
+++ b/office/mythes/mythes.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for MyThes
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mythes
+VERSION=${VERSION:-1.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL README *.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/mythes/mythes.info b/office/mythes/mythes.info
new file mode 100644
index 0000000000..760d35588b
--- /dev/null
+++ b/office/mythes/mythes.info
@@ -0,0 +1,10 @@
+PRGNAM="mythes"
+VERSION="1.2.4"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/hunspell/files/MyThes/1.2.4/mythes-1.2.4.tar.gz"
+MD5SUM="a8c2c5b8f09e7ede322d5c602ff6a4b6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/office/mythes/slack-desc b/office/mythes/slack-desc
new file mode 100644
index 0000000000..ceb24f3c43
--- /dev/null
+++ b/office/mythes/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+mythes: mythes (simple thesaurus)
+mythes:
+mythes: MyThes is a simple thesaurus that uses a structured text data file
+mythes: and an index file with binary search to lookup words and phrases and
+mythes: return information on part of speech, meanings, and synonyms
+mythes:
+mythes: Homepage: http://hunspell.sourceforge.net/
+mythes:
+mythes:
+mythes:
+mythes:
diff --git a/office/notmuch/notmuch.SlackBuild b/office/notmuch/notmuch.SlackBuild
index 896ccc700f..738010fe1c 100644
--- a/office/notmuch/notmuch.SlackBuild
+++ b/office/notmuch/notmuch.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Jostein Berntsen <jbernts@broadpark.no>
 
 PRGNAM=notmuch
-VERSION=${VERSION:-0.20}
+VERSION=${VERSION:-0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/notmuch/notmuch.info b/office/notmuch/notmuch.info
index ad12e029d4..7adea3dfb5 100644
--- a/office/notmuch/notmuch.info
+++ b/office/notmuch/notmuch.info
@@ -1,10 +1,10 @@
 PRGNAM="notmuch"
-VERSION="0.20"
+VERSION="0.21"
 HOMEPAGE="http://notmuchmail.org"
-DOWNLOAD="http://notmuchmail.org/releases/notmuch-0.20.tar.gz"
-MD5SUM="843b1c2bce38ddf40162f8f9c19de6ba"
+DOWNLOAD="https://notmuchmail.org/releases/notmuch-0.21.tar.gz"
+MD5SUM="a951212b8c4624e9a2069e9d9e00222b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="xapian-core Sphinx"
+REQUIRES="xapian-core"
 MAINTAINER="Jostein Berntsen"
 EMAIL="jbernts@broadpark.no"
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 382b6aaf52..1ecb73fb47 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for openoffice.org
-
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
-
 # Originally written by Niki Kovacs <info@microlinux.fr)
 #
 # Rewritten for slackbuilds.org by Ryan P.C. McQuen
@@ -29,8 +27,8 @@
 
 PRGNAM=openoffice.org
 SRCNAM=openoffice
-VERSION=${VERSION:-4.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.1.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCSHORT=$(echo $VERSION | cut -f1 -d.)
 
@@ -86,6 +84,12 @@ rm -rf $TMP/$SOURCEDIR
 tar xvf $CWD/$TARNAME -C $TMP
 
 cd $TMP/$SOURCEDIR/RPMS
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # We don't want this, so we delete the *onlineupdate*.rpm
 rm -f *onlineupdate*.rpm
@@ -140,4 +144,6 @@ mv $TMP/$OOLANG $PKG/opt/${SRCNAM}${SRCSHORT}/lang/
 chown -R root:root .
 find . -type d -exec chmod 755 {} \;
 chmod -R u+rw,go+r-w,a-s .
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index 719fab6ba1..d2e4d1f3f2 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,10 +1,10 @@
 PRGNAM="openoffice.org"
-VERSION="4.1.1"
+VERSION="4.1.2"
 HOMEPAGE="https://openoffice.org"
-DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.1/binaries/en-US/Apache_OpenOffice_4.1.1_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="46e0aa610b121b23d9ed820016a6e7fd"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.1/binaries/en-US/Apache_OpenOffice_4.1.1_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="b86a422de7be43f659555f2edbd74590"
+DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="fb3a9d03b16b258c27e46d65d87b6512"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="bb3c58bec7d1280aae18bafe55e922ee"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
diff --git a/office/pdf2djvu/README b/office/pdf2djvu/README
index e0a6295be4..e5aa356049 100644
--- a/office/pdf2djvu/README
+++ b/office/pdf2djvu/README
@@ -2,8 +2,8 @@ pdf2djvu creates DjVu files from PDF files.
 
 It's able to extract:
 
- * graphics,
- * text layer,
- * hyperlinks,
- * document outline (bookmarks),
- * metadata (including XMP metadata).
+ * graphics
+ * text layer
+ * hyperlinks
+ * document outline (bookmarks)
+ * metadata (including XMP metadata)
diff --git a/office/pdf2djvu/pdf2djvu.SlackBuild b/office/pdf2djvu/pdf2djvu.SlackBuild
index 95a1605a80..1077d96c66 100644
--- a/office/pdf2djvu/pdf2djvu.SlackBuild
+++ b/office/pdf2djvu/pdf2djvu.SlackBuild
@@ -2,10 +2,8 @@
 
 # Slackware build script for pdf2djvu
 
-# Copyright 2015, Brenton Earl <brent@exitstatusone.com> Tooele, UT, USA
-# All rights reserved.
-#
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdf2djvu
-VERSION=${VERSION:-0.7.21}
+VERSION=${VERSION:-0.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/pdf2djvu/pdf2djvu.info b/office/pdf2djvu/pdf2djvu.info
index 4f2d33ea54..7cb0c3a0fd 100644
--- a/office/pdf2djvu/pdf2djvu.info
+++ b/office/pdf2djvu/pdf2djvu.info
@@ -1,8 +1,8 @@
 PRGNAM="pdf2djvu"
-VERSION="0.7.21"
+VERSION="0.9.3"
 HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-DOWNLOAD="https://bitbucket.org/jwilk/pdf2djvu/downloads/pdf2djvu-0.7.21.tar.xz"
-MD5SUM="1efee113c9985d4102c09ab997fc795d"
+DOWNLOAD="https://bitbucket.org/jwilk/pdf2djvu/downloads/pdf2djvu-0.9.3.tar.xz"
+MD5SUM="346ec06dc57a35fc09a2780aefbe9280"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/pdfshuffler/pdfshuffler-PyPDF2.diff b/office/pdfshuffler/pdfshuffler-PyPDF2.diff
new file mode 100644
index 0000000000..3fff892c92
--- /dev/null
+++ b/office/pdfshuffler/pdfshuffler-PyPDF2.diff
@@ -0,0 +1,12 @@
+diff -Naur pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py pdfshuffler-0.6.0-patched/pdfshuffler/pdfshuffler.py
+--- pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py	2012-04-28 15:15:17.000000000 +0100
++++ pdfshuffler-0.6.0-patched/pdfshuffler/pdfshuffler.py	2015-11-24 16:27:34.381182962 +0000
+@@ -71,7 +71,7 @@
+ import cairo
+ 
+ import poppler      #for the rendering of pdf pages
+-from pyPdf import PdfFileWriter, PdfFileReader
++from PyPDF2 import PdfFileWriter, PdfFileReader
+ 
+ from pdfshuffler_iconview import CellRendererImage
+ gobject.type_register(CellRendererImage)
diff --git a/office/pdfshuffler/pdfshuffler.SlackBuild b/office/pdfshuffler/pdfshuffler.SlackBuild
index 3d9f79e24a..11485fb642 100644
--- a/office/pdfshuffler/pdfshuffler.SlackBuild
+++ b/office/pdfshuffler/pdfshuffler.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdfshuffler
-VERSION=0.6.0
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.6.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,10 +53,12 @@ cd $PRGNAM-$VERSION
 
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch --verbose -p1 < $CWD/pdfshuffler-PyPDF2.diff
 
 python setup.py install --root=$PKG
 
diff --git a/office/pdfshuffler/pdfshuffler.info b/office/pdfshuffler/pdfshuffler.info
index 9dfa24d83c..b401e83d06 100644
--- a/office/pdfshuffler/pdfshuffler.info
+++ b/office/pdfshuffler/pdfshuffler.info
@@ -6,5 +6,5 @@ MD5SUM="573f42e8392d20e6f03557096c85c178"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyPdf pypoppler"
-MAINTAINER="Howard Pepper"
-EMAIL="h_pepper <at> bellsouth {dot} net"
+MAINTAINER="Rob van Nues"
+EMAIL="rvnues at tesco {dot} net"
diff --git a/office/pyspread/pyspread.SlackBuild b/office/pyspread/pyspread.SlackBuild
index 2ffbf22471..d9a5011b3b 100644
--- a/office/pyspread/pyspread.SlackBuild
+++ b/office/pyspread/pyspread.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyspread
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=pyspread
-VERSION=${VERSION:-0.4.3}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/pyspread/pyspread.info b/office/pyspread/pyspread.info
index 1e02b8b3ec..99840c4c43 100644
--- a/office/pyspread/pyspread.info
+++ b/office/pyspread/pyspread.info
@@ -1,8 +1,8 @@
 PRGNAM="pyspread"
-VERSION="0.4.3"
+VERSION="1.0.1"
 HOMEPAGE="http://manns.github.io/pyspread/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyspread/pyspread-0.4.3.tar.gz"
-MD5SUM="37f33eb1d03c76cd86edc7d74356e528"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyspread/pyspread-1.0.1.tar.gz"
+MD5SUM="6c32e469036cce3f24cecdf8316fc937"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython matplotlib numpy"
diff --git a/office/qpdf/qpdf.SlackBuild b/office/qpdf/qpdf.SlackBuild
index cd5e4fca48..ac6175c38b 100644
--- a/office/qpdf/qpdf.SlackBuild
+++ b/office/qpdf/qpdf.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qpdf
-VERSION=${VERSION:-5.1.3}
+VERSION=${VERSION:-6.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/qpdf/qpdf.info b/office/qpdf/qpdf.info
index c48c561dd2..6f1138be67 100644
--- a/office/qpdf/qpdf.info
+++ b/office/qpdf/qpdf.info
@@ -1,8 +1,8 @@
 PRGNAM="qpdf"
-VERSION="5.1.3"
+VERSION="6.0.0"
 HOMEPAGE="http://qpdf.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/qpdf/qpdf-5.1.3.tar.gz"
-MD5SUM="aafbf3950230f84d7998b700b12428f4"
+DOWNLOAD="http://downloads.sourceforge.net/qpdf/qpdf-6.0.0.tar.gz"
+MD5SUM="e014bd3ecf1c4d1a520bbc14d84ac20e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild
index 7387aa6004..d20259c614 100644
--- a/office/qpdfview/qpdfview.SlackBuild
+++ b/office/qpdfview/qpdfview.SlackBuild
@@ -24,8 +24,8 @@
 # Updated and maintained by Donald Cooley
 
 PRGNAM=qpdfview
-VERSION=${VERSION:-0.4.15}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.16}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -67,10 +67,10 @@ tar xfv $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 sed -i "s|/usr/lib/qpdfview|/usr/lib${LIBDIRSUFFIX}/qpdfview|" qpdfview.pri
 
diff --git a/office/qpdfview/qpdfview.info b/office/qpdfview/qpdfview.info
index b74456d99b..2777a67747 100644
--- a/office/qpdfview/qpdfview.info
+++ b/office/qpdfview/qpdfview.info
@@ -1,8 +1,8 @@
 PRGNAM="qpdfview"
-VERSION="0.4.15"
+VERSION="0.4.16"
 HOMEPAGE="https://launchpad.net/qpdfview"
-DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.15/+download/qpdfview-0.4.15.tar.gz"
-MD5SUM="d7e4066f9062a00380e9aa78c12a882e"
+DOWNLOAD="https://launchpad.net/qpdfview/trunk/0.4.16/+download/qpdfview-0.4.16.tar.gz"
+MD5SUM="4b317c4536332a7fe437abe50eca1716"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/rednotebook/rednotebook.SlackBuild b/office/rednotebook/rednotebook.SlackBuild
index 3419360455..f7328f211d 100644
--- a/office/rednotebook/rednotebook.SlackBuild
+++ b/office/rednotebook/rednotebook.SlackBuild
@@ -22,8 +22,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rednotebook
-VERSION=${VERSION:-1.1.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.11}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -75,7 +75,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CHANGELOG LICENSE README.Packagers README  \
+  AUTHORS CHANGELOG LICENSE  \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/office/rednotebook/rednotebook.info b/office/rednotebook/rednotebook.info
index cb43335bd9..a739a68e21 100644
--- a/office/rednotebook/rednotebook.info
+++ b/office/rednotebook/rednotebook.info
@@ -1,8 +1,8 @@
 PRGNAM="rednotebook"
-VERSION="1.1.6"
+VERSION="1.11"
 HOMEPAGE="http://rednotebook.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/rednotebook/rednotebook-1.1.6.tar.gz"
-MD5SUM="a2abc6d89a05dab97f56c8585a48a603"
+DOWNLOAD="http://downloads.sourceforge.net/project/rednotebook/rednotebook-1.11.tar.gz"
+MD5SUM="2a4feff4632b094731be2be4138208a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="PyYAML pywebkitgtk"
diff --git a/office/remind/remind.SlackBuild b/office/remind/remind.SlackBuild
index 75073f5cf8..e1f8a415f1 100644
--- a/office/remind/remind.SlackBuild
+++ b/office/remind/remind.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=remind
-VERSION=${VERSION:-03.01.14}
+VERSION=${VERSION:-03.01.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/remind/remind.info b/office/remind/remind.info
index 0ddd63e092..b27fc7b656 100644
--- a/office/remind/remind.info
+++ b/office/remind/remind.info
@@ -1,8 +1,8 @@
 PRGNAM="remind"
-VERSION="03.01.14"
+VERSION="03.01.15"
 HOMEPAGE="https://www.roaringpenguin.com/products/remind"
-DOWNLOAD="https://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz"
-MD5SUM="a6c4677363d90fd279b52e3206955cba"
+DOWNLOAD="https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz"
+MD5SUM="089c51c060fdda2357a833800a5bfe39"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/task/task.SlackBuild b/office/task/task.SlackBuild
index 3797b9f786..771c12799c 100644
--- a/office/task/task.SlackBuild
+++ b/office/task/task.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Jostein Berntsen <jbernts@broadpark.no>
 
 PRGNAM=task
-VERSION=${VERSION:-2.4.4}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CMakeLists.txt COPYING ChangeLog DEVELOPER EXPOSITION INSTALL LICENSE NEWS README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/task/task.info b/office/task/task.info
index e0305f9a4d..32333ec10a 100644
--- a/office/task/task.info
+++ b/office/task/task.info
@@ -1,8 +1,8 @@
 PRGNAM="task"
-VERSION="2.4.4"
+VERSION="2.5.0"
 HOMEPAGE="http://www.taskwarrior.org"
-DOWNLOAD="http://www.taskwarrior.org/download/task-2.4.4.tar.gz"
-MD5SUM="517450c4a23a5842df3e9905b38801b3"
+DOWNLOAD="http://www.taskwarrior.org/download/task-2.5.0.tar.gz"
+MD5SUM="bca2a8a6f7727ccbcefd5e190d935910"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"
diff --git a/office/tellico/tellico.SlackBuild b/office/tellico/tellico.SlackBuild
index a5c2afe077..6dc4d8bcfd 100644
--- a/office/tellico/tellico.SlackBuild
+++ b/office/tellico/tellico.SlackBuild
@@ -2,6 +2,7 @@
 
 # SlackBuild script for tellico
 
+# Copyright 2015 Benjamin Trigona-Harany
 # Copyright 2009 Gilcio Amaral <gilcio.amaral@gmail.com>
 # Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
@@ -26,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tellico
-VERSION=${VERSION:-2.3.10}
+VERSION=${VERSION:-2.3.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/tellico/tellico.info b/office/tellico/tellico.info
index 16054768b1..9b440aea33 100644
--- a/office/tellico/tellico.info
+++ b/office/tellico/tellico.info
@@ -1,8 +1,8 @@
 PRGNAM="tellico"
-VERSION="2.3.10"
+VERSION="2.3.11"
 HOMEPAGE="http://tellico-project.org/"
-DOWNLOAD="http://tellico-project.org/files/tellico-2.3.10.tar.bz2"
-MD5SUM="06b29f88fe9883ddf9550ce541a0c180"
+DOWNLOAD="http://tellico-project.org/files/tellico-2.3.11.tar.bz2"
+MD5SUM="8f79b02147167f95111c334cf6c0376c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index 827c138245..2ebab9efd3 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -1,13 +1,13 @@
 PRGNAM="texlive"
 VERSION="20140525"
 HOMEPAGE="http://tug.org/texlive/"
-DOWNLOAD="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz
+DOWNLOAD="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz \
           http://harrier.slackbuilds.org/texlive-2014/texlive/texlive-texmf-tetexish-20140525.tar.xz \
           http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/1.8/binaries/Linux/biber-linux_x86_32.tar.gz"
 MD5SUM="09ee265ff51637827559affc7304078c \
         a8498dbad49e093a9608fe57b015bf3a \
         1011bee56611d55a1818a8698afdc6ed"
-DOWNLOAD_x86_64="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz
+DOWNLOAD_x86_64="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz \
                  http://harrier.slackbuilds.org/texlive-2014/texlive/texlive-texmf-tetexish-20140525.tar.xz \
                  http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/1.8/binaries/Linux/biber-linux_x86_64.tar.gz"
 MD5SUM_x86_64="09ee265ff51637827559affc7304078c \
diff --git a/office/texmacs/texmacs.SlackBuild b/office/texmacs/texmacs.SlackBuild
index a5df00b5b2..f6e937c5ed 100644
--- a/office/texmacs/texmacs.SlackBuild
+++ b/office/texmacs/texmacs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Texmacs
 
-# Copyright 2013 Zhu Qun-Ying
+# Copyright 2013,2015 Zhu Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texmacs
-VERSION=${VERSION:-1.0.7.21}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.99.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=TeXmacs
@@ -87,6 +87,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
+sed -i -e "s|-lfreetype|-lfreetype -lz|" src/makefile
+
 make
 make install DESTDIR=$PKG
 
diff --git a/office/texmacs/texmacs.info b/office/texmacs/texmacs.info
index d6f935225d..77faf71bfe 100644
--- a/office/texmacs/texmacs.info
+++ b/office/texmacs/texmacs.info
@@ -1,8 +1,8 @@
 PRGNAM="texmacs"
-VERSION="1.0.7.21"
+VERSION="1.99.2"
 HOMEPAGE="http://www.texmacs.org"
-DOWNLOAD="http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.0.7.21-src.tar.gz"
-MD5SUM="a56e2f14761e9003471fd26d91058ef0"
+DOWNLOAD="http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.99.2-src.tar.gz"
+MD5SUM="544ee0ada9a7fe0ea39e33d94e8d5ff5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="guile1.8"
diff --git a/office/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild
index b1a6509b1f..e47e2c55e0 100644
--- a/office/texmaker/texmaker.SlackBuild
+++ b/office/texmaker/texmaker.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for texmaker
 
-# Copyright 2013-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texmaker
-VERSION=${VERSION:-4.4.1}
+VERSION=${VERSION:-4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,10 +64,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Check for Qt5 or else drop back to Qt4.
 if [ "${QT5GUI:-no}" == "yes" ]; then
@@ -81,7 +81,7 @@ fi
 make
 make install INSTALL_ROOT=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 install -D -m 0644 utilities/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1
diff --git a/office/texmaker/texmaker.info b/office/texmaker/texmaker.info
index cba5dc897b..e60a786825 100644
--- a/office/texmaker/texmaker.info
+++ b/office/texmaker/texmaker.info
@@ -1,8 +1,8 @@
 PRGNAM="texmaker"
-VERSION="4.4.1"
+VERSION="4.5"
 HOMEPAGE="http://www.xm1math.net/texmaker/index.html"
-DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-4.4.1.tar.bz2"
-MD5SUM="d6af622aa9ab1ec29c799842f2b76dc7"
+DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-4.5.tar.bz2"
+MD5SUM="156ffad5b7193e0cfecd2d3689f3a7a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/texstudio/texstudio.SlackBuild b/office/texstudio/texstudio.SlackBuild
index 5e11b0ca1e..524a43aa7d 100644
--- a/office/texstudio/texstudio.SlackBuild
+++ b/office/texstudio/texstudio.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texstudio
-VERSION=${VERSION:-2.9.4}
+VERSION=${VERSION:-2.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,7 +84,7 @@ fi
 make
 make install INSTALL_ROOT=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/man/man1
@@ -99,7 +99,7 @@ install -D -m 0644 utilities/$PRGNAM.svg \
   $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a utilities/{AUTHORS,CHANGELOG.txt,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a utilities/{AUTHORS,license.txt,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -f $PKG/usr/share/$PRGNAM/{COPYING,CHANGELOG.txt,AUTHORS}
 
diff --git a/office/texstudio/texstudio.info b/office/texstudio/texstudio.info
index 21c5283d9c..15e1e0170f 100644
--- a/office/texstudio/texstudio.info
+++ b/office/texstudio/texstudio.info
@@ -1,8 +1,8 @@
 PRGNAM="texstudio"
-VERSION="2.9.4"
+VERSION="2.10.4"
 HOMEPAGE="http://texstudio.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.9.4.tar.gz"
-MD5SUM="398baea51cf9f9f15ab961da09efb263"
+DOWNLOAD="http://downloads.sourceforge.net/texstudio/texstudio-2.10.4.tar.gz"
+MD5SUM="96b34746e5a2b7b41111cc7ac83d7a92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/timetrap/timetrap.SlackBuild b/office/timetrap/timetrap.SlackBuild
index 95381e531a..3fa955e132 100644
--- a/office/timetrap/timetrap.SlackBuild
+++ b/office/timetrap/timetrap.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=timetrap
-VERSION=${VERSION:-1.8.14}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/timetrap/timetrap.info b/office/timetrap/timetrap.info
index 5aafa854ae..41920e1e1b 100644
--- a/office/timetrap/timetrap.info
+++ b/office/timetrap/timetrap.info
@@ -1,8 +1,8 @@
 PRGNAM="timetrap"
-VERSION="1.8.14"
+VERSION="1.10.0"
 HOMEPAGE="https://github.com/samg/timetrap"
-DOWNLOAD="http://rubygems.org/downloads/timetrap-1.8.14.gem"
-MD5SUM="4beb5818745f30624e596d11785d85d0"
+DOWNLOAD="http://rubygems.org/downloads/timetrap-1.10.0.gem"
+MD5SUM="e4832ea5894048da22e2c143e86cd1a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="sequel sqlite3 chronic"
diff --git a/office/unoconv/unoconv.SlackBuild b/office/unoconv/unoconv.SlackBuild
index 914bca13a0..9950d70595 100644
--- a/office/unoconv/unoconv.SlackBuild
+++ b/office/unoconv/unoconv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for unoconv
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unoconv
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,7 @@ gzip -9 doc/$PRGNAM.1
 install -D -m0644 doc/$PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog README* WISHLIST doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog README.adoc doc/*.adoc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/unoconv/unoconv.info b/office/unoconv/unoconv.info
index 43ed3f51cb..64761fa0ef 100644
--- a/office/unoconv/unoconv.info
+++ b/office/unoconv/unoconv.info
@@ -1,10 +1,10 @@
 PRGNAM="unoconv"
-VERSION="0.6"
+VERSION="0.7"
 HOMEPAGE="http://dag.wiee.rs/home-made/unoconv"
-DOWNLOAD="https://github.com/dagwieers/unoconv/archive/0.6.tar.gz"
-MD5SUM="2b5b8e4c1c62f2b3cba48ceabc1f3671"
+DOWNLOAD="https://github.com/dagwieers/unoconv/archive/0.7.tar.gz"
+MD5SUM="ee1a8050cdb64672101c0ecc5659913a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libreoffice"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/office/verbiste/verbiste.SlackBuild b/office/verbiste/verbiste.SlackBuild
index 008727b612..1fa11c1f08 100644
--- a/office/verbiste/verbiste.SlackBuild
+++ b/office/verbiste/verbiste.SlackBuild
@@ -47,7 +47,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/office/verbiste/verbiste.info b/office/verbiste/verbiste.info
index bc7d083f1e..267872a6b2 100644
--- a/office/verbiste/verbiste.info
+++ b/office/verbiste/verbiste.info
@@ -1,7 +1,7 @@
 PRGNAM="verbiste"
 VERSION="0.1.40"
 HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/verbiste.html"
-DOWNLOAD="http://perso.b2b2c.ca/sarrazip/dev/verbiste-0.1.40.tar.gz"
+DOWNLOAD="ftp://ftp.fau.de/mint/lmde-packages/pools/B/pool/main/v/verbiste/verbiste_0.1.40.orig.tar.gz"
 MD5SUM="e5801736ba08818dbb6edc61b7e214db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/office/xmind/xmind.info b/office/xmind/xmind.info
index bd712e152c..8d5a6f4219 100644
--- a/office/xmind/xmind.info
+++ b/office/xmind/xmind.info
@@ -1,9 +1,9 @@
 PRGNAM="xmind"
 VERSION="3.5.1"
 HOMEPAGE="http://www.xmind.net/"
-DOWNLOAD="http://dl2.xmind.net/xmind-downloads/xmind-linux-3.5.1.201411201906_i386.deb"
+DOWNLOAD="http://www10.frugalware.org/pub/linux/frugalware/frugalware-2.0/source/xapps-extra/xmind/xmind-linux-3.5.1.201411201906_i386.deb"
 MD5SUM="71e6334967f6ec8a8e3ab643eba1a783"
-DOWNLOAD_x86_64="http://dl2.xmind.net/xmind-downloads/xmind-linux-3.5.1.201411201906_amd64.deb"
+DOWNLOAD_x86_64="http://www10.frugalware.org/pub/linux/frugalware/frugalware-2.0/source/xapps-extra/xmind/xmind-linux-3.5.1.201411201906_amd64.deb"
 MD5SUM_x86_64="de438124b307ba9fd726c24ba7b7e53f"
 REQUIRES="jdk"
 MAINTAINER="Andre Barboza"
diff --git a/office/xpad/patches/xpad-undo.patch b/office/xpad/patches/xpad-undo.patch
deleted file mode 100644
index ba86325752..0000000000
--- a/office/xpad/patches/xpad-undo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/xpad-undo.c	2012-11-16 11:07:43.889800762 -0500
-+++ src/xpad-undo.c	2012-11-16 11:13:32.114998699 -0500
-@@ -23,7 +23,6 @@
- #include "../config.h"
- #include <stdlib.h>
- #include <glib.h>
--#include <glib/glist.h>
- #include "xpad-undo.h"
- #include "xpad-text-buffer.h"
- 
diff --git a/office/xpad/xpad.SlackBuild b/office/xpad/xpad.SlackBuild
index 229acbfa7a..79c56d7a0a 100644
--- a/office/xpad/xpad.SlackBuild
+++ b/office/xpad/xpad.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
-
 # Slackware build script for xpad
 
+# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+
 # Copyright 2011  Howard Pepper <h_pepper {at} bellsouth {dot} net>
 # Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
@@ -65,13 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# patch the relevant files:
-patch -p0 < $CWD/patches/xpad-undo.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/office/xpad/xpad.info b/office/xpad/xpad.info
index 7b2ed80b5d..3a24de8bc8 100644
--- a/office/xpad/xpad.info
+++ b/office/xpad/xpad.info
@@ -1,10 +1,10 @@
 PRGNAM="xpad"
 VERSION="4.1"
 HOMEPAGE="http://mterry.name/xpad/"
-DOWNLOAD="http://launchpad.net/xpad/trunk/4.1/+download/xpad-4.1.tar.bz2"
+DOWNLOAD="https://launchpad.net/xpad/trunk/4.1/+download/xpad-4.1.tar.bz2"
 MD5SUM="e37bfbe2331d810124c28150fdf30b3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Howard Pepper"
-EMAIL="h_pepper <at> bellsouth {dot} net"
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
diff --git a/office/xtrkcad/xtrkcad.SlackBuild b/office/xtrkcad/xtrkcad.SlackBuild
index aef15a67b2..8e0dcba351 100644
--- a/office/xtrkcad/xtrkcad.SlackBuild
+++ b/office/xtrkcad/xtrkcad.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xtrkcad
 
-# Copyright 2013 Heiko Rosemann Germany
+# Copyright 2013-2015 Heiko Rosemann Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xtrkcad
-VERSION=${VERSION:-4.2.0}
+VERSION=${VERSION:-4.2.2}
 SRCVERSION=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-source-$SRCVERSION.tar.gz
+tar xvzf $CWD/$PRGNAM-source-$SRCVERSION.tar.gz
 cd $PRGNAM-source-$SRCVERSION
 chown -R root:root .
 find -L . \
diff --git a/office/xtrkcad/xtrkcad.info b/office/xtrkcad/xtrkcad.info
index 9fa3d143ec..469a185e96 100644
--- a/office/xtrkcad/xtrkcad.info
+++ b/office/xtrkcad/xtrkcad.info
@@ -1,8 +1,8 @@
 PRGNAM="xtrkcad"
-VERSION="4.2.0"
+VERSION="4.2.2"
 HOMEPAGE="http://sourceforge.net/projects/xtrkcad-fork"
-DOWNLOAD="http://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/xtrkcad-source-4.2.0.tar.gz"
-MD5SUM="79b8128dcae723e00e002db49f5faf85"
+DOWNLOAD="http://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/Version%204.2.2/xtrkcad-source-4.2.2.tar.gz"
+MD5SUM="f499d6603f0425a9d46751ce96d6eff5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkitgtk"
diff --git a/office/zathura-pdf-mupdf/patches/0001-Use-correct-free-function-for-search-results.patch b/office/zathura-pdf-mupdf/patches/0001-Use-correct-free-function-for-search-results.patch
deleted file mode 100644
index 6eaa0775ad..0000000000
--- a/office/zathura-pdf-mupdf/patches/0001-Use-correct-free-function-for-search-results.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e2dbf4be4709c54d3e3859eba4ceb9cdab8e6b43 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq@pwmt.org>
-Date: Thu, 20 Nov 2014 13:58:42 +0100
-Subject: [PATCH 1/6] Use correct free function for search results
-
----
- search.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/search.c b/search.c
-index d0a148f..3a9fad4 100644
---- a/search.c
-+++ b/search.c
-@@ -26,7 +26,7 @@ pdf_page_search_text(zathura_page_t* page, mupdf_page_t* mupdf_page, const char*
- 
-   mupdf_document_t* mupdf_document = zathura_document_get_data(document);;
- 
--  girara_list_t* list = girara_list_new2((girara_free_function_t) zathura_link_free);
-+  girara_list_t* list = girara_list_new2(g_free);
-   if (list == NULL) {
-     if (error != NULL) {
-       *error = ZATHURA_ERROR_OUT_OF_MEMORY;
--- 
-1.8.4
-
diff --git a/office/zathura-pdf-mupdf/patches/0002-Handle-additional-and-missing-link-types-in-outline.patch b/office/zathura-pdf-mupdf/patches/0002-Handle-additional-and-missing-link-types-in-outline.patch
deleted file mode 100644
index fa62463d31..0000000000
--- a/office/zathura-pdf-mupdf/patches/0002-Handle-additional-and-missing-link-types-in-outline.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 23b5d6f2822bb27ec97de0701aefeed2a539f06a Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq@pwmt.org>
-Date: Sat, 7 Feb 2015 15:56:59 +0100
-Subject: [PATCH 2/6] Handle additional and missing link types in outline
-
----
- index.c | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/index.c b/index.c
-index 023944f..80c1068 100644
---- a/index.c
-+++ b/index.c
-@@ -73,17 +73,31 @@ build_index(fz_outline* outline, girara_tree_node_t* root)
-           if (gflags & fz_link_flag_t_valid) {
-             target.top = outline->dest.ld.gotor.lt.y;
-           }
--          if (gflags & fz_link_flag_r_is_zoom) {
--            target.scale = outline->dest.ld.gotor.rb.x;
--          }
-+          /* if (gflags & fz_link_flag_r_is_zoom) { */
-+          /*   target.scale = outline->dest.ld.gotor.rb.x; */
-+          /* } */
-         }
-         break;
-+      case FZ_LINK_LAUNCH:
-+        type = ZATHURA_LINK_LAUNCH;
-+        target.value = outline->dest.ld.launch.file_spec;
-+        break;
-+      case FZ_LINK_NAMED:
-+        type = ZATHURA_LINK_NAMED;
-+        target.value = outline->dest.ld.named.named;
-+        break;
-+      case FZ_LINK_GOTOR:
-+        type = ZATHURA_LINK_GOTO_REMOTE;
-+        target.value = outline->dest.ld.gotor.file_spec;
-+        break;
-       default:
-+        outline = outline->next; // TODO: Don't skip unknown type
-         continue;
-     }
- 
-     index_element->link = zathura_link_new(type, rect, target);
-     if (index_element->link == NULL) {
-+      outline = outline->next;
-       continue;
-     }
- 
--- 
-1.8.4
-
diff --git a/office/zathura-pdf-mupdf/patches/0003-Update-for-1.7-API-changes.patch b/office/zathura-pdf-mupdf/patches/0003-Update-for-1.7-API-changes.patch
deleted file mode 100644
index ecb78e0fbf..0000000000
--- a/office/zathura-pdf-mupdf/patches/0003-Update-for-1.7-API-changes.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-From f96dd48825c049bbccb2e25a814c49d03fedf86c Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq@pwmt.org>
-Date: Sun, 19 Apr 2015 10:39:02 +0200
-Subject: [PATCH 3/6] Update for 1.7 API changes
-
-Thanks to Leonardo Taccari
----
- README     |  2 +-
- document.c | 16 +++++++-------
- image.c    | 70 +++++++++++++++++++++++++++++++++++++++++---------------------
- index.c    |  4 ++--
- links.c    |  2 +-
- page.c     | 10 ++++-----
- render.c   |  8 +++----
- utils.c    |  4 ++--
- 8 files changed, 70 insertions(+), 46 deletions(-)
-
-diff --git a/README b/README
-index 9773daf..34db54a 100644
---- a/README
-+++ b/README
-@@ -7,7 +7,7 @@ Requirements
- ------------
- zathura (>= 0.2.0)
- girara
--mupdf (>= 1.3)
-+mupdf (>= 1.7)
- openjpeg (>= 2.0)
- 
- Installation
-diff --git a/document.c b/document.c
-index ec26e9d..38e70b5 100644
---- a/document.c
-+++ b/document.c
-@@ -51,14 +51,14 @@ pdf_document_open(zathura_document_t* document)
-   }
- 
-   /* authenticate if password is required and given */
--  if (fz_needs_password(mupdf_document->document) != 0) {
--    if (password == NULL || fz_authenticate_password(mupdf_document->document, (char*) password) == 0) {
-+  if (fz_needs_password(mupdf_document->ctx, mupdf_document->document) != 0) {
-+    if (password == NULL || fz_authenticate_password(mupdf_document->ctx, mupdf_document->document, (char*) password) == 0) {
-       error = ZATHURA_ERROR_INVALID_PASSWORD;
-       goto error_free;
-     }
-   }
- 
--  zathura_document_set_number_of_pages(document, fz_count_pages(mupdf_document->document));
-+  zathura_document_set_number_of_pages(document, fz_count_pages(mupdf_document->ctx, mupdf_document->document));
-   zathura_document_set_data(document, mupdf_document);
- 
-   return error;
-@@ -67,10 +67,10 @@ error_free:
- 
-   if (mupdf_document != NULL) {
-     if (mupdf_document->document != NULL) {
--      fz_close_document(mupdf_document->document);
-+      fz_drop_document(mupdf_document->ctx, mupdf_document->document);
-     }
-     if (mupdf_document->ctx != NULL) {
--      fz_free_context(mupdf_document->ctx);
-+      fz_drop_context(mupdf_document->ctx);
-     }
- 
-     free(mupdf_document);
-@@ -90,8 +90,8 @@ pdf_document_free(zathura_document_t* document, mupdf_document_t* mupdf_document
-     return ZATHURA_ERROR_INVALID_ARGUMENTS;
-   }
- 
--  fz_close_document(mupdf_document->document);
--  fz_free_context(mupdf_document->ctx);
-+  fz_drop_document(mupdf_document->ctx, mupdf_document->document);
-+  fz_drop_context(mupdf_document->ctx);
-   free(mupdf_document);
-   zathura_document_set_data(document, NULL);
- 
-@@ -112,7 +112,7 @@ pdf_document_save_as(zathura_document_t* document, mupdf_document_t*
-      * options. */
- 
-     fz_write_options opts = { 0 }; /* just use the default options */
--    fz_write_document(mupdf_document->document, (char*) path, &opts);
-+    fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
-   } fz_catch (mupdf_document->ctx) {
-     return ZATHURA_ERROR_UNKNOWN;
-   }
-diff --git a/image.c b/image.c
-index 90d6899..ef2f67b 100644
---- a/image.c
-+++ b/image.c
-@@ -9,8 +9,8 @@
- #include "plugin.h"
- 
- static void pdf_zathura_image_free(zathura_image_t* image);
--static void get_images(pdf_obj* dict, girara_list_t* list);
--static void get_resources(pdf_obj* resource, girara_list_t* list);
-+static void get_images(zathura_page_t* page, pdf_obj* dict, girara_list_t* list);
-+static void get_resources(zathura_page_t* page, pdf_obj* resource, girara_list_t* list);
- 
- girara_list_t*
- pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_error_t* error)
-@@ -30,12 +30,12 @@ pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_erro
- 
-   mupdf_document_t* mupdf_document = zathura_document_get_data(document);
- 
--  pdf_obj* page_object = pdf_load_object((pdf_document*) mupdf_document->document, zathura_page_get_index(page), 0);
-+  pdf_obj* page_object = pdf_load_object(mupdf_document->ctx, (pdf_document*) mupdf_document->document, zathura_page_get_index(page), 0);
-   if (page_object == NULL) {
-     goto error_free;
-   }
- 
--  pdf_obj* resource = pdf_dict_gets(page_object, "Resources");
-+  pdf_obj* resource = pdf_dict_gets(mupdf_document->ctx, page_object, "Resources");
-   if (resource == NULL) {
-     goto error_free;
-   }
-@@ -50,7 +50,7 @@ pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_erro
- 
-   girara_list_set_free_function(list, (girara_free_function_t) pdf_zathura_image_free);
- 
--  get_resources(resource, list);
-+  get_resources(page, resource, list);
- 
-   return list;
- 
-@@ -81,20 +81,32 @@ pdf_zathura_image_free(zathura_image_t* image)
- }
- 
- static void
--get_images(pdf_obj* dict, girara_list_t* list)
-+get_images(zathura_page_t* page, pdf_obj* dict, girara_list_t* list)
- {
-   if (dict == NULL || list == NULL) {
-     return;
-   }
- 
--  for (int i = 0; i < pdf_dict_len(dict); i++) {
--    pdf_obj* image_dict = pdf_dict_get_val(dict, i);
--    if (pdf_is_dict(image_dict) == 0) {
-+  if (page == NULL) {
-+    return;
-+  }
-+
-+  zathura_document_t* document = zathura_page_get_document(page);
-+
-+  if (document == NULL) {
-+    return;
-+  }
-+
-+  mupdf_document_t* mupdf_document = zathura_document_get_data(document);
-+
-+  for (int i = 0; i < pdf_dict_len(mupdf_document->ctx, dict); i++) {
-+    pdf_obj* image_dict = pdf_dict_get_val(mupdf_document->ctx, dict, i);
-+    if (pdf_is_dict(mupdf_document->ctx, image_dict) == 0) {
-       continue;
-     }
- 
--    pdf_obj* type = pdf_dict_gets(image_dict, "Subtype");
--    if (strcmp(pdf_to_name(type), "Image") != 0) {
-+    pdf_obj* type = pdf_dict_gets(mupdf_document->ctx, image_dict, "Subtype");
-+    if (strcmp(pdf_to_name(mupdf_document->ctx, type), "Image") != 0) {
-       continue;
-     }
- 
-@@ -110,8 +122,8 @@ get_images(pdf_obj* dict, girara_list_t* list)
-       continue;
-     }
- 
--    pdf_obj* width  = pdf_dict_gets(image_dict, "Width");
--    pdf_obj* height = pdf_dict_gets(image_dict, "Height");
-+    pdf_obj* width  = pdf_dict_gets(mupdf_document->ctx, image_dict, "Width");
-+    pdf_obj* height = pdf_dict_gets(mupdf_document->ctx, image_dict, "Height");
- 
-     zathura_image_t* zathura_image = g_malloc(sizeof(zathura_image_t));
- 
-@@ -120,33 +132,45 @@ get_images(pdf_obj* dict, girara_list_t* list)
-     // FIXME: Get correct image coordinates
-     zathura_image->data        = image_dict;
-     zathura_image->position.x1 = 0;
--    zathura_image->position.x2 = pdf_to_int(width);
-+    zathura_image->position.x2 = pdf_to_int(mupdf_document->ctx, width);
-     zathura_image->position.y1 = 0;
--    zathura_image->position.y2 = pdf_to_int(height);
-+    zathura_image->position.y2 = pdf_to_int(mupdf_document->ctx, height);
- 
-     girara_list_append(list, zathura_image);
-   }
- }
- 
- static void
--get_resources(pdf_obj* resource, girara_list_t* list)
-+get_resources(zathura_page_t* page, pdf_obj* resource, girara_list_t* list)
- {
-   if (resource == NULL || list == NULL) {
-     return;
-   }
- 
--  pdf_obj* x_object = pdf_dict_gets(resource, "XObject");
-+  if (page == NULL) {
-+    return;
-+  }
-+
-+  zathura_document_t* document = zathura_page_get_document(page);
-+
-+  if (document == NULL) {
-+    return;
-+  }
-+
-+  mupdf_document_t* mupdf_document = zathura_document_get_data(document);
-+
-+  pdf_obj* x_object = pdf_dict_gets(mupdf_document->ctx, resource, "XObject");
-   if (x_object == NULL) {
-     return;
-   }
- 
--  get_images(x_object, list);
-+  get_images(page, x_object, list);
- 
--  for (int i = 0; i < pdf_dict_len(x_object); i++) {
--    pdf_obj* obj = pdf_dict_get_val(x_object, i);
--    pdf_obj* subsrc = pdf_dict_gets(obj, "Resources");
--    if (subsrc != NULL && pdf_objcmp(resource, subsrc)) {
--      get_resources(subsrc, list);
-+  for (int i = 0; i < pdf_dict_len(mupdf_document->ctx, x_object); i++) {
-+    pdf_obj* obj = pdf_dict_get_val(mupdf_document->ctx, x_object, i);
-+    pdf_obj* subsrc = pdf_dict_gets(mupdf_document->ctx, obj, "Resources");
-+    if (subsrc != NULL && pdf_objcmp(mupdf_document->ctx, resource, subsrc)) {
-+      get_resources(page, subsrc, list);
-     }
-   }
- }
-diff --git a/index.c b/index.c
-index 80c1068..8b8f8a5 100644
---- a/index.c
-+++ b/index.c
-@@ -19,7 +19,7 @@ pdf_document_index_generate(zathura_document_t* document, mupdf_document_t* mupd
-   }
- 
-   /* get outline */
--  fz_outline* outline = fz_load_outline(mupdf_document->document);
-+  fz_outline* outline = fz_load_outline(mupdf_document->ctx, mupdf_document->document);
-   if (outline == NULL) {
-     if (error != NULL) {
-       *error = ZATHURA_ERROR_UNKNOWN;
-@@ -32,7 +32,7 @@ pdf_document_index_generate(zathura_document_t* document, mupdf_document_t* mupd
-   build_index(outline, root);
- 
-   /* free outline */
--  fz_free_outline(mupdf_document->ctx, outline);
-+  fz_drop_outline(mupdf_document->ctx, outline);
- 
-   return root;
- }
-diff --git a/links.c b/links.c
-index 21be39d..a947802 100644
---- a/links.c
-+++ b/links.c
-@@ -31,7 +31,7 @@ pdf_page_links_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_error
-     goto error_free;
-   }
- 
--  fz_link* link = fz_load_links(mupdf_document->document, mupdf_page->page);
-+  fz_link* link = fz_load_links(mupdf_document->ctx, mupdf_page->page);
-   for (; link != NULL; link = link->next) {
-     /* extract position */
-     zathura_rectangle_t position;
-diff --git a/page.c b/page.c
-index 9032622..beb0351 100644
---- a/page.c
-+++ b/page.c
-@@ -29,12 +29,12 @@ pdf_page_init(zathura_page_t* page)
- 
-   /* load page */
-   fz_try (mupdf_page->ctx) {
--    mupdf_page->page = fz_load_page(mupdf_document->document, index);
-+    mupdf_page->page = fz_load_page(mupdf_document->ctx, mupdf_document->document, index);
-   } fz_catch (mupdf_page->ctx) {
-     goto error_free;
-   }
- 
--  fz_bound_page(mupdf_document->document, (fz_page*) mupdf_page->page, &mupdf_page->bbox);
-+  fz_bound_page(mupdf_document->ctx, (fz_page*) mupdf_page->page, &mupdf_page->bbox);
- 
-   /* get page dimensions */
-   zathura_page_set_width(page,  mupdf_page->bbox.x1 - mupdf_page->bbox.x0);
-@@ -74,15 +74,15 @@ pdf_page_clear(zathura_page_t* page, mupdf_page_t* mupdf_page)
- 
-   if (mupdf_page != NULL) {
-     if (mupdf_page->text != NULL) {
--      fz_free_text_page(mupdf_page->ctx, mupdf_page->text);
-+      fz_drop_text_page(mupdf_page->ctx, mupdf_page->text);
-     }
- 
-     if (mupdf_page->sheet != NULL) {
--      fz_free_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
-+      fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
-     }
- 
-     if (mupdf_page->page != NULL) {
--      fz_free_page(mupdf_document->document, mupdf_page->page);
-+      fz_drop_page(mupdf_document->ctx, mupdf_page->page);
-     }
- 
-     free(mupdf_page);
-diff --git a/render.c b/render.c
-index 4ec07ae..e0648e1 100644
---- a/render.c
-+++ b/render.c
-@@ -26,12 +26,12 @@ pdf_page_render_to_buffer(mupdf_document_t* mupdf_document, mupdf_page_t* mupdf_
-   fz_try (mupdf_document->ctx) {
-     fz_matrix m;
-     fz_scale(&m, scalex, scaley);
--    fz_run_page(mupdf_document->document, mupdf_page->page, device, &m, NULL);
-+    fz_run_page(mupdf_document->ctx, mupdf_page->page, device, &m, NULL);
-   } fz_catch (mupdf_document->ctx) {
-     return ZATHURA_ERROR_UNKNOWN;
-   }
- 
--  fz_free_device(device);
-+  fz_drop_device(mupdf_page->ctx, device);
- 
-   fz_irect irect = { .x1 = page_width, .y1 = page_height };
-   fz_rect rect = { .x1 = page_width, .y1 = page_height };
-@@ -41,8 +41,8 @@ pdf_page_render_to_buffer(mupdf_document_t* mupdf_document, mupdf_page_t* mupdf_
-   fz_clear_pixmap_with_value(mupdf_page->ctx, pixmap, 0xFF);
- 
-   device = fz_new_draw_device(mupdf_page->ctx, pixmap);
--  fz_run_display_list(display_list, device, &fz_identity, &rect, NULL);
--  fz_free_device(device);
-+  fz_run_display_list(mupdf_page->ctx, display_list, device, &fz_identity, &rect, NULL);
-+  fz_drop_device(mupdf_page->ctx, device);
- 
-   unsigned char* s = fz_pixmap_samples(mupdf_page->ctx, pixmap);
-   unsigned int n   = fz_pixmap_components(mupdf_page->ctx, pixmap);
-diff --git a/utils.c b/utils.c
-index 13ee788..d45a31d 100644
---- a/utils.c
-+++ b/utils.c
-@@ -17,9 +17,9 @@ mupdf_page_extract_text(mupdf_document_t* mupdf_document, mupdf_page_t* mupdf_pa
-     text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
-     fz_matrix ctm;
-     fz_scale(&ctm, 1.0, 1.0);
--    fz_run_page(mupdf_document->document, mupdf_page->page, text_device, &ctm, NULL);
-+    fz_run_page(mupdf_page->ctx, mupdf_page->page, text_device, &ctm, NULL);
-   } fz_always (mupdf_document->ctx) {
--    fz_free_device(text_device);
-+    fz_drop_device(mupdf_page->ctx, text_device);
-   } fz_catch(mupdf_document->ctx) {
-   }
- 
--- 
-1.8.4
-
diff --git a/office/zathura-pdf-mupdf/patches/0004-Enable-EPUB-support.patch.disabled b/office/zathura-pdf-mupdf/patches/0004-Enable-EPUB-support.patch.disabled
deleted file mode 100644
index 3c731be781..0000000000
--- a/office/zathura-pdf-mupdf/patches/0004-Enable-EPUB-support.patch.disabled
+++ /dev/null
@@ -1,45 +0,0 @@
-From 00792eae08aafb5ba2f429b1cdee0a5fe9c25c61 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq@pwmt.org>
-Date: Sun, 19 Apr 2015 10:49:20 +0200
-Subject: [PATCH 4/6] Enable EPUB support
-
----
- document.c | 8 +++-----
- plugin.c   | 3 ++-
- 2 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/document.c b/document.c
-index 38e70b5..de805bb 100644
---- a/document.c
-+++ b/document.c
-@@ -34,11 +34,9 @@ pdf_document_open(zathura_document_t* document)
-   const char* password = zathura_document_get_password(document);
- 
-   fz_try(mupdf_document->ctx){
--    if (strstr(path, ".xps") != 0 || strstr(path, ".XPS") != 0 || strstr(path, ".rels") != 0) {
--      mupdf_document->document = (fz_document*) xps_open_document(mupdf_document->ctx, (char*) path);
--    } else {
--      mupdf_document->document = (fz_document*) pdf_open_document(mupdf_document->ctx, (char*) path);
--    }
-+    fz_register_document_handlers(mupdf_document->ctx);
-+
-+    mupdf_document->document = fz_open_document(mupdf_document->ctx, path);
-   }
-   fz_catch(mupdf_document->ctx){
-     error = ZATHURA_ERROR_UNKNOWN;
-diff --git a/plugin.c b/plugin.c
-index a115db4..86cb8de 100644
---- a/plugin.c
-+++ b/plugin.c
-@@ -32,6 +32,7 @@ ZATHURA_PLUGIN_REGISTER(
-   register_functions,
-   ZATHURA_PLUGIN_MIMETYPES({
-     "application/pdf",
--    "application/oxps"
-+    "application/oxps",
-+    "application/epub+zip"
-   })
- )
--- 
-1.8.4
-
diff --git a/office/zathura-pdf-mupdf/patches/0005-Locate-and-extract-images-from-pages.patch b/office/zathura-pdf-mupdf/patches/0005-Locate-and-extract-images-from-pages.patch
deleted file mode 100644
index b59bb9aec3..0000000000
--- a/office/zathura-pdf-mupdf/patches/0005-Locate-and-extract-images-from-pages.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From c3820b67cc2742e531481c7255bfa3bbdbe36a2a Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq@pwmt.org>
-Date: Sun, 19 Apr 2015 23:24:39 +0200
-Subject: [PATCH 5/6] Locate and extract images from pages
-
----
- image.c  | 163 ++++++++++++++++++++++++++++-----------------------------------
- plugin.c |   3 +-
- plugin.h |  14 ++++++
- select.c |   3 --
- utils.c  |   4 ++
- 5 files changed, 92 insertions(+), 95 deletions(-)
-
-diff --git a/image.c b/image.c
-index ef2f67b..97d4143 100644
---- a/image.c
-+++ b/image.c
-@@ -7,10 +7,9 @@
- #include <mupdf/pdf.h>
- 
- #include "plugin.h"
-+#include "utils.h"
- 
- static void pdf_zathura_image_free(zathura_image_t* image);
--static void get_images(zathura_page_t* page, pdf_obj* dict, girara_list_t* list);
--static void get_resources(zathura_page_t* page, pdf_obj* resource, girara_list_t* list);
- 
- girara_list_t*
- pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_error_t* error)
-@@ -30,16 +29,7 @@ pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_erro
- 
-   mupdf_document_t* mupdf_document = zathura_document_get_data(document);
- 
--  pdf_obj* page_object = pdf_load_object(mupdf_document->ctx, (pdf_document*) mupdf_document->document, zathura_page_get_index(page), 0);
--  if (page_object == NULL) {
--    goto error_free;
--  }
--
--  pdf_obj* resource = pdf_dict_gets(mupdf_document->ctx, page_object, "Resources");
--  if (resource == NULL) {
--    goto error_free;
--  }
--
-+  /* Setup image list */
-   list = girara_list_new();
-   if (list == NULL) {
-     if (error != NULL) {
-@@ -50,7 +40,25 @@ pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_erro
- 
-   girara_list_set_free_function(list, (girara_free_function_t) pdf_zathura_image_free);
- 
--  get_resources(page, resource, list);
-+  /* Extract images */
-+  mupdf_page_extract_text(mupdf_document, mupdf_page);
-+
-+  fz_page_block* block;
-+  for (block = mupdf_page->text->blocks; block < mupdf_page->text->blocks + mupdf_page->text->len; block++) {
-+    if (block->type == FZ_PAGE_BLOCK_IMAGE) {
-+      fz_image_block *image_block = block->u.image;
-+
-+      zathura_image_t* zathura_image = g_malloc(sizeof(zathura_image_t));
-+
-+      zathura_image->position.x1 = image_block->bbox.x0;
-+      zathura_image->position.y1 = image_block->bbox.y0;
-+      zathura_image->position.x2 = image_block->bbox.x1;
-+      zathura_image->position.y2 = image_block->bbox.y1;
-+      zathura_image->data        = image_block->image;
-+
-+      girara_list_append(list, zathura_image);
-+    }
-+  }
- 
-   return list;
- 
-@@ -69,109 +77,82 @@ error_ret:
-   return NULL;
- }
- 
--
--static void
--pdf_zathura_image_free(zathura_image_t* image)
-+cairo_surface_t*
-+pdf_page_image_get_cairo(zathura_page_t* page, mupdf_page_t* mupdf_page,
-+    zathura_image_t* image, zathura_error_t* error)
- {
--  if (image == NULL) {
--    return;
-+  if (page == NULL || mupdf_page == NULL || image == NULL || image->data == NULL) {
-+    if (error != NULL) {
-+      *error = ZATHURA_ERROR_INVALID_ARGUMENTS;
-+    }
-+    goto error_ret;
-   }
- 
--  g_free(image);
--}
-+  fz_image* mupdf_image = (fz_image*) image->data;
- 
--static void
--get_images(zathura_page_t* page, pdf_obj* dict, girara_list_t* list)
--{
--  if (dict == NULL || list == NULL) {
--    return;
--  }
-+  fz_pixmap* pixmap = NULL;
-+  cairo_surface_t* surface = NULL;
- 
--  if (page == NULL) {
--    return;
-+  pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
-+  if (pixmap == NULL) {
-+    goto error_free;
-   }
- 
--  zathura_document_t* document = zathura_page_get_document(page);
--
--  if (document == NULL) {
--    return;
-+  surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, mupdf_image->w, mupdf_image->h);
-+  if (surface == NULL) {
-+    goto error_free;
-   }
- 
--  mupdf_document_t* mupdf_document = zathura_document_get_data(document);
-+  unsigned char* surface_data = cairo_image_surface_get_data(surface);
-+  int rowstride = cairo_image_surface_get_stride(surface);
- 
--  for (int i = 0; i < pdf_dict_len(mupdf_document->ctx, dict); i++) {
--    pdf_obj* image_dict = pdf_dict_get_val(mupdf_document->ctx, dict, i);
--    if (pdf_is_dict(mupdf_document->ctx, image_dict) == 0) {
--      continue;
--    }
-+  unsigned char* s = fz_pixmap_samples(mupdf_page->ctx, pixmap);
-+  unsigned int n   = fz_pixmap_components(mupdf_page->ctx, pixmap);
- 
--    pdf_obj* type = pdf_dict_gets(mupdf_document->ctx, image_dict, "Subtype");
--    if (strcmp(pdf_to_name(mupdf_document->ctx, type), "Image") != 0) {
--      continue;
--    }
-+  for (unsigned int y = 0; y < fz_pixmap_height(mupdf_page->ctx, pixmap); y++) {
-+    for (unsigned int x = 0; x < fz_pixmap_width(mupdf_page->ctx, pixmap); x++) {
-+      guchar* p = surface_data + y * rowstride + x * 4;
- 
--    bool duplicate = false;
--    GIRARA_LIST_FOREACH(list, zathura_image_t*, iter, image)
--      if (image->data == image_dict) {
--        duplicate = true;
--        break;
-+      // RGB
-+      if (n == 4) {
-+        p[0] = s[2];
-+        p[1] = s[1];
-+        p[2] = s[0];
-+      // Gray-scale or mask
-+      } else {
-+        p[0] = s[0];
-+        p[1] = s[0];
-+        p[2] = s[0];
-       }
--    GIRARA_LIST_FOREACH_END(list, zathura_image_t*, iter, image);
--
--    if (duplicate == true) {
--      continue;
-+      s += n;
-     }
-+  }
- 
--    pdf_obj* width  = pdf_dict_gets(mupdf_document->ctx, image_dict, "Width");
--    pdf_obj* height = pdf_dict_gets(mupdf_document->ctx, image_dict, "Height");
--
--    zathura_image_t* zathura_image = g_malloc(sizeof(zathura_image_t));
--
--    fprintf(stderr, "image\n");
-+  fz_drop_pixmap(mupdf_page->ctx, pixmap);
- 
--    // FIXME: Get correct image coordinates
--    zathura_image->data        = image_dict;
--    zathura_image->position.x1 = 0;
--    zathura_image->position.x2 = pdf_to_int(mupdf_document->ctx, width);
--    zathura_image->position.y1 = 0;
--    zathura_image->position.y2 = pdf_to_int(mupdf_document->ctx, height);
-+  return surface;
- 
--    girara_list_append(list, zathura_image);
--  }
--}
-+error_free:
- 
--static void
--get_resources(zathura_page_t* page, pdf_obj* resource, girara_list_t* list)
--{
--  if (resource == NULL || list == NULL) {
--    return;
-+  if (pixmap != NULL) {
-+    fz_drop_pixmap(mupdf_page->ctx, pixmap);
-   }
- 
--  if (page == NULL) {
--    return;
-+  if (surface != NULL) {
-+    cairo_surface_destroy(surface);
-   }
- 
--  zathura_document_t* document = zathura_page_get_document(page);
--
--  if (document == NULL) {
--    return;
--  }
-+error_ret:
- 
--  mupdf_document_t* mupdf_document = zathura_document_get_data(document);
-+  return NULL;
-+}
- 
--  pdf_obj* x_object = pdf_dict_gets(mupdf_document->ctx, resource, "XObject");
--  if (x_object == NULL) {
-+static void
-+pdf_zathura_image_free(zathura_image_t* image)
-+{
-+  if (image == NULL) {
-     return;
-   }
- 
--  get_images(page, x_object, list);
--
--  for (int i = 0; i < pdf_dict_len(mupdf_document->ctx, x_object); i++) {
--    pdf_obj* obj = pdf_dict_get_val(mupdf_document->ctx, x_object, i);
--    pdf_obj* subsrc = pdf_dict_gets(mupdf_document->ctx, obj, "Resources");
--    if (subsrc != NULL && pdf_objcmp(mupdf_document->ctx, resource, subsrc)) {
--      get_resources(page, subsrc, list);
--    }
--  }
-+  g_free(image);
- }
--
-diff --git a/plugin.c b/plugin.c
-index 86cb8de..fef2c6a 100644
---- a/plugin.c
-+++ b/plugin.c
-@@ -17,12 +17,13 @@ register_functions(zathura_plugin_functions_t* functions)
-   functions->page_links_get           = (zathura_plugin_page_links_get_t) pdf_page_links_get;
- #if 0
-   functions->document_get_information = (zathura_plugin_document_get_information_t) pdf_document_get_information;
--  functions->page_images_get          = (zathura_plugin_page_images_get_t) pdf_page_images_get;
- #endif
-+  functions->page_images_get          = (zathura_plugin_page_images_get_t) pdf_page_images_get;
-   functions->page_get_text            = (zathura_plugin_page_get_text_t) pdf_page_get_text;
-   functions->page_render              = (zathura_plugin_page_render_t) pdf_page_render;
- #if HAVE_CAIRO
-   functions->page_render_cairo        = (zathura_plugin_page_render_cairo_t) pdf_page_render_cairo;
-+  functions->page_image_get_cairo     = (zathura_plugin_page_image_get_cairo_t) pdf_page_image_get_cairo;
- #endif
- }
- 
-diff --git a/plugin.h b/plugin.h
-index a229a74..8b6c74d 100644
---- a/plugin.h
-+++ b/plugin.h
-@@ -113,6 +113,20 @@ girara_list_t* pdf_page_links_get(zathura_page_t* page, mupdf_page_t* mupdf_page
-  */
- girara_list_t* pdf_page_images_get(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_error_t* error);
- 
-+#if HAVE_CAIRO
-+/**
-+ * Gets the content of the image in a cairo surface
-+ *
-+ * @param page Page
-+ * @param image Image identifier
-+ * @param error Set to an error value (see \ref zathura_error_t) if an
-+ *   error occured
-+ * @return The cairo image surface or NULL if an error occured
-+ */
-+cairo_surface_t* pdf_page_image_get_cairo(zathura_page_t* page, mupdf_page_t*
-+    mupdf_page, zathura_image_t* image, zathura_error_t* error);
-+#endif
-+
- /**
-  * Get text for selection
-  * @param page Page
-diff --git a/select.c b/select.c
-index 15f9258..c1e1437 100644
---- a/select.c
-+++ b/select.c
-@@ -7,9 +7,6 @@
- #include "plugin.h"
- #include "utils.h"
- 
--void mupdf_page_extract_text(mupdf_document_t* mupdf_document,
--    mupdf_page_t* mupdf_page);
--
- char*
- pdf_page_get_text(zathura_page_t* page, mupdf_page_t* mupdf_page, zathura_rectangle_t rectangle, zathura_error_t* error)
- {
-diff --git a/utils.c b/utils.c
-index d45a31d..4a003b9 100644
---- a/utils.c
-+++ b/utils.c
-@@ -15,6 +15,10 @@ mupdf_page_extract_text(mupdf_document_t* mupdf_document, mupdf_page_t* mupdf_pa
- 
-   fz_try (mupdf_page->ctx) {
-     text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
-+
-+    /* Disable FZ_IGNORE_IMAGE to collect image blocks */
-+    fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);
-+
-     fz_matrix ctm;
-     fz_scale(&ctm, 1.0, 1.0);
-     fz_run_page(mupdf_page->ctx, mupdf_page->page, text_device, &ctm, NULL);
--- 
-1.8.4
-
diff --git a/office/zathura-pdf-mupdf/patches/0006-Parse-entries-in-the-document-information-dictionary.patch b/office/zathura-pdf-mupdf/patches/0006-Parse-entries-in-the-document-information-dictionary.patch
deleted file mode 100644
index 5101a90cde..0000000000
--- a/office/zathura-pdf-mupdf/patches/0006-Parse-entries-in-the-document-information-dictionary.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 99bff723291f5aa2558e5c8b475f496025105f4a Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <mlq@pwmt.org>
-Date: Mon, 20 Apr 2015 00:30:54 +0200
-Subject: [PATCH 6/6] Parse entries in the document information dictionary
-
----
- document.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- plugin.c   |  4 +--
- 2 files changed, 99 insertions(+), 3 deletions(-)
-
-diff --git a/document.c b/document.c
-index de805bb..873866c 100644
---- a/document.c
-+++ b/document.c
-@@ -6,8 +6,12 @@
- #include <mupdf/xps.h>
- #include <mupdf/pdf.h>
- 
-+#include <glib-2.0/glib.h>
-+
- #include "plugin.h"
- 
-+#define LENGTH(x) (sizeof(x)/sizeof((x)[0]))
-+
- zathura_error_t
- pdf_document_open(zathura_document_t* document)
- {
-@@ -118,3 +122,97 @@ pdf_document_save_as(zathura_document_t* document, mupdf_document_t*
-   return ZATHURA_ERROR_OK;
- }
- 
-+girara_list_t*
-+pdf_document_get_information(zathura_document_t* document, mupdf_document_t*
-+    mupdf_document, zathura_error_t* error)
-+{
-+  if (document == NULL || mupdf_document == NULL || error == NULL) {
-+    if (error != NULL) {
-+      *error = ZATHURA_ERROR_INVALID_ARGUMENTS;
-+    }
-+  }
-+
-+  girara_list_t* list = zathura_document_information_entry_list_new();
-+  if (list == NULL) {
-+    if (error != NULL) {
-+      *error = ZATHURA_ERROR_UNKNOWN;
-+    }
-+    return NULL;
-+  }
-+
-+  fz_try (mupdf_document->ctx) {
-+    pdf_obj* trailer = pdf_trailer(mupdf_document->ctx, (pdf_document*) mupdf_document->document);
-+    pdf_obj* info_dict = pdf_dict_get(mupdf_document->ctx, trailer, PDF_NAME_Info);
-+
-+    /* get string values */
-+    typedef struct info_value_s {
-+      const char* property;
-+      zathura_document_information_type_t type;
-+    } info_value_t;
-+
-+    static const info_value_t string_values[] = {
-+      { "Title",    ZATHURA_DOCUMENT_INFORMATION_TITLE },
-+      { "Author",   ZATHURA_DOCUMENT_INFORMATION_AUTHOR },
-+      { "Subject",  ZATHURA_DOCUMENT_INFORMATION_SUBJECT },
-+      { "Keywords", ZATHURA_DOCUMENT_INFORMATION_KEYWORDS },
-+      { "Creator",  ZATHURA_DOCUMENT_INFORMATION_CREATOR },
-+      { "Producer", ZATHURA_DOCUMENT_INFORMATION_PRODUCER }
-+    };
-+
-+    for (unsigned int i = 0; i < LENGTH(string_values); i++) {
-+      pdf_obj* value = pdf_dict_gets(mupdf_document->ctx, info_dict, string_values[i].property);
-+      if (value == NULL) {
-+        continue;
-+      }
-+
-+      char* str_value = pdf_to_str_buf(mupdf_document->ctx, value);
-+      if (str_value == NULL || strlen(str_value) == 0) {
-+        continue;
-+      }
-+
-+      zathura_document_information_entry_t* entry =
-+        zathura_document_information_entry_new(
-+          string_values[i].type,
-+          str_value
-+        );
-+
-+    if (entry != NULL) {
-+      girara_list_append(list, entry);
-+    }
-+    }
-+
-+    static const info_value_t time_values[] = {
-+      { "CreationDate", ZATHURA_DOCUMENT_INFORMATION_CREATION_DATE },
-+      { "ModDate",      ZATHURA_DOCUMENT_INFORMATION_MODIFICATION_DATE }
-+    };
-+
-+    for (unsigned int i = 0; i < LENGTH(time_values); i++) {
-+      pdf_obj* value = pdf_dict_gets(mupdf_document->ctx, info_dict, time_values[i].property);
-+      if (value == NULL) {
-+        continue;
-+      }
-+
-+      char* str_value = pdf_to_str_buf(mupdf_document->ctx, value);
-+      if (str_value == NULL || strlen(str_value) == 0) {
-+        continue;
-+      }
-+
-+      zathura_document_information_entry_t* entry =
-+        zathura_document_information_entry_new(
-+          time_values[i].type,
-+          str_value // FIXME: Convert to common format
-+        );
-+
-+      if (entry != NULL) {
-+        girara_list_append(list, entry);
-+      }
-+    }
-+  } fz_catch (mupdf_document->ctx) {
-+    if (error != NULL) {
-+      *error = ZATHURA_ERROR_UNKNOWN;
-+    }
-+    return NULL;
-+  }
-+
-+  return list;
-+}
-diff --git a/plugin.c b/plugin.c
-index fef2c6a..2efae6f 100644
---- a/plugin.c
-+++ b/plugin.c
-@@ -11,13 +11,11 @@ register_functions(zathura_plugin_functions_t* functions)
-   functions->document_free            = (zathura_plugin_document_free_t) pdf_document_free;
-   functions->document_save_as         = (zathura_plugin_document_save_as_t) pdf_document_save_as;
-   functions->document_index_generate  = (zathura_plugin_document_index_generate_t) pdf_document_index_generate;
-+  functions->document_get_information = (zathura_plugin_document_get_information_t) pdf_document_get_information;
-   functions->page_init                = (zathura_plugin_page_init_t) pdf_page_init;
-   functions->page_clear               = (zathura_plugin_page_clear_t) pdf_page_clear;
-   functions->page_search_text         = (zathura_plugin_page_search_text_t) pdf_page_search_text;
-   functions->page_links_get           = (zathura_plugin_page_links_get_t) pdf_page_links_get;
--#if 0
--  functions->document_get_information = (zathura_plugin_document_get_information_t) pdf_document_get_information;
--#endif
-   functions->page_images_get          = (zathura_plugin_page_images_get_t) pdf_page_images_get;
-   functions->page_get_text            = (zathura_plugin_page_get_text_t) pdf_page_get_text;
-   functions->page_render              = (zathura_plugin_page_render_t) pdf_page_render;
--- 
-1.8.4
-
diff --git a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild
index 8ff8cc5af8..ca9b6c940f 100644
--- a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild
+++ b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=zathura-pdf-mupdf
-VERSION=${VERSION:-0.2.7}
+VERSION=${VERSION:-0.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,14 +56,6 @@ find -L . \
 # Upstream left the README out of the release tarball for some reason.
 cat $CWD/upstream.README > README
 
-# Patches from upstream's -develop branch, needed for mupdf-1.7 API.
-# Also fix some minor bugs. The patch that enables epub support is
-# disabled here, as it doesn't actually work (yet).
-for patch in $CWD/patches/*.patch; do
-  basename $patch
-  patch -p1 < $patch
-done
-
 # mupdf 1.4 and later no longer have libmupdf-js-none (moved to libmupdf).
 # Anyway it's better to use pkg-config now that mupdf supports it.
 sed -i \
diff --git a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info
index 7ef8d074f6..a516e5f7b8 100644
--- a/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info
+++ b/office/zathura-pdf-mupdf/zathura-pdf-mupdf.info
@@ -1,8 +1,8 @@
 PRGNAM="zathura-pdf-mupdf"
-VERSION="0.2.7"
+VERSION="0.2.8"
 HOMEPAGE="https://www.pwmt.org/projects/zathura-pdf-mupdf/"
-DOWNLOAD="http://www.pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.2.7.tar.gz"
-MD5SUM="b89b45289c8ec77854de4afc149cd1a4"
+DOWNLOAD="http://www.pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.2.8.tar.gz"
+MD5SUM="b0bf109c536bf1da131c38861cebb7e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mupdf zathura"
diff --git a/office/zim/zim.SlackBuild b/office/zim/zim.SlackBuild
index 79376625e2..6641de2991 100644
--- a/office/zim/zim.SlackBuild
+++ b/office/zim/zim.SlackBuild
@@ -2,6 +2,9 @@
 
 # Slackware build script for zim
 
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
 # Copyright 2013 Michael Ren <micron33@gmail.com>
 # All rights reserved.
 #
@@ -23,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zim
-VERSION=${VERSION:-0.60}
+VERSION=${VERSION:-0.65}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/zim/zim.info b/office/zim/zim.info
index 3cabdd5337..ae3d5f824d 100644
--- a/office/zim/zim.info
+++ b/office/zim/zim.info
@@ -1,10 +1,10 @@
 PRGNAM="zim"
-VERSION="0.60"
+VERSION="0.65"
 HOMEPAGE="http://zim-wiki.org/"
-DOWNLOAD="http://zim-wiki.org/downloads/zim-0.60.tar.gz"
-MD5SUM="f781cefa9f8c669b1a664e03361977e2"
+DOWNLOAD="http://zim-wiki.org/downloads/zim-0.65.tar.gz"
+MD5SUM="63ab7a2070e6d1d3fb32700a851d7b8b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Michael Ren"
-EMAIL="micron33@gmail.com"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/perl/Net-SSLeay/Net-SSLeay.SlackBuild b/perl/Net-SSLeay/Net-SSLeay.SlackBuild
index 5528d08022..6e62b0afc7 100644
--- a/perl/Net-SSLeay/Net-SSLeay.SlackBuild
+++ b/perl/Net-SSLeay/Net-SSLeay.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for Net-SSLeay
 #
 # Copyright 2009-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Net-SSLeay
-VERSION=1.55
+VERSION=${VERSION:-1.72}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,32 +60,28 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Change to "y" if you want to enable tests
-# (connectivity needed)
-echo "n" | perl Makefile.PL
-make OPTIMIZE="$SLKCFLAGS"
-make DESTDIR=$PKG \
-     INSTALLDIRS=vendor \
-     INSTALLVENDORMAN3DIR=/usr/man/man3 \
-     install
+echo "n" | perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-( cd $PKG
-  find -L . \( -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs" \) \
-    -exec rm -f {} \;
-)
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/perl/Net-SSLeay/Net-SSLeay.info b/perl/Net-SSLeay/Net-SSLeay.info
index 8cf1994213..75bb0a532b 100644
--- a/perl/Net-SSLeay/Net-SSLeay.info
+++ b/perl/Net-SSLeay/Net-SSLeay.info
@@ -1,10 +1,10 @@
 PRGNAM="Net-SSLeay"
-VERSION="1.55"
+VERSION="1.72"
 HOMEPAGE="https://metacpan.org/pod/Net::SSLeay"
-DOWNLOAD="http://www.cpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-1.55.tar.gz"
-MD5SUM="473b8d66ca69d5784bb0e428721f58e0"
+DOWNLOAD="http://www.cpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-1.72.tar.gz"
+MD5SUM="a740d7792dbac8ca8c4eb38d3b8fbd01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/perl/libwww-perl/libwww-perl.SlackBuild b/perl/libwww-perl/libwww-perl.SlackBuild
index efea91b0b9..06e6875ff6 100644
--- a/perl/libwww-perl/libwww-perl.SlackBuild
+++ b/perl/libwww-perl/libwww-perl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libwww-perl
 
-# Copyright 2008-2014 LukenShiro, Italy
+# Copyright 2008-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libwww-perl
-VERSION=${VERSION:-6.08}
+VERSION=${VERSION:-6.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/libwww-perl/libwww-perl.info b/perl/libwww-perl/libwww-perl.info
index b8c9a97a9e..f5f7cafb48 100644
--- a/perl/libwww-perl/libwww-perl.info
+++ b/perl/libwww-perl/libwww-perl.info
@@ -1,8 +1,8 @@
 PRGNAM="libwww-perl"
-VERSION="6.08"
+VERSION="6.13"
 HOMEPAGE="https://metacpan.org/pod/LWP"
-DOWNLOAD="http://www.cpan.org/authors/id/M/MS/MSCHILLI/libwww-perl-6.08.tar.gz"
-MD5SUM="28e5005609af16c1fa297d12e0312f86"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-6.13.tar.gz"
+MD5SUM="85b36bcd2fd2450718ee14f894f0d3d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-file-listing perl-http-cookies perl-http-daemon perl-http-negotiate perl-net-http perl-www-robotrules"
diff --git a/perl/perl-AnyEvent-HTTP/perl-AnyEvent-HTTP.info b/perl/perl-AnyEvent-HTTP/perl-AnyEvent-HTTP.info
index 9281033a3f..5440343927 100644
--- a/perl/perl-AnyEvent-HTTP/perl-AnyEvent-HTTP.info
+++ b/perl/perl-AnyEvent-HTTP/perl-AnyEvent-HTTP.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-AnyEvent-HTTP"
 VERSION="2.21"
 HOMEPAGE="http://search.cpan.org/~mlehmann/AnyEvent-HTTP/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.21.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/AnyEvent-HTTP-2.21.tar.gz"
 MD5SUM="bbd8b067a5de3dcb1be865e84993cfc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-Astro-SunTime/perl-Astro-SunTime.SlackBuild b/perl/perl-Astro-SunTime/perl-Astro-SunTime.SlackBuild
index 6610872950..8602ed28a7 100644
--- a/perl/perl-Astro-SunTime/perl-Astro-SunTime.SlackBuild
+++ b/perl/perl-Astro-SunTime/perl-Astro-SunTime.SlackBuild
@@ -4,6 +4,8 @@
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
 # All rights reserved.
 #
+# Adopted 2015  Glenn Becker <glenn.becker@gmail.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
diff --git a/perl/perl-Astro-SunTime/perl-Astro-SunTime.info b/perl/perl-Astro-SunTime/perl-Astro-SunTime.info
index aee3583e3d..da17ef3ce0 100644
--- a/perl/perl-Astro-SunTime/perl-Astro-SunTime.info
+++ b/perl/perl-Astro-SunTime/perl-Astro-SunTime.info
@@ -6,5 +6,5 @@ MD5SUM="4657927a49604494bfaaa153663b90b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Time-modules"
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-BerkeleyDB/perl-BerkeleyDB.SlackBuild b/perl/perl-BerkeleyDB/perl-BerkeleyDB.SlackBuild
index aa6eb4e9ca..3c51c45884 100644
--- a/perl/perl-BerkeleyDB/perl-BerkeleyDB.SlackBuild
+++ b/perl/perl-BerkeleyDB/perl-BerkeleyDB.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: BerkeleyDB
 # Home Page http://search.cpan.org/dist/BerkeleyDB/
 
-# Copyright (c) 2009-2013, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
@@ -28,7 +28,7 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM="perl-BerkeleyDB"
-VERSION=${VERSION:-0.53}
+VERSION=${VERSION:-0.55}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,10 +72,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
 chown -R root.root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3
@@ -87,7 +87,6 @@ make install DESTDIR=$PKG
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/perl/perl-BerkeleyDB/perl-BerkeleyDB.info b/perl/perl-BerkeleyDB/perl-BerkeleyDB.info
index 534f226470..8bdb649d7f 100644
--- a/perl/perl-BerkeleyDB/perl-BerkeleyDB.info
+++ b/perl/perl-BerkeleyDB/perl-BerkeleyDB.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-BerkeleyDB"
-VERSION="0.53"
-HOMEPAGE="https://metacpan.org/pod/BerkeleyDB"
-DOWNLOAD="http://www.cpan.org/authors/id/P/PM/PMQS/BerkeleyDB-0.53.tar.gz"
-MD5SUM="899c6967316c7a36b1d5b6a4c7ffbb02"
+VERSION="0.55"
+HOMEPAGE="http://search.cpan.org/dist/BerkeleyDB/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.55.tar.gz"
+MD5SUM="7aa018597792a2f56e80f31d3fe76fa2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.SlackBuild b/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.SlackBuild
index ca99d6cdfb..b5b536f2fc 100644
--- a/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.SlackBuild
+++ b/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
+#
 # Slackware build script for perl-CPAN-Meta-YAML.
-
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -22,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-CPAN-Meta-YAML
-VERSION=${VERSION:-0.016}
+VERSION=${VERSION:-0.018}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,7 +56,7 @@ fi
 
 set -e
 
-SRCNAM=CPAN-Meta-YAML
+SRCNAM="CPAN-Meta-YAML"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.info b/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.info
index 6c608bea9e..92f5f7f44b 100644
--- a/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.info
+++ b/perl/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-CPAN-Meta-YAML"
-VERSION="0.016"
+VERSION="0.018"
 HOMEPAGE="https://metacpan.org/pod/CPAN::Meta::YAML"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.016.tar.gz"
-MD5SUM="edc2b238ad5de69e768bd4f898d85464"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.018.tar.gz"
+MD5SUM="1e00f4426d743c88c6da1b79c7e882a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-CPANPLUS-Dist-Slackware/README b/perl/perl-CPANPLUS-Dist-Slackware/README
index 5a1ced3bc5..81280dbde7 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/README
+++ b/perl/perl-CPANPLUS-Dist-Slackware/README
@@ -1,6 +1,6 @@
 CPANPLUS::Dist::Slackware is a CPANPLUS plugin that creates Slackware
 compatible packages from Perl distributions.  You can either install the
-created packages using the API provided by CPANPLUS or manually via
+created packages using the API provided by CPANPLUS or manually with
 "installpkg".
 
     $ cpanp
diff --git a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild
index fe444011a6..50ebbac02e 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild
+++ b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.SlackBuild
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-CPANPLUS-Dist-Slackware
-VERSION=${VERSION:-1.021}
+VERSION=${VERSION:-1.023}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
index d708223d7b..642302ea3c 100644
--- a/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
+++ b/perl/perl-CPANPLUS-Dist-Slackware/perl-CPANPLUS-Dist-Slackware.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-CPANPLUS-Dist-Slackware"
-VERSION="1.021"
+VERSION="1.023"
 HOMEPAGE="https://metacpan.org/pod/CPANPLUS::Dist::Slackware"
-DOWNLOAD="http://www.cpan.org/authors/id/V/VO/VOEGELAS/CPANPLUS-Dist-Slackware-1.021.tar.gz"
-MD5SUM="9849645cc2b7959394cf813e8cd9a1c4"
+DOWNLOAD="http://www.cpan.org/authors/id/V/VO/VOEGELAS/CPANPLUS-Dist-Slackware-1.023.tar.gz"
+MD5SUM="c7d84b8416072a4fa77a077c69debf9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fakeroot perl-CPANPLUS perl-CPANPLUS-Dist-Build perl-Module-Pluggable"
diff --git a/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild b/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild
index 24f7f29cfb..1fa4205781 100644
--- a/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild
+++ b/perl/perl-CPANPLUS/perl-CPANPLUS.SlackBuild
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-CPANPLUS
-VERSION=${VERSION:-0.9154}
+VERSION=${VERSION:-0.9156}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-CPANPLUS/perl-CPANPLUS.info b/perl/perl-CPANPLUS/perl-CPANPLUS.info
index 5096db2151..fff22369e8 100644
--- a/perl/perl-CPANPLUS/perl-CPANPLUS.info
+++ b/perl/perl-CPANPLUS/perl-CPANPLUS.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-CPANPLUS"
-VERSION="0.9154"
+VERSION="0.9156"
 HOMEPAGE="https://metacpan.org/pod/CPANPLUS"
-DOWNLOAD="http://www.cpan.org/authors/id/B/BI/BINGOS/CPANPLUS-0.9154.tar.gz"
-MD5SUM="a41b3efb2bbbd708a573dbd8d0b6c641"
+DOWNLOAD="http://www.cpan.org/authors/id/B/BI/BINGOS/CPANPLUS-0.9156.tar.gz"
+MD5SUM="99134c27de949d2734278c4b121e5b3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Archive-Extract perl-DBD-SQLite perl-DBIx-Simple perl-Log-Message perl-Module-Pluggable perl-Object-Accessor perl-Term-ReadLine-Gnu perl-Term-UI"
+REQUIRES="perl-Archive-Extract perl-DBD-SQLite perl-DBIx-Simple perl-Log-Message perl-Module-Pluggable perl-Object-Accessor perl-Package-Constants perl-Term-ReadLine-Gnu perl-Term-UI"
 MAINTAINER="Andreas Voegele"
 EMAIL="andreas@andreasvoegele.com"
diff --git a/perl/perl-Canary-Stability/README b/perl/perl-Canary-Stability/README
new file mode 100644
index 0000000000..bd9a9a5b9a
--- /dev/null
+++ b/perl/perl-Canary-Stability/README
@@ -0,0 +1 @@
+canary to check perl compatibility for schmorp's modules
diff --git a/perl/perl-Canary-Stability/perl-Canary-Stability.SlackBuild b/perl/perl-Canary-Stability/perl-Canary-Stability.SlackBuild
new file mode 100644
index 0000000000..354715e752
--- /dev/null
+++ b/perl/perl-Canary-Stability/perl-Canary-Stability.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware Package Build Script for perl modules: Canary::Stability
+# Home Page http://search.cpan.org/dist/Canary-Stability-2006/
+
+# Copyright (c) 2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
+# All rights reserved.
+
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+
+# 1. Redistributions of script must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="perl-Canary-Stability"
+VERSION=${VERSION:-2006}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -f2- -d-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+DOCS="COPYING Changes README"
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -fr $TMP/$SRCNAM-$VERSION $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $TMP/$SRCNAM-$VERSION
+chown -R root.root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+make install DESTDIR=$PKG
+
+### putting essential docs
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Remove perlocal.pod and .packlist from $PKG
+find $PKG -name "perllocal.pod" -o -name ".packlist"  -o -name "*.bs"  | xargs rm -f
+
+# Remove empty directories
+find $PKG -depth -type d -empty -exec rm -rf {} \;
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Canary-Stability/perl-Canary-Stability.info b/perl/perl-Canary-Stability/perl-Canary-Stability.info
new file mode 100644
index 0000000000..0afc5b07bd
--- /dev/null
+++ b/perl/perl-Canary-Stability/perl-Canary-Stability.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Canary-Stability"
+VERSION="2006"
+HOMEPAGE="http://search.cpan.org/dist/Canary-Stability-2006/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Canary-Stability-2006.tar.gz"
+MD5SUM="570ffd5fd8a399b6ba392c8451c8f5ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nishant Limbachia"
+EMAIL="nishant@mnspace.net"
diff --git a/perl/perl-Canary-Stability/slack-desc b/perl/perl-Canary-Stability/slack-desc
new file mode 100644
index 0000000000..596b672001
--- /dev/null
+++ b/perl/perl-Canary-Stability/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+                     |-----handy-ruler------------------------------------------------------|
+perl-Canary-Stability: perl-Canary-Stability (Canary::Stability)
+perl-Canary-Stability:
+perl-Canary-Stability: canary to check perl compatibility for schmorp's modules 
+perl-Canary-Stability: 
+perl-Canary-Stability:
+perl-Canary-Stability: Homepage: http://search.cpan.org/dist/Canary-Stability-2006/
+perl-Canary-Stability:
+perl-Canary-Stability:
+perl-Canary-Stability:
+perl-Canary-Stability:
+perl-Canary-Stability:
diff --git a/perl/perl-Capture-Tiny/perl-Capture-Tiny.SlackBuild b/perl/perl-Capture-Tiny/perl-Capture-Tiny.SlackBuild
index a59d32104a..945aac15d8 100644
--- a/perl/perl-Capture-Tiny/perl-Capture-Tiny.SlackBuild
+++ b/perl/perl-Capture-Tiny/perl-Capture-Tiny.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Capture-Tiny
 
-# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Capture-Tiny
-VERSION=${VERSION:-0.27}
+VERSION=${VERSION:-0.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Capture-Tiny/perl-Capture-Tiny.info b/perl/perl-Capture-Tiny/perl-Capture-Tiny.info
index 60dd9f97f3..863272f8f2 100644
--- a/perl/perl-Capture-Tiny/perl-Capture-Tiny.info
+++ b/perl/perl-Capture-Tiny/perl-Capture-Tiny.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Capture-Tiny"
-VERSION="0.27"
+VERSION="0.30"
 HOMEPAGE="https://metacpan.org/pod/Capture::Tiny"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.27.tar.gz"
-MD5SUM="63ee233f1dfaa75c5233839407b87ae3"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.30.tar.gz"
+MD5SUM="7b0fbdbf4199724df1e53fe0b3e2ef4c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Class-MethodMaker/perl-Class-MethodMaker.info b/perl/perl-Class-MethodMaker/perl-Class-MethodMaker.info
index 1ac3477f34..8c6879740c 100644
--- a/perl/perl-Class-MethodMaker/perl-Class-MethodMaker.info
+++ b/perl/perl-Class-MethodMaker/perl-Class-MethodMaker.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-Class-MethodMaker"
 VERSION="2.21"
 HOMEPAGE="https://metacpan.org/pod/Class::MethodMaker"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.21.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/Class-MethodMaker-2.21.tar.gz"
 MD5SUM="d53a587fb84d5c5209e55ec0d4fab21d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-Convert-BinHex/perl-Convert-BinHex.SlackBuild b/perl/perl-Convert-BinHex/perl-Convert-BinHex.SlackBuild
index 3374106141..f1be5c753b 100644
--- a/perl/perl-Convert-BinHex/perl-Convert-BinHex.SlackBuild
+++ b/perl/perl-Convert-BinHex/perl-Convert-BinHex.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl modules: Convert::BinHex
 # Home Page http://search.cpan.org/dist/Convert-BinHex/
 
-# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant__AT__mnspace__DOT__net)
+# Copyright (c) 2009-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +27,9 @@
 #
 # Modified by the SlackBuilds.org project.
 
-SRCNAM=Convert-BinHex
-PRGNAM=perl-Convert-BinHex
-VERSION=${VERSION:-1.123}
+SRCNAM="Convert-BinHex"
+PRGNAM="perl-Convert-BinHex"
+VERSION=${VERSION:-1.124}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +77,8 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3
+perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3 \
+INSTALLVENDORMAN1DIR=/usr/man/man1
 
 make
 make install DESTDIR=$PKG
diff --git a/perl/perl-Convert-BinHex/perl-Convert-BinHex.info b/perl/perl-Convert-BinHex/perl-Convert-BinHex.info
index 75287bb4a7..c60b47e5f9 100644
--- a/perl/perl-Convert-BinHex/perl-Convert-BinHex.info
+++ b/perl/perl-Convert-BinHex/perl-Convert-BinHex.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Convert-BinHex"
-VERSION="1.123"
-HOMEPAGE="https://metacpan.org/pod/Convert::BinHex"
-DOWNLOAD="http://www.cpan.org/authors/id/S/ST/STEPHEN/Convert-BinHex-1.123.tar.gz"
-MD5SUM="6957dee877c64918066ae27ca6069bfe"
+VERSION="1.124"
+HOMEPAGE="http://search.cpan.org/dist/Convert-BinHex/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/ST/STEPHEN/Convert-BinHex-1.124.tar.gz"
+MD5SUM="81bbc7c7f3d349767137658a200a7f11"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild b/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild
index 350943ef18..6d6eeab8ce 100644
--- a/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild
+++ b/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: Convert::UUlib
 # Home Page http://search.cpan.org/dist/Convert-UUlib/
 
-# Copyright (c) 2009-2011, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net)
+# Copyright (c) 2009-2015, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
 
 SRCNAM="Convert-UUlib"
 PRGNAM=perl-${SRCNAM}
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,15 +70,16 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
 chown -R root.root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-
-CFLAGS="$SLKCFLAGS" \
-perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3
-
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
 make
 make install DESTDIR=$PKG
 
diff --git a/perl/perl-Convert-UUlib/perl-Convert-UUlib.info b/perl/perl-Convert-UUlib/perl-Convert-UUlib.info
index a8bb9410eb..4ffe28ed2a 100644
--- a/perl/perl-Convert-UUlib/perl-Convert-UUlib.info
+++ b/perl/perl-Convert-UUlib/perl-Convert-UUlib.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Convert-UUlib"
-VERSION="1.4"
-HOMEPAGE="https://metacpan.org/pod/Convert::UUlib"
-DOWNLOAD="http://www.cpan.org/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.4.tar.gz"
-MD5SUM="a6486df1d9ce319406fb9d5a610da759"
+VERSION="1.5"
+HOMEPAGE="http://search.cpan.org/dist/Convert-UUlib/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.5.tar.gz"
+MD5SUM="3332731b274723772ee8ad79c45bc401"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-Canary-Stability"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
diff --git a/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.SlackBuild b/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.SlackBuild
index d77f5a17e7..9b42bd5c0e 100644
--- a/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.SlackBuild
+++ b/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl modules: Crypt::OpenSSL::Bignum
 # Home Page http://search.cpan.org/dist/Crypt-OpenSSL-Bignum/
 
-# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant__AT__mnspace__DOT__net)
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +27,9 @@
 #
 # Modified by the SlackBuilds.org project.
 
-SRCNAM=Crypt-OpenSSL-Bignum
-PRGNAM=perl-Crypt-OpenSSL-Bignum
-VERSION=0.04
+SRCNAM="Crypt-OpenSSL-Bignum"
+PRGNAM="perl-Crypt-OpenSSL-Bignum"
+VERSION=${VERSION:-0.06}
 TAG=${TAG:-_SBo}
 BUILD=${BUILD:-1}
 
diff --git a/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.info b/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.info
index 2f46fd436f..6144084850 100644
--- a/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.info
+++ b/perl/perl-Crypt-OpenSSL-Bignum/perl-Crypt-OpenSSL-Bignum.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Crypt-OpenSSL-Bignum"
-VERSION="0.04"
-HOMEPAGE="https://metacpan.org/pod/Crypt::OpenSSL::Bignum"
-DOWNLOAD="http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-0.04.tar.gz"
-MD5SUM="9369ef722b0705c0604998559988eb18"
+VERSION="0.06"
+HOMEPAGE="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.06.tar.gz"
+MD5SUM="5673ee17919231c6394382e48f80c582"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.SlackBuild b/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.SlackBuild
index b56a8005ed..44c611dfc4 100644
--- a/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.SlackBuild
+++ b/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl module: Crypt::OpenSSL::Random
 # Home Page http://search.cpan.org/dist/Crypt-OpenSSL-Random/
 
-# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant__AT__mnspace__DOT__net)
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +27,9 @@
 #
 # Modified by the SlackBuilds.org project.
 
-SRCNAM=Crypt-OpenSSL-Random
-PRGNAM=perl-Crypt-OpenSSL-Random
-VERSION=${VERSION:-0.06}
+SRCNAM="Crypt-OpenSSL-Random"
+PRGNAM="perl-Crypt-OpenSSL-Random"
+VERSION=${VERSION:-0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.info b/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.info
index 9807ef2d30..313565c5f0 100644
--- a/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.info
+++ b/perl/perl-Crypt-OpenSSL-Random/perl-Crypt-OpenSSL-Random.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Crypt-OpenSSL-Random"
-VERSION="0.06"
-HOMEPAGE="https://metacpan.org/pod/Crypt::OpenSSL::Random"
-DOWNLOAD="http://www.cpan.org/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.06.tar.gz"
-MD5SUM="3771d3417f658d28f8682adc1e087136"
+VERSION="0.10"
+HOMEPAGE="http://search.cpan.org/dist/Crypt-OpenSSL-Random/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.10.tar.gz"
+MD5SUM="b89ca9314c3a066b440a7bb3cb8d725d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Date-Calc/perl-Date-Calc.SlackBuild b/perl/perl-Date-Calc/perl-Date-Calc.SlackBuild
index 2717159dd6..6410d4bce2 100644
--- a/perl/perl-Date-Calc/perl-Date-Calc.SlackBuild
+++ b/perl/perl-Date-Calc/perl-Date-Calc.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl modules: Date::Calc
 # Home Page http://search.cpan.org/dist/Date-Calc/
 
-# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant@mnspace.net)
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +25,9 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM=Date-Calc
-PRGNAM=perl-Date-Calc
-VERSION=6.3
+SRCNAM="Date-Calc"
+PRGNAM="perl-Date-Calc"
+VERSION=${VERSION:-6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Date-Calc/perl-Date-Calc.info b/perl/perl-Date-Calc/perl-Date-Calc.info
index 2ffaab32bb..e3bce647fe 100644
--- a/perl/perl-Date-Calc/perl-Date-Calc.info
+++ b/perl/perl-Date-Calc/perl-Date-Calc.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Date-Calc"
-VERSION="6.3"
-HOMEPAGE="https://metacpan.org/pod/Date::Calc"
-DOWNLOAD="http://www.cpan.org/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz"
-MD5SUM="9b64555b7051c1beb6b61daead2d01b3"
+VERSION="6.4"
+HOMEPAGE="http://search.cpan.org/dist/Date-Calc/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz"
+MD5SUM="69c635070d38c884682bfd4657031a8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Bit-Vector"
diff --git a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
index 1445596de0..9d019bc443 100644
--- a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
+++ b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for perl-Date-Manip
 
 # Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com>
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Date-Manip
-VERSION=${VERSION:-6.48}
+VERSION=${VERSION:-6.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Date-Manip/perl-Date-Manip.info b/perl/perl-Date-Manip/perl-Date-Manip.info
index ba9994ac15..89c7d8fde1 100644
--- a/perl/perl-Date-Manip/perl-Date-Manip.info
+++ b/perl/perl-Date-Manip/perl-Date-Manip.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Date-Manip"
-VERSION="6.48"
+VERSION="6.50"
 HOMEPAGE="https://metacpan.org/pod/distribution/Date-Manip/lib/Date/Manip.pod"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.48.tar.gz"
-MD5SUM="fc1629f119072fa723ff89133d6f9a2d"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.50.tar.gz"
+MD5SUM="62c86841f9c57ebe663178195c1df272"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Test-Inter perl-Test-Pod perl-Test-Pod-Coverage perl-YAML-Syck"
diff --git a/perl/perl-DateTime/perl-DateTime.info b/perl/perl-DateTime/perl-DateTime.info
index 2a054b8e84..7130da0854 100644
--- a/perl/perl-DateTime/perl-DateTime.info
+++ b/perl/perl-DateTime/perl-DateTime.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-DateTime"
 VERSION="1.10"
 HOMEPAGE="https://metacpan.org/pod/DateTime"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-1.10.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/DateTime-1.10.tar.gz"
 MD5SUM="2dccc83565dfffef50611acaa50f0426"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-Devel-Symdump/perl-Devel-Symdump.SlackBuild b/perl/perl-Devel-Symdump/perl-Devel-Symdump.SlackBuild
index 8aecf00b7b..d5183097e6 100644
--- a/perl/perl-Devel-Symdump/perl-Devel-Symdump.SlackBuild
+++ b/perl/perl-Devel-Symdump/perl-Devel-Symdump.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for perl-Devel-Symdump
 
 # Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com>
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 
 SRCNAM=Devel-Symdump
 PRGNAM=perl-$SRCNAM
-VERSION=${VERSION:-2.14}
+VERSION=${VERSION:-2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Devel-Symdump/perl-Devel-Symdump.info b/perl/perl-Devel-Symdump/perl-Devel-Symdump.info
index 6f849f84e0..587d6a5711 100644
--- a/perl/perl-Devel-Symdump/perl-Devel-Symdump.info
+++ b/perl/perl-Devel-Symdump/perl-Devel-Symdump.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Devel-Symdump"
-VERSION="2.14"
+VERSION="2.15"
 HOMEPAGE="https://metacpan.org/pod/Devel::Symdump"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/A/AN/ANDK/Devel-Symdump-2.14.tar.gz"
-MD5SUM="2d28b91792d0ef6bae2f75c4a635edee"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AN/ANDK/Devel-Symdump-2.15.tar.gz"
+MD5SUM="6d34787ab647505b8d353a1d1713f907"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Device-SerialPort/perl-Device-SerialPort.SlackBuild b/perl/perl-Device-SerialPort/perl-Device-SerialPort.SlackBuild
index 412679a906..ecf21aee5b 100644
--- a/perl/perl-Device-SerialPort/perl-Device-SerialPort.SlackBuild
+++ b/perl/perl-Device-SerialPort/perl-Device-SerialPort.SlackBuild
@@ -4,6 +4,8 @@
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
 # All rights reserved.
 #
+# Adopted 2015  Glenn Becker <glenn.becker@gmail.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
diff --git a/perl/perl-Device-SerialPort/perl-Device-SerialPort.info b/perl/perl-Device-SerialPort/perl-Device-SerialPort.info
index e0feb468c4..b8d3b4a440 100644
--- a/perl/perl-Device-SerialPort/perl-Device-SerialPort.info
+++ b/perl/perl-Device-SerialPort/perl-Device-SerialPort.info
@@ -6,5 +6,5 @@ MD5SUM="82c698151f934eb28c65d1838cee7d9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Email-Date-Format/perl-Email-Date-Format.SlackBuild b/perl/perl-Email-Date-Format/perl-Email-Date-Format.SlackBuild
index 3adfb556f5..89d3da7b34 100644
--- a/perl/perl-Email-Date-Format/perl-Email-Date-Format.SlackBuild
+++ b/perl/perl-Email-Date-Format/perl-Email-Date-Format.SlackBuild
@@ -4,6 +4,8 @@
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
 # All rights reserved.
 #
+# Adopted 2015  Glenn Becker <glenn.becker@gmail.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -23,7 +25,7 @@
 
 SRCNAM=Email-Date-Format
 PRGNAM=perl-$SRCNAM
-VERSION=${VERSION:-1.004}
+VERSION=${VERSION:-1.005}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Email-Date-Format/perl-Email-Date-Format.info b/perl/perl-Email-Date-Format/perl-Email-Date-Format.info
index f8cfb74426..abde34865b 100644
--- a/perl/perl-Email-Date-Format/perl-Email-Date-Format.info
+++ b/perl/perl-Email-Date-Format/perl-Email-Date-Format.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Email-Date-Format"
-VERSION="1.004"
+VERSION="1.005"
 HOMEPAGE="https://metacpan.org/pod/Email::Date::Format"
-DOWNLOAD="http://www.cpan.org/authors/id/R/RJ/RJBS/Email-Date-Format-1.004.tar.gz"
-MD5SUM="c6b651d56996cd37f6e0251c5c3672ec"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz"
+MD5SUM="030dcee3bc1a44674900b0132925bd03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Capture-Tiny"
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Encode-ISO2022/perl-Encode-ISO2022.info b/perl/perl-Encode-ISO2022/perl-Encode-ISO2022.info
index 8cfda6bf4b..cc3f466e98 100644
--- a/perl/perl-Encode-ISO2022/perl-Encode-ISO2022.info
+++ b/perl/perl-Encode-ISO2022/perl-Encode-ISO2022.info
@@ -1,5 +1,5 @@
 PRGNAM="perl-Encode-ISO2022"
-VERSION="0.03"
+VERSION="0.04"
 HOMEPAGE="https://metacpan.org/pod/Encode::ISO2022"
 DOWNLOAD="http://www.cpan.org/authors/id/N/NE/NEZUMI/Encode-ISO2022-0.04.tar.gz"
 MD5SUM="f3b0717b470961da808d871362bf1c5f"
diff --git a/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.SlackBuild b/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.SlackBuild
index b8f3c06d1e..f24b22d1bb 100644
--- a/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.SlackBuild
+++ b/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Encode-JISX0213
-VERSION=${VERSION:-0.03}
+VERSION=${VERSION:-0.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.info b/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.info
index 5587580134..bb86f14d89 100644
--- a/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.info
+++ b/perl/perl-Encode-JISX0213/perl-Encode-JISX0213.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Encode-JISX0213"
-VERSION="0.03"
-HOMEPAGE="https://metacpan.org/pod/Encode::JISX0213"
-DOWNLOAD="http://www.cpan.org/authors/id/N/NE/NEZUMI/Encode-JISX0213-0.03.tar.gz"
-MD5SUM="1ddc16d637b866319a597d7ed2d5be9b"
+VERSION="0.04"
+HOMEPAGE="http://search.cpan.org/~nezumi/Encode-JISX0213-0.04/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/N/NE/NEZUMI/Encode-JISX0213-0.04.tar.gz"
+MD5SUM="d2d8ec4ebff4d44c40fe8d11d961f2b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Encode-ISO2022"
diff --git a/perl/perl-ExtUtils-Install/README b/perl/perl-ExtUtils-Install/README
new file mode 100644
index 0000000000..f9f646f848
--- /dev/null
+++ b/perl/perl-ExtUtils-Install/README
@@ -0,0 +1,6 @@
+perl-ExtUtils-Install (install files from here to there)
+
+ExtUtils::Install - Handles the installing and uninstalling of perl modules, scripts, man pages, etc...
+
+Both install() and uninstall() are specific to the way ExtUtils::MakeMaker handles the installation
+and deinstallation of perl modules. They are not designed as general purpose tools.
diff --git a/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild
new file mode 100644
index 0000000000..ad31a82c50
--- /dev/null
+++ b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# Slackware build script for perl-ExtUtils-Install.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-ExtUtils-Install
+VERSION=${VERSION:-2.04}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info
new file mode 100644
index 0000000000..89f41ed281
--- /dev/null
+++ b/perl/perl-ExtUtils-Install/perl-ExtUtils-Install.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-ExtUtils-Install"
+VERSION="2.04"
+HOMEPAGE="https://metacpan.org/pod/ExtUtils::Install"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-Install-2.04.tar.gz"
+MD5SUM="5784c74271dcb5f85dd9564e3d3cb726"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-extutils-makemaker"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/perl/perl-ExtUtils-Install/slack-desc b/perl/perl-ExtUtils-Install/slack-desc
new file mode 100644
index 0000000000..a9af236fd1
--- /dev/null
+++ b/perl/perl-ExtUtils-Install/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+perl-ExtUtils-Install: perl-ExtUtils-Install (install files from here to there)
+perl-ExtUtils-Install:
+perl-ExtUtils-Install: ExtUtils::Install - Handles the installing and uninstalling of perl 
+perl-ExtUtils-Install: modules, scripts, man pages, etc...
+perl-ExtUtils-Install:
+perl-ExtUtils-Install: Home page: https://metacpan.org/pod/ExtUtils::Install
+perl-ExtUtils-Install:
+perl-ExtUtils-Install:
+perl-ExtUtils-Install:
+perl-ExtUtils-Install:
+perl-ExtUtils-Install:
diff --git a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild
index 4e5c43d9e6..bcbb019e34 100644
--- a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild
+++ b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-ExtUtils-InstallPaths
 
-# Copyright 2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-ExtUtils-InstallPaths
-VERSION=${VERSION:-0.010}
+VERSION=${VERSION:-0.011}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info
index e3cd2f236e..50f3666684 100644
--- a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info
+++ b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-ExtUtils-InstallPaths"
-VERSION="0.010"
+VERSION="0.011"
 HOMEPAGE="https://metacpan.org/pod/ExtUtils::InstallPaths"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz"
-MD5SUM="f0b00cc6c04653588a6298fa1f16c07f"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz"
+MD5SUM="9c75894c3c8c899ab6bfafc5eaa97999"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-ExtUtils-Config"
diff --git a/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.SlackBuild b/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.SlackBuild
index 71b7c6fd1b..67f9aaf46e 100644
--- a/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.SlackBuild
+++ b/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-ExtUtils-ModuleMaker
-VERSION=${VERSION:-0.54}
+VERSION=${VERSION:-0.55}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.info b/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.info
index 60766ed3ae..a2198d3695 100644
--- a/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.info
+++ b/perl/perl-ExtUtils-ModuleMaker/perl-ExtUtils-ModuleMaker.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-ExtUtils-ModuleMaker"
-VERSION="0.54"
+VERSION="0.55"
 HOMEPAGE="https://metacpan.org/pod/ExtUtils::ModuleMaker"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/J/JK/JKEENAN/ExtUtils-ModuleMaker-0.54.tar.gz"
-MD5SUM="db98901a13f04dded0ed69d27ecfd122"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/J/JK/JKEENAN/ExtUtils-ModuleMaker-0.55.tar.gz"
+MD5SUM="a68f6c85979d7b1b81473e1f1d8eac34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-File-Save-Home"
diff --git a/perl/perl-File-Copy-Recursive/README b/perl/perl-File-Copy-Recursive/README
new file mode 100644
index 0000000000..7b25412264
--- /dev/null
+++ b/perl/perl-File-Copy-Recursive/README
@@ -0,0 +1,3 @@
+This module copies and moves directories recursively (or single files, well... 
+singly) to an optional depth and attempts to preserve each file or directory's 
+mode.
diff --git a/perl/perl-File-Copy-Recursive/perl-File-Copy-Recursive.SlackBuild b/perl/perl-File-Copy-Recursive/perl-File-Copy-Recursive.SlackBuild
new file mode 100644
index 0000000000..80a4909f2e
--- /dev/null
+++ b/perl/perl-File-Copy-Recursive/perl-File-Copy-Recursive.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for perl-File-Copy-Recursive
+
+# Copyright 2015 Glenn Becker <glenn.becker@gmail.com> Arlington, MA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-File-Copy-Recursive
+VERSION=${VERSION:-0.38}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-File-Copy-Recursive/perl-File-Copy-Recursive.info b/perl/perl-File-Copy-Recursive/perl-File-Copy-Recursive.info
new file mode 100644
index 0000000000..69c8550562
--- /dev/null
+++ b/perl/perl-File-Copy-Recursive/perl-File-Copy-Recursive.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-File-Copy-Recursive"
+VERSION="0.38"
+HOMEPAGE="https://metacpan.org/pod/File::Copy::Recursive"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz"
+MD5SUM="e76dc75ab456510d67c6c3a95183f72f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-File-Copy-Recursive/slack-desc b/perl/perl-File-Copy-Recursive/slack-desc
new file mode 100644
index 0000000000..deda457c94
--- /dev/null
+++ b/perl/perl-File-Copy-Recursive/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                        |-----handy-ruler------------------------------------------------------|
+perl-File-Copy-Recursive: perl-File-Copy-Recursive (perl extension)
+perl-File-Copy-Recursive:
+perl-File-Copy-Recursive:
+perl-File-Copy-Recursive:
+perl-File-Copy-Recursive: This module copies and moves directories recursively (or single
+perl-File-Copy-Recursive: files, well... singly) to an optional depth and attempts to preserve
+perl-File-Copy-Recursive: each file or directory's mode.
+perl-File-Copy-Recursive:
+perl-File-Copy-Recursive:
+perl-File-Copy-Recursive:
+perl-File-Copy-Recursive:
diff --git a/perl/perl-File-ShareDir-Install/README b/perl/perl-File-ShareDir-Install/README
new file mode 100644
index 0000000000..4dc64da5d0
--- /dev/null
+++ b/perl/perl-File-ShareDir-Install/README
@@ -0,0 +1,10 @@
+File::ShareDir::Install allows you to install read-only data files from a 
+distribution. It is a companion module to File::ShareDir, which allows 
+you to locate these files after installation.
+
+It is a port of Module::Install::Share to ExtUtils::MakeMaker with the 
+improvement of only installing the files you want; .svn, .git and other 
+source-control junk will be ignored.
+
+Please note that this module installs read-only data files; empty directories 
+will be ignored.
diff --git a/perl/perl-File-ShareDir-Install/perl-File-ShareDir-Install.SlackBuild b/perl/perl-File-ShareDir-Install/perl-File-ShareDir-Install.SlackBuild
new file mode 100644
index 0000000000..ab7e50f1d9
--- /dev/null
+++ b/perl/perl-File-ShareDir-Install/perl-File-ShareDir-Install.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for perl-File-ShareDir-Install
+
+# Copyright 2015 Glenn Becker <glenn.becker@gmail.com> Arlington, MA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-File-ShareDir-Install
+VERSION=${VERSION:-0.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes MANIFEST README  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-File-ShareDir-Install/perl-File-ShareDir-Install.info b/perl/perl-File-ShareDir-Install/perl-File-ShareDir-Install.info
new file mode 100644
index 0000000000..4541568f72
--- /dev/null
+++ b/perl/perl-File-ShareDir-Install/perl-File-ShareDir-Install.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-File-ShareDir-Install"
+VERSION="0.10"
+HOMEPAGE="https://metacpan.org/pod/File::ShareDir::Install"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GW/GWYN/File-ShareDir-Install-0.10.tar.gz"
+MD5SUM="37fb7fa72ce7184516dd022aba62f524"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-File-ShareDir-Install/slack-desc b/perl/perl-File-ShareDir-Install/slack-desc
new file mode 100644
index 0000000000..efed5073ae
--- /dev/null
+++ b/perl/perl-File-ShareDir-Install/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                          |-----handy-ruler------------------------------------------------------|
+perl-File-ShareDir-Install: perl-File-ShareDir-Install (install shared files)
+perl-File-ShareDir-Install:
+perl-File-ShareDir-Install: allows you to install read-only data files from a distribution. It is
+perl-File-ShareDir-Install: a companion module to File::ShareDir, which allows you to locate
+perl-File-ShareDir-Install: these files after installation
+perl-File-ShareDir-Install:
+perl-File-ShareDir-Install:
+perl-File-ShareDir-Install:
+perl-File-ShareDir-Install:
+perl-File-ShareDir-Install:
+perl-File-ShareDir-Install:
diff --git a/perl/perl-File-Tail/perl-File-Tail.SlackBuild b/perl/perl-File-Tail/perl-File-Tail.SlackBuild
index a0500acc24..0632aec6da 100644
--- a/perl/perl-File-Tail/perl-File-Tail.SlackBuild
+++ b/perl/perl-File-Tail/perl-File-Tail.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for File-Tail
 
-# Copyright 2012-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2012-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-File-Tail
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-File-Tail/perl-File-Tail.info b/perl/perl-File-Tail/perl-File-Tail.info
index 3ae7ee24c0..cf4dad2111 100644
--- a/perl/perl-File-Tail/perl-File-Tail.info
+++ b/perl/perl-File-Tail/perl-File-Tail.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-File-Tail"
-VERSION="1.0"
+VERSION="1.3"
 HOMEPAGE="https://metacpan.org/pod/File::Tail"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MG/MGRABNAR/File-Tail-1.0.tar.gz"
-MD5SUM="c87f648d138c176b5d224c8d1b59838e"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MG/MGRABNAR/File-Tail-1.3.tar.gz"
+MD5SUM="252635f89ec18cb871c0b45ed64b3f63"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-IO-All/README b/perl/perl-IO-All/README
new file mode 100644
index 0000000000..f8e37e3345
--- /dev/null
+++ b/perl/perl-IO-All/README
@@ -0,0 +1,19 @@
+IO::All combines all of the best Perl IO modules into a single nifty object 
+oriented interface to greatly simplify your everyday Perl IO idioms. It exports 
+a single function called io, which returns a new IO::All object. And that 
+object can do it all!
+
+The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, Tie::File, 
+File::Spec, File::Path, File::MimeInfo and File::ReadBackwards; as well as all 
+the DBM and MLDBM modules. You can use most of the methods found in these 
+classes and in IO::Handle (which they inherit from). IO::All adds dozens of 
+other helpful idiomatic methods including file stat and manipulation functions.
+
+IO::All is pluggable, and modules like IO::All::LWP and IO::All::Mailto add 
+even more functionality. Optionally, every IO::All object can be tied to 
+itself. This means that you can use most perl IO builtins on it: readline, 
+<>, getc, print, printf, syswrite, sysread, close.
+
+The distinguishing magic of IO::All is that it will automatically open (and 
+close) files, directories, sockets and other IO things for you. You never need 
+to specify the mode (<, >>, etc), since it is determined by the usage context.
diff --git a/perl/perl-IO-All/perl-IO-All.SlackBuild b/perl/perl-IO-All/perl-IO-All.SlackBuild
new file mode 100644
index 0000000000..de39d4b4a9
--- /dev/null
+++ b/perl/perl-IO-All/perl-IO-All.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for perl-IO-All
+
+# Copyright 2015 Glenn Becker <glenn.becker@gmail.com> Arlington, MA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-IO-All
+VERSION=${VERSION:-0.86}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes MANIFEST README CONTRIBUTING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-IO-All/perl-IO-All.info b/perl/perl-IO-All/perl-IO-All.info
new file mode 100644
index 0000000000..7d6a9ab29e
--- /dev/null
+++ b/perl/perl-IO-All/perl-IO-All.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-IO-All"
+VERSION="0.86"
+HOMEPAGE="https://metacpan.org/pod/distribution/IO-All/lib/IO/All.pod"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IN/INGY/IO-All-0.86.tar.gz"
+MD5SUM="b257d3f742867825d018e74f5a5d549b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-IO-All/slack-desc b/perl/perl-IO-All/slack-desc
new file mode 100644
index 0000000000..8ca1498729
--- /dev/null
+++ b/perl/perl-IO-All/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+perl-IO-All: perl-IO-All (IO modules)
+perl-IO-All:
+perl-IO-All: IO::All combines all of the best Perl IO modules into a single nifty
+perl-IO-All: object oriented interface to greatly simplify your everyday Perl IO
+perl-IO-All: idioms. It exports a single function called io, which returns a new
+perl-IO-All: IO::All object. And that object can do it all!
+perl-IO-All:
+perl-IO-All:
+perl-IO-All:
+perl-IO-All:
+perl-IO-All:
diff --git a/perl/perl-IO-HTML/perl-IO-HTML.SlackBuild b/perl/perl-IO-HTML/perl-IO-HTML.SlackBuild
index 2943a49e9e..3414544885 100644
--- a/perl/perl-IO-HTML/perl-IO-HTML.SlackBuild
+++ b/perl/perl-IO-HTML/perl-IO-HTML.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-IO-HTML
 
-# Copyright 2012 Glenn Becker <burningc@sdf.org>
+# Copyright 2012-15 Glenn Becker <glenn.becker@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-IO-HTML
-VERSION=${VERSION:-1.00}
+VERSION=${VERSION:-1.001}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-IO-HTML/perl-IO-HTML.info b/perl/perl-IO-HTML/perl-IO-HTML.info
index 58f2f7bb89..281fed1a89 100644
--- a/perl/perl-IO-HTML/perl-IO-HTML.info
+++ b/perl/perl-IO-HTML/perl-IO-HTML.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-IO-HTML"
-VERSION="1.00"
+VERSION="1.001"
 HOMEPAGE="https://metacpan.org/pod/IO::HTML"
-DOWNLOAD="http://www.cpan.org/authors/id/C/CJ/CJM/IO-HTML-1.00.tar.gz"
-MD5SUM="fdfa3fe3d61a7fda9236c8d9776cdd65"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz"
+MD5SUM="3f8958718844dc96b9f6946f21d70d22"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-IO-Socket-IP/perl-IO-Socket-IP.info b/perl/perl-IO-Socket-IP/perl-IO-Socket-IP.info
index ce835d704e..89be5e0f8b 100644
--- a/perl/perl-IO-Socket-IP/perl-IO-Socket-IP.info
+++ b/perl/perl-IO-Socket-IP/perl-IO-Socket-IP.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-IO-Socket-IP"
 VERSION="0.33"
 HOMEPAGE="http://search.cpan.org/dist/IO-Socket-IP/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/IO-Socket-IP-0.33.tar.gz"
+DOWNLOAD="http://downloads.sf.net/slackbuildsdirectlinks/IO-Socket-IP-0.33.tar.gz"
 MD5SUM="a0bd5e5c1141fa77e6458b3056181bae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
index e2e368ac03..8bcdf669f3 100644
--- a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
+++ b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for perl-IO-Socket-SSL
 
 # Copyright 2009-2012 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,19 +12,19 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-IO-Socket-SSL
-VERSION=${VERSION:-1.955}
+VERSION=${VERSION:-2.020}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,19 +54,19 @@ tar xvf $CWD/$SRC_PRGNAM-$VERSION.tar.gz
 cd $SRC_PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-perl Makefile.PL INSTALLDIRS=perl
+yes | perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
 make
-make test
 make install DESTDIR=$PKG
 
-# Move man pages
-mv $PKG/usr/share/man $PKG/usr/
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
index 01cd904396..b8e5d2aaf9 100644
--- a/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
+++ b/perl/perl-IO-Socket-SSL/perl-IO-Socket-SSL.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-IO-Socket-SSL"
-VERSION="1.955"
+VERSION="2.020"
 HOMEPAGE="https://metacpan.org/pod/IO::Socket::SSL"
-DOWNLOAD="http://www.cpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-1.955.tar.gz"
-MD5SUM="4f975bc3932a273c46206fa926f20b08"
+DOWNLOAD="http://www.cpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-2.020.tar.gz"
+MD5SUM="dc0f5992492786a0bde79d2f8fb00cc1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Net-SSLeay perl-Net-LibIDN"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/perl/perl-IO-stringy/perl-IO-stringy.SlackBuild b/perl/perl-IO-stringy/perl-IO-stringy.SlackBuild
index fde66bfac6..a03abb3241 100644
--- a/perl/perl-IO-stringy/perl-IO-stringy.SlackBuild
+++ b/perl/perl-IO-stringy/perl-IO-stringy.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl modules: IO-stringy
 # Home Page http://search.cpan.org/dist/IO-stringy/
 
-# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant__AT__mnspace__DOT__net)
+# Copyright (c) 2009-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +27,9 @@
 #
 # Modified by the SlackBuilds.org project.
 
-SRCNAM=IO-stringy
-PRGNAM=perl-IO-stringy
-VERSION=2.110
+SRCNAM="IO-stringy"
+PRGNAM="perl-IO-stringy"
+VERSION=${VERSION:-2.111}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-IO-stringy/perl-IO-stringy.info b/perl/perl-IO-stringy/perl-IO-stringy.info
index fb83104cc5..f7c105364c 100644
--- a/perl/perl-IO-stringy/perl-IO-stringy.info
+++ b/perl/perl-IO-stringy/perl-IO-stringy.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-IO-stringy"
-VERSION="2.110"
-HOMEPAGE="https://metacpan.org/pod/IO::Stringy"
-DOWNLOAD="http://www.cpan.org/authors/id/D/DS/DSKOLL/IO-stringy-2.110.tar.gz"
-MD5SUM="2e6a976cfa5521e815c1fdf4006982de"
+VERSION="2.111"
+HOMEPAGE="http://search.cpan.org/dist/IO-stringy/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/IO-stringy-2.111.tar.gz"
+MD5SUM="e91acf0a800b190d13585a47de775bdd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Image-Info/perl-Image-Info.SlackBuild b/perl/perl-Image-Info/perl-Image-Info.SlackBuild
index e87d8f7a9a..1d0ddd05ed 100644
--- a/perl/perl-Image-Info/perl-Image-Info.SlackBuild
+++ b/perl/perl-Image-Info/perl-Image-Info.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: Image::Info
 # Home Page http://search.cpan.org/dist/Image-Info/
 
-# Copyright (c) 2009-2013, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
@@ -27,13 +27,12 @@
 
 # Modified by the SlackBuilds.org project.
 
+SRCNAM="Image-Info"
 PRGNAM="perl-Image-Info"
-VERSION=${VERSION:-1.36}
+VERSION=${VERSION:-1.38}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM="$(printf $PRGNAM | cut -f2- -d-)"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
diff --git a/perl/perl-Image-Info/perl-Image-Info.info b/perl/perl-Image-Info/perl-Image-Info.info
index 2bb684e5e0..98c1586437 100644
--- a/perl/perl-Image-Info/perl-Image-Info.info
+++ b/perl/perl-Image-Info/perl-Image-Info.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Image-Info"
-VERSION="1.36"
-HOMEPAGE="https://metacpan.org/pod/Image::Info"
-DOWNLOAD="http://www.cpan.org/authors/id/S/SR/SREZIC/Image-Info-1.36.tar.gz"
-MD5SUM="171acb0f59ee23865bbea4ea832e325c"
+VERSION="1.38"
+HOMEPAGE="http://search.cpan.org/dist/Image-Info/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/Image-Info-1.38.tar.gz"
+MD5SUM="0fa4db4bdf14b6f453655bafa62d766a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-IO-stringy"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
diff --git a/perl/perl-Inline-C/README b/perl/perl-Inline-C/README
new file mode 100644
index 0000000000..edfb28b3bc
--- /dev/null
+++ b/perl/perl-Inline-C/README
@@ -0,0 +1,13 @@
+Inline::C is a module that allows you to write Perl subroutines in C. Since 
+version 0.30 the Inline module supports multiple programming languages and 
+each language has its own support module. This document describes how to use 
+Inline with the C programming language. It also goes a bit into Perl C 
+internals.
+
+If you want to start working with programming examples right away, check out 
+Inline::C::Cookbook. For more information on Inline in general, see Inline.
+
+USAGE
+
+You never actually use Inline::C directly. It is just a support module for 
+using Inline.pm with C.
diff --git a/perl/perl-Inline-C/perl-Inline-C.SlackBuild b/perl/perl-Inline-C/perl-Inline-C.SlackBuild
new file mode 100644
index 0000000000..7fb6bc2118
--- /dev/null
+++ b/perl/perl-Inline-C/perl-Inline-C.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for perl-Inline-C
+
+# Copyright 2015 Glenn Becker Arlington, MA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PRGNAM=perl-Inline-C
+VERSION=${VERSION:-0.76}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes CONTRIBUTING MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Inline-C/perl-Inline-C.info b/perl/perl-Inline-C/perl-Inline-C.info
new file mode 100644
index 0000000000..73edf97e82
--- /dev/null
+++ b/perl/perl-Inline-C/perl-Inline-C.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Inline-C"
+VERSION="0.76"
+HOMEPAGE="https://metacpan.org/pod/distribution/Inline-C/lib/Inline/C.pod"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IN/INGY/Inline-C-0.76.tar.gz"
+MD5SUM="c0fbfdd058075c9271a1384c822c9a87"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Inline perl-IO-All perl-Pegex perl-File-Copy-Recursive perl-extutils-makemaker"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Inline-C/slack-desc b/perl/perl-Inline-C/slack-desc
new file mode 100644
index 0000000000..c5bbf06258
--- /dev/null
+++ b/perl/perl-Inline-C/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+perl-Inline-C: perl-Inline-C (C language support for Inline)
+perl-Inline-C:
+perl-Inline-C: Inline::C is a module that allows you to write Perl subroutines in C.
+perl-Inline-C: Since version 0.30 the Inline module supports multiple programming
+perl-Inline-C: languages and each language has its own support module.
+perl-Inline-C:
+perl-Inline-C:
+perl-Inline-C:
+perl-Inline-C:
+perl-Inline-C:
+perl-Inline-C:
diff --git a/perl/perl-Inline/README b/perl/perl-Inline/README
index 63a364918e..499cca9074 100644
--- a/perl/perl-Inline/README
+++ b/perl/perl-Inline/README
@@ -21,4 +21,5 @@ time.
 Best of all, it works the same on both Unix and Microsoft 
 Windows.
 
-NOTE: This also installs the submodule Inline::C.
+NOTE: This NO LONGER installs the submodule Inline::C -- that must
+be installed separately.
diff --git a/perl/perl-Inline/perl-Inline.SlackBuild b/perl/perl-Inline/perl-Inline.SlackBuild
index 46ad788681..3900d98139 100644
--- a/perl/perl-Inline/perl-Inline.SlackBuild
+++ b/perl/perl-Inline/perl-Inline.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Inline
-VERSION=${VERSION:-0.53}
+VERSION=${VERSION:-0.80}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,7 +91,7 @@ find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  Changes README ToDo \
+  Changes README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/perl/perl-Inline/perl-Inline.info b/perl/perl-Inline/perl-Inline.info
index e17aca9af8..ddc1b2ff09 100644
--- a/perl/perl-Inline/perl-Inline.info
+++ b/perl/perl-Inline/perl-Inline.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Inline"
-VERSION="0.53"
+VERSION="0.80"
 HOMEPAGE="https://metacpan.org/pod/Inline"
-DOWNLOAD="http://www.cpan.org/authors/id/S/SI/SISYPHUS/Inline-0.53.tar.gz"
-MD5SUM="7d0133546d2243e5dfcb1b5a75f9011e"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IN/INGY/Inline-0.80.tar.gz"
+MD5SUM="510bbac46e727bcaf240b7feac2646c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Parse-RecDescent perl-test-warn"
 MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Lingua-EN-Numbers-Ordinate/perl-Lingua-EN-Numbers-Ordinate.info b/perl/perl-Lingua-EN-Numbers-Ordinate/perl-Lingua-EN-Numbers-Ordinate.info
index 6aa5ed5e92..6ba9a04422 100644
--- a/perl/perl-Lingua-EN-Numbers-Ordinate/perl-Lingua-EN-Numbers-Ordinate.info
+++ b/perl/perl-Lingua-EN-Numbers-Ordinate/perl-Lingua-EN-Numbers-Ordinate.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-Lingua-EN-Numbers-Ordinate"
 VERSION="1.03"
 HOMEPAGE="https://metacpan.org/pod/Lingua::EN::Numbers::Ordinate"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/Lingua-EN-Numbers-Ordinate-1.03.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/Lingua-EN-Numbers-Ordinate-1.03.tar.gz"
 MD5SUM="27c8c52bf64ab34086151a149a907130"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-MIME-Charset/README b/perl/perl-MIME-Charset/README
index d429bbaa17..887b0fff9a 100644
--- a/perl/perl-MIME-Charset/README
+++ b/perl/perl-MIME-Charset/README
@@ -14,9 +14,10 @@ of following optional dependencies (perl modules):
   Encode::EUCJPASCII [Extended mappings by Japanese codepages]
   Encode::JISX0213 [Additional mappings for JIS X 0213]
   Encode::HanExtra [Additional mappings for Chinese standards]
-
 Default answer [n] is safe, but these modules can be installed before
 perl-MIME-Charset as they are available @ slackbuilds.org, as respectively:
   perl-Encode-EUCJPASCII
   perl-Encode-JISX0213
   perl-Encode-HanExtra
+
+This perl package is a dependency of perl-Unicode-LineBreak.
diff --git a/perl/perl-MIME-Charset/perl-MIME-Charset.SlackBuild b/perl/perl-MIME-Charset/perl-MIME-Charset.SlackBuild
index 8dfef51114..dbc5e2f268 100644
--- a/perl/perl-MIME-Charset/perl-MIME-Charset.SlackBuild
+++ b/perl/perl-MIME-Charset/perl-MIME-Charset.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-MIME-Charset
-VERSION=${VERSION:-1.011.1}
+VERSION=${VERSION:-1.012}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Makefile.PL \
   PREFIX=/usr \
@@ -81,7 +81,7 @@ make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/perl/perl-MIME-Charset/perl-MIME-Charset.info b/perl/perl-MIME-Charset/perl-MIME-Charset.info
index cca57551af..c066e959a2 100644
--- a/perl/perl-MIME-Charset/perl-MIME-Charset.info
+++ b/perl/perl-MIME-Charset/perl-MIME-Charset.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-MIME-Charset"
-VERSION="1.011.1"
-HOMEPAGE="https://metacpan.org/pod/MIME::Charset"
-DOWNLOAD="http://www.cpan.org/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz"
-MD5SUM="1cc1d7f650ea9c6906a63a471b001741"
+VERSION="1.012"
+HOMEPAGE="http://search.cpan.org/~nezumi/MIME-Charset-1.012/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.tar.gz"
+MD5SUM="1762b0d9e9379be684b704c247317276"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Didier Spaier"
-EMAIL="didier dot spaier at epsm dot fr"
+EMAIL="didier at slint dot fr"
diff --git a/perl/perl-MIME-Lite/perl-MIME-Lite.SlackBuild b/perl/perl-MIME-Lite/perl-MIME-Lite.SlackBuild
index eee9eb181a..714a8e3e39 100644
--- a/perl/perl-MIME-Lite/perl-MIME-Lite.SlackBuild
+++ b/perl/perl-MIME-Lite/perl-MIME-Lite.SlackBuild
@@ -4,6 +4,8 @@
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
 # All rights reserved.
 #
+# Adopted 2015  Glenn Becker <glenn.becker@gmail.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
diff --git a/perl/perl-MIME-Lite/perl-MIME-Lite.info b/perl/perl-MIME-Lite/perl-MIME-Lite.info
index c2d19be384..aabf1016c8 100644
--- a/perl/perl-MIME-Lite/perl-MIME-Lite.info
+++ b/perl/perl-MIME-Lite/perl-MIME-Lite.info
@@ -6,5 +6,5 @@ MD5SUM="5a6d90329e049eee77248d667343acc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Email-Date-Format"
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-MIME-tools/perl-MIME-tools.SlackBuild b/perl/perl-MIME-tools/perl-MIME-tools.SlackBuild
index ce2efe2e7c..483a59cbad 100644
--- a/perl/perl-MIME-tools/perl-MIME-tools.SlackBuild
+++ b/perl/perl-MIME-tools/perl-MIME-tools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: MIME-tools
 # Home Page http://search.cpan.org/dist/MIME-Tools/
 
-# Copyright (c) 2009-2013, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
@@ -27,13 +27,12 @@
 #
 # Modified by the SlackBuilds.org project.
 
+SRCNAM="MIME-tools"
 PRGNAM="perl-MIME-tools"
-VERSION=${VERSION:-5.504}
+VERSION=${VERSION:-5.506}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM="$(printf $PRGNAM | cut -f2- -d-)"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
diff --git a/perl/perl-MIME-tools/perl-MIME-tools.info b/perl/perl-MIME-tools/perl-MIME-tools.info
index 8885d169a6..1a37787818 100644
--- a/perl/perl-MIME-tools/perl-MIME-tools.info
+++ b/perl/perl-MIME-tools/perl-MIME-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-MIME-tools"
-VERSION="5.504"
-HOMEPAGE="https://metacpan.org/pod/MIME::Tools"
-DOWNLOAD="http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.504.tar.gz"
-MD5SUM="8e055aab88552710377b4727b23bfb70"
+VERSION="5.506"
+HOMEPAGE="http://search.cpan.org/dist/MIME-tools/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-5.506.tar.gz"
+MD5SUM="ddc8479d25688f8860d0bf3be9df52c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Convert-BinHex perl-IO-stringy perl-MailTools"
diff --git a/perl/perl-Module-Pluggable/perl-Module-Pluggable.SlackBuild b/perl/perl-Module-Pluggable/perl-Module-Pluggable.SlackBuild
index 3a07bdea0a..ad686a6f31 100644
--- a/perl/perl-Module-Pluggable/perl-Module-Pluggable.SlackBuild
+++ b/perl/perl-Module-Pluggable/perl-Module-Pluggable.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Module-Pluggable
 
-# Copyright 2013 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2013-2015 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-Module-Pluggable
-VERSION=${VERSION:-5.1}
+VERSION=${VERSION:-5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,13 +63,14 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 find -L . \
  \( -name Changes -o -name README -o -name '*.pm' \) -exec chmod 644 {} \;
 
 perl Makefile.PL \
   PREFIX=/usr \
   INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
   INSTALLVENDORMAN3DIR=/usr/man/man3
 make
 make test
diff --git a/perl/perl-Module-Pluggable/perl-Module-Pluggable.info b/perl/perl-Module-Pluggable/perl-Module-Pluggable.info
index ba61bcb07d..c88eb61bc9 100644
--- a/perl/perl-Module-Pluggable/perl-Module-Pluggable.info
+++ b/perl/perl-Module-Pluggable/perl-Module-Pluggable.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Module-Pluggable"
-VERSION="5.1"
+VERSION="5.2"
 HOMEPAGE="https://metacpan.org/pod/Module::Pluggable"
-DOWNLOAD="http://www.cpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.1.tar.gz"
-MD5SUM="1b71ed7a67ad8c048d1499540bc892ba"
+DOWNLOAD="http://www.cpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz"
+MD5SUM="87ce2971662efd0b69a81bb4dc9ea76c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Module-ScanDeps/README b/perl/perl-Module-ScanDeps/README
index 0cd4c704f4..a1e7e5e22c 100644
--- a/perl/perl-Module-ScanDeps/README
+++ b/perl/perl-Module-ScanDeps/README
@@ -1,3 +1,7 @@
 perl-Module-ScanDeps (Recursively scan Perl code for dependencies).
 
-This module scans potential modules used by perl programs, and returns a hash reference;
+This module scans potential modules used by perl programs, and returns
+a hash reference; its keys are the module names as appears in %INC
+(e.g. Test/More.pm).
+
+Optional deps (for tests only): perl-Test-Pod, perl-Module-Pluggable.
diff --git a/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.SlackBuild b/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.SlackBuild
index cf60ae6993..1b79840742 100644
--- a/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.SlackBuild
+++ b/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Module-ScanDeps
-VERSION=${VERSION:-1.19}
+VERSION=${VERSION:-1.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.info b/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.info
index 9e7a0f88a0..1739bde72f 100644
--- a/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.info
+++ b/perl/perl-Module-ScanDeps/perl-Module-ScanDeps.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Module-ScanDeps"
-VERSION="1.19"
+VERSION="1.20"
 HOMEPAGE="https://metacpan.org/pod/Module::ScanDeps"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.19.tar.gz"
-MD5SUM="ea2545dbf46bae4cc43d9d07cad77b96"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.20.tar.gz"
+MD5SUM="283e4d4f215d6ce6a05c13e9b740f842"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Test-Requires"
diff --git a/perl/perl-Moo/perl-Moo.SlackBuild b/perl/perl-Moo/perl-Moo.SlackBuild
index 16397956a7..23d1f6eddc 100644
--- a/perl/perl-Moo/perl-Moo.SlackBuild
+++ b/perl/perl-Moo/perl-Moo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Moo
-VERSION=${VERSION:-1.006001}
+VERSION=${VERSION:-2.000002}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Moo/perl-Moo.info b/perl/perl-Moo/perl-Moo.info
index 576ba3450e..878da31a4e 100644
--- a/perl/perl-Moo/perl-Moo.info
+++ b/perl/perl-Moo/perl-Moo.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Moo"
-VERSION="1.006001"
+VERSION="2.000002"
 HOMEPAGE="https://metacpan.org/pod/Moo"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-1.006001.tar.gz"
-MD5SUM="814b4b4f465a1d3c84f91bd0f30f1fbf"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.000002.tar.gz"
+MD5SUM="8b84a7289fc6247de5ec5d151105fd6b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Role-Tiny perl-strictures perl-Dist-CheckConflicts perl-Class-Method-Modifiers perl-Devel-GlobalDestruction perl-Module-Runtime perl-Import-Into"
diff --git a/perl/perl-MusicBrainz-DiscID/README b/perl/perl-MusicBrainz-DiscID/README
index 1b22bbd65d..f0689ddac7 100644
--- a/perl/perl-MusicBrainz-DiscID/README
+++ b/perl/perl-MusicBrainz-DiscID/README
@@ -1,4 +1,5 @@
-MusicBrainz::DiscID is a Perl module -- described by its author as "a class 
-to calculate a MusicBrainz DiscID from an audio CD in the drive. The coding 
-style is slightly different to the C interface to libdiscid, because it makes 
-use of perl's Object Oriented functionality."
+MusicBrainz::DiscID is an interface to the libdiscid library,
+which calculates a MusicBrainz disc ID from an audio CD in the
+CD-ROM drive.
+
+abcde can use MusicBrainz::DiscID to calculate disc IDs.
diff --git a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild
index 3a79f3d97a..10a3dc29c0 100644
--- a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild
+++ b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild
@@ -2,29 +2,25 @@
 
 # Slackware build script for perl-MusicBrainz-DiscID
 
-# Copyright 2012 Glenn Becker, Arlington, Massachusetts, USA
-# All rights reserved.
+# All rights reserved
+# Copyright 2012-15 Glenn Becker <glenn.becker@gmail.com>
+# Copyright 2016 Andreas Voegele <andreas@andreasvoegele.com>
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-MusicBrainz-DiscID
 VERSION=${VERSION:-0.03}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
@@ -66,22 +62,21 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 < $CWD/pod-encoding.patch
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Build.PL \
-  prefix=/usr \
-  installdirs=vendor \
-  destdir=$PKG
+  --installdirs vendor \
+  --config installvendorman1dir=/usr/man/man1 \
+  --config installvendorman3dir=/usr/man/man3
 ./Build
-./Build test
-./Build install \
-  --install_path bindoc=/usr/man/man1 \
-  --install_path libdoc=/usr/man/man3
+
+# The test suite fails if Test::Pod is installed.
+# See https://rt.cpan.org/Public/Bug/Display.html?id=85212.
+#./Build test
+./Build install --destdir $PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -91,9 +86,7 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  Changes README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
index e467b2874d..8cfbfd507f 100644
--- a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
+++ b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.cpan.org/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz
 MD5SUM="4b775f38604f15fd20298d5b443d6900"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Test-Pod"
-MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+REQUIRES=""
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/perl/perl-MusicBrainz-DiscID/slack-desc b/perl/perl-MusicBrainz-DiscID/slack-desc
index d8533175c2..de6adfc837 100644
--- a/perl/perl-MusicBrainz-DiscID/slack-desc
+++ b/perl/perl-MusicBrainz-DiscID/slack-desc
@@ -6,17 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                        |-----handy-ruler------------------------------------------------------|
-perl-MusicBrainz-DiscID: perl-MusicBrainz-DiscID (MusicBrainz::DiscID)
-perl-MusicBrainz-DiscID:
-perl-MusicBrainz-DiscID: MusicBrainz::DiscID is a class to calculate a MusicBrainz DiscID
-perl-MusicBrainz-DiscID: from an audio CD in the drive. The coding style is slightly different
-perl-MusicBrainz-DiscID: to the C interface to libdiscid, because it makes use of perl's
-perl-MusicBrainz-DiscID: Object Oriented functionality.
-perl-MusicBrainz-DiscID:
-perl-MusicBrainz-DiscID: http://search.cpan.org/~njh/MusicBrainz-DiscID-0.03/
-perl-MusicBrainz-DiscID:
-perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: perl-MusicBrainz-DiscID (calculate a disc ID from an audio CD)
 perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: MusicBrainz::DiscID is an interface to the libdiscid library,
+perl-MusicBrainz-DiscID: which calculates a MusicBrainz disc ID from an audio CD in the
+perl-MusicBrainz-DiscID: CD-ROM drive.
 perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: abcde can use MusicBrainz::DiscID to calculate disc IDs.
 perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: For more info, visit: https://musicbrainz.org/ and
+perl-MusicBrainz-DiscID: https://metacpan.org/release/MusicBrainz-DiscID
 perl-MusicBrainz-DiscID:
diff --git a/perl/perl-NetAddr-IP/perl-NetAddr-IP.SlackBuild b/perl/perl-NetAddr-IP/perl-NetAddr-IP.SlackBuild
index 05355b63b0..1d0704b9c4 100644
--- a/perl/perl-NetAddr-IP/perl-NetAddr-IP.SlackBuild
+++ b/perl/perl-NetAddr-IP/perl-NetAddr-IP.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: NetAddr::IP
 # Home Page http://search.cpan.org/dist/NetAddr-IP/
 
-# Copyright (c) 2008-2014, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
@@ -28,7 +28,7 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM="perl-NetAddr-IP"
-VERSION=${VERSION:-4.075}
+VERSION=${VERSION:-4.078}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-NetAddr-IP/perl-NetAddr-IP.info b/perl/perl-NetAddr-IP/perl-NetAddr-IP.info
index c87fd14d0a..a7b486e90f 100644
--- a/perl/perl-NetAddr-IP/perl-NetAddr-IP.info
+++ b/perl/perl-NetAddr-IP/perl-NetAddr-IP.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-NetAddr-IP"
-VERSION="4.075"
-HOMEPAGE="https://metacpan.org/pod/NetAddr::IP"
-DOWNLOAD="http://www.cpan.org/authors/id/M/MI/MIKER/NetAddr-IP-4.075.tar.gz"
-MD5SUM="b72b91ebd228b096fd3b0acc87df877e"
+VERSION="4.078"
+HOMEPAGE="http://search.cpan.org/dist/NetAddr-IP/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-4.078.tar.gz"
+MD5SUM="bca8406520b6535a3f9661d385705d97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-NetPacket/perl-NetPacket.info b/perl/perl-NetPacket/perl-NetPacket.info
index 663bc77260..aa85afb50c 100644
--- a/perl/perl-NetPacket/perl-NetPacket.info
+++ b/perl/perl-NetPacket/perl-NetPacket.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-NetPacket"
 VERSION="1.4.3"
 HOMEPAGE="https://metacpan.org/pod/NetPacket"
-DOWNLOAD="http://www.cpan.org/authors/id/Y/YA/YANICK/NetPacket-1.4.3.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/NetPacket-1.4.3.tar.gz"
 MD5SUM="9ca7dfe00957a3bcb54f3bb10671eaef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-Number-Bites-Human/README b/perl/perl-Number-Bites-Human/README
new file mode 100644
index 0000000000..2b050368e1
--- /dev/null
+++ b/perl/perl-Number-Bites-Human/README
@@ -0,0 +1,8 @@
+perl-Number-Bites-Human (Convert byte count to human readable format)
+
+This module provides a formatter which turns byte counts to usual 
+readable format, like '2.0K', '3.1G', '100B'. It was inspired in the 
+-h option of Unix utilities like du, df and ls for "human-readable"  
+output.
+
+Optional deps (for test only): perl-Test-Pod, perl-Test-Pod-Coverage.
diff --git a/perl/perl-Number-Bites-Human/perl-Number-Bites-Human.SlackBuild b/perl/perl-Number-Bites-Human/perl-Number-Bites-Human.SlackBuild
new file mode 100644
index 0000000000..cba382b0ca
--- /dev/null
+++ b/perl/perl-Number-Bites-Human/perl-Number-Bites-Human.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# Slackware build script for perl-Number-Bites-Human.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-Number-Bites-Human
+VERSION=${VERSION:-0.09}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="Number-Bytes-Human"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/share/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Number-Bites-Human/perl-Number-Bites-Human.info b/perl/perl-Number-Bites-Human/perl-Number-Bites-Human.info
new file mode 100644
index 0000000000..8c65f9e19a
--- /dev/null
+++ b/perl/perl-Number-Bites-Human/perl-Number-Bites-Human.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Number-Bites-Human"
+VERSION="0.09"
+HOMEPAGE="https://metacpan.org/pod/Number::Bytes::Human"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DA/DAGOBERT/Number-Bytes-Human-0.09.tar.gz"
+MD5SUM="09c021072dc095bfae6895608c999f8b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-extutils-makemaker"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/perl/perl-Number-Bites-Human/slack-desc b/perl/perl-Number-Bites-Human/slack-desc
new file mode 100644
index 0000000000..57a92adb0a
--- /dev/null
+++ b/perl/perl-Number-Bites-Human/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                       |-----handy-ruler------------------------------------------------------|
+perl-Number-Bites-Human: perl-Number-Bites-Human (Convert byte count to human readable format)
+perl-Number-Bites-Human:
+perl-Number-Bites-Human: This module provides a formatter which turns byte counts to usual 
+perl-Number-Bites-Human: readable format, like '2.0K', '3.1G', '100B'. It was inspired in the 
+perl-Number-Bites-Human: -h option of Unix utilities like du, df and ls for "human-readable"  
+perl-Number-Bites-Human: output.
+perl-Number-Bites-Human:
+perl-Number-Bites-Human: Home page: https://metacpan.org/pod/Number::Bytes::Human
+perl-Number-Bites-Human:
+perl-Number-Bites-Human:
+perl-Number-Bites-Human:
diff --git a/perl/perl-PHP-Serialization/perl-PHP-Serialization.SlackBuild b/perl/perl-PHP-Serialization/perl-PHP-Serialization.SlackBuild
index cba2ea8a3b..bb2faae73f 100644
--- a/perl/perl-PHP-Serialization/perl-PHP-Serialization.SlackBuild
+++ b/perl/perl-PHP-Serialization/perl-PHP-Serialization.SlackBuild
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 # Slackware build script for perl-PHP-Serialization
-# Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
+# Copyright 2010  V'yacheslav Stetskevych
 # All rights reserved.
 #
+# Adopted 2015  Glenn Becker <glenn.becker@gmail.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
diff --git a/perl/perl-PHP-Serialization/perl-PHP-Serialization.info b/perl/perl-PHP-Serialization/perl-PHP-Serialization.info
index 84e76ed3a5..dd2bec8e8d 100644
--- a/perl/perl-PHP-Serialization/perl-PHP-Serialization.info
+++ b/perl/perl-PHP-Serialization/perl-PHP-Serialization.info
@@ -6,5 +6,5 @@ MD5SUM="333af0848ad79931875a35cc61dc22e0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Package-Constants/README b/perl/perl-Package-Constants/README
new file mode 100644
index 0000000000..0c2132f6ac
--- /dev/null
+++ b/perl/perl-Package-Constants/README
@@ -0,0 +1,3 @@
+Package::Constants lists all the constants defined in a certain
+package. This can be useful for, among others, setting up an
+autogenerated @EXPORT/@EXPORT_OK for a Constants.pm file.
diff --git a/perl/perl-Package-Constants/perl-Package-Constants.SlackBuild b/perl/perl-Package-Constants/perl-Package-Constants.SlackBuild
new file mode 100644
index 0000000000..cb3a95bca8
--- /dev/null
+++ b/perl/perl-Package-Constants/perl-Package-Constants.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for perl-Package-Constants
+
+# Copyright 2016 Andreas Voegele <andreas@andreasvoegele.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+PRGNAM=perl-Package-Constants
+VERSION=${VERSION:-0.06}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Package-Constants/perl-Package-Constants.info b/perl/perl-Package-Constants/perl-Package-Constants.info
new file mode 100644
index 0000000000..05fc604828
--- /dev/null
+++ b/perl/perl-Package-Constants/perl-Package-Constants.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Package-Constants"
+VERSION="0.06"
+HOMEPAGE="https://metacpan.org/pod/Package::Constants"
+DOWNLOAD="http://www.cpan.org/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz"
+MD5SUM="e608e8eb260ee6226943c67eba1015ed"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/perl/perl-Package-Constants/slack-desc b/perl/perl-Package-Constants/slack-desc
new file mode 100644
index 0000000000..edd44066c8
--- /dev/null
+++ b/perl/perl-Package-Constants/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+perl-Package-Constants: perl-Package-Constants (List all constants declared in a package)
+perl-Package-Constants:
+perl-Package-Constants: Package::Constants lists all the constants defined in a certain
+perl-Package-Constants: package. This can be useful for, among others, setting up an
+perl-Package-Constants: autogenerated @EXPORT/@EXPORT_OK for a Constants.pm file.
+perl-Package-Constants:
+perl-Package-Constants: For more info, visit: https://metacpan.org/release/Package-Constants
+perl-Package-Constants:
+perl-Package-Constants:
+perl-Package-Constants:
+perl-Package-Constants:
diff --git a/perl/perl-Pegex/README b/perl/perl-Pegex/README
new file mode 100644
index 0000000000..dba8a7c057
--- /dev/null
+++ b/perl/perl-Pegex/README
@@ -0,0 +1,19 @@
+Pegex is an Acmeist parser framework. It allows you to easily create parsers 
+that will work equivalently in lots of programming languages! The inspiration 
+for Pegex comes from the parsing engine upon which the postmodern programming 
+language Perl 6 is based on. Pegex brings this beauty to the other justmodern 
+languages that have a normal regular expression engine available.
+
+Pegex gets it name by combining Parsing Expression Grammars (PEG), with 
+Regular Expessions (Regex). That's actually what Pegex does.
+
+PEG is the cool new way to elegantly specify recursive descent grammars. The 
+Perl 6 language is defined in terms of a self modifying PEG language called 
+Perl 6 Rules. Regexes are familiar to programmers of most modern programming 
+languages. Pegex defines a simple PEG syntax, where all the terminals are 
+regexes. This means that Pegex can be quite fast and powerful.
+
+Pegex attempts to be the simplest way to define new (or old) Domain Specific 
+Languages (DSLs) that need to be used in several programming languages and 
+environments. Things like JSON, YAML, Markdown etc. It also great for writing 
+parsers/compilers that only need to work in one language.
diff --git a/perl/perl-Pegex/perl-Pegex.SlackBuild b/perl/perl-Pegex/perl-Pegex.SlackBuild
new file mode 100644
index 0000000000..207054eff5
--- /dev/null
+++ b/perl/perl-Pegex/perl-Pegex.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for perl-Pegex
+
+# Copyright 2015 Glenn Becker <glenn.becker@gmail.com> Arlington, MA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-Pegex
+VERSION=${VERSION:-0.60}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README MANIFEST CONTRIBUTING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Pegex/perl-Pegex.info b/perl/perl-Pegex/perl-Pegex.info
new file mode 100644
index 0000000000..c3779b6dcb
--- /dev/null
+++ b/perl/perl-Pegex/perl-Pegex.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Pegex"
+VERSION="0.60"
+HOMEPAGE="https://metacpan.org/pod/Pegex"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IN/INGY/Pegex-0.60.tar.gz"
+MD5SUM="347f72c1c0347148d80058ea35927df8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-File-ShareDir-Install perl-YAML-LibYAML"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Pegex/slack-desc b/perl/perl-Pegex/slack-desc
new file mode 100644
index 0000000000..9cea343331
--- /dev/null
+++ b/perl/perl-Pegex/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+perl-Pegex: perl-Pegex (Acmeist PEG Parser Framework)
+perl-Pegex:
+perl-Pegex: Pegex is an Acmeist parser framework. It allows you to easily create
+perl-Pegex: parsers that will work equivalently in lots of programming languages!
+perl-Pegex:
+perl-Pegex:
+perl-Pegex:
+perl-Pegex:
+perl-Pegex:
+perl-Pegex:
+perl-Pegex:
diff --git a/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.SlackBuild b/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.SlackBuild
index 80d7bd9b06..96d48d8d69 100644
--- a/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.SlackBuild
+++ b/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-PerlIO-Layers
 
-# Copyright 2012 Glenn Becker <burningc@sdf.org>
+# Copyright 2012-15 Glenn Becker <glenn.becker@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-PerlIO-Layers
-VERSION=${VERSION:-0.010}
+VERSION=${VERSION:-0.011}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.info b/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.info
index f71d7e6dc5..69f6cca47d 100644
--- a/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.info
+++ b/perl/perl-PerlIO-Layers/perl-PerlIO-Layers.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-PerlIO-Layers"
-VERSION="0.010"
+VERSION="0.011"
 HOMEPAGE="https://metacpan.org/pod/PerlIO::Layers"
-DOWNLOAD="http://www.cpan.org/authors/id/L/LE/LEONT/PerlIO-Layers-0.010.tar.gz"
-MD5SUM="b8aff92d8f9446e54cca34b5780cee72"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.tar.gz"
+MD5SUM="0ae26fbacfa77935ce0e7553ddca40f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-List-MoreUtils"
 MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Proc-Daemon/perl-Proc-Daemon.SlackBuild b/perl/perl-Proc-Daemon/perl-Proc-Daemon.SlackBuild
index 3146c9a4f0..5a44f77a74 100644
--- a/perl/perl-Proc-Daemon/perl-Proc-Daemon.SlackBuild
+++ b/perl/perl-Proc-Daemon/perl-Proc-Daemon.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Thomas Morper <thomas@beingboiled.info>
 
 PRGNAM=perl-Proc-Daemon
-VERSION=${VERSION:-0.20}
+VERSION=${VERSION:-0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Proc-Daemon/perl-Proc-Daemon.info b/perl/perl-Proc-Daemon/perl-Proc-Daemon.info
index f212158287..ec5831fdc2 100644
--- a/perl/perl-Proc-Daemon/perl-Proc-Daemon.info
+++ b/perl/perl-Proc-Daemon/perl-Proc-Daemon.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Proc-Daemon"
-VERSION="0.20"
+VERSION="0.21"
 HOMEPAGE="http://search.cpan.org/~akreal/Proc-Daemon/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/A/AK/AKREAL/Proc-Daemon-0.20.tar.gz"
-MD5SUM="2ac298b4e6d83b6c9da1e5f3a8ea4821"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/A/AK/AKREAL/Proc-Daemon-0.21.tar.gz"
+MD5SUM="342681eba6a0b1a7a826717e16e31190"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild b/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild
index 74300ee83a..9a9667cc4f 100644
--- a/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild
+++ b/perl/perl-Role-Tiny/perl-Role-Tiny.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Role-Tiny
 
-# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Role-Tiny
-VERSION=${VERSION:-1.003004}
+VERSION=${VERSION:-2.000001}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Role-Tiny/perl-Role-Tiny.info b/perl/perl-Role-Tiny/perl-Role-Tiny.info
index 4fbf14b16c..e8cba15db2 100644
--- a/perl/perl-Role-Tiny/perl-Role-Tiny.info
+++ b/perl/perl-Role-Tiny/perl-Role-Tiny.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Role-Tiny"
-VERSION="1.003004"
+VERSION="2.000001 "
 HOMEPAGE="https://metacpan.org/pod/Role::Tiny"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-1.003004.tar.gz"
-MD5SUM="3c405a0f76eab9893c8927baea0cdb0c"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.000001.tar.gz"
+MD5SUM="f350f1f8c13652bf85da172380b39ec8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Test-Fatal"
diff --git a/perl/perl-Sidef/README b/perl/perl-Sidef/README
new file mode 100644
index 0000000000..e837eef58e
--- /dev/null
+++ b/perl/perl-Sidef/README
@@ -0,0 +1,5 @@
+perl-Sidef (A modern object-oriented programming language).
+
+Sidef is a modern object-oriented programming language, implemented in Perl.
+
+You can download Sidef HandBook at: http://trizen.gitbooks.io/sidef-lang/
diff --git a/perl/perl-Sidef/perl-Sidef.SlackBuild b/perl/perl-Sidef/perl-Sidef.SlackBuild
new file mode 100644
index 0000000000..66c6fcf898
--- /dev/null
+++ b/perl/perl-Sidef/perl-Sidef.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Slackware build script for perl-Sidef.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-Sidef
+VERSION=${VERSION:-2.20}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="sidef"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+PERL_MM_USE_DEFAULT=1 \
+PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR=$PKG" \
+PERL_MB_OPT="--installdirs vendor --destdir $PKG" \
+MODULEBUILDRC=/dev/null \
+perl Build.PL \
+  prefix=/usr \
+  installdirs=vendor \
+  destdir=$PKG
+./Build
+./Build install \
+  --install_path bindoc=/usr/man/man1 \
+  --install_path libdoc=/usr/man/man3
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+DOCS="Changes LICENSE README.md TODO"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Sidef/perl-Sidef.info b/perl/perl-Sidef/perl-Sidef.info
new file mode 100644
index 0000000000..a15c3e791f
--- /dev/null
+++ b/perl/perl-Sidef/perl-Sidef.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Sidef"
+VERSION="2.20"
+HOMEPAGE="https://github.com/trizen/sidef"
+DOWNLOAD="https://github.com/trizen/sidef/archive/2.20.tar.gz"
+MD5SUM="5499dbed75c06cf42295d7027c1ad6b1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-data-dump perl-Module-Build"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/perl/perl-Sidef/slack-desc b/perl/perl-Sidef/slack-desc
new file mode 100644
index 0000000000..5495e1e228
--- /dev/null
+++ b/perl/perl-Sidef/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+perl-Sidef: perl-Sidef (A modern object-oriented programming language)
+perl-Sidef:
+perl-Sidef: Sidef is a modern object-oriented programming language, implemented
+perl-Sidef: in Perl.
+perl-Sidef:
+perl-Sidef: Home page: https://github.com/trizen/sidef
+perl-Sidef:
+perl-Sidef:
+perl-Sidef:
+perl-Sidef:
+perl-Sidef:
diff --git a/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.SlackBuild b/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.SlackBuild
index 66a5305d91..b597ffbfa9 100644
--- a/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.SlackBuild
+++ b/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for <appname>
+# Slackware build script for perl-Sub-Exporter-Progressive
 
-# Copyright <year> <you> <where you live>
+# Copyright 2015 Glenn Becker <glenn.becker@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.info b/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.info
index 68998f5981..2de8fe916d 100644
--- a/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.info
+++ b/perl/perl-Sub-Exporter-Progressive/perl-Sub-Exporter-Progressive.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.SlackBuild b/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.SlackBuild
index aa6c89628f..810aa09b00 100644
--- a/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.SlackBuild
+++ b/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl modules: Sub::Uplevel
 # Home Page http://search.cpan.org/dist/Sub-Uplevel/
 
-# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant@mnspace.net)
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +25,12 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=perl-Sub-Uplevel
-VERSION=${VERSION:-0.24}
+PRGNAM="perl-Sub-Uplevel"
+VERSION=${VERSION:-0.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=Sub-Uplevel
+SRCNAM="$(printf $PRGNAM | cut -f2- -d-)"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -69,10 +70,10 @@ tar xzvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
 chown -R root.root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
 make
diff --git a/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.info b/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.info
index 489c88ca8b..2037098eb1 100644
--- a/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.info
+++ b/perl/perl-Sub-Uplevel/perl-Sub-Uplevel.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Sub-Uplevel"
-VERSION="0.24"
-HOMEPAGE="https://metacpan.org/pod/Sub::Uplevel"
-DOWNLOAD="http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.24.tar.gz"
-MD5SUM="bea4037e8b2a0df563e25e6e44cb2e73"
+VERSION="0.25"
+HOMEPAGE="http://search.cpan.org/dist/Sub-Uplevel/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.25.tar.gz"
+MD5SUM="5d0752dbfa94d0c91b25a264f47f5675"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Sys-Mmap/perl-Sys-Mmap.SlackBuild b/perl/perl-Sys-Mmap/perl-Sys-Mmap.SlackBuild
index 075723cec3..00408b2cfb 100644
--- a/perl/perl-Sys-Mmap/perl-Sys-Mmap.SlackBuild
+++ b/perl/perl-Sys-Mmap/perl-Sys-Mmap.SlackBuild
@@ -4,6 +4,7 @@
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
 # All rights reserved.
 #
+# Updated for 0.17 by Glenn Becker <glenn.becker@gmail.com>
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -23,7 +24,7 @@
 
 SRCNAM=Sys-Mmap
 PRGNAM=perl-$SRCNAM
-VERSION=${VERSION:-0.16}
+VERSION=${VERSION:-0.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Sys-Mmap/perl-Sys-Mmap.info b/perl/perl-Sys-Mmap/perl-Sys-Mmap.info
index a4f7e8f764..833fcce4b4 100644
--- a/perl/perl-Sys-Mmap/perl-Sys-Mmap.info
+++ b/perl/perl-Sys-Mmap/perl-Sys-Mmap.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Sys-Mmap"
-VERSION="0.16"
+VERSION="0.17"
 HOMEPAGE="https://metacpan.org/pod/Sys::Mmap"
-DOWNLOAD="http://www.cpan.org/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz"
-MD5SUM="faae869e876fa86f92e6de3f13af3aef"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Sys-Mmap-0.17.tar.gz"
+MD5SUM="1fc827d67d468c594ab486c58047d57c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-TeX-Hyphen/README b/perl/perl-TeX-Hyphen/README
new file mode 100644
index 0000000000..7045d4cd1b
--- /dev/null
+++ b/perl/perl-TeX-Hyphen/README
@@ -0,0 +1,3 @@
+This module uses TeX style hyphenation patterns to find places in words to
+hyphenate. You can use any hyphenation file you like, but it will use the
+built-in Plain TeX hyphenation tables if no file is supplied.
diff --git a/perl/perl-TeX-Hyphen/perl-TeX-Hyphen.SlackBuild b/perl/perl-TeX-Hyphen/perl-TeX-Hyphen.SlackBuild
new file mode 100644
index 0000000000..15c50f8f88
--- /dev/null
+++ b/perl/perl-TeX-Hyphen/perl-TeX-Hyphen.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for perl-TeX-Hyphen
+#
+# Copyright 2015 Tracy Williams <t_s_williams[at]yahoo[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-TeX-Hyphen
+VERSION=${VERSION:-1.16}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=TeX-Hyphen
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs" -empty | xargs rm -f || true
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-TeX-Hyphen/perl-TeX-Hyphen.info b/perl/perl-TeX-Hyphen/perl-TeX-Hyphen.info
new file mode 100644
index 0000000000..7451150697
--- /dev/null
+++ b/perl/perl-TeX-Hyphen/perl-TeX-Hyphen.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-TeX-Hyphen"
+VERSION="1.16"
+HOMEPAGE="https://metacpan.org/pod/TeX::Hyphen"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/J/JA/JANPAZ/TeX-Hyphen-1.16.tar.gz"
+MD5SUM="035e4113d98891e656b78a83afdfb790"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Tracy Williams"
+EMAIL="t_s_williams[at]yahoo[dot]com"
diff --git a/perl/perl-TeX-Hyphen/slack-desc b/perl/perl-TeX-Hyphen/slack-desc
new file mode 100644
index 0000000000..8f979b1b05
--- /dev/null
+++ b/perl/perl-TeX-Hyphen/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+perl-TeX-Hyphen: perl-TeX-Hyphen (hyphenate words using TeX's patterns)
+perl-TeX-Hyphen:
+perl-TeX-Hyphen: TeX::Hyphen module uses TeX style hyphenation patterns to find places
+perl-TeX-Hyphen: in words to hyphenate. You can use any hyphenation file you like, but
+perl-TeX-Hyphen: it will use the built-in Plain TeX hyphenation tables if no file is
+perl-TeX-Hyphen: supplied.
+perl-TeX-Hyphen:
+perl-TeX-Hyphen:
+perl-TeX-Hyphen:
+perl-TeX-Hyphen: Homepage: https://metacpan.org/pod/TeX::Hyphen
+perl-TeX-Hyphen:
diff --git a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild
index 2c3cdcc912..cf154199e1 100644
--- a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild
+++ b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.SlackBuild
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-Term-ReadLine-Gnu
-VERSION=${VERSION:-1.26}
+VERSION=${VERSION:-1.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info
index b91cf52081..d43300ac04 100644
--- a/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info
+++ b/perl/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Term-ReadLine-Gnu"
-VERSION="1.26"
+VERSION="1.28"
 HOMEPAGE="https://metacpan.org/pod/Term::ReadLine::Gnu"
-DOWNLOAD="http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.26.tar.gz"
-MD5SUM="0792d93dc22608132c94928121d51482"
+DOWNLOAD="http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.28.tar.gz"
+MD5SUM="bde05818d8f8c73c5c5b8a60c28f2662"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Test-Differences/perl-Test-Differences.SlackBuild b/perl/perl-Test-Differences/perl-Test-Differences.SlackBuild
index 2aa676555f..c23e426765 100644
--- a/perl/perl-Test-Differences/perl-Test-Differences.SlackBuild
+++ b/perl/perl-Test-Differences/perl-Test-Differences.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 PRGNAM=perl-Test-Differences
-VERSION=${VERSION:-0.63}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.64}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
diff --git a/perl/perl-Test-Differences/perl-Test-Differences.info b/perl/perl-Test-Differences/perl-Test-Differences.info
index 88a096ccdb..fb75a0c29f 100644
--- a/perl/perl-Test-Differences/perl-Test-Differences.info
+++ b/perl/perl-Test-Differences/perl-Test-Differences.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Test-Differences"
-VERSION="0.63"
+VERSION="0.64"
 HOMEPAGE="https://metacpan.org/pod/Test::Differences"
-DOWNLOAD="http://www.cpan.org/authors/id/D/DC/DCANTRELL/Test-Differences-0.63.tar.gz"
-MD5SUM="473cce4879642e29d41bdfafd89c821d"
+DOWNLOAD="http://www.cpan.org/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz"
+MD5SUM="ecfda620fe133e36a6e392d94ab8424d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Text-Diff"
+REQUIRES="perl-Text-Diff perl-Module-Build perl-Capture-Tiny"
 MAINTAINER="LEVAI Daniel"
 EMAIL="leva@ecentrum.hu"
diff --git a/perl/perl-Test-Exception/perl-Test-Exception.SlackBuild b/perl/perl-Test-Exception/perl-Test-Exception.SlackBuild
index f5cbd39499..a970de7c9d 100644
--- a/perl/perl-Test-Exception/perl-Test-Exception.SlackBuild
+++ b/perl/perl-Test-Exception/perl-Test-Exception.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: Test::Exception
 # Home Page http://search.cpan.org/dist/Test-Exception/
 
-# Copyright (c) 2008-2014, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 #
@@ -25,12 +25,12 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=perl-Test-Exception
-VERSION=${VERSION:-0.35}
+PRGNAM="perl-Test-Exception"
+VERSION=${VERSION:-0.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=Test-Exception
+SRCNAM="$(printf $PRGNAM | cut -f2- -d-)"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -55,7 +55,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 fi
 
-DOCS="Changes README"
+DOCS="Changes"
 
 rm -fr $TMP/$SRCNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/perl/perl-Test-Exception/perl-Test-Exception.info b/perl/perl-Test-Exception/perl-Test-Exception.info
index f396afc76f..f6d6728c3e 100644
--- a/perl/perl-Test-Exception/perl-Test-Exception.info
+++ b/perl/perl-Test-Exception/perl-Test-Exception.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Test-Exception"
-VERSION="0.35"
+VERSION="0.40"
 HOMEPAGE="http://search.cpan.org/dist/Test-Exception/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/Test-Exception-0.35.tar.gz"
-MD5SUM="d774ff26e5fcd67d6364a990b61e62ca"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/Test-Exception-0.40.tar.gz"
+MD5SUM="29993e711cf671f8f2ec759f410de681"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Sub-Uplevel"
diff --git a/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild b/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild
index bd56cf4fcb..e50b2ca1e6 100644
--- a/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild
+++ b/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Test-Harness
 
-# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Test-Harness
-VERSION=${VERSION:-3.34}
+VERSION=${VERSION:-3.35}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Test-Harness/perl-Test-Harness.info b/perl/perl-Test-Harness/perl-Test-Harness.info
index e288c472b9..d4aa88a8bf 100644
--- a/perl/perl-Test-Harness/perl-Test-Harness.info
+++ b/perl/perl-Test-Harness/perl-Test-Harness.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Test-Harness"
-VERSION="3.34"
+VERSION="3.35"
 HOMEPAGE="https://metacpan.org/pod/Test::Harness"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/L/LE/LEONT/Test-Harness-3.34.tar.gz"
-MD5SUM="aa0175e8fef92c19f06128810f1a2921"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LE/LEONT/Test-Harness-3.35.tar.gz"
+MD5SUM="2a6010bca2ad78e094d629eea6afd7d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Test-Inter/perl-Test-Inter.SlackBuild b/perl/perl-Test-Inter/perl-Test-Inter.SlackBuild
index 4c680717c3..3b0221542b 100644
--- a/perl/perl-Test-Inter/perl-Test-Inter.SlackBuild
+++ b/perl/perl-Test-Inter/perl-Test-Inter.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Test-Inter
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 SRCNAM=Test-Inter
 PRGNAM=perl-$SRCNAM
-VERSION=${VERSION:-1.05}
+VERSION=${VERSION:-1.06}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,7 +86,7 @@ find $PKG -name "perllocal.pod" -o -name ".packlist"  -o -name "*.bs"  | xargs r
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README TODO INSTALL ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README MANIFEST INSTALL Changes $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/perl/perl-Test-Inter/perl-Test-Inter.info b/perl/perl-Test-Inter/perl-Test-Inter.info
index 3501491c4e..79e47a6ea9 100644
--- a/perl/perl-Test-Inter/perl-Test-Inter.info
+++ b/perl/perl-Test-Inter/perl-Test-Inter.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Test-Inter"
-VERSION="1.05"
+VERSION="1.06"
 HOMEPAGE="https://metacpan.org/pod/distribution/Test-Inter/lib/Test/Inter.pod"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/S/SB/SBECK/Test-Inter-1.05.tar.gz"
-MD5SUM="5c021ced9a642f9bb28aa0b8ac6f50a1"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Test-Inter-1.06.tar.gz"
+MD5SUM="61da056da6dae8ee256d2ccbd2e24a73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Test-MockObject/perl-Test-MockObject.info b/perl/perl-Test-MockObject/perl-Test-MockObject.info
index 5ca65e6a23..0839dcac77 100644
--- a/perl/perl-Test-MockObject/perl-Test-MockObject.info
+++ b/perl/perl-Test-MockObject/perl-Test-MockObject.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-Test-MockObject"
 VERSION="1.20140408"
 HOMEPAGE="http://search.cpan.org/~chromatic/Test-MockObject/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20140408.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/Test-MockObject-1.20140408.tar.gz"
 MD5SUM="df25fe07981cf1a533bf9e4c65c130ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-Test-Pod/perl-Test-Pod.SlackBuild b/perl/perl-Test-Pod/perl-Test-Pod.SlackBuild
index 68075ba5f9..6c6965ed69 100644
--- a/perl/perl-Test-Pod/perl-Test-Pod.SlackBuild
+++ b/perl/perl-Test-Pod/perl-Test-Pod.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for perl modules: Test::POD
 # Home Page http://search.cpan.org/dist/Test-Pod/
 
-# Copyright (c) 2008-2013, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2015, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
@@ -27,13 +27,12 @@
 #
 # Modified by the SlackBuilds.org project.
 
+SRCNAM="Test-Pod"
 PRGNAM="perl-Test-Pod"
-VERSION=${VERSION:-1.48}
+VERSION=${VERSION:-1.51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM="$(printf $PRGNAM | cut -f2- -d-)"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -63,12 +62,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-
 CFLAGS="$SLKCFLAGS" \
-perl Build.PL prefix=/usr installdirs=vendor destdir=$PKG
-./Build
-./Build test
-./Build install
+perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+make install DESTDIR=$PKG
 
 ### putting essential docs
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -78,7 +76,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Remove perlocal.pod and .packlist from $PKG
 find $PKG -name "perllocal.pod" -o -name ".packlist"  -o -name "*.bs"  | xargs rm -f
 
-mv $PKG/usr/share/man $PKG/usr/man
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
diff --git a/perl/perl-Test-Pod/perl-Test-Pod.info b/perl/perl-Test-Pod/perl-Test-Pod.info
index 0cad6a7307..2aae10b1b0 100644
--- a/perl/perl-Test-Pod/perl-Test-Pod.info
+++ b/perl/perl-Test-Pod/perl-Test-Pod.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Test-Pod"
-VERSION="1.48"
-HOMEPAGE="https://metacpan.org/pod/Test::Pod"
-DOWNLOAD="http://www.cpan.org/authors/id/D/DW/DWHEELER/Test-Pod-1.48.tar.gz"
-MD5SUM="c6bfd00ccdcb417d68fb3c0a0ec884c8"
+VERSION="1.51"
+HOMEPAGE="http://search.cpan.org/dist/Test-Pod/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Pod-1.51.tar.gz"
+MD5SUM="f806aa84de2f0c0fba48b3a5a8a4aecf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Test-Warnings/perl-Test-Warnings.info b/perl/perl-Test-Warnings/perl-Test-Warnings.info
index 96564fce9d..69bb1ba9b5 100644
--- a/perl/perl-Test-Warnings/perl-Test-Warnings.info
+++ b/perl/perl-Test-Warnings/perl-Test-Warnings.info
@@ -1,7 +1,7 @@
 PRGNAM="perl-Test-Warnings"
 VERSION="0.013"
 HOMEPAGE="https://metacpan.org/pod/Test::Warnings"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Warnings-0.013.tar.gz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/Test-Warnings-0.013.tar.gz"
 MD5SUM="417033144b2fc373830a3547e9f96fab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/perl/perl-Text-CharWidth/perl-Text-CharWidth.info b/perl/perl-Text-CharWidth/perl-Text-CharWidth.info
index 0a4f0822ca..4699779c10 100644
--- a/perl/perl-Text-CharWidth/perl-Text-CharWidth.info
+++ b/perl/perl-Text-CharWidth/perl-Text-CharWidth.info
@@ -1,5 +1,5 @@
 PRGNAM="perl-Text-CharWidth"
-VERSION="0.0.4"
+VERSION="0.04"
 HOMEPAGE="https://metacpan.org/pod/Text::CharWidth"
 DOWNLOAD="http://www.cpan.org/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz"
 MD5SUM="37a723df0580c0758c0ee67b37336c15"
diff --git a/perl/perl-Text-Diff/perl-Text-Diff.SlackBuild b/perl/perl-Text-Diff/perl-Text-Diff.SlackBuild
index f861ddeee4..e1a498b90d 100644
--- a/perl/perl-Text-Diff/perl-Text-Diff.SlackBuild
+++ b/perl/perl-Text-Diff/perl-Text-Diff.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PRGNAM=perl-Text-Diff
-VERSION=${VERSION:-1.41}
+VERSION=${VERSION:-1.43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Text-Diff/perl-Text-Diff.info b/perl/perl-Text-Diff/perl-Text-Diff.info
index a4b3a34b5f..f666da7548 100644
--- a/perl/perl-Text-Diff/perl-Text-Diff.info
+++ b/perl/perl-Text-Diff/perl-Text-Diff.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Text-Diff"
-VERSION="1.41"
+VERSION="1.43"
 HOMEPAGE="https://metacpan.org/pod/Text::Diff"
-DOWNLOAD="http://www.cpan.org/authors/id/O/OV/OVID/Text-Diff-1.41.tar.gz"
-MD5SUM="30d56e6dd5551ca16b8e16cc7299dc21"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Diff-1.43.tar.gz"
+MD5SUM="49ee558984cb85b81bbc8fe5cf7324c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Algorithm-Diff"
diff --git a/perl/perl-Text-Hyphen/perl-Text-Hyphen.SlackBuild b/perl/perl-Text-Hyphen/perl-Text-Hyphen.SlackBuild
index ce1f3b8b9f..0b3cdda41b 100644
--- a/perl/perl-Text-Hyphen/perl-Text-Hyphen.SlackBuild
+++ b/perl/perl-Text-Hyphen/perl-Text-Hyphen.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-Text-Hyphen
 #
-# Copyright 2014 Tracy Williams <t_s_williams[at]yahoo[dot]com>
+# Copyright 2015 Tracy Williams <t_s_williams[at]yahoo[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Text-Hyphen
-VERSION=${VERSION:-0.11}
+VERSION=${VERSION:-0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,20 +42,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -71,14 +57,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-perl Makefile.PL \
-  PREFIX=/usr \
-  INSTALLDIRS=vendor \
-  INSTALLVENDORMAN3DIR=/usr/man/man3
-
-make
-make test
-make install DESTDIR=$PKG
+perl Build.PL \
+  prefix=/usr \
+  installdirs=vendor \
+  destdir=$PKG
+./Build
+./Build test
+./Build install \
+  --install_path bindoc=/usr/man/man1 \
+  --install_path libdoc=/usr/man/man3
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -90,7 +77,7 @@ find $PKG -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs" -empty | xa
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes MANIFEST README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/perl/perl-Text-Hyphen/perl-Text-Hyphen.info b/perl/perl-Text-Hyphen/perl-Text-Hyphen.info
index b716b171ea..fb5307f09e 100644
--- a/perl/perl-Text-Hyphen/perl-Text-Hyphen.info
+++ b/perl/perl-Text-Hyphen/perl-Text-Hyphen.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Text-Hyphen"
-VERSION="0.11"
+VERSION="0.12"
 HOMEPAGE="https://metacpan.org/pod/Text::Hyphen"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/K/KA/KAPPA/Text-Hyphen-0.11.tar.gz"
-MD5SUM="48185d553e2aa4fca6f968a7a6ab99dc"
+DOWNLOAD="http://cpan.metacpan.org/authors/id/K/KA/KAPPA/Text-Hyphen-0.12.tar.gz"
+MD5SUM="fb685ce74ebf09645d4f62e48eb13c6d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Time-Piece/perl-Time-Piece.SlackBuild b/perl/perl-Time-Piece/perl-Time-Piece.SlackBuild
index 1d1344cbc7..9a176f88b5 100644
--- a/perl/perl-Time-Piece/perl-Time-Piece.SlackBuild
+++ b/perl/perl-Time-Piece/perl-Time-Piece.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Time-Piece
-VERSION=${VERSION:-1.30}
+VERSION=${VERSION:-1.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-Time-Piece/perl-Time-Piece.info b/perl/perl-Time-Piece/perl-Time-Piece.info
index 048c406f2f..175c297213 100644
--- a/perl/perl-Time-Piece/perl-Time-Piece.info
+++ b/perl/perl-Time-Piece/perl-Time-Piece.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-Time-Piece"
-VERSION="1.30"
+VERSION="1.31"
 HOMEPAGE="https://metacpan.org/pod/Time::Piece"
-DOWNLOAD="http://www.cpan.org/authors/id/R/RJ/RJBS/Time-Piece-1.30.tar.gz"
-MD5SUM="5b58f4a3c2826f42fc5d4094105c9f1b"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ES/ESAYM/Time-Piece-1.31.tar.gz"
+MD5SUM="034c584a88232b122667cc594f544ca8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-Unicode-LineBreak/README b/perl/perl-Unicode-LineBreak/README
index 1d96ffd0e5..430e67fbfc 100644
--- a/perl/perl-Unicode-LineBreak/README
+++ b/perl/perl-Unicode-LineBreak/README
@@ -1,4 +1,4 @@
-perl-Unicode-LineBreak (UAX #14 Unicode Line Breaking Algorithm)
+perl-Unicode-LineBreak - UAX #14 Unicode Line Breaking Algorithm
 
 This perl package includes three modules:
 Text::LineFold - Line Folding for Plain Text
@@ -7,7 +7,8 @@ Unicode::LineBreak - UAX #14 Unicode Line Breaking Algorithm
 
 man pages wearing the same name are included, e.g. type:
 man Unicode::GCString 
-
 For man pages in Japanese prepend page name with POD2::JA::, e.g.
 man POD2::JA::Unicode::GCString
 
+This perl package is a dependency of the TEXT module of po4a as it
+includes Unicode::GCString
diff --git a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild
index da92e31bf6..9688476878 100644
--- a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild
+++ b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-Unicode-LineBreak
-VERSION=${VERSION:-2013.11}
+VERSION=${VERSION:-2015.07.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Makefile.PL --with-bundled-sombok --disable-libthai \
   PREFIX=/usr \
diff --git a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info
index 6e761e14fa..ddf0966441 100644
--- a/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info
+++ b/perl/perl-Unicode-LineBreak/perl-Unicode-LineBreak.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Unicode-LineBreak"
-VERSION="2013.008_06"
-HOMEPAGE="https://metacpan.org/pod/Unicode::LineBreak"
-DOWNLOAD="http://www.cpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2013.11.tar.gz"
-MD5SUM="994da3b6dab60486249034d2502fba28"
+VERSION="2015.07.16"
+HOMEPAGE="http://search.cpan.org/~nezumi/Unicode-LineBreak-2015.07.16/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2015.07.16.tar.gz"
+MD5SUM="8e811b9b9c47fdc7fa3a5c55e1a9c0ea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-MIME-Charset"
 MAINTAINER="Didier Spaier"
-EMAIL="didier dot spaier at epsm dot fr"
+EMAIL="didier at slint dot fr"
diff --git a/perl/perl-WWW-Curl/README b/perl/perl-WWW-Curl/README
new file mode 100644
index 0000000000..de8f13624e
--- /dev/null
+++ b/perl/perl-WWW-Curl/README
@@ -0,0 +1 @@
+WWW::Curl - Perl extension interface for libcurl
diff --git a/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild b/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild
new file mode 100644
index 0000000000..df5b95b16a
--- /dev/null
+++ b/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for perl-WWW-Curl
+# Written by Pragmatic Cypher <slackbuilds@server.ky>
+
+PRGNAM=perl-WWW-Curl
+VERSION=${VERSION:-4.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=$(echo $PRGNAM | cut -f2- -d-)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name "perllocal.pod" -o -name ".packlist" -o -name "*.bs" -empty | xargs rm -f || true
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes LICENSE MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-WWW-Curl/perl-WWW-Curl.info b/perl/perl-WWW-Curl/perl-WWW-Curl.info
new file mode 100644
index 0000000000..ae9c0dbf71
--- /dev/null
+++ b/perl/perl-WWW-Curl/perl-WWW-Curl.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-WWW-Curl"
+VERSION="4.17"
+HOMEPAGE="http://search.cpan.org/~szbalint/WWW-Curl-4.17/lib/WWW/Curl.pm"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz"
+MD5SUM="997ac81cd6b03b30b36f7cd930474845"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pragmatic Cypher"
+EMAIL="slackbuilds@server.ky"
diff --git a/perl/perl-WWW-Curl/slack-desc b/perl/perl-WWW-Curl/slack-desc
new file mode 100644
index 0000000000..d95625bea5
--- /dev/null
+++ b/perl/perl-WWW-Curl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+perl-WWW-Curl: perl-WWW-Curl (RDBMS perl module)
+perl-WWW-Curl:
+perl-WWW-Curl:	WWW::Curl - Perl extension interface for libcurl
+perl-WWW-Curl:
+perl-WWW-Curl:
+perl-WWW-Curl:
+perl-WWW-Curl:
+perl-WWW-Curl:
+perl-WWW-Curl:
+perl-WWW-Curl:
+perl-WWW-Curl:
diff --git a/perl/perl-WebService-MusicBrainz/README b/perl/perl-WebService-MusicBrainz/README
new file mode 100644
index 0000000000..a30fde7361
--- /dev/null
+++ b/perl/perl-WebService-MusicBrainz/README
@@ -0,0 +1,5 @@
+WebService::MusicBrainz searches the MusicBrainz database, which
+contains a huge amount of music metadata, through the database's web
+service and returns objects with the found data.
+
+abcde can use WebService::MusicBrainz to look up metadata.
diff --git a/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.SlackBuild b/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.SlackBuild
new file mode 100644
index 0000000000..11d73e4d69
--- /dev/null
+++ b/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for perl-WebService-MusicBrainz
+
+# Copyright 2016 Andreas Voegele <andreas@andreasvoegele.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+PRGNAM=perl-WebService-MusicBrainz
+VERSION=${VERSION:-0.93}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+# The test suite requires a network connection and also contains outdated
+# music metadata, which has changed in the online database since the test
+# suite was written.
+#make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info b/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info
new file mode 100644
index 0000000000..975c323a75
--- /dev/null
+++ b/perl/perl-WebService-MusicBrainz/perl-WebService-MusicBrainz.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-WebService-MusicBrainz"
+VERSION="0.93"
+HOMEPAGE="https://metacpan.org/pod/WebService::MusicBrainz"
+DOWNLOAD="http://www.cpan.org/authors/id/B/BF/BFAIST/WebService-MusicBrainz-0.93.tar.gz"
+MD5SUM="120bdefa3fc317a44aa00a92bd29297c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libwww-perl perl-class-accessor perl-xml-libxml"
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/perl/perl-WebService-MusicBrainz/slack-desc b/perl/perl-WebService-MusicBrainz/slack-desc
new file mode 100644
index 0000000000..b15eb26379
--- /dev/null
+++ b/perl/perl-WebService-MusicBrainz/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                           |-----handy-ruler------------------------------------------------------|
+perl-WebService-MusicBrainz: perl-WebService-MusicBrainz (retrieve music metadata)
+perl-WebService-MusicBrainz:
+perl-WebService-MusicBrainz: WebService::MusicBrainz searches the MusicBrainz database, which
+perl-WebService-MusicBrainz: contains a huge amount of music metadata, through the database's web
+perl-WebService-MusicBrainz: service and returns objects with the found data.
+perl-WebService-MusicBrainz:
+perl-WebService-MusicBrainz: abcde can use WebService::MusicBrainz to look up metadata.
+perl-WebService-MusicBrainz:
+perl-WebService-MusicBrainz: For more info, visit: https://musicbrainz.org/ and
+perl-WebService-MusicBrainz: https://metacpan.org/release/WebService-MusicBrainz
+perl-WebService-MusicBrainz:
diff --git a/perl/perl-XML-TreePP/README b/perl/perl-XML-TreePP/README
new file mode 100644
index 0000000000..93a40d94e5
--- /dev/null
+++ b/perl/perl-XML-TreePP/README
@@ -0,0 +1 @@
+Pure Perl implementation for parsing/writing XML documents.
diff --git a/perl/perl-XML-TreePP/perl-XML-TreePP.SlackBuild b/perl/perl-XML-TreePP/perl-XML-TreePP.SlackBuild
new file mode 100644
index 0000000000..69915706b6
--- /dev/null
+++ b/perl/perl-XML-TreePP/perl-XML-TreePP.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for perl-XML-TreePP
+
+# Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-XML-TreePP
+SRCNAM=XML-TreePP
+VERSION=${VERSION:-0.43}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes MANIFEST README*  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-XML-TreePP/perl-XML-TreePP.info b/perl/perl-XML-TreePP/perl-XML-TreePP.info
new file mode 100644
index 0000000000..6f91dea4ff
--- /dev/null
+++ b/perl/perl-XML-TreePP/perl-XML-TreePP.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-XML-TreePP"
+VERSION="0.43"
+HOMEPAGE="https://metacpan.org/release/XML-TreePP"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz"
+MD5SUM="f69693066e52591bf1142d3f4e6d37e5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/perl/perl-XML-TreePP/slack-desc b/perl/perl-XML-TreePP/slack-desc
new file mode 100644
index 0000000000..6330b22c3e
--- /dev/null
+++ b/perl/perl-XML-TreePP/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+perl-XML-TreePP: perl-XML-TreePP (perl module)
+perl-XML-TreePP:
+perl-XML-TreePP: Pure Perl implementation for parsing/writing XML documents.
+perl-XML-TreePP:
+perl-XML-TreePP:
+perl-XML-TreePP:
+perl-XML-TreePP:
+perl-XML-TreePP:
+perl-XML-TreePP:
+perl-XML-TreePP:
+perl-XML-TreePP:
diff --git a/perl/perl-YAML-LibYAML/README b/perl/perl-YAML-LibYAML/README
new file mode 100644
index 0000000000..dd08ca2a2c
--- /dev/null
+++ b/perl/perl-YAML-LibYAML/README
@@ -0,0 +1,9 @@
+Kirill Siminov's libyaml is arguably the best YAML implementation. The C 
+library is written precisely to the YAML 1.1 specification. It was originally 
+bound to Python and was later bound to Ruby.
+
+This module is a Perl XS binding to libyaml which offers Perl the best YAML 
+support to date.
+
+This module exports the functions Dump, Load, DumpFile and LoadFile. These 
+functions are intended to work exactly like YAML.pm's corresponding functions.
diff --git a/perl/perl-YAML-LibYAML/perl-YAML-LibYAML.SlackBuild b/perl/perl-YAML-LibYAML/perl-YAML-LibYAML.SlackBuild
new file mode 100644
index 0000000000..9408881cd7
--- /dev/null
+++ b/perl/perl-YAML-LibYAML/perl-YAML-LibYAML.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for perl-YAML-LibYAML
+
+# Copyright 2015 Glenn Becker <glenn.becker@gmail.com> Arlington, MA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-YAML-LibYAML
+VERSION=${VERSION:-0.59}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README LICENSE MANIFEST CONTRIBUTING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-YAML-LibYAML/perl-YAML-LibYAML.info b/perl/perl-YAML-LibYAML/perl-YAML-LibYAML.info
new file mode 100644
index 0000000000..82e2e22916
--- /dev/null
+++ b/perl/perl-YAML-LibYAML/perl-YAML-LibYAML.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-YAML-LibYAML"
+VERSION="0.59"
+HOMEPAGE="https://metacpan.org/release/YAML-LibYAML"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/I/IN/INGY/YAML-LibYAML-0.59.tar.gz"
+MD5SUM="733e63b743088781eb8cad6477cd4905"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/perl/perl-YAML-LibYAML/slack-desc b/perl/perl-YAML-LibYAML/slack-desc
new file mode 100644
index 0000000000..ffca0cb1a8
--- /dev/null
+++ b/perl/perl-YAML-LibYAML/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+perl-YAML-LibYAML: perl-YAML-LibYAML (Perl YAML Serialization using XS and libyaml)
+perl-YAML-LibYAML:
+perl-YAML-LibYAML: provides YAML::LibYAML and YAML::XS. Kirill Siminov's libyaml is
+perl-YAML-LibYAML: arguably the best YAML implementation. The C library is written
+perl-YAML-LibYAML: precisely to the YAML 1.1 specification. It was originally bound to
+perl-YAML-LibYAML: Python and was later bound to Ruby.
+perl-YAML-LibYAML:
+perl-YAML-LibYAML: This module is a Perl XS binding to libyaml which offers Perl the
+perl-YAML-LibYAML: best YAML support to date.
+perl-YAML-LibYAML:
+perl-YAML-LibYAML:
diff --git a/perl/perl-config-general/perl-config-general.SlackBuild b/perl/perl-config-general/perl-config-general.SlackBuild
index cfc9117691..e16283aee4 100644
--- a/perl/perl-config-general/perl-config-general.SlackBuild
+++ b/perl/perl-config-general/perl-config-general.SlackBuild
@@ -28,7 +28,7 @@
 
 PRGNAM=perl-config-general
 SRCNAM=Config-General
-VERSION=${VERSION:-2.58}
+VERSION=${VERSION:-2.60}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-config-general/perl-config-general.info b/perl/perl-config-general/perl-config-general.info
index b934901f65..b898043ea3 100644
--- a/perl/perl-config-general/perl-config-general.info
+++ b/perl/perl-config-general/perl-config-general.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-config-general"
-VERSION="2.58"
+VERSION="2.60"
 HOMEPAGE="https://metacpan.org/pod/Config::General"
-DOWNLOAD="http://www.cpan.org/authors/id/T/TL/TLINDEN/Config-General-2.58.tar.gz"
-MD5SUM="79397bfbf32dbe772bdc2167afc5c5a6"
+DOWNLOAD="http://www.cpan.org/authors/id/T/TL/TLINDEN/Config-General-2.60.tar.gz"
+MD5SUM="407042f1558354131e7e322f12f5cf44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-data-dump/perl-data-dump.SlackBuild b/perl/perl-data-dump/perl-data-dump.SlackBuild
index d4b70c6392..546cf5d676 100644
--- a/perl/perl-data-dump/perl-data-dump.SlackBuild
+++ b/perl/perl-data-dump/perl-data-dump.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=perl-data-dump
-VERSION=${VERSION:-1.22}
+VERSION=${VERSION:-1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-data-dump/perl-data-dump.info b/perl/perl-data-dump/perl-data-dump.info
index 72d4b74d8c..beecf13ee0 100644
--- a/perl/perl-data-dump/perl-data-dump.info
+++ b/perl/perl-data-dump/perl-data-dump.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-data-dump"
-VERSION="1.22"
+VERSION="1.23"
 HOMEPAGE="https://metacpan.org/pod/Data::Dump"
-DOWNLOAD="http://www.cpan.org/authors/id/G/GA/GAAS/Data-Dump-1.22.tar.gz"
-MD5SUM="db211fe64a5cab15b1e86e5b0dc379a4"
+DOWNLOAD="http://www.cpan.org/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz"
+MD5SUM="762c111e525c82ff23d62c90821b26e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-encode-locale/perl-encode-locale.SlackBuild b/perl/perl-encode-locale/perl-encode-locale.SlackBuild
index 96bb0420a0..333ee04346 100644
--- a/perl/perl-encode-locale/perl-encode-locale.SlackBuild
+++ b/perl/perl-encode-locale/perl-encode-locale.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-encode-locale
 
-# Copyright 2011-2012 LukenShiro, Italy
+# Copyright 2011-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-encode-locale
-VERSION=${VERSION:-1.03}
+VERSION=${VERSION:-1.05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,10 +53,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 echo "y" | CFLAGS="$SLKCFLAGS" perl Makefile.PL \
   PREFIX=/usr \
diff --git a/perl/perl-encode-locale/perl-encode-locale.info b/perl/perl-encode-locale/perl-encode-locale.info
index d690744d1a..be663a96dd 100644
--- a/perl/perl-encode-locale/perl-encode-locale.info
+++ b/perl/perl-encode-locale/perl-encode-locale.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-encode-locale"
-VERSION="1.03"
+VERSION="1.05"
 HOMEPAGE="https://metacpan.org/pod/Encode::Locale"
-DOWNLOAD="http://www.cpan.org/authors/id/G/GA/GAAS/Encode-Locale-1.03.tar.gz"
-MD5SUM="de8422d068634e7c1068dab4e18b452f"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz"
+MD5SUM="fcfdb8e4ee34bcf62aed429b4a23db27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-extutils-makemaker/perl-extutils-makemaker.SlackBuild b/perl/perl-extutils-makemaker/perl-extutils-makemaker.SlackBuild
index 2fd8f65b8b..5aa0eb1205 100644
--- a/perl/perl-extutils-makemaker/perl-extutils-makemaker.SlackBuild
+++ b/perl/perl-extutils-makemaker/perl-extutils-makemaker.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
-# Slackware build script for perl-extutils-makemaker
-
-# Copyright 2015 Edinaldo P. Silva  <edps.mundognu@gmail.com>
+#
+# Slackware build script for perl-extutils-makemaker.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-extutils-makemaker
-VERSION=${VERSION:-7.04}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.10}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/perl/perl-extutils-makemaker/perl-extutils-makemaker.info b/perl/perl-extutils-makemaker/perl-extutils-makemaker.info
index dcdd7a869c..85ee88a535 100644
--- a/perl/perl-extutils-makemaker/perl-extutils-makemaker.info
+++ b/perl/perl-extutils-makemaker/perl-extutils-makemaker.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-extutils-makemaker"
-VERSION="7.04"
+VERSION="7.10"
 HOMEPAGE="https://metacpan.org/pod/ExtUtils::MakeMaker"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.04.tar.gz"
-MD5SUM="c280fa6a0dfe1d21d6b42792c041ddf7"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.10.tar.gz"
+MD5SUM="2639a21adee5e0a903730c12dcba08ec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-extutils-makemaker/slack-desc b/perl/perl-extutils-makemaker/slack-desc
index 5dfa8406b6..5a14d7edd9 100644
--- a/perl/perl-extutils-makemaker/slack-desc
+++ b/perl/perl-extutils-makemaker/slack-desc
@@ -11,7 +11,7 @@ perl-extutils-makemaker:
 perl-extutils-makemaker: This utility is designed to write a Makefile for an extension module 
 perl-extutils-makemaker: from a Makefile.PL.
 perl-extutils-makemaker:
-perl-extutils-makemaker:
+perl-extutils-makemaker: Home page: https://metacpan.org/pod/ExtUtils::MakeMaker
 perl-extutils-makemaker:
 perl-extutils-makemaker:
 perl-extutils-makemaker:
diff --git a/perl/perl-file-desktopentry/perl-file-desktopentry.SlackBuild b/perl/perl-file-desktopentry/perl-file-desktopentry.SlackBuild
index 9600d245a6..f68e60f51c 100644
--- a/perl/perl-file-desktopentry/perl-file-desktopentry.SlackBuild
+++ b/perl/perl-file-desktopentry/perl-file-desktopentry.SlackBuild
@@ -20,7 +20,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-file-desktopentry
-VERSION=${VERSION:-0.12}
+VERSION=${VERSION:-0.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,7 +87,7 @@ find $PKG -name perllocal.pod \
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README Changes $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/perl/perl-file-desktopentry/perl-file-desktopentry.info b/perl/perl-file-desktopentry/perl-file-desktopentry.info
index ce1639fb3a..4850f874d0 100644
--- a/perl/perl-file-desktopentry/perl-file-desktopentry.info
+++ b/perl/perl-file-desktopentry/perl-file-desktopentry.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-file-desktopentry"
-VERSION="0.12"
+VERSION="0.22"
 HOMEPAGE="https://metacpan.org/pod/File::DesktopEntry"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.12.tar.gz"
-MD5SUM="4b881e40c9234dbaef647a0e01f57be8"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz"
+MD5SUM="57083f2e009967f875ad05c6c5db1467"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-file-basedir perl-extutils-makemaker"
diff --git a/perl/perl-http-message/perl-http-message.SlackBuild b/perl/perl-http-message/perl-http-message.SlackBuild
index 308d69ff8e..953c734e2f 100644
--- a/perl/perl-http-message/perl-http-message.SlackBuild
+++ b/perl/perl-http-message/perl-http-message.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-http-message
 
-# Copyright 2011-2013  LukenShiro, Italy
+# Copyright 2011-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-http-message
-VERSION=${VERSION:-6.06}
+VERSION=${VERSION:-6.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,10 +53,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 echo "y" | perl Makefile.PL \
   PREFIX=/usr \
@@ -67,7 +67,6 @@ make test
 make install DESTDIR=$PKG
 
 find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
 find $PKG -depth -type d -empty -delete
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/perl/perl-http-message/perl-http-message.info b/perl/perl-http-message/perl-http-message.info
index 8466b29070..9128eb195b 100644
--- a/perl/perl-http-message/perl-http-message.info
+++ b/perl/perl-http-message/perl-http-message.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-http-message"
-VERSION="6.06"
+VERSION="6.11"
 HOMEPAGE="https://metacpan.org/pod/HTTP::Message"
-DOWNLOAD="http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Message-6.06.tar.gz"
-MD5SUM="e563ac516e28d33f65bc0f295f625f85"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/HTTP-Message-6.11.tar.gz"
+MD5SUM="4ed7add10daea3ab30abfeab6d03872f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-encode-locale perl-html-parser perl-http-date perl-lwp-mediatypes perl-IO-HTML"
diff --git a/perl/perl-inc-latest/README b/perl/perl-inc-latest/README
index a85eb90d30..486e03f439 100644
--- a/perl/perl-inc-latest/README
+++ b/perl/perl-inc-latest/README
@@ -5,3 +5,5 @@ It was originally bundled (as an experiment) with Module::Build and has been spl
 
 The inc::latest module helps bootstrap configure-time dependencies for CPAN distributions.
 These dependencies get bundled into the inc directory within a distribution and are used by Makefile.PL or Build.PL.
+
+Optional dependencie: perl-ExtUtils-Install
diff --git a/perl/perl-inc-latest/slack-desc b/perl/perl-inc-latest/slack-desc
index f18f250d99..a29c302c8d 100644
--- a/perl/perl-inc-latest/slack-desc
+++ b/perl/perl-inc-latest/slack-desc
@@ -12,7 +12,7 @@ perl-inc-latest: WARNING -- THIS IS AN EXPERIMENTAL MODULE. It was originally bu
 perl-inc-latest: (as an experiment) with Module::Build and has been split out for more
 perl-inc-latest: general use.
 perl-inc-latest:
-perl-inc-latest:
+perl-inc-latest: Home page: https://metacpan.org/pod/inc::latest
 perl-inc-latest:
 perl-inc-latest:
 perl-inc-latest:
diff --git a/perl/perl-net-dns/perl-net-dns.SlackBuild b/perl/perl-net-dns/perl-net-dns.SlackBuild
index 4d09590576..0dd20ca8df 100644
--- a/perl/perl-net-dns/perl-net-dns.SlackBuild
+++ b/perl/perl-net-dns/perl-net-dns.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-net-dns
 
-# Copyright 2008-2014  LukenShiro, Italy
+# Copyright 2008-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-net-dns
-VERSION=${VERSION:-0.78}
+VERSION=${VERSION:-1.02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,7 +41,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SRCNAM=Net-DNS
-DOCFILES="TODO Changes README"
+DOCFILES="Changes README"
 
 # LIBDIRSUFFIX not used
 if [ "$ARCH" = "i486" ]; then
diff --git a/perl/perl-net-dns/perl-net-dns.info b/perl/perl-net-dns/perl-net-dns.info
index bb88a5e3eb..d41eaea11e 100644
--- a/perl/perl-net-dns/perl-net-dns.info
+++ b/perl/perl-net-dns/perl-net-dns.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-net-dns"
-VERSION="0.78"
+VERSION="1.02"
 HOMEPAGE="https://metacpan.org/pod/Net::DNS"
-DOWNLOAD="http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-0.78.tar.gz"
-MD5SUM="38862c7df536b514c5eec9004b57aa70"
+DOWNLOAD="http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-1.02.tar.gz"
+MD5SUM="adbb3fd9bc1677d8fd79605925a35106"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-digest-hmac perl-net-ip"
diff --git a/perl/perl-net-http/perl-net-http.SlackBuild b/perl/perl-net-http/perl-net-http.SlackBuild
index 35def4070b..e4961f94ef 100644
--- a/perl/perl-net-http/perl-net-http.SlackBuild
+++ b/perl/perl-net-http/perl-net-http.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-net-http
 
-# Copyright 2011-2014  LukenShiro, Italy
+# Copyright 2011-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-net-http
-VERSION=${VERSION:-6.07}
+VERSION=${VERSION:-6.09}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +67,6 @@ make test
 make install DESTDIR=$PKG
 
 find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
 find $PKG -depth -type d -empty -delete
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/perl/perl-net-http/perl-net-http.info b/perl/perl-net-http/perl-net-http.info
index 0328a0be1d..da2e8206a3 100644
--- a/perl/perl-net-http/perl-net-http.info
+++ b/perl/perl-net-http/perl-net-http.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-net-http"
-VERSION="6.07"
+VERSION="6.09"
 HOMEPAGE="https://metacpan.org/pod/Net::HTTP"
-DOWNLOAD="http://www.cpan.org/authors/id/M/MS/MSCHILLI/Net-HTTP-6.07.tar.gz"
-MD5SUM="b6da691523456089d7a812ac398bc77e"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz"
+MD5SUM="3d84d17f64c7316d69e7eb7b4e292b9a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-strictures/perl-strictures.SlackBuild b/perl/perl-strictures/perl-strictures.SlackBuild
index c2c00f5d0e..7e9cebd96a 100644
--- a/perl/perl-strictures/perl-strictures.SlackBuild
+++ b/perl/perl-strictures/perl-strictures.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for perl-strictures
 
-# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-strictures
-VERSION=${VERSION:-1.005005}
+VERSION=${VERSION:-2.000001}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-strictures/perl-strictures.info b/perl/perl-strictures/perl-strictures.info
index 2a0b88c02f..da995cd458 100644
--- a/perl/perl-strictures/perl-strictures.info
+++ b/perl/perl-strictures/perl-strictures.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-strictures"
-VERSION="1.005005"
+VERSION="2.000001"
 HOMEPAGE="https://metacpan.org/pod/strictures"
-DOWNLOAD="http://cpan.metacpan.org/authors/id/H/HA/HAARG/strictures-1.005005.tar.gz"
-MD5SUM="6600e27805eed1554984799ac8158410"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/H/HA/HAARG/strictures-2.000001.tar.gz"
+MD5SUM="fb1350b4af50a2f6ba053c1cfd97e920"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-text-aspell/README b/perl/perl-text-aspell/README
new file mode 100644
index 0000000000..aeaf626cd7
--- /dev/null
+++ b/perl/perl-text-aspell/README
@@ -0,0 +1,4 @@
+Text::Aspell as a module provides a Perl interface to the GNU Aspell
+library. This module is to meet the need of looking up many words,
+one at a time, in a single session, such as spell-checking a document
+in memory.
diff --git a/perl/perl-text-aspell/perl-text-aspell.SlackBuild b/perl/perl-text-aspell/perl-text-aspell.SlackBuild
new file mode 100644
index 0000000000..2460b9fb7a
--- /dev/null
+++ b/perl/perl-text-aspell/perl-text-aspell.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for "perl-text-aspell".
+
+# Copyright 2015 Winkel Manah <winkel.manah@outlook.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=perl-text-aspell
+SRCNAM=Text-Aspell
+VERSION=${VERSION:-0.09}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$SRCNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  OPTIMIZE="$SLKCFLAGS" \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Remove perllocal.pod, other special files, and empty directories
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-text-aspell/perl-text-aspell.info b/perl/perl-text-aspell/perl-text-aspell.info
new file mode 100644
index 0000000000..50710e634f
--- /dev/null
+++ b/perl/perl-text-aspell/perl-text-aspell.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-text-aspell"
+VERSION="0.09"
+HOMEPAGE="http://search.cpan.org/~hank/Text-Aspell-0.09/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz"
+MD5SUM="67ec8b9c4769969fa714fc25c9c73832"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Winkel Manah"
+EMAIL="winkel.manah@outlook.com"
diff --git a/perl/perl-text-aspell/slack-desc b/perl/perl-text-aspell/slack-desc
new file mode 100644
index 0000000000..f9bd59b253
--- /dev/null
+++ b/perl/perl-text-aspell/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+perl-text-aspell: perl-text-aspell (Perl interface to the GNU Aspell library)
+perl-text-aspell:
+perl-text-aspell: Text::Aspell as a module provides a Perl interface to the GNU Aspell
+perl-text-aspell: library. This module is to meet the need of looking up many words,
+perl-text-aspell: one at a time, in a single session, such as spell-checking a document
+perl-text-aspell: in memory.
+perl-text-aspell:
+perl-text-aspell:
+perl-text-aspell:
+perl-text-aspell: Homepage: http://search.cpan.org/~hank/Text-Aspell-0.09/
+perl-text-aspell:
diff --git a/perl/perl-text-unaccent/README b/perl/perl-text-unaccent/README
new file mode 100644
index 0000000000..1167d43ea0
--- /dev/null
+++ b/perl/perl-text-unaccent/README
@@ -0,0 +1,6 @@
+perl-text-unaccent (perl module to remove accents from a string)
+
+Text::Unaccent is a module that remove accents from a string. unac_string
+converts the input string from the specified charset to UTF-16 and call
+unac_string_utf16 to return the unaccented equivalent. The conversion
+from and to UTF-16 is done with iconv(1).
diff --git a/perl/perl-text-unaccent/oe_lig_and_size_t.diff b/perl/perl-text-unaccent/oe_lig_and_size_t.diff
new file mode 100644
index 0000000000..2249cd5fe8
--- /dev/null
+++ b/perl/perl-text-unaccent/oe_lig_and_size_t.diff
@@ -0,0 +1,46 @@
+diff -Naur Text-Unaccent-1.08/unac.c Text-Unaccent-1.08.patched/unac.c
+--- Text-Unaccent-1.08/unac.c	2004-10-17 15:00:36.000000000 -0400
++++ Text-Unaccent-1.08.patched/unac.c	2015-10-26 18:41:33.000000000 -0400
+@@ -360,6 +360,12 @@
+  * 	004F LATIN CAPITAL LETTER O
+  * 0151 LATIN SMALL LETTER O WITH DOUBLE ACUTE
+  * 	006F LATIN SMALL LETTER O
++ * 0152 LATIN CAPITAL LIGATURE OE
++ * 	004F LATIN CAPITAL LETTER O
++ * 	0045 LATIN CAPITAL LETTER E
++ * 0153 LATIN SMALL LIGATURE OE
++ * 	006F LATIN SMALL LETTER O
++ * 	0065 LATIN SMALL LETTER E
+  * 0154 LATIN CAPITAL LETTER R WITH ACUTE
+  * 	0052 LATIN CAPITAL LETTER R
+  * 0155 LATIN SMALL LETTER R WITH ACUTE
+@@ -12933,7 +12939,7 @@
+ /* 3 */ { 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33 },
+ /* 4 */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 },
+ /* 5 */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35 },
+-/* 6 */ { 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34 },
++/* 6 */ { 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 },
+ /* 7 */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 },
+ /* 8 */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 },
+ /* 9 */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 },
+@@ -13149,7 +13155,7 @@
+ unsigned short unac_data3[] = { 0x0061, 0x0061, 0x0061, 0x0061, 0x0061, 0x0061, 0x0061, 0x0065, 0x0063, 0x0065, 0x0065, 0x0065, 0x0065, 0x0069, 0x0069, 0x0069, 0x0069, 0xFFFF, 0x006E, 0x006F, 0x006F, 0x006F, 0x006F, 0x006F, 0xFFFF, 0x006F, 0x0075, 0x0075, 0x0075, 0x0075, 0x0079, 0xFFFF, 0x0079 };
+ unsigned short unac_data4[] = { 0x0041, 0x0061, 0x0041, 0x0061, 0x0041, 0x0061, 0x0043, 0x0063, 0x0043, 0x0063, 0x0043, 0x0063, 0x0043, 0x0063, 0x0044, 0x0064, 0x0044, 0x0064, 0x0045, 0x0065, 0x0045, 0x0065, 0x0045, 0x0065, 0x0045, 0x0065, 0x0045, 0x0065, 0x0047, 0x0067, 0x0047, 0x0067 };
+ unsigned short unac_data5[] = { 0x0047, 0x0067, 0x0047, 0x0067, 0x0048, 0x0068, 0x0048, 0x0068, 0x0049, 0x0069, 0x0049, 0x0069, 0x0049, 0x0069, 0x0049, 0x0069, 0x0049, 0xFFFF, 0x0049, 0x004A, 0x0069, 0x006A, 0x004A, 0x006A, 0x004B, 0x006B, 0xFFFF, 0x004C, 0x006C, 0x004C, 0x006C, 0x004C, 0x006C, 0x004C, 0x00B7 };
+-unsigned short unac_data6[] = { 0x006C, 0x00B7, 0x004C, 0x006C, 0x004E, 0x006E, 0x004E, 0x006E, 0x004E, 0x006E, 0x02BC, 0x006E, 0xFFFF, 0xFFFF, 0x004F, 0x006F, 0x004F, 0x006F, 0x004F, 0x006F, 0xFFFF, 0xFFFF, 0x0052, 0x0072, 0x0052, 0x0072, 0x0052, 0x0072, 0x0053, 0x0073, 0x0053, 0x0073, 0x0053, 0x0073 };
++unsigned short unac_data6[] = { 0x006C, 0x00B7, 0x004C, 0x006C, 0x004E, 0x006E, 0x004E, 0x006E, 0x004E, 0x006E, 0x02BC, 0x006E, 0xFFFF, 0xFFFF, 0x004F, 0x006F, 0x004F, 0x006F, 0x004F, 0x006F, 0x004F, 0x0045, 0x006F, 0x0065, 0x0052, 0x0072, 0x0052, 0x0072, 0x0052, 0x0072, 0x0053, 0x0073, 0x0053, 0x0073, 0x0053, 0x0073 };
+ unsigned short unac_data7[] = { 0x0053, 0x0073, 0x0054, 0x0074, 0x0054, 0x0074, 0x0054, 0x0074, 0x0055, 0x0075, 0x0055, 0x0075, 0x0055, 0x0075, 0x0055, 0x0075, 0x0055, 0x0075, 0x0055, 0x0075, 0x0057, 0x0077, 0x0059, 0x0079, 0x0059, 0x005A, 0x007A, 0x005A, 0x007A, 0x005A, 0x007A, 0x0073 };
+ unsigned short unac_data8[] = { 0x0062, 0x0042, 0x0042, 0x0062, 0xFFFF, 0xFFFF, 0xFFFF, 0x0043, 0x0063, 0xFFFF, 0x0044, 0x0044, 0x0064, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0046, 0x0066, 0x0047, 0xFFFF, 0xFFFF, 0xFFFF, 0x0049, 0x004B, 0x006B, 0x006C, 0xFFFF, 0xFFFF, 0x004E, 0x006E, 0x004F };
+ unsigned short unac_data9[] = { 0x004F, 0x006F, 0xFFFF, 0xFFFF, 0x0050, 0x0070, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0074, 0x0054, 0x0074, 0x0054, 0x0055, 0x0075, 0xFFFF, 0x0056, 0x0059, 0x0079, 0x005A, 0x007A, 0xFFFF, 0xFFFF, 0xFFFF, 0x0292, 0xFFFF, 0xFFFF, 0xFFFF, 0x0296, 0xFFFF };
+@@ -13881,9 +13887,9 @@
+     *out_lengthp = 0;
+   } else {
+     char* utf16 = 0;
+-    int utf16_length = 0;
++    size_t utf16_length = 0;
+     char* utf16_unaccented = 0;
+-    int utf16_unaccented_length = 0;
++    size_t utf16_unaccented_length = 0;
+   
+     if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
+       return -1;
diff --git a/perl/perl-text-unaccent/perl-text-unaccent.SlackBuild b/perl/perl-text-unaccent/perl-text-unaccent.SlackBuild
new file mode 100644
index 0000000000..3122578e88
--- /dev/null
+++ b/perl/perl-text-unaccent/perl-text-unaccent.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for perl-text-unaccent
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=perl-text-unaccent
+VERSION=${VERSION:-1.08}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+TARNAME=Text-Unaccent
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $TARNAME-$VERSION
+tar xvf $CWD/$TARNAME-$VERSION.tar.gz
+cd $TARNAME-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# combined patch made by diffing against the unac.c in system/unac.
+patch -p1 < $CWD/oe_lig_and_size_t.diff
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+gzip $PKG/usr/man/man?/*.?
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-text-unaccent/perl-text-unaccent.info b/perl/perl-text-unaccent/perl-text-unaccent.info
new file mode 100644
index 0000000000..f86a6abebc
--- /dev/null
+++ b/perl/perl-text-unaccent/perl-text-unaccent.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-text-unaccent"
+VERSION="1.08"
+HOMEPAGE="https://metacpan.org/pod/Text::Unaccent"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz"
+MD5SUM="9ac9b28cbb66f4829a50d563ace79cb5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/perl/perl-text-unaccent/slack-desc b/perl/perl-text-unaccent/slack-desc
new file mode 100644
index 0000000000..a508e866a9
--- /dev/null
+++ b/perl/perl-text-unaccent/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+perl-text-unaccent: perl-text-unaccent (perl module to remove accents from a string)
+perl-text-unaccent:
+perl-text-unaccent: Text::Unaccent is a module that remove accents from a
+perl-text-unaccent: string. unac_string converts the input string from the specified
+perl-text-unaccent: charset to UTF-16 and call unac_string_utf16 to return the unaccented
+perl-text-unaccent: equivalent. The conversion from and to UTF-16 is done with iconv(1).
+perl-text-unaccent:
+perl-text-unaccent:
+perl-text-unaccent:
+perl-text-unaccent:
+perl-text-unaccent:
diff --git a/perl/perl-tk/patches/perl_bin_path.diff b/perl/perl-tk/patches/perl_bin_path.diff
new file mode 100644
index 0000000000..2d304b4dc4
--- /dev/null
+++ b/perl/perl-tk/patches/perl_bin_path.diff
@@ -0,0 +1,8 @@
+--- TextList/reindex.pl.orig	2015-11-05 21:46:10.470602695 +0100
++++ TextList/reindex.pl	2015-11-05 21:46:21.884547803 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/perl
++#!/usr/bin/perl
+ 
+ use lib qw(/home1/gbartels/textlist);
+ use Tk;
diff --git a/perl/perl-tk/perl-tk.SlackBuild b/perl/perl-tk/perl-tk.SlackBuild
index 3dae19f887..a1dcd12960 100644
--- a/perl/perl-tk/perl-tk.SlackBuild
+++ b/perl/perl-tk/perl-tk.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Pablo Santamaria (pablosantamaria@gmail.com)
 
 PRGNAM=perl-tk
-VERSION=${VERSION:-804.031}
+VERSION=${VERSION:-804.033}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -52,7 +52,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 # Apply a few patches
-patch -p1 < $CWD/patches/$PRGNAM-$VERSION.diff
+patch -p0 < $CWD/patches/perl_bin_path.diff
 
 # XFT=1 (font manager) support, which gives perl-tk programs the ability to
 # use all fonts accessible from XFT and antialiasing.
diff --git a/perl/perl-tk/perl-tk.info b/perl/perl-tk/perl-tk.info
index ba014ed8b1..85c121eeb9 100644
--- a/perl/perl-tk/perl-tk.info
+++ b/perl/perl-tk/perl-tk.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-tk"
-VERSION="804.031"
+VERSION="804.033"
 HOMEPAGE="https://metacpan.org/pod/Tk"
-DOWNLOAD="http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-804.031.tar.gz"
-MD5SUM="57a8afd0563184c17a6470d1ee957f35"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SR/SREZIC/Tk-804.033.tar.gz"
+MD5SUM="4c6d281ca9c6c2349e5cf84394e638fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-tree-dagnode/perl-tree-dagnode.SlackBuild b/perl/perl-tree-dagnode/perl-tree-dagnode.SlackBuild
index c678e36903..8b78891a71 100644
--- a/perl/perl-tree-dagnode/perl-tree-dagnode.SlackBuild
+++ b/perl/perl-tree-dagnode/perl-tree-dagnode.SlackBuild
@@ -1,7 +1,10 @@
 #!/bin/sh
 
 # Slackware build script for perl-tree-dagnode
-
+#
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com> Tooele, UT, USA
+# All rights reserved.
+#
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
 # All rights reserved.
 #
@@ -23,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=perl-tree-dagnode
-VERSION=${VERSION:-1.26}
+VERSION=${VERSION:-1.27}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/perl/perl-tree-dagnode/perl-tree-dagnode.info b/perl/perl-tree-dagnode/perl-tree-dagnode.info
index 35a07ce30b..9bc4381a66 100644
--- a/perl/perl-tree-dagnode/perl-tree-dagnode.info
+++ b/perl/perl-tree-dagnode/perl-tree-dagnode.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-tree-dagnode"
-VERSION="1.26"
+VERSION="1.27"
 HOMEPAGE="https://metacpan.org/pod/Tree::DAG_Node"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.26.tgz"
-MD5SUM="c6c0056982a5642b343288264d3a7d75"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.27.tgz"
+MD5SUM="6697c3e746a146e74ae2ba1727608200"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Slurp-Tiny"
diff --git a/perl/perl-x11-protocol/perl-x11-protocol.SlackBuild b/perl/perl-x11-protocol/perl-x11-protocol.SlackBuild
index f4e5935c51..d00a1b9100 100644
--- a/perl/perl-x11-protocol/perl-x11-protocol.SlackBuild
+++ b/perl/perl-x11-protocol/perl-x11-protocol.SlackBuild
@@ -5,6 +5,8 @@
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
 # All rights reserved.
 #
+# Adopted 2015  Glenn Becker <glenn.becker@gmail.com>
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
diff --git a/perl/perl-x11-protocol/perl-x11-protocol.info b/perl/perl-x11-protocol/perl-x11-protocol.info
index e25e8ad8c6..ecd30a9988 100644
--- a/perl/perl-x11-protocol/perl-x11-protocol.info
+++ b/perl/perl-x11-protocol/perl-x11-protocol.info
@@ -6,5 +6,5 @@ MD5SUM="2260bad68d373b201b17c60d761e0f0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Binh Nguyen"
-EMAIL="binhvng@gmail.com"
+MAINTAINER="Glenn Becker"
+EMAIL="glenn.becker@gmail.com"
diff --git a/python/APScheduler/APScheduler.SlackBuild b/python/APScheduler/APScheduler.SlackBuild
index bd02fff28d..febf298153 100644
--- a/python/APScheduler/APScheduler.SlackBuild
+++ b/python/APScheduler/APScheduler.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for APScheduler
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=APScheduler
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/APScheduler/APScheduler.info b/python/APScheduler/APScheduler.info
index dea8b954f8..9996a5b430 100644
--- a/python/APScheduler/APScheduler.info
+++ b/python/APScheduler/APScheduler.info
@@ -1,8 +1,8 @@
 PRGNAM="APScheduler"
-VERSION="3.0.1"
+VERSION="3.0.3"
 HOMEPAGE="http://pypi.python.org/pypi/APScheduler/"
-DOWNLOAD="https://pypi.python.org/packages/source/A/APScheduler/APScheduler-3.0.1.tar.gz"
-MD5SUM="7c3687b3dcd645fe9df48e34eb7a7592"
+DOWNLOAD="https://pypi.python.org/packages/source/A/APScheduler/APScheduler-3.0.3.tar.gz"
+MD5SUM="0f2fcffdf7504a29664f114ea09c33ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tzlocal six futures"
diff --git a/python/Flask-SQLAlchemy/Flask-SQLAlchemy.SlackBuild b/python/Flask-SQLAlchemy/Flask-SQLAlchemy.SlackBuild
new file mode 100644
index 0000000000..a5aef3670a
--- /dev/null
+++ b/python/Flask-SQLAlchemy/Flask-SQLAlchemy.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for Flask-SQLAlchemy
+
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Flask-SQLAlchemy
+VERSION=${VERSION:-2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README CHANGES LICENSE docs/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/Flask-SQLAlchemy/Flask-SQLAlchemy.info b/python/Flask-SQLAlchemy/Flask-SQLAlchemy.info
new file mode 100644
index 0000000000..170f98cfce
--- /dev/null
+++ b/python/Flask-SQLAlchemy/Flask-SQLAlchemy.info
@@ -0,0 +1,10 @@
+PRGNAM="Flask-SQLAlchemy"
+VERSION="2.1"
+HOMEPAGE="https://github.com/mitsuhiko/flask-sqlalchemy"
+DOWNLOAD="https://pypi.python.org/packages/source/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.1.tar.gz"
+MD5SUM="dc15fe08b07b434d3d2c4063b4674b72"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="Flask SQLAlchemy"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/Flask-SQLAlchemy/README b/python/Flask-SQLAlchemy/README
new file mode 100644
index 0000000000..fc294fe764
--- /dev/null
+++ b/python/Flask-SQLAlchemy/README
@@ -0,0 +1,2 @@
+Flask-SQLAlchemy is a Flask microframework extension which adds
+support for the SQLAlchemy SQL toolkit/ORM.
diff --git a/python/Flask-SQLAlchemy/slack-desc b/python/Flask-SQLAlchemy/slack-desc
new file mode 100644
index 0000000000..295a408208
--- /dev/null
+++ b/python/Flask-SQLAlchemy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+Flask-SQLAlchemy: Flask-SQLAlchemy (SQLAlchemy support to your Flask)
+Flask-SQLAlchemy:
+Flask-SQLAlchemy: Flask-SQLAlchemy is a Flask microframework extension which adds
+Flask-SQLAlchemy: support for the SQLAlchemy SQL toolkit/ORM.
+Flask-SQLAlchemy:
+Flask-SQLAlchemy: Homepage: https://github.com/mitsuhiko/flask-sqlalchemy
+Flask-SQLAlchemy:
+Flask-SQLAlchemy:
+Flask-SQLAlchemy:
+Flask-SQLAlchemy:
+Flask-SQLAlchemy:
diff --git a/python/PyGithub/PyGithub.SlackBuild b/python/PyGithub/PyGithub.SlackBuild
index edbcd9fa90..328017eda5 100644
--- a/python/PyGithub/PyGithub.SlackBuild
+++ b/python/PyGithub/PyGithub.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for PyGithub
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=PyGithub
-VERSION=${VERSION:-1.25.2}
+VERSION=${VERSION:-1.26.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/PyGithub/PyGithub.info b/python/PyGithub/PyGithub.info
index 9194cad3c6..3d54d08d5b 100644
--- a/python/PyGithub/PyGithub.info
+++ b/python/PyGithub/PyGithub.info
@@ -1,8 +1,8 @@
 PRGNAM="PyGithub"
-VERSION="1.25.2"
+VERSION="1.26.0"
 HOMEPAGE="http://jacquev6.github.io/PyGithub/v1/index.html"
-DOWNLOAD="https://pypi.python.org/packages/source/P/PyGithub/PyGithub-1.25.2.tar.gz"
-MD5SUM="18bb9d3fc1cebff8ab69eb57e85179a5"
+DOWNLOAD="https://pypi.python.org/packages/source/P/PyGithub/PyGithub-1.26.0.tar.gz"
+MD5SUM="5a9961b4331d63cbbcae3850abcf888a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/Pygments/Pygments.SlackBuild b/python/Pygments/Pygments.SlackBuild
index 2f558875dd..45a4d1b4d7 100644
--- a/python/Pygments/Pygments.SlackBuild
+++ b/python/Pygments/Pygments.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Pygments
 
 # Copyright 2009 Grissiom <chaos.proton@gmail.com>
-# Copyright 2009-2013 LukenShiro, Italy
+# Copyright 2009-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Pygments
-VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.0.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,7 +41,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="LICENSE TODO AUTHORS CHANGES docs/build/*.html"
+DOCFILES="LICENSE TODO AUTHORS CHANGES README.rst"
+# html documentation is not built by default
+HTML=${HTML:-0}
 
 set -e
 
@@ -53,15 +55,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --prefix=/usr --root=$PKG
 
 mkdir -p $PKG/usr/man/man1
-cp -a docs/pygmentize.1 $PKG/usr/man/man1
+cp -a doc/pygmentize.1 $PKG/usr/man/man1
 # Adapting to Slackware's directory layout
 sed -i "s|share/doc/python-pygments|doc/${PRGNAM}-${VERSION}|" \
   $PKG/usr/man/man1/pygmentize.1
@@ -69,6 +71,11 @@ sed -i "s|share/doc/python-pygments|doc/${PRGNAM}-${VERSION}|" \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# building html documentation
+case "$HTML" in
+    0) ;;
+    *) cd doc ; make html && cp -R _build/html $PKG/usr/doc/$PRGNAM-$VERSION ; cd - ;;
+esac
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -77,4 +84,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/python/Pygments/Pygments.info b/python/Pygments/Pygments.info
index b6696debb3..c7c672e214 100644
--- a/python/Pygments/Pygments.info
+++ b/python/Pygments/Pygments.info
@@ -1,10 +1,10 @@
 PRGNAM="Pygments"
-VERSION="1.6"
+VERSION="2.0.2"
 HOMEPAGE="http://pygments.org/"
-DOWNLOAD="http://pypi.python.org/packages/source/P/Pygments/Pygments-1.6.tar.gz"
-MD5SUM="a18feedf6ffd0b0cc8c8b0fbdb2027b1"
+DOWNLOAD="http://pypi.python.org/packages/source/P/Pygments/Pygments-2.0.2.tar.gz"
+MD5SUM="238587a1370d62405edabd0794b3ec4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="pysetuptools"
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
diff --git a/python/Pygments/README b/python/Pygments/README
index 975ce911d5..4e7391ba6f 100644
--- a/python/Pygments/README
+++ b/python/Pygments/README
@@ -9,3 +9,6 @@ Highlights are:
   * A number of output formats, presently HTML, LaTeX, RTF, SVG and ANSI
     sequences.
   * It is usable as a command-line tool and as a library.
+
+In order to build pygments' html documentation files you must install Sphinx
+and you need to use "HTML=1 ./Pygments.SlackBuild".
diff --git a/python/apsw/apsw.SlackBuild b/python/apsw/apsw.SlackBuild
index a09966c20b..5856a421ea 100644
--- a/python/apsw/apsw.SlackBuild
+++ b/python/apsw/apsw.SlackBuild
@@ -67,7 +67,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/apsw/apsw.info b/python/apsw/apsw.info
index ef7784fd8a..9f3df91560 100644
--- a/python/apsw/apsw.info
+++ b/python/apsw/apsw.info
@@ -1,8 +1,8 @@
 PRGNAM="apsw"
 VERSION="3.7.17_r1"
 HOMEPAGE="http://code.google.com/p/apsw/"
-DOWNLOAD="http://apsw.googlecode.com/files/apsw-3.7.17-r1.zip"
-MD5SUM="5393765e7ef55def11dae08149133136"
+DOWNLOAD="https://github.com/rogerbinns/apsw/archive/3.7.17-r1.zip"
+MD5SUM="3516203c369aacbe12a3bed35f60fe4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/argcomplete/argcomplete.SlackBuild b/python/argcomplete/argcomplete.SlackBuild
index 90e0cf82f0..80fa4fc9c6 100644
--- a/python/argcomplete/argcomplete.SlackBuild
+++ b/python/argcomplete/argcomplete.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=argcomplete
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/argcomplete/argcomplete.info b/python/argcomplete/argcomplete.info
index 9e8cc0e46b..6e7f3d2bc3 100644
--- a/python/argcomplete/argcomplete.info
+++ b/python/argcomplete/argcomplete.info
@@ -1,8 +1,8 @@
 PRGNAM="argcomplete"
-VERSION="0.9.0"
+VERSION="1.0.0"
 HOMEPAGE="https://github.com/kislyuk/argcomplete"
-DOWNLOAD="https://pypi.python.org/packages/source/a/argcomplete/argcomplete-0.9.0.tar.gz"
-MD5SUM="7f182c544089716e9ebdb8108df21f6a"
+DOWNLOAD="https://pypi.python.org/packages/source/a/argcomplete/argcomplete-1.0.0.tar.gz"
+MD5SUM="7cdf147b498e7e4d6ab71036292939a3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/astroid/astroid.SlackBuild b/python/astroid/astroid.SlackBuild
index aec2080172..8c71b2d5d7 100644
--- a/python/astroid/astroid.SlackBuild
+++ b/python/astroid/astroid.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=astroid
-VERSION=${VERSION:-1.3.7}
+VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/astroid/astroid.info b/python/astroid/astroid.info
index 44c9c81afa..db3d66e6e8 100644
--- a/python/astroid/astroid.info
+++ b/python/astroid/astroid.info
@@ -1,10 +1,10 @@
 PRGNAM="astroid"
-VERSION="1.3.7"
+VERSION="1.4.3"
 HOMEPAGE="https://bitbucket.org/logilab/astroid"
-DOWNLOAD="https://pypi.python.org/packages/source/a/astroid/astroid-1.3.7.tar.gz"
-MD5SUM="fcea39824885100a8fe643846352c715"
+DOWNLOAD="https://pypi.python.org/packages/source/a/astroid/astroid-1.4.3.tar.gz"
+MD5SUM="71a7f3c1d0effab87e83299ef7f244c2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pysetuptools logilab-common"
+REQUIRES="six python-lazy-object-proxy python-wrapt"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/autopep8/autopep8.SlackBuild b/python/autopep8/autopep8.SlackBuild
index c7724cc1fb..3b10faa9b8 100644
--- a/python/autopep8/autopep8.SlackBuild
+++ b/python/autopep8/autopep8.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=autopep8
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/autopep8/autopep8.info b/python/autopep8/autopep8.info
index f36342b4a8..2141f1a695 100644
--- a/python/autopep8/autopep8.info
+++ b/python/autopep8/autopep8.info
@@ -1,8 +1,8 @@
 PRGNAM="autopep8"
-VERSION="1.2"
+VERSION="1.2.1"
 HOMEPAGE="https://github.com/hhatto/autopep8"
-DOWNLOAD="https://pypi.python.org/packages/source/a/autopep8/autopep8-1.2.tar.gz"
-MD5SUM="6cfbc826e46e3a4c7fb18b6b784ebfb9"
+DOWNLOAD="https://pypi.python.org/packages/source/a/autopep8/autopep8-1.2.1.tar.gz"
+MD5SUM="4167555f521ddd69b66f13819604f3db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pep8"
diff --git a/python/boto/README b/python/boto/README
index c097a5f87a..1153c28443 100644
--- a/python/boto/README
+++ b/python/boto/README
@@ -5,5 +5,4 @@ Services. In addition, boto provides support for other public services such as
 Google Storage in addition to private cloud systems like Eucalyptus, OpenStack
 and Open Nebula.
 
-Optional dependencies: filechunkio, lxml and keyring (this last one
-isn't yet available on SlackBuilds.org).
+Optional dependencies: filechunkio, lxml and python-keyring
diff --git a/python/boto/boto.SlackBuild b/python/boto/boto.SlackBuild
index d0a234ddcf..b81cfbd739 100644
--- a/python/boto/boto.SlackBuild
+++ b/python/boto/boto.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for boto
 
-# Copyright 2011-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=boto
-VERSION=${VERSION:-2.34.0}
+VERSION=${VERSION:-2.38.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,10 +50,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
diff --git a/python/boto/boto.info b/python/boto/boto.info
index cf22de81ae..ea37aa81cd 100644
--- a/python/boto/boto.info
+++ b/python/boto/boto.info
@@ -1,8 +1,8 @@
 PRGNAM="boto"
-VERSION="2.34.0"
+VERSION="2.38.0"
 HOMEPAGE="https://github.com/boto/boto"
-DOWNLOAD="http://pypi.python.org/packages/source/b/boto/boto-2.34.0.tar.gz"
-MD5SUM="5556223d2d0cc4d06dd4829e671dcecd"
+DOWNLOAD="http://pypi.python.org/packages/source/b/boto/boto-2.38.0.tar.gz"
+MD5SUM="28112f29e9c7b10e12b6917a325e70ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-requests paramiko rsa PyYAML simplejson"
diff --git a/python/boto3/README b/python/boto3/README
index e3ccaeefad..c32f866174 100644
--- a/python/boto3/README
+++ b/python/boto3/README
@@ -1,13 +1,9 @@
-Boto is the Amazon Web Services (AWS) Software Development Kit (SDK) for
+Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
 Python, which allows Python developers to write software that makes use
 of services like Amazon S3 and Amazon EC2. You can find the latest, most
 up to date, documentation at `Read the Docs`_, including a list of
 services that are supported.
 
-**WARNING**: Boto 3 is in *developer preview* and **should not** be used in
-production yet! Please try it out and give feedback by opening issues or
-pull requests on this repository.
-
 Note: boto3 can be installed alongside boto.
 
 Optional dependencies: pysetuptools
diff --git a/python/boto3/boto3.SlackBuild b/python/boto3/boto3.SlackBuild
index 356717ea76..71ded0f176 100644
--- a/python/boto3/boto3.SlackBuild
+++ b/python/boto3/boto3.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=boto3
-VERSION=${VERSION:-0.0.6}
+VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/boto3/boto3.info b/python/boto3/boto3.info
index b7ebe4e470..d33ac204c3 100644
--- a/python/boto3/boto3.info
+++ b/python/boto3/boto3.info
@@ -1,10 +1,10 @@
 PRGNAM="boto3"
-VERSION="0.0.6"
+VERSION="1.2.3"
 HOMEPAGE="http://aws.amazon.com/sdk-for-python/"
-DOWNLOAD="https://pypi.python.org/packages/source/b/boto3/boto3-0.0.6.tar.gz"
-MD5SUM="b3033c41e896e929fd57a5e05f856cfb"
+DOWNLOAD="https://pypi.python.org/packages/source/b/boto3/boto3-1.2.3.tar.gz"
+MD5SUM="3f45656baef1f1e9ef9aecefb33d898b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="botocore bcdoc"
+REQUIRES="botocore futures"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/python/cairocffi/cairocffi.SlackBuild b/python/cairocffi/cairocffi.SlackBuild
index 9900245b0e..681a0831c9 100644
--- a/python/cairocffi/cairocffi.SlackBuild
+++ b/python/cairocffi/cairocffi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cairocffi
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cairocffi
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/cairocffi/cairocffi.info b/python/cairocffi/cairocffi.info
index 75c30e8a33..3a27bafadd 100644
--- a/python/cairocffi/cairocffi.info
+++ b/python/cairocffi/cairocffi.info
@@ -1,8 +1,8 @@
 PRGNAM="cairocffi"
-VERSION="0.7.1"
+VERSION="0.7.2"
 HOMEPAGE="https://github.com/SimonSapin/cairocffi"
-DOWNLOAD="https://pypi.python.org/packages/source/c/cairocffi/cairocffi-0.7.1.tar.gz"
-MD5SUM="e26d06a8d8b16c7210414ce15d453636"
+DOWNLOAD="https://pypi.python.org/packages/source/c/cairocffi/cairocffi-0.7.2.tar.gz"
+MD5SUM="b7b6a5908f4180deee84f07bcc14253d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cffi"
diff --git a/python/click-plugins/README b/python/click-plugins/README
new file mode 100644
index 0000000000..d1f573c0da
--- /dev/null
+++ b/python/click-plugins/README
@@ -0,0 +1 @@
+An extension module for click to enable registering CLI commands via setuptools entry-points.
diff --git a/python/click-plugins/click-plugins.SlackBuild b/python/click-plugins/click-plugins.SlackBuild
new file mode 100644
index 0000000000..7a153561fd
--- /dev/null
+++ b/python/click-plugins/click-plugins.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for click-plugins
+
+# Copyright 2015 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=click-plugins
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS.txt CHANGES.txt LICENSE.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/click-plugins/click-plugins.info b/python/click-plugins/click-plugins.info
new file mode 100644
index 0000000000..74ef5f8afb
--- /dev/null
+++ b/python/click-plugins/click-plugins.info
@@ -0,0 +1,10 @@
+PRGNAM="click-plugins"
+VERSION="1.0"
+HOMEPAGE="https://pypi.python.org/pypi/click-plugins"
+DOWNLOAD="https://pypi.python.org/packages/source/c/click-plugins/click-plugins-1.0.tar.gz"
+MD5SUM="8f509404545c82185b609452f9535bef"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="click"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/click-plugins/slack-desc b/python/click-plugins/slack-desc
new file mode 100644
index 0000000000..1a62a2556a
--- /dev/null
+++ b/python/click-plugins/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+click-plugins: click-plugins (extension to click)
+click-plugins:
+click-plugins: An extension module for click to enable registering CLI commands via
+click-plugins: setuptools entry-points.
+click-plugins: 
+click-plugins: 
+click-plugins: 
+click-plugins:
+click-plugins:
+click-plugins:
+click-plugins:
diff --git a/python/click/click.SlackBuild b/python/click/click.SlackBuild
index bdbb22eb63..326f379d98 100644
--- a/python/click/click.SlackBuild
+++ b/python/click/click.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=click
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/click/click.info b/python/click/click.info
index 3c6eaee42d..bc855345da 100644
--- a/python/click/click.info
+++ b/python/click/click.info
@@ -1,8 +1,8 @@
 PRGNAM="click"
-VERSION="4.1"
+VERSION="6.2"
 HOMEPAGE="https://github.com/mitsuhiko/click"
-DOWNLOAD="https://github.com/mitsuhiko/click/archive/4.1.tar.gz"
-MD5SUM="3ec9b2fd74b31d22078991d432195118"
+DOWNLOAD="https://github.com/mitsuhiko/click/archive/6.2.tar.gz"
+MD5SUM="75f354ed52654b1b79fdea79b1cb52cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/colorama/colorama.SlackBuild b/python/colorama/colorama.SlackBuild
index 86d6b369a4..946fc9fc6c 100644
--- a/python/colorama/colorama.SlackBuild
+++ b/python/colorama/colorama.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for colorama
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=colorama
-VERSION=${VERSION:-0.3.3}
+VERSION=${VERSION:-0.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,8 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -82,7 +81,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2>  /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst CHANGELOG.rst LICENSE.txt demos/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst CHANGELOG.rst LICENSE.txt demos/{*.py,*.sh} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/colorama/colorama.info b/python/colorama/colorama.info
index c95f3308ed..1e32100a62 100644
--- a/python/colorama/colorama.info
+++ b/python/colorama/colorama.info
@@ -1,8 +1,8 @@
 PRGNAM="colorama"
-VERSION="0.3.3"
+VERSION="0.3.6"
 HOMEPAGE="https://github.com/tartley/colorama"
-DOWNLOAD="https://github.com/tartley/colorama/archive/v0.3.3.tar.gz"
-MD5SUM="395439c56c4a74878f3ecf4b331575e3"
+DOWNLOAD="https://pypi.python.org/packages/source/c/colorama/colorama-0.3.6.tar.gz"
+MD5SUM="88dc534278e3e3a7b7988cb3fae76c4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/cryptography/cryptography.SlackBuild b/python/cryptography/cryptography.SlackBuild
index 58306d6451..e8f2249ef9 100644
--- a/python/cryptography/cryptography.SlackBuild
+++ b/python/cryptography/cryptography.SlackBuild
@@ -25,7 +25,7 @@
 # Markus Reichelt <slackbuilds@mareichelt.de>, 0xCCEEF115
 
 PRGNAM=cryptography
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/cryptography/cryptography.info b/python/cryptography/cryptography.info
index b4130baec7..803603d025 100644
--- a/python/cryptography/cryptography.info
+++ b/python/cryptography/cryptography.info
@@ -1,10 +1,10 @@
 PRGNAM="cryptography"
-VERSION="0.8.2"
+VERSION="1.1.1"
 HOMEPAGE="https://cryptography.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/c/cryptography/cryptography-0.8.2.tar.gz"
-MD5SUM="7d33499e851300c194cbb0396de72462"
+DOWNLOAD="https://pypi.python.org/packages/source/c/cryptography/cryptography-1.1.1.tar.gz"
+MD5SUM="6ec05b916c52d8668cd3a3f6f1cea084"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyasn1 cffi six enum34"
+REQUIRES="pyasn1 cffi six enum34 ipaddress idna"
 MAINTAINER="Markus Reichelt"
 EMAIL="slackbuilds@mareichelt.de"
diff --git a/python/cssutils/README b/python/cssutils/README
index 61cc4b1697..f64a23ceea 100644
--- a/python/cssutils/README
+++ b/python/cssutils/README
@@ -1,3 +1,3 @@
 A Python package to parse and build CSS Cascading Style Sheets.
 
-cssutils can optionally use python2-chardet and gdata.
+Optional dependencies: python2-chardet and gdata.
diff --git a/python/cssutils/cssutils.SlackBuild b/python/cssutils/cssutils.SlackBuild
index 6f87b9b307..6b5b98cb72 100644
--- a/python/cssutils/cssutils.SlackBuild
+++ b/python/cssutils/cssutils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cssutils
 
-# Copyright 2009-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cssutils
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,18 +46,20 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Change files from DOS to unix.
 for FILE in $(find . -type f -exec grep -Pl '\r$' {} \;); do
-  sed -i 's/\r//g' $FILE
+  sed -e 's/\r//g' $FILE > ${FILE}.new
+  touch -r $FILE ${FILE}.new
+  mv ${FILE}.new $FILE
 done
 
 # Don't use ez_setup.  Use system setuptools or fail.
@@ -65,12 +67,12 @@ sed -i '/ez_setup/d' setup.py
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import setuptools' 2>/dev/null); then
+if [ "${PYTHON3:-no}" == "yes" ]; then
   rm -rf build
   python3 setup.py install --root=$PKG
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/python/cssutils/cssutils.info b/python/cssutils/cssutils.info
index ce04b93138..c3479b02bc 100644
--- a/python/cssutils/cssutils.info
+++ b/python/cssutils/cssutils.info
@@ -1,8 +1,8 @@
 PRGNAM="cssutils"
-VERSION="1.0"
+VERSION="1.0.1"
 HOMEPAGE="https://bitbucket.org/cthedot/cssutils"
-DOWNLOAD="http://pypi.python.org/packages/source/c/cssutils/cssutils-1.0.zip"
-MD5SUM="0c0b9df329ec1461c732d0f3cba05e93"
+DOWNLOAD="http://pypi.python.org/packages/source/c/cssutils/cssutils-1.0.1.tar.gz"
+MD5SUM="7fcdf2c3e9f053136af1990146eb361d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/darts.util.lru/README b/python/darts.util.lru/README
new file mode 100644
index 0000000000..3ada09ce48
--- /dev/null
+++ b/python/darts.util.lru/README
@@ -0,0 +1,2 @@
+A simple dictionary with LRU behaviour. Least Recently Used (LRU) is a
+cache alogarithm that discards the least recently used items first.
diff --git a/python/darts.util.lru/darts.util.lru.SlackBuild b/python/darts.util.lru/darts.util.lru.SlackBuild
new file mode 100644
index 0000000000..42c722045c
--- /dev/null
+++ b/python/darts.util.lru/darts.util.lru.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for darts.util.lru
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=darts.util.lru
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/darts.util.lru/darts.util.lru.info b/python/darts.util.lru/darts.util.lru.info
new file mode 100644
index 0000000000..efe399470b
--- /dev/null
+++ b/python/darts.util.lru/darts.util.lru.info
@@ -0,0 +1,10 @@
+PRGNAM="darts.util.lru"
+VERSION="0.5"
+HOMEPAGE="https://github.com/deterministic-arts/DartsPyLRU"
+DOWNLOAD="https://pypi.python.org/packages/source/d/darts.util.lru/darts.util.lru-0.5.tar.gz"
+MD5SUM="5c776e755a4d8dea134e7fa2050882b3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/darts.util.lru/slack-desc b/python/darts.util.lru/slack-desc
new file mode 100644
index 0000000000..a44d3820ce
--- /dev/null
+++ b/python/darts.util.lru/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+darts.util.lru: darts.util.lru (Dictionary with LRU behaviour)
+darts.util.lru:
+darts.util.lru: A simple dictionary with LRU behaviour. Least Recently Used (LRU) is
+darts.util.lru: a cache alogarithm that discards the least recently used items first.
+darts.util.lru:
+darts.util.lru: Home Page: https://github.com/deterministic-arts/DartsPyLRU
+darts.util.lru:
+darts.util.lru:
+darts.util.lru:
+darts.util.lru:
+darts.util.lru:
diff --git a/python/dhcpy6d/README b/python/dhcpy6d/README
new file mode 100644
index 0000000000..7db541df80
--- /dev/null
+++ b/python/dhcpy6d/README
@@ -0,0 +1,8 @@
+Dhcpy6d delivers IPv6 addresses for DHCPv6 clients, which can be
+identified by DUID, hostname or MAC address as in the good old IPv4
+days. It allows easy dualstack transistion, addresses may be generated
+randomly, by range, by arbitrary ID or MAC address. Clients can get
+more than one address, leases and client configuration can be stored
+in databases and DNS can be updated dynamically.
+
+MySQL-python and dnspython are optional dependencies.
diff --git a/python/dhcpy6d/dhcpy6d.SlackBuild b/python/dhcpy6d/dhcpy6d.SlackBuild
new file mode 100644
index 0000000000..889ad05d7b
--- /dev/null
+++ b/python/dhcpy6d/dhcpy6d.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for dhcpy6d
+
+# Copyright 2015 Thibaut Notteboom, Paris, FRANCE
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=dhcpy6d
+VERSION=${VERSION:-0.4.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+if [ "$(grep ^dhcpy6d /etc/passwd)" = "" -o "$(grep ^dhcpy6d /etc/group)" = "" ] ; then
+  printf "\nYou must have a dhcpy6d user and group.\n\nExample:\n"
+  printf "\t# groupadd -g 313 dhcpy6d\n"
+  printf "\t# /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/dhcpy6d -M -u 313 -g dhcpy6d dhcpy6d\n\n"
+  exit 1
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/bin $PKG/usr/sbin
+
+mv $PKG/etc/dhcpy6d.conf $PKG/etc/dhcpy6d.conf.new
+
+mkdir -p $PKG/etc/rc.d
+cat redhat/init.d/dhcpy6d > $PKG/etc/rc.d/rc.dhcpy6d.new
+
+mkdir -p $PKG/etc/logrotate.d
+cat etc/logrotate.d/dhcpy6d > $PKG/etc/logrotate.d/dhcpy6d.new
+
+chown dhcpy6d:dhcpy6d $PKG/var/log/dhcpy6d.log
+
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mv $PKG/usr/share/doc $PKG/usr/doc
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/dhcpy6d/dhcpy6d.info b/python/dhcpy6d/dhcpy6d.info
new file mode 100644
index 0000000000..8e4f753eae
--- /dev/null
+++ b/python/dhcpy6d/dhcpy6d.info
@@ -0,0 +1,10 @@
+PRGNAM="dhcpy6d"
+VERSION="0.4.2"
+HOMEPAGE="https://dhcpy6d.ifw-dresden.de/"
+DOWNLOAD="https://dhcpy6d.ifw-dresden.de/files-dhcpy6d/stable/dhcpy6d-0.4.2.tar.gz"
+MD5SUM="dcc3e79436f3c59919167afbf6566ca1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/python/dhcpy6d/doinst.sh b/python/dhcpy6d/doinst.sh
new file mode 100644
index 0000000000..b082aee50d
--- /dev/null
+++ b/python/dhcpy6d/doinst.sh
@@ -0,0 +1,27 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.dhcpy6d.new
+config etc/dhcpy6d.conf.new
+config etc/logrotate.d/dhcpy6d.new
diff --git a/python/dhcpy6d/slack-desc b/python/dhcpy6d/slack-desc
new file mode 100644
index 0000000000..213c98a6af
--- /dev/null
+++ b/python/dhcpy6d/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+dhcpy6d: dhcpy6d (DHCPv6 server daemon)
+dhcpy6d:
+dhcpy6d: Dhcpy6d delivers IPv6 addresses for DHCPv6 clients, which can be
+dhcpy6d: identified by DUID, hostname or MAC address as in the good old IPv4
+dhcpy6d: days. It allows easy dualstack transistion, addresses may be generated
+dhcpy6d: randomly, by range, by arbitrary ID or MAC address. Clients can get
+dhcpy6d: more than one address, leases and client configuration can be stored
+dhcpy6d: in databases and DNS can be updated dynamically.
+dhcpy6d:
+dhcpy6d:
+dhcpy6d:
diff --git a/python/dulwich/dulwich.SlackBuild b/python/dulwich/dulwich.SlackBuild
index a0a6a9db61..4aa315b7ab 100644
--- a/python/dulwich/dulwich.SlackBuild
+++ b/python/dulwich/dulwich.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dulwich
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/dulwich/dulwich.info b/python/dulwich/dulwich.info
index 1bb0742ded..59f565f34b 100644
--- a/python/dulwich/dulwich.info
+++ b/python/dulwich/dulwich.info
@@ -1,8 +1,8 @@
 PRGNAM="dulwich"
-VERSION="0.10.0"
+VERSION="0.10.1"
 HOMEPAGE="https://www.samba.org/~jelmer/dulwich/"
-DOWNLOAD="https://pypi.python.org/packages/source/d/dulwich/dulwich-0.10.0.tar.gz"
-MD5SUM="caa3222039ca1359c011c2d5e4f2d85b"
+DOWNLOAD="https://www.samba.org/~jelmer/dulwich/dulwich-0.10.1.tar.gz"
+MD5SUM="fa72df313916fb86186e507414899cf9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/easygui/easygui.SlackBuild b/python/easygui/easygui.SlackBuild
index 665f600ed0..3e96772d63 100644
--- a/python/easygui/easygui.SlackBuild
+++ b/python/easygui/easygui.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for easygui
 
-# Copyright 2007-2011  LukenShiro, Italy
+# Copyright 2007-2015  LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=easygui
-VERSION=${VERSION:-0.96}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.97.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,8 +40,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRC_VERSION=version_${VERSION}_docs
-
 if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -55,30 +53,27 @@ fi
 
 # directory for python packages
 PYTHONDIR=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')")
-DOCFILES="cookbook faq epydoc pydoc tutorial"
 
-set -e  
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
+unzip  $CWD/${PRGNAM}-${VERSION}.zip
 cd $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${SRC_VERSION}.tar.gz
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # install .py source file and sample file
 python ./setup.py build install --root=$PKG
 
 # Copy documentation files
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-for docdir in $DOCFILES ; do mv $docdir $PKG/usr/doc/$PRGNAM-$VERSION/ ; done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/easygui/easygui.info b/python/easygui/easygui.info
index 9b5c5fd618..93703c5428 100644
--- a/python/easygui/easygui.info
+++ b/python/easygui/easygui.info
@@ -1,8 +1,8 @@
 PRGNAM="easygui"
-VERSION="0.96"
+VERSION="0.97.4"
 HOMEPAGE="http://easygui.sourceforge.net/"
-DOWNLOAD="http://easygui.sourceforge.net/download/version_0.96/easygui_version_0.96_docs.tar.gz"
-MD5SUM="2b97ebdee114e8723e84ef542506ddf2"
+DOWNLOAD="http://downloads.sourceforge.net/project/easygui/0.97.4/easygui-0.97.4.zip"
+MD5SUM="94627fed6574c3a6c704789854db1804"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/filechunkio/README b/python/filechunkio/README
index ff5f847a24..0e5c84bb1c 100644
--- a/python/filechunkio/README
+++ b/python/filechunkio/README
@@ -1,3 +1,9 @@
 FileChunkIO is a way to upload huge files to Amazon S3 in multiple parts without
 having to split them physically upfront (which requires more time and twice the
 disk space) or creating in-memory chunks as StringIO instances.
+
+Optionanl: python3
+
+Note: To install python3 bindings install python3 and run script with PYTHON3=yes.
+
+  # PYTHON3=yes ./filechunkio.SlackBuild
diff --git a/python/filechunkio/filechunkio.SlackBuild b/python/filechunkio/filechunkio.SlackBuild
index ce74850a70..2f9be5dea5 100644
--- a/python/filechunkio/filechunkio.SlackBuild
+++ b/python/filechunkio/filechunkio.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for filechunkio
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=filechunkio
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -32,13 +50,18 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
+# Install python3 modules. Default is no.
+if [ "${PYTHON3:-no}" == "yes" ]; then
+  python3 setup.py install --root=$PKG
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/python/filechunkio/filechunkio.info b/python/filechunkio/filechunkio.info
index d235bc935d..55106abc1c 100644
--- a/python/filechunkio/filechunkio.info
+++ b/python/filechunkio/filechunkio.info
@@ -1,8 +1,8 @@
 PRGNAM="filechunkio"
-VERSION="1.5"
+VERSION="1.6"
 HOMEPAGE="https://bitbucket.org/fabian/filechunkio"
-DOWNLOAD="http://pypi.python.org/packages/source/f/filechunkio/filechunkio-1.5.tar.gz"
-MD5SUM="bdc8507116dc32c7f140ff76cfd09ecc"
+DOWNLOAD="http://pypi.python.org/packages/source/f/filechunkio/filechunkio-1.6.tar.gz"
+MD5SUM="c168a11ad94cd2ec42a219f0f8869a7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/google-api-python-client/README b/python/google-api-python-client/README
index 136d714257..97d8bc1b42 100644
--- a/python/google-api-python-client/README
+++ b/python/google-api-python-client/README
@@ -1,7 +1 @@
-google-api-python-client (Google APIs Client for Python)
-
-Written by Google, this is a small, flexible, and powerful Python
-client library for accessing Google APIs. The library supports these
-Python environments: Google App Engine and Supported APIs
-This project is also the home of oauth2client, a Python client
-library for OAuth 2.0.
+This is the Python client library for Google's discovery based APIs.
diff --git a/python/google-api-python-client/google-api-python-client.SlackBuild b/python/google-api-python-client/google-api-python-client.SlackBuild
index f65016f139..08e12beb4a 100644
--- a/python/google-api-python-client/google-api-python-client.SlackBuild
+++ b/python/google-api-python-client/google-api-python-client.SlackBuild
@@ -1,29 +1,32 @@
 #!/bin/sh
 
-# Slackware build script for google-api-python-client
+# Slackware build script for "google-api-python-client"
 
-# Copyright 2011  Vincent Batts, Vienna, VA. USA
+# Copyright 2011-2015  Vincent Batts, Vienna, VA. USA
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=google-api-python-client
-VERSION=${VERSION:-1.0beta2}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,24 +63,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README samples/ docs/ \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE README.md samples/ docs/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/doc/$PRGNAM-$VERSION -type d -exec chmod 0755 {} \;
diff --git a/python/google-api-python-client/google-api-python-client.info b/python/google-api-python-client/google-api-python-client.info
index d9905db469..21b5201f9a 100644
--- a/python/google-api-python-client/google-api-python-client.info
+++ b/python/google-api-python-client/google-api-python-client.info
@@ -1,10 +1,10 @@
 PRGNAM="google-api-python-client"
-VERSION="1.0beta2"
-HOMEPAGE="https://google-api-python-client.googlecode.com/"
-DOWNLOAD="http://google-api-python-client.googlecode.com/files/google-api-python-client-1.0beta2.tar.gz"
-MD5SUM="0998bcec19f69c7130a36d0c1a91b100"
+VERSION="1.4.2"
+HOMEPAGE="https://github.com/google/google-api-python-client/"
+DOWNLOAD="https://github.com/google/google-api-python-client/archive/v1.4.2.tar.gz"
+MD5SUM="93a9cb70135fb941197bcd6d4136fb67"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbangbash.com"
+REQUIRES="httplib2 python-uri-templates python-oauth2client"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/google-api-python-client/slack-desc b/python/google-api-python-client/slack-desc
index 6bb13abc3a..af8ba8e1e6 100644
--- a/python/google-api-python-client/slack-desc
+++ b/python/google-api-python-client/slack-desc
@@ -8,12 +8,12 @@
                         |-----handy-ruler------------------------------------------------------|
 google-api-python-client: google-api-python-client (Google APIs Client for Python)
 google-api-python-client:
-google-api-python-client: Written by Google, this is a small, flexible, and powerful Python
-google-api-python-client: client library for accessing Google APIs. The library supports these
-google-api-python-client: Python environments:
-google-api-python-client:   Google App Engine
-google-api-python-client:   Supported APIs
-google-api-python-client: This project is also the home of oauth2client, a Python client
-google-api-python-client: library for OAuth 2.0.
+google-api-python-client: This is the Python client library for Google's discovery based APIs.
+google-api-python-client:
+google-api-python-client: Homepage: https://github.com/google/google-api-python-client/
+google-api-python-client:
+google-api-python-client:
+google-api-python-client:
+google-api-python-client:
 google-api-python-client:
 google-api-python-client:
diff --git a/python/halberd/README b/python/halberd/README
new file mode 100644
index 0000000000..9a4d375f3f
--- /dev/null
+++ b/python/halberd/README
@@ -0,0 +1,8 @@
+Halberd discovers HTTP load balancers. It is useful for web application
+security auditing and for load balancer configuration testing.
+
+Default configuration file written to ~/.halberd/halberd.cfg during the
+first execution of the program.  See documentation describing further
+usage of this application.
+
+PDF Documentation included in /usr/doc/halberd-$VERSION/manual.pdf.
diff --git a/python/halberd/halberd.SlackBuild b/python/halberd/halberd.SlackBuild
new file mode 100644
index 0000000000..c79084e05e
--- /dev/null
+++ b/python/halberd/halberd.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for halberd
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=halberd
+VERSION=${VERSION:-0.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix path to latex binary for Slackware
+patch -p1 --verbose < $CWD/make-pdf-manual.diff
+
+# Generate PDF documentation
+( cd doc/
+make manual.pdf
+)
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/manual.pdf AUTHORS INSTALL PKG-INFO THANKS ChangeLog LICENSE README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/halberd/halberd.info b/python/halberd/halberd.info
new file mode 100644
index 0000000000..d1667d2019
--- /dev/null
+++ b/python/halberd/halberd.info
@@ -0,0 +1,10 @@
+PRGNAM="halberd"
+VERSION="0.2.4"
+HOMEPAGE="http://halberd.superadditive.com/"
+DOWNLOAD="https://pypi.python.org/packages/source/h/halberd/halberd-0.2.4.tar.gz"
+MD5SUM="d60d0fba8f379ea72c623ad1dd6052c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/halberd/make-pdf-manual.diff b/python/halberd/make-pdf-manual.diff
new file mode 100644
index 0000000000..6eae15bdd0
--- /dev/null
+++ b/python/halberd/make-pdf-manual.diff
@@ -0,0 +1,14 @@
+
+Corrects the path to the latex binary on Slackware.
+
+--- halberd-0.2.4.orig/doc/GNUmakefile	2015-11-17 19:57:03.993466727 -0700
++++ halberd-0.2.4/doc/GNUmakefile	2015-11-17 19:58:43.780459960 -0700
+@@ -15,7 +15,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ 
+-LATEX := /usr/bin/latex
++LATEX := /usr/share/texmf/bin/latex
+ DVIPDF := /usr/bin/dvipdf
+ LATEX2HTML := /usr/bin/latex2html
+ 
diff --git a/python/halberd/slack-desc b/python/halberd/slack-desc
new file mode 100644
index 0000000000..5907b8cc3c
--- /dev/null
+++ b/python/halberd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+halberd: halberd (HTTP load balancer detector)
+halberd:
+halberd: Halberd discovers HTTP load balancers. It is useful for web
+halberd: application security auditing and for load balancer configuration
+halberd: testing.
+halberd:
+halberd: Home page: http://halberd.superadditive.com/
+halberd:
+halberd:
+halberd:
+halberd:
diff --git a/python/hg-git/hg-git.SlackBuild b/python/hg-git/hg-git.SlackBuild
index bdae9eab16..99ca27e975 100644
--- a/python/hg-git/hg-git.SlackBuild
+++ b/python/hg-git/hg-git.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hg-git
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/hg-git/hg-git.info b/python/hg-git/hg-git.info
index 973deb984f..db479ee838 100644
--- a/python/hg-git/hg-git.info
+++ b/python/hg-git/hg-git.info
@@ -1,8 +1,8 @@
 PRGNAM="hg-git"
-VERSION="0.8.1"
+VERSION="0.8.2"
 HOMEPAGE="http://hg-git.github.com/"
-DOWNLOAD="https://pypi.python.org/packages/source/h/hg-git/hg-git-0.8.1.tar.gz"
-MD5SUM="f939426b8a8916e25fb971c1936ee5c4"
+DOWNLOAD="https://pypi.python.org/packages/source/h/hg-git/hg-git-0.8.2.tar.gz"
+MD5SUM="500fba05874fe1487cc550842fab8772"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dulwich"
diff --git a/python/hgsubversion/hgsubversion.SlackBuild b/python/hgsubversion/hgsubversion.SlackBuild
index 3efe2f8813..081669ef5c 100644
--- a/python/hgsubversion/hgsubversion.SlackBuild
+++ b/python/hgsubversion/hgsubversion.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hgsubversion
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/hgsubversion/hgsubversion.info b/python/hgsubversion/hgsubversion.info
index a714878399..3f56b3b8b8 100644
--- a/python/hgsubversion/hgsubversion.info
+++ b/python/hgsubversion/hgsubversion.info
@@ -1,8 +1,8 @@
 PRGNAM="hgsubversion"
-VERSION="1.8.1"
+VERSION="1.8.2"
 HOMEPAGE="https://bitbucket.org/durin42/hgsubversion"
-DOWNLOAD="https://pypi.python.org/packages/source/h/hgsubversion/hgsubversion-1.8.1.tar.gz"
-MD5SUM="7ad0e4cd7dc1acabdd076511d485b247"
+DOWNLOAD="https://pypi.python.org/packages/source/h/hgsubversion/hgsubversion-1.8.2.tar.gz"
+MD5SUM="48f93f9ee78dd388004667e12cb585fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="subvertpy"
diff --git a/python/hpack/README b/python/hpack/README
new file mode 100644
index 0000000000..4d9d87f966
--- /dev/null
+++ b/python/hpack/README
@@ -0,0 +1,4 @@
+hpack contains a pure-Python HTTP/2 header encoding (HPACK) logic
+for use in Python programs that implement HTTP/2. It also contains a
+compatibility layer that automatically enables the use of nghttp2 if
+it's available.
diff --git a/python/hpack/hpack.SlackBuild b/python/hpack/hpack.SlackBuild
new file mode 100644
index 0000000000..c6afe2570d
--- /dev/null
+++ b/python/hpack/hpack.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for hpack
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hpack
+VERSION=${VERSION:-2.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTORS.rst LICENSE PKG-INFO HISTORY.rst README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/hpack/hpack.info b/python/hpack/hpack.info
new file mode 100644
index 0000000000..cafe205c6d
--- /dev/null
+++ b/python/hpack/hpack.info
@@ -0,0 +1,10 @@
+PRGNAM="hpack"
+VERSION="2.0.1"
+HOMEPAGE="http://hyper.rtfd.org/"
+DOWNLOAD="https://pypi.python.org/packages/source/h/hpack/hpack-2.0.1.tar.gz"
+MD5SUM="66da5d6a831fbfddc75f3f5bf17277a0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/hpack/slack-desc b/python/hpack/slack-desc
new file mode 100644
index 0000000000..77070d7e67
--- /dev/null
+++ b/python/hpack/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+hpack: hpack (Pure-Python HPACK header compression)
+hpack:
+hpack: hpack contains a pure-Python HTTP/2 header encoding (HPACK) logic
+hpack: for use in Python programs that implement HTTP/2. It also contains a
+hpack: compatibility layer that automatically enables the use of nghttp2 if
+hpack: it's available.
+hpack:
+hpack: Home page: http://hyper.rtfd.org/
+hpack:
+hpack:
+hpack:
diff --git a/python/html2text/html2text.SlackBuild b/python/html2text/html2text.SlackBuild
index 7c1ddd5fc4..b837837b2e 100644
--- a/python/html2text/html2text.SlackBuild
+++ b/python/html2text/html2text.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for html2text
 
 # Copyright 2011 crocket (crockabiscuit@gmail.com)
-# Copyright 2013 LukenShiro, Italy
+# Copyright 2013-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=html2text
-VERSION=${VERSION:-3.200.3_8ddc844b03}
+VERSION=${VERSION:-2015.11.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,16 +55,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCFILES="COPYING README.md test/"
+DOCFILES="AUTHORS.rst ChangeLog.rst COPYING README.md test/"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-master
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-master
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/python/html2text/html2text.info b/python/html2text/html2text.info
index 7cdcb40079..22b48f0e41 100644
--- a/python/html2text/html2text.info
+++ b/python/html2text/html2text.info
@@ -1,8 +1,8 @@
 PRGNAM="html2text"
-VERSION="3.200.3_8ddc844b03"
-HOMEPAGE="http://www.aaronsw.com/2002/html2text/"
-DOWNLOAD="http://lukenshiro.altervista.org/sbo-sources/html2text-3.200.3_8ddc844b03.zip"
-MD5SUM="4fe2a4e706da570895c3019d53e5c2ac"
+VERSION="2015.11.4"
+HOMEPAGE="https://github.com/Alir3z4/html2text"
+DOWNLOAD="https://pypi.python.org/packages/source/h/html2text/html2text-2015.11.4.tar.gz"
+MD5SUM="51bdf631d39ba577b8b66497fb17aed9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/idna/README b/python/idna/README
new file mode 100644
index 0000000000..fe83501136
--- /dev/null
+++ b/python/idna/README
@@ -0,0 +1 @@
+Internationalized Domain Names in Applications (IDNA)
diff --git a/python/idna/idna.SlackBuild b/python/idna/idna.SlackBuild
new file mode 100644
index 0000000000..e1fc1ad91b
--- /dev/null
+++ b/python/idna/idna.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for idna
+
+# Copyright 2015 Markus Reichelt
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=idna
+VERSION=${VERSION:-2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/idna/idna.info b/python/idna/idna.info
new file mode 100644
index 0000000000..4e83888aec
--- /dev/null
+++ b/python/idna/idna.info
@@ -0,0 +1,10 @@
+PRGNAM="idna"
+VERSION="2.0"
+HOMEPAGE="https://github.com/kjd/idna"
+DOWNLOAD="https://pypi.python.org/packages/source/i/idna/idna-2.0.tar.gz"
+MD5SUM="bd17a9d15e755375f48a62c13b25b801"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Markus Reichelt"
+EMAIL="slackbuilds@mareichelt.de"
diff --git a/python/idna/slack-desc b/python/idna/slack-desc
new file mode 100644
index 0000000000..5010245075
--- /dev/null
+++ b/python/idna/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+idna: idna (Internationalized Domain Names in Applications)
+idna:
+idna: A library to support the IDNA protocol as specified in RFC 5891.
+idna:
+idna:
+idna:
+idna: Homepage: https://github.com/kjd/idna
+idna:
+idna:
+idna:
+idna:
diff --git a/python/ipaddr-py/ipaddr-py.SlackBuild b/python/ipaddr-py/ipaddr-py.SlackBuild
index 4fbfa15398..207af468cd 100644
--- a/python/ipaddr-py/ipaddr-py.SlackBuild
+++ b/python/ipaddr-py/ipaddr-py.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ipaddr-py
 
-# Copyright 2013, Robby Workman, Northport, Alabama, USA
+# Copyright 2013-2015 Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/python/ipaddr-py/ipaddr-py.info b/python/ipaddr-py/ipaddr-py.info
index dd65dff448..96b82267ab 100644
--- a/python/ipaddr-py/ipaddr-py.info
+++ b/python/ipaddr-py/ipaddr-py.info
@@ -1,6 +1,6 @@
 PRGNAM="ipaddr-py"
 VERSION="2.1.10"
-HOMEPAGE="https://code.google.com/p/ipaddr-py/"
+HOMEPAGE="https://github.com/google/ipaddr-py"
 DOWNLOAD="https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz"
 MD5SUM="f315ac829218e9735c5d772d59a3e0e7"
 DOWNLOAD_x86_64=""
diff --git a/python/jmespath/jmespath.SlackBuild b/python/jmespath/jmespath.SlackBuild
index 6d29708e95..f715aa10d5 100644
--- a/python/jmespath/jmespath.SlackBuild
+++ b/python/jmespath/jmespath.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jmespath
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jmespath
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/jmespath/jmespath.info b/python/jmespath/jmespath.info
index 4e224ded00..df6703eff5 100644
--- a/python/jmespath/jmespath.info
+++ b/python/jmespath/jmespath.info
@@ -1,8 +1,8 @@
 PRGNAM="jmespath"
-VERSION="0.7.1"
+VERSION="0.9.0"
 HOMEPAGE="https://github.com/boto/jmespath"
-DOWNLOAD="https://pypi.python.org/packages/source/j/jmespath/jmespath-0.7.1.tar.gz"
-MD5SUM="ca76cb014165306c1eded212cfb78cf5"
+DOWNLOAD="https://pypi.python.org/packages/source/j/jmespath/jmespath-0.9.0.tar.gz"
+MD5SUM="471b7d19bd153ac11a21d4fb7466800c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/lxml/lxml.SlackBuild b/python/lxml/lxml.SlackBuild
index f732c54049..7a91659771 100644
--- a/python/lxml/lxml.SlackBuild
+++ b/python/lxml/lxml.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lxml
-VERSION=${VERSION:-3.4.4}
+VERSION=${VERSION:-3.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/lxml/lxml.info b/python/lxml/lxml.info
index 9b11ae6931..3db0bfe71e 100644
--- a/python/lxml/lxml.info
+++ b/python/lxml/lxml.info
@@ -1,8 +1,8 @@
 PRGNAM="lxml"
-VERSION="3.4.4"
+VERSION="3.5.0"
 HOMEPAGE="http://lxml.de/"
-DOWNLOAD="http://pypi.python.org/packages/source/l/lxml/lxml-3.4.4.tar.gz"
-MD5SUM="a9a65972afc173ec7a39c585f4eea69c"
+DOWNLOAD="http://pypi.python.org/packages/source/l/lxml/lxml-3.5.0.tar.gz"
+MD5SUM="9f0c5f1eb43ff44d5455dab4b4efbe73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="BeautifulSoup"
diff --git a/python/monty/monty.SlackBuild b/python/monty/monty.SlackBuild
index 79a36a17a6..4a183fd9c7 100644
--- a/python/monty/monty.SlackBuild
+++ b/python/monty/monty.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for monty
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monty
-VERSION=${VERSION:-0.6.5}
+VERSION=${VERSION:-0.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/monty/monty.info b/python/monty/monty.info
index cbabc39f92..bdf480df8d 100644
--- a/python/monty/monty.info
+++ b/python/monty/monty.info
@@ -1,8 +1,8 @@
 PRGNAM="monty"
-VERSION="0.6.5"
+VERSION="0.7.2"
 HOMEPAGE="https://github.com/materialsvirtuallab/monty"
-DOWNLOAD="https://pypi.python.org/packages/source/m/monty/monty-0.6.5.tar.gz"
-MD5SUM="c1d883ed1de16ceecd3c65cfc949197f"
+DOWNLOAD="https://pypi.python.org/packages/source/m/monty/monty-0.7.2.tar.gz"
+MD5SUM="9c02ac5db866dcc53402f3f8ea0c3b1a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools PyYAML six"
diff --git a/python/netlib/README b/python/netlib/README
new file mode 100644
index 0000000000..3ba663a6f3
--- /dev/null
+++ b/python/netlib/README
@@ -0,0 +1,6 @@
+Netlib is a collection of network utility classes, used by the pathod
+and mitmproxy projects. It differs from other projects in some
+fundamental respects, because both pathod and mitmproxy often need to
+violate standards. This means that protocols are implemented as small,
+well-contained and flexible functions, and are designed to allow
+misbehaviour when needed.
diff --git a/python/netlib/netlib.SlackBuild b/python/netlib/netlib.SlackBuild
new file mode 100644
index 0000000000..115105bf32
--- /dev/null
+++ b/python/netlib/netlib.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for netlib
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=netlib
+VERSION=${VERSION:-0.14.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.mkd PKG-INFO LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/netlib/netlib.info b/python/netlib/netlib.info
new file mode 100644
index 0000000000..0ce7bdd829
--- /dev/null
+++ b/python/netlib/netlib.info
@@ -0,0 +1,10 @@
+PRGNAM="netlib"
+VERSION="0.14.0"
+HOMEPAGE="https://mitmproxy.org/"
+DOWNLOAD="https://mitmproxy.org/download/netlib-0.14.0.tar.gz"
+MD5SUM="2210333803a8549a2d858d98d9402d0c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pyOpenSSL passlib hpack python-certifi backports-ssl-match-hostname"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/netlib/slack-desc b/python/netlib/slack-desc
new file mode 100644
index 0000000000..9a6b02e4c8
--- /dev/null
+++ b/python/netlib/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+netlib: netlib (Network utilities used by pathod and mitmproxy)
+netlib:
+netlib: Netlib is a collection of network utility classes, used by the
+netlib: pathod and mitmproxy projects. It differs from other projects in
+netlib: some fundamental respects, because both pathod and mitmproxy often
+netlib: need to violate standards. This means that protocols are implemented
+netlib: as small, well-contained and flexible functions, and are designed to
+netlib: allow misbehaviour when needed.
+netlib:
+netlib: Home page: https://mitmproxy.org/
+netlib:
diff --git a/python/npyscreen/npyscreen.SlackBuild b/python/npyscreen/npyscreen.SlackBuild
index 02a2e1417d..f3e469ebb4 100644
--- a/python/npyscreen/npyscreen.SlackBuild
+++ b/python/npyscreen/npyscreen.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=npyscreen
-VERSION=${VERSION:-4.9.1}
+VERSION=${VERSION:-4.10.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/npyscreen/npyscreen.info b/python/npyscreen/npyscreen.info
index b339030492..0d7c9ae98b 100644
--- a/python/npyscreen/npyscreen.info
+++ b/python/npyscreen/npyscreen.info
@@ -1,8 +1,8 @@
 PRGNAM="npyscreen"
-VERSION="4.9.1"
+VERSION="4.10.5"
 HOMEPAGE="http://www.npcole.com/npyscreen/"
-DOWNLOAD="https://pypi.python.org/packages/source/n/npyscreen/npyscreen-4.9.1.tar.gz"
-MD5SUM="05088a99c76b8a924079cd139fab4aec"
+DOWNLOAD="https://pypi.python.org/packages/source/n/npyscreen/npyscreen-4.10.5.tar.gz"
+MD5SUM="8f2e2e404d87393fbd277db6430508c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/numexpr/numexpr.SlackBuild b/python/numexpr/numexpr.SlackBuild
index 3a3b071cca..e843ed707d 100644
--- a/python/numexpr/numexpr.SlackBuild
+++ b/python/numexpr/numexpr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for numexpr
 
-# Copyright 2010-2014  LukenShiro, Italy
+# Copyright 2010-2015  LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=numexpr
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCFILES="ANNOUNCE.rst README.rst AUTHORS.txt INSTALL.rst RELEASE_NOTES.rst"
+DOCFILES="ANNOUNCE.rst AUTHORS.txt INSTALL.rst LICENSE.txt README.rst RELEASE_NOTES.rst"
 
 set -e
 
diff --git a/python/numexpr/numexpr.info b/python/numexpr/numexpr.info
index 435c1044a9..29db9e5bcc 100644
--- a/python/numexpr/numexpr.info
+++ b/python/numexpr/numexpr.info
@@ -1,8 +1,8 @@
 PRGNAM="numexpr"
-VERSION="2.4"
+VERSION="2.4.6"
 HOMEPAGE="https://github.com/pydata/numexpr"
-DOWNLOAD="https://pypi.python.org/packages/source/n/numexpr/numexpr-2.4.tar.gz"
-MD5SUM="df7e8d9e9dbb145b56d43c465c2bf854"
+DOWNLOAD="https://pypi.python.org/packages/source/n/numexpr/numexpr-2.4.6.tar.gz"
+MD5SUM="17ac6fafc9ea1ce3eb970b9abccb4fbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numpy"
diff --git a/python/passlib/README b/python/passlib/README
new file mode 100644
index 0000000000..d3618f7ac9
--- /dev/null
+++ b/python/passlib/README
@@ -0,0 +1,6 @@
+Passlib is a password hashing library for Python 2 & 3, which provides
+cross-platform implementations of over 30 password hashing algorithms,
+as well as a framework for managing existing password hashes. It's
+designed to be useful for a wide range of tasks, from verifying a hash
+found in /etc/shadow, to providing full-strength password hashing for
+multi-user applications.
diff --git a/python/passlib/passlib.SlackBuild b/python/passlib/passlib.SlackBuild
new file mode 100644
index 0000000000..4a4ce59c56
--- /dev/null
+++ b/python/passlib/passlib.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for passlib
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=passlib
+VERSION=${VERSION:-1.6.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES README LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/passlib/passlib.info b/python/passlib/passlib.info
new file mode 100644
index 0000000000..e86fd84f7b
--- /dev/null
+++ b/python/passlib/passlib.info
@@ -0,0 +1,10 @@
+PRGNAM="passlib"
+VERSION="1.6.5"
+HOMEPAGE="https://bitbucket.org/ecollins/passlib"
+DOWNLOAD="https://pypi.python.org/packages/source/p/passlib/passlib-1.6.5.tar.gz"
+MD5SUM="d2edd6c42cde136a538b48d90a06ad67"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/passlib/slack-desc b/python/passlib/slack-desc
new file mode 100644
index 0000000000..14578b94a8
--- /dev/null
+++ b/python/passlib/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+passlib: passlib (comprehensive password hashing framework)
+passlib:
+passlib: Passlib is a password hashing library for Python 2 & 3, which
+passlib: provides cross-platform implementations of over 30 password hashing
+passlib: algorithms, as well as a framework for managing existing password
+passlib: hashes. It's designed to be useful for a wide range of tasks, from
+passlib: verifying a hash found in /etc/shadow, to providing full-strength
+passlib: password hashing for multi-user applications.
+passlib:
+passlib: Home page: https://bitbucket.org/ecollins/passlib
+passlib:
diff --git a/python/path.py/path.py.SlackBuild b/python/path.py/path.py.SlackBuild
index b5e2345456..6487024741 100644
--- a/python/path.py/path.py.SlackBuild
+++ b/python/path.py/path.py.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=path.py
-VERSION=${VERSION:-7.4}
+VERSION=${VERSION:-8.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/path.py/path.py.info b/python/path.py/path.py.info
index 9bab1bb522..2f7279505a 100644
--- a/python/path.py/path.py.info
+++ b/python/path.py/path.py.info
@@ -1,8 +1,8 @@
 PRGNAM="path.py"
-VERSION="7.4"
+VERSION="8.1.2"
 HOMEPAGE="https://github.com/jaraco/path.py"
-DOWNLOAD="https://github.com/jaraco/path.py/archive/7.4.tar.gz"
-MD5SUM="618b51f49a1f60a54445007f282cfb1a"
+DOWNLOAD="https://pypi.python.org/packages/source/p/path.py/path.py-8.1.2.tar.gz"
+MD5SUM="31d07ac861284f8148a9041064852371"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/pbr/pbr.SlackBuild b/python/pbr/pbr.SlackBuild
index 0790c1e8ce..6424e632c9 100644
--- a/python/pbr/pbr.SlackBuild
+++ b/python/pbr/pbr.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pbr
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pbr/pbr.info b/python/pbr/pbr.info
index 04b4e38e57..1b7805b815 100644
--- a/python/pbr/pbr.info
+++ b/python/pbr/pbr.info
@@ -1,8 +1,8 @@
 PRGNAM="pbr"
-VERSION="0.8.0"
+VERSION="1.8.1"
 HOMEPAGE="https://pypi.python.org/pypi/pbr"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pbr/pbr-0.8.0.tar.gz"
-MD5SUM="7d85dc6aa47809d97d29901bf0244f6f"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pbr/pbr-1.8.1.tar.gz"
+MD5SUM="c8f9285e1a4ca6f9654c529b158baa3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/phply/README b/python/phply/README
new file mode 100644
index 0000000000..c966d94bc9
--- /dev/null
+++ b/python/phply/README
@@ -0,0 +1,15 @@
+phply is a lexer and parser for the PHP programming language written in
+Python.
+
+Included tools installed to /usr/bin:
+
+phpshell.py - PHP interactive interpreter written in Python
+
+php2json.py - Converts PHP to a JSON-based abstract syntax tree
+Usage: php2json.py < input.php > output.json
+
+php2python.py - Converts PHP to Python using unparse.py
+Usage: php2python.py < input.php > output.py
+
+php2jinja.py - Converts PHP to Jinja2 templates (experimental)
+Usage: php2jinja.py < input.php > output.html
diff --git a/python/phply/phply-setup.py.diff b/python/phply/phply-setup.py.diff
new file mode 100644
index 0000000000..34f495ac99
--- /dev/null
+++ b/python/phply/phply-setup.py.diff
@@ -0,0 +1,18 @@
+--- phply-0.9.1.orig/setup.py	2015-11-16 13:07:31.666674204 -0700
++++ phply-0.9.1/setup.py	2015-11-16 13:15:02.571666129 -0700
+@@ -19,6 +19,15 @@
+       license='BSD',
+       url='http://www.github.com/ramen/phply',
+ 
++      scripts=[
++        'tools/php2jinja.py',
++        'tools/php2json.py',
++        'tools/php2python.py',
++        'tools/phpshell.py',
++        'tools/tokenize.php',
++        'tools/unparse.py',
++        ],
++
+       classifiers=[
+         'Development Status :: 2 - Pre-Alpha',
+         'Environment :: Console',
diff --git a/python/phply/phply.SlackBuild b/python/phply/phply.SlackBuild
new file mode 100644
index 0000000000..f8dc1945af
--- /dev/null
+++ b/python/phply/phply.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for phply
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=phply
+VERSION=${VERSION:-0.9.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# make setup.py include scripts in $PRGNAM-$VERSION/tools/
+patch -p1 --verbose < $CWD/phply-setup.py.diff
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE PKG-INFO README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/phply/phply.info b/python/phply/phply.info
new file mode 100644
index 0000000000..1540e5a76d
--- /dev/null
+++ b/python/phply/phply.info
@@ -0,0 +1,10 @@
+PRGNAM="phply"
+VERSION="0.9.1"
+HOMEPAGE="https://github.com/ramen/phply"
+DOWNLOAD="https://pypi.python.org/packages/source/p/phply/phply-0.9.1.tar.gz"
+MD5SUM="f336ab9d35bd9c0f0a50ede3252b12ba"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ply simplejson pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/phply/slack-desc b/python/phply/slack-desc
new file mode 100644
index 0000000000..2fa1fe2b2a
--- /dev/null
+++ b/python/phply/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+phply: phply (PHP lexer and parser in Python)
+phply:
+phply: phply is a lexer and parser for the PHP programming language
+phply: written in Python.
+phply:
+phply: Home page: https://github.com/ramen/phply
+phply:
+phply:
+phply:
+phply:
+phply:
diff --git a/python/pilkit/pilkit.SlackBuild b/python/pilkit/pilkit.SlackBuild
index d786371286..fb5e537f73 100644
--- a/python/pilkit/pilkit.SlackBuild
+++ b/python/pilkit/pilkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pilkit
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pilkit
-VERSION=${VERSION:-1.1.12}
+VERSION=${VERSION:-1.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pilkit/pilkit.info b/python/pilkit/pilkit.info
index d54deac687..53ffb3e595 100644
--- a/python/pilkit/pilkit.info
+++ b/python/pilkit/pilkit.info
@@ -1,8 +1,8 @@
 PRGNAM="pilkit"
-VERSION="1.1.12"
+VERSION="1.1.13"
 HOMEPAGE="http://github.com/matthewwithanm/pilkit/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pilkit/pilkit-1.1.12.tar.gz"
-MD5SUM="db659fe027a4c48196bd46ae9263e14b"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pilkit/pilkit-1.1.13.tar.gz"
+MD5SUM="dc586362902dcc1110d487d7c8ffd5e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/pip/pip.SlackBuild b/python/pip/pip.SlackBuild
index 6cdc9e0be3..d6fe0f6713 100644
--- a/python/pip/pip.SlackBuild
+++ b/python/pip/pip.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pip
-VERSION=${VERSION:-7.1.0}
+VERSION=${VERSION:-7.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pip/pip.info b/python/pip/pip.info
index eb1a078edb..f215098cb0 100644
--- a/python/pip/pip.info
+++ b/python/pip/pip.info
@@ -1,8 +1,8 @@
 PRGNAM="pip"
-VERSION="7.1.0"
+VERSION="7.1.2"
 HOMEPAGE="https://pip.pypa.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pip/pip-7.1.0.tar.gz"
-MD5SUM="d935ee9146074b1d3f26c5f0acfd120e"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz"
+MD5SUM="3823d2343d9f3aaab21cf9c917710196"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/plaso/plaso.info b/python/plaso/plaso.info
index 8a35219b18..1f2d65867b 100644
--- a/python/plaso/plaso.info
+++ b/python/plaso/plaso.info
@@ -1,7 +1,7 @@
 PRGNAM="plaso"
 VERSION="1.2.0"
 HOMEPAGE="http://plaso.kiddaland.net/"
-DOWNLOAD="https://e366e647f8637dd31e0a13f75e5469341a9ab0ee.googledrive.com/host/0B30H7z4S52FleW5vUHBnblJfcjg/1.2.0/final/plaso-1.2.0.tar.gz"
+DOWNLOAD="https://github.com/log2timeline/plaso/releases/download/v1.2.0/plaso-1.2.0.tar.gz"
 MD5SUM="89f0d04cb4e6763419cda347fdffaeab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/python/ply/ply.SlackBuild b/python/ply/ply.SlackBuild
index 84780347b1..cde9099212 100644
--- a/python/ply/ply.SlackBuild
+++ b/python/ply/ply.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ply
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greeece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ply
-VERSION=${VERSION:-3.6}
+VERSION=${VERSION:-3.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,11 @@ find -L . \
 
 python setup.py install --root=$PKG
 
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/python/ply/ply.info b/python/ply/ply.info
index bc6c72fed7..bd6d50fb15 100644
--- a/python/ply/ply.info
+++ b/python/ply/ply.info
@@ -1,8 +1,8 @@
 PRGNAM="ply"
-VERSION="3.6"
+VERSION="3.8"
 HOMEPAGE="http://www.dabeaz.com/ply/"
-DOWNLOAD="http://www.dabeaz.com/ply/ply-3.6.tar.gz"
-MD5SUM="7aa0e8749d2377a863f477a7d67524d2"
+DOWNLOAD="http://www.dabeaz.com/ply/ply-3.8.tar.gz"
+MD5SUM="94726411496c52c87c2b9429b12d5c50"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/prompt_toolkit/prompt_toolkit.SlackBuild b/python/prompt_toolkit/prompt_toolkit.SlackBuild
index ba15c13841..3ecda27dc9 100644
--- a/python/prompt_toolkit/prompt_toolkit.SlackBuild
+++ b/python/prompt_toolkit/prompt_toolkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for prompt_toolkit
 
-# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=prompt_toolkit
-VERSION=${VERSION:-0.43}
+VERSION=${VERSION:-0.57}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/prompt_toolkit/prompt_toolkit.info b/python/prompt_toolkit/prompt_toolkit.info
index 4b0d198181..035850e8ab 100644
--- a/python/prompt_toolkit/prompt_toolkit.info
+++ b/python/prompt_toolkit/prompt_toolkit.info
@@ -1,8 +1,8 @@
 PRGNAM="prompt_toolkit"
-VERSION="0.43"
+VERSION="0.57"
 HOMEPAGE="https://github.com/jonathanslenders/python-prompt-toolkit"
-DOWNLOAD="https://pypi.python.org/packages/source/p/prompt_toolkit/prompt_toolkit-0.43.tar.gz"
-MD5SUM="a0034cd283238e729b4d76aa4a044020"
+DOWNLOAD="https://pypi.python.org/packages/source/p/prompt_toolkit/prompt_toolkit-0.57.tar.gz"
+MD5SUM="280284f7ecf5454143f90c3ec8b0750d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wcwidth Pygments six"
diff --git a/python/ps_mem/README b/python/ps_mem/README
new file mode 100644
index 0000000000..af331eb14a
--- /dev/null
+++ b/python/ps_mem/README
@@ -0,0 +1,4 @@
+ps_mem (list processes by memory usage)
+
+ps_mem is a utility to accurately report the in core memory usage
+for a program.
diff --git a/python/ps_mem/ps_mem.SlackBuild b/python/ps_mem/ps_mem.SlackBuild
new file mode 100644
index 0000000000..f77f629b1e
--- /dev/null
+++ b/python/ps_mem/ps_mem.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# Slackware build script for ps_mem.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ps_mem
+VERSION=${VERSION:-3.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCVER="v3.6"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCVER.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG --optimize=1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man/man1
+cp -a ps_mem.1 $PKG/usr/man/man1/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/ps_mem/ps_mem.info b/python/ps_mem/ps_mem.info
new file mode 100644
index 0000000000..f4ab149407
--- /dev/null
+++ b/python/ps_mem/ps_mem.info
@@ -0,0 +1,10 @@
+PRGNAM="ps_mem"
+VERSION="3.6"
+HOMEPAGE="https://github.com/pixelb/ps_mem/"
+DOWNLOAD="https://github.com/pixelb/ps_mem/archive/v3.6.tar.gz"
+MD5SUM="d178522f404dd7db8de598d75600c0e0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/python/ps_mem/slack-desc b/python/ps_mem/slack-desc
new file mode 100644
index 0000000000..564f5b10c3
--- /dev/null
+++ b/python/ps_mem/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ps_mem: ps_mem (list processes by memory usage)
+ps_mem:
+ps_mem: ps_mem is a utility to accurately report the in core memory usage
+ps_mem: for a program.
+ps_mem:
+ps_mem: Homepage: https://github.com/pixelb/ps_mem
+ps_mem:
+ps_mem:
+ps_mem:
+ps_mem:
+ps_mem:
diff --git a/python/psutil/README b/python/psutil/README
index 0b94eeec80..c6fc21eeb6 100644
--- a/python/psutil/README
+++ b/python/psutil/README
@@ -5,3 +5,7 @@ command line tools such as: ps, top, df, kill, free, lsof, netstat, ifconfig,
 nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, and pmap.
 
 Optional: pysetuptools, python3.
+
+To install python3 bindings run the slackbuild with PYTHON3=yes.
+
+  # PYTHON3=yes ./psutil.SlackBuild
diff --git a/python/psutil/psutil.SlackBuild b/python/psutil/psutil.SlackBuild
index b7d5b3f786..7503837b6e 100644
--- a/python/psutil/psutil.SlackBuild
+++ b/python/psutil/psutil.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=psutil
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,7 +57,8 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import os' 2>/dev/null); then
+# Install python3 bindings for psutil. Default is no.
+if [ "${PYTHON3:-no}" == "yes" ]; then
   python3 setup.py install --root=$PKG
 fi
 
diff --git a/python/psutil/psutil.info b/python/psutil/psutil.info
index 7c8c1d9d05..c08fdecf40 100644
--- a/python/psutil/psutil.info
+++ b/python/psutil/psutil.info
@@ -1,8 +1,8 @@
 PRGNAM="psutil"
-VERSION="3.0.1"
-HOMEPAGE="http://code.google.com/p/psutil/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/psutil/psutil-3.0.1.tar.gz"
-MD5SUM="037dc67b7902d10f49f6fa5404a73a24"
+VERSION="3.3.0"
+HOMEPAGE="https://github.com/giampaolo/psutil"
+DOWNLOAD="https://pypi.python.org/packages/source/p/psutil/psutil-3.3.0.tar.gz"
+MD5SUM="0625db01ea46417308db94cc59362b65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/ptpython/ptpython.SlackBuild b/python/ptpython/ptpython.SlackBuild
index 1bc1b3162d..3d40c12f8c 100644
--- a/python/ptpython/ptpython.SlackBuild
+++ b/python/ptpython/ptpython.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ptpython
 
-# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ptpython
-VERSION=${VERSION:-0.18}
+VERSION=${VERSION:-0.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/ptpython/ptpython.info b/python/ptpython/ptpython.info
index 5dc0996061..f148e6bd62 100644
--- a/python/ptpython/ptpython.info
+++ b/python/ptpython/ptpython.info
@@ -1,8 +1,8 @@
 PRGNAM="ptpython"
-VERSION="0.18"
+VERSION="0.28"
 HOMEPAGE="https://github.com/jonathanslenders/ptpython"
-DOWNLOAD="https://pypi.python.org/packages/source/p/ptpython/ptpython-0.18.tar.gz"
-MD5SUM="2159864e67fa1640b2fbf6f214a1950f"
+DOWNLOAD="https://pypi.python.org/packages/source/p/ptpython/ptpython-0.28.tar.gz"
+MD5SUM="f563f435185d5681f754310c96fe9cfe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="prompt_toolkit jedi docopt"
diff --git a/python/purl/purl.SlackBuild b/python/purl/purl.SlackBuild
index b763a79c02..94da0d78e9 100644
--- a/python/purl/purl.SlackBuild
+++ b/python/purl/purl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for purl
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=purl
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,7 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
-cp -a README.rst PKG-INFO LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/purl/purl.info b/python/purl/purl.info
index 9ce85c019b..7b6356425f 100644
--- a/python/purl/purl.info
+++ b/python/purl/purl.info
@@ -1,8 +1,8 @@
 PRGNAM="purl"
-VERSION="1.0.3"
+VERSION="1.1"
 HOMEPAGE="https://github.com/codeinthehole/purl"
-DOWNLOAD="https://pypi.python.org/packages/source/p/purl/purl-1.0.3.tar.gz"
-MD5SUM="f07b21a91bb0995a0f9da962321fa43b"
+DOWNLOAD="https://pypi.python.org/packages/source/p/purl/purl-1.1.tar.gz"
+MD5SUM="18e85232396ce60d2e77baed7c5c90e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools six"
diff --git a/python/py/py.SlackBuild b/python/py/py.SlackBuild
index 4707b61005..5f3b0c6c2e 100644
--- a/python/py/py.SlackBuild
+++ b/python/py/py.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=py
-VERSION=${VERSION:-1.4.30}
+VERSION=${VERSION:-1.4.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/py/py.info b/python/py/py.info
index aeda347ae8..b0e127ba11 100644
--- a/python/py/py.info
+++ b/python/py/py.info
@@ -1,8 +1,8 @@
 PRGNAM="py"
-VERSION="1.4.30"
+VERSION="1.4.31"
 HOMEPAGE="http://pylib.readthedocs.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/py/py-1.4.30.tar.gz"
-MD5SUM="a904aabfe4765cb754f2db84ec7bb03a"
+DOWNLOAD="https://pypi.python.org/packages/source/p/py/py-1.4.31.tar.gz"
+MD5SUM="5d2c63c56dc3f2115ec35c066ecd582b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/py3cairo/py3cairo.SlackBuild b/python/py3cairo/py3cairo.SlackBuild
index e18a71a2bc..1645b80d8b 100644
--- a/python/py3cairo/py3cairo.SlackBuild
+++ b/python/py3cairo/py3cairo.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=py3cairo
 SRCNAM=pycairo
 VERSION=${VERSION:-1.10.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,6 +57,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+export PYTHON=python3
+
 set -e
 
 rm -rf $PKG
@@ -73,7 +75,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/pycairo-1.10.0-waf_unpack-1.patch
-wafdir=$(python3 ./waf unpack)
+wafdir=$(./waf unpack)
 pushd $wafdir
 patch -p1 < $CWD/pycairo-1.10.0-waf_python_3_4-1.patch
 popd
@@ -82,7 +84,7 @@ unset wafdir
 PYTHON="/usr/bin/python3" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-python3 ./waf configure \
+./waf configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -90,8 +92,8 @@ python3 ./waf configure \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION
 
-python3 ./waf build
-DESTDIR=$PKG python3 ./waf install
+./waf build
+DESTDIR=$PKG ./waf install
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/python/py3sensors/README b/python/py3sensors/README
index a842715450..18b2c919c1 100644
--- a/python/py3sensors/README
+++ b/python/py3sensors/README
@@ -1,2 +1,2 @@
-Py3sensors provides Python bindings to the libsensors library, which is
+py3sensors provides Python bindings to the libsensors library, which is
 included in the lm_sensors project.
diff --git a/python/py3sensors/py3sensors.SlackBuild b/python/py3sensors/py3sensors.SlackBuild
index cbba493394..4ee9b2de94 100644
--- a/python/py3sensors/py3sensors.SlackBuild
+++ b/python/py3sensors/py3sensors.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for Py3sensors
+# Slackware build script for py3sensors
 
-# Copyright 2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=py3sensors
 SRCNAM=gleb_zhulik-$PRGNAM
 VERSION=${VERSION:-0cf96f4e2cfe}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -48,8 +48,8 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 
-# The upstream tarball will be named differently, depending on the file being
-# downloaded manually (web browser) or with wget.
+# The upstream tarball will be named differently, depending on
+# the file being downloaded manually (web browser) or with wget.
 if [ -e $CWD/$VERSION.zip ]; then
   unzip $CWD/$VERSION.zip
 else
@@ -64,19 +64,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-PRGUSR=$PKG/usr
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-
 python setup.py install --root=$PKG
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+PRGUSR=$PKG/usr
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
+# Install documentation.
 mkdir -p $PRGDOC
 mv README.rst $PRGDOC/
 cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
diff --git a/python/py3sensors/py3sensors.info b/python/py3sensors/py3sensors.info
index fd1ced1050..520283127e 100644
--- a/python/py3sensors/py3sensors.info
+++ b/python/py3sensors/py3sensors.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/python/py3sensors/slack-desc b/python/py3sensors/slack-desc
index e0e6f21fd5..49bd6ad60c 100644
--- a/python/py3sensors/slack-desc
+++ b/python/py3sensors/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-py3sensors: Py3sensors (Python bindings to libsensors.so)
+py3sensors: py3sensors (Python bindings to libsensors.so)
 py3sensors: 
-py3sensors: Py3sensors provides Python bindings to the libsensors library, which
+py3sensors: py3sensors provides Python bindings to the libsensors library, which
 py3sensors: is included in the lm_sensors project.
 py3sensors:
 py3sensors: Homepage: https://bitbucket.org/gleb_zhulik/py3sensors
diff --git a/python/pyPdf/pyPdf.SlackBuild b/python/pyPdf/pyPdf.SlackBuild
index 6b8268988a..8933033457 100644
--- a/python/pyPdf/pyPdf.SlackBuild
+++ b/python/pyPdf/pyPdf.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for pyPdf.
-#
+
 # Copyright 2009-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyPdf
-VERSION=1.13
+VERSION=1.25.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCDIRNAM=PyPDF2
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -40,7 +43,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="PKG-INFO README"
+DOCS="CHANGELOG LICENSE README.md"
 
 set -e
 
@@ -48,8 +51,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $SRCDIRNAM-$VERSION
 
 chown -R root:root .
 find -L . \
diff --git a/python/pyPdf/pyPdf.info b/python/pyPdf/pyPdf.info
index 93fd50c98a..79c1996f06 100644
--- a/python/pyPdf/pyPdf.info
+++ b/python/pyPdf/pyPdf.info
@@ -1,10 +1,10 @@
 PRGNAM="pyPdf"
-VERSION="1.13"
-HOMEPAGE="http://pybrary.net/pyPdf/"
-DOWNLOAD="http://pybrary.net/pyPdf/pyPdf-1.13.tar.gz"
-MD5SUM="7a75ef56f227b78ae62d6e38d4b6b1da"
+VERSION="1.25.1"
+HOMEPAGE="https://mstamy2.github.io/PyPDF2/"
+DOWNLOAD="https://github.com/mstamy2/PyPDF2/archive/v1.25.1.tar.gz"
+MD5SUM="c129a049d6612ea9aa06aac7fe10252b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/pyasn1-modules/pyasn1-modules.SlackBuild b/python/pyasn1-modules/pyasn1-modules.SlackBuild
index 664ab6940b..fd7255f749 100644
--- a/python/pyasn1-modules/pyasn1-modules.SlackBuild
+++ b/python/pyasn1-modules/pyasn1-modules.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for pyasn1-modules.
+# Slackware build script for pyasn1-modules
 
-# Copyright 2014 Markus Reichelt, Stolberg (Rhld.), DE
+# Copyright 2014-2015 Markus Reichelt, Stolberg (Rhld.), DE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=pyasn1-modules
-VERSION=${VERSION:-0.0.5}
+VERSION=${VERSION:-0.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pyasn1-modules/pyasn1-modules.info b/python/pyasn1-modules/pyasn1-modules.info
index ad91bb520c..9663ed03da 100644
--- a/python/pyasn1-modules/pyasn1-modules.info
+++ b/python/pyasn1-modules/pyasn1-modules.info
@@ -1,8 +1,8 @@
 PRGNAM="pyasn1-modules"
-VERSION="0.0.5"
+VERSION="0.0.6"
 HOMEPAGE="https://pypi.python.org/pypi/pyasn1-modules/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyasn1-modules/pyasn1-modules-0.0.5.tar.gz"
-MD5SUM="6c5c9dd61a5784ff22695ac233cb11f8"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyasn1-modules/pyasn1-modules-0.0.6.tar.gz"
+MD5SUM="3b94e7a4999bc7477b76c46c30a56727"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyasn1"
diff --git a/python/pyasn1/pyasn1.SlackBuild b/python/pyasn1/pyasn1.SlackBuild
index cd90dc7bd8..ca7c5cabe0 100644
--- a/python/pyasn1/pyasn1.SlackBuild
+++ b/python/pyasn1/pyasn1.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for pyasn1.
+# Slackware build script for pyasn1
 
-# Copyright 2011-2013  Markus Reichelt, Stolberg (Rhld.), DE
+# Copyright 2011-2015  Markus Reichelt, Stolberg (Rhld.), DE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=pyasn1
-VERSION=${VERSION:-0.1.7}
+VERSION=${VERSION:-0.1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pyasn1/pyasn1.info b/python/pyasn1/pyasn1.info
index 602ba15f04..c5613102de 100644
--- a/python/pyasn1/pyasn1.info
+++ b/python/pyasn1/pyasn1.info
@@ -1,8 +1,8 @@
 PRGNAM="pyasn1"
-VERSION="0.1.7"
+VERSION="0.1.8"
 HOMEPAGE="http://sourceforge.net/projects/pyasn1/"
-DOWNLOAD="http://downloads.sourceforge.net/pyasn1/pyasn1-0.1.7.tar.gz"
-MD5SUM="2cbd80fcd4c7b1c82180d3d76fee18c8"
+DOWNLOAD="http://downloads.sourceforge.net/pyasn1/pyasn1-0.1.8.tar.gz"
+MD5SUM="7f6526f968986a789b1e5e372f0b7065"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pyflakes/pyflakes.SlackBuild b/python/pyflakes/pyflakes.SlackBuild
index 57a14ae3bf..ddea83840c 100644
--- a/python/pyflakes/pyflakes.SlackBuild
+++ b/python/pyflakes/pyflakes.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyflakes
 
-# Copyright 2010-2014 LukenShiro, Italy
+# Copyright 2010-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyflakes
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="PKG-INFO"
+DOCFILES="AUTHORS NEWS.txt LICENSE PKG-INFO README.rst"
 
 set -e
 
diff --git a/python/pyflakes/pyflakes.info b/python/pyflakes/pyflakes.info
index ce534d30a4..1b26882d0a 100644
--- a/python/pyflakes/pyflakes.info
+++ b/python/pyflakes/pyflakes.info
@@ -1,8 +1,8 @@
 PRGNAM="pyflakes"
-VERSION="0.8.1"
-HOMEPAGE="http://www.divmod.org/trac/wiki/DivmodPyflakes"
-DOWNLOAD="http://pypi.python.org/packages/source/p/pyflakes/pyflakes-0.8.1.tar.gz"
-MD5SUM="905fe91ad14b912807e8fdc2ac2e2c23"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/pyflakes/pyflakes"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyflakes/pyflakes-1.0.0.tar.gz"
+MD5SUM="914621d4c9546248419b435dd358eb6a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pyflakes/slack-desc b/python/pyflakes/slack-desc
index f1e3eb67f3..76c04cab36 100644
--- a/python/pyflakes/slack-desc
+++ b/python/pyflakes/slack-desc
@@ -13,7 +13,7 @@ pyflakes: errors. It works by parsing the source file, not importing it, so it
 pyflakes: is safe to use on modules with side effects. It's also much faster
 pyflakes: passive checker of Python programs.
 pyflakes:
-pyflakes: Homepage: http://www.divmod.org/trac/wiki/DivmodPyflakes
+pyflakes:
 pyflakes:
 pyflakes:
 pyflakes:
diff --git a/python/pyglet/pyglet.SlackBuild b/python/pyglet/pyglet.SlackBuild
index 7095b34559..61a141c300 100644
--- a/python/pyglet/pyglet.SlackBuild
+++ b/python/pyglet/pyglet.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyglet
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyglet
-VERSION=${VERSION:-1.2.3}
+VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pyglet/pyglet.info b/python/pyglet/pyglet.info
index 9d1485030f..2faddee65e 100644
--- a/python/pyglet/pyglet.info
+++ b/python/pyglet/pyglet.info
@@ -1,8 +1,8 @@
 PRGNAM="pyglet"
-VERSION="1.2.3"
+VERSION="1.2.4"
 HOMEPAGE="http://pyglet.readthedocs.org/en/pyglet-1.2-maintenance/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyglet/pyglet-1.2.3.tar.gz"
-MD5SUM="7b5e3c8ceae30cc6e6df1f7dc777034a"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyglet/pyglet-1.2.4.tar.gz"
+MD5SUM="ba640b5fea8d670efdd747daa70a529a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/pyinotify/README b/python/pyinotify/README
index 54db578c8f..8d2e7cf339 100644
--- a/python/pyinotify/README
+++ b/python/pyinotify/README
@@ -3,4 +3,9 @@ Pyinotify relies on a Linux Kernel feature (merged in kernel 2.6.13)
 called inotify. inotify is an event-driven notifier, its notifications
 are exported from kernel space to user space through three system calls.
 
-pysetuptools and python3 are optional deps that will be used if present.
+Optional dependencies: pysetuptools and python3
+
+Note: To install python3 bindings pass the variable PYTHON3=yes to the
+slackbuild.
+
+  # PYTHON3=yes ./pyinotify.SlackBuild
diff --git a/python/pyinotify/pyinotify.SlackBuild b/python/pyinotify/pyinotify.SlackBuild
index 40eedd041a..57c60a6744 100644
--- a/python/pyinotify/pyinotify.SlackBuild
+++ b/python/pyinotify/pyinotify.SlackBuild
@@ -2,10 +2,28 @@
 
 # Slackware build script for pyinotify
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2012-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyinotify
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -32,25 +50,25 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Compile the C extension.
 sed -i '/^compile_ext_mod/s|=.*|= True|' setup.py
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import sys' 2>/dev/null); then
+if [ "${PYTHON3:-no}" == "yes" ]; then
   python3 setup.py install --root=$PKG
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ACKS COPYING PKG-INFO README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ACKS COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pyinotify/pyinotify.info b/python/pyinotify/pyinotify.info
index 588c9cbf42..2c7534e470 100644
--- a/python/pyinotify/pyinotify.info
+++ b/python/pyinotify/pyinotify.info
@@ -1,8 +1,8 @@
 PRGNAM="pyinotify"
-VERSION="0.9.4"
+VERSION="0.9.6"
 HOMEPAGE="https://github.com/seb-m/pyinotify"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyinotify/pyinotify-0.9.4.tar.gz"
-MD5SUM="701c91854d241514ede7ffe72086566d"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyinotify/pyinotify-0.9.6.tar.gz"
+MD5SUM="8e580fa1ff3971f94a6f81672b76c406"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pyliblo/README b/python/pyliblo/README
index b7f0b19d22..b755232141 100644
--- a/python/pyliblo/README
+++ b/python/pyliblo/README
@@ -5,3 +5,7 @@ supports almost the complete functionality of liblo, allowing you to
 send and receive OSC messages using a nice and simple Python API.
 
 Also included are the command line utilities send_osc and dump_osc.
+
+If you're upgrading from an older pyliblo version and you get 'compilation
+terminated due to -Wfatal-errors', check your installed version of liblo:
+for pyliblo-0.10.0 and up, you need liblo-0.28 or greater.
diff --git a/python/pyliblo/pyliblo.SlackBuild b/python/pyliblo/pyliblo.SlackBuild
index 327d9f013d..858bbbc3f5 100644
--- a/python/pyliblo/pyliblo.SlackBuild
+++ b/python/pyliblo/pyliblo.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=pyliblo
-VERSION=${VERSION:-0.9.1}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pyliblo/pyliblo.info b/python/pyliblo/pyliblo.info
index f418f36921..f28e9267d4 100644
--- a/python/pyliblo/pyliblo.info
+++ b/python/pyliblo/pyliblo.info
@@ -1,10 +1,10 @@
 PRGNAM="pyliblo"
-VERSION="0.9.1"
+VERSION="0.10.0"
 HOMEPAGE="http://das.nasophon.de/pyliblo/"
-DOWNLOAD="http://das.nasophon.de/download/pyliblo-0.9.1.tar.gz"
-MD5SUM="eb2b2b86031b702eba8e65da75fbaacc"
+DOWNLOAD="http://das.nasophon.de/download/pyliblo-0.10.0.tar.gz"
+MD5SUM="1be68794dedaf8cc60748fe94fdb9628"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="liblo"
+REQUIRES="liblo Cython"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/python/pymysql/README b/python/pymysql/README
index f59d6db989..f753b73b04 100644
--- a/python/pymysql/README
+++ b/python/pymysql/README
@@ -1,3 +1,9 @@
 This package contains a pure-Python MySQL client library. The goal of PyMySQL is
 to be a drop-in replacement for MySQLdb and work on CPython, PyPy, IronPython
 and Jython.
+
+Optional dependency: python3
+
+To install python3 bindings run slackbuild with option PYTHON3=yes.
+
+  # PYTHON3=yes ./pymysql.SlackBuild
diff --git a/python/pymysql/pymysql.SlackBuild b/python/pymysql/pymysql.SlackBuild
index e497f1b928..2ee2a77421 100644
--- a/python/pymysql/pymysql.SlackBuild
+++ b/python/pymysql/pymysql.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pymysql
 
-# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pymysql
-VERSION=${VERSION:-0.6.2}
+SRCNAM=PyMySQL
+VERSION=${VERSION:-0.6.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,21 +46,26 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf PyMySQL-$PRGNAM-$VERSION
-tar xvf $CWD/PyMySQL-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd PyMySQL-$PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Don't install tests.
 rm -rf $PRGNAM/tests
 
 python setup.py install --root=$PKG
 
+# Install python3 bindings. Default is no.
+if [ "${PYTHON3:-no}" == "yes" ]; then
+  python3 setup.py install --root=$PKG
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/python/pymysql/pymysql.info b/python/pymysql/pymysql.info
index 98939a3db6..647106e8ee 100644
--- a/python/pymysql/pymysql.info
+++ b/python/pymysql/pymysql.info
@@ -1,8 +1,8 @@
 PRGNAM="pymysql"
-VERSION="0.6.2"
+VERSION="0.6.7"
 HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-DOWNLOAD="https://github.com/PyMySQL/PyMySQL/archive/pymysql-0.6.2.tar.gz"
-MD5SUM="d16b0b4b1fe5a5c397525da4bc8a3e46"
+DOWNLOAD="https://github.com/PyMySQL/PyMySQL/archive/0.6.7.tar.gz"
+MD5SUM="102a1250c414330f65d9982fbca6db76"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/pyperclip/README b/python/pyperclip/README
new file mode 100644
index 0000000000..f24b18ae6a
--- /dev/null
+++ b/python/pyperclip/README
@@ -0,0 +1,16 @@
+Pyperclip is a cross-platform Python module for copy and paste clipboard
+functions. It works with Python 2 and 3.  It currently only handles
+plaintext.
+
+Example Usage:
+
+>>> import pyperclip
+>>> pyperclip.copy('The text to be copied to the clipboard.')
+>>> pyperclip.paste()
+'The text to be copied to the clipboard.'
+
+PDF documentation included in /usr/doc/pyperclip-$VERSION
+
+Optional Dependencies:
+- xclip
+- xsel
diff --git a/python/pyperclip/pyperclip-1.5-doc.pdf b/python/pyperclip/pyperclip-1.5-doc.pdf
new file mode 100644
index 0000000000..99f743118e
--- /dev/null
+++ b/python/pyperclip/pyperclip-1.5-doc.pdf
diff --git a/python/pyperclip/pyperclip.SlackBuild b/python/pyperclip/pyperclip.SlackBuild
new file mode 100644
index 0000000000..2b7cac0b17
--- /dev/null
+++ b/python/pyperclip/pyperclip.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for pyperclip
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Maintainer Notes:
+# PDF Documentation downloaded from pyperclip.readthedocs.org 12/1/2015
+
+PRGNAM=pyperclip
+VERSION=${VERSION:-1.5.25}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp $CWD/pyperclip-1.5-doc.pdf PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pyperclip/pyperclip.info b/python/pyperclip/pyperclip.info
new file mode 100644
index 0000000000..e1aa88f53f
--- /dev/null
+++ b/python/pyperclip/pyperclip.info
@@ -0,0 +1,10 @@
+PRGNAM="pyperclip"
+VERSION="1.5.25"
+HOMEPAGE="https://github.com/asweigart/pyperclip"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyperclip/pyperclip-1.5.25.zip"
+MD5SUM="344e45b6eae6df72fe768b0baae03fc8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/pyperclip/slack-desc b/python/pyperclip/slack-desc
new file mode 100644
index 0000000000..67f2cd5e6c
--- /dev/null
+++ b/python/pyperclip/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pyperclip: pyperclip (Python copy and paste clipboard functions)
+pyperclip:
+pyperclip: Pyperclip is a cross-platform Python module for copy and paste
+pyperclip: clipboard functions. It works with Python 2 and 3.
+pyperclip:
+pyperclip: Home page:  https://github.com/asweigart/pyperclip
+pyperclip:
+pyperclip:
+pyperclip:
+pyperclip:
+pyperclip:
diff --git a/python/pypy/pypy.SlackBuild b/python/pypy/pypy.SlackBuild
index d54430b2e2..09a1590d82 100644
--- a/python/pypy/pypy.SlackBuild
+++ b/python/pypy/pypy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pypy
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pypy/pypy.info b/python/pypy/pypy.info
index 3e56bd62ca..5faa490b16 100644
--- a/python/pypy/pypy.info
+++ b/python/pypy/pypy.info
@@ -1,10 +1,10 @@
 PRGNAM="pypy"
-VERSION="2.6"
+VERSION="2.6.1"
 HOMEPAGE="http://pypy.org/"
-DOWNLOAD="https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6-linux_i686-portable.tar.bz2"
-MD5SUM="f41f8dda1967853612d92002f539848a"
-DOWNLOAD_x86_64="https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6-linux_x86_64-portable.tar.bz2"
-MD5SUM_x86_64="900be4fb348cf2acb0da90ada46348f2"
+DOWNLOAD="https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6.1-linux_i686-portable.tar.bz2"
+MD5SUM="d58ebc8eeb4506e8512c3f3ebaadf7f5"
+DOWNLOAD_x86_64="https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-2.6.1-linux_x86_64-portable.tar.bz2"
+MD5SUM_x86_64="5716cc4ac31b7fb32cf271c6400cf8a5"
 REQUIRES=""
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/python/pyrfc3339/README b/python/pyrfc3339/README
new file mode 100644
index 0000000000..08ec990257
--- /dev/null
+++ b/python/pyrfc3339/README
@@ -0,0 +1,2 @@
+pyRFC3339 parses and generates RFC 3339-compliant timestamps using
+Python datetime.datetime objects.
diff --git a/python/pyrfc3339/pyrfc3339.SlackBuild b/python/pyrfc3339/pyrfc3339.SlackBuild
new file mode 100644
index 0000000000..9fd84f1c50
--- /dev/null
+++ b/python/pyrfc3339/pyrfc3339.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for pyrfc3339
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pyrfc3339
+SRCNAM=pyRFC3339
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst *.txt PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/pyrfc3339/pyrfc3339.info b/python/pyrfc3339/pyrfc3339.info
new file mode 100644
index 0000000000..16aa240b07
--- /dev/null
+++ b/python/pyrfc3339/pyrfc3339.info
@@ -0,0 +1,10 @@
+PRGNAM="pyrfc3339"
+VERSION="1.0"
+HOMEPAGE="https://pypi.python.org/pypi/pyRFC3339"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyRFC3339/pyRFC3339-1.0.tar.gz"
+MD5SUM="0f7edd7ffd756a582eeef9282fecb60d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/python/pyrfc3339/slack-desc b/python/pyrfc3339/slack-desc
new file mode 100644
index 0000000000..9beb5e4ac5
--- /dev/null
+++ b/python/pyrfc3339/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pyrfc3339: pyrfc3339 (Python module)
+pyrfc3339:
+pyrfc3339: pyRFC3339 parses and generates RFC 3339-compliant timestamps using
+pyrfc3339: Python datetime.datetime objects.
+pyrfc3339:
+pyrfc3339:
+pyrfc3339:
+pyrfc3339:
+pyrfc3339: Project URL: https://pypi.python.org/pypi/pyRFC3339
+pyrfc3339:
+pyrfc3339:
diff --git a/python/pysed/pysed.SlackBuild b/python/pysed/pysed.SlackBuild
index f729f494ce..52f395cd02 100644
--- a/python/pysed/pysed.SlackBuild
+++ b/python/pysed/pysed.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/pysed/pysed.info b/python/pysed/pysed.info
index 644eccf24e..c66db8532e 100644
--- a/python/pysed/pysed.info
+++ b/python/pysed/pysed.info
@@ -1,8 +1,8 @@
 PRGNAM="pysed"
 VERSION="0.7.8"
 HOMEPAGE="https://github.com/dslackw/pysed"
-DOWNLOAD="http://sourceforge.net/projects/python-sed/files/pysed-0.7.8/pysed-0.7.8.tar.gz"
-MD5SUM="daee87677454961e7eb0ee523b9338f5"
+DOWNLOAD="https://github.com/dslackw/pysed/archive/v0.7.8.tar.gz"
+MD5SUM="ae638228eb1f101beca70b397e6e4ed7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pysetuptools/pysetuptools.SlackBuild b/python/pysetuptools/pysetuptools.SlackBuild
index 30a0080ec2..0ffafc259e 100644
--- a/python/pysetuptools/pysetuptools.SlackBuild
+++ b/python/pysetuptools/pysetuptools.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pysetuptools
-VERSION=${VERSION:-18.0.1}
+VERSION=${VERSION:-18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/pysetuptools/pysetuptools.info b/python/pysetuptools/pysetuptools.info
index fcb0ce71c6..c459daab00 100644
--- a/python/pysetuptools/pysetuptools.info
+++ b/python/pysetuptools/pysetuptools.info
@@ -1,8 +1,8 @@
 PRGNAM="pysetuptools"
-VERSION="18.0.1"
+VERSION="18.2"
 HOMEPAGE="https://pypi.python.org/pypi/setuptools"
-DOWNLOAD="https://pypi.python.org/packages/source/s/setuptools/setuptools-18.0.1.tar.gz"
-MD5SUM="cecd172c9ff7fd5f2e16b2fcc88bba51"
+DOWNLOAD="https://pypi.python.org/packages/source/s/setuptools/setuptools-18.2.tar.gz"
+MD5SUM="52b4e48939ef311d7204f8fe940764f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/pytables/pytables.SlackBuild b/python/pytables/pytables.SlackBuild
index f9443f4938..08f02e5c9b 100644
--- a/python/pytables/pytables.SlackBuild
+++ b/python/pytables/pytables.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pytables
 
-# Copyright 2007-2014  LukenShiro, Italy
+# Copyright 2007-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pytables
-VERSION=${VERSION:-3.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,8 +41,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SRC_PRGNAM=tables
-DOCFILES="RELEASE_NOTES.txt LICENSES/ THANKS ANNOUNCE.txt LICENSE.txt \
-  PKG-INFO README.txt doc/html doc/scripts"
+DOCFILES="ANNOUNCE.txt LICENSE.txt LICENSES/ PKG-INFO README.rst \
+          RELEASE_NOTES.txt THANKS doc/html doc/scripts"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
diff --git a/python/pytables/pytables.info b/python/pytables/pytables.info
index 45103f3483..5320f07c30 100644
--- a/python/pytables/pytables.info
+++ b/python/pytables/pytables.info
@@ -1,8 +1,8 @@
 PRGNAM="pytables"
-VERSION="3.1.1"
-HOMEPAGE="http://www.pytables.org/moin"
-DOWNLOAD="http://downloads.sourceforge.net/pytables/tables-3.1.1.tar.gz"
-MD5SUM="38d917f0c6dfb0bc28ce9ea0c3492524"
+VERSION="3.2.0"
+HOMEPAGE="http://www.pytables.org"
+DOWNLOAD="http://downloads.sourceforge.net/pytables/tables-3.2.0.tar.gz"
+MD5SUM="339a2225ee814a6899cb14e7ba28c081"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Cython hdf5 numexpr"
diff --git a/python/pytest-cov/pytest-cov.SlackBuild b/python/pytest-cov/pytest-cov.SlackBuild
index 7d1a366f7c..92a6d5a691 100644
--- a/python/pytest-cov/pytest-cov.SlackBuild
+++ b/python/pytest-cov/pytest-cov.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pytest-cov
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pytest-cov
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pytest-cov/pytest-cov.info b/python/pytest-cov/pytest-cov.info
index 813522593d..88ac966cd2 100644
--- a/python/pytest-cov/pytest-cov.info
+++ b/python/pytest-cov/pytest-cov.info
@@ -1,8 +1,8 @@
 PRGNAM="pytest-cov"
-VERSION="1.8.1"
+VERSION="2.0.0"
 HOMEPAGE="https://github.com/schlamar/pytest-cov"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pytest-cov/pytest-cov-1.8.1.tar.gz"
-MD5SUM="76c778afa2494088270348be42d759fc"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pytest-cov/pytest-cov-2.0.0.tar.gz"
+MD5SUM="c6520aefe1e9d15fde08348e32d738b9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pytest cov-core"
diff --git a/python/pytest/pytest.SlackBuild b/python/pytest/pytest.SlackBuild
index c7f7ce48e2..3ac70e7e9a 100644
--- a/python/pytest/pytest.SlackBuild
+++ b/python/pytest/pytest.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pytest
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pytest
-VERSION=${VERSION:-2.7.2}
+VERSION=${VERSION:-2.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+unzip $CWD/$PRGNAM-$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,16 +71,11 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import sys' 2>/dev/null); then
-     python3 setup.py install --root=$PKG
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG LICENSE PKG-INFO README.rst doc/en/*.txt doc/en/example/ \
-	$PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/pytest/pytest.info b/python/pytest/pytest.info
index dd59a52af8..96b4f82397 100644
--- a/python/pytest/pytest.info
+++ b/python/pytest/pytest.info
@@ -1,8 +1,8 @@
 PRGNAM="pytest"
-VERSION="2.7.2"
+VERSION="2.8.5"
 HOMEPAGE="http://pytest.org"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pytest/pytest-2.7.2.tar.gz"
-MD5SUM="dcd8e891474d605b81fc7fcc8711e95b"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pytest/pytest-2.8.5.tar.gz"
+MD5SUM="8493b06f700862f1294298d6c1b715a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="py"
diff --git a/python/python-augeas/README b/python/python-augeas/README
new file mode 100644
index 0000000000..be2148f528
--- /dev/null
+++ b/python/python-augeas/README
@@ -0,0 +1 @@
+Pure python bindings for augeas
diff --git a/python/python-augeas/python-augeas.SlackBuild b/python/python-augeas/python-augeas.SlackBuild
new file mode 100644
index 0000000000..7f99d47d1a
--- /dev/null
+++ b/python/python-augeas/python-augeas.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for python-augeas
+
+# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-augeas
+VERSION=${VERSION:-0.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-augeas/python-augeas.info b/python/python-augeas/python-augeas.info
new file mode 100644
index 0000000000..67a1efd58f
--- /dev/null
+++ b/python/python-augeas/python-augeas.info
@@ -0,0 +1,10 @@
+PRGNAM="python-augeas"
+VERSION="0.5.0"
+HOMEPAGE="http://augeas.net/"
+DOWNLOAD="https://fedorahosted.org/released/python-augeas/python-augeas-0.5.0.tar.gz"
+MD5SUM="2d5a903467410b8d60abca5fa54bae2d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="augeas"
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/python/python-augeas/slack-desc b/python/python-augeas/slack-desc
new file mode 100644
index 0000000000..a13a81fb23
--- /dev/null
+++ b/python/python-augeas/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+python-augeas: python-augeas (Python bindings for augeas)
+python-augeas:
+python-augeas: Pure python bindings for augeas
+python-augeas:
+python-augeas: Homepage: http://augeas.net/
+python-augeas:
+python-augeas:
+python-augeas:
+python-augeas:
+python-augeas:
+python-augeas:
diff --git a/python/python-certifi/python-certifi.SlackBuild b/python/python-certifi/python-certifi.SlackBuild
index 8befa77bba..3303db4f65 100644
--- a/python/python-certifi/python-certifi.SlackBuild
+++ b/python/python-certifi/python-certifi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-certifi
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-certifi
 SRCNAM=certifi
-VERSION=${VERSION:-2015.04.28}
+VERSION=${VERSION:-2015.11.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-certifi/python-certifi.info b/python/python-certifi/python-certifi.info
index 4e35b58576..38223eabee 100644
--- a/python/python-certifi/python-certifi.info
+++ b/python/python-certifi/python-certifi.info
@@ -1,8 +1,8 @@
 PRGNAM="python-certifi"
-VERSION="2015.04.28"
+VERSION="2015.11.20.1"
 HOMEPAGE="http://certifi.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz"
-MD5SUM="12c7c3a063b2ff97a0f8291d8de41e8c"
+DOWNLOAD="https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.1.tar.gz"
+MD5SUM="e04b512009401603f1485380ac879cf5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/python-clamd/README b/python/python-clamd/README
new file mode 100644
index 0000000000..20223a615c
--- /dev/null
+++ b/python/python-clamd/README
@@ -0,0 +1,7 @@
+clamd is a portable Python module to use the ClamAV anti-virus engine on
+Windows, Linux, MacOSX and other platforms. It requires a running
+instance of the clamd daemon.
+
+*NOTE*
+Make sure that the Clamav daemon is running and that freshclam
+has been ran to use this python module.
diff --git a/python/python-clamd/clamd-socket-file-name.patch b/python/python-clamd/clamd-socket-file-name.patch
new file mode 100644
index 0000000000..76611cd036
--- /dev/null
+++ b/python/python-clamd/clamd-socket-file-name.patch
@@ -0,0 +1,14 @@
+
+Fixes the clamd socket file name
+
+--- clamd-1.0.2.orig/src/clamd/__init__.py	2015-11-12 20:33:36.923228615 -0700
++++ clamd-1.0.2/src/clamd/__init__.py	2015-11-12 20:34:37.925224478 -0700
+@@ -274,7 +274,7 @@
+     """
+     Class for using clamd with an unix socket
+     """
+-    def __init__(self, path="/var/run/clamav/clamd.ctl", timeout=None):
++    def __init__(self, path="/var/run/clamav/clamd.socket", timeout=None):
+         """
+         class initialisation
+ 
diff --git a/python/python-clamd/python-clamd.SlackBuild b/python/python-clamd/python-clamd.SlackBuild
new file mode 100644
index 0000000000..be47efae6c
--- /dev/null
+++ b/python/python-clamd/python-clamd.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for python-clamd
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-clamd
+SRCNAM=clamd
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fixes the clamd socket file name for Slackware
+patch -p1 --verbose < $CWD/clamd-socket-file-name.patch
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.rst PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-clamd/python-clamd.info b/python/python-clamd/python-clamd.info
new file mode 100644
index 0000000000..4fbc481272
--- /dev/null
+++ b/python/python-clamd/python-clamd.info
@@ -0,0 +1,10 @@
+PRGNAM="python-clamd"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/graingert/python-clamd"
+DOWNLOAD="https://pypi.python.org/packages/source/c/clamd/clamd-1.0.2.tar.gz"
+MD5SUM="637f1d44a60a511544b6bd0bcb817f8a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="clamav pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-clamd/slack-desc b/python/python-clamd/slack-desc
new file mode 100644
index 0000000000..9fbc535e9e
--- /dev/null
+++ b/python/python-clamd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+python-clamd: python-clamd (python interface to Clamav)
+python-clamd:
+python-clamd: clamd is a portable Python module to use the ClamAV
+python-clamd: anti-virus engine on Windows, Linux, MacOSX and other
+python-clamd: platforms. It requires a running instance of the
+python-clamd: clamd daemon.
+python-clamd:
+python-clamd:
+python-clamd: Web Site:  https://github.com/graingert/python-clamd
+python-clamd:
+python-clamd:
diff --git a/python/python-configargparse/README b/python/python-configargparse/README
new file mode 100644
index 0000000000..2d7e00f0db
--- /dev/null
+++ b/python/python-configargparse/README
@@ -0,0 +1,2 @@
+A drop-in replacement for argparse that allows options to also be set
+via config files and/or environment variables
diff --git a/python/python-configargparse/python-configargparse.SlackBuild b/python/python-configargparse/python-configargparse.SlackBuild
new file mode 100644
index 0000000000..2adb393193
--- /dev/null
+++ b/python/python-configargparse/python-configargparse.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-configargparse
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-configargparse
+SRCNAM=ConfigArgParse
+VERSION=${VERSION:-0.10.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-configargparse/python-configargparse.info b/python/python-configargparse/python-configargparse.info
new file mode 100644
index 0000000000..f91b77c2b6
--- /dev/null
+++ b/python/python-configargparse/python-configargparse.info
@@ -0,0 +1,10 @@
+PRGNAM="python-configargparse"
+VERSION="0.10.0"
+HOMEPAGE="https://github.com/bw2/ConfigArgParse"
+DOWNLOAD="https://github.com/bw2/ConfigArgParse/archive/0.10.0.tar.gz"
+MD5SUM="be99c22bd70b34592af69a72f9c13bab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/python/python-configargparse/slack-desc b/python/python-configargparse/slack-desc
new file mode 100644
index 0000000000..985c824b43
--- /dev/null
+++ b/python/python-configargparse/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+python-configargparse: python-configargparse (Python module)
+python-configargparse:
+python-configargparse: A drop-in replacement for argparse that allows options to also be set
+python-configargparse: via config files and/or environment variables
+python-configargparse:
+python-configargparse:
+python-configargparse:
+python-configargparse:
+python-configargparse: Project URL: https://github.com/bw2/ConfigArgParse
+python-configargparse:
+python-configargparse:
diff --git a/python/python-dateutil/python-dateutil.SlackBuild b/python/python-dateutil/python-dateutil.SlackBuild
index f38d57e088..29833449ff 100644
--- a/python/python-dateutil/python-dateutil.SlackBuild
+++ b/python/python-dateutil/python-dateutil.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-dateutil
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,7 +46,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -57,8 +57,7 @@ find -L . \
 
 # Fix end-of-line encoding.
 for i in NEWS PKG-INFO python_dateutil.egg-info/{zip-safe,PKG-INFO}; do
-  cp $i ${i}.new
-  sed -i 's/\r//' ${i}.new
+  sed -e 's/\r//' $i > ${i}.new
   touch -r $i ${i}.new
   mv ${i}.new $i
 done
diff --git a/python/python-dateutil/python-dateutil.info b/python/python-dateutil/python-dateutil.info
index 4c1257f928..fd8520193f 100644
--- a/python/python-dateutil/python-dateutil.info
+++ b/python/python-dateutil/python-dateutil.info
@@ -1,8 +1,8 @@
 PRGNAM="python-dateutil"
-VERSION="2.4.1"
+VERSION="2.4.2"
 HOMEPAGE="http://labix.org/python-dateutil"
-DOWNLOAD="http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.4.1.tar.bz2"
-MD5SUM="6603c54f37cace901157e2ec2443e96b"
+DOWNLOAD="http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.4.2.tar.gz"
+MD5SUM="4ef68e1c485b09e9f034e10473e5add2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools six"
diff --git a/python/python-esmre/README b/python/python-esmre/README
new file mode 100644
index 0000000000..354017ebc2
--- /dev/null
+++ b/python/python-esmre/README
@@ -0,0 +1,2 @@
+Modules used to accelerate execution of a large collection of regular
+expressions using the Aho-Corasick algorithms.
diff --git a/python/python-esmre/python-esmre.SlackBuild b/python/python-esmre/python-esmre.SlackBuild
new file mode 100644
index 0000000000..b8c9017f38
--- /dev/null
+++ b/python/python-esmre/python-esmre.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-esmre
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-esmre
+SRCNAM=esmre
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL PKG-INFO README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-esmre/python-esmre.info b/python/python-esmre/python-esmre.info
new file mode 100644
index 0000000000..e11f58e4f9
--- /dev/null
+++ b/python/python-esmre/python-esmre.info
@@ -0,0 +1,10 @@
+PRGNAM="python-esmre"
+VERSION="0.3.1"
+HOMEPAGE="https://code.google.com/p/esmre/"
+DOWNLOAD="https://pypi.python.org/packages/source/e/esmre/esmre-0.3.1.tar.gz"
+MD5SUM="95ace12bac0c79cf95712336489bc4a4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-esmre/slack-desc b/python/python-esmre/slack-desc
new file mode 100644
index 0000000000..6acfc44460
--- /dev/null
+++ b/python/python-esmre/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+python-esmre: python-esmre (Regular expression accelerator)
+python-esmre:
+python-esmre: Modules used to accelerate execution of a large collection
+python-esmre: of regular expressions using the Aho-Corasick algorithms.
+python-esmre:
+python-esmre: Home page:  https://code.google.com/p/esmre/
+python-esmre:
+python-esmre:
+python-esmre:
+python-esmre:
+python-esmre:
diff --git a/python/python-future/python-future.SlackBuild b/python/python-future/python-future.SlackBuild
index 92664b4b56..a0799b6276 100644
--- a/python/python-future/python-future.SlackBuild
+++ b/python/python-future/python-future.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-future
 SRCNAM=$(echo $PRGNAM | cut -c8-13)
-VERSION=${VERSION:-0.15.0}
+VERSION=${VERSION:-0.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-future/python-future.info b/python/python-future/python-future.info
index f08e8a19f6..7b58a35fd0 100644
--- a/python/python-future/python-future.info
+++ b/python/python-future/python-future.info
@@ -1,8 +1,8 @@
 PRGNAM="python-future"
-VERSION="0.15.0"
+VERSION="0.15.2"
 HOMEPAGE="https://github.com/PythonCharmers/python-future"
-DOWNLOAD="https://pypi.python.org/packages/source/f/future/future-0.15.0.tar.gz"
-MD5SUM="cf1ee211567cc0b1021de5839064fe7b"
+DOWNLOAD="https://pypi.python.org/packages/source/f/future/future-0.15.2.tar.gz"
+MD5SUM="a68eb3c90b3b76714c5ceb8c09ea3a06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-futures/README b/python/python-futures/README
new file mode 100644
index 0000000000..6d34208749
--- /dev/null
+++ b/python/python-futures/README
@@ -0,0 +1,3 @@
+Backport of the concurrent.futures package to Python 2.6 and 2.7.
+The concurrent.futures module provides a high-level interface for
+asynchronously executing callables.
diff --git a/python/python-futures/python-futures.SlackBuild b/python/python-futures/python-futures.SlackBuild
new file mode 100644
index 0000000000..eb9da7d282
--- /dev/null
+++ b/python/python-futures/python-futures.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for python-futures
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-futures
+SRCNAM=futures
+VERSION=${VERSION:-3.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Add link to online documentation
+cat > $PKG/usr/doc/$PRGNAM-$VERSION/DOCS <<EOF
+Documentation:  https://pythonhosted.org/futures/
+EOF
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-futures/python-futures.info b/python/python-futures/python-futures.info
new file mode 100644
index 0000000000..a66d90cd16
--- /dev/null
+++ b/python/python-futures/python-futures.info
@@ -0,0 +1,10 @@
+PRGNAM="python-futures"
+VERSION="3.0.3"
+HOMEPAGE="https://github.com/agronholm/pythonfutures"
+DOWNLOAD="https://pypi.python.org/packages/source/f/futures/futures-3.0.3.tar.gz"
+MD5SUM="32171f72af7e80c266310794adc4db46"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-futures/slack-desc b/python/python-futures/slack-desc
new file mode 100644
index 0000000000..d602cdd945
--- /dev/null
+++ b/python/python-futures/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python-futures: python-futures (Backport of the concurrent.futures package)
+python-futures:
+python-futures: Backport of the concurrent.futures package to Python 2.6
+python-futures: and 2.7.  The concurrent.futures module provides a high-level
+python-futures: interface for asynchronously executing callables.
+python-futures:
+python-futures: Home page:  https://github.com/agronholm/pythonfutures
+python-futures:
+python-futures:
+python-futures:
+python-futures:
diff --git a/python/python-keyczar/README b/python/python-keyczar/README
index 01b7e97aa4..2c001c051c 100644
--- a/python/python-keyczar/README
+++ b/python/python-keyczar/README
@@ -1,3 +1,5 @@
 Keyczar is an open source cryptographic toolkit designed to make it easier and
 safer for developers to use cryptography in their applications. Keyczar supports
 authentication and encryption with both symmetric and asymmetric keys.
+
+Optional dependency: simplejson
diff --git a/python/python-keyczar/python-keyczar.SlackBuild b/python/python-keyczar/python-keyczar.SlackBuild
index 5f15fac919..27d26054e3 100644
--- a/python/python-keyczar/python-keyczar.SlackBuild
+++ b/python/python-keyczar/python-keyczar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-keyczar
 
-# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-keyczar
-VERSION=${VERSION:-0.71c}
+VERSION=${VERSION:-0.715}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,7 +53,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 rm -rf ${PRGNAM/-/_}.egg-info
 
diff --git a/python/python-keyczar/python-keyczar.info b/python/python-keyczar/python-keyczar.info
index f2d50d464a..26c377e9ea 100644
--- a/python/python-keyczar/python-keyczar.info
+++ b/python/python-keyczar/python-keyczar.info
@@ -1,8 +1,8 @@
 PRGNAM="python-keyczar"
-VERSION="0.71c"
+VERSION="0.715"
 HOMEPAGE="http://www.keyczar.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.71c.tar.gz"
-MD5SUM="e7483709eb95aac46f441f84f4ae8780"
+DOWNLOAD="https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.715.tar.gz"
+MD5SUM="bdb47448f622fdfea7851327a5f20476"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools pyasn1 pycrypto"
diff --git a/python/python-keyring/README b/python/python-keyring/README
new file mode 100644
index 0000000000..5935c016f6
--- /dev/null
+++ b/python/python-keyring/README
@@ -0,0 +1,3 @@
+The Python keyring lib provides a easy way to access the 
+system keyring service from python. It can be used in any 
+application that needs safe password storage.
diff --git a/python/python-keyring/python-keyring.SlackBuild b/python/python-keyring/python-keyring.SlackBuild
new file mode 100644
index 0000000000..ed144f4921
--- /dev/null
+++ b/python/python-keyring/python-keyring.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for keyring
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-keyring
+SRCNAM=$(echo $PRGNAM | cut -c8-14)
+VERSION=${VERSION:-5.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst CHANGES.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-keyring/python-keyring.info b/python/python-keyring/python-keyring.info
new file mode 100644
index 0000000000..3452912c0e
--- /dev/null
+++ b/python/python-keyring/python-keyring.info
@@ -0,0 +1,10 @@
+PRGNAM="python-keyring"
+VERSION="5.4"
+HOMEPAGE="https://bitbucket.org/kang/python-keyring-lib"
+DOWNLOAD="https://pypi.python.org/packages/source/k/keyring/keyring-5.4.tar.gz"
+MD5SUM="ed60cc006c1bc629bf92e100cca952ea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-keyring/slack-desc b/python/python-keyring/slack-desc
new file mode 100644
index 0000000000..ae136fec28
--- /dev/null
+++ b/python/python-keyring/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python-keyring: python-keyring (Python keyring library)
+python-keyring:
+python-keyring: The Python keyring lib provides a easy way to access the system
+python-keyring: keyring service from python. It can be used in any application
+python-keyring: that needs safe password storage.
+python-keyring:
+python-keyring: Homepage: https://bitbucket.org/kang/python-keyring-lib
+python-keyring:
+python-keyring:
+python-keyring:
+python-keyring:
diff --git a/python/python-keyutils/README b/python/python-keyutils/README
new file mode 100644
index 0000000000..4ec1441822
--- /dev/null
+++ b/python/python-keyutils/README
@@ -0,0 +1,5 @@
+python-keyutils is a set of python bindings for keyutils 
+(available from http://people.redhat.com/~dhowells/keyutils), 
+a key management suite that leverages the infrastructure 
+provided by the Linux kernel for safely storing and retrieving 
+sensitive infromation in your programs.
diff --git a/python/python-keyutils/python-keyutils.SlackBuild b/python/python-keyutils/python-keyutils.SlackBuild
new file mode 100644
index 0000000000..cd0df99fda
--- /dev/null
+++ b/python/python-keyutils/python-keyutils.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-keyutils
+
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-keyutils
+SRCNAM=$(echo $PRGNAM | cut -c8-15)
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst ChangeLog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-keyutils/python-keyutils.info b/python/python-keyutils/python-keyutils.info
new file mode 100644
index 0000000000..7f50fc1870
--- /dev/null
+++ b/python/python-keyutils/python-keyutils.info
@@ -0,0 +1,10 @@
+PRGNAM="python-keyutils"
+VERSION="0.3"
+HOMEPAGE="https://github.com/sassoftware/python-keyutils"
+DOWNLOAD="https://pypi.python.org/packages/source/k/keyutils/keyutils-0.3.tar.gz"
+MD5SUM="c3bf5836b3c7ee89170b2fa3886963b1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-keyutils/slack-desc b/python/python-keyutils/slack-desc
new file mode 100644
index 0000000000..2540e2d88d
--- /dev/null
+++ b/python/python-keyutils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python-keyutils: python-keyutils (keyutils bindings for Python)
+python-keyutils:
+python-keyutils: python-keyutils is a set of python bindings for keyutils a key
+python-keyutils: management suite that leverages the infrastructure provided by
+python-keyutils: the Linux kernel for safely storing and retrieving sensitive
+python-keyutils: infromation in your programs.
+python-keyutils:
+python-keyutils: Homepage: https://github.com/sassoftware/python-keyutils
+python-keyutils:
+python-keyutils:
+python-keyutils:
diff --git a/python/python-lazy-object-proxy/README b/python/python-lazy-object-proxy/README
new file mode 100644
index 0000000000..3cc4c3db0b
--- /dev/null
+++ b/python/python-lazy-object-proxy/README
@@ -0,0 +1 @@
+A fast and thorough lazy object proxy.
diff --git a/python/python-lazy-object-proxy/python-lazy-object-proxy.SlackBuild b/python/python-lazy-object-proxy/python-lazy-object-proxy.SlackBuild
new file mode 100644
index 0000000000..df5046a65e
--- /dev/null
+++ b/python/python-lazy-object-proxy/python-lazy-object-proxy.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-lazy-object-proxy
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-lazy-object-proxy
+SRCNAM=$(echo $PRGNAM | cut -c8-24)
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst CHANGELOG.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-lazy-object-proxy/python-lazy-object-proxy.info b/python/python-lazy-object-proxy/python-lazy-object-proxy.info
new file mode 100644
index 0000000000..7ee1c96638
--- /dev/null
+++ b/python/python-lazy-object-proxy/python-lazy-object-proxy.info
@@ -0,0 +1,10 @@
+PRGNAM="python-lazy-object-proxy"
+VERSION="1.2.1"
+HOMEPAGE="https://github.com/ionelmc/python-lazy-object-proxy"
+DOWNLOAD="https://pypi.python.org/packages/source/l/lazy-object-proxy/lazy-object-proxy-1.2.1.tar.gz"
+MD5SUM="ad33e3e06d24786f708b72cc23350afa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-lazy-object-proxy/slack-desc b/python/python-lazy-object-proxy/slack-desc
new file mode 100644
index 0000000000..00e813c3e5
--- /dev/null
+++ b/python/python-lazy-object-proxy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                        |-----handy-ruler------------------------------------------------------|
+python-lazy-object-proxy: python-lazy-object-proxy (Python lazy object proxy)
+python-lazy-object-proxy:
+python-lazy-object-proxy: A fast and thorough lazy object proxy.
+python-lazy-object-proxy:
+python-lazy-object-proxy: Homepage: https://github.com/ionelmc/python-lazy-object-proxy
+python-lazy-object-proxy:
+python-lazy-object-proxy:
+python-lazy-object-proxy:
+python-lazy-object-proxy:
+python-lazy-object-proxy:
+python-lazy-object-proxy:
diff --git a/python/python-lhafile/python-lhafile.SlackBuild b/python/python-lhafile/python-lhafile.SlackBuild
index 667fdd54b7..6478ac09e7 100644
--- a/python/python-lhafile/python-lhafile.SlackBuild
+++ b/python/python-lhafile/python-lhafile.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-lhafile
-VERSION=${VERSION:-0.1.0fs4}
+VERSION=${VERSION:-0.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,6 +73,9 @@ find -L . \
 
 python setup.py install --root=$PKG
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING.txt README.txt VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/python/python-lhafile/python-lhafile.info b/python/python-lhafile/python-lhafile.info
index 216147d424..f738f79f27 100644
--- a/python/python-lhafile/python-lhafile.info
+++ b/python/python-lhafile/python-lhafile.info
@@ -1,8 +1,8 @@
 PRGNAM="python-lhafile"
-VERSION="0.1.0fs4"
+VERSION="0.2.1"
 HOMEPAGE="http://fengestad.no/python-lhafile/"
-DOWNLOAD="http://fengestad.no/python-lhafile/python-lhafile-0.1.0fs4.tar.gz"
-MD5SUM="cedac40d5363bf49b51528522bf05c60"
+DOWNLOAD="http://fengestad.no/python-lhafile/python-lhafile-0.2.1.tar.gz"
+MD5SUM="bc63d61a1b562bbbc52118c168f8cb5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-libnacl/README b/python/python-libnacl/README
index d856a07753..db7bea1cc8 100644
--- a/python/python-libnacl/README
+++ b/python/python-libnacl/README
@@ -1 +1,8 @@
 Python bindings for libsodium/tweetnacl based on ctypes.
+
+Optional dependencies: msgpack-python and python3
+
+To install python3 bindings install python3 and then run the script
+with PYTHON3=yes.
+
+  # PYTHON3=yes ./python-libnacl.SlackBuild
diff --git a/python/python-libnacl/python-libnacl.SlackBuild b/python/python-libnacl/python-libnacl.SlackBuild
index 0e1a5769e7..9d8bf85b81 100644
--- a/python/python-libnacl/python-libnacl.SlackBuild
+++ b/python/python-libnacl/python-libnacl.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-libnacl
 
-# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-libnacl
 SRCNAM=libnacl
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,14 +65,14 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import sys' 2>/dev/null); then
+if [ "${PYTHON3:-no}" == "yes" ]; then
   python3 setup.py install --root=$PKG
 fi
 
diff --git a/python/python-libnacl/python-libnacl.info b/python/python-libnacl/python-libnacl.info
index e65f50b03e..e3e42ee0b1 100644
--- a/python/python-libnacl/python-libnacl.info
+++ b/python/python-libnacl/python-libnacl.info
@@ -1,8 +1,8 @@
 PRGNAM="python-libnacl"
-VERSION="1.4.0"
+VERSION="1.4.3"
 HOMEPAGE="https://libnacl.readthedocs.org/en/latest/"
-DOWNLOAD="https://pypi.python.org/packages/source/l/libnacl/libnacl-1.4.0.tar.gz"
-MD5SUM="fd986449d9a2bf22ed9d05989bb46fba"
+DOWNLOAD="https://pypi.python.org/packages/source/l/libnacl/libnacl-1.4.3.tar.gz"
+MD5SUM="27f57f34ce6e0fe1dba7c754bd83773f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools libsodium"
diff --git a/python/python-magic/LICENSE b/python/python-magic/LICENSE
new file mode 100644
index 0000000000..044612d292
--- /dev/null
+++ b/python/python-magic/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2001-2014 Adam Hupp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/python/python-magic/python-magic.SlackBuild b/python/python-magic/python-magic.SlackBuild
index 9479bd48fd..aea733d41b 100644
--- a/python/python-magic/python-magic.SlackBuild
+++ b/python/python-magic/python-magic.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-magic
 
-# Copyright 2009-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-magic
-VERSION=${VERSION:-0.4.6}
+VERSION=${VERSION:-0.4.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,10 +50,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
@@ -63,6 +63,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.md > $PKG/usr/doc/$PRGNAM-$VERSION/README.md
+cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/python-magic/python-magic.info b/python/python-magic/python-magic.info
index 06acc27cb5..3232ab2245 100644
--- a/python/python-magic/python-magic.info
+++ b/python/python-magic/python-magic.info
@@ -1,8 +1,8 @@
 PRGNAM="python-magic"
-VERSION="0.4.6"
+VERSION="0.4.10"
 HOMEPAGE="https://github.com/ahupp/python-magic"
-DOWNLOAD="http://pypi.python.org/packages/source/p/python-magic/python-magic-0.4.6.tar.gz"
-MD5SUM="07e7a0fea78dd81ed609414c3484df58"
+DOWNLOAD="http://pypi.python.org/packages/source/p/python-magic/python-magic-0.4.10.tar.gz"
+MD5SUM="becc45e6b4e00d4e8a6bdf727c52bd27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/python-nbxmpp/python-nbxmpp.SlackBuild b/python/python-nbxmpp/python-nbxmpp.SlackBuild
index 44ee408af9..e2a9212ad2 100644
--- a/python/python-nbxmpp/python-nbxmpp.SlackBuild
+++ b/python/python-nbxmpp/python-nbxmpp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-nbxmpp
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 TARNAM=nbxmpp
@@ -63,8 +63,8 @@ cd $TMP
 rm -rf $TARNAM-$VERSION
 if [ -e "$CWD/$TARNAM-$VERSION.tar.gz" ]; then
 	tar xvf $CWD/$TARNAM-$VERSION.tar.gz
-elif [ -e "$CWD/6" ]; then
-	tar xvf $CWD/6
+elif [ -e "$CWD/8" ]; then
+	tar xvf $CWD/8
 fi
 cd $TARNAM-$VERSION
 chown -R root:root .
diff --git a/python/python-nbxmpp/python-nbxmpp.info b/python/python-nbxmpp/python-nbxmpp.info
index 06289efaf3..4594757325 100644
--- a/python/python-nbxmpp/python-nbxmpp.info
+++ b/python/python-nbxmpp/python-nbxmpp.info
@@ -1,8 +1,8 @@
 PRGNAM="python-nbxmpp"
-VERSION="0.5.1"
+VERSION="0.5.3"
 HOMEPAGE="https://python-nbxmpp.gajim.org/"
-DOWNLOAD="https://python-nbxmpp.gajim.org/downloads/6"
-MD5SUM="fc3946a949db6d8131a28b7220414b52"
+DOWNLOAD="https://python-nbxmpp.gajim.org/downloads/8"
+MD5SUM="62cc22fd25fb5fa3aa405338349446ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-oauth2client/README b/python/python-oauth2client/README
new file mode 100644
index 0000000000..d3ba4fdb96
--- /dev/null
+++ b/python/python-oauth2client/README
@@ -0,0 +1,2 @@
+This is a Python library for accessing resources protected by
+OAuth 2.0.
diff --git a/python/python-oauth2client/python-oauth2client.SlackBuild b/python/python-oauth2client/python-oauth2client.SlackBuild
new file mode 100644
index 0000000000..d9ec4c7fec
--- /dev/null
+++ b/python/python-oauth2client/python-oauth2client.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for "python-oauth2client".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-oauth2client
+SRCNAM=oauth2client
+VERSION=${VERSION:-1.5.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root $PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG.md CONTRIBUTING.md LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-oauth2client/python-oauth2client.info b/python/python-oauth2client/python-oauth2client.info
new file mode 100644
index 0000000000..4c2eecbd08
--- /dev/null
+++ b/python/python-oauth2client/python-oauth2client.info
@@ -0,0 +1,10 @@
+PRGNAM="python-oauth2client"
+VERSION="1.5.2"
+HOMEPAGE="https://github.com/google/oauth2client/"
+DOWNLOAD="https://github.com/google/oauth2client/archive/v1.5.2.tar.gz"
+MD5SUM="68caf10316e78db0953899609927977c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools pycrypto"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python-oauth2client/slack-desc b/python/python-oauth2client/slack-desc
new file mode 100644
index 0000000000..bd2f610411
--- /dev/null
+++ b/python/python-oauth2client/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+python-oauth2client: python-oauth2client (OAuth 2.0 Python library)
+python-oauth2client:
+python-oauth2client: This is a Python library for accessing resources protected by
+python-oauth2client: OAuth 2.0.
+python-oauth2client:
+python-oauth2client: Homepage: https://github.com/google/oauth2client/
+python-oauth2client:
+python-oauth2client:
+python-oauth2client:
+python-oauth2client:
+python-oauth2client:
diff --git a/python/python-oauthlib/python-oauthlib.SlackBuild b/python/python-oauthlib/python-oauthlib.SlackBuild
index 634c12f4ea..0f0bed0820 100644
--- a/python/python-oauthlib/python-oauthlib.SlackBuild
+++ b/python/python-oauthlib/python-oauthlib.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-oauthlib
 SRCNAM=$(echo $PRGNAM | cut -c8-15)
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-oauthlib/python-oauthlib.info b/python/python-oauthlib/python-oauthlib.info
index f268cde519..9b6e38a28e 100644
--- a/python/python-oauthlib/python-oauthlib.info
+++ b/python/python-oauthlib/python-oauthlib.info
@@ -1,8 +1,8 @@
 PRGNAM="python-oauthlib"
-VERSION="1.0.1"
+VERSION="1.0.3"
 HOMEPAGE="https://github.com/idan/oauthlib"
-DOWNLOAD="https://pypi.python.org/packages/source/o/oauthlib/oauthlib-1.0.1.tar.gz"
-MD5SUM="67fbf9c8173ba38c31dc66c571d8bd40"
+DOWNLOAD="https://pypi.python.org/packages/source/o/oauthlib/oauthlib-1.0.3.tar.gz"
+MD5SUM="02772867bf246b3b37f4ed22786c41f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools pycrypto"
diff --git a/python/python-parsedatetime/README b/python/python-parsedatetime/README
new file mode 100644
index 0000000000..9f64d7514d
--- /dev/null
+++ b/python/python-parsedatetime/README
@@ -0,0 +1 @@
+Parse human-readable date/time strings.
diff --git a/python/python-parsedatetime/python-parsedatetime.SlackBuild b/python/python-parsedatetime/python-parsedatetime.SlackBuild
new file mode 100644
index 0000000000..60b8c2be52
--- /dev/null
+++ b/python/python-parsedatetime/python-parsedatetime.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-parsedatetime
+
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-parsedatetime
+SRCNAM=parsedatetime
+VERSION=${VERSION:-1.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-parsedatetime/python-parsedatetime.info b/python/python-parsedatetime/python-parsedatetime.info
new file mode 100644
index 0000000000..be1574b6d3
--- /dev/null
+++ b/python/python-parsedatetime/python-parsedatetime.info
@@ -0,0 +1,10 @@
+PRGNAM="python-parsedatetime"
+VERSION="1.5"
+HOMEPAGE="https://github.com/bear/parsedatetime"
+DOWNLOAD="https://github.com/bear/parsedatetime/archive/v1.5.tar.gz"
+MD5SUM="f7b6b8258728ca9aa2ef536b3f221baf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/python/python-parsedatetime/slack-desc b/python/python-parsedatetime/slack-desc
new file mode 100644
index 0000000000..84b75a1671
--- /dev/null
+++ b/python/python-parsedatetime/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+python-parsedatetime: python-parsedatetime (Python module)
+python-parsedatetime:
+python-parsedatetime: Parse human-readable date/time strings.
+python-parsedatetime:
+python-parsedatetime:
+python-parsedatetime:
+python-parsedatetime:
+python-parsedatetime:
+python-parsedatetime: Project URL: https://github.com/bear/parsedatetime
+python-parsedatetime:
+python-parsedatetime:
diff --git a/python/python-pdfminer/README b/python/python-pdfminer/README
new file mode 100644
index 0000000000..64ca2affa2
--- /dev/null
+++ b/python/python-pdfminer/README
@@ -0,0 +1,23 @@
+PDFMiner is a tool for extracting information from PDF documents. Unlike
+other PDF-related tools, it focuses entirely on getting and analyzing
+text data. PDFMiner allows one to obtain the exact location of text in a
+page, as well as other information such as fonts or lines. It includes a
+PDF converter that can transform PDF files into other text formats (such
+as HTML). It has an extensible PDF parser that can be used for other
+purposes than text analysis.
+
+PDFMiner comes with two handy tools: pdf2txt.py and dumppdf.py.
+
+pdf2txt.py
+
+pdf2txt.py extracts text contents from a PDF file.  It cannot recognize 
+text drawn as images.  It also extracts locations, font names/sizes, 
+writing direction.  It requires a password for password protected PDF 
+documents.  You cannot extract any text from a PDF document which does 
+not have extraction permission.
+
+dumppdf.py
+
+dumppdf.py dumps the internal contents of a PDF file in pseudo-XML
+format. This program is primarily for debugging purposes, but it's also
+possible to extract some meaningful contents (e.g. images).
diff --git a/python/python-pdfminer/python-pdfminer.SlackBuild b/python/python-pdfminer/python-pdfminer.SlackBuild
new file mode 100644
index 0000000000..73e5d7ed96
--- /dev/null
+++ b/python/python-pdfminer/python-pdfminer.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for python-pdfminer
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com> 
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-pdfminer
+SRCNAM=pdfminer
+VERSION=${VERSION:-20140328}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Enables the ability to process Chinese, Japanese and Korean Languagues
+make cmap # Comment out this line to disable this support
+
+# Build / Install
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  PKG-INFO \
+	$PKG/usr/doc/$PRGNAM-$VERSION
+cp -R \
+	samples/ \
+	$PKG/usr/doc/$PRGNAM-$VERSION
+cp -R \
+	docs/ \
+	$PKG/usr/doc/$PRGNAM-$VERSION/html_docs
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-pdfminer/python-pdfminer.info b/python/python-pdfminer/python-pdfminer.info
new file mode 100644
index 0000000000..87021abe74
--- /dev/null
+++ b/python/python-pdfminer/python-pdfminer.info
@@ -0,0 +1,10 @@
+PRGNAM="python-pdfminer"
+VERSION="20140328"
+HOMEPAGE="https://euske.github.io/pdfminer/index.html"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pdfminer/pdfminer-20140328.tar.gz"
+MD5SUM="dfe3eb1b7b7017ab514aad6751a7c2ea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-pdfminer/slack-desc b/python/python-pdfminer/slack-desc
new file mode 100644
index 0000000000..0076bdf514
--- /dev/null
+++ b/python/python-pdfminer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python-pdfminer: python-pdfminer (PDF parser and analyzer)
+python-pdfminer:
+python-pdfminer: PDFMiner is a tool for extracting information from PDF
+python-pdfminer: documents. It focuses entirely on getting and analyzing text
+python-pdfminer: data. PDFMiner can obtain the location of text in a page,
+python-pdfminer: and other information like fonts or lines. It includes a
+python-pdfminer: PDF converter that can transform PDF files into several
+python-pdfminer: text formats. It also includes an extensible PDF parser.
+python-pdfminer:
+python-pdfminer: Home page: https://euske.github.io/pdfminer/index.html
+python-pdfminer:
diff --git a/python/python-pillow/README b/python/python-pillow/README
new file mode 100644
index 0000000000..e4b5f84690
--- /dev/null
+++ b/python/python-pillow/README
@@ -0,0 +1,10 @@
+The Python Imaging Library (PIL) adds image processing capabilities to
+your Python environment.  This library provides extensive file format
+support, an efficient internal representation, and powerful image
+processing capabilities.
+
+***Warning***
+
+Pillow and PIL CANNOT co-exist in the same environment. Before
+installing Pillow, please uninstall PIL.
+https://pillow.readthedocs.org/en/latest/installation.html
diff --git a/python/python-pillow/python-pillow.SlackBuild b/python/python-pillow/python-pillow.SlackBuild
new file mode 100644
index 0000000000..e9676a6e50
--- /dev/null
+++ b/python/python-pillow/python-pillow.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for python-pillow
+
+# Copyright 2009, 2010, 2013, 2014  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2014  Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Maintainer notes:
+# Copied from -current python-pillow (Thu Oct 29 20:12:14 UTC 2015)
+#
+
+PRGNAM=python-pillow
+VERSION=${VERSION:-3.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf Pillow-$VERSION
+tar xvf $CWD/Pillow-$VERSION.tar.gz
+cd Pillow-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.md *.rst docs/BUILDME docs/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-pillow/python-pillow.info b/python/python-pillow/python-pillow.info
new file mode 100644
index 0000000000..fbba3b32b4
--- /dev/null
+++ b/python/python-pillow/python-pillow.info
@@ -0,0 +1,10 @@
+PRGNAM="python-pillow"
+VERSION="3.0.0"
+HOMEPAGE="http://python-pillow.github.io/"
+DOWNLOAD="https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz"
+MD5SUM="fc8ac44e93da09678eac7e30c9b7377d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools libwebp %README%"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-pillow/slack-desc b/python/python-pillow/slack-desc
new file mode 100644
index 0000000000..313987b191
--- /dev/null
+++ b/python/python-pillow/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+python-pillow: python-pillow (Python Imaging Library)
+python-pillow:
+python-pillow: The Python Imaging Library (PIL) adds image processing capabilities
+python-pillow: to your Python environment.  This library provides extensive file
+python-pillow: format support, an efficient internal representation, and powerful
+python-pillow: image processing capabilities.
+python-pillow:
+python-pillow: PIL homepage:  https://python-pillow.github.io/
+python-pillow:
+python-pillow:
+python-pillow:
diff --git a/python/python-pyparted/README b/python/python-pyparted/README
new file mode 100644
index 0000000000..0039f3283e
--- /dev/null
+++ b/python/python-pyparted/README
@@ -0,0 +1,3 @@
+pyparted is a set of native Python bindings for libparted.  libparted is the
+library portion of the GNU parted project.  With pyparted, you can write
+applications that interact with disk partition tables and filesystems.
diff --git a/python/python-pyparted/python-pyparted.SlackBuild b/python/python-pyparted/python-pyparted.SlackBuild
new file mode 100644
index 0000000000..2fe52cd323
--- /dev/null
+++ b/python/python-pyparted/python-pyparted.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# Slackware build script for python-pyparted
+
+# Copyright 2015 Nikos Giotis
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-pyparted
+SRCNAM=pyparted
+VERSION=${VERSION:-3.10.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -r $CWD/v$VERSION.tar.gz ]; then
+  mv $CWD/v$VERSION.tar.gz $CWD/$SRCNAM-$VERSION.tar.gz
+fi
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BUGS COPYING HACKING NEWS README RELEASE TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-pyparted/python-pyparted.info b/python/python-pyparted/python-pyparted.info
new file mode 100644
index 0000000000..c31adbe96c
--- /dev/null
+++ b/python/python-pyparted/python-pyparted.info
@@ -0,0 +1,10 @@
+PRGNAM="python-pyparted"
+VERSION="3.10.5"
+HOMEPAGE="https://github.com/rhinstaller/pyparted"
+DOWNLOAD="https://github.com/rhinstaller/pyparted/archive/v3.10.5.tar.gz"
+MD5SUM="b303caf8e907a2541e71aa492494b5e5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/python/python-pyparted/slack-desc b/python/python-pyparted/slack-desc
new file mode 100644
index 0000000000..9f5af62a26
--- /dev/null
+++ b/python/python-pyparted/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python-pyparted: python-pyparted (Python bindings for libparted)
+python-pyparted:
+python-pyparted: pyparted is a set of native Python bindings for libparted.
+python-pyparted: libparted is the library portion of the GNU parted project.
+python-pyparted: With pyparted, you can write applications that interact with disk
+python-pyparted: partition tables and filesystems.
+python-pyparted:
+python-pyparted: Homepage: https://github.com/rhinstaller/pyparted
+python-pyparted:
+python-pyparted:
+python-pyparted
diff --git a/python/python-requests-kerberos/README b/python/python-requests-kerberos/README
new file mode 100644
index 0000000000..0295cb546b
--- /dev/null
+++ b/python/python-requests-kerberos/README
@@ -0,0 +1,3 @@
+Requests is an HTTP library, written in Python, for human beings.
+This library adds optional Kerberos/GSSAPI authentication support and
+supports mutual authentication.
diff --git a/python/python-requests-kerberos/python-requests-kerberos.SlackBuild b/python/python-requests-kerberos/python-requests-kerberos.SlackBuild
new file mode 100644
index 0000000000..eebf4cae2b
--- /dev/null
+++ b/python/python-requests-kerberos/python-requests-kerberos.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for python-requests-kerberos
+
+# Copyright 2015 Thibaut Notteboom, Paris, FRANCE
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-requests-kerberos
+VERSION=${VERSION:-0.7.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=requests-kerberos
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS HISTORY.rst LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-requests-kerberos/python-requests-kerberos.info b/python/python-requests-kerberos/python-requests-kerberos.info
new file mode 100644
index 0000000000..9b54e8ce8a
--- /dev/null
+++ b/python/python-requests-kerberos/python-requests-kerberos.info
@@ -0,0 +1,10 @@
+PRGNAM="python-requests-kerberos"
+VERSION="0.7.0"
+HOMEPAGE="http://pypi.python.org/pypi/requests-kerberos"
+DOWNLOAD="https://pypi.python.org/packages/source/r/requests-kerberos/requests-kerberos-0.7.0.tar.gz"
+MD5SUM="d7cde195a95536c83a2ffd8a7050be4c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-kerberos python-requests"
+MAINTAINER="Thibaut Notteboom"
+EMAIL="thibaut.notteboom@gmail.com"
diff --git a/python/python-requests-kerberos/slack-desc b/python/python-requests-kerberos/slack-desc
new file mode 100644
index 0000000000..1bb50a3c0a
--- /dev/null
+++ b/python/python-requests-kerberos/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                        |-----handy-ruler------------------------------------------------------|
+python-requests-kerberos: python-requests-kerberos (A Kerberos authentication handler
+python-requests-kerberos:
+python-requests-kerberos:
+python-requests-kerberos: Requests is an HTTP library, written in Python, for human beings.
+python-requests-kerberos: This library adds optional Kerberos/GSSAPI authentication support and
+python-requests-kerberos: supports mutual authentication.
+python-requests-kerberos:
+python-requests-kerberos:
+python-requests-kerberos:
+python-requests-kerberos:
+python-requests-kerberos:
diff --git a/python/python-requests/python-requests.SlackBuild b/python/python-requests/python-requests.SlackBuild
index 6ef101688d..2f6e0a1d92 100644
--- a/python/python-requests/python-requests.SlackBuild
+++ b/python/python-requests/python-requests.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-requests
 
-# Copyright 2013-2015 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2013-2016 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-requests
-VERSION=${VERSION:-2.7.0}
+VERSION=${VERSION:-2.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-requests/python-requests.info b/python/python-requests/python-requests.info
index 693b34de0f..8cec60ccb2 100644
--- a/python/python-requests/python-requests.info
+++ b/python/python-requests/python-requests.info
@@ -1,8 +1,8 @@
 PRGNAM="python-requests"
-VERSION="2.7.0"
+VERSION="2.9.1"
 HOMEPAGE="http://pypi.python.org/pypi/requests"
-DOWNLOAD="http://pypi.python.org/packages/source/r/requests/requests-2.7.0.tar.gz"
-MD5SUM="29b173fd5fa572ec0764d1fd7b527260"
+DOWNLOAD="http://pypi.python.org/packages/source/r/requests/requests-2.9.1.tar.gz"
+MD5SUM="0b7f480d19012ec52bab78292efd976d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-scandir/README b/python/python-scandir/README
new file mode 100644
index 0000000000..7fcbf2782f
--- /dev/null
+++ b/python/python-scandir/README
@@ -0,0 +1,13 @@
+scandir, a better directory iterator and faster os.walk()
+
+scandir() is a generator version of os.listdir() that returns 
+an iterator over files in a directory, and also exposes the 
+extra information most OSes provide while iterating files in a 
+directory (such as type and stat information).
+
+This module also includes a version of os.walk() that uses 
+scandir() to speed it up significantly.
+
+NOTE: If you’re using Python version 3.5+, os.scandir() and the 
+speed improvements to os.walk() are already available in the 
+standard library.
diff --git a/python/python-scandir/python-scandir.SlackBuild b/python/python-scandir/python-scandir.SlackBuild
new file mode 100644
index 0000000000..1eae126459
--- /dev/null
+++ b/python/python-scandir/python-scandir.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-scandir
+
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-scandir
+SRCNAM=$(echo $PRGNAM | cut -c8-15)
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-scandir/python-scandir.info b/python/python-scandir/python-scandir.info
new file mode 100644
index 0000000000..027dfdd551
--- /dev/null
+++ b/python/python-scandir/python-scandir.info
@@ -0,0 +1,10 @@
+PRGNAM="python-scandir"
+VERSION="1.2"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+DOWNLOAD="https://pypi.python.org/packages/source/s/scandir/scandir-1.2.tar.gz"
+MD5SUM="3a317b482128e072f6cfb3bb2ce52e06"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-scandir/slack-desc b/python/python-scandir/slack-desc
new file mode 100644
index 0000000000..74c9308f89
--- /dev/null
+++ b/python/python-scandir/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python-scandir: python-scandir (directory iterator)
+python-scandir:
+python-scandir: scandir, a better directory iterator and faster os.walk().
+python-scandir: scandir() is a generator version of os.listdir() that returns an 
+python-scandir: iterator over files in a directory, and also exposes the extra
+python-scandir: information most OSes provide while iterating files in a directory
+python-scandir: (such as type and stat information).
+python-scandir:
+python-scandir: Homepage: https://github.com/benhoyt/scandir
+python-scandir:
+python-scandir:
diff --git a/python/python-swiftclient/python-swiftclient.SlackBuild b/python/python-swiftclient/python-swiftclient.SlackBuild
index f73a5fb1a8..e88b33b25d 100644
--- a/python/python-swiftclient/python-swiftclient.SlackBuild
+++ b/python/python-swiftclient/python-swiftclient.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-swiftclient
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python-swiftclient
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-swiftclient/python-swiftclient.info b/python/python-swiftclient/python-swiftclient.info
index 6b3d332588..bec40d0274 100644
--- a/python/python-swiftclient/python-swiftclient.info
+++ b/python/python-swiftclient/python-swiftclient.info
@@ -1,10 +1,10 @@
 PRGNAM="python-swiftclient"
-VERSION="2.3.1"
+VERSION="2.7.0"
 HOMEPAGE="http://www.openstack.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/python-swiftclient/python-swiftclient-2.3.1.tar.gz"
-MD5SUM="7ad68f32a9df6ef7bb81878261b89ab6"
+DOWNLOAD="https://pypi.python.org/packages/source/p/python-swiftclient/python-swiftclient-2.7.0.tar.gz"
+MD5SUM="e04710f3a74dccefd64bc75f866dd37e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests simplejson six futures"
+REQUIRES="python-requests six futures pbr"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-tblib/README b/python/python-tblib/README
new file mode 100644
index 0000000000..cc1f8b420d
--- /dev/null
+++ b/python/python-tblib/README
@@ -0,0 +1,4 @@
+Traceback fiddling library. For now allows you to pickle tracebacks and
+raise exceptions with pickled tracebacks in different processes. This
+allows better error handling when running code over multiple processes
+(imagine multiprocessing, billiard, futures, celery etc).
diff --git a/python/python-tblib/python-tblib.SlackBuild b/python/python-tblib/python-tblib.SlackBuild
new file mode 100644
index 0000000000..c1bed06f4e
--- /dev/null
+++ b/python/python-tblib/python-tblib.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-tblib
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-tblib
+SRCNAM=tblib
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a PKG-INFO LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-tblib/python-tblib.info b/python/python-tblib/python-tblib.info
new file mode 100644
index 0000000000..7cc84a382a
--- /dev/null
+++ b/python/python-tblib/python-tblib.info
@@ -0,0 +1,10 @@
+PRGNAM="python-tblib"
+VERSION="1.1.0"
+HOMEPAGE="https://github.com/ionelmc/python-tblib"
+DOWNLOAD="https://pypi.python.org/packages/source/t/tblib/tblib-1.1.0.tar.gz"
+MD5SUM="a5131b5b58a5495130e6ab1f8c305832"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="six pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-tblib/slack-desc b/python/python-tblib/slack-desc
new file mode 100644
index 0000000000..1194a756fd
--- /dev/null
+++ b/python/python-tblib/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+python-tblib: python-tblib (Traceback fiddling library)
+python-tblib:
+python-tblib: Traceback fiddling library. For now allows you to pickle tracebacks
+python-tblib: and raise exceptions with pickled tracebacks in different processes.
+python-tblib: This allows better error handling when running code over multiple
+python-tblib: processes (imagine multiprocessing, billiard, futures, celery etc).
+python-tblib:
+python-tblib: Home page: https://github.com/ionelmc/python-tblib
+python-tblib:
+python-tblib:
+python-tblib:
diff --git a/python/python-unicodecsv/python-unicodecsv.SlackBuild b/python/python-unicodecsv/python-unicodecsv.SlackBuild
index b4e0bd7faa..7f3517db83 100644
--- a/python/python-unicodecsv/python-unicodecsv.SlackBuild
+++ b/python/python-unicodecsv/python-unicodecsv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-unicodecsv
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=python-unicodecsv
 SRCNAM=$(echo $PRGNAM | cut -c8-17)
-VERSION=${VERSION:-0.13.0}
+VERSION=${VERSION:-0.14.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/python-unicodecsv/python-unicodecsv.info b/python/python-unicodecsv/python-unicodecsv.info
index c763bf62f6..67d5fcfcf8 100644
--- a/python/python-unicodecsv/python-unicodecsv.info
+++ b/python/python-unicodecsv/python-unicodecsv.info
@@ -1,8 +1,8 @@
 PRGNAM="python-unicodecsv"
-VERSION="0.13.0"
+VERSION="0.14.1"
 HOMEPAGE="https://github.com/jdunck/python-unicodecsv"
-DOWNLOAD="https://pypi.python.org/packages/source/u/unicodecsv/unicodecsv-0.13.0.tar.gz"
-MD5SUM="e223b525abd372b559e3277278418985"
+DOWNLOAD="https://pypi.python.org/packages/source/u/unicodecsv/unicodecsv-0.14.1.tar.gz"
+MD5SUM="c18ffe8ded29a4f429224877b2b34252"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/python-uri-templates/README b/python/python-uri-templates/README
new file mode 100644
index 0000000000..30973b3c00
--- /dev/null
+++ b/python/python-uri-templates/README
@@ -0,0 +1,2 @@
+Youtube-upload is a command line Python script that uploads videos
+to Youtube using the YouTube APIv3.
diff --git a/python/python-uri-templates/python-uri-templates.SlackBuild b/python/python-uri-templates/python-uri-templates.SlackBuild
new file mode 100644
index 0000000000..7e31c4edb6
--- /dev/null
+++ b/python/python-uri-templates/python-uri-templates.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for "python-uri-templates".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-uri-templates
+SRCNAM1=uri-template-py
+SRCNAM2=uritemplate-py-uri-template-py
+VERSION=${VERSION:-0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM2-$VERSION
+tar xvf $CWD/$SRCNAM1-$VERSION.tar.gz || tar xvf $CWD/$SRCNAM2-$VERSION.tar.gz
+cd $SRCNAM2-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root $PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  MAINTAINERS.rst README.rst \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-uri-templates/python-uri-templates.info b/python/python-uri-templates/python-uri-templates.info
new file mode 100644
index 0000000000..3fdd2a3ec3
--- /dev/null
+++ b/python/python-uri-templates/python-uri-templates.info
@@ -0,0 +1,10 @@
+PRGNAM="python-uri-templates"
+VERSION="0.6"
+HOMEPAGE="https://github.com/uri-templates/"
+DOWNLOAD="https://github.com/uri-templates/uritemplate-py/archive/uri-template-py-0.6.tar.gz"
+MD5SUM="e15925c2fceb09150011618e31e250ac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="simplejson"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python-uri-templates/slack-desc b/python/python-uri-templates/slack-desc
new file mode 100644
index 0000000000..eb5690706f
--- /dev/null
+++ b/python/python-uri-templates/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+python-uri-templates: python-uri-templates (Python implementation of URI Template)
+python-uri-templates:
+python-uri-templates: This is a Python implementation of RFC6570, URI Template, and can
+python-uri-templates: expand templates up to and including Level 4 in that specification.
+python-uri-templates:
+python-uri-templates: Homepage: https://github.com/uri-templates/
+python-uri-templates:
+python-uri-templates:
+python-uri-templates:
+python-uri-templates:
+python-uri-templates:
diff --git a/python/python-vulndb/README b/python/python-vulndb/README
new file mode 100644
index 0000000000..dad07f1205
--- /dev/null
+++ b/python/python-vulndb/README
@@ -0,0 +1,8 @@
+Python-vulndb is a Python SDK to access the (vulndb) vulnerability
+database.  vulndb is a user, contributor, and developer friendly
+database.
+
+To update the vulnerability database after installation, run
+as root:
+
+# update-vulndb
diff --git a/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff b/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff
new file mode 100644
index 0000000000..6fb65be81e
--- /dev/null
+++ b/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff
@@ -0,0 +1,38 @@
+
+Removes git commits to vulndb since it seems to be broken
+Tracks vulndb repository in /tmp/vulndb_data
+
+--- vulndb-0.0.19.orig/tools/update-db.sh	2015-11-17 22:47:34.506772912 -0700
++++ vulndb-0.0.19/tools/update-db.sh	2015-11-17 22:54:12.818745899 -0700
+@@ -5,25 +5,13 @@
+ #
+ # Update the database
+ #
+-if [ ! -d "data" ]; then
+-  git clone https://github.com/vulndb/data.git
++
++if [ ! -d "/tmp/vulndb_data" ]; then
++  git clone https://github.com/vulndb/data.git /tmp/vulndb_data
+ fi
+ 
+-cd data
++cd /tmp/vulndb_data
+ git pull
+ cd ..
+ 
+-mkdir -p vulndb/db/
+-cp -rf data/db/*.json vulndb/db/
+-git add vulndb/db/
+-
+-# Bump the version numbers
+-tools/semver.sh bump patch
+-
+-cd data
+-git rev-parse HEAD > ../vulndb/db-version.txt
+-cd ..
+-
+-# Push to repo
+-git commit vulndb/db/ vulndb/version.txt vulndb/db-version.txt -m 'Updated vulnerability database'
+-git push
+\ No newline at end of file
++cp -rf /tmp/vulndb_data/db/*.json /usr/lib64/python2.7/site-packages/vulndb/db/
diff --git a/python/python-vulndb/python-vulndb.SlackBuild b/python/python-vulndb/python-vulndb.SlackBuild
new file mode 100644
index 0000000000..9b778fa235
--- /dev/null
+++ b/python/python-vulndb/python-vulndb.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for python-vulndb
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-vulndb
+SRCNAM=vulndb
+VERSION=${VERSION:-0.0.19}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Removes git commit to vulndb/data.git since it seems to be
+# broken.  Tracks vulndb/data.git in /tmp/vulndb_data
+# After Vulndb is downloaded it is copied to:
+# /usr/lib64/python2.7/site-packages/vulndb/db/
+patch -p1 --verbose < $CWD/do-not-commit-vulndb-to-upstream.diff
+
+python setup.py install --root=$PKG
+
+# Installs update-db.sh and renames it to update-vulndb
+install -Dm755 tools/update-db.sh $PKG/usr/bin/update-vulndb
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-vulndb/python-vulndb.info b/python/python-vulndb/python-vulndb.info
new file mode 100644
index 0000000000..dbcc54138c
--- /dev/null
+++ b/python/python-vulndb/python-vulndb.info
@@ -0,0 +1,10 @@
+PRGNAM="python-vulndb"
+VERSION="0.0.19"
+HOMEPAGE="https://github.com/vulndb/python-sdk/"
+DOWNLOAD="https://pypi.python.org/packages/source/v/vulndb/vulndb-0.0.19.tar.gz"
+MD5SUM="40f60a109aca06a928e0e0e64c13c226"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/python-vulndb/slack-desc b/python/python-vulndb/slack-desc
new file mode 100644
index 0000000000..ea1a6973ec
--- /dev/null
+++ b/python/python-vulndb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+python-vulndb: python-vulndb (vulndb Python SDK)
+python-vulndb:
+python-vulndb: Python-vulndb is a Python SDK to access the (vulndb) vulnerability
+python-vulndb: database.  vulndb is a user, contributor, and developer friendly
+python-vulndb: database.
+python-vulndb:
+python-vulndb: Home page: https://github.com/vulndb/python-sdk/
+python-vulndb:
+python-vulndb:
+python-vulndb:
+python-vulndb:
diff --git a/python/python-wrapt/README b/python/python-wrapt/README
new file mode 100644
index 0000000000..84fd2ce36f
--- /dev/null
+++ b/python/python-wrapt/README
@@ -0,0 +1,5 @@
+A Python module for decorators, wrappers and monkey patching.
+
+The aim of the wrapt module is to provide a transparent object proxy 
+for Python, which can be used as the basis for the construction of 
+function wrappers and decorator functions.
diff --git a/python/python-wrapt/python-wrapt.SlackBuild b/python/python-wrapt/python-wrapt.SlackBuild
new file mode 100644
index 0000000000..564ca02216
--- /dev/null
+++ b/python/python-wrapt/python-wrapt.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python-wrapt
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python-wrapt
+SRCNAM=$(echo $PRGNAM | cut -c8-12)
+VERSION=${VERSION:-1.10.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python-wrapt/python-wrapt.info b/python/python-wrapt/python-wrapt.info
new file mode 100644
index 0000000000..3c2dac3db5
--- /dev/null
+++ b/python/python-wrapt/python-wrapt.info
@@ -0,0 +1,10 @@
+PRGNAM="python-wrapt"
+VERSION="1.10.6"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+DOWNLOAD="https://pypi.python.org/packages/source/w/wrapt/wrapt-1.10.6.tar.gz"
+MD5SUM="e29294a8949ff4dc74d6fcd800f6f23d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/python/python-wrapt/slack-desc b/python/python-wrapt/slack-desc
new file mode 100644
index 0000000000..dad67ab106
--- /dev/null
+++ b/python/python-wrapt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+python-wrapt: python-wrapt (A Python module for decorators)
+python-wrapt:
+python-wrapt: A Python module for decorators, wrappers and monkey patching. 
+python-wrapt: The aim of the wrapt module is to provide a transparent object proxy
+python-wrapt: for Python, which can be used as the basis for the construction of
+python-wrapt: function wrappers and decorator functions.
+python-wrapt:
+python-wrapt: Homepage: https://github.com/GrahamDumpleton/wrapt
+python-wrapt:
+python-wrapt:
+python-wrapt:
diff --git a/python/python3-augeas/README b/python/python3-augeas/README
new file mode 100644
index 0000000000..be2148f528
--- /dev/null
+++ b/python/python3-augeas/README
@@ -0,0 +1 @@
+Pure python bindings for augeas
diff --git a/python/python3-augeas/python3-augeas.SlackBuild b/python/python3-augeas/python3-augeas.SlackBuild
new file mode 100644
index 0000000000..2d9cbfd5d4
--- /dev/null
+++ b/python/python3-augeas/python3-augeas.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for python3-augeas
+
+# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python3-augeas
+SRCNAM=python-augeas
+VERSION=${VERSION:-0.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-augeas/python3-augeas.info b/python/python3-augeas/python3-augeas.info
new file mode 100644
index 0000000000..25e9d5fef9
--- /dev/null
+++ b/python/python3-augeas/python3-augeas.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-augeas"
+VERSION="0.5.0"
+HOMEPAGE="http://augeas.net/"
+DOWNLOAD="https://fedorahosted.org/released/python-augeas/python-augeas-0.5.0.tar.gz"
+MD5SUM="2d5a903467410b8d60abca5fa54bae2d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 augeas"
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/python/python3-augeas/slack-desc b/python/python3-augeas/slack-desc
new file mode 100644
index 0000000000..6274d75d42
--- /dev/null
+++ b/python/python3-augeas/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python3-augeas: python3-augeas (Python 3 bindings for augeas)
+python3-augeas:
+python3-augeas: Pure python 3 bindings for augeas
+python3-augeas:
+python3-augeas: Homepage: http://augeas.net/
+python3-augeas:
+python3-augeas:
+python3-augeas:
+python3-augeas:
+python3-augeas:
+python3-augeas:
diff --git a/python/python3-defusedxml/README b/python/python3-defusedxml/README
new file mode 100644
index 0000000000..252fe89b4b
--- /dev/null
+++ b/python/python3-defusedxml/README
@@ -0,0 +1 @@
+XML bomb protection for Python stdlib modules.
diff --git a/python/python3-defusedxml/python3-defusedxml.SlackBuild b/python/python3-defusedxml/python3-defusedxml.SlackBuild
new file mode 100644
index 0000000000..b2f87eb682
--- /dev/null
+++ b/python/python3-defusedxml/python3-defusedxml.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for "python3-defusedxml".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python3-defusedxml
+SRCNAM=tiran-defusedxml
+REV=${REV:-f6b0e619a6c8}
+VERSION=${VERSION:-0.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$REV
+tar xvf $CWD/v$VERSION.tar.bz2
+cd $SRCNAM-$REV
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.txt LICENSE README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-defusedxml/python3-defusedxml.info b/python/python3-defusedxml/python3-defusedxml.info
new file mode 100644
index 0000000000..bb161da5d9
--- /dev/null
+++ b/python/python3-defusedxml/python3-defusedxml.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-defusedxml"
+VERSION="0.4.1"
+HOMEPAGE="https://bitbucket.org/tiran/defusedxml/"
+DOWNLOAD="https://bitbucket.org/tiran/defusedxml/get/v0.4.1.tar.bz2"
+MD5SUM="f84ac91c1b82860ec329aebeb5484462"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python3-defusedxml/slack-desc b/python/python3-defusedxml/slack-desc
new file mode 100644
index 0000000000..d1404e4351
--- /dev/null
+++ b/python/python3-defusedxml/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+python3-defusedxml: python3-defusedxml (XML bomb protection for Python stdlib modules)
+python3-defusedxml:
+python3-defusedxml: XML bomb protection for Python stdlib modules.
+python3-defusedxml:
+python3-defusedxml: Homepage: https://bitbucket.org/tiran/defusedxml/
+python3-defusedxml:
+python3-defusedxml:
+python3-defusedxml:
+python3-defusedxml:
+python3-defusedxml:
+python3-defusedxml:
diff --git a/python/python3-dugong/README b/python/python3-dugong/README
new file mode 100644
index 0000000000..6b6ee0f671
--- /dev/null
+++ b/python/python3-dugong/README
@@ -0,0 +1,3 @@
+The Python Dugong module provides an API for communicating with
+HTTP 1.1 servers. It is an alternative to the standard library's
+http.client (formerly httplib) module.
diff --git a/python/python3-dugong/python3-dugong.SlackBuild b/python/python3-dugong/python3-dugong.SlackBuild
new file mode 100644
index 0000000000..f743d393b5
--- /dev/null
+++ b/python/python3-dugong/python3-dugong.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for "python3-dugong".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python3-dugong
+SRCNAM=nikratio-python-dugong
+REV=${REV:-c04412d6a69d}
+VERSION=${VERSION:-3.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$REV
+tar xvf $CWD/release-$VERSION.tar.bz2
+cd $SRCNAM-$REV
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-dugong/python3-dugong.info b/python/python3-dugong/python3-dugong.info
new file mode 100644
index 0000000000..ab8e8f89b5
--- /dev/null
+++ b/python/python3-dugong/python3-dugong.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-dugong"
+VERSION="3.5"
+HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
+DOWNLOAD="https://bitbucket.org/nikratio/python-dugong/get/release-3.5.tar.bz2"
+MD5SUM="e1293f7189681309c66f63d4ebccfb8a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python3-dugong/slack-desc b/python/python3-dugong/slack-desc
new file mode 100644
index 0000000000..61ec13efe8
--- /dev/null
+++ b/python/python3-dugong/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+python3-dugong: python3-dugong (HTTP 1.1 communication API)
+python3-dugong:
+python3-dugong: The Python Dugong module provides an API for communicating with
+python3-dugong: HTTP 1.1 servers. It is an alternative to the standard library's
+python3-dugong: http.client (formerly httplib) module.
+python3-dugong:
+python3-dugong: Homepage: https://bitbucket.org/nikratio/python-dugong/
+python3-dugong:
+python3-dugong:
+python3-dugong:
+python3-dugong:
diff --git a/python/python3-lhafile/README b/python/python3-lhafile/README
new file mode 100644
index 0000000000..ad9fda0525
--- /dev/null
+++ b/python/python3-lhafile/README
@@ -0,0 +1,5 @@
+This project is an updated version of the project found
+at http://trac.neotitans.net/wiki/lhafile.
+It is primarily used as a component in FS-UAE Launcher to index and
+extract files from .lha archives. The project consists of a Python
+package (lhafile) and a C extension for Python (lzhlib).
diff --git a/python/python3-lhafile/python3-lhafile.SlackBuild b/python/python3-lhafile/python3-lhafile.SlackBuild
new file mode 100644
index 0000000000..83a1fe5e76
--- /dev/null
+++ b/python/python3-lhafile/python3-lhafile.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for "python3-lhafile".
+
+# Copyright 2014-2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python3-lhafile
+SRCNAM=python-lhafile
+VERSION=${VERSION:-0.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.txt README.txt VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-lhafile/python3-lhafile.info b/python/python3-lhafile/python3-lhafile.info
new file mode 100644
index 0000000000..a2a7cd5083
--- /dev/null
+++ b/python/python3-lhafile/python3-lhafile.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-lhafile"
+VERSION="0.2.1"
+HOMEPAGE="http://fengestad.no/python-lhafile/"
+DOWNLOAD="http://fengestad.no/python-lhafile/python-lhafile-0.2.1.tar.gz"
+MD5SUM="bc63d61a1b562bbbc52118c168f8cb5e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python3-lhafile/slack-desc b/python/python3-lhafile/slack-desc
new file mode 100644
index 0000000000..c75ffc27ff
--- /dev/null
+++ b/python/python3-lhafile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+python3-lhafile: python3-lhafile (Python LHA archive extension)
+python3-lhafile:
+python3-lhafile: This project is an updated version of the project found
+python3-lhafile: at http://trac.neotitans.net/wiki/lhafile.
+python3-lhafile: It is primarily used as a component in FS-UAE Launcher to index and
+python3-lhafile: extract files from .lha archives. The project consists of a Python
+python3-lhafile: package (lhafile) and a C extension for Python (lzhlib).
+python3-lhafile:
+python3-lhafile: Homepage: http://fengestad.no/python-lhafile/
+python3-lhafile:
+python3-lhafile:
diff --git a/python/python3-pycrypto/README b/python/python3-pycrypto/README
new file mode 100644
index 0000000000..e40f72ec0e
--- /dev/null
+++ b/python/python3-pycrypto/README
@@ -0,0 +1,3 @@
+This is a collection of both secure hash functions (such as SHA256
+and RIPEMD160), and various encryption algorithms (AES, DES, RSA,
+ElGamal, etc.).
diff --git a/python/python3-pycrypto/python3-pycrypto.SlackBuild b/python/python3-pycrypto/python3-pycrypto.SlackBuild
new file mode 100644
index 0000000000..ab35ee6f5a
--- /dev/null
+++ b/python/python3-pycrypto/python3-pycrypto.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for "python3-pycrypto".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python3-pycrypto
+SRCNAM=pycrypto
+VERSION=${VERSION:-2.6.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar ACKS COPYRIGHT ChangeLog Doc LEGAL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pycrypto/python3-pycrypto.info b/python/python3-pycrypto/python3-pycrypto.info
new file mode 100644
index 0000000000..d12e8d768b
--- /dev/null
+++ b/python/python3-pycrypto/python3-pycrypto.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pycrypto"
+VERSION="2.6.1"
+HOMEPAGE="https://www.dlitz.net/software/pycrypto/"
+DOWNLOAD="https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz"
+MD5SUM="55a61a054aa66812daf5161a0d5d7eda"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python3-pycrypto/slack-desc b/python/python3-pycrypto/slack-desc
new file mode 100644
index 0000000000..b4114a4c5d
--- /dev/null
+++ b/python/python3-pycrypto/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+python3-pycrypto: python3-pycrypto (The Python Cryptography Toolkit)
+python3-pycrypto:
+python3-pycrypto: This is a collection of both secure hash functions (such as SHA256
+python3-pycrypto: and RIPEMD160), and various encryption algorithms (AES, DES, RSA,
+python3-pycrypto: ElGamal, etc.).
+python3-pycrypto:
+python3-pycrypto: Homepage: https://www.dlitz.net/software/pycrypto/
+python3-pycrypto:
+python3-pycrypto:
+python3-pycrypto:
+python3-pycrypto:
diff --git a/python/python3-pyparted/README b/python/python3-pyparted/README
new file mode 100644
index 0000000000..ae232c1676
--- /dev/null
+++ b/python/python3-pyparted/README
@@ -0,0 +1,7 @@
+pyparted
+Python bindings for libparted
+-----------------------------
+
+pyparted is a set of native Python bindings for libparted.  libparted is the
+library portion of the GNU parted project.  With pyparted, you can write
+applications that interact with disk partition tables and filesystems.
diff --git a/python/python3-pyparted/python3-pyparted.SlackBuild b/python/python3-pyparted/python3-pyparted.SlackBuild
new file mode 100644
index 0000000000..283a7f24b0
--- /dev/null
+++ b/python/python3-pyparted/python3-pyparted.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Slackware build script for python3-pyparted
+
+# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=python3-pyparted
+SRCNAM=pyparted
+VERSION=${VERSION:-3.10.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -r $CWD/v$VERSION.tar.gz ]; then
+  mv $CWD/v$VERSION.tar.gz $CWD/$SRCNAM-$VERSION.tar.gz
+fi
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BUGS COPYING HACKING NEWS README RELEASE TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-pyparted/python3-pyparted.info b/python/python3-pyparted/python3-pyparted.info
new file mode 100644
index 0000000000..6f466a8e70
--- /dev/null
+++ b/python/python3-pyparted/python3-pyparted.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-pyparted"
+VERSION="3.10.5"
+HOMEPAGE="https://github.com/rhinstaller/pyparted"
+DOWNLOAD="https://github.com/rhinstaller/pyparted/archive/v3.10.5.tar.gz"
+MD5SUM="b303caf8e907a2541e71aa492494b5e5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/python/python3-pyparted/slack-desc b/python/python3-pyparted/slack-desc
new file mode 100644
index 0000000000..c3ce00770f
--- /dev/null
+++ b/python/python3-pyparted/slack-desc
@@ -0,0 +1,26 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+python3-pyparted: python3-pyparted (Python 3 bindings for libparted)
+python3-pyparted:
+python3-pyparted: pyparted is a set of native Python 3 bindings for libparted.
+python3-pyparted: libparted is the library portion of the GNU parted project.
+python3-pyparted: With pyparted, you can write applications that interact with disk
+python3-pyparted: partition tables and filesystems.
+python3-pyparted:
+python3-pyparted: Homepage: https://github.com/rhinstaller/pyparted
+python3-pyparted:
+python3-pyparted:
+python3-pyparted:
diff --git a/python/python3-sip/README b/python/python3-sip/README
new file mode 100644
index 0000000000..73272f0e41
--- /dev/null
+++ b/python/python3-sip/README
@@ -0,0 +1,4 @@
+SIP is a tool that makes it very easy to create Python bindings for
+C and C++ libraries.  It was originally developed to create PyQt,
+the Python bindings for the Qt toolkit, but can be used to create
+bindings for any C or C++ library.
diff --git a/python/python3-sip/python3-sip.SlackBuild b/python/python3-sip/python3-sip.SlackBuild
new file mode 100644
index 0000000000..24ee152b16
--- /dev/null
+++ b/python/python3-sip/python3-sip.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
+# Adapted by Marcel Saegebarth <marc@mos6581.de>
+
+PRGNAM=python3-sip
+SRCNAM=sip
+VERSION=${VERSION:-4.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+PYTHONVER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
+PYTHONLIB=/usr/lib$LIBDIRSUFFIX/python$PYTHONVER/site-packages
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 configure.py \
+  -b "/usr/bin" \
+  -d "$PYTHONLIB" \
+  -e "/usr/include/python$PYTHONVER" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS"
+
+make
+make install DESTDIR=$PKG
+
+(
+  cd $PKG/usr/bin
+  mv sip python3-sip
+)
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE* NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/python3-sip/python3-sip.info b/python/python3-sip/python3-sip.info
new file mode 100644
index 0000000000..2ef6c1bf44
--- /dev/null
+++ b/python/python3-sip/python3-sip.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-sip"
+VERSION="4.17"
+HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro/"
+DOWNLOAD="http://downloads.sourceforge.net/project/pyqt/sip/sip-4.17/sip-4.17.tar.gz"
+MD5SUM="ca51677770fa62dd5087877688cf97ba"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/python/python3-sip/slack-desc b/python/python3-sip/slack-desc
new file mode 100644
index 0000000000..ed15edff1c
--- /dev/null
+++ b/python/python3-sip/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+python3-sip: SIP (Tool to generate Python bindings)
+python3-sip:
+python3-sip: SIP is a tool that makes it very easy to create Python bindings for
+python3-sip: C and C++ libraries.  It was originally developed to create PyQt,
+python3-sip: the Python bindings for the Qt toolkit, but can be used to create
+python3-sip: bindings for any C or C++ library.
+python3-sip:
+python3-sip: Homepage: http://www.riverbankcomputing.com/software/sip/intro/
+python3-sip:
+python3-sip:
+python3-sip:
diff --git a/python/python3/patches/python3.no-static-library.diff b/python/python3/patches/python3.no-static-library.diff
index fa3a36b9d5..c33aeedcf7 100644
--- a/python/python3/patches/python3.no-static-library.diff
+++ b/python/python3/patches/python3.no-static-library.diff
@@ -1,16 +1,16 @@
-diff -uar Python-3.4.3.orig/Makefile.pre.in Python-3.4.3/Makefile.pre.in
---- Python-3.4.3.orig/Makefile.pre.in	2015-02-25 13:27:45.000000000 +0200
-+++ Python-3.4.3/Makefile.pre.in	2015-02-25 21:29:01.322056319 +0200
-@@ -538,7 +538,7 @@
+diff -uar Python-3.5.1.orig/Makefile.pre.in Python-3.5.1/Makefile.pre.in
+--- Python-3.5.1.orig/Makefile.pre.in	2015-12-07 03:39:09.000000000 +0200
++++ Python-3.5.1/Makefile.pre.in	2015-12-14 21:25:22.103542432 +0200
+@@ -564,7 +564,7 @@
  	$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
  
  # Build the interpreter
--$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+-$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
++$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
  platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -573,18 +573,6 @@
+@@ -599,18 +599,6 @@
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  
@@ -29,16 +29,16 @@ diff -uar Python-3.4.3.orig/Makefile.pre.in Python-3.4.3/Makefile.pre.in
  libpython$(LDVERSION).so: $(LIBRARY_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
  		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -674,7 +662,7 @@
+@@ -700,7 +688,7 @@
  		echo "-----------------------------------------------"; \
  	fi
  
--Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
++Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
  ############################################################################
-@@ -1325,18 +1313,6 @@
+@@ -1372,18 +1360,6 @@
  		else	true; \
  		fi; \
  	done
@@ -55,5 +55,5 @@ diff -uar Python-3.4.3.orig/Makefile.pre.in Python-3.4.3/Makefile.pre.in
 -		fi; \
 -	fi
  	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+ 	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
diff --git a/python/python3/patches/python3.x86_64.diff b/python/python3/patches/python3.x86_64.diff
index 6d03183149..c6fbf34eba 100644
--- a/python/python3/patches/python3.x86_64.diff
+++ b/python/python3/patches/python3.x86_64.diff
@@ -1,6 +1,6 @@
-diff -uar Python-3.4.3.orig/Lib/distutils/command/install.py Python-3.4.3/Lib/distutils/command/install.py
---- Python-3.4.3.orig/Lib/distutils/command/install.py	2015-02-25 13:27:44.000000000 +0200
-+++ Python-3.4.3/Lib/distutils/command/install.py	2015-02-25 21:32:54.352351233 +0200
+diff -uar Python-3.5.1.orig/Lib/distutils/command/install.py Python-3.5.1/Lib/distutils/command/install.py
+--- Python-3.5.1.orig/Lib/distutils/command/install.py	2015-12-07 03:39:07.000000000 +0200
++++ Python-3.5.1/Lib/distutils/command/install.py	2015-12-14 21:27:46.083400395 +0200
 @@ -29,15 +29,15 @@
  
  INSTALL_SCHEMES = {
@@ -21,10 +21,10 @@ diff -uar Python-3.4.3.orig/Lib/distutils/command/install.py Python-3.4.3/Lib/di
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -uar Python-3.4.3.orig/Lib/distutils/sysconfig.py Python-3.4.3/Lib/distutils/sysconfig.py
---- Python-3.4.3.orig/Lib/distutils/sysconfig.py	2015-02-25 13:27:44.000000000 +0200
-+++ Python-3.4.3/Lib/distutils/sysconfig.py	2015-02-25 21:32:54.352351233 +0200
-@@ -142,7 +142,7 @@
+diff -uar Python-3.5.1.orig/Lib/distutils/sysconfig.py Python-3.5.1/Lib/distutils/sysconfig.py
+--- Python-3.5.1.orig/Lib/distutils/sysconfig.py	2015-12-07 03:39:07.000000000 +0200
++++ Python-3.5.1/Lib/distutils/sysconfig.py	2015-12-14 21:27:46.083400395 +0200
+@@ -133,7 +133,7 @@
  
      if os.name == "posix":
          libpython = os.path.join(prefix,
@@ -33,10 +33,10 @@ diff -uar Python-3.4.3.orig/Lib/distutils/sysconfig.py Python-3.4.3/Lib/distutil
          if standard_lib:
              return libpython
          else:
-diff -uar Python-3.4.3.orig/Lib/site.py Python-3.4.3/Lib/site.py
---- Python-3.4.3.orig/Lib/site.py	2015-02-25 13:27:44.000000000 +0200
-+++ Python-3.4.3/Lib/site.py	2015-02-25 21:32:54.353351252 +0200
-@@ -304,13 +304,13 @@
+diff -uar Python-3.5.1.orig/Lib/site.py Python-3.5.1/Lib/site.py
+--- Python-3.5.1.orig/Lib/site.py	2015-12-07 03:39:08.000000000 +0200
++++ Python-3.5.1/Lib/site.py	2015-12-14 21:27:46.083400395 +0200
+@@ -303,7 +303,7 @@
          seen.add(prefix)
  
          if os.sep == '/':
@@ -44,17 +44,10 @@ diff -uar Python-3.4.3.orig/Lib/site.py Python-3.4.3/Lib/site.py
 +            sitepackages.append(os.path.join(prefix, "lib64",
                                          "python" + sys.version[:3],
                                          "site-packages"))
-             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
          else:
-             sitepackages.append(prefix)
--            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
-         if sys.platform == "darwin":
-             # for framework builds *only* we add the standard Apple
-             # locations.
-diff -uar Python-3.4.3.orig/Lib/sysconfig.py Python-3.4.3/Lib/sysconfig.py
---- Python-3.4.3.orig/Lib/sysconfig.py	2015-02-25 13:27:44.000000000 +0200
-+++ Python-3.4.3/Lib/sysconfig.py	2015-02-25 21:32:54.353351252 +0200
+diff -uar Python-3.5.1.orig/Lib/sysconfig.py Python-3.5.1/Lib/sysconfig.py
+--- Python-3.5.1.orig/Lib/sysconfig.py	2015-12-07 03:39:08.000000000 +0200
++++ Python-3.5.1/Lib/sysconfig.py	2015-12-14 21:27:46.084400429 +0200
 @@ -20,10 +20,10 @@
  
  _INSTALL_SCHEMES = {
@@ -100,10 +93,10 @@ diff -uar Python-3.4.3.orig/Lib/sysconfig.py Python-3.4.3/Lib/sysconfig.py
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data': '{userbase}',
-diff -uar Python-3.4.3.orig/Makefile.pre.in Python-3.4.3/Makefile.pre.in
---- Python-3.4.3.orig/Makefile.pre.in	2015-02-25 13:27:45.000000000 +0200
-+++ Python-3.4.3/Makefile.pre.in	2015-02-25 21:32:54.354351276 +0200
-@@ -120,7 +120,7 @@
+diff -uar Python-3.5.1.orig/Makefile.pre.in Python-3.5.1/Makefile.pre.in
+--- Python-3.5.1.orig/Makefile.pre.in	2015-12-07 03:39:09.000000000 +0200
++++ Python-3.5.1/Makefile.pre.in	2015-12-14 21:27:46.084400429 +0200
+@@ -125,7 +125,7 @@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -112,9 +105,9 @@ diff -uar Python-3.4.3.orig/Makefile.pre.in Python-3.4.3/Makefile.pre.in
  ABIFLAGS=	@ABIFLAGS@
  
  # Detailed destination directories
-diff -uar Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c
---- Python-3.4.3.orig/Modules/getpath.c	2015-02-25 13:27:46.000000000 +0200
-+++ Python-3.4.3/Modules/getpath.c	2015-02-25 21:32:54.354351276 +0200
+diff -uar Python-3.5.1.orig/Modules/getpath.c Python-3.5.1/Modules/getpath.c
+--- Python-3.5.1.orig/Modules/getpath.c	2015-12-07 03:39:10.000000000 +0200
++++ Python-3.5.1/Modules/getpath.c	2015-12-14 21:27:46.085400463 +0200
 @@ -118,8 +118,8 @@
  #endif
  
@@ -126,16 +119,16 @@ diff -uar Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c
  #endif
  
  #ifndef LANDMARK
-@@ -494,7 +494,7 @@
-     _pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
-     _prefix = _Py_char2wchar(PREFIX, NULL);
-     _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
--    lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
-+    lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
+@@ -511,7 +511,7 @@
+     _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
+     _prefix = Py_DecodeLocale(PREFIX, NULL);
+     _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
+-    lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
++    lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
  
      if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
          Py_FatalError(
-@@ -683,7 +683,7 @@
+@@ -700,7 +700,7 @@
      }
      else
          wcsncpy(zip_path, _prefix, MAXPATHLEN);
@@ -144,7 +137,7 @@ diff -uar Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c
      bufsz = wcslen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
-@@ -695,7 +695,7 @@
+@@ -712,7 +712,7 @@
              fprintf(stderr,
                  "Could not find platform dependent libraries <exec_prefix>\n");
          wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
@@ -153,22 +146,22 @@ diff -uar Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
-diff -uar Python-3.4.3.orig/configure Python-3.4.3/configure
---- Python-3.4.3.orig/configure	2015-02-25 13:27:46.000000000 +0200
-+++ Python-3.4.3/configure	2015-02-25 21:32:54.358351377 +0200
-@@ -14022,7 +14022,7 @@
+diff -uar Python-3.5.1.orig/configure Python-3.5.1/configure
+--- Python-3.5.1.orig/configure	2015-12-07 03:39:11.000000000 +0200
++++ Python-3.5.1/configure	2015-12-14 21:27:46.089400598 +0200
+@@ -14464,7 +14464,7 @@
  $as_echo "$LDVERSION" >&6; }
  
  
--LIBPL="${prefix}/lib/python${VERSION}/config-${LDVERSION}"
-+LIBPL="${prefix}/lib64/python${VERSION}/config-${LDVERSION}"
+-LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
++LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
  
  
  # Check whether right shifting a negative integer extends the sign bit
-diff -uar Python-3.4.3.orig/setup.py Python-3.4.3/setup.py
---- Python-3.4.3.orig/setup.py	2015-02-25 13:27:46.000000000 +0200
-+++ Python-3.4.3/setup.py	2015-02-25 21:32:54.358351377 +0200
-@@ -451,7 +451,7 @@
+diff -uar Python-3.5.1.orig/setup.py Python-3.5.1/setup.py
+--- Python-3.5.1.orig/setup.py	2015-12-07 03:39:11.000000000 +0200
++++ Python-3.5.1/setup.py	2015-12-14 21:27:46.090400632 +0200
+@@ -469,7 +469,7 @@
          # directories (i.e. '.' and 'Include') must be first.  See issue
          # 10520.
          if not cross_compiling:
@@ -177,7 +170,7 @@ diff -uar Python-3.4.3.orig/setup.py Python-3.4.3/setup.py
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
          # only change this for cross builds for 3.3, issues on Mageia
          if cross_compiling:
-@@ -730,11 +730,11 @@
+@@ -750,11 +750,11 @@
              elif curses_library:
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
@@ -191,7 +184,7 @@ diff -uar Python-3.4.3.orig/setup.py Python-3.4.3/setup.py
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -771,8 +771,8 @@
+@@ -791,8 +791,8 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
diff --git a/python/python3/python3.SlackBuild b/python/python3/python3.SlackBuild
index 6b67d7609b..6841db8685 100644
--- a/python/python3/python3.SlackBuild
+++ b/python/python3/python3.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=python3
-VERSION=${VERSION:-3.4.3}
+VERSION=${VERSION:-3.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,9 +56,9 @@ PYVER=$(cut -d. -f1,2 <<< "$VERSION")
 
 set -eu
 
-# Location for Python site-packages:
+# Location for Python site-packages.
 SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${PYVER}/site-packages
-# same as above without $PKG
+# Same as above without $PKG.
 TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${PYVER}/site-packages
 
 rm -rf $PKG
@@ -69,11 +69,11 @@ tar xvf $CWD/Python-$VERSION.tar.xz
 cd Python-$VERSION
 
 patch -p1 -i $CWD/patches/python3.readline.set_pre_input_hook.diff
-# We don't want a large libpython*.a:
+# We don't want a large libpython*.a.
 patch -p1 -i $CWD/patches/python3.no-static-library.diff
 
 if [ "$ARCH" = "x86_64" ]; then
-  # Install to lib64 instead of lib:
+  # Install to lib64 instead of lib.
   patch -p1 -i $CWD/patches/python3.x86_64.diff
 fi
 
@@ -84,9 +84,6 @@ sed -i '1s|^#.*/usr/local/bin/python|#!/usr/bin/python3|' Lib/cgi.py
 # install pip anyway.
 sed -i 's|\("install",\)|\1 "--ignore-installed",|' Lib/ensurepip/__init__.py
 
-# Fix the SO for --extension-suffix in python3-config.
-sed -i 's|@SO@|@EXT_SUFFIX@|' Misc/python-config.sh.in
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -116,7 +113,7 @@ sed -i 's|\("install",\) "--ignore-installed",|\1|' \
 # Remove to avoid overwriting a copy from Python2.
 rm -f $PKG/usr/bin/2to3
 
-# We'll install the python-tools under site-packages:
+# We'll install the python-tools under site-packages.
 mkdir -p $SITEPK
 cp -a Tools/* $SITEPK
 
@@ -126,7 +123,7 @@ find $PKG \( -name '*.exe' -o -name '*.bat' \) -exec rm -f '{}' \;
 # Fix permissions on dynamic libraries.
 find $PKG -type f -perm 555 -exec chmod 755 '{}' \;
 
-# Install docs:
+# Install docs.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README LICENSE Misc $PKG/usr/doc/$PRGNAM-$VERSION
 mv $SITEPK/README $PKG/usr/doc/$PRGNAM-$VERSION/README.python-tools
diff --git a/python/python3/python3.info b/python/python3/python3.info
index a6c38301e9..f668b29910 100644
--- a/python/python3/python3.info
+++ b/python/python3/python3.info
@@ -1,8 +1,8 @@
 PRGNAM="python3"
-VERSION="3.4.3"
+VERSION="3.5.1"
 HOMEPAGE="https://www.python.org/"
-DOWNLOAD="https://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz"
-MD5SUM="7d092d1bba6e17f0d9bd21b49e441dd5"
+DOWNLOAD="https://www.python.org/ftp/python/3.5.1/Python-3.5.1.tar.xz"
+MD5SUM="e9ea6f2623fffcdd871b7b19113fde80"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/regex/regex.SlackBuild b/python/regex/regex.SlackBuild
index 5bb47f28ff..14184d22d1 100644
--- a/python/regex/regex.SlackBuild
+++ b/python/regex/regex.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for regex
 
-# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=regex
-VERSION=${VERSION:-2015.07.19}
+VERSION=${VERSION:-2016.01.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/regex/regex.info b/python/regex/regex.info
index afa6d7270c..8a3d59564b 100644
--- a/python/regex/regex.info
+++ b/python/regex/regex.info
@@ -1,8 +1,8 @@
 PRGNAM="regex"
-VERSION="2015.07.19"
-HOMEPAGE="https://code.google.com/p/mrab-regex-hg/"
-DOWNLOAD="https://pypi.python.org/packages/source/r/regex/regex-2015.07.19.tar.gz"
-MD5SUM="6e7b9169b5a016ef306db51ad29c5958"
+VERSION="2016.01.10"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+DOWNLOAD="https://pypi.python.org/packages/source/r/regex/regex-2016.01.10.tar.gz"
+MD5SUM="17d03a6c7028b8f652915591bc5b5126"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/requirements-detector/requirements-detector.SlackBuild b/python/requirements-detector/requirements-detector.SlackBuild
index 93cda5f235..d361cdbd76 100644
--- a/python/requirements-detector/requirements-detector.SlackBuild
+++ b/python/requirements-detector/requirements-detector.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for requirements-detector
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=requirements-detector
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-0.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/requirements-detector/requirements-detector.info b/python/requirements-detector/requirements-detector.info
index e307463dfb..97f5de0b7a 100644
--- a/python/requirements-detector/requirements-detector.info
+++ b/python/requirements-detector/requirements-detector.info
@@ -1,8 +1,8 @@
 PRGNAM="requirements-detector"
-VERSION="0.4"
+VERSION="0.4.1"
 HOMEPAGE="https://github.com/landscapeio/requirements-detector"
-DOWNLOAD="https://pypi.python.org/packages/source/r/requirements-detector/requirements-detector-0.4.tar.gz"
-MD5SUM="6f76914e2944d070ee0e44dd75571c99"
+DOWNLOAD="https://pypi.python.org/packages/source/r/requirements-detector/requirements-detector-0.4.1.tar.gz"
+MD5SUM="6fbd05d8e2555de7e55ed89c7e1854c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="astroid"
diff --git a/python/rope/README b/python/rope/README
index 3a627841da..42a06f5a38 100644
--- a/python/rope/README
+++ b/python/rope/README
@@ -1,3 +1,3 @@
 Rope is a python refactoring library.
 
-Rope can optionally use pysetuptools during build time.
+Optional dependencies: pysvn
diff --git a/python/rope/rope.SlackBuild b/python/rope/rope.SlackBuild
index bed9c56e5c..9d137a7504 100644
--- a/python/rope/rope.SlackBuild
+++ b/python/rope/rope.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rope
 
-# Copyright 2011-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rope
-VERSION=${VERSION:-0.10.2}
+VERSION=${VERSION:-0.10.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING PKG-INFO README.rst docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.rst docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/rope/rope.info b/python/rope/rope.info
index e3193f6d68..23eaefae31 100644
--- a/python/rope/rope.info
+++ b/python/rope/rope.info
@@ -1,8 +1,8 @@
 PRGNAM="rope"
-VERSION="0.10.2"
-HOMEPAGE="http://rope.sourceforge.net/"
-DOWNLOAD="http://pypi.python.org/packages/source/r/rope/rope-0.10.2.tar.gz"
-MD5SUM="8d3341cd2994df5ea08e1729b45dac7c"
+VERSION="0.10.3"
+HOMEPAGE="https://github.com/python-rope/rope"
+DOWNLOAD="http://pypi.python.org/packages/source/r/rope/rope-0.10.3.tar.gz"
+MD5SUM="2fd498b64fe5390946167494eff13642"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/rsa/rsa.SlackBuild b/python/rsa/rsa.SlackBuild
index be68bde864..a288804ce1 100644
--- a/python/rsa/rsa.SlackBuild
+++ b/python/rsa/rsa.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rsa
 
-# Copyright 2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rsa
-VERSION=${VERSION:-3.1.4}
+VERSION=${VERSION:-3.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/rsa/rsa.info b/python/rsa/rsa.info
index e63e7d5677..3855f81c90 100644
--- a/python/rsa/rsa.info
+++ b/python/rsa/rsa.info
@@ -1,8 +1,8 @@
 PRGNAM="rsa"
-VERSION="3.1.4"
+VERSION="3.2.3"
 HOMEPAGE="http://stuvel.eu/rsa"
-DOWNLOAD="https://pypi.python.org/packages/source/r/rsa/rsa-3.1.4.tar.gz"
-MD5SUM="b6b1c80e1931d4eba8538fd5d4de1355"
+DOWNLOAD="https://pypi.python.org/packages/source/r/rsa/rsa-3.2.3.tar.gz"
+MD5SUM="0e93ca942184650116d84452d4b90253"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools pyasn1"
diff --git a/python/s3cmd/s3cmd.SlackBuild b/python/s3cmd/s3cmd.SlackBuild
index 220383344e..5b945e3cb0 100644
--- a/python/s3cmd/s3cmd.SlackBuild
+++ b/python/s3cmd/s3cmd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=s3cmd
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/s3cmd/s3cmd.info b/python/s3cmd/s3cmd.info
index 263d337cc5..c83885ea09 100644
--- a/python/s3cmd/s3cmd.info
+++ b/python/s3cmd/s3cmd.info
@@ -1,8 +1,8 @@
 PRGNAM="s3cmd"
-VERSION="1.5.2"
+VERSION="1.6.0"
 HOMEPAGE="http://s3tools.org/s3cmd"
-DOWNLOAD="http://downloads.sourceforge.net/s3tools/s3cmd-1.5.2.tar.gz"
-MD5SUM="3153116dc62c817a724ea58080968383"
+DOWNLOAD="http://downloads.sourceforge.net/s3tools/s3cmd-1.6.0.tar.gz"
+MD5SUM="c07a81248b4f26b299ada8ab4ccc8801"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-dateutil"
diff --git a/python/selenium/selenium.SlackBuild b/python/selenium/selenium.SlackBuild
index 98f06edf33..e1bab028f8 100644
--- a/python/selenium/selenium.SlackBuild
+++ b/python/selenium/selenium.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=selenium
-VERSION=${VERSION:-2.47.0}
+VERSION=${VERSION:-2.48.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/selenium/selenium.info b/python/selenium/selenium.info
index e58d71e398..4530f8d689 100644
--- a/python/selenium/selenium.info
+++ b/python/selenium/selenium.info
@@ -1,8 +1,8 @@
 PRGNAM="selenium"
-VERSION="2.47.0"
+VERSION="2.48.0"
 HOMEPAGE="http://www.seleniumhq.org"
-DOWNLOAD="https://pypi.python.org/packages/source/s/selenium/selenium-2.47.0.tar.gz"
-MD5SUM="a6ae00bc62b3cda0f0f293c1dc3b90f6"
+DOWNLOAD="https://pypi.python.org/packages/source/s/selenium/selenium-2.48.0.tar.gz"
+MD5SUM="d1e0635b427151d86457170825b96cf8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/simplejson/README b/python/simplejson/README
index fd00d47fff..dc5c972c0b 100644
--- a/python/simplejson/README
+++ b/python/simplejson/README
@@ -3,5 +3,9 @@ Simplejson is a simple, fast, complete, correct and extensible JSON
 pure Python code with no dependencies, but includes an optional C extension for
 a serious speed boost.
 
-Optional documentation can be built if Sphinx Pygments are installed. Python3
-bindings can be built if python3 is installed.
+Optional dependencies: Sphinx, python3 and pysetuptools
+
+Note: To install python3 bindings install python3 and pass PYTHON3=yes to the
+slackbuild.
+
+  # PYTHON3 ./simplejson.SlackBuild
diff --git a/python/simplejson/simplejson.SlackBuild b/python/simplejson/simplejson.SlackBuild
index 588fabb55b..58b75434da 100644
--- a/python/simplejson/simplejson.SlackBuild
+++ b/python/simplejson/simplejson.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for simplejson
 
-# Copyright 2009-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=simplejson
-VERSION=${VERSION:-3.5.3}
+VERSION=${VERSION:-3.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,11 +58,13 @@ find -L . \
 # Make documents if Sphinx and Pygments are installed.
 if $(python -c 'import sphinx.pygments_styles' 2>/dev/null); then
   python scripts/make_docs.py
+  rm -f docs/.buildinfo
+  rm -f docs/.nojekyll
 fi
 
 python setup.py install --root=$PKG
 
-if $(python3 -c 'import os' 2>/dev/null); then
+if [ "${PYTHON3:-no}" == "yes" ]; then
   python3 setup.py install --root=$PKG
 fi
 
diff --git a/python/simplejson/simplejson.info b/python/simplejson/simplejson.info
index 4f6874d49e..dad1f06c4b 100644
--- a/python/simplejson/simplejson.info
+++ b/python/simplejson/simplejson.info
@@ -1,8 +1,8 @@
 PRGNAM="simplejson"
-VERSION="3.5.3"
+VERSION="3.8.1"
 HOMEPAGE="https://github.com/simplejson/simplejson"
-DOWNLOAD="http://pypi.python.org/packages/source/s/simplejson/simplejson-3.5.3.tar.gz"
-MD5SUM="d5f62dfa6b6dea31735d56c858361d48"
+DOWNLOAD="http://pypi.python.org/packages/source/s/simplejson/simplejson-3.8.1.tar.gz"
+MD5SUM="b8441f1053edd9dc335ded8c7f98a974"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/six/six.SlackBuild b/python/six/six.SlackBuild
index b1dcbe9f96..b1c25a1eaf 100644
--- a/python/six/six.SlackBuild
+++ b/python/six/six.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=six
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/six/six.info b/python/six/six.info
index e10a30fe04..74c3f41ce8 100644
--- a/python/six/six.info
+++ b/python/six/six.info
@@ -1,8 +1,8 @@
 PRGNAM="six"
-VERSION="1.9.0"
+VERSION="1.10.0"
 HOMEPAGE="http://pypi.python.org/pypi/six/"
-DOWNLOAD="http://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz"
-MD5SUM="476881ef4012262dfc8adc645ee786c4"
+DOWNLOAD="http://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz"
+MD5SUM="34eed507548117b2ab523ab14b2f8b55"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/snuggs/README b/python/snuggs/README
new file mode 100644
index 0000000000..68d70601c0
--- /dev/null
+++ b/python/snuggs/README
@@ -0,0 +1 @@
+Snuggs are s-expressions for Numpy.
diff --git a/python/snuggs/slack-desc b/python/snuggs/slack-desc
new file mode 100644
index 0000000000..64ccd7bc8b
--- /dev/null
+++ b/python/snuggs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+snuggs: snuggs (s-expressions for Numpy)
+snuggs:
+snuggs: Snuggs are s-expressions for Numpy.
+snuggs: 
+snuggs: 
+snuggs: 
+snuggs: 
+snuggs:
+snuggs:
+snuggs:
+snuggs:
diff --git a/python/snuggs/snuggs.SlackBuild b/python/snuggs/snuggs.SlackBuild
new file mode 100644
index 0000000000..c79c2e6e6b
--- /dev/null
+++ b/python/snuggs/snuggs.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for snuggs
+
+# Copyright 2015 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=snuggs
+VERSION=${VERSION:-1.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/snuggs/snuggs.info b/python/snuggs/snuggs.info
new file mode 100644
index 0000000000..cf90247830
--- /dev/null
+++ b/python/snuggs/snuggs.info
@@ -0,0 +1,10 @@
+PRGNAM="snuggs"
+VERSION="1.3.1"
+HOMEPAGE="https://pypi.python.org/pypi/snuggs"
+DOWNLOAD="https://pypi.python.org/packages/source/s/snuggs/snuggs-1.3.1.tar.gz"
+MD5SUM="f812255b9b89d178a96c39395dba263d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="click numpy pyparsing"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/python/stevedore/stevedore.SlackBuild b/python/stevedore/stevedore.SlackBuild
index 2075661d91..64790c8c7f 100644
--- a/python/stevedore/stevedore.SlackBuild
+++ b/python/stevedore/stevedore.SlackBuild
@@ -25,7 +25,7 @@
 
 
 PRGNAM=stevedore
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/stevedore/stevedore.info b/python/stevedore/stevedore.info
index 7fb1d6071e..c9268e31b9 100644
--- a/python/stevedore/stevedore.info
+++ b/python/stevedore/stevedore.info
@@ -1,8 +1,8 @@
 PRGNAM="stevedore"
-VERSION="1.6.0"
+VERSION="1.10.0"
 HOMEPAGE="https://github.com/dreamhost/stevedore"
-DOWNLOAD="https://pypi.python.org/packages/source/s/stevedore/stevedore-1.6.0.tar.gz"
-MD5SUM="c53fc7d4408f715339e7fd3e8189ca4e"
+DOWNLOAD="https://pypi.python.org/packages/source/s/stevedore/stevedore-1.10.0.tar.gz"
+MD5SUM="01117561e6156d3c4780ce869fc245b6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pbr six"
diff --git a/python/stopit/README b/python/stopit/README
new file mode 100644
index 0000000000..3057bee0be
--- /dev/null
+++ b/python/stopit/README
@@ -0,0 +1,2 @@
+Raise asynchronous exceptions in other threads, control the timeout of
+blocks or callables with two context managers and two decorators.
diff --git a/python/stopit/slack-desc b/python/stopit/slack-desc
new file mode 100644
index 0000000000..ebd6859cf3
--- /dev/null
+++ b/python/stopit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+stopit: stopit (Control decorators, context managers, raise exceptions)
+stopit:
+stopit: Raise asynchronous exceptions in other threads, control the timeout
+stopit: of blocks or callables with two context managers and two decorators.
+stopit:
+stopit: Home page:  http://pypi.python.org/pypi/stopit
+stopit:
+stopit:
+stopit:
+stopit:
+stopit:
diff --git a/python/stopit/stopit.SlackBuild b/python/stopit/stopit.SlackBuild
new file mode 100644
index 0000000000..e968160951
--- /dev/null
+++ b/python/stopit/stopit.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for stopit
+
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=stopit
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.rst PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/stopit/stopit.info b/python/stopit/stopit.info
new file mode 100644
index 0000000000..642a094239
--- /dev/null
+++ b/python/stopit/stopit.info
@@ -0,0 +1,10 @@
+PRGNAM="stopit"
+VERSION="1.1.1"
+HOMEPAGE="https://pypi.python.org/pypi/stopit"
+DOWNLOAD="https://pypi.python.org/packages/source/s/stopit/stopit-1.1.1.tar.gz"
+MD5SUM="dec60dae41bec73233e83db003390bdc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Brenton Earl"
+EMAIL="brent@exitstatusone.com"
diff --git a/python/tox/tox.SlackBuild b/python/tox/tox.SlackBuild
index 294b83c162..9d158c1231 100644
--- a/python/tox/tox.SlackBuild
+++ b/python/tox/tox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tox
 
-# Copyright <2014-2015> <Dimitris Zlatanidis> <Orestiada, Greece>
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tox
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/tox/tox.info b/python/tox/tox.info
index af3ef71f9e..3c3c68da4d 100644
--- a/python/tox/tox.info
+++ b/python/tox/tox.info
@@ -1,8 +1,8 @@
 PRGNAM="tox"
-VERSION="2.1.1"
+VERSION="2.3.1"
 HOMEPAGE="http://tox.testrun.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/t/tox/tox-2.1.1.tar.gz"
-MD5SUM="fc5b38cce701ced90a89b9da24af1769"
+DOWNLOAD="https://pypi.python.org/packages/source/t/tox/tox-2.3.1.tar.gz"
+MD5SUM="9371b3d3e25c03751a0372e19602dfb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="py virtualenv pluggy"
diff --git a/python/virtualenv/virtualenv.SlackBuild b/python/virtualenv/virtualenv.SlackBuild
index 6ff0a45b1c..38355877dc 100644
--- a/python/virtualenv/virtualenv.SlackBuild
+++ b/python/virtualenv/virtualenv.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=virtualenv
-VERSION=${VERSION:-13.1.0}
+VERSION=${VERSION:-13.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/virtualenv/virtualenv.info b/python/virtualenv/virtualenv.info
index 33890452a6..eb7cb1af18 100644
--- a/python/virtualenv/virtualenv.info
+++ b/python/virtualenv/virtualenv.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualenv"
-VERSION="13.1.0"
+VERSION="13.1.2"
 HOMEPAGE="https://virtualenv.pypa.io/"
-DOWNLOAD="https://pypi.python.org/packages/source/v/virtualenv/virtualenv-13.1.0.tar.gz"
-MD5SUM="70f63a429b7dd7c3e10f6af09ed32554"
+DOWNLOAD="https://pypi.python.org/packages/source/v/virtualenv/virtualenv-13.1.2.tar.gz"
+MD5SUM="b989598f068d64b32dead530eb25589a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/waitress/waitress.SlackBuild b/python/waitress/waitress.SlackBuild
index 482b712331..5c0fa64d97 100644
--- a/python/waitress/waitress.SlackBuild
+++ b/python/waitress/waitress.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for waitress
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=waitress
-VERSION=${VERSION:-0.8.9}
+VERSION=${VERSION:-0.8.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/waitress/waitress.info b/python/waitress/waitress.info
index eb3bbc4ea7..262a61ddcc 100644
--- a/python/waitress/waitress.info
+++ b/python/waitress/waitress.info
@@ -1,8 +1,8 @@
 PRGNAM="waitress"
-VERSION="0.8.9"
+VERSION="0.8.10"
 HOMEPAGE="https://github.com/Pylons/waitress"
-DOWNLOAD="https://pypi.python.org/packages/source/w/waitress/waitress-0.8.9.tar.gz"
-MD5SUM="da3f2e62b3676be5dd630703a68e2a04"
+DOWNLOAD="https://pypi.python.org/packages/source/w/waitress/waitress-0.8.10.tar.gz"
+MD5SUM="a957f79c1b56224660a5b68c8ef29c8b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/wcwidth/wcwidth.SlackBuild b/python/wcwidth/wcwidth.SlackBuild
index 050581b9ce..3ff55abf03 100644
--- a/python/wcwidth/wcwidth.SlackBuild
+++ b/python/wcwidth/wcwidth.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wcwidth
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wcwidth
-VERSION=${VERSION:-0.1.4}
+VERSION=${VERSION:-0.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/wcwidth/wcwidth.info b/python/wcwidth/wcwidth.info
index 3b885a0a2f..c92c715368 100644
--- a/python/wcwidth/wcwidth.info
+++ b/python/wcwidth/wcwidth.info
@@ -1,8 +1,8 @@
 PRGNAM="wcwidth"
-VERSION="0.1.4"
+VERSION="0.1.6"
 HOMEPAGE="https://github.com/jquast/wcwidth"
-DOWNLOAD="https://pypi.python.org/packages/source/w/wcwidth/wcwidth-0.1.4.tar.gz"
-MD5SUM="4fb1d2481c5a849e57ad3fa7018ccbae"
+DOWNLOAD="https://pypi.python.org/packages/source/w/wcwidth/wcwidth-0.1.6.tar.gz"
+MD5SUM="53031c6d6490d65c1de601595cff835f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools"
diff --git a/python/websocket-client/README b/python/websocket-client/README
new file mode 100644
index 0000000000..5a1072ea30
--- /dev/null
+++ b/python/websocket-client/README
@@ -0,0 +1,2 @@
+websocket-client module is WebSocket client for python.  This provides the low
+level APIs for WebSocket.  All APIs are synchronous functions.
diff --git a/python/websocket-client/slack-desc b/python/websocket-client/slack-desc
new file mode 100644
index 0000000000..59df27b2ba
--- /dev/null
+++ b/python/websocket-client/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+websocket-client: websocket-client (WebSocket client for python)
+websocket-client:
+websocket-client: websocket-client module is WebSocket client for python. This provides
+websocket-client: the low level APIs for WebSocket.  All APIs are synchronous functions
+websocket-client:
+websocket-client:
+websocket-client:
+websocket-client:
+websocket-client:
+websocket-client:
+websocket-client:
diff --git a/python/websocket-client/websocket-client.SlackBuild b/python/websocket-client/websocket-client.SlackBuild
new file mode 100644
index 0000000000..13db3a33b1
--- /dev/null
+++ b/python/websocket-client/websocket-client.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Slackware build script for websocket-client
+
+# Copyright 2015 Markus Rinne Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=websocket-client
+VERSION=${VERSION:-0.32.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -e $CWD/v$VERSION.tar.gz ]; then
+  tar xvf $CWD/v$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog examples/ LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/websocket-client/websocket-client.info b/python/websocket-client/websocket-client.info
new file mode 100644
index 0000000000..4b9f48a27d
--- /dev/null
+++ b/python/websocket-client/websocket-client.info
@@ -0,0 +1,10 @@
+PRGNAM="websocket-client"
+VERSION="0.32.0"
+HOMEPAGE="https://github.com/liris/websocket-client"
+DOWNLOAD="https://github.com/liris/websocket-client/archive/v0.32.0.tar.gz"
+MD5SUM="683a3067266d3fd1a09cebca208c30b6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Markus Rinne"
+EMAIL="markus.ka.rinne@gmail.com"
diff --git a/ruby/heroku-client/heroku-client.SlackBuild b/ruby/heroku-client/heroku-client.SlackBuild
index 8b3352332e..0934fa72f3 100644
--- a/ruby/heroku-client/heroku-client.SlackBuild
+++ b/ruby/heroku-client/heroku-client.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=heroku-client
-VERSION=${VERSION:-3.36.17}
+VERSION=${VERSION:-3.42.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/heroku-client/heroku-client.info b/ruby/heroku-client/heroku-client.info
index d4bc684b2f..1a97b77e2a 100644
--- a/ruby/heroku-client/heroku-client.info
+++ b/ruby/heroku-client/heroku-client.info
@@ -1,8 +1,8 @@
 PRGNAM="heroku-client"
-VERSION="3.36.17"
+VERSION="3.42.25"
 HOMEPAGE="https://toolbelt.heroku.com"
 DOWNLOAD="https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client.tgz"
-MD5SUM="e280ab69e54c556113fae2cd6ce8bd61"
+MD5SUM="66a50258f7d479ec0a12490794572534"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/ruby/heroku-client/slack-desc b/ruby/heroku-client/slack-desc
index c8f1c7bfed..68dee260bf 100644
--- a/ruby/heroku-client/slack-desc
+++ b/ruby/heroku-client/slack-desc
@@ -15,5 +15,5 @@ heroku-client: command shell. Log in using the email address and password you us
 heroku-client: when creating your Heroku account.
 heroku-client:
 heroku-client: Homepage: https://toolbelt.heroku.com
-heroku-client: Release date: May 13, 2015
+heroku-client: Release date: Dec 8, 2015
 heroku-client:
diff --git a/ruby/passenger/passenger.SlackBuild b/ruby/passenger/passenger.SlackBuild
index 470b52bfd5..6766e23b56 100644
--- a/ruby/passenger/passenger.SlackBuild
+++ b/ruby/passenger/passenger.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=passenger
-VERSION=${VERSION:-5.0.10}
+VERSION=${VERSION:-5.0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/passenger/passenger.info b/ruby/passenger/passenger.info
index 00ed18119d..13cd957718 100644
--- a/ruby/passenger/passenger.info
+++ b/ruby/passenger/passenger.info
@@ -1,8 +1,8 @@
 PRGNAM="passenger"
-VERSION="5.0.10"
+VERSION="5.0.16"
 HOMEPAGE="https://www.phusionpassenger.com"
-DOWNLOAD="https://rubygems.org/downloads/passenger-5.0.10.gem"
-MD5SUM="97ab2c8ba8cadc126847bad0dbe26cdd"
+DOWNLOAD="https://rubygems.org/downloads/passenger-5.0.16.gem"
+MD5SUM="5f209091675836767b3886d2ddf0639b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rubygem-rack"
diff --git a/ruby/ruby2/README b/ruby/ruby2/README
index 554246ec33..8016fdaeef 100644
--- a/ruby/ruby2/README
+++ b/ruby/ruby2/README
@@ -1,15 +1,10 @@
-============
-Ruby 2.2.2
-============
-
 Ruby is an interpreted scripting language for quick and easy
 object-oriented programming.  It has many features to process text
 files and to do system management tasks (as in Perl).  It is simple,
 straight-forward, and extensible.
 
-============
 Notes
-============
+======
 
 This build script will install a newer version of ruby alongside
 the provided official Slackware ruby package, however it will overwrite
diff --git a/ruby/ruby2/ruby2.SlackBuild b/ruby/ruby2/ruby2.SlackBuild
index 9b0af0e6b6..4cc787e09a 100644
--- a/ruby/ruby2/ruby2.SlackBuild
+++ b/ruby/ruby2/ruby2.SlackBuild
@@ -31,7 +31,7 @@
 
 PRGNAM=ruby2
 SRCNAM=ruby
-VERSION=${VERSION:-2.2.2}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,11 +98,17 @@ make install DESTDIR=$PKG
 ( cd $PKG/usr/bin
 	mv ruby ruby2
 	mv rake rake2
+	sed -i '0,/ruby/{s/ruby/ruby2/}' rake2
 	mv irb irb2
+	sed -i '0,/ruby/{s/ruby/ruby2/}' irb2
 	mv gem gem2
+	sed -i '0,/ruby/{s/ruby/ruby2/}' gem2
 	mv erb erb2
+	sed -i '0,/ruby/{s/ruby/ruby2/}' erb2
 	mv rdoc rdoc2
+	sed -i '0,/ruby/{s/ruby/ruby2/}' rdoc2
 	mv ri ri2
+	sed -i '0,/ruby/{s/ruby/ruby2/}' ri2
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/ruby/ruby2/ruby2.info b/ruby/ruby2/ruby2.info
index 46fe7af097..b2b6af2d2c 100644
--- a/ruby/ruby2/ruby2.info
+++ b/ruby/ruby2/ruby2.info
@@ -1,8 +1,8 @@
 PRGNAM="ruby2"
-VERSION="2.2.2"
+VERSION="2.2.3"
 HOMEPAGE="http://www.ruby-lang.org"
-DOWNLOAD="http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz"
-MD5SUM="326e99ddc75381c7b50c85f7089f3260"
+DOWNLOAD="https://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.3.tar.gz"
+MD5SUM="150a5efc5f5d8a8011f30aa2594a7654"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/ruby/rubygem-rack/rubygem-rack.SlackBuild b/ruby/rubygem-rack/rubygem-rack.SlackBuild
index 2f22459f1f..1dcdd09b85 100644
--- a/ruby/rubygem-rack/rubygem-rack.SlackBuild
+++ b/ruby/rubygem-rack/rubygem-rack.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rubygem-rack
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/ruby/rubygem-rack/rubygem-rack.info b/ruby/rubygem-rack/rubygem-rack.info
index b70700c795..37f4a58d46 100644
--- a/ruby/rubygem-rack/rubygem-rack.info
+++ b/ruby/rubygem-rack/rubygem-rack.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygem-rack"
-VERSION="1.6.1"
+VERSION="1.6.4"
 HOMEPAGE="https://rubygems.org/gems/rack"
-DOWNLOAD="http://rubygems.org/downloads/rack-1.6.1.gem"
-MD5SUM="3cdbc6ac7c8a0c33c4c30656f11c5f57"
+DOWNLOAD="http://rubygems.org/downloads/rack-1.6.4.gem"
+MD5SUM="7f11121a95fe4e59cd86af2b791a3590"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild
new file mode 100644
index 0000000000..fdc9b10235
--- /dev/null
+++ b/system/Iosevka/Iosevka.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for Iosevka
+
+# Copyright 2015 Eugene M., <damagedone at gmx dot com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=Iosevka
+VERSION=${VERSION:-1.5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $TMP/$PRGNAM-$VERSION
+unzip $CWD/iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+unzip $CWD/iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a *.ttf $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info
new file mode 100644
index 0000000000..3cd5c24171
--- /dev/null
+++ b/system/Iosevka/Iosevka.info
@@ -0,0 +1,12 @@
+PRGNAM="Iosevka"
+VERSION="1.5.1"
+HOMEPAGE="https://be5invis.github.io/Iosevka/"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v1.5.1/iosevka-1.5.1.zip \
+          https://github.com/be5invis/Iosevka/releases/download/v1.5.1/iosevka-slab-1.5.1.zip"
+MD5SUM="69bcd7208f140e945c8b14f3828d615c \
+        e63388c992772c830dcb82539944d9ee"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Eugene M."
+EMAIL="damagedone@gmx.com"
diff --git a/system/Iosevka/LICENSE b/system/Iosevka/LICENSE
new file mode 100644
index 0000000000..d952d62c06
--- /dev/null
+++ b/system/Iosevka/LICENSE
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka/README b/system/Iosevka/README
new file mode 100644
index 0000000000..52524ff6b1
--- /dev/null
+++ b/system/Iosevka/README
@@ -0,0 +1,10 @@
+Iosevka is a slender monospace, sans-serif and slab-serif typeface
+inspired by Pragmata Pro, M+ and PF DIN Mono, designed to be the
+ideal font for programming.
+
+- Four styles: Regular, Italic, Bold, and Bold Italic;
+- Extended language support for most Latin-based Western, Central and
+Northern European languages, as well as Greek and Cyrillic.
+
+This Slackbuild installs two versions of fonts: Iosevka and
+Iosevka-slab.
diff --git a/system/Iosevka/doinst.sh b/system/Iosevka/doinst.sh
new file mode 100644
index 0000000000..883c47ac0a
--- /dev/null
+++ b/system/Iosevka/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/Iosevka/slack-desc b/system/Iosevka/slack-desc
new file mode 100644
index 0000000000..3590cd1e96
--- /dev/null
+++ b/system/Iosevka/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+Iosevka: Iosevka (Open source monospace coding font)
+Iosevka:
+Iosevka: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and
+Iosevka: DIN Mono. It is designed to have a narrow shape to be space
+Iosevka: efficient and compatible to CJK characters.
+Iosevka:
+Iosevka:
+Iosevka: Homepage: https://be5invis.github.io/Iosevka/
+Iosevka:
+Iosevka:
+Iosevka:
diff --git a/system/TLP/TLP.SlackBuild b/system/TLP/TLP.SlackBuild
index 3b37e291b2..cab9621f33 100644
--- a/system/TLP/TLP.SlackBuild
+++ b/system/TLP/TLP.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=TLP
-VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/system/TLP/TLP.info b/system/TLP/TLP.info
index dcec2ad27b..f94dc9823c 100644
--- a/system/TLP/TLP.info
+++ b/system/TLP/TLP.info
@@ -1,8 +1,8 @@
 PRGNAM="TLP"
-VERSION="0.7"
+VERSION="0.8"
 HOMEPAGE="http://linrunner.de/en/tlp/tlp.html"
-DOWNLOAD="http://github.com/linrunner/TLP/archive/0.7.tar.gz"
-MD5SUM="660ee2e507c02f11c62d70ff4ca8329c"
+DOWNLOAD="http://github.com/linrunner/TLP/archive/0.8.tar.gz"
+MD5SUM="d53ef993ce96ccff904d6caad1f14006"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild
index 84b0ba2837..02fceb59f5 100644
--- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild
+++ b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild
@@ -53,7 +53,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/OTF/
 cp OTF/*.otf $PKG/usr/share/fonts/OTF/
diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info
index 89788da9c0..af6541d4b0 100644
--- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info
+++ b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info
@@ -2,7 +2,7 @@ PRGNAM="adobe-source-code-pro-font"
 VERSION="1.030"
 HOMEPAGE="http://adobe-fonts.github.io/source-code-pro/"
 DOWNLOAD="https://github.com/adobe-fonts/source-code-pro/archive/2.010R-ro/1.030R-it.tar.gz"
-MD5SUM="d297130af1c9bbeebd82c32c195d40fc"
+MD5SUM="5d11969eb0a5e243acdbcf046753aa03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild b/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild
index c31a747d64..050bda352e 100644
--- a/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild
+++ b/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for adobe-source-han-sans-fonts
 
-# Copyright 2014  CCHsu, Taiwan
+# Copyright 2015  CCHsu, Taiwan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=adobe-source-han-sans-fonts
-VERSION=${VERSION:-1.001R}
+VERSION=${VERSION:-1.004R}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -44,10 +44,11 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar -xvzf "$CWD"/"$VERSION".tar.gz "$SRC_PRGNAM"-"$VERSION"/LICENSE.txt \
-	"$SRC_PRGNAM"-"$VERSION"/"$FONT_NAM"ReadMe.pdf \
-	"$SRC_PRGNAM"-"$VERSION"/SuperOTC/"$FONT_NAM".ttc.zip
-unzip "$SRC_PRGNAM"-"$VERSION"/SuperOTC/"$FONT_NAM".ttc.zip
+mv $CWD/LICENSE.txt \
+	$CWD/"$FONT_NAM"ReadMe.pdf \
+	$CWD/"$FONT_NAM".ttc.zip \
+    $TMP/$PRGNAM-$VERSION
+unzip "$FONT_NAM".ttc.zip
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -60,8 +61,7 @@ mkdir -p $PKG/usr/share/fonts/TTF
 cp -L "$FONT_NAM".ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
-cp -L "$SRC_PRGNAM"-"$VERSION"/LICENSE.txt "$SRC_PRGNAM"-"$VERSION"/"$FONT_NAM"ReadMe.pdf \
-	$PKG/usr/doc/$PRGNAM-$VERSION
+cp -L LICENSE.txt "$FONT_NAM"ReadMe.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.info b/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.info
index e45de12ee5..3876b0901f 100644
--- a/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.info
+++ b/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.info
@@ -1,8 +1,8 @@
 PRGNAM="adobe-source-han-sans-fonts"
-VERSION="1.001R"
+VERSION="1.004R"
 HOMEPAGE="https://github.com/adobe-fonts/source-han-sans"
-DOWNLOAD="https://github.com/adobe-fonts/source-han-sans/archive/1.001R.tar.gz"
-MD5SUM="746e79e66d437732fe04bcf02c95c642"
+DOWNLOAD="https://github.com/adobe-fonts/source-han-sans/raw/1.004R/LICENSE.txt https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SourceHanSansReadMe.pdf https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SuperOTC/SourceHanSans.ttc.zip"
+MD5SUM="55719faa0112708e946b820b24b14097 b78323a4cebe8836bcf74c2d202f2674 8214d97a14991a22aa2ade3c8066a803"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/adobe-source-serif-pro-font/slack-desc b/system/adobe-source-serif-pro-font/slack-desc
index d4cc649593..aedc84cc42 100644
--- a/system/adobe-source-serif-pro-font/slack-desc
+++ b/system/adobe-source-serif-pro-font/slack-desc
@@ -5,15 +5,15 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-                          |-----handy-ruler------------------------------------------------------|
-adobe-source-sans-pro-font: adobe-source-serif-pro-font (open source font)
-adobe-source-sans-pro-font:
-adobe-source-sans-pro-font: Source Serif Pro is a set of OpenType fonts that have been designed
-adobe-source-sans-pro-font: to complement Source Sans Pro.
-adobe-source-sans-pro-font:
-adobe-source-sans-pro-font: https://github.com/adobe-fonts/source-serif-pro
-adobe-source-sans-pro-font:
-adobe-source-sans-pro-font:
-adobe-source-sans-pro-font:
-adobe-source-sans-pro-font:
-adobe-source-sans-pro-font:
+                           |-----handy-ruler------------------------------------------------------|
+adobe-source-serif-pro-font: adobe-source-serif-pro-font (open source font)
+adobe-source-serif-pro-font:
+adobe-source-serif-pro-font: Source Serif Pro is a set of OpenType fonts that have been designed
+adobe-source-serif-pro-font: to complement Source Sans Pro.
+adobe-source-serif-pro-font:
+adobe-source-serif-pro-font: https://github.com/adobe-fonts/source-serif-pro
+adobe-source-serif-pro-font:
+adobe-source-serif-pro-font:
+adobe-source-serif-pro-font:
+adobe-source-serif-pro-font:
+adobe-source-serif-pro-font:
diff --git a/system/advcopy/README b/system/advcopy/README
new file mode 100644
index 0000000000..1c3f3e151d
--- /dev/null
+++ b/system/advcopy/README
@@ -0,0 +1,6 @@
+advcopy (Advanced Copy is a mod for the GNU cp and GNU mv tools)
+
+Advanced Copy is a mod for the GNU cp and GNU mv tools which adds a 
+progress bar and provides some info on what's going on.
+
+This package does not replace standard cp and mv programs.
diff --git a/system/advcopy/advcopy.SlackBuild b/system/advcopy/advcopy.SlackBuild
new file mode 100644
index 0000000000..76ecdb86dc
--- /dev/null
+++ b/system/advcopy/advcopy.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# Slackware build script for advcopy.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=advcopy
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="coreutils"
+SRCVER="8.23"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.xz
+mv $SRCNAM-$SRCVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/advcpmv-0.5-8.23.patch
+
+FORCE_UNSAFE_CONFIGURE=1 \
+CFLAGS="$SLKCFLAGS" \
+DEFAULT_POSIX2_VERSION=199209 \
+./configure \
+  --prefix=/usr \
+  --bindir=/usr/bin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-no-install-program=groups,hostname,kill,uptime \
+  --without-gmp \
+  --build=$ARCH-slackware-linux
+
+make
+
+mkdir -p $PKG/usr/bin
+install -Dm755 src/cp $PKG/usr/bin/vcp
+install -Dm755 src/mv $PKG/usr/bin/vmv
+
+mkdir -p $PKG/etc/profile.d/
+cp -a $CWD/advcopy.sh $PKG/etc/profile.d/
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/advcopy/advcopy.info b/system/advcopy/advcopy.info
new file mode 100644
index 0000000000..97075dd52e
--- /dev/null
+++ b/system/advcopy/advcopy.info
@@ -0,0 +1,10 @@
+PRGNAM="advcopy"
+VERSION="0.5"
+HOMEPAGE="http://beatex.org/web/advancedcopy.html"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz"
+MD5SUM="abed135279f87ad6762ce57ff6d89c41"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/advcopy/advcopy.sh b/system/advcopy/advcopy.sh
new file mode 100644
index 0000000000..a5b323ae80
--- /dev/null
+++ b/system/advcopy/advcopy.sh
@@ -0,0 +1,2 @@
+alias vcp='vcp -g'
+alias vmv='vmv -g'
diff --git a/system/advcopy/advcpmv-0.5-8.23.patch b/system/advcopy/advcpmv-0.5-8.23.patch
new file mode 100644
index 0000000000..1b476c34b6
--- /dev/null
+++ b/system/advcopy/advcpmv-0.5-8.23.patch
@@ -0,0 +1,608 @@
+diff -crB coreutils-8.21/src/copy.c coreutils-8.21-patch0.5/src/copy.c
+*** coreutils-8.21/src/copy.c	2013-02-07 10:37:05.000000000 +0100
+--- coreutils-8.21-patch0.5/src/copy.c	2013-02-23 12:53:51.000000000 +0100
+***************
+*** 135,140 ****
+--- 135,190 ----
+    return err;
+  }
+  
++ /* BEGIN progress mod */
++ static void file_progress_bar ( char * _cDest, int _iBarLength, int _iProgress, int _iTotal )
++ {
++   // write number to progress bar
++   float fPercent = ( float ) _iProgress / ( float ) _iTotal * 100.f;
++   sprintf ( _cDest + ( _iBarLength - 6 ), "%4.1f", fPercent );
++   // remove zero
++   _cDest[_iBarLength - 2] = ' ';
++ 
++   // fill rest with '-'
++   int i;
++   for ( i = 1; i <= _iBarLength - 9; i++ )
++   {
++     if ( fPercent > ( float ) ( i - 1 ) / ( _iBarLength - 10 ) * 100.f )
++       _cDest[i] = '|';
++     else
++       _cDest[i] = '-';
++   }
++ }
++ 
++ int file_size_format ( char * _cDst, int _iSize, int _iCounter )
++ {
++   int iCounter = _iCounter;
++   double dSize = ( double ) _iSize;
++   while ( dSize >= 1000. )
++   {
++     dSize /= 1024.;
++     iCounter++;
++   }
++ 
++   /* get unit */
++   char * sUnit;
++   if ( iCounter == 0 )
++     sUnit = "B";
++   else if ( iCounter == 1 )
++     sUnit = "KiB";
++   else if ( iCounter == 2 )
++     sUnit = "MiB";
++   else if ( iCounter == 3 )
++     sUnit = "GiB";
++   else if ( iCounter == 4 )
++     sUnit = "TiB";
++   else
++     sUnit = "N/A";
++ 
++   /* write number */
++   return sprintf ( _cDst, "%5.1f %s", dSize, sUnit );
++ }
++ /* END progress mod */
++ 
+  /* Copy the regular file open on SRC_FD/SRC_NAME to DST_FD/DST_NAME,
+     honoring the MAKE_HOLES setting and using the BUF_SIZE-byte buffer
+     BUF for temporary storage.  Copy no more than MAX_N_READ bytes.
+***************
+*** 151,163 ****
+               bool make_holes,
+               char const *src_name, char const *dst_name,
+               uintmax_t max_n_read, off_t *total_n_read,
+!              bool *last_write_made_hole)
+  {
+    *last_write_made_hole = false;
+    *total_n_read = 0;
+  
+    while (max_n_read)
+      {
+        bool make_hole = false;
+  
+        ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
+--- 201,369 ----
+               bool make_holes,
+               char const *src_name, char const *dst_name,
+               uintmax_t max_n_read, off_t *total_n_read,
+!              bool *last_write_made_hole
+!             )
+  {
++   /* BEGIN progress mod */
++   /* create a field of 6 lines */
++   char ** cProgressField = ( char ** ) calloc ( 6, sizeof ( char * ) );
++   /* get console width */
++   int iBarLength = 80;
++   struct winsize win;
++   if ( ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win) == 0 && win.ws_col > 0 )
++       iBarLength = win.ws_col;
++   /* create rows */
++   int it;
++   for ( it = 0; it < 6; it++ )
++   {
++     cProgressField[it] = ( char * ) malloc ( iBarLength + 1 );
++     /* init with spaces */
++     int j;
++     for ( j = 0; j < iBarLength; j++ )
++       cProgressField[it][j] = ' ';
++     cProgressField[it][iBarLength] = '\0';
++   }
++ 
++   /* global progress bar? */
++   if ( g_iTotalSize )
++   {
++     /* init global progress bar */
++     cProgressField[2][0] = '[';
++     cProgressField[2][iBarLength - 8] = ']';
++     cProgressField[2][iBarLength - 7] = ' ';
++     cProgressField[2][iBarLength - 1] = '%';
++ 
++     /* total size */
++     cProgressField[1][iBarLength - 11] = '/';
++     file_size_format ( cProgressField[1] + iBarLength - 9, g_iTotalSize, 1 );
++ 
++     /* show how many files were written */
++     int sum_length = sprintf ( cProgressField[1], "%d files copied so far...", g_iFilesCopied );
++     cProgressField[1][sum_length] = ' ';
++   }
++ 
++   /* truncate filename? */
++   int fn_length;
++   if ( strlen ( src_name ) > iBarLength - 22 )
++     fn_length =
++       sprintf ( cProgressField[4], "...%s", src_name + ( strlen ( src_name ) - iBarLength + 25 ) );
++   else
++     fn_length = sprintf ( cProgressField[4], "%s", src_name );
++   cProgressField[4][fn_length] = ' ';
++ 
++   /* filesize */
++   int file_size = max_n_read;
++   struct stat file_stat;
++   if (fstat(src_fd, & file_stat) == 0)
++     file_size = file_stat.st_size;
++   cProgressField[4][iBarLength - 11] = '/';
++   file_size_format ( cProgressField[4] + iBarLength - 9, file_size, 0 );
++ 
++   int iCountDown = 1;
++   char * sProgressBar = cProgressField[5];
++   sProgressBar[0] = '[';
++   sProgressBar[iBarLength - 8] = ']';
++   sProgressBar[iBarLength - 7] = ' ';
++   sProgressBar[iBarLength - 1] = '%';
++ 
++   /* this will always save the time in between */
++   struct timeval last_time;
++   gettimeofday ( & last_time, NULL );
++   int last_size = g_iTotalWritten;
++   /* END progress mod */
++   
+    *last_write_made_hole = false;
+    *total_n_read = 0;
+  
+    while (max_n_read)
+      {
++     /* BEGIN progress mod */
++     if (progress) {
++       /* update countdown */
++       iCountDown--;
++       if ( iCountDown < 0 )
++       {
++         /* average copy speed is assumed to be around 10 MiB/s, just to be safe.
++          * the status should be updated about 10 times per second, or approximately
++          * once per 1 MiB transferred. */
++         iCountDown = 1024 * 1024 / buf_size;
++         /* must be greater than 0 */
++         if (iCountDown < 1)
++           iCountDown = 1;
++         /* limit */
++         if (iCountDown > 100)
++           iCountDown = 100;
++       }
++ 
++       /* just print one line with the percentage, but not always */
++       if ( iCountDown == 0 )
++       {
++         /* calculate current speed */
++         struct timeval cur_time;
++         gettimeofday ( & cur_time, NULL );
++         int cur_size = g_iTotalWritten + *total_n_read / 1024;
++         int usec_elapsed = cur_time.tv_usec - last_time.tv_usec;
++         double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++         sec_elapsed += ( double ) ( cur_time.tv_sec - last_time.tv_sec );
++         int copy_speed = ( int ) ( ( double ) ( cur_size - last_size )
++           / sec_elapsed );
++         if (copy_speed < 0)
++           copy_speed = 0;
++         char s_copy_speed[20];
++         file_size_format ( s_copy_speed, copy_speed, 1 );
++         /* update vars */
++         last_time = cur_time;
++         last_size = cur_size;
++ 
++         /* how much time has passed since the start? */
++         int isec_elapsed = cur_time.tv_sec - g_oStartTime.tv_sec;
++         int sec_remaining = ( int ) ( ( double ) isec_elapsed / cur_size
++           * g_iTotalSize ) - isec_elapsed;
++         int min_remaining = sec_remaining / 60;
++         sec_remaining -= min_remaining * 60;
++         int hours_remaining = min_remaining / 60;
++         min_remaining -= hours_remaining * 60;
++         /* print out */
++         sprintf ( cProgressField[3],
++           "Copying at %s/s (about %dh %dm %ds remaining)", s_copy_speed,
++           hours_remaining, min_remaining, sec_remaining );
++ 
++         int fs_len;
++         if ( g_iTotalSize )
++         {
++           /* global progress bar */
++           file_progress_bar ( cProgressField[2], iBarLength,
++                               g_iTotalWritten + *total_n_read / 1024, g_iTotalSize );
++ 
++           /* print the global status */
++           fs_len = file_size_format ( cProgressField[1] + iBarLength - 21,
++                                           g_iTotalWritten + *total_n_read / 1024, 1 );
++           cProgressField[1][iBarLength - 21 + fs_len] = ' ';
++         }
++ 
++         /* current progress bar */
++         file_progress_bar ( sProgressBar, iBarLength, *total_n_read, file_size );
++ 
++         /* print the status */
++         fs_len = file_size_format ( cProgressField[4] + iBarLength - 21, *total_n_read, 0 );
++         cProgressField[4][iBarLength - 21 + fs_len] = ' ';
++ 
++         /* print the field */
++         for ( it = g_iTotalSize ? 0 : 3; it < 6; it++ )
++         {
++           printf ( "\033[K%s\n", cProgressField[it] );
++           if ( strlen ( cProgressField[it] ) < iBarLength )
++             printf ( "" );
++         }
++         if ( g_iTotalSize )
++           printf ( "\r\033[6A" );
++         else
++           printf ( "\r\033[3A" );
++         fflush ( stdout );
++       }
++     }
++     /* END progress mod */
++       
+        bool make_hole = false;
+  
+        ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
+***************
+*** 215,220 ****
+--- 421,439 ----
+  
+        *last_write_made_hole = make_hole;
+      }
++     
++   if (progress) {
++     /* BEGIN progress mod */
++     /* update total size */
++     g_iTotalWritten += *total_n_read / 1024;
++     g_iFilesCopied++;
++ 
++     int i;
++     for ( i = 0; i < 6; i++ )
++       free ( cProgressField[i] );
++     free ( cProgressField );
++     /* END progress mod */
++   }
+  
+    return true;
+  }
+diff -crB coreutils-8.21/src/copy.h coreutils-8.21-patch0.5/src/copy.h
+*** coreutils-8.21/src/copy.h	2013-01-31 01:46:24.000000000 +0100
+--- coreutils-8.21-patch0.5/src/copy.h	2013-02-23 12:53:51.000000000 +0100
+***************
+*** 227,232 ****
+--- 227,235 ----
+    /* If true, create symbolic links instead of copying files.
+       Create destination directories as usual. */
+    bool symbolic_link;
++   
++   /* If true, draw a nice progress bar on screen */
++   bool progress_bar;
+  
+    /* If true, do not copy a nondirectory that has an existing destination
+       with the same or newer modification time. */
+***************
+*** 286,289 ****
+--- 289,303 ----
+  bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
+  mode_t cached_umask (void);
+  
++ /* BEGIN progress mod */
++ int file_size_format ( char * _cDst, int _iSize, int _iCounter );
++ 
++ long g_iTotalSize;
++ long g_iTotalWritten;
++ int g_iFilesCopied;
++ struct timeval g_oStartTime;
++ int g_iTotalFiles;
++ bool progress;
++ /* END progress mod */
++ 
+  #endif
+diff --git a/src/cp.c.orig b/src/cp.c
+index 99cafa7..07b5228 100644
+--- a/src/cp.c.orig
++++ b/src/cp.c
+@@ -141,6 +141,7 @@ static struct option const long_opts[] =
+   {"target-directory", required_argument, NULL, 't'},
+   {"update", no_argument, NULL, 'u'},
+   {"verbose", no_argument, NULL, 'v'},
++  {"progress-bar", no_argument, NULL, 'g'},
+   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
+   {GETOPT_HELP_OPTION_DECL},
+   {GETOPT_VERSION_OPTION_DECL},
+@@ -179,6 +180,7 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
+   -f, --force                  if an existing destination file cannot be\n\
+                                  opened, remove it and try again (this option\n\
+                                  is ignored when the -n option is also used)\n\
++  -g, --progress-bar           add progress-bar\n\
+   -i, --interactive            prompt before overwrite (overrides a previous -n\
+ \n\
+                                   option)\n\
+@@ -624,6 +626,57 @@ do_copy (int n_files, char **file, const char *target_directory,
+         error (EXIT_FAILURE, 0, _("target %s is not a directory"),
+                quote (file[n_files - 1]));
+     }
++    
++  /* BEGIN progress mod */
++  struct timeval start_time;
++  if (progress) {
++    g_iTotalSize = 0;
++    g_iFilesCopied = 0;
++    g_iTotalWritten = 0;
++
++    /* save time */
++    gettimeofday ( & start_time, NULL );
++    g_oStartTime = start_time;
++
++    printf ( "Calculating total size... \r" );
++    fflush ( stdout );
++    long iTotalSize = 0;
++    int iFiles = n_files;
++    if ( ! target_directory )
++      iFiles = n_files - 1;
++    int j;
++    for (j = 0; j < iFiles; j++)
++    {
++      /* call du -s for each file */
++      /* create command */
++      char command[1024];
++      sprintf ( command, "du -s \"%s\"", file[j] );
++      /* TODO: replace all quote signs in file[i] */
++
++      FILE *fp;
++      char output[1024];
++
++      /* run command */
++      fp = popen(command, "r");
++      if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
++        printf("failed to run du.\n" );
++      }
++      else
++      {
++        /* isolate size */
++        strchr ( output, '\t' )[0] = '\0';
++        iTotalSize += atol ( output );
++
++        printf ( "Calculating total size... %ld\r", iTotalSize );
++        fflush ( stdout );
++      }
++
++      /* close */
++      pclose(fp);
++    }
++    g_iTotalSize = iTotalSize;
++  }
++  /* END progress mod */
+ 
+   if (target_directory)
+     {
+@@ -766,6 +819,46 @@ do_copy (int n_files, char **file, const char *target_directory,
+ 
+       ok = copy (source, new_dest, 0, x, &unused, NULL);
+     }
++    
++  /* BEGIN progress mod */
++  if (progress) {
++    /* remove everything */
++    int i;
++    if ( g_iTotalSize )
++    {
++      for ( i = 0; i < 6; i++ )
++        printf ( "\033[K\n" );
++      printf ( "\r\033[6A" );
++    }
++    else
++    {
++      for ( i = 0; i < 3; i++ )
++        printf ( "\033[K\n" );
++      printf ( "\r\033[3A" );
++    }
++
++    /* save time */
++    struct timeval end_time;
++    gettimeofday ( & end_time, NULL );
++    int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
++    double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++    sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
++
++    /* get total size */
++    char sTotalWritten[20];
++    file_size_format ( sTotalWritten, g_iTotalSize, 1 );
++    /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
++
++    /* calculate speed */
++    int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
++    char s_copy_speed[20];
++    file_size_format ( s_copy_speed, copy_speed, 1 );
++
++    /* good-bye message */
++    printf ( "%d files (%s) copied in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
++             sec_elapsed, s_copy_speed );
++  }
++  /* END progress mod */
+ 
+   return ok;
+ }
+@@ -801,6 +894,7 @@ cp_option_init (struct cp_options *x)
+   x->recursive = false;
+   x->sparse_mode = SPARSE_AUTO;
+   x->symbolic_link = false;
++  x->progress_bar = false;
+   x->set_mode = false;
+   x->mode = 0;
+ 
+@@ -943,7 +1037,7 @@ main (int argc, char **argv)
+      we'll actually use backup_suffix_string.  */
+   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
+ 
+-  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
++  while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:TZ",
+                            long_opts, NULL))
+          != -1)
+     {
+@@ -1000,6 +1094,10 @@ main (int argc, char **argv)
+           x.unlink_dest_after_failed_open = true;
+           break;
+ 
++        case 'g':
++          progress = true;
++          break;
++
+         case 'H':
+           x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
+           break;
+diff --git a/src/mv.c.orig b/src/mv.c
+index 1db404f..5665e7f 100644
+--- a/src/mv.c.orig
++++ b/src/mv.c
+@@ -65,6 +65,7 @@ static struct option const long_options[] =
+   {"target-directory", required_argument, NULL, 't'},
+   {"update", no_argument, NULL, 'u'},
+   {"verbose", no_argument, NULL, 'v'},
++  {"progress-bar", no_argument, NULL, 'g'},
+   {GETOPT_HELP_OPTION_DECL},
+   {GETOPT_VERSION_OPTION_DECL},
+   {NULL, 0, NULL, 0}
+@@ -167,7 +168,7 @@ do_move (const char *source, const char *dest, const struct cp_options *x)
+   bool copy_into_self;
+   bool rename_succeeded;
+   bool ok = copy (source, dest, false, x, &copy_into_self, &rename_succeeded);
+-
++  
+   if (ok)
+     {
+       char const *dir_to_remove;
+@@ -302,6 +303,7 @@ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\
+ \n\
+   -b                           like --backup but does not accept an argument\n\
+   -f, --force                  do not prompt before overwriting\n\
++  -g, --progress-bar           add progress-bar\n\
+   -i, --interactive            prompt before overwrite\n\
+   -n, --no-clobber             do not overwrite an existing file\n\
+ If you specify more than one of -i, -f, -n, only the final one takes effect.\n\
+@@ -373,7 +375,7 @@ main (int argc, char **argv)
+      we'll actually use backup_suffix_string.  */
+   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
+ 
+-  while ((c = getopt_long (argc, argv, "bfint:uvS:TZ", long_options, NULL))
++  while ((c = getopt_long (argc, argv, "bfint:uvgS:TZ", long_options, NULL))
+          != -1)
+     {
+       switch (c)
+@@ -419,6 +421,9 @@ main (int argc, char **argv)
+         case 'v':
+           x.verbose = true;
+           break;
++        case 'g':
++          progress = true;
++          break;
+         case 'S':
+           make_backups = true;
+           backup_suffix_string = optarg;
+@@ -490,6 +495,57 @@ main (int argc, char **argv)
+                    : no_backups);
+ 
+   hash_init ();
++  
++  /* BEGIN progress mod */
++  struct timeval start_time;
++
++  if(progress) {
++    g_iTotalSize = 0;
++    g_iFilesCopied = 0;
++    g_iTotalWritten = 0;
++
++    gettimeofday (& start_time, NULL);
++    g_oStartTime = start_time;
++
++    printf ("Calculating total size... \r");
++    fflush (stdout);
++    long iTotalSize = 0;
++    int iFiles = n_files;
++    if ( !target_directory )
++      iFiles = 1;
++    int j;
++    for (j = 0; j < iFiles; j++)
++    {
++      /* call du -s for each file */
++      /* create command */
++      char command[1024];
++      sprintf ( command, "du -s \"%s\"", file[j] );
++      /* TODO: replace all quote signs in file[i] */
++
++      FILE *fp;
++      char output[1024];
++
++      /* run command */
++      fp = popen(command, "r");
++      if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
++        printf("failed to run du.\n" );
++      }
++      else
++      {
++        /* isolate size */
++        strchr ( output, '\t' )[0] = '\0';
++        iTotalSize += atol ( output );
++
++        printf ( "Calculating total size... %ld\r", iTotalSize );
++        fflush ( stdout );
++      }
++
++      /* close */
++      pclose(fp);
++    }
++    g_iTotalSize = iTotalSize;
++  }
++  /* END progress mod */
+ 
+   if (target_directory)
+     {
+@@ -507,6 +563,46 @@ main (int argc, char **argv)
+     }
+   else
+     ok = movefile (file[0], file[1], false, &x);
++  
++  /* BEGIN progress mod */
++  if (progress) {
++    /* remove everything */
++    int i;
++    if ( g_iTotalSize )
++    {
++      for ( i = 0; i < 6; i++ )
++        printf ( "\033[K\n" );
++      printf ( "\r\033[6A" );
++    }
++    else
++    {
++      for ( i = 0; i < 3; i++ )
++        printf ( "\033[K\n" );
++      printf ( "\r\033[3A" );
++    }
++
++    /* save time */
++    struct timeval end_time;
++    gettimeofday ( & end_time, NULL );
++    int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
++    double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++    sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
++
++    /* get total size */
++    char sTotalWritten[20];
++    file_size_format ( sTotalWritten, g_iTotalSize, 1 );
++    /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
++
++    /* calculate speed */
++    int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
++    char s_copy_speed[20];
++    file_size_format ( s_copy_speed, copy_speed, 1 );
++
++    /* good-bye message */
++    printf ( "%d files (%s) moved in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
++             sec_elapsed, s_copy_speed );
++  }
++  /* END progress mod */
+ 
+   exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
+ }
diff --git a/system/advcopy/slack-desc b/system/advcopy/slack-desc
new file mode 100644
index 0000000000..52f17893f0
--- /dev/null
+++ b/system/advcopy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+advcopy: advcopy (mod for the GNU cp and GNU mv tools)
+advcopy:
+advcopy: Advanced Copy is a mod for the GNU cp and GNU mv tools which adds a 
+advcopy: progress bar and provides some info on what's going on.
+advcopy:
+advcopy: Homepage: http://beatex.org/web/advancedcopy.html
+advcopy:
+advcopy:
+advcopy:
+advcopy:
+advcopy:
diff --git a/system/alien/alien.SlackBuild b/system/alien/alien.SlackBuild
index 29abfda216..697dcac01e 100644
--- a/system/alien/alien.SlackBuild
+++ b/system/alien/alien.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for alien
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=alien
-VERSION=${VERSION:-8.93}
+VERSION=${VERSION:-8.95}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,9 +53,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM\_$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/alien/alien.info b/system/alien/alien.info
index 05c909072c..1a637850da 100644
--- a/system/alien/alien.info
+++ b/system/alien/alien.info
@@ -1,8 +1,8 @@
 PRGNAM="alien"
-VERSION="8.93"
+VERSION="8.95"
 HOMEPAGE="http://joeyh.name/code/alien/"
-DOWNLOAD="http://http.debian.net/debian/pool/main/a/alien/alien_8.93.tar.gz"
-MD5SUM="3bda078c4503e46a96242ca62f11f884"
+DOWNLOAD="http://http.debian.net/debian/pool/main/a/alien/alien_8.95.tar.xz"
+MD5SUM="4b7fcb47616593578c87102f74c20d63"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/anything-sync-daemon/anything-sync-daemon.SlackBuild b/system/anything-sync-daemon/anything-sync-daemon.SlackBuild
index a89cd8c234..d5765c49d5 100644
--- a/system/anything-sync-daemon/anything-sync-daemon.SlackBuild
+++ b/system/anything-sync-daemon/anything-sync-daemon.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=anything-sync-daemon
-VERSION=${VERSION:-5.74}
+VERSION=${VERSION:-5.76}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/anything-sync-daemon/anything-sync-daemon.info b/system/anything-sync-daemon/anything-sync-daemon.info
index 3a498336b6..f2e9878c42 100644
--- a/system/anything-sync-daemon/anything-sync-daemon.info
+++ b/system/anything-sync-daemon/anything-sync-daemon.info
@@ -1,8 +1,8 @@
 PRGNAM="anything-sync-daemon"
-VERSION="5.74"
+VERSION="5.76"
 HOMEPAGE="https://github.com/graysky2/anything-sync-daemon"
-DOWNLOAD="https://github.com/graysky2/anything-sync-daemon/archive/v5.74.tar.gz"
-MD5SUM="cae6e550acb585e93af9d6cea8bda354"
+DOWNLOAD="https://github.com/graysky2/anything-sync-daemon/archive/v5.76.tar.gz"
+MD5SUM="362243b99ceb506164b348e370b2fa49"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/apache-activemq/apache-activemq.SlackBuild b/system/apache-activemq/apache-activemq.SlackBuild
index 2072e3cde8..d62119bd7e 100644
--- a/system/apache-activemq/apache-activemq.SlackBuild
+++ b/system/apache-activemq/apache-activemq.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=apache-activemq
-VERSION=${VERSION:-5.5.1}
+VERSION=${VERSION:-5.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 ACTIVEMQ_HOME=/usr/share/activemq
 
-DOCS="LICENSE NOTICE README.txt WebConsole-README.txt docs user-guide.html example"
+DOCS="LICENSE NOTICE README.txt docs"
 
 bailout() {
   echo "  You must have a $ACTIVEMQ_USER user and $ACTIVEMQ_GROUP group to run this script. "
@@ -107,6 +107,8 @@ chown -R $ACTIVEMQ_USER:$ACTIVEMQ_GROUP $PKG/var/{run,lib,log}/activemq
 ln -sf /etc/activemq $PKG/usr/share/activemq/conf
 ln -sf /var/lib/activemq/webapps $PKG/usr/share/activemq/webapps
 ln -sf /var/log/activemq $PKG/usr/share/activemq/log
+ln -sf /tmp/activemq $PKG/usr/share/activemq/tmp
+
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/apache-activemq/apache-activemq.info b/system/apache-activemq/apache-activemq.info
index f6fdd6d216..b7eda536c0 100644
--- a/system/apache-activemq/apache-activemq.info
+++ b/system/apache-activemq/apache-activemq.info
@@ -1,10 +1,10 @@
 PRGNAM="apache-activemq"
-VERSION="5.5.1"
+VERSION="5.12.1"
 HOMEPAGE="http://activemq.apache.org/"
-DOWNLOAD="http://archive.apache.org/dist/activemq/apache-activemq/5.5.1/apache-activemq-5.5.1-bin.tar.gz"
-MD5SUM="3e10c163c5e3869a9720d47849a5ae29"
+DOWNLOAD="https://repository.apache.org/content/repositories/releases/org/apache/activemq/apache-activemq/5.12.1/apache-activemq-5.12.1-bin.tar.gz"
+MD5SUM="93438ac60a882da8a505ff13de54b491"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Miguel De Anda"
+EMAIL="miguel@thedeanda.com"
diff --git a/system/apache-activemq/rc.activemq b/system/apache-activemq/rc.activemq
index 0f225dc2d6..3022449731 100644
--- a/system/apache-activemq/rc.activemq
+++ b/system/apache-activemq/rc.activemq
@@ -2,9 +2,12 @@
 # Start/stop/restart Apache ActiveMQ daemon
 
 DAEMON="/usr/share/activemq/bin/activemq"
+. /etc/default/activemq
 
 case "$1" in
 'start')
+  mkdir -p /tmp/activemq
+  chown $ACTIVEMQ_USER /tmp/activemq
   ${DAEMON} start
   ;;
 'stop')
diff --git a/system/apcupsd/README b/system/apcupsd/README
index f8afad550b..5e4534c3d9 100644
--- a/system/apcupsd/README
+++ b/system/apcupsd/README
@@ -13,6 +13,6 @@ the distribution-specific installation to prevent messing with files outside
 DESTDIR; however, this does make it require some manual configuration after 
 installation.
 
-After installing, see /usr/doc/apcupsd-3.14.10/README.SLACKWARE for more
+After installing, see /usr/doc/apcupsd-3.14.13/README.SLACKWARE for more
 information on how to modify rc.6 and how to start the apcupsd daemon 
 automatically at boot.
diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild
index 13612a607a..a877d188cc 100644
--- a/system/apcupsd/apcupsd.SlackBuild
+++ b/system/apcupsd/apcupsd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for apcupsd
 
-# Copyright 2006-2014  Robby Workman  Northport, AL, USA
+# Copyright 2006-2015  Robby Workman, Tuscaloosa, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 # * added log rotation
 
 PRGNAM=apcupsd
-VERSION=${VERSION:-3.14.12}
+VERSION=${VERSION:-3.14.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,13 +72,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Create /var/lock/subsys in the init script (rc.apcupsd)
-# These days, /var/lock may be on a tmpfs, so we can't assume the dir is there
+# Make sure /var/lock exists - create it in the rc.apcupsd
 patch -p1 < $CWD/patches/create_lockdir_in_init_script.diff
 
-# Use /var/lock/subsys as the LOCKDIR in apcupsd.conf
-patch -p1 < $CWD/patches/fix_lockdir_in_config_file.diff
-
 # Fixup up a couple of nitpicks in the init script
 patch -p1 < $CWD/patches/nitpicky-fixes-to-init-script.diff
 
diff --git a/system/apcupsd/apcupsd.info b/system/apcupsd/apcupsd.info
index 4873a857fe..58fa084422 100644
--- a/system/apcupsd/apcupsd.info
+++ b/system/apcupsd/apcupsd.info
@@ -1,8 +1,8 @@
 PRGNAM="apcupsd"
-VERSION="3.14.12"
+VERSION="3.14.13"
 HOMEPAGE="http://www.apcupsd.org"
-DOWNLOAD="http://downloads.sourceforge.net/apcupsd/apcupsd-3.14.12.tar.gz"
-MD5SUM="08bf201acea6b4dd69cf2fb0eecfd55e"
+DOWNLOAD="http://downloads.sourceforge.net/apcupsd/apcupsd-3.14.13.tar.gz"
+MD5SUM="c291d9d3923b4d9c0e600b755ad4f489"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/apcupsd/patches/create_lockdir_in_init_script.diff b/system/apcupsd/patches/create_lockdir_in_init_script.diff
index 0640544e53..024ac6d4cb 100644
--- a/system/apcupsd/patches/create_lockdir_in_init_script.diff
+++ b/system/apcupsd/patches/create_lockdir_in_init_script.diff
@@ -1,11 +1,11 @@
-diff -Nur apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in apcupsd-3.14.12/platforms/slackware/apcupsd.in
---- apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in	2005-03-03 11:18:09.000000000 -0600
-+++ apcupsd-3.14.12/platforms/slackware/apcupsd.in	2014-04-01 13:53:23.113153628 -0500
+diff -Nur apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in apcupsd-3.14.13/platforms/slackware/apcupsd.in
+--- apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in	2015-01-29 08:13:25.000000000 -0600
++++ apcupsd-3.14.13/platforms/slackware/apcupsd.in	2015-08-17 22:49:30.754638339 -0500
 @@ -20,6 +20,7 @@
  	if [ -f ${APCPID} ]; then
  		return="  Already running."
  	else
-+		mkdir -p @LOCKDIR@/subsys
- 		@sbindir@/apcupsd && touch @LOCKDIR@/subsys/apcupsd \
++		mkdir -p @LOCKDIR@
+ 		@sbindir@/apcupsd && touch @LOCKDIR@/apcupsd \
  		|| return="  Failed."
  	fi
diff --git a/system/apcupsd/patches/fix_lockdir_in_config_file.diff b/system/apcupsd/patches/fix_lockdir_in_config_file.diff
deleted file mode 100644
index 64ee7efa94..0000000000
--- a/system/apcupsd/patches/fix_lockdir_in_config_file.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur apcupsd-3.14.12.orig/platforms/etc/apcupsd.conf.in apcupsd-3.14.12/platforms/etc/apcupsd.conf.in
---- apcupsd-3.14.12.orig/platforms/etc/apcupsd.conf.in	2013-08-05 09:05:17.000000000 -0500
-+++ apcupsd-3.14.12/platforms/etc/apcupsd.conf.in	2014-04-01 13:54:06.786690735 -0500
-@@ -93,7 +93,7 @@
- 
- # LOCKFILE <path to lockfile>
- #   Path for device lock file. Not used on Win32.
--LOCKFILE @LOCKDIR@
-+LOCKFILE @LOCKDIR@/subsys
- 
- # SCRIPTDIR <path to script directory>
- #   Directory in which apccontrol and event scripts are located.
diff --git a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
index 30f901235e..0ba9058a5a 100644
--- a/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
+++ b/system/apcupsd/patches/nitpicky-fixes-to-init-script.diff
@@ -1,6 +1,6 @@
-diff -Nur apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in apcupsd-3.14.12/platforms/slackware/apcupsd.in
---- apcupsd-3.14.12.orig/platforms/slackware/apcupsd.in	2014-04-01 13:54:37.822360814 -0500
-+++ apcupsd-3.14.12/platforms/slackware/apcupsd.in	2014-04-01 13:56:22.722239781 -0500
+diff -Nur apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in apcupsd-3.14.13/platforms/slackware/apcupsd.in
+--- apcupsd-3.14.13.orig/platforms/slackware/apcupsd.in	2015-08-17 22:51:39.595562965 -0500
++++ apcupsd-3.14.13/platforms/slackware/apcupsd.in	2015-08-17 22:51:34.106608743 -0500
 @@ -9,14 +9,14 @@
  APCPID=@PIDDIR@/apcupsd.pid
  DISTVER="@DISTVER@"
diff --git a/system/argyllcms/README b/system/argyllcms/README
new file mode 100644
index 0000000000..8a906658ef
--- /dev/null
+++ b/system/argyllcms/README
@@ -0,0 +1,3 @@
+ArgyllCMS is an ICC compatible color management system.  It supports 
+accurate ICC profile creation for scanners, cameras and film recorders,
+and calibration and profiling of displays and RGB & CMYK printers.
diff --git a/system/argyllcms/argyllcms.SlackBuild b/system/argyllcms/argyllcms.SlackBuild
new file mode 100644
index 0000000000..91480be2f4
--- /dev/null
+++ b/system/argyllcms/argyllcms.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Slackware Package Build Script for ArgyllCMS
+# Home Page http://www.argyllcms.com/
+
+# Copyright (c) 2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# [nishant _AT_ mnspace _DOT_ net]
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of script must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM="argyllcms"
+SRCNAM="Argyll"
+VERSION=${VERSION:-1.8.2}
+SRCVERSION=${SRCVERSION:-V1.8.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf ${SRCNAM}_${SRCVERSION}
+unzip $CWD/${SRCNAM}_${SRCVERSION}_src.zip
+cd $TMP/${SRCNAM}_${SRCVERSION}
+
+chown -R root.root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 750 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+### install steps have been shamelessly copied from Arch Linux PKGBUILD
+### https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/argyllcms
+sh ./makeall.sh
+sh ./makeinstall.sh
+
+rm -f bin/License.txt
+rm -f ref/License.txt
+rm -f ref/afiles
+rm -f doc/afiles
+
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/share/$PRGNAM/{ref,doc/ccmxs}
+mkdir -p $PKG/lib/udev/rules.d
+
+install -m 0755 bin/* $PKG/usr/bin
+install -m 0644 ref/*.* $PKG/usr/share/$PRGNAM/ref
+install -m 0644 profile/*.sp $PKG/usr/share/$PRGNAM/ref
+install -m 0644 scanin/*.c?? $PKG/usr/share/$PRGNAM/ref
+
+install -m 0644 doc/ccmxs/*.ccmx $PKG/usr/share/$PRGNAM/doc/ccmxs
+install -m 0644 doc/*.* $PKG/usr/share/$PRGNAM/doc
+
+install -m 0644 usb/55-Argyll.rules $PKG/lib/udev/rules.d
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a License*.txt Readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/argyllcms/argyllcms.info b/system/argyllcms/argyllcms.info
new file mode 100644
index 0000000000..f8a3c94b1c
--- /dev/null
+++ b/system/argyllcms/argyllcms.info
@@ -0,0 +1,10 @@
+PRGNAM="argyllcms"
+VERSION="1.8.2"
+HOMEPAGE="http://www.argyllcms.com/"
+DOWNLOAD="http://argyllcms.com/Argyll_V1.8.2_src.zip"
+MD5SUM="3c069c2642ad9a9750e624439b5fb01b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jam"
+MAINTAINER="Nishant Limbachia"
+EMAIL="nishant@mnspace.net"
diff --git a/system/argyllcms/slack-desc b/system/argyllcms/slack-desc
new file mode 100644
index 0000000000..d33854a133
--- /dev/null
+++ b/system/argyllcms/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+     
+         |-----handy-ruler------------------------------------------------------|
+argyllcms: argyllcms (Argyll Color Management System)
+argyllcms:
+argyllcms: ArgyllCMS is an ICC compatible color management system.  It supports 
+argyllcms: accurate ICC profile creation for scanners, cameras and film
+argyllcms: recorders and calibration and profiling of displays and RGB & CMYK
+argyllcms: printers.
+argyllcms: 
+argyllcms:
+argyllcms: Home Page: http://www.argyllcms.com/
+argyllcms:
+argyllcms:
diff --git a/system/asbt/asbt.SlackBuild b/system/asbt/asbt.SlackBuild
index d50a098cb3..e0ce737c64 100644
--- a/system/asbt/asbt.SlackBuild
+++ b/system/asbt/asbt.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asbt
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/asbt/asbt.info b/system/asbt/asbt.info
index 1d84a9bbe5..5ddc8dd985 100644
--- a/system/asbt/asbt.info
+++ b/system/asbt/asbt.info
@@ -1,8 +1,8 @@
 PRGNAM="asbt"
-VERSION="1.7.1"
+VERSION="1.7.2"
 HOMEPAGE="http://github.com/aadityabagga/asbt"
-DOWNLOAD="http://github.com/aadityabagga/asbt/archive/1.7.1.tar.gz"
-MD5SUM="4500c7a91c91ba7ff6c655856bb5d539"
+DOWNLOAD="http://github.com/aadityabagga/asbt/archive/1.7.2.tar.gz"
+MD5SUM="8e80bad2133770d1496bddabe0372db0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild
index d82791c3b4..3c8ca4356f 100644
--- a/system/atop/atop.SlackBuild
+++ b/system/atop/atop.SlackBuild
@@ -12,8 +12,8 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=atop
-VERSION=${VERSION:-2.1}
-SRCVER=$(echo ${VERSION}-1)
+VERSION=${VERSION:-2.2}
+SRCVER=$(echo ${VERSION}-3)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,9 +49,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,8 +64,6 @@ make CFLAGS="$SLKCFLAGS"
 # Install the binary sgid utmp in order to allow accounting
 install -D -o root -g utmp -m 2751 atop $PKG/usr/bin/atop
 
-# Add the init script and fix the paths in it
-patch -p1 < $CWD/atop.init.diff
 install -D -m 0755 atop.init $PKG/etc/rc.d/rc.atop.new
 
 mkdir -p $PKG/etc/{logrotate.d,cron.daily}
diff --git a/system/atop/atop.info b/system/atop/atop.info
index 6c63a754d4..09b9695500 100644
--- a/system/atop/atop.info
+++ b/system/atop/atop.info
@@ -1,8 +1,8 @@
 PRGNAM="atop"
-VERSION="2.1"
+VERSION="2.2"
 HOMEPAGE="http://www.atoptool.nl/"
-DOWNLOAD="http://www.atoptool.nl/download/atop-2.1-1.tar.gz"
-MD5SUM="d956f5b0c7e0705cff6cf44898d664d7"
+DOWNLOAD="http://www.atoptool.nl/download/atop-2.2-3.tar.gz"
+MD5SUM="034dc1544f2ec4e4d2c739d320dc326d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/atop/atop.init.diff b/system/atop/atop.init.diff
deleted file mode 100644
index a2e75bc030..0000000000
--- a/system/atop/atop.init.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- atop-1.20/atop.init.orig	2008-01-08 20:44:34.327288088 -0600
-+++ atop-1.20/atop.init	2008-01-08 20:45:25.786220566 -0600
-@@ -7,7 +7,7 @@
- #
- 
- # Check existance of binaries 
--[ -f /usr/bin/atop ] || exit 0
-+[ -f /usr/bin/atop ] || exit 1
- 
- PIDFILE=/var/run/atop.pid
- RETVAL=0
-@@ -22,7 +22,7 @@
- 		:
- 	else
- 		# Start atop
--		/etc/atop/atop.daily
-+		/etc/cron.daily/atop
- 	fi
- 	;;
- 
-@@ -43,11 +43,11 @@
- 	;;
- 
-   reload)
--	/etc/atop/atop.daily
-+	/etc/cron.daily/atop
- 	;;
- 
-   restart)
--	/etc/atop/atop.daily
-+	/etc/cron.daily/atop
- 	;;
- 
-   *)
diff --git a/system/augeas/README b/system/augeas/README
new file mode 100644
index 0000000000..986c5d5128
--- /dev/null
+++ b/system/augeas/README
@@ -0,0 +1,11 @@
+Augeas is a library and command line tool that focuses on the most basic
+problem in handling Linux configurations programmatically: editing actual
+configuration files in a controlled manner.
+
+To that end, Augeas exposes a tree of all configuration settings (well,
+all the ones it knows about) and a simple local API for manipulating the
+tree. Augeas then modifies underlying configuration files according to
+the changes that have been made to the tree; it does as little modeling
+of configurations as possible, and focuses exclusivley on transforming
+the tree-oriented syntax of its public API to the myriad syntaxes of
+individual configuration files.
diff --git a/system/augeas/augeas.SlackBuild b/system/augeas/augeas.SlackBuild
new file mode 100644
index 0000000000..c738fdc115
--- /dev/null
+++ b/system/augeas/augeas.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for augeas
+
+# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PRGNAM=augeas
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/augeas/augeas.info b/system/augeas/augeas.info
new file mode 100644
index 0000000000..03fe904222
--- /dev/null
+++ b/system/augeas/augeas.info
@@ -0,0 +1,10 @@
+PRGNAM="augeas"
+VERSION="1.4.0"
+HOMEPAGE="http://augeas.net/"
+DOWNLOAD="http://download.augeas.net/augeas-1.4.0.tar.gz"
+MD5SUM="a2536a9c3d744dc09d234228fe4b0c93"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/system/augeas/slack-desc b/system/augeas/slack-desc
new file mode 100644
index 0000000000..192fb1f72c
--- /dev/null
+++ b/system/augeas/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+augeas: augeas (a configuration API)
+augeas:
+augeas: Augeas is a library and command line tool that focuses on the most
+augeas: basic problem in handling Linux configurations programmatically:
+augeas: editing actual configuration files in a controlled manner.
+augeas:
+augeas: Homepage: http://augeas.net/
+augeas: 
+augeas:
+augeas:
+augeas:
diff --git a/system/autojump/README b/system/autojump/README
index 96c3829425..31863dd081 100644
--- a/system/autojump/README
+++ b/system/autojump/README
@@ -4,4 +4,24 @@ command line. The jumpstat command shows you the current contents
 of the database. You need to work a little bit before the database
 becomes usable. Autojump will listen and rank your 'cd' commands by
 frequency. Once your database is reasonably complete, you can "jump"
-to a commonly "cd"ed directory.
+to a commonly "cd"ed directory.  It supports the bash, zsh, and
+tcsh shells.
+
+Installation
+------------
+
+Add the following to your .bashrc so that autojump commands will
+be recognized:
+
+source /etc/profile.d/autojump.bash
+
+Next, open a new shell and execute:
+
+$ cd /tmp
+$ cd /home
+$ cd /var
+$ j tmp
+
+You should be dropped back into the /tmp directory.  You can activate
+autojump for other shells by changing the sourced file extension to
+a supported shell name.
diff --git a/system/autojump/autojump.SlackBuild b/system/autojump/autojump.SlackBuild
index aca089c443..9842c37d48 100644
--- a/system/autojump/autojump.SlackBuild
+++ b/system/autojump/autojump.SlackBuild
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=autojump
-VERSION=${VERSION:-21.1.2}
+VERSION=${VERSION:-22.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,9 +42,9 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_v${VERSION}
-tar xvf $CWD/${PRGNAM}_v${VERSION}.tar.gz
-cd ${PRGNAM}_v${VERSION}
+rm -rf ${PRGNAM}-release-v${VERSION}
+tar xvf $CWD/release-v${VERSION}.tar.gz || tar xvf $CWD/${PRGNAM}-release-v${VERSION}.tar.gz
+cd ${PRGNAM}-release-v${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,21 +53,21 @@ find -L . \
  -exec chmod 644 {} \;
 
 install -Dm755 bin/autojump $PKG/usr/bin/autojump
-install -Dm755 bin/jumpapplet $PKG/usr/bin/jumpapplet
+install -Dm755 bin/autojump_argparse.py $PKG/usr/bin/autojump_argparse.py
+install -Dm755 bin/autojump_data.py $PKG/usr/bin/autojump_data.py
+install -Dm755 bin/autojump_utils.py $PKG/usr/bin/autojump_utils.py
 install -Dm755 bin/$PRGNAM.bash $PKG/etc/profile.d/$PRGNAM.bash
 install -Dm755 bin/$PRGNAM.sh $PKG/etc/profile.d/$PRGNAM.sh
 install -Dm755 bin/$PRGNAM.zsh $PKG/etc/profile.d/$PRGNAM.zsh
+install -Dm755 bin/$PRGNAM.fish $PKG/etc/profile.d/$PRGNAM.fish
 install -Dm644 bin/_j $PKG/usr/share/zsh/site-functions/_j
 install -Dm644 bin/icon.png $PKG/usr/share/$PRGNAM/icon.png
 install -Dm644 docs/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-# Seems like jumpapplet was changed for compliance with Arch
-sed -i 's/python2/python/' $PKG/usr/bin/jumpapplet
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGES.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/autojump/autojump.info b/system/autojump/autojump.info
index 76e32e4642..b7002142b7 100644
--- a/system/autojump/autojump.info
+++ b/system/autojump/autojump.info
@@ -1,8 +1,8 @@
 PRGNAM="autojump"
-VERSION="21.1.2"
-HOMEPAGE="https://github.com/joelthelion/autojump/wiki"
-DOWNLOAD="https://github.com/downloads/joelthelion/autojump/autojump_v21.1.2.tar.gz"
-MD5SUM="9b6dba043774db140434e18988fa9220"
+VERSION="22.2.4"
+HOMEPAGE="https://github.com/wting/autojump"
+DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.2.4.tar.gz"
+MD5SUM="136fc755090496b29bf664ffdf706d53"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/barman/barman.SlackBuild b/system/barman/barman.SlackBuild
index 1ec219359c..61988287e0 100644
--- a/system/barman/barman.SlackBuild
+++ b/system/barman/barman.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for barman
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=barman
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/barman/barman.info b/system/barman/barman.info
index 5cfa416b42..663305046c 100644
--- a/system/barman/barman.info
+++ b/system/barman/barman.info
@@ -1,8 +1,8 @@
 PRGNAM="barman"
-VERSION="1.4.1"
+VERSION="1.5.1"
 HOMEPAGE="http://www.pgbarman.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/pgbarman/1.4.1/barman-1.4.1.tar.gz"
-MD5SUM="c055c1168e3ee941a94cddfdf74af5cb"
+DOWNLOAD="http://downloads.sourceforge.net/project/pgbarman/1.5.1/barman-1.5.1.tar.gz"
+MD5SUM="637afad2441dcd8d58d3085dcf4d0ee2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="psycopg2 argh python-dateutil argcomplete"
diff --git a/system/betty/betty.SlackBuild b/system/betty/betty.SlackBuild
index 141cafa3d7..7ab3d9be40 100644
--- a/system/betty/betty.SlackBuild
+++ b/system/betty/betty.SlackBuild
@@ -5,7 +5,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/system/bicon/1e7128710f49ca1c53a892b9db3a364ec038f931.patch b/system/bicon/1e7128710f49ca1c53a892b9db3a364ec038f931.patch
deleted file mode 100644
index 2ea806c5b2..0000000000
--- a/system/bicon/1e7128710f49ca1c53a892b9db3a364ec038f931.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-# From 1e7128710f49ca1c53a892b9db3a364ec038f931 Mon Sep 17 00:00:00 2001
-# From: Behdad Esfahbod <behdad@behdad.org>
-# Date: Tue, 14 Oct 2014 17:36:50 -0700
-# Subject: [PATCH] Properly exit if child exited but didn't die
-# 
-# Happens, if for example you have a subprocess running in a shell but
-# exit the shell...
-# ---
- bicon/pty_spawn.c | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/bicon/pty_spawn.c b/bicon/pty_spawn.c
-index ad1da96..21ab737 100644
---- a/bicon/pty_spawn.c
-+++ b/bicon/pty_spawn.c
-@@ -10,6 +10,7 @@ namely the PSF License Agreement For Python 2.2.3
-  */
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <unistd.h>
- #include <errno.h>
- #include <pty.h>
-@@ -21,6 +22,8 @@ namely the PSF License Agreement For Python 2.2.3
- #include <signal.h>
- #include "pty_spawn.h"
- 
-+static volatile int done;
-+
- static pid_t
- _fork (int *master_fd, int *slave_fd)
- {
-@@ -66,7 +69,7 @@ _xread (
-   int ret;
-   do {
-     ret = read (fd, buf, count);
--  } while (ret == -1 && errno == EINTR);
-+  } while (ret == -1 && errno == EINTR && !done);
-   return ret;
- }
- 
-@@ -81,7 +84,7 @@ _xwrite (
-   {
-     do {
-       ret = write (fd, buf, count);
--    } while (ret == -1 && errno == EINTR);
-+    } while (ret == -1 && errno == EINTR && !done);
-     if (ret == -1)
-     {
-       fprintf (stderr, "bicon: write() failed.\n");
-@@ -105,7 +108,7 @@ _copy (
-   ino_t cwd = -1;
-   char _proc_child_cwd[32];
-   snprintf (_proc_child_cwd, sizeof (_proc_child_cwd), "/proc/%u/cwd", pid);
--  for (;;)
-+  for (;!done;)
-     {
- 
-       FD_ZERO (&rfds);
-@@ -114,9 +117,9 @@ _copy (
-       ret = select (master_fd + 1, &rfds, NULL, NULL, ptimeout);
-       if (-1 == ret)
-       {
--	if (errno == EINTR)
-+	if (errno == EINTR && !done)
- 	  continue;
--	return -1;
-+	return;
-       }
-       if (0 == ret)
-       {
-@@ -147,14 +150,14 @@ _copy (
- 	{
- 	  count = _xread (master_read, master_fd, buf, sizeof (buf));
- 	  if (count == -1)
--	    return -1;
-+	    return;
- 	  _xwrite (1, buf, count);
- 	}
-       if (FD_ISSET (0, &rfds))
- 	{
- 	  count = _xread (stdin_read, 0, buf, sizeof (buf));
- 	  if (count == -1)
--	    return -1;
-+	    return;
- 	  _xwrite (master_fd, buf, count);
- 	}
-       /* Set timeout, such that if things are steady, we update cwd
-@@ -180,6 +183,13 @@ resize(int dummy)
-   kill(pid, SIGWINCH);
- }
- 
-+static void
-+child(int dummy)
-+{
-+  done = 1;
-+  fprintf (stderr, "done\n");
-+}
-+
- int
- bicon_spawn (
-   const char *file,
-@@ -206,6 +216,11 @@ bicon_spawn (
-   sa.sa_handler = resize;
-   if (sigaction(SIGWINCH, &sa, NULL) == -1)
-     fprintf (stderr, "bicon: sigaction() failed.\n");
-+  sigemptyset (&sa.sa_mask);
-+  sa.sa_flags = 0;
-+  sa.sa_handler = child;
-+  if (sigaction(SIGCHLD, &sa, NULL) == -1)
-+    fprintf (stderr, "bicon: sigaction() failed.\n");
- 
-   tcgetattr (1, &ts);
-   newts = ts;
diff --git a/system/bicon/bicon.SlackBuild b/system/bicon/bicon.SlackBuild
index 0e542c6ea5..5095ce416e 100644
--- a/system/bicon/bicon.SlackBuild
+++ b/system/bicon/bicon.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bicon
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,14 +63,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
+
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cat $CWD/*patch | patch -p1 --verbose
 
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -85,14 +86,6 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Lets move the fonts and keymaps where they should go
-mkdir -p $PKG/usr/share/kbd/{consolefonts,keymaps/i386/qwerty}
-# We don't ship bicon-8x16.bdf beacuse it's heavy (392393 bytes) and we
-# ship the psf fonts that are useful on the console.
-mv $PKG/usr/share/bicon/font/*gz $PKG/usr/share/kbd/consolefonts
-mv $PKG/usr/share/bicon/keymap/* $PKG/usr/share/kbd/keymaps/i386/qwerty
-rm -r $PKG/usr/share/bicon
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/system/bicon/bicon.info b/system/bicon/bicon.info
index 0d53d1c120..8f47b3eb8c 100644
--- a/system/bicon/bicon.info
+++ b/system/bicon/bicon.info
@@ -1,10 +1,10 @@
 PRGNAM="bicon"
-VERSION="0.4"
+VERSION="0.5"
 HOMEPAGE="https://github.com/behdad/bicon"
-DOWNLOAD="https://github.com/behdad/bicon/releases/download/0.4/bicon-0.4.tar.gz"
-MD5SUM="82ba589b332ba6dfc9c39f66c246361b"
+DOWNLOAD="https://github.com/behdad/bicon/releases/download/0.5/bicon-0.5.tar.gz"
+MD5SUM="862972ed260f9e74277b8eeb7c81e126"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Didier Spaier"
-EMAIL="didier dot spaier at slint dot fr"
+EMAIL="didier at slint dot fr"
diff --git a/system/bicon/slack-desc b/system/bicon/slack-desc
index cd42a04185..4157e58efe 100644
--- a/system/bicon/slack-desc
+++ b/system/bicon/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-bicon: bicon (Bidirectional Console)
+bicon: bicon (a Bidirectional Console)
 bicon:
 bicon: BiCon can be used under Linux console, or terminal emulators with
 bicon: basic Unicode rendering (UTF-8).
diff --git a/system/blktrace/README b/system/blktrace/README
new file mode 100644
index 0000000000..8af793627e
--- /dev/null
+++ b/system/blktrace/README
@@ -0,0 +1,2 @@
+blktrace is a block layer IO tracing mechanism which provides detailed
+information about request queue operations up to user space.
diff --git a/system/blktrace/blktrace.SlackBuild b/system/blktrace/blktrace.SlackBuild
new file mode 100644
index 0000000000..163d84dec3
--- /dev/null
+++ b/system/blktrace/blktrace.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Slackware build script for blktrace
+
+# Copyright 2015 Markus Rinne Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=blktrace
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i 's|^prefix = /usr/local|prefix = /usr|' Makefile
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/blktrace/blktrace.info b/system/blktrace/blktrace.info
new file mode 100644
index 0000000000..8a001589b4
--- /dev/null
+++ b/system/blktrace/blktrace.info
@@ -0,0 +1,10 @@
+PRGNAM="blktrace"
+VERSION="1.1.0"
+HOMEPAGE="http://brick.kernel.dk/snaps/"
+DOWNLOAD="http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.gz"
+MD5SUM="9a6ca62330c8adb0b6a4ea6cf8a55694"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Markus Rinne"
+EMAIL="markus.ka.rinne@gmail.com"
diff --git a/system/blktrace/slack-desc b/system/blktrace/slack-desc
new file mode 100644
index 0000000000..36b3dd9abf
--- /dev/null
+++ b/system/blktrace/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+blktrace: blktrace (block layer IO tracing mechanism)
+blktrace:
+blktrace: blktrace is a block layer IO tracing mechanism which provides detailed
+blktrace: information about request queue operations up to user space.
+blktrace:
+blktrace:
+blktrace:
+blktrace:
+blktrace:
+blktrace:
+blktrace:
diff --git a/system/blocks/README b/system/blocks/README
new file mode 100644
index 0000000000..8f7294bb54
--- /dev/null
+++ b/system/blocks/README
@@ -0,0 +1,5 @@
+# blocks
+Conversion tools for block devices.
+
+Convert between raw partitions, logical volumes, and bcache devices
+without moving data.  `blocks` shuffles blocks and sprouts superblocks.
diff --git a/system/blocks/blocks.SlackBuild b/system/blocks/blocks.SlackBuild
new file mode 100644
index 0000000000..ebff0f1b02
--- /dev/null
+++ b/system/blocks/blocks.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for blocks
+
+# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=blocks
+COMMIT=d00d8aa2bcb64ef5113de9500220e57049b836b4
+VERSION=${VERSION:-0.1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+# Prepare directories
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/blocks/blocks.info b/system/blocks/blocks.info
new file mode 100644
index 0000000000..f173963991
--- /dev/null
+++ b/system/blocks/blocks.info
@@ -0,0 +1,10 @@
+PRGNAM="blocks"
+VERSION="0.1.4"
+HOMEPAGE="https://github.com/g2p/blocks"
+DOWNLOAD="https://github.com/g2p/blocks/archive/d00d8aa2bcb64ef5113de9500220e57049b836b4.tar.gz"
+MD5SUM="a8576e955f788449e7927800efa71e44"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 python3-pyparted python3-augeas maintboot"
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/system/blocks/slack-desc b/system/blocks/slack-desc
new file mode 100644
index 0000000000..cfd842e66a
--- /dev/null
+++ b/system/blocks/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+blocks: blocks (Block Devices Conversion Tools)
+blocks:
+blocks: Conversion tools for block devices.
+blocks: Convert between raw partitions, logical volumes, and bcache devices
+blocks: without moving data. blocks shuffles blocks and sprouts superblocks.
+blocks:
+blocks: Author: Gabriel de Perthuis
+blocks: Website: https://github.com/g2p/blocks
+blocks:
+blocks:
+blocks:
diff --git a/system/bochs/README b/system/bochs/README
index 90e1e95d40..9d937e215b 100644
--- a/system/bochs/README
+++ b/system/bochs/README
@@ -4,4 +4,44 @@ Intel x86 CPU, common I/O devices, and a custom BIOS. Bochs can be
 compiled to emulate 386, 486, Pentium/Pentium II/Pentium 4 or x86-64 
 including optional MMX, SSEx and 3DNow! instructions.
 
-wxPython is an optional dependency.
+You can enable/disable a lot of optional features by passing variables to the script (VAR=yes/no ./bochs.SlackBuild).
+
+IDLE_HACK=yes/no (default: no), works only with x11 and term GUIs
+PLUGINS=yes/no (default: no)
+A20_PIN=yes/no (default: yes)
+x86_64=yes/no (default: yes)
+SMP=yes/no (default: yes)
+CPU_LEVEL=3/4/5/6 (default: 6)
+DEBUGGER=yes/no (default: no)
+DISASM=yes/no (default: no)
+GDB_STUB=yes/no (default: no)
+IODEBUG=yes/no (default: no)
+READLINE=yes/no (default: yes)
+LOGGING=yes/no (default: yes)
+STATS=yes/no (default: yes)
+FPU=yes/no (default: yes)
+VMX=no/1/2 (default: no)
+SVM=yes/no (default: no)
+AVX=yes/no (default: no)
+EVEX=yes/no (default: no)
+PCI=yes/no (default: yes)
+USB=yes/no (default: yes)
+USB_OHCI=yes/no (default: yes)
+USB_XHCI=yes/no (default: yes)
+NE2K=yes/no (default:yes)
+PNIC=yes/no (default: yes)
+E1K=yes/no (default: yes)
+CIRRUS=yes/no (default: yes)
+VOODOO=yes/no (default: yes)
+CDROM=yes/no (default: yes)
+SB16=yes/no (default: yes)
+ES1370=yes/no (default: yes)
+GAMEPORT=yes/no (default: yes)
+BUSMOUSE=yes/no (default: yes)
+TERM=yes/no (default: yes)
+RFB=yes/no (default: yes)
+VNCSRV=yes/no (default: yes)
+X11=yes/no (default: yes)
+WX=yes/no (default: no), requires wxGTK, or wxPython
+SDL=yes/no (default: yes)
+SDL2=yes/no (default:no), requires SDL2, buggy
diff --git a/system/bochs/bochs.SlackBuild b/system/bochs/bochs.SlackBuild
index db6efdc4ea..198edad541 100644
--- a/system/bochs/bochs.SlackBuild
+++ b/system/bochs/bochs.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for Bochs
-# Copyright 2012, 2013, 2014, Bojan Popovic, Belgrade, Serbia 
+# Copyright 2012, 2013, 2014, 2015 Bojan Popovic, Belgrade, Serbia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,12 +25,15 @@
 
 # ChangeLog:
 #
-#  * build 2 (2014-01-29): 
+#  * 2014-01-29:
 # 		New upstream version (2.6.2). Solved the problem with dynamic
 #		linking on x86_64.
+#  * 2015-08-03:
+#   	New upstream version (2.6.8). You can now override most of the
+# 		configure options on the command line.
 
 PRGNAM=bochs
-VERSION=${VERSION:-2.6.2}
+VERSION=${VERSION:-2.6.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,6 +45,56 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# Fine tuning Bochs features (without experimental features)
+IDLE_HACK=${IDLE_HACK:-no} # Supposedly works only with X11 and term gui
+PLUGINS=${PLUGINS:-yes}
+A20_PIN=${A20_PIN:-yes}
+x86_64=${x86_64:-yes}
+SMP=${SMP:-yes}
+CPU_LEVEL=${CPU_LEVEL:-6} # (3/4/5/6)
+DEBUGGER=${DEBUGGER:-no}
+DISASM=${DISASM:-no}
+GDB_STUB=${GDB_STUB:-no}
+IODEBUG=${IODEBUG:-no}
+READLINE=${READLINE:-yes}
+LOGGING=${LOGGING:-yes}
+STATS=${STATS:-yes}
+FPU=${FPU:-yes}
+VMX=${VMX:-no} # (no/1/2)
+SVM=${SVM:-no}
+AVX=${AVX:-no}
+EVEX=${EVEX:-no}
+PCI=${PCI:-yes}
+USB=${USB:-yes}
+USB_OHCI=${USB_OHCI:-yes}
+USB_XHCI=${USB_XHCI:-yes}
+NE2K=${NE2K:-yes}
+PNIC=${PNIC:-yes}
+E1K=${E1K:-yes}
+CIRRUS=${CIRRUS:-yes}
+VOODOO=${VOODOO:-yes}
+CDROM=${CDROM:-yes}
+SB16=${SB16:-yes}
+ES1370=${ES1370:-yes}
+GAMEPORT=${GAMEPORT:-yes}
+BUSMOUSE=${BUSMOUSE:-yes}
+
+# Frontend interfaces
+TERM=${TERM:-yes}
+RFB=${RFB:-yes}
+VNCSRV=${VNCSRV:-yes}
+X11=${X11:-yes}
+WX=${WX:-no}
+SDL=${SDL:-yes}
+SDL2=${SDL2:-no} # Note: buggy on my machine.
+
+# SDL and SDL2 interfaces are mutually exclusive. SDL interface seems to be
+# more stable, so default to SDL.
+if [ "$SDL" = "yes" -a "$SDL2" = "yes" ]; then
+	echo "Warning: You can't enable both SDL and SDL2. Defaulting to SDL."
+	SDL2=no
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -63,8 +116,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ $(which wx-config 2>/dev/null) ]; then wx="--with-wx"; else wx=""; fi
-
 set -e
 
 rm -rf $PKG
@@ -75,10 +126,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # We need this on x86_64 to fix a libtldl problem
 libtoolize -c
@@ -94,34 +145,49 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-idle-hack \
-  --enable-cdrom \
-  --enable-clgd54xx \
-  --enable-disasm \
-  --enable-e1000 \
-  --enable-gameport \
-  --enable-iodebug \
-  --enable-monitor-mwait \
-  --enable-ne2000 \
-  --enable-plugins \
-  --enable-pci \
-  --enable-pcidev \
-  --enable-pnic \
-  --enable-readline \
-  --enable-raw-serial \
-  --enable-sb16 \
-  --enable-usb \
-  --enable-usb-ohci \
-  --enable-usb-xhci \
-  --with-nogui \
-  --with-rfb \
-  --with-term \
-  --with-x \
-  --with-x11 \
-  --with-sdl \
-  $wx \
+  --enable-idle-hack=${IDLE_HACK} \
+  --enable-plugins=${PLUGINS} \
+  --enable-a20-pin=${A20_PIN} \
+  --enable-x86_64=${x86_64} \
+  --enable-smp=${SMP} \
+  --enable-cpu-level=${CPU_LEVEL} \
+  --enable-debugger=${DEBUGGER} \
+  --enable-disasm=${DISASM} \
+  --enable-gdb-stub=${GDB_STUB} \
+  --enable-iodebug=${IODEBUG} \
+  --enable-readline=${READLINE} \
+  --enable-logging=${LOGGING} \
+  --enable-stats=${STATS} \
+  --enable-fpu=${FPU} \
+  --enable-vmx=${VMX} \
+  --enable-svm=${SVM} \
+  --enable-avx=${AVX} \
+  --enable-evex=${EVE} \
+  --enable-pci=${PCI} \
+  --enable-usb=${USB} \
+  --enable-usb-ohci=${USB_OHCI} \
+  --enable-usb-xhci=${USB_XHCI} \
+  --enable-ne2000=${NE2K} \
+  --enable-pnic=${PNIC} \
+  --enable-e1000=${E1K} \
+  --enable-clgd54xx=${CIRRUS} \
+  --enable-voodoo=${VOODOO} \
+  --enable-cdrom=${CDROM} \
+  --enable-sb16=${SB16} \
+  --enable-es1370=${ES1370} \
+  --enable-gameport=${GAMEPORT} \
+  --enable-busmouse=${BUSMOUSE} \
+  --with-term=${TERM} \
+  --with-rfb=${RFB} \
+  --with-vncsrv=${VNCSRV} \
+  --with-sdl=${SDL} \
+  --with-sdl2=${SDL2} \
+  --with-x11=${X11} \
+  --with-wx=${WX} \
   --build=$ARCH-slackware-linux
 
+
+
 make
 make install DESTDIR=$PKG
 
@@ -132,9 +198,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
-cp -a \
-  $DOCS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/bochs/bochs.info b/system/bochs/bochs.info
index 76d3ad0164..93ea47b057 100644
--- a/system/bochs/bochs.info
+++ b/system/bochs/bochs.info
@@ -1,8 +1,8 @@
 PRGNAM="bochs"
-VERSION="2.6.2"
+VERSION="2.6.8"
 HOMEPAGE="http://bochs.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/bochs/bochs-2.6.2.tar.gz"
-MD5SUM="82ecaff9826d4f29fa46f3062e2957b8"
+DOWNLOAD="http://downloads.sourceforge.net/bochs/bochs-2.6.8.tar.gz"
+MD5SUM="8a243e2b5f7562f32d2b26f3cebbba08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cabextract/cabextract.info b/system/cabextract/cabextract.info
index dab9e4ea26..deb0529668 100644
--- a/system/cabextract/cabextract.info
+++ b/system/cabextract/cabextract.info
@@ -1,7 +1,7 @@
 PRGNAM="cabextract"
 VERSION="1.4"
 HOMEPAGE="http://www.cabextract.org.uk"
-DOWNLOAD="http://www.cabextract.org.uk/cabextract-1.4.tar.gz"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/cabextract/cabextract-1.4.tar.gz"
 MD5SUM="79f41f568cf1a3ac105e0687e8bfb7c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/cantarell-fonts/README b/system/cantarell-fonts/README
index d134b820b7..d8ffb535cc 100644
--- a/system/cantarell-fonts/README
+++ b/system/cantarell-fonts/README
@@ -1,7 +1,12 @@
-cantarell-fonts (The Cantarell typeface family is a contemporary Humanist sans serif, and is
-used by the GNOME project for its user interface and the Fedora project.)
+cantarell-fonts (The Cantarell typeface family)
 
-Cantarell was originally designed by Dave Crossland as part of his coursework for the MA Typeface
-Design programme at the Department of Typography in the University of Reading, England.
+The Cantarell typeface family  is a contemporary Humanist sans serif,
+and is used by the GNOME project for its user interface and the
+Fedora project.)
 
-This is the open font officially chosen by default for the GNOME 3 desktop and for Fedora branding materials.
+Cantarell was originally designed by Dave Crossland as part of his
+coursework for the MA Typeface Design programme at the Department
+of Typography in the University of Reading, England.
+
+This is the open font officially chosen by default for the GNOME 3
+and for Fedora branding materials.
diff --git a/system/cantarell-fonts/cantarell-fonts.SlackBuild b/system/cantarell-fonts/cantarell-fonts.SlackBuild
index 6b2952cedf..ce6ba8e132 100644
--- a/system/cantarell-fonts/cantarell-fonts.SlackBuild
+++ b/system/cantarell-fonts/cantarell-fonts.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
-
-# Slackware build script for cantarell-fonts
-
+#
+# Slackware build script for cantarell-fonts.
+#
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cantarell-fonts
-VERSION=${VERSION:-0.0.16}
+VERSION=${VERSION:-0.0.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,8 +54,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="COPYING README NEWS"
-
 set -e
 
 rm -rf $PKG
@@ -82,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make -j1
+make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -93,7 +91,7 @@ cp -a $PKG/usr/share/fonts/cantarell/*.otf $PKG/usr/share/fonts/OTF/
 rm -rf $PKG/usr/share/fonts/cantarell
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/cantarell-fonts/cantarell-fonts.info b/system/cantarell-fonts/cantarell-fonts.info
index c568235f48..11c40b7dc1 100644
--- a/system/cantarell-fonts/cantarell-fonts.info
+++ b/system/cantarell-fonts/cantarell-fonts.info
@@ -1,8 +1,8 @@
 PRGNAM="cantarell-fonts"
-VERSION="0.0.16"
+VERSION="0.0.20.1"
 HOMEPAGE="https://download.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.16.tar.xz"
-MD5SUM="6665af844817ec1390f8ae2a16feb369"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.20.1.tar.xz"
+MD5SUM="66b255f8862cb43ffe24706017d8e2a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ccid/ccid.SlackBuild b/system/ccid/ccid.SlackBuild
index cb7f9043d4..61e8ec28c1 100644
--- a/system/ccid/ccid.SlackBuild
+++ b/system/ccid/ccid.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for ccid
 
 # Copyright 2008 Andrew Psaltis <ampsaltis@gmail.com>
-# Copyright 2014 LukenShiro, Italy
+# Copyright 2014-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -30,7 +30,7 @@
 # 05 October 2009 -- Updated to version 1.3.11
 
 PRGNAM=ccid
-VERSION=${VERSION:-1.4.18}
+VERSION=${VERSION:-1.4.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ccid/ccid.info b/system/ccid/ccid.info
index f308d66264..7db68a5de5 100644
--- a/system/ccid/ccid.info
+++ b/system/ccid/ccid.info
@@ -1,8 +1,8 @@
 PRGNAM="ccid"
-VERSION="1.4.18"
+VERSION="1.4.21"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4111/ccid-1.4.18.tar.bz2"
-MD5SUM="8d57342bda53aaee706ef2d02409c4f4"
+DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4148/ccid-1.4.21.tar.bz2"
+MD5SUM="d1c3d5b447510cd507d1ecc09ac41b04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-lite"
diff --git a/system/chrpath/README b/system/chrpath/README
index e5b04c1aed..8a4bd3505b 100644
--- a/system/chrpath/README
+++ b/system/chrpath/README
@@ -1,4 +1,3 @@
 chrpath allows you to modify the dynamic library load path (rpath) of
 compiled programs.  Currently, only removing and modifying the rpath
-is supported.  Eventually, I hope to be able to add an rpath if it is
-missing.
+is supported.
diff --git a/system/chrpath/chrpath.SlackBuild b/system/chrpath/chrpath.SlackBuild
index b5e5b6da14..cc2c4b6142 100644
--- a/system/chrpath/chrpath.SlackBuild
+++ b/system/chrpath/chrpath.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for chrpath
 
-# Copyright 2010-2014  Robby Workman, Northport, Alabama, USA
+# Copyright 2010-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -77,6 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/system/chrpath/chrpath.info b/system/chrpath/chrpath.info
index a65e404813..daa9c17790 100644
--- a/system/chrpath/chrpath.info
+++ b/system/chrpath/chrpath.info
@@ -1,7 +1,7 @@
 PRGNAM="chrpath"
 VERSION="0.16"
-HOMEPAGE="http://packages.qa.debian.org/c/chrpath.html"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/c/chrpath/chrpath_0.16.orig.tar.gz"
+HOMEPAGE="https://alioth.debian.org/projects/chrpath/"
+DOWNLOAD="https://alioth.debian.org/frs/download.php/file/3979/chrpath-0.16.tar.gz"
 MD5SUM="2bf8d1d1ee345fc8a7915576f5649982"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/chrpath/slack-desc b/system/chrpath/slack-desc
index 69bf803d9f..5c36a9fc40 100644
--- a/system/chrpath/slack-desc
+++ b/system/chrpath/slack-desc
@@ -10,9 +10,9 @@ chrpath: chrpath (modify rpath of binaries)
 chrpath:
 chrpath: chrpath allows you to modify the dynamic library load path (rpath) of
 chrpath: compiled programs.  Currently, only removing and modifying the rpath
-chrpath: is supported.  Eventually, I hope to be able to add an rpath if it is
-chrpath: missing.
+chrpath: is supported.
 chrpath:
+chrpath: Homepage:  https://alioth.debian.org/projects/chrpath/
 chrpath:
 chrpath:
 chrpath:
diff --git a/system/ciopfs/README b/system/ciopfs/README
new file mode 100644
index 0000000000..8288557370
--- /dev/null
+++ b/system/ciopfs/README
@@ -0,0 +1,3 @@
+ciopfs is a case-insensitive FUSE filesystem. It is useful for getting
+around issues where, say, a game is ported from Linux to Windows but
+the mods for that game still expect a case-insenitive filesystem.
diff --git a/system/ciopfs/ciopfs.SlackBuild b/system/ciopfs/ciopfs.SlackBuild
new file mode 100644
index 0000000000..27b116836c
--- /dev/null
+++ b/system/ciopfs/ciopfs.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Slackware build script for ciopfs
+
+# Copyright 2015 Dugan Chen Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ciopfs
+VERSION=${VERSION:-0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make
+install -Dm755 ciopfs $PKG/bin/ciopfs
+mkdir -p $PKG/sbin
+( cd $PKG/sbin
+ln -s ../bin/ciopfs mount.ciopfs
+)
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ciopfs/ciopfs.info b/system/ciopfs/ciopfs.info
new file mode 100644
index 0000000000..1b7880ed43
--- /dev/null
+++ b/system/ciopfs/ciopfs.info
@@ -0,0 +1,10 @@
+PRGNAM="ciopfs"
+VERSION="0.4"
+HOMEPAGE="http://www.brain-dump.org/projects/ciopfs/"
+DOWNLOAD="http://www.brain-dump.org/projects/ciopfs/ciopfs-0.4.tar.gz"
+MD5SUM="1798fc043034f292efd887c05fc4ea1e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dugan Chen"
+EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/system/ciopfs/slack-desc b/system/ciopfs/slack-desc
new file mode 100644
index 0000000000..71fd50e058
--- /dev/null
+++ b/system/ciopfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ciopfs: ciopfs (case insensitive FUSE filesystem)
+ciopfs:
+ciopfs: ciopfs is a stackable or overlay linux userspace file system
+ciopfs: (implemented with fuse) which mounts a normal directory on a regular
+ciopfs: file sytem in case insensitive fashion.
+ciopfs:
+ciopfs: http://www.brain-dump.org/projects/ciopfs/
+ciopfs:
+ciopfs:
+ciopfs:
+ciopfs:
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index cb8707ea4e..d009572a43 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -27,7 +27,7 @@
 # No additional license terms added
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.98.7}
+VERSION=${VERSION:-0.99}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,18 +86,29 @@ else
   with_jsonc=""
 fi
 
+# Some people don't have sendmail installed: don't build milter stuff
+# in this case.
+# This is your call, not having sendmail is *UNSUPPORTED*
+if [ ! -f /usr/lib$LIBDIRSUFFIX/libmilter.a ]; then
+  milter="dis"
+  milter_cf=""
+else
+  milter="en"
+  milter_cf="clamav-milter"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
@@ -142,7 +153,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-user=clamav \
   --with-group=clamav \
   --with-dbdir=/var/lib/clamav \
-  --enable-milter \
+  --${milter}able-milter \
   --enable-id-check \
   --enable-clamdtop \
   --disable-static \
@@ -154,7 +165,7 @@ make V=1
 make install DESTDIR=$PKG
 
 # Prepare the config files:
-for cf in clamd freshclam clamav-milter; do
+for cf in clamd freshclam $milter_cf; do
   mv $PKG/etc/$cf.conf.sample $PKG/etc/$cf.conf.new
 done
 
@@ -171,8 +182,10 @@ chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav
 # Fixup some ownership and permissions issues
 chown -R root:root $PKG
 chmod -R o-w $PKG
-chown clamav $PKG/usr/sbin/clamav-milter
-chmod 4700 $PKG/usr/sbin/clamav-milter
+if [ "$milter" = "en" ]; then
+  chown clamav $PKG/usr/sbin/clamav-milter
+  chmod 4700 $PKG/usr/sbin/clamav-milter
+fi
 chmod 0770 $PKG/var/lib/clamav
 touch $PKG/var/lib/clamav/main.cvd $PKG/var/lib/clamav/daily.cvd
 chmod 0660 $PKG/var/lib/clamav/*
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index 4365462691..6b478947db 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,8 +1,8 @@
 PRGNAM="clamav"
-VERSION="0.98.7"
+VERSION="0.99"
 HOMEPAGE="http://www.clamav.net/"
-DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.98.7.tar.gz"
-MD5SUM="157c601161da1c2d5a0e48ea1b49e067"
+DOWNLOAD="http://www.clamav.net/downloads/production/clamav-0.99.tar.gz"
+MD5SUM="ae79c3982761ba1815dbce17f846bab6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/clamav/doinst.sh b/system/clamav/doinst.sh
index 4d177d91b4..6ee0edcffc 100644
--- a/system/clamav/doinst.sh
+++ b/system/clamav/doinst.sh
@@ -27,7 +27,7 @@ preserve_perms() {
 preserve_perms etc/rc.d/rc.clamav.new
 config etc/freshclam.conf.new
 config etc/clamd.conf.new
-config etc/clamav-milter.conf.new
+[ -f etc/clamav-milter.conf.new ] && config etc/clamav-milter.conf.new
 config etc/logrotate.d/clamav.new
 # Remove new log if one is already present
 config var/log/clamav/clamd.log.new ; rm -f var/log/clamav/clamd.log.new
diff --git a/system/clamtk/clamtk.SlackBuild b/system/clamtk/clamtk.SlackBuild
index d89fccf876..3050c6d24b 100644
--- a/system/clamtk/clamtk.SlackBuild
+++ b/system/clamtk/clamtk.SlackBuild
@@ -26,7 +26,7 @@
 # https://aur.archlinux.org/packages/clamtk/
 
 PRGNAM=clamtk
-VERSION=${VERSION:-5.18}
+VERSION=${VERSION:-5.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/clamtk/clamtk.info b/system/clamtk/clamtk.info
index f91b12a066..234f362955 100644
--- a/system/clamtk/clamtk.info
+++ b/system/clamtk/clamtk.info
@@ -1,8 +1,8 @@
 PRGNAM="clamtk"
-VERSION="5.18"
+VERSION="5.20"
 HOMEPAGE="https://github.com/dave-theunsub/clamtk/"
-DOWNLOAD="https://bitbucket.org/dave_theunsub/clamtk/downloads/clamtk-5.18.tar.gz"
-MD5SUM="8be8061315efb8458960cc87bcaa131b"
+DOWNLOAD="https://bitbucket.org/dave_theunsub/clamtk/downloads/clamtk-5.20.tar.gz"
+MD5SUM="2a796771b11d89dd290daf6e29338a64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwww-perl perl-http-message perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Time-Piece perl-gtk2 clamav zenity"
diff --git a/system/colord-gtk/README b/system/colord-gtk/README
new file mode 100644
index 0000000000..bc76eaf240
--- /dev/null
+++ b/system/colord-gtk/README
@@ -0,0 +1 @@
+colord-gtk is the GTK+ support library for colord.
diff --git a/system/colord-gtk/colord-gtk.SlackBuild b/system/colord-gtk/colord-gtk.SlackBuild
new file mode 100644
index 0000000000..9e26c1719b
--- /dev/null
+++ b/system/colord-gtk/colord-gtk.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+# Slackware build script for colord-gtk
+
+# Copyright 2015 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=colord-gtk
+VERSION=${VERSION:-0.1.26}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING INSTALL MAINTAINERS NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/colord-gtk/colord-gtk.info b/system/colord-gtk/colord-gtk.info
new file mode 100644
index 0000000000..2dd21f5aa3
--- /dev/null
+++ b/system/colord-gtk/colord-gtk.info
@@ -0,0 +1,10 @@
+PRGNAM="colord-gtk"
+VERSION="0.1.26"
+HOMEPAGE="http://www.freedesktop.org/software/colord"
+DOWNLOAD="http://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.26.tar.xz"
+MD5SUM="bb9d6f3c037152ad791003375aa6c16c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="colord"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/system/colord-gtk/slack-desc b/system/colord-gtk/slack-desc
new file mode 100644
index 0000000000..e033503a70
--- /dev/null
+++ b/system/colord-gtk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+colord-gtk: colord-gtk (GTK integration for libcolord)
+colord-gtk:
+colord-gtk: colord-gtk is the GTK+ support library for colord.
+colord-gtk:
+colord-gtk: http://www.freedesktop.org/software/colord/
+colord-gtk:
+colord-gtk:
+colord-gtk:
+colord-gtk:
+colord-gtk:
+colord-gtk:
diff --git a/system/cool-retro-term/cool-retro-term.SlackBuild b/system/cool-retro-term/cool-retro-term.SlackBuild
index 8eb263a687..bd4e06199f 100644
--- a/system/cool-retro-term/cool-retro-term.SlackBuild
+++ b/system/cool-retro-term/cool-retro-term.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cool-retro-term
 
-# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cool-retro-term
-VERSION=${VERSION:-20141004_9deeb5e}
+VERSION=${VERSION:-20151215_2739170}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,15 +71,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|.*qmltermwidget||" $PRGNAM.pro
+
 qmake-qt5
 make
 make INSTALL_ROOT=$PKG install
 
-# install self made icon and use it instead of the generic one
-install -m 0644 -D $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
-sed -i "s|utilities-terminal$|$PRGNAM|" \
-  $PKG/usr/share/applications/$PRGNAM.desktop || exit 1
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/system/cool-retro-term/cool-retro-term.info b/system/cool-retro-term/cool-retro-term.info
index a49e359885..f8ec1c1a68 100644
--- a/system/cool-retro-term/cool-retro-term.info
+++ b/system/cool-retro-term/cool-retro-term.info
@@ -1,10 +1,10 @@
 PRGNAM="cool-retro-term"
-VERSION="20141004_9deeb5e"
-HOMEPAGE="https://github.com/Swordifish90/cool-retro-term"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cool-retro-term-20141004_9deeb5e.tar.xz"
-MD5SUM="780697cd5ee607837df29ac9a54e6880"
+VERSION="20151215_2739170"
+HOMEPAGE="https://github.com/Swordfish90/cool-retro-term"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cool-retro-term-20151215_2739170.tar.xz"
+MD5SUM="ab0eb7caafe3dac228762ffd16d8a203"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES="qmltermwidget"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/cool-retro-term/cool-retro-term.png b/system/cool-retro-term/cool-retro-term.png
deleted file mode 100644
index 5380fff17e..0000000000
--- a/system/cool-retro-term/cool-retro-term.png
+++ /dev/null
diff --git a/system/cool-retro-term/doinst.sh b/system/cool-retro-term/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/system/cool-retro-term/doinst.sh
+++ b/system/cool-retro-term/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/cool-retro-term/slack-desc b/system/cool-retro-term/slack-desc
index 0d3e47a176..b7d73572c5 100644
--- a/system/cool-retro-term/slack-desc
+++ b/system/cool-retro-term/slack-desc
@@ -13,7 +13,7 @@ cool-retro-term: and feel of the old cathode tube screens.
 cool-retro-term: It has been designed to be eye-candy, customizable, and reasonably
 cool-retro-term: lightweight.
 cool-retro-term:
-cool-retro-term: homepage: https://github.com/Swordifish90/cool-retro-term
+cool-retro-term: homepage: https://github.com/Swordfish90/cool-retro-term
 cool-retro-term:
 cool-retro-term:
 cool-retro-term:
diff --git a/system/crashplan/crashplan.SlackBuild b/system/crashplan/crashplan.SlackBuild
index 9eaa7412d6..770a665ee2 100644
--- a/system/crashplan/crashplan.SlackBuild
+++ b/system/crashplan/crashplan.SlackBuild
@@ -6,8 +6,8 @@
 # Based on http://slackbuilds.org/template.SlackBuild
 
 PRGNAM=crashplan
-VERSION=${VERSION:-3.5.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.3.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=CrashPlan
diff --git a/system/crashplan/crashplan.info b/system/crashplan/crashplan.info
index 938625f815..b9c8226360 100644
--- a/system/crashplan/crashplan.info
+++ b/system/crashplan/crashplan.info
@@ -1,10 +1,10 @@
 PRGNAM="crashplan"
-VERSION="3.5.3"
+VERSION="4.3.0"
 HOMEPAGE="http://www.crashplan.com"
-DOWNLOAD="http://download.crashplan.com/installs/linux/install/CrashPlan/CrashPlan_3.5.3_Linux.tgz"
-MD5SUM="9865c78dc1e1acf587d159fd6154a1bf"
+DOWNLOAD="http://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_4.3.0_Linux.tgz"
+MD5SUM="3b06038c29692b4daf05df739fd19ff7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
 MAINTAINER="Lionel Young"
-EMAIL="redtricycle@gmail.com"
+EMAIL="lionelyoung@gmail.com"
diff --git a/system/dahdi-complete/LICENSE b/system/dahdi-complete/LICENSE
new file mode 100644
index 0000000000..341c30bda4
--- /dev/null
+++ b/system/dahdi-complete/LICENSE
@@ -0,0 +1,166 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
diff --git a/system/dahdi-complete/README b/system/dahdi-complete/README
new file mode 100644
index 0000000000..32c4ef4cfb
--- /dev/null
+++ b/system/dahdi-complete/README
@@ -0,0 +1,11 @@
+dahdi-complete provides everything necessary for using DAHDI (Digium/Asterisk 
+Hardware Device Interface) telephony hardware with Linux. This includes:
+
+* drivers
+* configuration tools
+* example configuration files
+* firmware
+
+As this package contains kernel modules that will be built for your current
+kernel, you will need to rebuild (not simply reinstall) this SlackBuild if you
+change/upgrade your kernel.
diff --git a/system/dahdi-complete/README.SLACKWARE b/system/dahdi-complete/README.SLACKWARE
new file mode 100644
index 0000000000..bfcd8b3762
--- /dev/null
+++ b/system/dahdi-complete/README.SLACKWARE
@@ -0,0 +1,13 @@
+README.SLACKWARE for dahdi-complete
+
+To start dahdi-complete at boot, add the following to /etc/rc.d/rc.local:
+
+  if [ -x /etc/rc.d/rc.dahdi ];  then
+    /etc/rc.d/rc.dahdi start
+  fi
+
+This goes in /etc/rc.d/rc.local_shutdown:
+
+  if [ -x /etc/rc.d/rc.dahdi ];  then
+    /etc/rc.d/rc.dahdi stop
+  fi
diff --git a/system/dahdi-complete/dahdi-complete.SlackBuild b/system/dahdi-complete/dahdi-complete.SlackBuild
new file mode 100644
index 0000000000..269d26fe5e
--- /dev/null
+++ b/system/dahdi-complete/dahdi-complete.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh -e
+
+# Slackware Package Build Script for DAHDI complete package (http://www.asterisk.org/downloads/dahdi)
+# SlackBuild source at https://github.com/chapmajs/dahdi-complete-slackbuild
+
+# See LICENSE included in the project root for licensing information.
+
+# Copyright (c) 2015 Jonathan Chapman
+# glitch@glitchwrks.com
+# All rights reserved.
+
+PRGNAM=dahdi-complete
+VERSION=${VERSION:-2.10.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+ARCHIVE_NAME=dahdi-linux-complete
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# Clean up old builds
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar zxvf $CWD/$ARCHIVE_NAME-$VERSION+$VERSION.tar.gz
+cd $ARCHIVE_NAME-$VERSION+$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cd linux
+make all
+cd ../tools
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-dahdi=../linux \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+cd ..
+make config DESTDIR=$PKG
+
+# move config files to .new
+cd $PKG/etc
+for file in $(find . -type f); do
+	mv $file "$file.new"
+done
+
+install -D -m 0644 $TMP/$ARCHIVE_NAME-$VERSION+$VERSION/tools/dahdi.init $PKG/etc/rc.d/rc.dahdi.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr/
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Clean up zero-length firmware files
+(
+	cd $PKG/lib/firmware
+	find . -size 0 | xargs rm
+)
+
+# Finish up the package
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dahdi-complete/dahdi-complete.info b/system/dahdi-complete/dahdi-complete.info
new file mode 100644
index 0000000000..545f353e9a
--- /dev/null
+++ b/system/dahdi-complete/dahdi-complete.info
@@ -0,0 +1,10 @@
+PRGNAM="dahdi-complete"
+VERSION="2.10.2"
+HOMEPAGE="http://www.asterisk.org/downloads/dahdi"
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-2.10.2+2.10.2.tar.gz"
+MD5SUM="9b5ae61dc6202b45284d71481ec758c0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jonathan Chapman"
+EMAIL="glitch@glitchwrks.com"
diff --git a/system/dahdi-complete/doinst.sh b/system/dahdi-complete/doinst.sh
new file mode 100644
index 0000000000..76b1cc357b
--- /dev/null
+++ b/system/dahdi-complete/doinst.sh
@@ -0,0 +1,41 @@
+# Post-install configuration scripts, borrowed from the fail2ban
+# Slackbuild: 
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.dahdi.new
+
+config etc/udev/rules.d/xpp.rules.new
+config etc/udev/rules.d/dahdi.rules.new
+config etc/hotplug/usb/xpp_fxloader.usermap.new
+config etc/dahdi/system.conf.new
+config etc/dahdi/assigned-spans.conf.sample.new
+config etc/dahdi/span-types.conf.sample.new
+config etc/dahdi/init.conf.new
+config etc/dahdi/modules.new
+config etc/dahdi/genconf_parameters.new
+config etc/bash_completion.d/dahdi.new
+config etc/modprobe.d/dahdi.conf.new
+config etc/modprobe.d/dahdi.blacklist.conf.new
diff --git a/system/dahdi-complete/slack-desc b/system/dahdi-complete/slack-desc
new file mode 100644
index 0000000000..42f917c5c5
--- /dev/null
+++ b/system/dahdi-complete/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+dahdi-complete: dahdi-complete (DAHDI hardware drivers for Asterisk)
+dahdi-complete:
+dahdi-complete: DAHDI (Digium/Asterisk Hardware Device Interface) is the open source
+dahdi-complete: device technology used to control Digium and other legacy telephony
+dahdi-complete: interface cards.
+dahdi-complete:
+dahdi-complete:
+dahdi-complete:
+dahdi-complete:
+dahdi-complete: Homepage: http://www.asterisk.org/downloads/dahdi
+dahdi-complete:
diff --git a/system/dar/dar.SlackBuild b/system/dar/dar.SlackBuild
index c9c3676964..0d9cf6fef5 100644
--- a/system/dar/dar.SlackBuild
+++ b/system/dar/dar.SlackBuild
@@ -30,7 +30,7 @@
 # No additional license terms added  :-)
 
 PRGNAM="dar"
-VERSION=${VERSION:-2.4.17}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dar/dar.info b/system/dar/dar.info
index 1972fca4eb..40e7343879 100644
--- a/system/dar/dar.info
+++ b/system/dar/dar.info
@@ -1,8 +1,8 @@
 PRGNAM="dar"
-VERSION="2.4.17"
+VERSION="2.5.0"
 HOMEPAGE="http://dar.linux.free.fr/"
-DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.4.17.tar.gz"
-MD5SUM="b8986a75539a901f70854d7068e898af"
+DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.5.0.tar.gz"
+MD5SUM="5fcab4620a7eceffd83076868be82eda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dash/README b/system/dash/README
index c41d3417a6..4daf9c0301 100644
--- a/system/dash/README
+++ b/system/dash/README
@@ -1,4 +1,13 @@
 DASH is a POSIX-compliant implementation of /bin/sh that aims to be as 
 small as possible.  It does this without sacrificing speed where possible. 
 In fact, it is significantly faster than bash (the GNU Bourne-Again SHell) 
-for most tasks. 
+for most tasks.
+
+To patch in fixes from current git, add 'USE_GIT_PATCH=yes' to the command
+line when building, like this:
+
+# USE_GIT_PATCH=yes sh dash.Slackbuild
+
+or, if you use fakeroot to build:
+
+$ fakeroot env USE_GIT_PATCH=yes sh dash.SlackBuild
diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
index 47b9200929..f0c362a7d5 100644
--- a/system/dash/dash.SlackBuild
+++ b/system/dash/dash.SlackBuild
@@ -5,9 +5,11 @@
 # Written by Vincent Batts, http://hashbangbash.com/
 
 PRGNAM=dash
-VERSION=${VERSION:-0.5.6.1}
+VERSION=${VERSION:-0.5.8}
+_PATCH_VERS=${PATCH_VERS:-git_d7582e6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+USE_GIT_PATCH=${USE_GIT_PATCH:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,6 +46,14 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+# add fixes from upstream devel, if requested
+if [ "$USE_GIT_PATCH" = "yes" ] && \
+   [ -f $CWD/patches/dash-${VERSION}-${_PATCH_VERS}.diff ]; then
+  patch -p1 < $CWD/patches/dash-${VERSION}-${_PATCH_VERS}.diff
+  VERSION="${VERSION}.${_PATCH_VERS}"
+fi
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/system/dash/dash.info b/system/dash/dash.info
index 3e3ed5c887..6d206c8caa 100644
--- a/system/dash/dash.info
+++ b/system/dash/dash.info
@@ -1,10 +1,10 @@
 PRGNAM="dash"
-VERSION="0.5.6.1"
+VERSION="0.5.8"
 HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.6.1.tar.gz"
-MD5SUM="1c846f4f5a33c0050b2045a6f7037e56"
+DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.8.tar.gz"
+MD5SUM="5c152209680dab3c319e8923f6c51378"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbangbash.com"
+MAINTAINER="John Vogel"
+EMAIL="jvogel4@stny.rr.com"
diff --git a/system/dash/patches/dash-0.5.8-git_d7582e6.diff b/system/dash/patches/dash-0.5.8-git_d7582e6.diff
new file mode 100644
index 0000000000..ac5c6903d5
--- /dev/null
+++ b/system/dash/patches/dash-0.5.8-git_d7582e6.diff
@@ -0,0 +1,2371 @@
+diff -Naur dash-0.5.8/ChangeLog dash-0.5.8-git_d7582e6/ChangeLog
+--- dash-0.5.8/ChangeLog	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/ChangeLog	2015-08-05 13:55:25.055358032 -0400
+@@ -1,3 +1,73 @@
++2014-11-17  Stéphane Aulery <saulery@free.fr>
++
++	* Correct typo in manual page.
++	* Document redirection file descriptor limitation.
++
++2014-10-30  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Catch variable length expansions on non-existant specials.
++
++2014-10-28  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Removed unnecessary pungetc on EOF from parser.
++	* Simplify EOF/newline handling in list parser.
++
++2014-10-27  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Add printf support for format string a, A, and F.
++	* Handle embedded NULs correctly in printf.
++	* Replace open-coded flushall in preadbuffer.
++	* Add likely tag in outmem.
++	* Add ifdefs around MEM_OUT handling in outmem.
++	* Remove unnecessary restoration of format string in printf.
++	* Remove getintmax in printf.
++	* Use error instead of warnx for fatal errors in printf.
++	* Optimise handling of backslash octals in printf.
++	* Simplify echo command.
++	* Handle -- in dotcmd.
++
++2014-10-13  Eric Blake <eblake@redhat.com>
++
++	* cd: support drive letters on Cygwin.
++
++2014-10-08  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Split unquoted $@/$* correctly when IFS is set but empty.
++	* Do not split quoted VSLENGTH and VSTRIM.
++	* Optimise nulonly away and just use quoted as before.
++
++2014-10-07  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Use setvareq to set OPTIND initially.
++
++2014-10-06  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Exit without arguments in a trap should use status outside traps.
++	* Do not allow break to break across function calls.
++	* Move common skipcount logic into skiploop.
++	* Allow return in loop conditional to set exit status.
++	* Return without arguments in a trap should use status outside traps.
++
++2014-10-03  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Do not clobber exitstatus in evalcommand.
++
++2014-10-02  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Fix use-after-free in dotrap/evalstring.
++	* Make sure evalskip is zero before running traps.
++	* Set exitstatus in onint.
++
++2014-09-29  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Kill pgetc_macro.
++	* Handle backslash newlines properly after dollar sign.
++	* Add nlprompt/nlnoprompt helpers.
++
++2014-09-28  Herbert Xu <herbert@gondor.apana.org.au>
++
++	* Correctly handle test ! ! = !.
++
+ 2014-09-26  Herbert Xu <herbert@gondor.apana.org.au>
+ 
+ 	* Small optimisation of command -pv change.
+diff -Naur dash-0.5.8/Makefile.in dash-0.5.8-git_d7582e6/Makefile.in
+--- dash-0.5.8/Makefile.in	2014-09-28 04:19:40.000000000 -0400
++++ dash-0.5.8-git_d7582e6/Makefile.in	2015-08-05 13:57:40.555361584 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.6 from Makefile.am.
++# Makefile.in generated by automake 1.11.5 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -527,7 +527,7 @@
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+-	chmod -R a-w $(distdir); chmod u+w $(distdir)
++	chmod -R a-w $(distdir); chmod a+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+ 	chmod a-w $(distdir)
+diff -Naur dash-0.5.8/aclocal.m4 dash-0.5.8-git_d7582e6/aclocal.m4
+--- dash-0.5.8/aclocal.m4	2014-09-28 04:19:39.000000000 -0400
++++ dash-0.5.8-git_d7582e6/aclocal.m4	2015-08-05 13:57:39.728694896 -0400
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+@@ -38,7 +38,7 @@
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.11.6], [],
++m4_if([$1], [1.11.5], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -54,7 +54,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.6])dnl
++[AM_AUTOMAKE_VERSION([1.11.5])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff -Naur dash-0.5.8/config.h.in dash-0.5.8-git_d7582e6/config.h.in
+--- dash-0.5.8/config.h.in	2014-09-28 04:19:39.000000000 -0400
++++ dash-0.5.8-git_d7582e6/config.h.in	2015-08-05 13:57:40.062028238 -0400
+@@ -88,6 +88,9 @@
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+ 
++/* Define if your faccessat tells root all files are executable */
++#undef HAVE_TRADITIONAL_FACCESSAT
++
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
+diff -Naur dash-0.5.8/configure dash-0.5.8-git_d7582e6/configure
+--- dash-0.5.8/configure	2014-09-28 04:19:40.000000000 -0400
++++ dash-0.5.8-git_d7582e6/configure	2015-08-05 13:57:40.772028257 -0400
+@@ -714,6 +714,7 @@
+ enable_static
+ enable_fnmatch
+ enable_glob
++enable_test_workaround
+ with_libedit
+ enable_lineno
+ '
+@@ -1347,6 +1348,9 @@
+   --enable-static         Build statical linked program
+   --enable-fnmatch        Use fnmatch(3) from libc
+   --enable-glob           Use glob(3) from libc
++  --enable-test-workaround
++                          Guard against faccessat(2) that tells root all files
++                          are executable
+   --disable-lineno        Disable LINENO support
+ 
+ Optional Packages:
+@@ -4614,6 +4618,29 @@
+ done
+ 
+ 
++
++# Check whether --enable-test-workaround was given.
++if test "${enable_test_workaround+set}" = set; then :
++  enableval=$enable_test_workaround;
++else
++  enable_test_workaround=auto
++fi
++
++
++if test "enable_test_workaround" = "auto" &&
++   test "$ac_cv_func_faccessat" = yes; then
++	case `uname -s 2>/dev/null` in
++	GNU/kFreeBSD | \
++	FreeBSD)
++		enable_test_workaround=yes
++	esac
++fi
++if test "$enable_test_workaround" = "yes"; then
++
++$as_echo "#define HAVE_TRADITIONAL_FACCESSAT 1" >>confdefs.h
++
++fi
++
+ if test "$enable_fnmatch" = yes; then
+ 	use_fnmatch=
+ 	for ac_func in fnmatch
+diff -Naur dash-0.5.8/configure.ac dash-0.5.8-git_d7582e6/configure.ac
+--- dash-0.5.8/configure.ac	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/configure.ac	2015-08-05 13:55:25.055358032 -0400
+@@ -90,6 +90,37 @@
+ 	       sigsetmask stpcpy strchrnul strsignal strtod strtoimax \
+ 	       strtoumax sysconf)
+ 
++dnl Check whether it's worth working around FreeBSD PR kern/125009.
++dnl The traditional behavior of access/faccessat is crazy, but
++dnl POSIX.1-2008 explicitly allows those functions to misbehave.
++dnl
++dnl Unaffected kernels:
++dnl
++dnl - all versions of Linux
++dnl - NetBSD sys/kern/vfs_subr.c 1.64, 1997-04-23
++dnl - FreeBSD 9 (r212002), 2010-09-10
++dnl - OpenBSD sys/kern/vfs_subr.c 1.166, 2008-06-09
++dnl
++dnl Also worked around in Debian's libc0.1 2.13-19 when using
++dnl kFreeBSD 8.
++
++AC_ARG_ENABLE(test-workaround, AS_HELP_STRING(--enable-test-workaround, \
++	[Guard against faccessat(2) that tells root all files are executable]),,
++	[enable_test_workaround=auto])
++
++if test "enable_test_workaround" = "auto" &&
++   test "$ac_cv_func_faccessat" = yes; then
++	case `uname -s 2>/dev/null` in
++	GNU/kFreeBSD | \
++	FreeBSD)
++		enable_test_workaround=yes
++	esac
++fi
++if test "$enable_test_workaround" = "yes"; then
++	AC_DEFINE([HAVE_TRADITIONAL_FACCESSAT], [1],
++		[Define if your faccessat tells root all files are executable])
++fi
++
+ if test "$enable_fnmatch" = yes; then
+ 	use_fnmatch=
+ 	AC_CHECK_FUNCS(fnmatch, use_fnmatch=yes)
+diff -Naur dash-0.5.8/src/Makefile.am dash-0.5.8-git_d7582e6/src/Makefile.am
+--- dash-0.5.8/src/Makefile.am	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/Makefile.am	2015-08-05 13:55:25.058691365 -0400
+@@ -26,7 +26,7 @@
+ dash_SOURCES = \
+ 	$(dash_CFILES) \
+ 	alias.h arith_yacc.h bltin/bltin.h cd.h error.h eval.h exec.h \
+-	expand.h hetio.h \
++	expand.h \
+ 	init.h input.h jobs.h machdep.h mail.h main.h memalloc.h miscbltin.h \
+ 	myhistedit.h mystring.h options.h output.h parser.h redir.h shell.h \
+ 	show.h system.h trap.h var.h
+diff -Naur dash-0.5.8/src/Makefile.in dash-0.5.8-git_d7582e6/src/Makefile.in
+--- dash-0.5.8/src/Makefile.in	2014-09-28 04:19:40.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/Makefile.in	2015-08-05 13:57:40.525361584 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.6 from Makefile.am.
++# Makefile.in generated by automake 1.11.5 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -236,7 +236,7 @@
+ dash_SOURCES = \
+ 	$(dash_CFILES) \
+ 	alias.h arith_yacc.h bltin/bltin.h cd.h error.h eval.h exec.h \
+-	expand.h hetio.h \
++	expand.h \
+ 	init.h input.h jobs.h machdep.h mail.h main.h memalloc.h miscbltin.h \
+ 	myhistedit.h mystring.h options.h output.h parser.h redir.h shell.h \
+ 	show.h system.h trap.h var.h
+diff -Naur dash-0.5.8/src/bltin/printf.c dash-0.5.8-git_d7582e6/src/bltin/printf.c
+--- dash-0.5.8/src/bltin/printf.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/bltin/printf.c	2015-08-05 13:55:25.058691365 -0400
+@@ -40,12 +40,11 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-static int	 conv_escape_str(char *);
++static int	 conv_escape_str(char *, char **);
+ static char	*conv_escape(char *, int *);
+ static int	 getchr(void);
+ static double	 getdouble(void);
+-static intmax_t	 getintmax(void);
+-static uintmax_t getuintmax(void);
++static uintmax_t getuintmax(int);
+ static char	*getstr(void);
+ static char	*mklong(const char *, const char *);
+ static void      check_conversion(const char *, const char *);
+@@ -73,6 +72,53 @@
+ 	} \
+ }
+ 
++#define ASPF(sp, f, func) ({ \
++	int ret; \
++	switch ((char *)param - (char *)array) { \
++	default: \
++		ret = xasprintf(sp, f, array[0], array[1], func); \
++		break; \
++	case sizeof(*param): \
++		ret = xasprintf(sp, f, array[0], func); \
++		break; \
++	case 0: \
++		ret = xasprintf(sp, f, func); \
++		break; \
++	} \
++	ret; \
++})
++
++
++static int print_escape_str(const char *f, int *param, int *array, char *s)
++{
++	struct stackmark smark;
++	char *p, *q;
++	int done;
++	int len;
++	int total;
++
++	setstackmark(&smark);
++	done = conv_escape_str(s, &p);
++	q = stackblock();
++	len = p - q;
++
++	p = makestrspace(len, p);
++	memset(p, 'X', len - 1);
++	p[len - 1] = 0;
++
++	q = stackblock();
++	total = ASPF(&p, f, p);
++
++	len = strchrnul(p, 'X') - p;
++	memcpy(p + len, q, strchrnul(p + len, ' ') - (p + len));
++
++	out1mem(p, total);
++
++	popstackmark(&smark);
++	return done;
++}
++
++
+ int printfcmd(int argc, char *argv[])
+ {
+ 	char *fmt;
+@@ -86,10 +132,8 @@
+ 	argv = argptr;
+ 	format = *argv;
+ 
+-	if (!format) {
+-		warnx("usage: printf format [arg ...]");
+-		goto err;
+-	}
++	if (!format)
++		error("usage: printf format [arg ...]");
+ 
+ 	gargv = ++argv;
+ 
+@@ -132,39 +176,33 @@
+ 			/* skip to field width */
+ 			fmt += strspn(fmt, SKIP1);
+ 			if (*fmt == '*')
+-				*param++ = getintmax();
++				*param++ = getuintmax(1);
+ 
+ 			/* skip to possible '.', get following precision */
+ 			fmt += strspn(fmt, SKIP2);
+ 			if (*fmt == '.')
+ 				++fmt;
+ 			if (*fmt == '*')
+-				*param++ = getintmax();
++				*param++ = getuintmax(1);
+ 
+ 			fmt += strspn(fmt, SKIP2);
+ 
+ 			ch = *fmt;
+-			if (!ch) {
+-				warnx("missing format character");
+-				goto err;
+-			}
++			if (!ch)
++				error("missing format character");
+ 			/* null terminate format string to we can use it
+ 			   as an argument to printf. */
+ 			nextch = fmt[1];
+ 			fmt[1] = 0;
+ 			switch (ch) {
+ 
+-			case 'b': {
+-				int done = conv_escape_str(getstr());
+-				char *p = stackblock();
++			case 'b':
+ 				*fmt = 's';
+-				PF(start, p);
+ 				/* escape if a \c was encountered */
+-				if (done)
++				if (print_escape_str(start, param, array,
++						     getstr()))
+ 					goto out;
+-				*fmt = 'b';
+ 				break;
+-			}
+ 			case 'c': {
+ 				int p = getchr();
+ 				PF(start, p);
+@@ -177,23 +215,26 @@
+ 			}
+ 			case 'd':
+ 			case 'i': {
+-				intmax_t p = getintmax();
+-				char *f = mklong(start, fmt);
+-				PF(f, p);
++				uintmax_t p = getuintmax(1);
++				start = mklong(start, fmt);
++				PF(start, p);
+ 				break;
+ 			}
+ 			case 'o':
+ 			case 'u':
+ 			case 'x':
+ 			case 'X': {
+-				uintmax_t p = getuintmax();
+-				char *f = mklong(start, fmt);
+-				PF(f, p);
++				uintmax_t p = getuintmax(0);
++				start = mklong(start, fmt);
++				PF(start, p);
+ 				break;
+ 			}
++			case 'a':
++			case 'A':
+ 			case 'e':
+ 			case 'E':
+ 			case 'f':
++			case 'F':
+ 			case 'g':
+ 			case 'G': {
+ 				double p = getdouble();
+@@ -201,8 +242,7 @@
+ 				break;
+ 			}
+ 			default:
+-				warnx("%s: invalid directive", start);
+-				goto err;
++				error("%s: invalid directive", start);
+ 			}
+ 			*++fmt = nextch;
+ 		}
+@@ -210,8 +250,6 @@
+ 
+ out:
+ 	return rval;
+-err:
+-	return 1;
+ }
+ 
+ 
+@@ -220,8 +258,9 @@
+  *	Halts processing string if a \c escape is encountered.
+  */
+ static int
+-conv_escape_str(char *str)
++conv_escape_str(char *str, char **sp)
+ {
++	int c;
+ 	int ch;
+ 	char *cp;
+ 
+@@ -229,16 +268,14 @@
+ 	STARTSTACKSTR(cp);
+ 
+ 	do {
+-		int c;
+-
+-		ch = *str++;
++		c = ch = *str++;
+ 		if (ch != '\\')
+ 			continue;
+ 
+-		ch = *str++;
+-		if (ch == 'c') {
++		c = *str++;
++		if (c == 'c') {
+ 			/* \c as in SYSV echo - abort all processing.... */
+-			ch = 0x100;
++			c = ch = 0x100;
+ 			continue;
+ 		}
+ 
+@@ -247,25 +284,14 @@
+ 		 * They start with a \0, and are followed by 0, 1, 2, 
+ 		 * or 3 octal digits. 
+ 		 */
+-		if (ch == '0') {
+-			unsigned char i;
+-			i = 3;
+-			ch = 0;
+-			do {
+-				unsigned k = octtobin(*str);
+-				if (k > 7)
+-					break;
+-				str++;
+-				ch <<= 3;
+-				ch += k;
+-			} while (--i);
+-			continue;
+-		}
++		if (c == '0' && isodigit(*str))
++			str++;
+ 
+ 		/* Finally test for sequences valid in the format string */
+ 		str = conv_escape(str - 1, &c);
+-		ch = c;
+-	} while (STPUTC(ch, cp), (char)ch);
++	} while (STPUTC(c, cp), (char)ch);
++
++	*sp = cp;
+ 
+ 	return ch;
+ }
+@@ -283,12 +309,11 @@
+ 
+ 	switch (ch) {
+ 	default:
+-	case 0:
+-		value = '\\';
+-		goto out;
++		if (!isodigit(*str)) {
++			value = '\\';
++			goto out;
++		}
+ 
+-	case '0': case '1': case '2': case '3':
+-	case '4': case '5': case '6': case '7':
+ 		ch = 3;
+ 		value = 0;
+ 		do {
+@@ -357,30 +382,8 @@
+ 	return val;
+ }
+ 
+-static intmax_t
+-getintmax(void)
+-{
+-	intmax_t val = 0;
+-	char *cp, *ep;
+-
+-	cp = *gargv;
+-	if (cp == NULL)
+-		goto out;
+-	gargv++;
+-
+-	val = (unsigned char) cp[1];
+-	if (*cp == '\"' || *cp == '\'')
+-		goto out;
+-
+-	errno = 0;
+-	val = strtoimax(cp, &ep, 0);
+-	check_conversion(cp, ep);
+-out:
+-	return val;
+-}
+-
+ static uintmax_t
+-getuintmax(void)
++getuintmax(int sign)
+ {
+ 	uintmax_t val = 0;
+ 	char *cp, *ep;
+@@ -395,7 +398,7 @@
+ 		goto out;
+ 
+ 	errno = 0;
+-	val = strtoumax(cp, &ep, 0);
++	val = sign ? strtoimax(cp, &ep, 0) : strtoumax(cp, &ep, 0);
+ 	check_conversion(cp, ep);
+ out:
+ 	return val;
+@@ -439,34 +442,21 @@
+ int
+ echocmd(int argc, char **argv)
+ {
+-	int nonl = 0;
+-	struct output *outs = out1;
++	int nonl;
+ 
+-	if (!*++argv)
+-		goto end;
+-	if (equal(*argv, "-n")) {
+-		nonl = ~nonl;
+-		if (!*++argv)
+-			goto end;
+-	}
++	nonl = *++argv ? equal(*argv, "-n") : 0;
++	argv += nonl;
+ 
+ 	do {
+ 		int c;
+ 
+-		nonl += conv_escape_str(*argv);
+-		outstr(stackblock(), outs);
++		if (likely(*argv))
++			nonl += print_escape_str("%s", NULL, NULL, *argv++);
+ 		if (nonl > 0)
+ 			break;
+ 
+-		c = ' ';
+-		if (!*++argv) {
+-end:
+-			if (nonl) {
+-				break;
+-			}
+-			c = '\n';
+-		}
+-		outc(c, outs);
++		c = *argv ? ' ' : '\n';
++		out1c(c);
+ 	} while (*argv);
+ 	return 0;
+ }
+diff -Naur dash-0.5.8/src/bltin/test.c dash-0.5.8-git_d7582e6/src/bltin/test.c
+--- dash-0.5.8/src/bltin/test.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/bltin/test.c	2015-08-05 13:55:25.058691365 -0400
+@@ -155,6 +155,14 @@
+ static int bash_group_member(gid_t);
+ #endif
+ 
++#ifdef HAVE_FACCESSAT
++# ifdef HAVE_TRADITIONAL_FACCESSAT
++static inline int faccessat_confused_about_superuser(void) { return 1; }
++# else
++static inline int faccessat_confused_about_superuser(void) { return 0; }
++# endif
++#endif
++
+ static inline intmax_t getn(const char *s)
+ {
+ 	return atomax10(s);
+@@ -177,7 +185,7 @@
+ {
+ 	const struct t_op *op;
+ 	enum token n;
+-	int res;
++	int res = 1;
+ 
+ 	if (*argv[0] == '[') {
+ 		if (*argv[--argc] != ']')
+@@ -185,11 +193,12 @@
+ 		argv[argc] = NULL;
+ 	}
+ 
++recheck:
+ 	argv++;
+ 	argc--;
+ 
+ 	if (argc < 1)
+-		return 1;
++		return res;
+ 
+ 	/*
+ 	 * POSIX prescriptions: he who wrote this deserves the Nobel
+@@ -209,6 +218,9 @@
+ 			argv[--argc] = NULL;
+ 			argv++;
+ 			argc--;
++		} else if (!strcmp(argv[0], "!")) {
++			res = 0;
++			goto recheck;
+ 		}
+ 	}
+ 
+@@ -216,7 +228,7 @@
+ 
+ eval:
+ 	t_wp = argv;
+-	res = !oexpr(n);
++	res ^= oexpr(n);
+ 	argv = t_wp;
+ 
+ 	if (argv[0] != NULL && argv[1] != NULL)
+@@ -489,8 +501,20 @@
+ }
+ 
+ #ifdef HAVE_FACCESSAT
++static int has_exec_bit_set(const char *path)
++{
++	struct stat64 st;
++
++	if (stat64(path, &st))
++		return 0;
++	return st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH);
++}
++
+ static int test_file_access(const char *path, int mode)
+ {
++	if (faccessat_confused_about_superuser() &&
++	    mode == X_OK && geteuid() == 0 && !has_exec_bit_set(path))
++		return 0;
+ 	return !faccessat(AT_FDCWD, path, mode, AT_EACCESS);
+ }
+ #else	/* HAVE_FACCESSAT */
+diff -Naur dash-0.5.8/src/cd.c dash-0.5.8-git_d7582e6/src/cd.c
+--- dash-0.5.8/src/cd.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/cd.c	2015-08-05 13:55:25.058691365 -0400
+@@ -38,6 +38,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <limits.h>
++#ifdef __CYGWIN__
++#include <sys/cygwin.h>
++#endif
+ 
+ /*
+  * The cd and pwd commands.
+@@ -194,6 +197,17 @@
+ 	char *cdcomppath;
+ 	const char *lim;
+ 
++#ifdef __CYGWIN__
++	/* On cygwin, thanks to drive letters, some absolute paths do
++	   not begin with slash; but cygwin includes a function that
++	   forces normalization to the posix form */
++	char pathbuf[PATH_MAX];
++	if (cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_RELATIVE, dir, pathbuf,
++			     sizeof(pathbuf)) < 0)
++		sh_error("can't normalize %s", dir);
++	dir = pathbuf;
++#endif
++
+ 	cdcomppath = sstrdup(dir);
+ 	STARTSTACKSTR(new);
+ 	if (*dir != '/') {
+diff -Naur dash-0.5.8/src/dash.1 dash-0.5.8-git_d7582e6/src/dash.1
+--- dash-0.5.8/src/dash.1	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/dash.1	2015-08-05 13:55:25.058691365 -0400
+@@ -385,7 +385,7 @@
+ Following is a list of the possible redirections.
+ The
+ .Bq n
+-is an optional number, as in
++is an optional number between 0 and 9, as in
+ .Sq 3
+ (not
+ .Sq Bq 3 ) ,
+@@ -402,11 +402,13 @@
+ .It [n] Ns \*[Lt] file
+ Redirect standard input (or n) from file.
+ .It [n1] Ns \*[Lt]& Ns n2
+-Duplicate standard input (or n1) from file descriptor n2.
++Copy file descriptor n2 as stdout (or fd n1).
++fd n2.
+ .It [n] Ns \*[Lt]&-
+ Close standard input (or n).
+ .It [n1] Ns \*[Gt]& Ns n2
+-Duplicate standard output (or n1) to n2.
++Copy file descriptor n2 as stdin (or fd n1).
++fd n2.
+ .It [n] Ns \*[Gt]&-
+ Close standard output (or n).
+ .It [n] Ns \*[Lt]\*[Gt] file
+@@ -596,7 +598,7 @@
+ characters.
+ The commands in a list are executed in the order they are written.
+ If command is followed by an ampersand, the shell starts the
+-command and immediately proceed onto the next command; otherwise it waits
++command and immediately proceeds onto the next command; otherwise it waits
+ for the command to terminate before proceeding to the next one.
+ .Ss Short-Circuit List Operators
+ .Dq &&
+@@ -1400,14 +1402,9 @@
+ .Va optstring
+ all errors will be ignored.
+ .Pp
+-A nonzero value is returned when the last option is reached.
+-If there are no remaining arguments,
++After the last option
+ .Ic getopts
+-will set
+-.Va var
+-to the special option,
+-.Dq -- ,
+-otherwise, it will set
++will return a non-zero value and set
+ .Va var
+ to
+ .Dq \&? .
+diff -Naur dash-0.5.8/src/error.c dash-0.5.8-git_d7582e6/src/error.c
+--- dash-0.5.8/src/error.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/error.c	2015-08-05 13:55:25.058691365 -0400
+@@ -105,6 +105,7 @@
+ 		signal(SIGINT, SIG_DFL);
+ 		raise(SIGINT);
+ 	}
++	exitstatus = SIGINT + 128;
+ 	exraise(EXINT);
+ 	/* NOTREACHED */
+ }
+diff -Naur dash-0.5.8/src/eval.c dash-0.5.8-git_d7582e6/src/eval.c
+--- dash-0.5.8/src/eval.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/eval.c	2015-08-05 13:55:25.058691365 -0400
+@@ -74,6 +74,7 @@
+ char *commandname;
+ int exitstatus;			/* exit status of last command */
+ int back_exitstatus;		/* exit status of backquoted command */
++int savestatus = -1;		/* exit status of last command outside traps */
+ 
+ 
+ #if !defined(__alpha__) || (defined(__GNUC__) && __GNUC__ >= 3)
+@@ -114,6 +115,10 @@
+ RESET {
+ 	evalskip = 0;
+ 	loopnest = 0;
++	if (savestatus >= 0) {
++		exitstatus = savestatus;
++		savestatus = -1;
++	}
+ }
+ #endif
+ 
+@@ -160,6 +165,7 @@
+ 	struct stackmark smark;
+ 	int status;
+ 
++	s = sstrdup(s);
+ 	setinputstring(s);
+ 	setstackmark(&smark);
+ 
+@@ -171,7 +177,9 @@
+ 		if (evalskip)
+ 			break;
+ 	}
++	popstackmark(&smark);
+ 	popfile();
++	stunalloc(s);
+ 
+ 	return status;
+ }
+@@ -194,6 +202,9 @@
+ 		TRACE(("evaltree(NULL) called\n"));
+ 		goto out;
+ 	}
++
++	dotrap();
++
+ #ifndef SMALL
+ 	displayhist = 1;	/* show history substitutions done with fc */
+ #endif
+@@ -305,8 +316,7 @@
+ 	if (checkexit & exitstatus)
+ 		goto exexit;
+ 
+-	if (pendingsigs)
+-		dotrap();
++	dotrap();
+ 
+ 	if (flags & EV_EXIT) {
+ exexit:
+@@ -329,27 +339,45 @@
+ #endif
+ 
+ 
++static int skiploop(void)
++{
++	int skip = evalskip;
++
++	switch (skip) {
++	case 0:
++		break;
++
++	case SKIPBREAK:
++	case SKIPCONT:
++		if (likely(--skipcount <= 0)) {
++			evalskip = 0;
++			break;
++		}
++
++		skip = SKIPBREAK;
++		break;
++	}
++
++	return skip;
++}
++
++
+ STATIC void
+ evalloop(union node *n, int flags)
+ {
++	int skip;
+ 	int status;
+ 
+ 	loopnest++;
+ 	status = 0;
+ 	flags &= EV_TESTED;
+-	for (;;) {
++	do {
+ 		int i;
+ 
+ 		evaltree(n->nbinary.ch1, EV_TESTED);
+-		if (evalskip) {
+-skipping:	  if (evalskip == SKIPCONT && --skipcount <= 0) {
+-				evalskip = 0;
+-				continue;
+-			}
+-			if (evalskip == SKIPBREAK && --skipcount <= 0)
+-				evalskip = 0;
+-			break;
+-		}
++		skip = skiploop();
++		if (skip)
++			continue;
+ 		i = exitstatus;
+ 		if (n->type != NWHILE)
+ 			i = !i;
+@@ -357,11 +385,11 @@
+ 			break;
+ 		evaltree(n->nbinary.ch2, flags);
+ 		status = exitstatus;
+-		if (evalskip)
+-			goto skipping;
+-	}
++		skip = skiploop();
++	} while (!(skip & ~SKIPCONT));
++	if (skip != SKIPFUNC)
++		exitstatus = status;
+ 	loopnest--;
+-	exitstatus = status;
+ }
+ 
+ 
+@@ -382,9 +410,6 @@
+ 	arglist.lastp = &arglist.list;
+ 	for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
+ 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
+-		/* XXX */
+-		if (evalskip)
+-			goto out;
+ 	}
+ 	*arglist.lastp = NULL;
+ 
+@@ -394,18 +419,10 @@
+ 	for (sp = arglist.list ; sp ; sp = sp->next) {
+ 		setvar(n->nfor.var, sp->text, 0);
+ 		evaltree(n->nfor.body, flags);
+-		if (evalskip) {
+-			if (evalskip == SKIPCONT && --skipcount <= 0) {
+-				evalskip = 0;
+-				continue;
+-			}
+-			if (evalskip == SKIPBREAK && --skipcount <= 0)
+-				evalskip = 0;
++		if (skiploop() & ~SKIPCONT)
+ 			break;
+-		}
+ 	}
+ 	loopnest--;
+-out:
+ 	popstackmark(&smark);
+ }
+ 
+@@ -848,21 +865,12 @@
+ 				listsetvar(varlist.list, VEXPORT);
+ 		}
+ 		if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) {
+-			int status;
+-			int i;
+-
+-			i = exception;
+-			if (i == EXEXIT)
+-				goto raise;
+-
+-			status = (i == EXINT) ? SIGINT + 128 : 2;
+-			exitstatus = status;
+-
+-			if (i == EXINT || spclbltin > 0) {
+-raise:
+-				longjmp(handler->loc, 1);
++			if (exception == EXERROR && spclbltin <= 0) {
++				FORCEINTON;
++				break;
+ 			}
+-			FORCEINTON;
++raise:
++			longjmp(handler->loc, 1);
+ 		}
+ 		break;
+ 
+@@ -927,9 +935,11 @@
+ 	struct jmploc jmploc;
+ 	int e;
+ 	int savefuncline;
++	int saveloopnest;
+ 
+ 	saveparam = shellparam;
+ 	savefuncline = funcline;
++	saveloopnest = loopnest;
+ 	savehandler = handler;
+ 	if ((e = setjmp(jmploc.loc))) {
+ 		goto funcdone;
+@@ -939,6 +949,7 @@
+ 	shellparam.malloc = 0;
+ 	func->count++;
+ 	funcline = func->n.ndefun.linno;
++	loopnest = 0;
+ 	INTON;
+ 	shellparam.nparam = argc - 1;
+ 	shellparam.p = argv + 1;
+@@ -949,13 +960,14 @@
+ 	poplocalvars(0);
+ funcdone:
+ 	INTOFF;
++	loopnest = saveloopnest;
+ 	funcline = savefuncline;
+ 	freefunc(func);
+ 	freeparam(&shellparam);
+ 	shellparam = saveparam;
+ 	handler = savehandler;
+ 	INTON;
+-	evalskip &= ~SKIPFUNC;
++	evalskip &= ~(SKIPFUNC | SKIPFUNCDEF);
+ 	return e;
+ }
+ 
+@@ -1035,12 +1047,23 @@
+ int
+ returncmd(int argc, char **argv)
+ {
++	int skip;
++	int status;
++
+ 	/*
+ 	 * If called outside a function, do what ksh does;
+ 	 * skip the rest of the file.
+ 	 */
+-	evalskip = SKIPFUNC;
+-	return argv[1] ? number(argv[1]) : exitstatus;
++	if (argv[1]) {
++		skip = SKIPFUNC;
++		status = number(argv[1]);
++	} else {
++		skip = SKIPFUNCDEF;
++		status = exitstatus;
++	}
++	evalskip = skip;
++
++	return status;
+ }
+ 
+ 
+diff -Naur dash-0.5.8/src/eval.h dash-0.5.8-git_d7582e6/src/eval.h
+--- dash-0.5.8/src/eval.h	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/eval.h	2015-08-05 13:55:25.058691365 -0400
+@@ -37,6 +37,7 @@
+ extern char *commandname;	/* currently executing command */
+ extern int exitstatus;		/* exit status of last command */
+ extern int back_exitstatus;	/* exit status of backquoted command */
++extern int savestatus;		/* exit status of last command outside traps */
+ 
+ 
+ struct backcmd {		/* result of evalbackcmd */
+@@ -61,3 +62,4 @@
+ #define SKIPBREAK	(1 << 0)
+ #define SKIPCONT	(1 << 1)
+ #define SKIPFUNC	(1 << 2)
++#define SKIPFUNCDEF	(1 << 3)
+diff -Naur dash-0.5.8/src/expand.c dash-0.5.8-git_d7582e6/src/expand.c
+--- dash-0.5.8/src/expand.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/expand.c	2015-08-05 13:55:25.058691365 -0400
+@@ -116,7 +116,7 @@
+ STATIC char *evalvar(char *, int);
+ STATIC size_t strtodest(const char *, const char *, int);
+ STATIC void memtodest(const char *, size_t, const char *, int);
+-STATIC ssize_t varvalue(char *, int, int);
++STATIC ssize_t varvalue(char *, int, int, int *);
+ STATIC void expandmeta(struct strlist *, int);
+ #ifdef HAVE_GLOB
+ STATIC void addglob(const glob_t *);
+@@ -736,7 +736,7 @@
+ 	p = strchr(p, '=') + 1;
+ 
+ again:
+-	varlen = varvalue(var, varflags, flag);
++	varlen = varvalue(var, varflags, flag, &quoted);
+ 	if (varflags & VSNUL)
+ 		varlen--;
+ 
+@@ -751,28 +751,22 @@
+ 			argstr(p, flag | EXP_TILDE | EXP_WORD);
+ 			goto end;
+ 		}
+-		if (easy)
+-			goto record;
+-		goto end;
++		goto record;
+ 	}
+ 
+ 	if (subtype == VSASSIGN || subtype == VSQUESTION) {
+-		if (varlen < 0) {
+-			if (subevalvar(p, var, 0, subtype, startloc,
+-				       varflags, flag & ~QUOTES_ESC)) {
+-				varflags &= ~VSNUL;
+-				/* 
+-				 * Remove any recorded regions beyond 
+-				 * start of variable 
+-				 */
+-				removerecordregions(startloc);
+-				goto again;
+-			}
+-			goto end;
+-		}
+-		if (easy)
++		if (varlen >= 0)
+ 			goto record;
+-		goto end;
++
++		subevalvar(p, var, 0, subtype, startloc, varflags,
++			   flag & ~QUOTES_ESC);
++		varflags &= ~VSNUL;
++		/* 
++		 * Remove any recorded regions beyond 
++		 * start of variable 
++		 */
++		removerecordregions(startloc);
++		goto again;
+ 	}
+ 
+ 	if (varlen < 0 && uflag)
+@@ -784,9 +778,9 @@
+ 	}
+ 
+ 	if (subtype == VSNORMAL) {
++record:
+ 		if (!easy)
+ 			goto end;
+-record:
+ 		recordregion(startloc, expdest - (char *)stackblock(), quoted);
+ 		goto end;
+ 	}
+@@ -892,7 +886,7 @@
+  */
+ 
+ STATIC ssize_t
+-varvalue(char *name, int varflags, int flags)
++varvalue(char *name, int varflags, int flags, int *quotedp)
+ {
+ 	int num;
+ 	char *p;
+@@ -901,13 +895,13 @@
+ 	char sepc;
+ 	char **ap;
+ 	char const *syntax;
+-	int quoted = flags & EXP_QUOTED;
++	int quoted = *quotedp;
+ 	int subtype = varflags & VSTYPE;
+ 	int discard = subtype == VSPLUS || subtype == VSLENGTH;
+ 	int quotes = (discard ? 0 : (flags & QUOTES_ESC)) | QUOTES_KEEPNUL;
+ 	ssize_t len = 0;
+ 
+-	sep = quoted ? ((flags & EXP_FULL) << CHAR_BIT) : 0;
++	sep = (flags & EXP_FULL) << CHAR_BIT;
+ 	syntax = quoted ? DQSYNTAX : BASESYNTAX;
+ 
+ 	switch (*name) {
+@@ -938,15 +932,18 @@
+ 		expdest = p;
+ 		break;
+ 	case '@':
+-		if (sep)
++		if (quoted && sep)
+ 			goto param;
+ 		/* fall through */
+ 	case '*':
+-		sep = ifsset() ? ifsval()[0] : ' ';
++		if (quoted)
++			sep = 0;
++		sep |= ifsset() ? ifsval()[0] : ' ';
+ param:
++		sepc = sep;
++		*quotedp = !sepc;
+ 		if (!(ap = shellparam.p))
+ 			return -1;
+-		sepc = sep;
+ 		while ((p = *ap++)) {
+ 			len += strtodest(p, syntax, quotes);
+ 
+diff -Naur dash-0.5.8/src/hetio.h dash-0.5.8-git_d7582e6/src/hetio.h
+--- dash-0.5.8/src/hetio.h	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/hetio.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,22 +0,0 @@
+-/*
+- * Termios command line History and Editting for NetBSD sh (ash)
+- * Copyright (c) 1999
+- *	Main code:	Adam Rogoyski <rogoyski@cs.utexas.edu> 
+- *	Etc:		Dave Cinege <dcinege@psychosis.com>
+- *
+- * You may use this code as you wish, so long as the original author(s)
+- * are attributed in any redistributions of the source code.
+- * This code is 'as is' with no warranty.
+- * This code may safely be consumed by a BSD or GPL license.
+- *
+- * v 0.5  19990328	Initial release 
+- *
+- * Future plans: Simple file and path name completion. (like BASH)
+- *
+- */
+-
+-void hetio_init(void);
+-int hetio_read_input(int fd);
+-void hetio_reset_term(void);
+-
+-extern int hetio_inter;
+diff -Naur dash-0.5.8/src/histedit.c dash-0.5.8-git_d7582e6/src/histedit.c
+--- dash-0.5.8/src/histedit.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/histedit.c	2015-08-05 13:55:25.062024698 -0400
+@@ -372,8 +372,7 @@
+ 					out2str(s);
+ 				}
+ 
+-				evalstring(strcpy(stalloc(strlen(s) + 1), s),
+-					   0);
++				evalstring(s, 0);
+ 				if (displayhist && hist) {
+ 					/*
+ 					 *  XXX what about recursive and
+diff -Naur dash-0.5.8/src/input.c dash-0.5.8-git_d7582e6/src/input.c
+--- dash-0.5.8/src/input.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/input.c	2015-08-05 13:55:25.062024698 -0400
+@@ -58,45 +58,10 @@
+ #include "myhistedit.h"
+ #endif
+ 
+-#ifdef HETIO
+-#include "hetio.h"
+-#endif
+-
+ #define EOF_NLEFT -99		/* value of parsenleft when EOF pushed back */
+ #define IBUFSIZ (BUFSIZ + 1)
+ 
+-MKINIT
+-struct strpush {
+-	struct strpush *prev;	/* preceding string on stack */
+-	char *prevstring;
+-	int prevnleft;
+-	struct alias *ap;	/* if push was associated with an alias */
+-	char *string;		/* remember the string since it may change */
+-};
+-
+-/*
+- * The parsefile structure pointed to by the global variable parsefile
+- * contains information about the current file being read.
+- */
+ 
+-MKINIT
+-struct parsefile {
+-	struct parsefile *prev;	/* preceding file on stack */
+-	int linno;		/* current line */
+-	int fd;			/* file descriptor (or -1 if string) */
+-	int nleft;		/* number of chars left in this line */
+-	int lleft;		/* number of chars left in this buffer */
+-	char *nextc;		/* next char in buffer */
+-	char *buf;		/* input buffer */
+-	struct strpush *strpush; /* for pushing strings at this level */
+-	struct strpush basestrpush; /* so pushing one is fast */
+-};
+-
+-
+-int plinno = 1;			/* input line number */
+-int parsenleft;			/* copy of parsefile->nleft */
+-MKINIT int parselleft;		/* copy of parsefile->lleft */
+-char *parsenextc;		/* copy of parsefile->nextc */
+ MKINIT struct parsefile basepf;	/* top level input file */
+ MKINIT char basebuf[IBUFSIZ];	/* buffer for top level input file */
+ struct parsefile *parsefile = &basepf;	/* current input file */
+@@ -109,6 +74,7 @@
+ STATIC void pushfile(void);
+ static int preadfd(void);
+ static void setinputfd(int fd, int push);
++static int preadbuffer(void);
+ 
+ #ifdef mkinit
+ INCLUDE <stdio.h>
+@@ -117,10 +83,12 @@
+ 
+ INIT {
+ 	basepf.nextc = basepf.buf = basebuf;
++	basepf.linno = 1;
+ }
+ 
+ RESET {
+-	parselleft = parsenleft = 0;	/* clear input buffer */
++	/* clear input buffer */
++	basepf.lleft = basepf.nleft = 0;
+ 	popallfiles();
+ }
+ #endif
+@@ -134,7 +102,20 @@
+ int
+ pgetc(void)
+ {
+-	return pgetc_macro();
++	int c;
++
++	if (parsefile->unget)
++		return parsefile->lastc[--parsefile->unget];
++
++	if (--parsefile->nleft >= 0)
++		c = (signed char)*parsefile->nextc++;
++	else
++		c = preadbuffer();
++
++	parsefile->lastc[1] = parsefile->lastc[0];
++	parsefile->lastc[0] = c;
++
++	return c;
+ }
+ 
+ 
+@@ -147,7 +128,7 @@
+ {
+ 	int c;
+ 	do {
+-		c = pgetc_macro();
++		c = pgetc();
+ 	} while (c == PEOA);
+ 	return c;
+ }
+@@ -158,7 +139,7 @@
+ {
+ 	int nr;
+ 	char *buf =  parsefile->buf;
+-	parsenextc = buf;
++	parsefile->nextc = buf;
+ 
+ retry:
+ #ifndef SMALL
+@@ -184,11 +165,6 @@
+ 
+ 	} else
+ #endif
+-
+-#ifdef HETIO
+-		nr = hetio_read_input(parsefile->fd);
+-		if (nr == -255)
+-#endif
+ 		nr = read(parsefile->fd, buf, IBUFSIZ - 1);
+ 
+ 
+@@ -219,8 +195,7 @@
+  * 4) Process input up to the next newline, deleting nul characters.
+  */
+ 
+-int
+-preadbuffer(void)
++static int preadbuffer(void)
+ {
+ 	char *q;
+ 	int more;
+@@ -229,34 +204,33 @@
+ #endif
+ 	char savec;
+ 
+-	while (unlikely(parsefile->strpush)) {
++	if (unlikely(parsefile->strpush)) {
+ 		if (
+-			parsenleft == -1 && parsefile->strpush->ap &&
+-			parsenextc[-1] != ' ' && parsenextc[-1] != '\t'
++			parsefile->nleft == -1 &&
++			parsefile->strpush->ap &&
++			parsefile->nextc[-1] != ' ' &&
++			parsefile->nextc[-1] != '\t'
+ 		) {
+ 			return PEOA;
+ 		}
+ 		popstring();
+-		if (--parsenleft >= 0)
+-			return (signed char)*parsenextc++;
++		return pgetc();
+ 	}
+-	if (unlikely(parsenleft == EOF_NLEFT || parsefile->buf == NULL))
++	if (unlikely(parsefile->nleft == EOF_NLEFT ||
++		     parsefile->buf == NULL))
+ 		return PEOF;
+-	flushout(&output);
+-#ifdef FLUSHERR
+-	flushout(&errout);
+-#endif
++	flushall();
+ 
+-	more = parselleft;
++	more = parsefile->lleft;
+ 	if (more <= 0) {
+ again:
+ 		if ((more = preadfd()) <= 0) {
+-			parselleft = parsenleft = EOF_NLEFT;
++			parsefile->lleft = parsefile->nleft = EOF_NLEFT;
+ 			return PEOF;
+ 		}
+ 	}
+ 
+-	q = parsenextc;
++	q = parsefile->nextc;
+ 
+ 	/* delete nul characters */
+ #ifndef SMALL
+@@ -274,7 +248,7 @@
+ 			q++;
+ 
+ 			if (c == '\n') {
+-				parsenleft = q - parsenextc - 1;
++				parsefile->nleft = q - parsefile->nextc - 1;
+ 				break;
+ 			}
+ 
+@@ -291,13 +265,13 @@
+ 		}
+ 
+ 		if (more <= 0) {
+-			parsenleft = q - parsenextc - 1;
+-			if (parsenleft < 0)
++			parsefile->nleft = q - parsefile->nextc - 1;
++			if (parsefile->nleft < 0)
+ 				goto again;
+ 			break;
+ 		}
+ 	}
+-	parselleft = more;
++	parsefile->lleft = more;
+ 
+ 	savec = *q;
+ 	*q = '\0';
+@@ -307,13 +281,13 @@
+ 		HistEvent he;
+ 		INTOFF;
+ 		history(hist, &he, whichprompt == 1? H_ENTER : H_APPEND,
+-		    parsenextc);
++			parsefile->nextc);
+ 		INTON;
+ 	}
+ #endif
+ 
+ 	if (vflag) {
+-		out2str(parsenextc);
++		out2str(parsefile->nextc);
+ #ifdef FLUSHERR
+ 		flushout(out2);
+ #endif
+@@ -321,19 +295,18 @@
+ 
+ 	*q = savec;
+ 
+-	return (signed char)*parsenextc++;
++	return (signed char)*parsefile->nextc++;
+ }
+ 
+ /*
+- * Undo the last call to pgetc.  Only one character may be pushed back.
++ * Undo a call to pgetc.  Only two characters may be pushed back.
+  * PEOF may be pushed back.
+  */
+ 
+ void
+ pungetc(void)
+ {
+-	parsenleft++;
+-	parsenextc--;
++	parsefile->unget++;
+ }
+ 
+ /*
+@@ -355,15 +328,18 @@
+ 		parsefile->strpush = sp;
+ 	} else
+ 		sp = parsefile->strpush = &(parsefile->basestrpush);
+-	sp->prevstring = parsenextc;
+-	sp->prevnleft = parsenleft;
++	sp->prevstring = parsefile->nextc;
++	sp->prevnleft = parsefile->nleft;
++	sp->unget = parsefile->unget;
++	memcpy(sp->lastc, parsefile->lastc, sizeof(sp->lastc));
+ 	sp->ap = (struct alias *)ap;
+ 	if (ap) {
+ 		((struct alias *)ap)->flag |= ALIASINUSE;
+ 		sp->string = s;
+ 	}
+-	parsenextc = s;
+-	parsenleft = len;
++	parsefile->nextc = s;
++	parsefile->nleft = len;
++	parsefile->unget = 0;
+ 	INTON;
+ }
+ 
+@@ -374,7 +350,8 @@
+ 
+ 	INTOFF;
+ 	if (sp->ap) {
+-		if (parsenextc[-1] == ' ' || parsenextc[-1] == '\t') {
++		if (parsefile->nextc[-1] == ' ' ||
++		    parsefile->nextc[-1] == '\t') {
+ 			checkkwd |= CHKALIAS;
+ 		}
+ 		if (sp->string != sp->ap->val) {
+@@ -385,8 +362,10 @@
+ 			unalias(sp->ap->name);
+ 		}
+ 	}
+-	parsenextc = sp->prevstring;
+-	parsenleft = sp->prevnleft;
++	parsefile->nextc = sp->prevstring;
++	parsefile->nleft = sp->prevnleft;
++	parsefile->unget = sp->unget;
++	memcpy(parsefile->lastc, sp->lastc, sizeof(sp->lastc));
+ /*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+ 	parsefile->strpush = sp->prev;
+ 	if (sp != &(parsefile->basestrpush))
+@@ -435,7 +414,7 @@
+ 	parsefile->fd = fd;
+ 	if (parsefile->buf == NULL)
+ 		parsefile->buf = ckmalloc(IBUFSIZ);
+-	parselleft = parsenleft = 0;
++	parsefile->lleft = parsefile->nleft = 0;
+ 	plinno = 1;
+ }
+ 
+@@ -449,8 +428,8 @@
+ {
+ 	INTOFF;
+ 	pushfile();
+-	parsenextc = string;
+-	parsenleft = strlen(string);
++	parsefile->nextc = string;
++	parsefile->nleft = strlen(string);
+ 	parsefile->buf = NULL;
+ 	plinno = 1;
+ 	INTON;
+@@ -468,15 +447,12 @@
+ {
+ 	struct parsefile *pf;
+ 
+-	parsefile->nleft = parsenleft;
+-	parsefile->lleft = parselleft;
+-	parsefile->nextc = parsenextc;
+-	parsefile->linno = plinno;
+ 	pf = (struct parsefile *)ckmalloc(sizeof (struct parsefile));
+ 	pf->prev = parsefile;
+ 	pf->fd = -1;
+ 	pf->strpush = NULL;
+ 	pf->basestrpush.prev = NULL;
++	pf->unget = 0;
+ 	parsefile = pf;
+ }
+ 
+@@ -495,10 +471,6 @@
+ 		popstring();
+ 	parsefile = pf->prev;
+ 	ckfree(pf);
+-	parsenleft = parsefile->nleft;
+-	parselleft = parsefile->lleft;
+-	parsenextc = parsefile->nextc;
+-	plinno = parsefile->linno;
+ 	INTON;
+ }
+ 
+diff -Naur dash-0.5.8/src/input.h dash-0.5.8-git_d7582e6/src/input.h
+--- dash-0.5.8/src/input.h	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/input.h	2015-08-05 13:55:25.062024698 -0400
+@@ -41,18 +41,56 @@
+ 	INPUT_NOFILE_OK = 2,
+ };
+ 
++struct alias;
++
++struct strpush {
++	struct strpush *prev;	/* preceding string on stack */
++	char *prevstring;
++	int prevnleft;
++	struct alias *ap;	/* if push was associated with an alias */
++	char *string;		/* remember the string since it may change */
++
++	/* Remember last two characters for pungetc. */
++	int lastc[2];
++
++	/* Number of outstanding calls to pungetc. */
++	int unget;
++};
++
++/*
++ * The parsefile structure pointed to by the global variable parsefile
++ * contains information about the current file being read.
++ */
++
++struct parsefile {
++	struct parsefile *prev;	/* preceding file on stack */
++	int linno;		/* current line */
++	int fd;			/* file descriptor (or -1 if string) */
++	int nleft;		/* number of chars left in this line */
++	int lleft;		/* number of chars left in this buffer */
++	char *nextc;		/* next char in buffer */
++	char *buf;		/* input buffer */
++	struct strpush *strpush; /* for pushing strings at this level */
++	struct strpush basestrpush; /* so pushing one is fast */
++
++	/* Remember last two characters for pungetc. */
++	int lastc[2];
++
++	/* Number of outstanding calls to pungetc. */
++	int unget;
++};
++
++extern struct parsefile *parsefile;
++
+ /*
+  * The input line number.  Input.c just defines this variable, and saves
+  * and restores it when files are pushed and popped.  The user of this
+  * package must set its value.
+  */
+-extern int plinno;
+-extern int parsenleft;		/* number of characters left in input buffer */
+-extern char *parsenextc;	/* next character in input buffer */
++#define plinno (parsefile->linno)
+ 
+ int pgetc(void);
+ int pgetc2(void);
+-int preadbuffer(void);
+ void pungetc(void);
+ void pushstring(char *, void *);
+ void popstring(void);
+@@ -61,6 +99,3 @@
+ void popfile(void);
+ void popallfiles(void);
+ void closescript(void);
+-
+-#define pgetc_macro() \
+-	(--parsenleft >= 0 ? (signed char)*parsenextc++ : preadbuffer())
+diff -Naur dash-0.5.8/src/main.c dash-0.5.8-git_d7582e6/src/main.c
+--- dash-0.5.8/src/main.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/main.c	2015-08-05 13:55:25.062024698 -0400
+@@ -60,10 +60,6 @@
+ #include "exec.h"
+ #include "cd.h"
+ 
+-#ifdef HETIO
+-#include "hetio.h"
+-#endif
+-
+ #define PROFILE 0
+ 
+ int rootpid;
+@@ -206,10 +202,6 @@
+ 	int numeof = 0;
+ 
+ 	TRACE(("cmdloop(%d) called\n", top));
+-#ifdef HETIO
+-	if(iflag && top)
+-		hetio_init();
+-#endif
+ 	for (;;) {
+ 		int skip;
+ 
+@@ -242,7 +234,7 @@
+ 
+ 		skip = evalskip;
+ 		if (skip) {
+-			evalskip &= ~SKIPFUNC;
++			evalskip &= ~(SKIPFUNC | SKIPFUNCDEF);
+ 			break;
+ 		}
+ 	}
+@@ -321,15 +313,19 @@
+ {
+ 	int status = 0;
+ 
+-	if (argc >= 2) {		/* That's what SVR2 does */
++	nextopt(nullstr);
++	argv = argptr;
++
++	if (*argv) {
+ 		char *fullname;
+ 
+-		fullname = find_dot_file(argv[1]);
++		fullname = find_dot_file(*argv);
+ 		setinputfile(fullname, INPUT_PUSH_FILE);
+ 		commandname = fullname;
+ 		status = cmdloop(0);
+ 		popfile();
+ 	}
++
+ 	return status;
+ }
+ 
+@@ -339,8 +335,15 @@
+ {
+ 	if (stoppedjobs())
+ 		return 0;
+-	if (argc > 1)
+-		exitstatus = number(argv[1]);
++
++	if (argc > 1) {
++		int status = number(argv[1]);
++
++		exitstatus = status;
++		if (savestatus >= 0)
++			savestatus = status;
++	}
++
+ 	exraise(EXEXIT);
+ 	/* NOTREACHED */
+ }
+diff -Naur dash-0.5.8/src/mkbuiltins dash-0.5.8-git_d7582e6/src/mkbuiltins
+--- dash-0.5.8/src/mkbuiltins	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/mkbuiltins	2015-08-05 13:55:25.062024698 -0400
+@@ -69,7 +69,7 @@
+ #include "builtins.h"
+ 
+ !
+-< $builtins sed '/^#/d; /^$/d' > $temp
++< $builtins sed '/^#/d; /^ *$/d' > $temp
+ awk '{	printf "int %s(int, char **);\n", $1}' $temp
+ echo '
+ const struct builtincmd builtincmd[] = {'
+@@ -78,7 +78,7 @@
+ 		if ($i ~ /^-/)
+ 			line = $(++i) "\t" line
+ 		print line
+-	}}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
++	}}' $temp | LC_ALL= LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
+ 		opt = ""
+ 		if (NF > 2) {
+ 			opt = substr($2, 2)
+@@ -97,8 +97,9 @@
+  */
+ 
+ !
+-sed 's/	-[a-z]*//' $temp2 | nl -b a -v 0 | LC_COLLATE=C sort -u -k 3,3 |
+-tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
++sed 's/	-[a-z]*//' $temp2 | nl -b a -v 0 |
++	LC_ALL= LC_COLLATE=C sort -u -k 3,3 |
++	tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
+ 	awk '{	printf "#define %s (builtincmd + %d)\n", $3, $1}'
+ printf '\n#define NUMBUILTINS %d\n' $(wc -l < $temp2)
+ echo '
+diff -Naur dash-0.5.8/src/output.c dash-0.5.8-git_d7582e6/src/output.c
+--- dash-0.5.8/src/output.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/output.c	2015-08-05 13:55:25.062024698 -0400
+@@ -99,9 +99,6 @@
+ struct output *out2 = &errout;
+ 
+ 
+-#ifndef USE_GLIBC_STDIO
+-static void __outstr(const char *, size_t, struct output *);
+-#endif
+ static int xvsnprintf(char *, size_t, const char *, va_list);
+ 
+ 
+@@ -134,16 +131,20 @@
+ #endif
+ 
+ 
+-#ifndef USE_GLIBC_STDIO
+-static void
+-__outstr(const char *p, size_t len, struct output *dest)
++void
++outmem(const char *p, size_t len, struct output *dest)
+ {
++#ifdef USE_GLIBC_STDIO
++	INTOFF;
++	fwrite(p, 1, len, dest->stream);
++	INTON;
++#else
+ 	size_t bufsize;
+ 	size_t offset;
+ 	size_t nleft;
+ 
+ 	nleft = dest->end - dest->nextc;
+-	if (nleft >= len) {
++	if (likely(nleft >= len)) {
+ buffered:
+ 		dest->nextc = mempcpy(dest->nextc, p, len);
+ 		return;
+@@ -153,10 +154,13 @@
+ 	if (!bufsize) {
+ 		;
+ 	} else if (dest->buf == NULL) {
++#ifdef notyet
+ 		if (dest->fd == MEM_OUT && len > bufsize) {
+ 			bufsize = len;
+ 		}
++#endif
+ 		offset = 0;
++#ifdef notyet
+ 		goto alloc;
+ 	} else if (dest->fd == MEM_OUT) {
+ 		offset = bufsize;
+@@ -168,6 +172,7 @@
+ 		if (bufsize < offset)
+ 			goto err;
+ alloc:
++#endif
+ 		INTOFF;
+ 		dest->buf = ckrealloc(dest->buf, bufsize);
+ 		dest->bufsize = bufsize;
+@@ -183,11 +188,13 @@
+ 		goto buffered;
+ 
+ 	if ((xwrite(dest->fd, p, len))) {
++#ifdef notyet
+ err:
++#endif
+ 		dest->flags |= OUTPUT_ERR;
+ 	}
+-}
+ #endif
++}
+ 
+ 
+ void
+@@ -201,7 +208,7 @@
+ 	size_t len;
+ 
+ 	len = strlen(p);
+-	__outstr(p, len, file);
++	outmem(p, len, file);
+ #endif
+ }
+ 
+@@ -213,7 +220,7 @@
+ outcslow(int c, struct output *dest)
+ {
+ 	char buf = c;
+-	__outstr(&buf, 1, dest);
++	outmem(&buf, 1, dest);
+ }
+ #endif
+ 
+@@ -283,35 +290,58 @@
+ }
+ 
+ 
++static int xvasprintf(char **sp, size_t size, const char *f, va_list ap)
++{
++	char *s;
++	int len;
++	va_list ap2;
++
++	va_copy(ap2, ap);
++	len = xvsnprintf(*sp, size, f, ap2);
++	va_end(ap2);
++	if (len < 0)
++		sh_error("xvsnprintf failed");
++	if (len < size)
++		return len;
++
++	s = stalloc((len >= stackblocksize() ? len : stackblocksize()) + 1);
++	*sp = s;
++	len = xvsnprintf(s, len + 1, f, ap);
++	return len;
++}
++
++
++int xasprintf(char **sp, const char *f, ...)
++{
++	va_list ap;
++	int ret;
++
++	va_start(ap, f);
++	ret = xvasprintf(sp, 0, f, ap);
++	va_end(ap);
++	return ret;
++}
++
++
+ #ifndef USE_GLIBC_STDIO
+ void
+ doformat(struct output *dest, const char *f, va_list ap)
+ {
+ 	struct stackmark smark;
+ 	char *s;
+-	int len, ret;
+-	size_t size;
+-	va_list ap2;
++	int len;
++	int olen;
+ 
+-	va_copy(ap2, ap);
+-	size = dest->end - dest->nextc;
+-	len = xvsnprintf(dest->nextc, size, f, ap2);
+-	va_end(ap2);
+-	if (len < 0) {
+-		dest->flags |= OUTPUT_ERR;
+-		return;
+-	}
+-	if (len < size) {
++	setstackmark(&smark);
++	s = dest->nextc;
++	olen = dest->end - dest->nextc;
++	len = xvasprintf(&s, olen, f, ap);
++	if (likely(olen > len)) {
+ 		dest->nextc += len;
+-		return;
++		goto out;
+ 	}
+-	setstackmark(&smark);
+-	s = stalloc((len >= stackblocksize() ? len : stackblocksize()) + 1);
+-	ret = xvsnprintf(s, len + 1, f, ap);
+-	if (ret == len)
+-		__outstr(s, len, dest);
+-	else
+-		dest->flags |= OUTPUT_ERR;
++	outmem(s, len, dest);
++out:
+ 	popstackmark(&smark);
+ }
+ #endif
+diff -Naur dash-0.5.8/src/output.h dash-0.5.8-git_d7582e6/src/output.h
+--- dash-0.5.8/src/output.h	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/output.h	2015-08-05 13:55:25.062024698 -0400
+@@ -63,6 +63,7 @@
+ extern struct output *out1;
+ extern struct output *out2;
+ 
++void outmem(const char *, size_t, struct output *);
+ void outstr(const char *, struct output *);
+ #ifndef USE_GLIBC_STDIO
+ void outcslow(int, struct output *);
+@@ -75,6 +76,7 @@
+     __attribute__((__format__(__printf__,1,2)));
+ int fmtstr(char *, size_t, const char *, ...)
+     __attribute__((__format__(__printf__,3,4)));
++int xasprintf(char **, const char *, ...);
+ #ifndef USE_GLIBC_STDIO
+ void doformat(struct output *, const char *, va_list);
+ #endif
+@@ -115,6 +117,7 @@
+ #endif
+ #define out1c(c)	outc((c), out1)
+ #define out2c(c)	outcslow((c), out2)
++#define out1mem(s, l)	outmem((s), (l), out1)
+ #define out1str(s)	outstr((s), out1)
+ #define out2str(s)	outstr((s), out2)
+ #define outerr(f)	(f)->flags
+diff -Naur dash-0.5.8/src/parser.c dash-0.5.8-git_d7582e6/src/parser.c
+--- dash-0.5.8/src/parser.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/parser.c	2015-08-05 13:55:25.062024698 -0400
+@@ -135,19 +135,13 @@
+ union node *
+ parsecmd(int interact)
+ {
+-	int t;
+-
+ 	tokpushback = 0;
++	checkkwd = 0;
++	heredoclist = 0;
+ 	doprompt = interact;
+ 	if (doprompt)
+ 		setprompt(doprompt);
+ 	needprompt = 0;
+-	t = readtoken();
+-	if (t == TEOF)
+-		return NEOF;
+-	if (t == TNL)
+-		return NULL;
+-	tokpushback++;
+ 	return list(1);
+ }
+ 
+@@ -158,11 +152,27 @@
+ 	union node *n1, *n2, *n3;
+ 	int tok;
+ 
+-	checkkwd = CHKNL | CHKKWD | CHKALIAS;
+-	if (nlflag == 2 && tokendlist[peektoken()])
+-		return NULL;
+ 	n1 = NULL;
+ 	for (;;) {
++		switch (peektoken()) {
++		case TNL:
++			if (!(nlflag & 1))
++				break;
++			parseheredoc();
++			return n1;
++
++		case TEOF:
++			if (!n1 && (nlflag & 1))
++				n1 = NEOF;
++			parseheredoc();
++			return n1;
++		}
++
++		checkkwd = CHKNL | CHKKWD | CHKALIAS;
++		if (nlflag == 2 && tokendlist[peektoken()])
++			return n1;
++		nlflag |= 2;
++
+ 		n2 = andor();
+ 		tok = readtoken();
+ 		if (tok == TBACKGND) {
+@@ -189,31 +199,15 @@
+ 			n1 = n3;
+ 		}
+ 		switch (tok) {
+-		case TBACKGND:
+-		case TSEMI:
+-			tok = readtoken();
+-			/* fall through */
+ 		case TNL:
+-			if (tok == TNL) {
+-				parseheredoc();
+-				if (nlflag == 1)
+-					return n1;
+-			} else {
+-				tokpushback++;
+-			}
+-			checkkwd = CHKNL | CHKKWD | CHKALIAS;
+-			if (tokendlist[peektoken()])
+-				return n1;
+-			break;
+ 		case TEOF:
+-			if (heredoclist)
+-				parseheredoc();
+-			else
+-				pungetc();		/* push back EOF on input */
+ 			tokpushback++;
+-			return n1;
++			/* fall through */
++		case TBACKGND:
++		case TSEMI:
++			break;
+ 		default:
+-			if (nlflag == 1)
++			if ((nlflag & 1))
+ 				synexpect(-1);
+ 			tokpushback++;
+ 			return n1;
+@@ -743,6 +737,19 @@
+ 	return (t);
+ }
+ 
++static void nlprompt(void)
++{
++	plinno++;
++	if (doprompt)
++		setprompt(2);
++}
++
++static void nlnoprompt(void)
++{
++	plinno++;
++	needprompt = doprompt;
++}
++
+ 
+ /*
+  * Read the next input token.
+@@ -775,7 +782,7 @@
+ 		setprompt(2);
+ 	}
+ 	for (;;) {	/* until token or start of word found */
+-		c = pgetc_macro();
++		c = pgetc();
+ 		switch (c) {
+ 		case ' ': case '\t':
+ 		case PEOA:
+@@ -786,16 +793,13 @@
+ 			continue;
+ 		case '\\':
+ 			if (pgetc() == '\n') {
+-				plinno++;
+-				if (doprompt)
+-					setprompt(2);
++				nlprompt();
+ 				continue;
+ 			}
+ 			pungetc();
+ 			goto breakloop;
+ 		case '\n':
+-			plinno++;
+-			needprompt = doprompt;
++			nlnoprompt();
+ 			RETURN(TNL);
+ 		case PEOF:
+ 			RETURN(TEOF);
+@@ -827,6 +831,22 @@
+ #undef RETURN
+ }
+ 
++static int pgetc_eatbnl(void)
++{
++	int c;
++
++	while ((c = pgetc()) == '\\') {
++		if (pgetc() != '\n') {
++			pungetc();
++			break;
++		}
++
++		nlprompt();
++	}
++
++	return c;
++}
++
+ 
+ 
+ /*
+@@ -895,9 +915,7 @@
+ 				if (syntax == BASESYNTAX)
+ 					goto endword;	/* exit outer loop */
+ 				USTPUTC(c, out);
+-				plinno++;
+-				if (doprompt)
+-					setprompt(2);
++				nlprompt();
+ 				c = pgetc();
+ 				goto loop;		/* continue outer loop */
+ 			case CWORD:
+@@ -916,9 +934,7 @@
+ 					USTPUTC('\\', out);
+ 					pungetc();
+ 				} else if (c == '\n') {
+-					plinno++;
+-					if (doprompt)
+-						setprompt(2);
++					nlprompt();
+ 				} else {
+ 					if (
+ 						dblquote &&
+@@ -1009,7 +1025,7 @@
+ 					USTPUTC(c, out);
+ 				}
+ 			}
+-			c = pgetc_macro();
++			c = pgetc();
+ 		}
+ 	}
+ endword:
+@@ -1074,8 +1090,7 @@
+ 
+ 		if (c == '\n' || c == PEOF) {
+ 			c = PEOF;
+-			plinno++;
+-			needprompt = doprompt;
++			nlnoprompt();
+ 		} else {
+ 			int len;
+ 
+@@ -1179,7 +1194,7 @@
+ 	char *p;
+ 	static const char types[] = "}-+?=";
+ 
+-	c = pgetc();
++	c = pgetc_eatbnl();
+ 	if (
+ 		(checkkwd & CHKEOFMARK) ||
+ 		c <= PEOA  ||
+@@ -1188,7 +1203,7 @@
+ 		USTPUTC('$', out);
+ 		pungetc();
+ 	} else if (c == '(') {	/* $(command) or $((arith)) */
+-		if (pgetc() == '(') {
++		if (pgetc_eatbnl() == '(') {
+ 			PARSEARITH();
+ 		} else {
+ 			pungetc();
+@@ -1200,25 +1215,24 @@
+ 		STADJUST(1, out);
+ 		subtype = VSNORMAL;
+ 		if (likely(c == '{')) {
+-			c = pgetc();
++			c = pgetc_eatbnl();
+ 			subtype = 0;
+ 		}
+ varname:
+ 		if (is_name(c)) {
+ 			do {
+ 				STPUTC(c, out);
+-				c = pgetc();
++				c = pgetc_eatbnl();
+ 			} while (is_in_name(c));
+ 		} else if (is_digit(c)) {
+ 			do {
+ 				STPUTC(c, out);
+-				c = pgetc();
++				c = pgetc_eatbnl();
+ 			} while (is_digit(c));
+-		}
+-		else if (is_special(c)) {
++		} else {
+ 			int cc = c;
+ 
+-			c = pgetc();
++			c = pgetc_eatbnl();
+ 
+ 			if (!subtype && cc == '#') {
+ 				subtype = VSLENGTH;
+@@ -1227,7 +1241,7 @@
+ 					goto varname;
+ 
+ 				cc = c;
+-				c = pgetc();
++				c = pgetc_eatbnl();
+ 				if (cc == '}' || c != '}') {
+ 					pungetc();
+ 					subtype = 0;
+@@ -1236,16 +1250,20 @@
+ 				}
+ 			}
+ 
++			if (!is_special(cc)) {
++				if (subtype == VSLENGTH)
++					subtype = 0;
++				goto badsub;
++			}
++
+ 			USTPUTC(cc, out);
+ 		}
+-		else
+-			goto badsub;
+ 
+ 		if (subtype == 0) {
+ 			switch (c) {
+ 			case ':':
+ 				subtype = VSNUL;
+-				c = pgetc();
++				c = pgetc_eatbnl();
+ 				/*FALLTHROUGH*/
+ 			default:
+ 				p = strchr(types, c);
+@@ -1259,7 +1277,7 @@
+ 					int cc = c;
+ 					subtype = c == '#' ? VSTRIMLEFT :
+ 							     VSTRIMRIGHT;
+-					c = pgetc();
++					c = pgetc_eatbnl();
+ 					if (c == cc)
+ 						subtype++;
+ 					else
+@@ -1324,9 +1342,7 @@
+ 
+ 			case '\\':
+                                 if ((pc = pgetc()) == '\n') {
+-					plinno++;
+-					if (doprompt)
+-						setprompt(2);
++					nlprompt();
+ 					/*
+ 					 * If eating a newline, avoid putting
+ 					 * the newline into the new character
+@@ -1348,8 +1364,7 @@
+ 				synerror("EOF in backquote substitution");
+ 
+ 			case '\n':
+-				plinno++;
+-				needprompt = doprompt;
++				nlnoprompt();
+ 				break;
+ 
+ 			default:
+@@ -1427,10 +1442,6 @@
+ 
+ #ifdef mkinit
+ INCLUDE "parser.h"
+-RESET {
+-	tokpushback = 0;
+-	checkkwd = 0;
+-}
+ #endif
+ 
+ 
+diff -Naur dash-0.5.8/src/trap.c dash-0.5.8-git_d7582e6/src/trap.c
+--- dash-0.5.8/src/trap.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/trap.c	2015-08-05 13:55:25.062024698 -0400
+@@ -51,10 +51,6 @@
+ #include "trap.h"
+ #include "mystring.h"
+ 
+-#ifdef HETIO
+-#include "hetio.h"
+-#endif
+-
+ /*
+  * Sigmode records the current value of the signal handlers for the various
+  * modes.  A value of zero means that the current handler is not known.
+@@ -314,25 +310,40 @@
+ 	char *p;
+ 	char *q;
+ 	int i;
+-	int savestatus;
++	int status, last_status;
+ 
+-	savestatus = exitstatus;
++	if (!pendingsigs)
++		return;
++
++	status = savestatus;
++	last_status = status;
++	if (likely(status < 0)) {
++		status = exitstatus;
++		savestatus = status;
++	}
+ 	pendingsigs = 0;
+ 	barrier();
+ 
+ 	for (i = 0, q = gotsig; i < NSIG - 1; i++, q++) {
+ 		if (!*q)
+ 			continue;
++
++		if (evalskip) {
++			pendingsigs = i + 1;
++			break;
++		}
++
+ 		*q = 0;
+ 
+ 		p = trap[i + 1];
+ 		if (!p)
+ 			continue;
+ 		evalstring(p, 0);
+-		exitstatus = savestatus;
+-		if (evalskip)
+-			break;
++		if (evalskip != SKIPFUNC)
++			exitstatus = status;
+ 	}
++
++	savestatus = last_status;
+ }
+ 
+ 
+@@ -366,18 +377,11 @@
+ {
+ 	struct jmploc loc;
+ 	char *p;
+-	volatile int status;
+ 
+-#ifdef HETIO
+-	hetio_reset_term();
+-#endif
+-	status = exitstatus;
+-	TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
+-	if (setjmp(loc.loc)) {
+-		if (exception == EXEXIT)
+-			status = exitstatus;
++	savestatus = exitstatus;
++	TRACE(("pid %d, exitshell(%d)\n", getpid(), savestatus));
++	if (setjmp(loc.loc))
+ 		goto out;
+-	}
+ 	handler = &loc;
+ 	if ((p = trap[0])) {
+ 		trap[0] = NULL;
+@@ -392,7 +396,7 @@
+ 	if (likely(!setjmp(loc.loc)))
+ 		setjobctl(0);
+ 	flushall();
+-	_exit(status);
++	_exit(savestatus);
+ 	/* NOTREACHED */
+ }
+ 
+diff -Naur dash-0.5.8/src/var.c dash-0.5.8-git_d7582e6/src/var.c
+--- dash-0.5.8/src/var.c	2014-09-28 04:19:32.000000000 -0400
++++ dash-0.5.8-git_d7582e6/src/var.c	2015-08-05 13:55:25.065358031 -0400
+@@ -80,6 +80,7 @@
+ #else
+ const char defifs[] = " \t\n";
+ #endif
++MKINIT char defoptindvar[] = "OPTIND=1";
+ 
+ int lineno;
+ char linenovar[sizeof("LINENO=")+sizeof(int)*CHAR_BIT/3+1] = "LINENO=";
+@@ -100,7 +101,7 @@
+ 	{ 0,	VSTRFIXED|VTEXTFIXED,		"PS1=$ ",	0 },
+ 	{ 0,	VSTRFIXED|VTEXTFIXED,		"PS2=> ",	0 },
+ 	{ 0,	VSTRFIXED|VTEXTFIXED,		"PS4=+ ",	0 },
+-	{ 0,	VSTRFIXED|VTEXTFIXED,		"OPTIND=1",	getoptsreset },
++	{ 0,	VSTRFIXED|VTEXTFIXED,		defoptindvar,	getoptsreset },
+ #ifdef WITH_LINENO
+ 	{ 0,	VSTRFIXED|VTEXTFIXED,		linenovar,	0 },
+ #endif
+@@ -142,7 +143,7 @@
+ 		}
+ 	}
+ 
+-	setvarint("OPTIND", 1, 0);
++	setvareq(defoptindvar, VTEXTFIXED);
+ 
+ 	fmtstr(ppid + 5, sizeof(ppid) - 5, "%ld", (long) getppid());
+ 	setvareq(ppid, VTEXTFIXED);
diff --git a/system/ddrescue-gui/README b/system/ddrescue-gui/README
new file mode 100644
index 0000000000..f838bec299
--- /dev/null
+++ b/system/ddrescue-gui/README
@@ -0,0 +1,12 @@
+ddrescue-gui (GUI for ddrescue)
+
+DDRescue-GUI is a program designed to make it easier to use GNU ddrescue (A Command-Line data recovery tool).
+It provides a simple graphical method for using ddrescue.
+This is designed to be as user-friendly as possible so users new to Linux can use ddrescue easily.
+
+DDRescue-GUI is a simple GUI written in Python 2 designed to make the data recovery tool, ddrescue, easier for beginners to use.
+It's designed for Linux, and more recently Apple OS X, as KDiskRescue appears to be abandoned, with the last update in 2006.
+DDRescue-GUI is desgined to look native on almost all Desktop Environments, so whichever one you use, it should look familiar.
+
+DDRescue-GUI uses very few rescources, with the current version using about 38MB RAM, and <80MHz CPU power
+so it'll run on almost any system, and give you the best battery life possible on laptops.
diff --git a/system/ddrescue-gui/ddrescue-gui.SlackBuild b/system/ddrescue-gui/ddrescue-gui.SlackBuild
new file mode 100644
index 0000000000..54142ab882
--- /dev/null
+++ b/system/ddrescue-gui/ddrescue-gui.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/sh
+#
+# Slackware build script for ddrescue-gui.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ddrescue-gui
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="ddrescue-gui_1.4otherdistro-0ubuntu1~ppa1"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a GetDevInfo images other Tools AuthenticationDialog.py DDRescue-GUI.py $PKG/usr/share/$PRGNAM
+install -D -m644 ddrescue-gui.desktop $PKG/usr/share/applications/ddrescue-gui.desktop
+install -D -m644 ddrescue-gui.png $PKG/usr/share/pixmaps/ddrescue-gui.png
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
+cp -a debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION/copyright
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ddrescue-gui/ddrescue-gui.info b/system/ddrescue-gui/ddrescue-gui.info
new file mode 100644
index 0000000000..5846db3bd5
--- /dev/null
+++ b/system/ddrescue-gui/ddrescue-gui.info
@@ -0,0 +1,10 @@
+PRGNAM="ddrescue-gui"
+VERSION="1.4"
+HOMEPAGE="https://launchpad.net/ddrescue-gui"
+DOWNLOAD="https://launchpadlibrarian.net/213272261/ddrescue-gui_1.4otherdistro-0ubuntu1~ppa1.tar.gz"
+MD5SUM="c849699ea6271383b61de3719e3f31f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="wxPython lshw"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/ddrescue-gui/doinst.sh b/system/ddrescue-gui/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/system/ddrescue-gui/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/ddrescue-gui/slack-desc b/system/ddrescue-gui/slack-desc
new file mode 100644
index 0000000000..8393d16904
--- /dev/null
+++ b/system/ddrescue-gui/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+ddrescue-gui: ddrescue-gui (GUI for ddrescue)
+ddrescue-gui:
+ddrescue-gui: DDRescue-GUI is a program designed to make it easier to use GNU 
+ddrescue-gui: ddrescue (A Command-Line data recovery tool). It provides a simple 
+ddrescue-gui: graphical method for using ddrescue. This is designed to be as 
+ddrescue-gui: user-friendly as possible so users new to Linux can use ddrescue
+ddrescue-gui: easily.
+ddrescue-gui:
+ddrescue-gui: Home page: https://launchpad.net/ddrescue-gui
+ddrescue-gui:
+ddrescue-gui:
diff --git a/system/ded/ded.SlackBuild b/system/ded/ded.SlackBuild
index fe6f265dd9..9a5588bb12 100644
--- a/system/ded/ded.SlackBuild
+++ b/system/ded/ded.SlackBuild
@@ -15,7 +15,7 @@
 # - added td_lib docs in /usr/doc
 
 PRGNAM=ded
-VERSION=${VERSION:-20140722}
+VERSION=${VERSION:-20150704}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/ded/ded.info b/system/ded/ded.info
index d63d8de23c..013cf41661 100644
--- a/system/ded/ded.info
+++ b/system/ded/ded.info
@@ -1,10 +1,10 @@
 PRGNAM="ded"
-VERSION="20140722"
+VERSION="20150704"
 HOMEPAGE="http://invisible-island.net/ded/"
-DOWNLOAD="ftp://invisible-island.net/ded/ded-20140722.tgz \
-          ftp://invisible-island.net/ded/td_lib-20140722.tgz"
-MD5SUM="37dc72e4626cc49d069f4d03acbeb464 \
-        f68c7c4afdc9e4bcfe931bbf77971c6f"
+DOWNLOAD="ftp://invisible-island.net/ded/ded-20150704.tgz \
+          ftp://invisible-island.net/ded/td_lib-20150704.tgz"
+MD5SUM="bd67175c28e44540e32f00cbc1151257 \
+        d647ee3e2f3be918a3cef4907ec52cb0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/distorm3/README b/system/distorm3/README
new file mode 100644
index 0000000000..93f03ad567
--- /dev/null
+++ b/system/distorm3/README
@@ -0,0 +1,7 @@
+diStorm3 is really a decomposer, which means it takes an 
+instruction and returns a binary structure which describes 
+it rather than static text, which is great for advanced 
+binary code analysis.
+
+diStorm3 is super lightweight (~45KB), ultra fast and easy 
+to use (a single API)!
diff --git a/system/distorm3/distorm3.SlackBuild b/system/distorm3/distorm3.SlackBuild
new file mode 100644
index 0000000000..d17edb9768
--- /dev/null
+++ b/system/distorm3/distorm3.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for distorm3
+# Copyright 2014-2015  Barry Grundy <bgrundy[at]linuxleo.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Created v3.3.0  December 2015, Barry J. Grundy.
+
+PRGNAM=distorm3
+VERSION=${VERSION:-3.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/distorm3/distorm3.info b/system/distorm3/distorm3.info
new file mode 100644
index 0000000000..c5d30197b5
--- /dev/null
+++ b/system/distorm3/distorm3.info
@@ -0,0 +1,10 @@
+PRGNAM="distorm3"
+VERSION="3.3.0"
+HOMEPAGE="https://github.com/gdabah/distorm"
+DOWNLOAD="https://pypi.python.org/packages/source/d/distorm3/distorm3-3.3.0.zip"
+MD5SUM="ba4b803de4adc1f738a7e489640115c9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Barry J. Grundy"
+EMAIL="bgrundy AT linuxleo.com"
diff --git a/system/distorm3/slack-desc b/system/distorm3/slack-desc
new file mode 100644
index 0000000000..08b3645be5
--- /dev/null
+++ b/system/distorm3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+distorm3: distorm3 (Disassembler Library for x86/AMD64 binary streams)
+distorm3:
+distorm3: The goal of diStorm3 is to decode x86/AMD64 binary streams and return
+distorm3: a structure that describes each instruction.
+distorm3: 
+distorm3: The package includes Python Bindings
+distorm3:
+distorm3:
+distorm3:
+distorm3:
+distorm3:
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index 46128a0377..dfc00c85f3 100644
--- a/system/docker/docker.SlackBuild
+++ b/system/docker/docker.SlackBuild
@@ -5,11 +5,11 @@
 # Written by Vincent Batts <vbatts@hashbangbash.com>
 
 PRGNAM=docker
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-GITHASH=${GITHASH:-7c8fca2}
+GITHASH=${GITHASH:-0a8c2e3}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -61,6 +61,12 @@ unset GOPATH
 # https://github.com/docker/docker/commit/6922f1be08111d889b0585b763b08f92d7a55e05
 patch -p1 -R < $CWD/docker-btrfs.patch
 
+# a couple of patches that missed the 1.8.2 release window, but are essential
+for patch in ${CWD}/patches/*.patch
+do
+	patch -p1 < ${patch}
+done
+
 mkdir -p ${PKG}/usr/share/gocode/src/github.com/docker/docker
 cp -a .  ${PKG}/usr/share/gocode/src/github.com/docker/docker/
 
diff --git a/system/docker/docker.info b/system/docker/docker.info
index e80706c10b..688dc88d97 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,10 +1,10 @@
 PRGNAM="docker"
-VERSION="1.6.2"
+VERSION="1.8.2"
 HOMEPAGE="https://docker.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/docker/docker/archive/v1.6.2.tar.gz"
-MD5SUM_x86_64="81a1a015ec0520d739ec721f8295d94f"
+DOWNLOAD_x86_64="https://github.com/docker/docker/archive/v1.8.2.tar.gz"
+MD5SUM_x86_64="4faf25b356900f3e7599783ad4565e69"
 REQUIRES="google-go-lang"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/system/docker/patches/0001-devicemapper-fix-zero-sized-field-access.patch b/system/docker/patches/0001-devicemapper-fix-zero-sized-field-access.patch
new file mode 100644
index 0000000000..60d95db7c9
--- /dev/null
+++ b/system/docker/patches/0001-devicemapper-fix-zero-sized-field-access.patch
@@ -0,0 +1,88 @@
+From f7236a195c84687edb74fec28b6c4cc98e34185c Mon Sep 17 00:00:00 2001
+From: Vincent Batts <vbatts@redhat.com>
+Date: Fri, 7 Aug 2015 10:18:20 -0400
+Subject: [PATCH 1/4] devicemapper: fix zero-sized field access
+
+Fixes: #15279
+
+Due to
+https://github.com/golang/go/commit/7904946eeb35faece61bbf6f5b3cc8be2f519c17
+the devices field is dropped.
+
+This solution works on go1.4 and go1.5
+
+Signed-off-by: Vincent Batts <vbatts@redhat.com>
+---
+ daemon/graphdriver/devmapper/deviceset.go | 14 +++++++++-----
+ pkg/devicemapper/devmapper_wrapper.go     | 18 +++++++++++++++---
+ 2 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
+index 2eee330..a80736a 100644
+--- a/daemon/graphdriver/devmapper/deviceset.go
++++ b/daemon/graphdriver/devmapper/deviceset.go
+@@ -1482,12 +1482,16 @@ func (devices *DeviceSet) deactivatePool() error {
+ 	if err != nil {
+ 		return err
+ 	}
+-	if d, err := devicemapper.GetDeps(devname); err == nil {
+-		// Access to more Debug output
+-		logrus.Debugf("[devmapper] devicemapper.GetDeps() %s: %#v", devname, d)
++
++	if devinfo.Exists == 0 {
++		return nil
+ 	}
+-	if devinfo.Exists != 0 {
+-		return devicemapper.RemoveDevice(devname)
++	if err := devicemapper.RemoveDevice(devname); err != nil {
++		return err
++	}
++
++	if d, err := devicemapper.GetDeps(devname); err == nil {
++		logrus.Warnf("[devmapper] device %s still has %d active dependents", devname, d.Count)
+ 	}
+ 
+ 	return nil
+diff --git a/pkg/devicemapper/devmapper_wrapper.go b/pkg/devicemapper/devmapper_wrapper.go
+index 87c2003..44ca772 100644
+--- a/pkg/devicemapper/devmapper_wrapper.go
++++ b/pkg/devicemapper/devmapper_wrapper.go
+@@ -38,7 +38,10 @@ static void	log_with_errno_init()
+ */
+ import "C"
+ 
+-import "unsafe"
++import (
++	"reflect"
++	"unsafe"
++)
+ 
+ type (
+ 	CDmTask C.struct_dm_task
+@@ -184,12 +187,21 @@ func dmTaskGetDepsFct(task *CDmTask) *Deps {
+ 	if Cdeps == nil {
+ 		return nil
+ 	}
++
++	// golang issue: https://github.com/golang/go/issues/11925
++	hdr := reflect.SliceHeader{
++		Data: uintptr(unsafe.Pointer(uintptr(unsafe.Pointer(Cdeps)) + unsafe.Sizeof(*Cdeps))),
++		Len:  int(Cdeps.count),
++		Cap:  int(Cdeps.count),
++	}
++	devices := *(*[]C.uint64_t)(unsafe.Pointer(&hdr))
++
+ 	deps := &Deps{
+ 		Count:  uint32(Cdeps.count),
+ 		Filler: uint32(Cdeps.filler),
+ 	}
+-	for _, device := range Cdeps.device {
+-		deps.Device = append(deps.Device, (uint64)(device))
++	for _, device := range devices {
++		deps.Device = append(deps.Device, uint64(device))
+ 	}
+ 	return deps
+ }
+-- 
+2.4.3
+
diff --git a/system/docker/patches/0002-Avoid-buffering-to-tempfile-when-pushing-with-V2.patch b/system/docker/patches/0002-Avoid-buffering-to-tempfile-when-pushing-with-V2.patch
new file mode 100644
index 0000000000..f8d827fb82
--- /dev/null
+++ b/system/docker/patches/0002-Avoid-buffering-to-tempfile-when-pushing-with-V2.patch
@@ -0,0 +1,220 @@
+From cccc745d93a59fdbb4dd7d7562ee8dd684a00786 Mon Sep 17 00:00:00 2001
+From: Stephen J Day <stephen.day@docker.com>
+Date: Tue, 11 Aug 2015 13:47:08 -0700
+Subject: [PATCH 2/4] Avoid buffering to tempfile when pushing with V2
+
+The practice of buffering to a tempfile during a pushing contributes massively
+to slow V2 push performance perception. The protocol was actually designed to
+avoid precalculation, supporting cut-through data push. This means we can
+assemble the layer, calculate its digest and push to the remote endpoint, all
+at the same time.
+
+This should increase performance massively on systems with slow disks or IO
+bottlenecks.
+
+Signed-off-by: Stephen J Day <stephen.day@docker.com>
+---
+ graph/graph.go                          | 21 --------------
+ graph/push_v2.go                        | 51 ++++++++++++++-------------------
+ integration-cli/docker_cli_push_test.go |  2 +-
+ pkg/jsonmessage/jsonmessage.go          |  6 ++++
+ pkg/jsonmessage/jsonmessage_test.go     |  4 +--
+ 5 files changed, 31 insertions(+), 53 deletions(-)
+
+diff --git a/graph/graph.go b/graph/graph.go
+index be911b0..885de87 100644
+--- a/graph/graph.go
++++ b/graph/graph.go
+@@ -2,7 +2,6 @@ package graph
+ 
+ import (
+ 	"compress/gzip"
+-	"crypto/sha256"
+ 	"encoding/json"
+ 	"errors"
+ 	"fmt"
+@@ -329,26 +328,6 @@ func (graph *Graph) newTempFile() (*os.File, error) {
+ 	return ioutil.TempFile(tmp, "")
+ }
+ 
+-func bufferToFile(f *os.File, src io.Reader) (int64, digest.Digest, error) {
+-	var (
+-		h = sha256.New()
+-		w = gzip.NewWriter(io.MultiWriter(f, h))
+-	)
+-	_, err := io.Copy(w, src)
+-	w.Close()
+-	if err != nil {
+-		return 0, "", err
+-	}
+-	n, err := f.Seek(0, os.SEEK_CUR)
+-	if err != nil {
+-		return 0, "", err
+-	}
+-	if _, err := f.Seek(0, 0); err != nil {
+-		return 0, "", err
+-	}
+-	return n, digest.NewDigest("sha256", h), nil
+-}
+-
+ // Delete atomically removes an image from the graph.
+ func (graph *Graph) Delete(name string) error {
+ 	id, err := graph.idIndex.Get(name)
+diff --git a/graph/push_v2.go b/graph/push_v2.go
+index 92d63ca..0ec8cfd 100644
+--- a/graph/push_v2.go
++++ b/graph/push_v2.go
+@@ -2,8 +2,8 @@ package graph
+ 
+ import (
+ 	"fmt"
++	"io"
+ 	"io/ioutil"
+-	"os"
+ 
+ 	"github.com/Sirupsen/logrus"
+ 	"github.com/docker/distribution"
+@@ -199,7 +199,7 @@ func (p *v2Pusher) pushV2Tag(tag string) error {
+ func (p *v2Pusher) pushV2Image(bs distribution.BlobService, img *image.Image) (digest.Digest, error) {
+ 	out := p.config.OutStream
+ 
+-	out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Buffering to Disk", nil))
++	out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Preparing", nil))
+ 
+ 	image, err := p.graph.Get(img.ID)
+ 	if err != nil {
+@@ -209,52 +209,45 @@ func (p *v2Pusher) pushV2Image(bs distribution.BlobService, img *image.Image) (d
+ 	if err != nil {
+ 		return "", err
+ 	}
+-
+-	tf, err := p.graph.newTempFile()
+-	if err != nil {
+-		return "", err
+-	}
+-	defer func() {
+-		tf.Close()
+-		os.Remove(tf.Name())
+-	}()
+-
+-	size, dgst, err := bufferToFile(tf, arch)
+-	if err != nil {
+-		return "", err
+-	}
++	defer arch.Close()
+ 
+ 	// Send the layer
+-	logrus.Debugf("rendered layer for %s of [%d] size", img.ID, size)
+ 	layerUpload, err := bs.Create(context.Background())
+ 	if err != nil {
+ 		return "", err
+ 	}
+ 	defer layerUpload.Close()
+ 
++	digester := digest.Canonical.New()
++	tee := io.TeeReader(arch, digester.Hash())
++
+ 	reader := progressreader.New(progressreader.Config{
+-		In:        ioutil.NopCloser(tf),
++		In:        ioutil.NopCloser(tee), // we'll take care of close here.
+ 		Out:       out,
+ 		Formatter: p.sf,
+-		Size:      int(size),
+-		NewLines:  false,
+-		ID:        stringid.TruncateID(img.ID),
+-		Action:    "Pushing",
++		// TODO(stevvooe): This may cause a size reporting error. Try to get
++		// this from tar-split or elsewhere. The main issue here is that we
++		// don't want to buffer to disk *just* to calculate the size.
++		Size: int(img.Size),
++
++		NewLines: false,
++		ID:       stringid.TruncateID(img.ID),
++		Action:   "Pushing",
+ 	})
+-	n, err := layerUpload.ReadFrom(reader)
++
++	out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Pushing", nil))
++	nn, err := io.Copy(layerUpload, reader)
+ 	if err != nil {
+ 		return "", err
+ 	}
+-	if n != size {
+-		return "", fmt.Errorf("short upload: only wrote %d of %d", n, size)
+-	}
+ 
+-	desc := distribution.Descriptor{Digest: dgst}
+-	if _, err := layerUpload.Commit(context.Background(), desc); err != nil {
++	dgst := digester.Digest()
++	if _, err := layerUpload.Commit(context.Background(), distribution.Descriptor{Digest: dgst}); err != nil {
+ 		return "", err
+ 	}
+ 
+-	out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Image successfully pushed", nil))
++	logrus.Debugf("uploaded layer %s (%s), %d bytes", img.ID, dgst, nn)
++	out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Pushed", nil))
+ 
+ 	return dgst, nil
+ }
+diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go
+index 111e9f3..c17a0ea 100644
+--- a/integration-cli/docker_cli_push_test.go
++++ b/integration-cli/docker_cli_push_test.go
+@@ -108,7 +108,7 @@ func (s *DockerRegistrySuite) TestPushInterrupt(c *check.C) {
+ 	}
+ 
+ 	// Interrupt push (yes, we have no idea at what point it will get killed).
+-	time.Sleep(200 * time.Millisecond)
++	time.Sleep(50 * time.Millisecond) // dependent on race condition.
+ 	if err := pushCmd.Process.Kill(); err != nil {
+ 		c.Fatalf("Failed to kill push process: %v", err)
+ 	}
+diff --git a/pkg/jsonmessage/jsonmessage.go b/pkg/jsonmessage/jsonmessage.go
+index 7db1626..c4b311e 100644
+--- a/pkg/jsonmessage/jsonmessage.go
++++ b/pkg/jsonmessage/jsonmessage.go
+@@ -61,8 +61,14 @@ func (p *JSONProgress) String() string {
+ 		}
+ 		pbBox = fmt.Sprintf("[%s>%s] ", strings.Repeat("=", percentage), strings.Repeat(" ", numSpaces))
+ 	}
++
+ 	numbersBox = fmt.Sprintf("%8v/%v", current, total)
+ 
++	if p.Current > p.Total {
++		// remove total display if the reported current is wonky.
++		numbersBox = fmt.Sprintf("%8v", current)
++	}
++
+ 	if p.Current > 0 && p.Start > 0 && percentage < 50 {
+ 		fromStart := time.Now().UTC().Sub(time.Unix(int64(p.Start), 0))
+ 		perEntry := fromStart / time.Duration(p.Current)
+diff --git a/pkg/jsonmessage/jsonmessage_test.go b/pkg/jsonmessage/jsonmessage_test.go
+index 2e78fa7..889b0ba 100644
+--- a/pkg/jsonmessage/jsonmessage_test.go
++++ b/pkg/jsonmessage/jsonmessage_test.go
+@@ -3,12 +3,12 @@ package jsonmessage
+ import (
+ 	"bytes"
+ 	"fmt"
++	"strings"
+ 	"testing"
+ 	"time"
+ 
+ 	"github.com/docker/docker/pkg/term"
+ 	"github.com/docker/docker/pkg/timeutils"
+-	"strings"
+ )
+ 
+ func TestError(t *testing.T) {
+@@ -45,7 +45,7 @@ func TestProgress(t *testing.T) {
+ 	}
+ 
+ 	// this number can't be negative gh#7136
+-	expected = "[==================================================>]     50 B/40 B"
++	expected = "[==================================================>]     50 B"
+ 	jp5 := JSONProgress{Current: 50, Total: 40}
+ 	if jp5.String() != expected {
+ 		t.Fatalf("Expected %q, got %q", expected, jp5.String())
+-- 
+2.4.3
+
diff --git a/system/docker/patches/0003-Refactoring-of-pullV2Tag.patch b/system/docker/patches/0003-Refactoring-of-pullV2Tag.patch
new file mode 100644
index 0000000000..97f44bc78f
--- /dev/null
+++ b/system/docker/patches/0003-Refactoring-of-pullV2Tag.patch
@@ -0,0 +1,189 @@
+From e12038fb4a2f74314cf23860ea97528418832ba5 Mon Sep 17 00:00:00 2001
+From: Alexander Morozov <lk4d4@docker.com>
+Date: Wed, 12 Aug 2015 20:23:56 -0700
+Subject: [PATCH 3/4] Refactoring of pullV2Tag
+
+* use downloadInfo pointers everywhere
+* use downloads slice only for things that we really download
+* cleanup tmp files in all cases
+
+Signed-off-by: Alexander Morozov <lk4d4@docker.com>
+---
+ graph/pull_v2.go | 106 ++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 58 insertions(+), 48 deletions(-)
+
+diff --git a/graph/pull_v2.go b/graph/pull_v2.go
+index 1dbb9fe..ba5e8ce 100644
+--- a/graph/pull_v2.go
++++ b/graph/pull_v2.go
+@@ -139,6 +139,7 @@ func (p *v2Puller) download(di *downloadInfo) {
+ 		di.err <- err
+ 		return
+ 	}
++	di.tmpFile = tmpFile
+ 
+ 	blobs := p.repo.Blobs(context.Background())
+ 
+@@ -187,7 +188,6 @@ func (p *v2Puller) download(di *downloadInfo) {
+ 	out.Write(p.sf.FormatProgress(stringid.TruncateID(di.img.ID), "Download complete", nil))
+ 
+ 	logrus.Debugf("Downloaded %s to tempfile %s", di.img.ID, tmpFile.Name())
+-	di.tmpFile = tmpFile
+ 	di.layer = layerDownload
+ 
+ 	di.err <- nil
+@@ -243,9 +243,9 @@ func (p *v2Puller) pullV2Tag(tag, taggedName string) (verified bool, err error)
+ 
+ 	out.Write(p.sf.FormatStatus(tag, "Pulling from %s", p.repo.Name()))
+ 
+-	downloads := make([]downloadInfo, len(manifest.FSLayers))
++	var downloads []*downloadInfo
+ 
+-	layerIDs := []string{}
++	var layerIDs []string
+ 	defer func() {
+ 		p.graph.Release(p.sessionID, layerIDs...)
+ 	}()
+@@ -256,66 +256,75 @@ func (p *v2Puller) pullV2Tag(tag, taggedName string) (verified bool, err error)
+ 			logrus.Debugf("error getting image v1 json: %v", err)
+ 			return false, err
+ 		}
+-		downloads[i].img = img
+-		downloads[i].digest = manifest.FSLayers[i].BlobSum
+-
+ 		p.graph.Retain(p.sessionID, img.ID)
+ 		layerIDs = append(layerIDs, img.ID)
+ 
+ 		// Check if exists
+ 		if p.graph.Exists(img.ID) {
+ 			logrus.Debugf("Image already exists: %s", img.ID)
++			out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Already exists", nil))
+ 			continue
+ 		}
+-
+ 		out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Pulling fs layer", nil))
+ 
+-		downloads[i].err = make(chan error)
+-		downloads[i].out = pipeWriter
+-		go p.download(&downloads[i])
++		d := &downloadInfo{
++			img:    img,
++			digest: manifest.FSLayers[i].BlobSum,
++			// TODO: seems like this chan buffer solved hanging problem in go1.5,
++			// this can indicate some deeper problem that somehow we never take
++			// error from channel in loop below
++			err: make(chan error, 1),
++			out: pipeWriter,
++		}
++		downloads = append(downloads, d)
++
++		go p.download(d)
+ 	}
+ 
+-	var tagUpdated bool
+-	for i := len(downloads) - 1; i >= 0; i-- {
+-		d := &downloads[i]
+-		if d.err != nil {
+-			if err := <-d.err; err != nil {
+-				return false, err
+-			}
+-		}
+-		if d.layer != nil {
+-			// if tmpFile is empty assume download and extracted elsewhere
+-			defer os.Remove(d.tmpFile.Name())
+-			defer d.tmpFile.Close()
+-			d.tmpFile.Seek(0, 0)
++	// run clean for all downloads to prevent leftovers
++	for _, d := range downloads {
++		defer func(d *downloadInfo) {
+ 			if d.tmpFile != nil {
+-
+-				reader := progressreader.New(progressreader.Config{
+-					In:        d.tmpFile,
+-					Out:       out,
+-					Formatter: p.sf,
+-					Size:      int(d.size),
+-					NewLines:  false,
+-					ID:        stringid.TruncateID(d.img.ID),
+-					Action:    "Extracting",
+-				})
+-
+-				err = p.graph.Register(d.img, reader)
+-				if err != nil {
+-					return false, err
++				d.tmpFile.Close()
++				if err := os.RemoveAll(d.tmpFile.Name()); err != nil {
++					logrus.Errorf("Failed to remove temp file: %s", d.tmpFile.Name())
+ 				}
++			}
++		}(d)
++	}
+ 
+-				if err := p.graph.SetDigest(d.img.ID, d.digest); err != nil {
+-					return false, err
+-				}
++	var tagUpdated bool
++	for _, d := range downloads {
++		if err := <-d.err; err != nil {
++			return false, err
++		}
++		if d.layer == nil {
++			continue
++		}
++		// if tmpFile is empty assume download and extracted elsewhere
++		d.tmpFile.Seek(0, 0)
++		reader := progressreader.New(progressreader.Config{
++			In:        d.tmpFile,
++			Out:       out,
++			Formatter: p.sf,
++			Size:      int(d.size),
++			NewLines:  false,
++			ID:        stringid.TruncateID(d.img.ID),
++			Action:    "Extracting",
++		})
++
++		err = p.graph.Register(d.img, reader)
++		if err != nil {
++			return false, err
++		}
+ 
+-				// FIXME: Pool release here for parallel tag pull (ensures any downloads block until fully extracted)
+-			}
+-			out.Write(p.sf.FormatProgress(stringid.TruncateID(d.img.ID), "Pull complete", nil))
+-			tagUpdated = true
+-		} else {
+-			out.Write(p.sf.FormatProgress(stringid.TruncateID(d.img.ID), "Already exists", nil))
++		if err := p.graph.SetDigest(d.img.ID, d.digest); err != nil {
++			return false, err
+ 		}
++
++		// FIXME: Pool release here for parallel tag pull (ensures any downloads block until fully extracted)
++		out.Write(p.sf.FormatProgress(stringid.TruncateID(d.img.ID), "Pull complete", nil))
++		tagUpdated = true
+ 	}
+ 
+ 	manifestDigest, _, err := digestFromManifest(manifest, p.repoInfo.LocalName)
+@@ -342,17 +351,18 @@ func (p *v2Puller) pullV2Tag(tag, taggedName string) (verified bool, err error)
+ 		out.Write(p.sf.FormatStatus(p.repo.Name()+":"+tag, "The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security."))
+ 	}
+ 
++	firstID := layerIDs[len(layerIDs)-1]
+ 	if utils.DigestReference(tag) {
+ 		// TODO(stevvooe): Ideally, we should always set the digest so we can
+ 		// use the digest whether we pull by it or not. Unfortunately, the tag
+ 		// store treats the digest as a separate tag, meaning there may be an
+ 		// untagged digest image that would seem to be dangling by a user.
+-		if err = p.SetDigest(p.repoInfo.LocalName, tag, downloads[0].img.ID); err != nil {
++		if err = p.SetDigest(p.repoInfo.LocalName, tag, firstID); err != nil {
+ 			return false, err
+ 		}
+ 	} else {
+ 		// only set the repository/tag -> image ID mapping when pulling by tag (i.e. not by digest)
+-		if err = p.Tag(p.repoInfo.LocalName, tag, downloads[0].img.ID, true); err != nil {
++		if err = p.Tag(p.repoInfo.LocalName, tag, firstID, true); err != nil {
+ 			return false, err
+ 		}
+ 	}
+-- 
+2.4.3
+
diff --git a/system/docker/patches/0004-deamon-events-use-UnixNano-and-no-goroutine.patch b/system/docker/patches/0004-deamon-events-use-UnixNano-and-no-goroutine.patch
new file mode 100644
index 0000000000..9b9836842a
--- /dev/null
+++ b/system/docker/patches/0004-deamon-events-use-UnixNano-and-no-goroutine.patch
@@ -0,0 +1,72 @@
+From 67c185dea42b6d4dc8f53280446488621ab04f7c Mon Sep 17 00:00:00 2001
+From: Vincent Batts <vbatts@redhat.com>
+Date: Tue, 15 Sep 2015 15:05:17 -0400
+Subject: [PATCH 4/4] deamon/events: use UnixNano and no goroutine
+
+Signed-off-by: Vincent Batts <vbatts@redhat.com>
+---
+ daemon/events/events.go        | 24 +++++++++++-------------
+ pkg/jsonmessage/jsonmessage.go |  5 +++--
+ 2 files changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/daemon/events/events.go b/daemon/events/events.go
+index 07ee29a..aeb22e8 100644
+--- a/daemon/events/events.go
++++ b/daemon/events/events.go
+@@ -45,19 +45,17 @@ func (e *Events) Evict(l chan interface{}) {
+ // Log broadcasts event to listeners. Each listener has 100 millisecond for
+ // receiving event or it will be skipped.
+ func (e *Events) Log(action, id, from string) {
+-	go func() {
+-		e.mu.Lock()
+-		jm := &jsonmessage.JSONMessage{Status: action, ID: id, From: from, Time: time.Now().UTC().Unix()}
+-		if len(e.events) == cap(e.events) {
+-			// discard oldest event
+-			copy(e.events, e.events[1:])
+-			e.events[len(e.events)-1] = jm
+-		} else {
+-			e.events = append(e.events, jm)
+-		}
+-		e.mu.Unlock()
+-		e.pub.Publish(jm)
+-	}()
++	e.mu.Lock()
++	jm := &jsonmessage.JSONMessage{Status: action, ID: id, From: from, TimeNano: time.Now().UTC().UnixNano()}
++	if len(e.events) == cap(e.events) {
++		// discard oldest event
++		copy(e.events, e.events[1:])
++		e.events[len(e.events)-1] = jm
++	} else {
++		e.events = append(e.events, jm)
++	}
++	e.mu.Unlock()
++	e.pub.Publish(jm)
+ }
+ 
+ // SubscribersCount returns number of event listeners
+diff --git a/pkg/jsonmessage/jsonmessage.go b/pkg/jsonmessage/jsonmessage.go
+index c4b311e..8a24d9c 100644
+--- a/pkg/jsonmessage/jsonmessage.go
++++ b/pkg/jsonmessage/jsonmessage.go
+@@ -90,6 +90,7 @@ type JSONMessage struct {
+ 	ID              string        `json:"id,omitempty"`
+ 	From            string        `json:"from,omitempty"`
+ 	Time            int64         `json:"time,omitempty"`
++	TimeNano        int64         `json:"timeNano,omitempty"`
+ 	Error           *JSONError    `json:"errorDetail,omitempty"`
+ 	ErrorMessage    string        `json:"error,omitempty"` //deprecated
+ }
+@@ -109,8 +110,8 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
+ 	} else if jm.Progress != nil && jm.Progress.String() != "" { //disable progressbar in non-terminal
+ 		return nil
+ 	}
+-	if jm.Time != 0 {
+-		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(timeutils.RFC3339NanoFixed))
++	if jm.Time != 0 || jm.TimeNano != 0 {
++		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, jm.TimeNano).Format(timeutils.RFC3339NanoFixed))
+ 	}
+ 	if jm.ID != "" {
+ 		fmt.Fprintf(out, "%s: ", jm.ID)
+-- 
+2.4.3
+
diff --git a/system/docker/patches/0005-vendor-update-tar-split-to-v0.9.10.patch b/system/docker/patches/0005-vendor-update-tar-split-to-v0.9.10.patch
new file mode 100644
index 0000000000..f343afae57
--- /dev/null
+++ b/system/docker/patches/0005-vendor-update-tar-split-to-v0.9.10.patch
@@ -0,0 +1,289 @@
+From d8029ceb202fda8160855c07081dc51aae1ec1ad Mon Sep 17 00:00:00 2001
+From: Vincent Batts <vbatts@redhat.com>
+Date: Wed, 23 Sep 2015 15:50:23 -0400
+Subject: [PATCH 5/5] vendor: update tar-split to v0.9.10
+
+This addresses handling of non-utf8 file names, namely iso-8859-1.
+
+https://github.com/docker/docker/issues/16516
+
+Reported-by: @kwk
+Signed-off-by: Vincent Batts <vbatts@redhat.com>
+---
+ hack/vendor.sh                                     |  2 +-
+ .../vbatts/tar-split/archive/tar/common.go         | 28 ++++++++++++++--
+ .../vbatts/tar-split/archive/tar/reader.go         | 15 ++++++++-
+ .../vbatts/tar-split/archive/tar/writer.go         |  2 +-
+ .../vbatts/tar-split/tar/asm/assemble.go           |  4 +--
+ .../vbatts/tar-split/tar/asm/disassemble.go        | 11 +++---
+ .../vbatts/tar-split/tar/storage/entry.go          | 39 ++++++++++++++++++++++
+ .../vbatts/tar-split/tar/storage/packer.go         | 13 ++++++--
+ 8 files changed, 101 insertions(+), 13 deletions(-)
+
+diff --git a/hack/vendor.sh b/hack/vendor.sh
+index 68772ef..52ba6ef 100755
+--- a/hack/vendor.sh
++++ b/hack/vendor.sh
+@@ -36,7 +36,7 @@ clone git github.com/hashicorp/consul v0.5.2
+ 
+ # get graph and distribution packages
+ clone git github.com/docker/distribution ec87e9b6971d831f0eff752ddb54fb64693e51cd # docker/1.8 branch
+-clone git github.com/vbatts/tar-split v0.9.6
++clone git github.com/vbatts/tar-split v0.9.10
+ 
+ clone git github.com/docker/notary 8e8122eb5528f621afcd4e2854c47302f17392f7
+ clone git github.com/endophage/gotuf a592b03b28b02bb29bb5878308fb1abed63383b5
+diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/common.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/common.go
+index e363aa7..c31df06 100644
+--- a/vendor/src/github.com/vbatts/tar-split/archive/tar/common.go
++++ b/vendor/src/github.com/vbatts/tar-split/archive/tar/common.go
+@@ -139,8 +139,8 @@ func (fi headerFileInfo) Mode() (mode os.FileMode) {
+ 	}
+ 
+ 	switch fi.h.Typeflag {
+-	case TypeLink, TypeSymlink:
+-		// hard link, symbolic link
++	case TypeSymlink:
++		// symbolic link
+ 		mode |= os.ModeSymlink
+ 	case TypeChar:
+ 		// character device node
+@@ -249,6 +249,30 @@ func FileInfoHeader(fi os.FileInfo, link string) (*Header, error) {
+ 	if fm&os.ModeSticky != 0 {
+ 		h.Mode |= c_ISVTX
+ 	}
++	// If possible, populate additional fields from OS-specific
++	// FileInfo fields.
++	if sys, ok := fi.Sys().(*Header); ok {
++		// This FileInfo came from a Header (not the OS). Use the
++		// original Header to populate all remaining fields.
++		h.Uid = sys.Uid
++		h.Gid = sys.Gid
++		h.Uname = sys.Uname
++		h.Gname = sys.Gname
++		h.AccessTime = sys.AccessTime
++		h.ChangeTime = sys.ChangeTime
++		if sys.Xattrs != nil {
++			h.Xattrs = make(map[string]string)
++			for k, v := range sys.Xattrs {
++				h.Xattrs[k] = v
++			}
++		}
++		if sys.Typeflag == TypeLink {
++			// hard link
++			h.Typeflag = TypeLink
++			h.Size = 0
++			h.Linkname = sys.Linkname
++		}
++	}
+ 	if sysStat != nil {
+ 		return h, sysStat(fi, h)
+ 	}
+diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go
+index c72e002..4168ea2 100644
+--- a/vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go
++++ b/vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go
+@@ -138,7 +138,13 @@ func (tr *Reader) Next() (*Header, error) {
+ 		// We actually read the whole file,
+ 		// but this skips alignment padding
+ 		tr.skipUnread()
++		if tr.err != nil {
++			return nil, tr.err
++		}
+ 		hdr = tr.readHeader()
++		if hdr == nil {
++			return nil, tr.err
++		}
+ 		mergePAX(hdr, headers)
+ 
+ 		// Check for a PAX format sparse file
+@@ -397,7 +403,7 @@ func parsePAX(r io.Reader) (map[string]string, error) {
+ 		}
+ 		// Parse the first token as a decimal integer.
+ 		n, err := strconv.ParseInt(string(buf[:sp]), 10, 0)
+-		if err != nil {
++		if err != nil || n < 5 || int64(len(buf)) < n {
+ 			return nil, ErrHeader
+ 		}
+ 		// Extract everything between the decimal and the n -1 on the
+@@ -553,6 +559,10 @@ func (tr *Reader) readHeader() *Header {
+ 	hdr.Uid = int(tr.octal(s.next(8)))
+ 	hdr.Gid = int(tr.octal(s.next(8)))
+ 	hdr.Size = tr.octal(s.next(12))
++	if hdr.Size < 0 {
++		tr.err = ErrHeader
++		return nil
++	}
+ 	hdr.ModTime = time.Unix(tr.octal(s.next(12)), 0)
+ 	s.next(8) // chksum
+ 	hdr.Typeflag = s.next(1)[0]
+@@ -895,6 +905,9 @@ func (sfr *sparseFileReader) Read(b []byte) (n int, err error) {
+ 		// Otherwise, we're at the end of the file
+ 		return 0, io.EOF
+ 	}
++	if sfr.tot < sfr.sp[0].offset {
++		return 0, io.ErrUnexpectedEOF
++	}
+ 	if sfr.pos < sfr.sp[0].offset {
+ 		// We're in a hole
+ 		n = sfr.readHole(b, sfr.sp[0].offset)
+diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go
+index dafb2ca..9dbc01a 100644
+--- a/vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go
++++ b/vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go
+@@ -355,7 +355,7 @@ func paxHeader(msg string) string {
+ // hdr.Size bytes are written after WriteHeader.
+ func (tw *Writer) Write(b []byte) (n int, err error) {
+ 	if tw.closed {
+-		err = ErrWriteTooLong
++		err = ErrWriteAfterClose
+ 		return
+ 	}
+ 	overwrite := false
+diff --git a/vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go b/vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go
+index 74317cb..83d6426 100644
+--- a/vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go
++++ b/vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go
+@@ -39,7 +39,7 @@ func NewOutputTarStream(fg storage.FileGetter, up storage.Unpacker) io.ReadClose
+ 				if entry.Size == 0 {
+ 					continue
+ 				}
+-				fh, err := fg.Get(entry.Name)
++				fh, err := fg.Get(entry.GetName())
+ 				if err != nil {
+ 					pw.CloseWithError(err)
+ 					return
+@@ -56,7 +56,7 @@ func NewOutputTarStream(fg storage.FileGetter, up storage.Unpacker) io.ReadClose
+ 					// but since it's coming through the PipeReader, the context of
+ 					// _which_ file would be lost...
+ 					fh.Close()
+-					pw.CloseWithError(fmt.Errorf("file integrity checksum failed for %q", entry.Name))
++					pw.CloseWithError(fmt.Errorf("file integrity checksum failed for %q", entry.GetName()))
+ 					return
+ 				}
+ 				fh.Close()
+diff --git a/vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go b/vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go
+index 7986890..54ef23a 100644
+--- a/vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go
++++ b/vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go
+@@ -92,13 +92,16 @@ func NewInputTarStream(r io.Reader, p storage.Packer, fp storage.FilePutter) (io
+ 				}
+ 			}
+ 
+-			// File entries added, regardless of size
+-			_, err = p.AddEntry(storage.Entry{
++			entry := storage.Entry{
+ 				Type:    storage.FileType,
+-				Name:    hdr.Name,
+ 				Size:    hdr.Size,
+ 				Payload: csum,
+-			})
++			}
++			// For proper marshalling of non-utf8 characters
++			entry.SetName(hdr.Name)
++
++			// File entries added, regardless of size
++			_, err = p.AddEntry(entry)
+ 			if err != nil {
+ 				pW.CloseWithError(err)
+ 				return
+diff --git a/vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go b/vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go
+index 38fe7ba..c91e7ea 100644
+--- a/vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go
++++ b/vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go
+@@ -1,5 +1,7 @@
+ package storage
+ 
++import "unicode/utf8"
++
+ // Entries is for sorting by Position
+ type Entries []Entry
+ 
+@@ -33,7 +35,44 @@ const (
+ type Entry struct {
+ 	Type     Type   `json:"type"`
+ 	Name     string `json:"name,omitempty"`
++	NameRaw  []byte `json:"name_raw,omitempty"`
+ 	Size     int64  `json:"size,omitempty"`
+ 	Payload  []byte `json:"payload"` // SegmentType stores payload here; FileType stores crc64 checksum here;
+ 	Position int    `json:"position"`
+ }
++
++// SetName will check name for valid UTF-8 string, and set the appropriate
++// field. See https://github.com/vbatts/tar-split/issues/17
++func (e *Entry) SetName(name string) {
++	if utf8.ValidString(name) {
++		e.Name = name
++	} else {
++		e.NameRaw = []byte(name)
++	}
++}
++
++// SetNameBytes will check name for valid UTF-8 string, and set the appropriate
++// field
++func (e *Entry) SetNameBytes(name []byte) {
++	if utf8.Valid(name) {
++		e.Name = string(name)
++	} else {
++		e.NameRaw = name
++	}
++}
++
++// GetName returns the string for the entry's name, regardless of the field stored in
++func (e *Entry) GetName() string {
++	if len(e.NameRaw) > 0 {
++		return string(e.NameRaw)
++	}
++	return e.Name
++}
++
++// GetNameBytes returns the bytes for the entry's name, regardless of the field stored in
++func (e *Entry) GetNameBytes() []byte {
++	if len(e.NameRaw) > 0 {
++		return e.NameRaw
++	}
++	return []byte(e.Name)
++}
+diff --git a/vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go b/vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go
+index a02a19a..0c9d99b 100644
+--- a/vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go
++++ b/vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go
+@@ -6,6 +6,7 @@ import (
+ 	"errors"
+ 	"io"
+ 	"path/filepath"
++	"unicode/utf8"
+ )
+ 
+ // ErrDuplicatePath occurs when a tar archive has more than one entry for the
+@@ -61,7 +62,7 @@ func (jup *jsonUnpacker) Next() (*Entry, error) {
+ 
+ 	// check for dup name
+ 	if e.Type == FileType {
+-		cName := filepath.Clean(e.Name)
++		cName := filepath.Clean(e.GetName())
+ 		if _, ok := jup.seen[cName]; ok {
+ 			return nil, ErrDuplicatePath
+ 		}
+@@ -93,9 +94,17 @@ type jsonPacker struct {
+ type seenNames map[string]struct{}
+ 
+ func (jp *jsonPacker) AddEntry(e Entry) (int, error) {
++	// if Name is not valid utf8, switch it to raw first.
++	if e.Name != "" {
++		if !utf8.ValidString(e.Name) {
++			e.NameRaw = []byte(e.Name)
++			e.Name = ""
++		}
++	}
++
+ 	// check early for dup name
+ 	if e.Type == FileType {
+-		cName := filepath.Clean(e.Name)
++		cName := filepath.Clean(e.GetName())
+ 		if _, ok := jp.seen[cName]; ok {
+ 			return -1, ErrDuplicatePath
+ 		}
+-- 
+2.4.3
+
diff --git a/system/drbd-utils/drbd-utils.SlackBuild b/system/drbd-utils/drbd-utils.SlackBuild
index 8307ca41e6..c7a3e67d86 100644
--- a/system/drbd-utils/drbd-utils.SlackBuild
+++ b/system/drbd-utils/drbd-utils.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=drbd-utils
-VERSION=${VERSION:-8.9.3}
+VERSION=${VERSION:-8.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/drbd-utils/drbd-utils.info b/system/drbd-utils/drbd-utils.info
index 1eb7ed6f06..ce4b27425c 100644
--- a/system/drbd-utils/drbd-utils.info
+++ b/system/drbd-utils/drbd-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="drbd-utils"
-VERSION="8.9.3"
+VERSION="8.9.4"
 HOMEPAGE="http://www.drbd.org"
-DOWNLOAD="http://oss.linbit.com/drbd/drbd-utils-8.9.3.tar.gz"
-MD5SUM="81ba3ac48786602b4eddd637654ba24c"
+DOWNLOAD="http://oss.linbit.com/drbd/drbd-utils-8.9.4.tar.gz"
+MD5SUM="8671f86d366288ea082ac1b4571eaa4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/driconf/driconf.SlackBuild b/system/driconf/driconf.SlackBuild
index 1768dac18a..d344b866ff 100644
--- a/system/driconf/driconf.SlackBuild
+++ b/system/driconf/driconf.SlackBuild
@@ -21,6 +21,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Thanks to James Powell for the .desktop file.
+
 PRGNAM=driconf
 VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
@@ -72,6 +74,11 @@ cat $CWD/driconf-0.9.1-2.diff | patch --verbose -p1
 
 python setup.py install --root=$PKG
 
+mkdir -p $PKG/usr/share/{applications,driconf}
+  cp -a $CWD/driconf.desktop $PKG/usr/share/applications/driconf.desktop
+  cp -a driconf-icon.png $PKG/usr/share/applications/driconf-icon.png
+
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/system/driconf/driconf.desktop b/system/driconf/driconf.desktop
new file mode 100644
index 0000000000..763507510c
--- /dev/null
+++ b/system/driconf/driconf.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=3D Acceleration
+Comment=Change 3D Acceleration options
+Exec=driconf
+Icon=/usr/share/driconf/driconf-icon.png
+Type=Application
+Categories=GNOME;Application;Settings;AdvancedSettings;
+StartupNotify=true
diff --git a/system/eaglemode/README b/system/eaglemode/README
new file mode 100644
index 0000000000..c5a87983a6
--- /dev/null
+++ b/system/eaglemode/README
@@ -0,0 +1,14 @@
+Eagle Mode is an advanced solution for a futuristic style of 
+man-machine communication in which the user can visit almost 
+everything simply by zooming in. It has a professional file 
+manager, file viewers and players for most of the common file 
+types, a chess game, a 3D mines game, a netwalk game, 
+a multi-function clock and some fractal fun, all integrated 
+in a virtual cosmos. Besides, that cosmos also provides a Linux 
+kernel configurator in form of a kernel patch.
+
+By featuring a separate popup-zoomed control view, help texts in 
+the things they are describing, editable bookmarks, multiple input 
+methods, fast anti-aliased graphics, a virtually unlimited depth 
+of panel tree, and by its portable C++ API, Eagle Mode aims to be 
+a cutting edge of zoomable user interfaces.
diff --git a/system/eaglemode/doinst.sh b/system/eaglemode/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/eaglemode/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/eaglemode/eaglemode.SlackBuild b/system/eaglemode/eaglemode.SlackBuild
new file mode 100644
index 0000000000..44fc5bac91
--- /dev/null
+++ b/system/eaglemode/eaglemode.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Slackware build script for eaglemode
+
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+PRGNAM=eaglemode
+VERSION=${VERSION:-0.89.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl make.pl build \
+    continue=yes
+perl make.pl install \
+    dir=/opt/$PRGNAM \
+    root=$PKG menu=yes \
+    bin=yes
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/eaglemode/eaglemode.info b/system/eaglemode/eaglemode.info
new file mode 100644
index 0000000000..72fa28eb58
--- /dev/null
+++ b/system/eaglemode/eaglemode.info
@@ -0,0 +1,10 @@
+PRGNAM="eaglemode"
+VERSION="0.89.1"
+HOMEPAGE="http://eaglemode.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/eaglemode/eaglemode-0.89.1.tar.bz2"
+MD5SUM="9ce9717eff8effb248ff31614af912be"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/eaglemode/slack-desc b/system/eaglemode/slack-desc
new file mode 100644
index 0000000000..0359218173
--- /dev/null
+++ b/system/eaglemode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+eaglemode: eaglemode (zoomable user interface)
+eaglemode:
+eaglemode: Eagle Mode is an advanced solution for a futuristic style of
+eaglemode: man-machine communication in which the user can visit almost
+eaglemode: everything simply by zooming in. It has a professional file
+eaglemode: manager, file viewers and players for most of the common file
+eaglemode: types, a chess game, a 3D mines game, a netwalk game,
+eaglemode: a multi-function clock and some fractal fun, all integrated in
+eaglemode: a virtual cosmos.
+eaglemode:
+eaglemode: Homepage: http://eaglemode.sourceforge.net/
diff --git a/system/etckeeper/etckeeper.SlackBuild b/system/etckeeper/etckeeper.SlackBuild
index 9641b22dd7..47d44e45ff 100644
--- a/system/etckeeper/etckeeper.SlackBuild
+++ b/system/etckeeper/etckeeper.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for etckeeper
 
-# Copyright (c) 2013, David Sullins
+# Copyright (c) 2013-2015 David Sullins
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=etckeeper
-VERSION=${VERSION:-1.13}
+VERSION=${VERSION:-1.18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +69,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a GPL INSTALL README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a GPL doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/etckeeper/etckeeper.info b/system/etckeeper/etckeeper.info
index f9574e965a..a0756636ff 100644
--- a/system/etckeeper/etckeeper.info
+++ b/system/etckeeper/etckeeper.info
@@ -1,8 +1,8 @@
 PRGNAM="etckeeper"
-VERSION="1.13"
+VERSION="1.18.2"
 HOMEPAGE="http://joeyh.name/code/etckeeper/"
-DOWNLOAD="https://github.com/joeyh/etckeeper/archive/1.13/etckeeper-1.13.tar.gz"
-MD5SUM="bee7baacd8ffc71657bc424c4523038a"
+DOWNLOAD="https://github.com/joeyh/etckeeper/archive/1.18.2/etckeeper-1.18.2.tar.gz"
+MD5SUM="f4217adc1e1a19a03222af76a0a5bffc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/evilvte/README b/system/evilvte/README
new file mode 100644
index 0000000000..dc3e08e25a
--- /dev/null
+++ b/system/evilvte/README
@@ -0,0 +1,11 @@
+evilvte (VTE based, highly customizable terminal emulator)
+
+Evilvte is a VTE based, highly customizable terminal emulator.
+
+Features:
+
+ * tabs;
+ * tabbar autohide;
+ * right click to switch encoding;
+ * supports almost all VTE features;
+ * build-time configuration.
diff --git a/system/evilvte/doinst.sh b/system/evilvte/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/system/evilvte/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/evilvte/evilvte.SlackBuild b/system/evilvte/evilvte.SlackBuild
new file mode 100644
index 0000000000..e7d45e9947
--- /dev/null
+++ b/system/evilvte/evilvte.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# Slackware build script for evilvte.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=evilvte
+VERSION=${VERSION:-0.5.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCVER="0.5.2~pre1"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.xz
+mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr/man
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info
new file mode 100644
index 0000000000..01f74b193c
--- /dev/null
+++ b/system/evilvte/evilvte.info
@@ -0,0 +1,10 @@
+PRGNAM="evilvte"
+VERSION="0.5.2"
+HOMEPAGE="http://www.calno.com/evilvte/"
+DOWNLOAD="http://www.calno.com/evilvte/evilvte-0.5.2~pre1.tar.xz"
+MD5SUM="caab340cb7bf10e86049fc317a65829a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/evilvte/slack-desc b/system/evilvte/slack-desc
new file mode 100644
index 0000000000..b3b79e65c0
--- /dev/null
+++ b/system/evilvte/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the firtinyterm '|' above the ':' following the base package name, and
+# the '|' on the right side marks the latinyterm column you can put a character in.
+# You mutinyterm make exactly 11 lines for the formatting to be correct.  It's also
+# cutinytermomary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+evilvte: evilvte (VTE based, highly customizable terminal emulator)
+evilvte:
+evilvte: Evilvte is a VTE based, highly customizable terminal emulator.
+evilvte:
+evilvte: Home page: http://www.calno.com/evilvte/
+evilvte:
+evilvte:
+evilvte:
+evilvte:
+evilvte:
+evilvte:
diff --git a/system/exfat-utils/README b/system/exfat-utils/README
index f80f312c6f..0e76c3b0d0 100644
--- a/system/exfat-utils/README
+++ b/system/exfat-utils/README
@@ -1,12 +1,5 @@
-exfat-utils (ExFat module for FUSE)
+This project aims to provide a full-featured exFAT file system implementation
+for GNU/Linux and other Unix-like systems as a FUSE module and a set of
+utilities.
 
-This project aims to provide a full-featured exFAT file system
-implementation for GNU/Linux other Unix-like systems as a FUSE
-module.
-
-Current status of the project: beta.
-
-This package contains the utilities
-
-Keep in mind, that it might be illegal to use this software in 
-countries respecting US-Patents.
+This package contains the utilities.
diff --git a/system/exfat-utils/exfat-utils.SlackBuild b/system/exfat-utils/exfat-utils.SlackBuild
index 01d80e3fec..8bda56036e 100644
--- a/system/exfat-utils/exfat-utils.SlackBuild
+++ b/system/exfat-utils/exfat-utils.SlackBuild
@@ -1,19 +1,30 @@
 #!/bin/sh
 
-# Slackware build script for fuse-exfat
+# Slackware build script for exfat-utils
 
-# Written by Vliegendehuiskat
-# E-mail: vliegendehuiskat [at] gmail [dot] com
-
-# This script is released in the public domain.
-# I am not responsible for any consequences that follow from the
-# incorrect use of this script.
-
-# Keep in mind, that it might be illegal to use this software in
-# countries respecting US-Patents.
+# Copyright 2012  Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com
+# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exfat-utils
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,20 +65,30 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-scons install DESTDIR=$PKG/sbin/
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/exfat-utils/exfat-utils.info b/system/exfat-utils/exfat-utils.info
index 78d80349bf..8723009530 100644
--- a/system/exfat-utils/exfat-utils.info
+++ b/system/exfat-utils/exfat-utils.info
@@ -1,10 +1,10 @@
 PRGNAM="exfat-utils"
-VERSION="0.9.6"
-HOMEPAGE="https://code.google.com/p/exfat/"
-DOWNLOAD="https://exfat.googlecode.com/files/exfat-utils-0.9.6.tar.gz"
-MD5SUM="6722b7a919b4924bc64f86bccfedb0a6"
+VERSION="1.2.1"
+HOMEPAGE="https://github.com/relan/exfat"
+DOWNLOAD="https://github.com/relan/exfat/releases/download/v1.2.1/exfat-utils-1.2.1.tar.gz"
+MD5SUM="33e6356b8bec238944b9ea5d682bdc65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fuse-exfat"
-MAINTAINER="Vliegendehuiskat"
-EMAIL="vliegendehuiskat [at] gmail [dot] com"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/system/exfat-utils/slack-desc b/system/exfat-utils/slack-desc
index e9760831fc..c7e9f3acea 100644
--- a/system/exfat-utils/slack-desc
+++ b/system/exfat-utils/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-exfat-utils: exfat-utils (ExFat filesystem utilities)
+exfat-utils: exfat-utils (exFAT system utilities)
 exfat-utils:
 exfat-utils: This project aims to provide a full-featured exFAT file system
-exfat-utils: implementation for GNU/Linux other Unix-like systems as a FUSE
+exfat-utils: implementation for GNU/Linux and other Unix-like systems as a FUSE
+exfat-utils: module and a set of utilities.
 exfat-utils: module.
 exfat-utils:
-exfat-utils: This package contains the file-system utilities for use with
-exfat-utils: the ExFAT file system.
+exfat-utils: This package contains the utilities.
 exfat-utils:
-exfat-utils: Current status of the project: beta.
+exfat-utils: Homepage: https://github.com/relan/exfat
 exfat-utils:
diff --git a/system/facter/facter-lib64.patch b/system/facter/facter-lib64.patch
index 5de8537080..4cd432b375 100644
--- a/system/facter/facter-lib64.patch
+++ b/system/facter/facter-lib64.patch
@@ -1,6 +1,6 @@
---- lib/CMakeLists.txt.orig	2015-06-30 22:48:00.309505706 +0200
-+++ lib/CMakeLists.txt	2015-06-30 22:48:28.407734850 +0200
-@@ -238,7 +238,7 @@
+--- lib/CMakeLists.txt.orig	2015-08-23 12:43:09.134322236 +0200
++++ lib/CMakeLists.txt	2015-08-23 12:43:25.959452818 +0200
+@@ -240,7 +240,7 @@
      set(LIBFACTER_INSTALL_DESTINATION bin)
  else()
      # TODO: lib64 for certain operating systems?
diff --git a/system/facter/facter.SlackBuild b/system/facter/facter.SlackBuild
index 69fe5a3c73..7788f94801 100644
--- a/system/facter/facter.SlackBuild
+++ b/system/facter/facter.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=facter
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/facter/facter.info b/system/facter/facter.info
index 38583b3828..ef116ee561 100644
--- a/system/facter/facter.info
+++ b/system/facter/facter.info
@@ -1,8 +1,8 @@
 PRGNAM="facter"
-VERSION="3.0.1"
+VERSION="3.0.2"
 HOMEPAGE="https://puppetlabs.com/facter/"
-DOWNLOAD="https://downloads.puppetlabs.com/facter/facter-3.0.1.tar.gz"
-MD5SUM="c5ce03ec246c10a0694dea397c59bc1f"
+DOWNLOAD="https://downloads.puppetlabs.com/facter/facter-3.0.2.tar.gz"
+MD5SUM="8ef9396352d8fa081d61da7c64d15d06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yaml-cpp"
diff --git a/system/fdupes/fdupes.SlackBuild b/system/fdupes/fdupes.SlackBuild
index 153fbd82e1..c157299c84 100644
--- a/system/fdupes/fdupes.SlackBuild
+++ b/system/fdupes/fdupes.SlackBuild
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar -xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/fio/README b/system/fio/README
index c82de43832..c8ef2e22d8 100644
--- a/system/fio/README
+++ b/system/fio/README
@@ -8,3 +8,11 @@ Several example job files are included. fio displays all sorts of I/O
 performance information. Fio is in wide use in many places, for both
 benchmarking, QA, and verification purposes. It supports Linux, FreeBSD,
 NetBSD, OS X, OpenSolaris, AIX, HP-UX, and Windows.
+
+
+Example Usage:
+
+This process runs a random read and write of two 128MB files created during
+execution of fio.
+
+$ fio --name=global --rw=randread --size=128m --name=job1 --name=job2
diff --git a/system/fio/fio.SlackBuild b/system/fio/fio.SlackBuild
index e8d7859655..8af237ec87 100644
--- a/system/fio/fio.SlackBuild
+++ b/system/fio/fio.SlackBuild
@@ -2,10 +2,8 @@
 
 # Slackware build script for fio
 
-# Copyright 2015, Brenton Earl, <brent@exitstatusone.com>, Tooele, UT, USA
-# All rights reserved.
-#
 # Copyright 2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fio
-VERSION=${VERSION:-2.2.9}
+VERSION=${VERSION:-2.2.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fio/fio.info b/system/fio/fio.info
index 1c2d0757a3..e7adab12ab 100644
--- a/system/fio/fio.info
+++ b/system/fio/fio.info
@@ -1,8 +1,8 @@
 PRGNAM="fio"
-VERSION="2.2.9"
+VERSION="2.2.13"
 HOMEPAGE="http://freecode.com/projects/fio"
-DOWNLOAD="http://brick.kernel.dk/snaps/fio-2.2.9.tar.gz"
-MD5SUM="6da5701f601373adba3e44f6f59d2984"
+DOWNLOAD="http://brick.kernel.dk/snaps/fio-2.2.13.tar.gz"
+MD5SUM="fb3b8818cdd8d0a613d2a90ad1536b7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/firmware-gobi-2000/README b/system/firmware-gobi-2000/README
new file mode 100644
index 0000000000..89c2845a7e
--- /dev/null
+++ b/system/firmware-gobi-2000/README
@@ -0,0 +1,16 @@
+Firmware and loader for Qualcomm Gobi USB chipsets. These
+devices appear in an uninitialised state when power is applied and
+require firmware to be loaded before they can be used as modems.
+gobi_loader adds a udev rule that will trigger loading of the
+firmware and make the modem usable.
+
+Note:
+No carrier specific card configuration may work with `CARRIER=UMTS' (default)
+or `CARRIER=6' else pass `CARRIER=<sub-directory>' to the SlackBuild matching
+your carrier or reseller/franchiser which is using the carrier.
+It's strongly encouraged to explicit select a carrier.
+
+After installation restart your system or use
+`udevadm control --reload && udevadm trigger`.
+
+For carrier information, see README.SBo
diff --git a/system/firmware-gobi-2000/README.SBo b/system/firmware-gobi-2000/README.SBo
new file mode 100644
index 0000000000..7aaad88a30
--- /dev/null
+++ b/system/firmware-gobi-2000/README.SBo
@@ -0,0 +1,42 @@
+
+--------------------------------------------------------------------------------
+| Sub-Directory | Files                           | Carrier                    |
+--------------------------------------------------------------------------------
+| UMTS          | amss.mbn, apps.mbn              | Default Firmware           |
+--------------------------------------------------------------------------------
+| 0             | UQCN.mbn                        | Vodafone                   |
+--------------------------------------------------------------------------------
+| 1             | amss.mbn, apps.mbn, UQCN.mbn    | Verizon (special firmware) |
+--------------------------------------------------------------------------------
+| 2             | UQCN.mbn                        | AT&T                       |
+--------------------------------------------------------------------------------
+| 3             | amss.mbn, apps.mbn, UQCN.mbn    | Sprint (special Firmware)  |
+--------------------------------------------------------------------------------
+| 4             | UQCN.mbn                        | T-Mobile                   |
+--------------------------------------------------------------------------------
+| 6             | UQCN.mbn                        | Generic UMTS               |
+--------------------------------------------------------------------------------
+| 7             | UQCN.mbn                        | Telefonica, O2             |
+--------------------------------------------------------------------------------
+| 8             | UQCN.mbn                        | Telecom Italia             |
+--------------------------------------------------------------------------------
+| 9             | UQCN.mbn                        | Orange                     |
+--------------------------------------------------------------------------------
+| 12            | amss.mbn, apps.mbn, UQCN.mbn    | DoCoMo (special firmware)  |
+--------------------------------------------------------------------------------
+
+Non-listed carriers
+--------------------------------------------------------------------------------
+| Sub-Directory | Carrier         | Works with                                 |
+--------------------------------------------------------------------------------
+| UMTS          | Default         | UMTS unlocked, O2 UK?, O2 Germany,         |
+|               | Firmware        | E-Plus Germany                             |
+--------------------------------------------------------------------------------
+| 0             | Vodafone        | E-Plus Germany                             |
+--------------------------------------------------------------------------------
+| 6             | Generic UMTS    |O2 UK?, O2 Germany, Mobitel Slovenia        |
+--------------------------------------------------------------------------------
+
+Sources:
+http://www.thinkwiki.org/wiki/Qualcomm_Gobi_2000 (englisch)
+http://thinkwiki.de/Qualcomm_Gobi_2000_unter_Linux_installieren (german)
diff --git a/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild b/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild
new file mode 100644
index 0000000000..596472b969
--- /dev/null
+++ b/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# SlackBuild script for "firmware-gobi-2000".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=firmware-gobi-2000
+SRCNAM=gobi_loader
+EXENAM=${EXENAM:-7xwc48ww.exe}
+MSINAM=${MSINAM:-GobiInstaller.msi}
+CARRIER=${CARRIER:-UMTS}
+VERSION=${VERSION:-0.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  echo "Only x86 & x86_64 is supported. Exit."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# extract firmware from InstallShield and Windows Installer
+innoextract -d $TMP/$SRCNAM-$VERSION $CWD/$EXENAM
+mkdir -p $TMP/$SRCNAM-$VERSION/bullshit
+msiextract -C $TMP/$SRCNAM-$VERSION/bullshit $TMP/$SRCNAM-$VERSION/app/Driver/$MSINAM
+
+sed -i "s/-Wall/& ${SLKCFLAGS}/" Makefile
+make
+mkdir -p $PKG/lib/udev/rules.d
+install -s -D -m 0755 $TMP/$SRCNAM-$VERSION/gobi_loader $PKG/lib/udev
+install -D -m 0644 $TMP/$SRCNAM-$VERSION/60-gobi.rules $PKG/lib/udev/rules.d
+
+FIRMWARE="$TMP/$SRCNAM-$VERSION/bullshit/Images/Lenovo"
+if [ ! -d "$FIRMWARE/UMTS"] || [ ! -d "$FIRMWARE/$CARRIER"]; then
+  echo "Selected carrier missing or not supported. Exit."
+  exit 1
+fi
+
+mkdir -p $PKG/lib/firmware/gobi
+for file in amss.mbn apps.mbn UQCN.mbn; do
+  if [ -f "$FIRMWARE/UMTS/$file" ]; then
+    cp -a $FIRMWARE/UMTS/$file $PKG/lib/firmware/gobi
+  fi
+
+  if [ -f "$FIRMWARE/$CARRIER/$file" ]; then
+    cp -a $FIRMWARE/$CARRIER/$file $PKG/lib/firmware/gobi
+  fi
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/firmware-gobi-2000/firmware-gobi-2000.info b/system/firmware-gobi-2000/firmware-gobi-2000.info
new file mode 100644
index 0000000000..798ed6a93c
--- /dev/null
+++ b/system/firmware-gobi-2000/firmware-gobi-2000.info
@@ -0,0 +1,12 @@
+PRGNAM="firmware-gobi-2000"
+VERSION="0.7"
+HOMEPAGE="http://www.codon.org.uk/~mjg59/gobi_loader/"
+DOWNLOAD="http://www.codon.org.uk/~mjg59/gobi_loader/download/gobi_loader-0.7.tar.gz \
+          https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/7xwc48ww.exe"
+MD5SUM="c3aca13541be3b29e3700149256aadb6 \
+        629985df8599b3815211ddcffbb6bad5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="innoextract msitools"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/system/firmware-gobi-2000/slack-desc b/system/firmware-gobi-2000/slack-desc
new file mode 100644
index 0000000000..6110d7fe42
--- /dev/null
+++ b/system/firmware-gobi-2000/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+firmware-gobi-2000: firmware-gobi-2000 (Qualcomm Gobi 2000 firmware and loader)
+firmware-gobi-2000:
+firmware-gobi-2000: Firmware and loader for Qualcomm Gobi USB chipsets. These
+firmware-gobi-2000: devices appear in an uninitialised state when power is applied and
+firmware-gobi-2000: require firmware to be loaded before they can be used as modems.
+firmware-gobi-2000: gobi_loader adds a udev rule that will trigger loading of the
+firmware-gobi-2000: firmware and make the modem usable.
+firmware-gobi-2000:
+firmware-gobi-2000: Homepage: http://www.codon.org.uk/~mjg59/gobi_loader/
+firmware-gobi-2000:
+firmware-gobi-2000:
diff --git a/system/foomatic-db-engine/README b/system/foomatic-db-engine/README
new file mode 100644
index 0000000000..e3e0147dc0
--- /dev/null
+++ b/system/foomatic-db-engine/README
@@ -0,0 +1,3 @@
+Foomatic's database engine generates PPD files from the data in Foomatic's XML
+database.  It also contains scripts to directly configure print queues and
+handle jobs.
diff --git a/system/foomatic-db-engine/foomatic-db-engine.SlackBuild b/system/foomatic-db-engine/foomatic-db-engine.SlackBuild
new file mode 100644
index 0000000000..30541d613f
--- /dev/null
+++ b/system/foomatic-db-engine/foomatic-db-engine.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Slackware build script for foomatic-db-engine
+
+# Copyright 2015 Markus Rinne Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=foomatic-db-engine
+VERSION=${VERSION:-4.0.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog README USAGE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/foomatic-db-engine/foomatic-db-engine.info b/system/foomatic-db-engine/foomatic-db-engine.info
new file mode 100644
index 0000000000..d1dc75bdef
--- /dev/null
+++ b/system/foomatic-db-engine/foomatic-db-engine.info
@@ -0,0 +1,10 @@
+PRGNAM="foomatic-db-engine"
+VERSION="4.0.12"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic"
+DOWNLOAD="http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.12.tar.gz"
+MD5SUM="b8049e61a3dad76044e83dde0087e0a0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Markus Rinne"
+EMAIL="markus.ka.rinne@gmail.com"
diff --git a/system/foomatic-db-engine/slack-desc b/system/foomatic-db-engine/slack-desc
new file mode 100644
index 0000000000..25c36c3fd9
--- /dev/null
+++ b/system/foomatic-db-engine/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+foomatic-db-engine: foomatic-db-engine (Foomatic's database engine)
+foomatic-db-engine:
+foomatic-db-engine: Foomatic's database engine generates PPD files from the data in
+foomatic-db-engine: Foomatic's XML database.  It also contains scripts to directly
+foomatic-db-engine: configure print queues and handle jobs.
+foomatic-db-engine:
+foomatic-db-engine:
+foomatic-db-engine:
+foomatic-db-engine:
+foomatic-db-engine:
+foomatic-db-engine:
diff --git a/system/foomatic-db/README b/system/foomatic-db/README
new file mode 100644
index 0000000000..25ace0a288
--- /dev/null
+++ b/system/foomatic-db/README
@@ -0,0 +1,4 @@
+The collected knowledge about printers, drivers, and driver options in XML
+files, used by foomatic-db-engine to generate PPD files.  It also contains
+manufacturer-supplied PPD files which got released under free software
+licenses.
diff --git a/system/foomatic-db/foomatic-db.SlackBuild b/system/foomatic-db/foomatic-db.SlackBuild
new file mode 100644
index 0000000000..60967e8242
--- /dev/null
+++ b/system/foomatic-db/foomatic-db.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for foomatic-db
+
+# Copyright 2015 Markus Rinne Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=foomatic-db
+VERSION=${VERSION:-20150819}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-4.0-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./configure \
+  --prefix=/usr
+
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog README USAGE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/foomatic-db/foomatic-db.info b/system/foomatic-db/foomatic-db.info
new file mode 100644
index 0000000000..c3f0266034
--- /dev/null
+++ b/system/foomatic-db/foomatic-db.info
@@ -0,0 +1,10 @@
+PRGNAM="foomatic-db"
+VERSION="20150819"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic"
+DOWNLOAD="http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20150819.tar.gz"
+MD5SUM="6adaea9b7383d97c3aefb58532fd66d8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Markus Rinne"
+EMAIL="markus.ka.rinne@gmail.com"
diff --git a/system/foomatic-db/slack-desc b/system/foomatic-db/slack-desc
new file mode 100644
index 0000000000..0c79ee82b0
--- /dev/null
+++ b/system/foomatic-db/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+foomatic-db: foomatic-db (Foomatic's XML database)
+foomatic-db:
+foomatic-db: The collected knowledge about printers, drivers, and driver options in
+foomatic-db: XML files, used by foomatic-db-engine to generate PPD files.  It also
+foomatic-db: contains manufacturer-supplied PPD files which got released under free
+foomatic-db: software licenses.
+foomatic-db:
+foomatic-db:
+foomatic-db:
+foomatic-db:
+foomatic-db:
diff --git a/system/forkstat/forkstat.SlackBuild b/system/forkstat/forkstat.SlackBuild
index 73fe6b92ca..9b54d4d5f7 100644
--- a/system/forkstat/forkstat.SlackBuild
+++ b/system/forkstat/forkstat.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=forkstat
-VERSION=${VERSION:-0.01.11}
+VERSION=${VERSION:-0.01.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,16 +74,17 @@ make prefix=/usr DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/bin
+install -Dm755 forkstat $PKG/usr/bin/forkstat
+
 mkdir -p $PKG/usr/man/man8
-cp -a forkstat.8 $PKG/usr/man/man8
+install -D -m644 forkstat.8 $PKG/usr/man/man8/forkstat.8
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/bin
-cp -a forkstat $PKG/usr/bin
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/forkstat/forkstat.info b/system/forkstat/forkstat.info
index 4cc7710ce3..77abbce502 100644
--- a/system/forkstat/forkstat.info
+++ b/system/forkstat/forkstat.info
@@ -1,8 +1,8 @@
 PRGNAM="forkstat"
-VERSION="0.01.11"
+VERSION="0.01.13"
 HOMEPAGE="http://kernel.ubuntu.com/~cking/forkstat/"
-DOWNLOAD="http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-0.01.11.tar.gz"
-MD5SUM="430b1f2233bfc53746c30bf164fa26ad"
+DOWNLOAD="http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-0.01.13.tar.gz"
+MD5SUM="d2ab9cb81fce921737fdae2231b63a05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fr/fr.SlackBuild b/system/fr/fr.SlackBuild
index 7f3a8b827f..eed8cd2ee3 100644
--- a/system/fr/fr.SlackBuild
+++ b/system/fr/fr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fr
 
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=fr
-VERSION=${VERSION:-1.24}
+VERSION=${VERSION:-1.33}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/fr/fr.info b/system/fr/fr.info
index 6778ff3ae1..a5aced4c75 100644
--- a/system/fr/fr.info
+++ b/system/fr/fr.info
@@ -1,8 +1,8 @@
 PRGNAM="fr"
-VERSION="1.24"
+VERSION="1.33"
 HOMEPAGE="https://bitbucket.org/mixmastamyk/fr"
-DOWNLOAD="https://pypi.python.org/packages/source/f/fr/fr-1.24.tar.gz"
-MD5SUM="b626917d8c07646937b3a0fe8bbcce93"
+DOWNLOAD="https://pypi.python.org/packages/source/f/fr/fr-1.33.tar.gz"
+MD5SUM="2b2e9cf8cf0a42fdb97c4aa3496746e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fs-uae-arcade/fs-uae-arcade.SlackBuild b/system/fs-uae-arcade/fs-uae-arcade.SlackBuild
index fadfb8b362..d8cb3185af 100644
--- a/system/fs-uae-arcade/fs-uae-arcade.SlackBuild
+++ b/system/fs-uae-arcade/fs-uae-arcade.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fs-uae-arcade
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-2.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,10 +71,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
-
-mkdir -p $PKG/usr
-cp -a share $PKG/usr
+python3 setup.py build
+make
+make install prefix=/usr DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/fs-uae-arcade/fs-uae-arcade.info b/system/fs-uae-arcade/fs-uae-arcade.info
index 069f9488c6..fdfee4ff9d 100644
--- a/system/fs-uae-arcade/fs-uae-arcade.info
+++ b/system/fs-uae-arcade/fs-uae-arcade.info
@@ -1,10 +1,10 @@
 PRGNAM="fs-uae-arcade"
-VERSION="2.4.3"
+VERSION="2.6.2"
 HOMEPAGE="http://fs-uae.net/"
-DOWNLOAD="http://fs-uae.net/fs-uae/stable/2.4.3/fs-uae-arcade-2.4.3.tar.gz"
-MD5SUM="b103882dcd182997cf9eb496c8462e63"
+DOWNLOAD="http://fs-uae.net/fs-uae/stable/2.6.2/fs-uae-arcade-2.6.2.tar.gz"
+MD5SUM="2b99bbcb32245a36c4b73cb1d56e1d2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython PyOpenGL numpy pygame fs-uae"
+REQUIRES="python3-PyQt5 python3-lhafile fs-uae"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/system/fs-uae-launcher/fs-uae-launcher.SlackBuild b/system/fs-uae-launcher/fs-uae-launcher.SlackBuild
index 899dd8ab14..7cf795a364 100644
--- a/system/fs-uae-launcher/fs-uae-launcher.SlackBuild
+++ b/system/fs-uae-launcher/fs-uae-launcher.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fs-uae-launcher
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-2.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,12 +71,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py build
+python3 setup.py build
 make
-python setup.py install --root=$PKG
-
-mkdir -p $PKG/usr
-cp -a share $PKG/usr
+make install prefix=/usr DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/fs-uae-launcher/fs-uae-launcher.info b/system/fs-uae-launcher/fs-uae-launcher.info
index faea4e26f2..59d4eb30c9 100644
--- a/system/fs-uae-launcher/fs-uae-launcher.info
+++ b/system/fs-uae-launcher/fs-uae-launcher.info
@@ -1,10 +1,10 @@
 PRGNAM="fs-uae-launcher"
-VERSION="2.4.3"
+VERSION="2.6.2"
 HOMEPAGE="http://fs-uae.net/"
-DOWNLOAD="http://fs-uae.net/fs-uae/stable/2.4.3/fs-uae-launcher-2.4.3.tar.gz"
-MD5SUM="ca1b0596a7d8267cf62dc940853ee3f4"
+DOWNLOAD="http://fs-uae.net/fs-uae/stable/2.6.2/fs-uae-launcher-2.6.2.tar.gz"
+MD5SUM="bde923259083a97c5ea677f4f61cb660"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython fs-uae"
+REQUIRES="python3-PyQt5 python3-lhafile fs-uae"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/system/fs-uae/fs-uae.SlackBuild b/system/fs-uae/fs-uae.SlackBuild
index c9b659729c..16a2b0ef2d 100644
--- a/system/fs-uae/fs-uae.SlackBuild
+++ b/system/fs-uae/fs-uae.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fs-uae
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-2.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,11 +71,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make CXXFLAGS="$SLKCFLAGS" prefix=/usr docdir=/usr/doc/$PRGNAM-$VERSION 
-make install prefix=$PKG/usr docdir=$PKG/usr/doc/$PRGNAM-$VERSION
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make
+make install-strip DESTDIR=$PKG
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/fs-uae/fs-uae.info b/system/fs-uae/fs-uae.info
index 5e88d88859..49c565b35d 100644
--- a/system/fs-uae/fs-uae.info
+++ b/system/fs-uae/fs-uae.info
@@ -1,10 +1,10 @@
 PRGNAM="fs-uae"
-VERSION="2.4.3"
+VERSION="2.6.2"
 HOMEPAGE="http://fs-uae.net/"
-DOWNLOAD="http://fs-uae.net/fs-uae/stable/2.4.3/fs-uae-2.4.3.tar.gz"
-MD5SUM="2ab25b0de3126c607e5f513968f74930"
+DOWNLOAD="http://fs-uae.net/fs-uae/stable/2.6.2/fs-uae-2.6.2.tar.gz"
+MD5SUM="9268425a44fae2f6166de2cca2a9091a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL pysetuptools pygame"
+REQUIRES="SDL2 OpenAL libmpeg2"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/system/fsviewer/fsviewer.SlackBuild b/system/fsviewer/fsviewer.SlackBuild
index ca710c0d98..a28386494d 100644
--- a/system/fsviewer/fsviewer.SlackBuild
+++ b/system/fsviewer/fsviewer.SlackBuild
@@ -61,8 +61,8 @@ if [ "${TITLEBAR:-no}" = "yes" ]; then
   patch -p1 < $CWD/titlebar.diff
 fi
 
-LIBS="-lWUtil" \
-CFLAGS="$SLKCFLAGS" \
+LIBS="-lWUtil -lX11 -lm -lXpm" \
+CFLAGS="$SLKCFLAGS -std=gnu89" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -73,6 +73,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
+# fix broken gobbledegook emitted by autoconf. Life is too short
+# to spend time fixing it 'correctly'.
+GCCMAJVER=$( gcc --version | head -1 | cut -d' ' -f3 | cut -d. -f1 )
+[ "$GCCMAJVER" -ge 5 ] && sed -i 's,-MT *\$@,-M,' */Makefile */*/Makefile
+
 make
 make install-strip DESTDIR=$PKG
 
diff --git a/system/fuse-exfat/README b/system/fuse-exfat/README
index 506bacc894..ee6f36eb2d 100644
--- a/system/fuse-exfat/README
+++ b/system/fuse-exfat/README
@@ -1,13 +1,5 @@
-fuse-exfat (ExFat module for the FUSE)
+This project aims to provide a full-featured exFAT file system implementation
+for GNU/Linux and other Unix-like systems as a FUSE module and a set of
+utilities.
 
-This project aims to provide a full-featured exFAT file system
-implementation for GNU/Linux other Unix-like systems as a FUSE
-module.
-
-In other words, you need this package to mount drives formatted
-with the ExFAT file system.
-
-Current status of the project: beta.
-
-Keep in mind, that it might be illegal to use this software in 
-countries respecting US-Patents.
+This package contains the FUSE module.
diff --git a/system/fuse-exfat/doinst.sh b/system/fuse-exfat/doinst.sh
new file mode 100644
index 0000000000..490d3515a9
--- /dev/null
+++ b/system/fuse-exfat/doinst.sh
@@ -0,0 +1,3 @@
+# `mount -t extfs` looks in /sbin
+( cd sbin ; rm -rf mount.exfat )
+( cd sbin ; ln -sf /usr/sbin/mount.exfat mount.exfat )
diff --git a/system/fuse-exfat/fuse-exfat.SlackBuild b/system/fuse-exfat/fuse-exfat.SlackBuild
index be272746a9..c2888f5b23 100644
--- a/system/fuse-exfat/fuse-exfat.SlackBuild
+++ b/system/fuse-exfat/fuse-exfat.SlackBuild
@@ -2,18 +2,29 @@
 
 # Slackware build script for fuse-exfat
 
-# Written by Vliegendehuiskat
-# E-mail: vliegendehuiskat [at] gmail [dot] com
-
-# This script is released in the public domain.
-# I am not responsible for any consequences that follow from the
-# incorrect use of this script.
-
-# Keep in mind, that it might be illegal to use this software in
-# countries respecting US-Patents.
+# Copyright 2012  Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com
+# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fuse-exfat
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,24 +65,35 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-scons install DESTDIR=$PKG/sbin/
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/fuse-exfat/fuse-exfat.info b/system/fuse-exfat/fuse-exfat.info
index b5d94703ea..f2e0c5dc27 100644
--- a/system/fuse-exfat/fuse-exfat.info
+++ b/system/fuse-exfat/fuse-exfat.info
@@ -1,10 +1,10 @@
 PRGNAM="fuse-exfat"
-VERSION="0.9.6"
-HOMEPAGE="https://code.google.com/p/exfat/"
-DOWNLOAD="https://exfat.googlecode.com/files/fuse-exfat-0.9.6.tar.gz"
-MD5SUM="809be0bc49c3b2be3f2d0fd115d36709"
+VERSION="1.2.1"
+HOMEPAGE="https://github.com/relan/exfat"
+DOWNLOAD="https://github.com/relan/exfat/releases/download/v1.2.1/fuse-exfat-1.2.1.tar.gz"
+MD5SUM="9d889d2c3d8c3080c442eb55717ee73b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="scons"
-MAINTAINER="Vliegendehuiskat"
-EMAIL="vliegendehuiskat [at] gmail [dot] com"
+REQUIRES=""
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/system/fuse-exfat/slack-desc b/system/fuse-exfat/slack-desc
index fbf2471322..be34cb222a 100644
--- a/system/fuse-exfat/slack-desc
+++ b/system/fuse-exfat/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-fuse-exfat: fuse-exfat (ExFat module for the FUSE)
+fuse-exfat: fuse-exfat (exFAT FUSE module)
 fuse-exfat:
 fuse-exfat: This project aims to provide a full-featured exFAT file system
-fuse-exfat: implementation for GNU/Linux other Unix-like systems as a FUSE
+fuse-exfat: implementation for GNU/Linux and other Unix-like systems as a FUSE
+fuse-exfat: module and a set of utilities.
 fuse-exfat: module.
 fuse-exfat:
-fuse-exfat: In other words, you need this package to mount drives formatted
-fuse-exfat: with the ExFAT file system.
+fuse-exfat: This package contains the FUSE module.
 fuse-exfat:
-fuse-exfat: Current status of the project: beta.
+fuse-exfat: Homepage: https://github.com/relan/exfat
 fuse-exfat:
diff --git a/system/gencfs/README b/system/gencfs/README
new file mode 100644
index 0000000000..1c0b5ae9d0
--- /dev/null
+++ b/system/gencfs/README
@@ -0,0 +1 @@
+GENCFS is a GUI to EncFS, for encrypted directory mounting.
diff --git a/system/gencfs/doinst.sh b/system/gencfs/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/system/gencfs/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/gencfs/gencfs.SlackBuild b/system/gencfs/gencfs.SlackBuild
new file mode 100644
index 0000000000..0c634dd92b
--- /dev/null
+++ b/system/gencfs/gencfs.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for gencfs
+
+# Copyright 2015 Panagiotis Nikolaou, Karlovasi Samos, Gr
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gencfs
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xjf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+rm $PKG/usr/doc/$PRGNAM-$VERSION/TODO
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gencfs/gencfs.info b/system/gencfs/gencfs.info
new file mode 100644
index 0000000000..f44ff85f42
--- /dev/null
+++ b/system/gencfs/gencfs.info
@@ -0,0 +1,10 @@
+PRGNAM="gencfs"
+VERSION="1.2"
+HOMEPAGE="http://sallu.tuxfamily.org/-Desktop-utilities,7-"
+DOWNLOAD="https://slackonly.com/pub/sources/system/gencfs/gencfs-1.2.tar.bz2"
+MD5SUM="97823a78efaaf7bdfd1759631d404c16"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="encfs"
+MAINTAINER="Panagiotis Nikolaou"
+EMAIL="hostmaster@slackonly.com"
diff --git a/system/gencfs/slack-desc b/system/gencfs/slack-desc
new file mode 100644
index 0000000000..effe261502
--- /dev/null
+++ b/system/gencfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+gencfs: gencfs (Gencfs)
+gencfs:
+gencfs: Gencfs is a simple graphical front end for encfs.
+gencfs: With encfs directories and their files can be crypted.
+gencfs: Gencfs easily can mount such a directory to an encrypted copy. 
+gencfs:  
+gencfs: Homepage: http://sallu.tuxfamily.org/
+gencfs:
+gencfs:  
+gencfs: 
+gencfs:
diff --git a/system/geoclue/geoclue.info b/system/geoclue/geoclue.info
index 481befbaa6..44e68c7ac2 100644
--- a/system/geoclue/geoclue.info
+++ b/system/geoclue/geoclue.info
@@ -1,7 +1,7 @@
 PRGNAM="geoclue"
 VERSION="0.12.99"
 HOMEPAGE="http://geoclue.freedesktop.org/"
-DOWNLOAD="http://freedesktop.org/~hadess/geoclue-0.12.99.tar.gz"
+DOWNLOAD="https://people.freedesktop.org/~hadess/geoclue-0.12.99.tar.gz"
 MD5SUM="779245045bfeeec4853da8baaa3a18e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/gitolite/gitolite b/system/gitolite/gitolite
index af1c0bb5ab..332e43ab4a 100644
--- a/system/gitolite/gitolite
+++ b/system/gitolite/gitolite
@@ -5,5 +5,5 @@ GL_USER=@GL_USER@
 if [ "$(whoami)" == "$GL_USER" ]; then
   /usr/libexec/gitolite/gitolite ${@}
 else
-  su -c "/usr/libexec/gitolite/gitolite ${@}" $GL_USER
+  sudo -u $GL_USER -- "$0" "$@"
 fi
diff --git a/system/gitolite/gitolite.SlackBuild b/system/gitolite/gitolite.SlackBuild
index 47a977f4ab..379f2091f9 100644
--- a/system/gitolite/gitolite.SlackBuild
+++ b/system/gitolite/gitolite.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=gitolite
 VERSION=${VERSION:-3.6.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 ARCH=noarch
 
diff --git a/system/glances/README b/system/glances/README
index 15ef766369..d91793e83c 100644
--- a/system/glances/README
+++ b/system/glances/README
@@ -1,4 +1,4 @@
-Glances is a free (LGPL) cross-platform curses-based system monitoring tool
+glances is a free (LGPL) cross-platform curses-based system monitoring tool
 which aims to present a maximum of information in a minimum of space, ideally
 to fit in a classical 80x24 terminal, or larger for additional data as it can
 adapt the displayed information dynamically, depending on the terminal size.
@@ -6,7 +6,7 @@ adapt the displayed information dynamically, depending on the terminal size.
 This tool can also work in client/server mode. Remote monitoring can be done
 via terminal or web interface.
 
-Glances is written in Python and uses the psutil library to fetch statistical
+glances is written in Python and uses the psutil library to fetch statistical
 values from key elements, like CPU, load average, memory, network, disks,
 file systems, processes, etc.
 
@@ -14,17 +14,14 @@ OPTIONAL DEPENDENCIES
 
 Available on SBo: batinfo (battery monitoring support), bottle (Web server
 mode), hddtemp (HHD temperature monitoring support), matplotlib (generation
-of graphs from history data), netifaces (auto discoverer mode), py3sensors
-(HW monitoring support), pymdstat (RAID support), python3, statsd (StatsD
-export module), ysnmp (SNMP support).
+of graphs from history data), netifaces (IP plugin), py3sensors (HW monitoring
+support), pymdstat (RAID support), python3, statsd (StatsD export module),
+pysnmp (SNMP support).
 
 Not available on SBo: docker-py (Docker monitoring support), influxdb (InfluxDB
-export module), pika (RabbitMQ/ActiveMQ export module), pystache (action script
-feature), zeroconf (auto discoverer mode).
+export module), pika (RabbitMQ/ActiveMQ export module), py-cpuinfo (Quicklook
+CPU info module), pystache (action script feature), zeroconf (auto discoverer
+mode).
 
-NOTES
-
-1) When launching Glances in a terminal with a bright background, the option
+NOTE: When launching glances in a terminal with a bright background, the option
 '--theme-white' is recommended.
-
-2) For optional auto discoverer mode, both zeroconf and netifaces are needed.
diff --git a/system/glances/glances.SlackBuild b/system/glances/glances.SlackBuild
index 6e5959dc48..f1acfd3ccc 100644
--- a/system/glances/glances.SlackBuild
+++ b/system/glances/glances.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for glances
 
-# Copyright 2013-2015 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2013-2015 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glances
-VERSION=${VERSION:-2.4.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,20 +65,14 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null \
-  || true
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 PRGUSR=$PKG/usr
 PRGSHR=$PKG/usr/share
 PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-# Compress man page.
+# Move and compress man page.
 mv $PRGSHR/man $PRGUSR/
 gzip -9 $PRGUSR/man/man1/$PRGNAM.1
 
diff --git a/system/glances/glances.info b/system/glances/glances.info
index 7a96ff29f0..c8ef953cb1 100644
--- a/system/glances/glances.info
+++ b/system/glances/glances.info
@@ -1,10 +1,10 @@
 PRGNAM="glances"
-VERSION="2.4.1"
+VERSION="2.5.1"
 HOMEPAGE="https://github.com/nicolargo/glances"
-DOWNLOAD="https://github.com/nicolargo/glances/archive/v2.4.1.tar.gz"
-MD5SUM="e469f8bb8c5a1b0b2a38402b911134ed"
+DOWNLOAD="https://github.com/nicolargo/glances/archive/v2.5.1.tar.gz"
+MD5SUM="d90292fb283b2f888253d650eb28b549"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="psutil pysetuptools"
 MAINTAINER="Philip Lacroix"
-EMAIL="philnx at posteo dot de"
+EMAIL="slackph at posteo dot de"
diff --git a/system/gnome-disk-utility/README b/system/gnome-disk-utility/README
new file mode 100644
index 0000000000..e424cfb0dd
--- /dev/null
+++ b/system/gnome-disk-utility/README
@@ -0,0 +1,5 @@
+gnome-disk-utility provides libraries and applications for dealing
+with storage devices.
+
+This is pretty much locked at version 3.6.1 unless you want to go
+down the rabbithole of GNOME3 on your system.
diff --git a/system/gnome-disk-utility/doinst.sh b/system/gnome-disk-utility/doinst.sh
new file mode 100644
index 0000000000..6fb1283156
--- /dev/null
+++ b/system/gnome-disk-utility/doinst.sh
@@ -0,0 +1,16 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
new file mode 100644
index 0000000000..1ed20c7918
--- /dev/null
+++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Slackware build script for gnome-disk-utility
+
+# Copyright 2015  Robby Workman, Tuscaloosa, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gnome-disk-utility
+VERSION=${VERSION:-3.6.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --disable-schemas-compile \
+  --disable-libsystemd-login
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gnome-disk-utility/gnome-disk-utility.info b/system/gnome-disk-utility/gnome-disk-utility.info
new file mode 100644
index 0000000000..cbed34abc3
--- /dev/null
+++ b/system/gnome-disk-utility/gnome-disk-utility.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-disk-utility"
+VERSION="3.6.1"
+HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility/"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gnome-disk-utility/3.6/gnome-disk-utility-3.6.1.tar.xz"
+MD5SUM="ff6e0a50a3a6aa9a8d9aa8b19d304485"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libpwquality"
+MAINTAINER="Robby Workman"
+EMAIL="rworkman@slackbuilds.org"
diff --git a/system/gnome-disk-utility/slack-desc b/system/gnome-disk-utility/slack-desc
new file mode 100644
index 0000000000..327f5ab536
--- /dev/null
+++ b/system/gnome-disk-utility/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+gnome-disk-utility: gnome-disk-utility (libs and apps for storage device handling)
+gnome-disk-utility:
+gnome-disk-utility: gnome-disk-utility provides libraries and applications for dealing
+gnome-disk-utility: with storage devices.
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
diff --git a/system/gnu-unifont/gnu-unifont.SlackBuild b/system/gnu-unifont/gnu-unifont.SlackBuild
index c29ba85d2a..527309110a 100644
--- a/system/gnu-unifont/gnu-unifont.SlackBuild
+++ b/system/gnu-unifont/gnu-unifont.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for gnu-unifont
 
 # Copyright 2010 crocket (crockabiscuit@gmail.com)
-# Copyright 2013-2014 LukenShiro, Italy
+# Copyright 2013-2015 LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnu-unifont
-VERSION=${VERSION:-7.0.03}
+VERSION=${VERSION:-8.0.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/gnu-unifont/gnu-unifont.info b/system/gnu-unifont/gnu-unifont.info
index c20d9a149f..95dcb493dd 100644
--- a/system/gnu-unifont/gnu-unifont.info
+++ b/system/gnu-unifont/gnu-unifont.info
@@ -1,8 +1,8 @@
 PRGNAM="gnu-unifont"
-VERSION="7.0.03"
+VERSION="8.0.01"
 HOMEPAGE="http://unifoundry.com/unifont.html"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/unifont/unifont-7.0.03/unifont-7.0.03.tar.gz"
-MD5SUM="17f4b4de9cf0a58049da251611c19415"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/unifont/unifont-8.0.01/unifont-8.0.01.tar.gz"
+MD5SUM="b813e863f35e0f5f6235e73041c7b1a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/goaccess/doinst.sh b/system/goaccess/doinst.sh
new file mode 100644
index 0000000000..07fd2e932b
--- /dev/null
+++ b/system/goaccess/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/goaccess.conf.new
diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild
index 3b0bfbd962..c6d7b4c842 100644
--- a/system/goaccess/goaccess.SlackBuild
+++ b/system/goaccess/goaccess.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=goaccess
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-0.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -88,20 +88,21 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mv $PKG/etc/goaccess.conf $PKG/etc/goaccess.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info
index 78da14873d..0069ee5d13 100644
--- a/system/goaccess/goaccess.info
+++ b/system/goaccess/goaccess.info
@@ -1,8 +1,8 @@
 PRGNAM="goaccess"
-VERSION="0.7"
+VERSION="0.9.4"
 HOMEPAGE="http://goaccess.prosoftcorp.com/download"
-DOWNLOAD="https://downloads.sourceforge.net/goaccess/goaccess-0.7.tar.gz"
-MD5SUM="6f7091dc320f8c695e9523279b521c38"
+DOWNLOAD="http://tar.goaccess.io/goaccess-0.9.4.tar.gz"
+MD5SUM="2671796a17d2488f65b657bc39e26de5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gpart/README b/system/gpart/README
new file mode 100644
index 0000000000..3cdde88307
--- /dev/null
+++ b/system/gpart/README
@@ -0,0 +1,12 @@
+Gpart is a small tool which tries to guess what partitions are on a PC type,
+MBR-partitioned hard disk in case the primary partition table was damaged.
+
+Gpart works by scanning through the device (or file) given on the command
+line on a sector basis. Each guessing module is asked if it thinks a
+filesystem it knows about could start at a given sector. Several
+filesystem guessing modules are built in.
+
+Supported (guessable) filesystem or partition types:
+DOS/Windows FAT, Linux ext2 and swap, OS/2 HPFS, Windows NTFS,
+FreeBSD and Solaris/x86 disklabels, Minix FS, QNX 4 FS, Reiser FS,
+LVM and LVM2 physical volumes, BTRFS, BeOS FS, SGI XFS.
diff --git a/system/gpart/docdir.diff.gz b/system/gpart/docdir.diff.gz
new file mode 100644
index 0000000000..6dfbdd52da
--- /dev/null
+++ b/system/gpart/docdir.diff.gz
diff --git a/system/gpart/gpart.SlackBuild b/system/gpart/gpart.SlackBuild
new file mode 100644
index 0000000000..14b7cd3953
--- /dev/null
+++ b/system/gpart/gpart.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for gpart
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=gpart
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Add LVM2 and btrfs to list of supported modules
+# https://github.com/baruch/gpart/commit/610741608381635064c15030f35714dd113f76af
+zcat $CWD/lvm2-btrfs.diff.gz | patch -p1
+
+# Respect configure --docdir option
+# https://github.com/baruch/gpart/commit/5fa7b6f405ae651af06a50e85c80cc2a76116538
+zcat $CWD/docdir.diff.gz | patch -p1
+
+# generate the configure file
+sed '/configure/d' -i autogen.sh
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --datarootdir=/usr/share \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING Changes INSTALL LSM README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gpart/gpart.info b/system/gpart/gpart.info
new file mode 100644
index 0000000000..4b7e39858d
--- /dev/null
+++ b/system/gpart/gpart.info
@@ -0,0 +1,10 @@
+PRGNAM="gpart"
+VERSION="0.3"
+HOMEPAGE="https://github.com/baruch/gpart"
+DOWNLOAD="https://github.com/baruch/gpart/archive/0.3.tar.gz"
+MD5SUM="2d709068b5123198b3eb337f9d4686a8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/system/gpart/lvm2-btrfs.diff.gz b/system/gpart/lvm2-btrfs.diff.gz
new file mode 100644
index 0000000000..d45dcae710
--- /dev/null
+++ b/system/gpart/lvm2-btrfs.diff.gz
diff --git a/system/gpart/slack-desc b/system/gpart/slack-desc
new file mode 100644
index 0000000000..c9b1129bfa
--- /dev/null
+++ b/system/gpart/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+gpart: gpart (Guess PC-type hard disk partitions)
+gpart:
+gpart: A tool which tries to guess the primary partition table of a PC-type 
+gpart: hard disk in case the primary partition table in sector 0 is damaged, 
+gpart: incorrect or deleted. The guessed table can be written to a file or
+gpart: device. 
+gpart:
+gpart: Homepage: https://github.com/baruch/gpart
+gpart:
+gpart:
+gpart:
diff --git a/system/gparted/README b/system/gparted/README
index 0f91a13021..6689c5e50c 100644
--- a/system/gparted/README
+++ b/system/gparted/README
@@ -3,3 +3,6 @@ tables.  Several (optional) "file system" tools provide support for file
 systems not included in libparted.  These optional packages will be detected 
 at runtime and do not require a rebuild of GParted.  GParted is written in 
 C++ and uses gtkmm for it's Graphical User Interface (GUI).
+
+gpart is an optional runtime dependency for using the 'Attempt Data Rescue'
+function found in the 'Device' tab.
diff --git a/system/gparted/gparted.SlackBuild b/system/gparted/gparted.SlackBuild
index e19c9ff855..c29802fccd 100644
--- a/system/gparted/gparted.SlackBuild
+++ b/system/gparted/gparted.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for GParted
 #
 # Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2015 Hunter Sezen, California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gparted
-VERSION=${VERSION:-0.22.0}
+VERSION=${VERSION:-0.24.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/gparted/gparted.info b/system/gparted/gparted.info
index 008b2f3d17..a13010deb4 100644
--- a/system/gparted/gparted.info
+++ b/system/gparted/gparted.info
@@ -1,10 +1,10 @@
 PRGNAM="gparted"
-VERSION="0.22.0"
+VERSION="0.24.0"
 HOMEPAGE="http://gparted.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/gparted/gparted-0.22.0.tar.bz2"
-MD5SUM="67c4bdf680461e1107b718aff6095ea6"
+DOWNLOAD="http://downloads.sourceforge.net/gparted/gparted-0.24.0.tar.bz2"
+MD5SUM="b8480274c68876acff5965d4346710e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkmm"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/system/guix/README b/system/guix/README
new file mode 100644
index 0000000000..4613a6ec6d
--- /dev/null
+++ b/system/guix/README
@@ -0,0 +1,48 @@
+GNU Guix provides state-of-the-art package management features such as transactional
+upgrades and roll-backs, reproducible build environments, unprivileged package
+management, and per-user profiles. It uses low-level mechanisms from the Nix package
+manager, but packages are defined as native Guile modules, using extensions to the
+Scheme language—which makes it nicely hackable.
+
+Guix may be run in single or multi-user mode (which requires the guix-daemon). To
+have the guix daemon start and stop with your host, add to /etc/rc.d/rc.local:
+
+if [ -x /etc/rc.d/rc.guix ]; then
+/etc/rc.d/rc.guix start
+fi
+
+and to /etc/rc.d/rc.local_shutdown (creating it if needed):
+
+if [ -x /etc/rc.d/rc.guix ]; then
+/etc/rc.d/rc.guix stop
+fi
+
+The daemon requires users for building the guix packages, which should be added
+under the 'guixbuild' group.
+
+groupadd -g 316 guixbuild
+for i in `seq -w 1 10`; do
+          useradd -G guixbuild \
+          -d /var/empty -s `which nologin` \
+          -c "Guix build user $i" -u 316 -g 316 \
+          guixbuilder$i;
+done
+
+Restricting access to the daemon to only users in the guixbuild group is acheived
+by setting file permissions for the daemon's socket's folder.
+
+chgrp guixbuild /var/guix/daemon-socket
+chmod ug=rwx,o= /var/guix/daemon-socket
+
+Correct permissions must also be set for /var/guix/profiles to give users access.
+
+By default guix will compile in /tmp, this can be changed by exporting $TMPDIR.
+Guix will also by default store its packages in /gnu/store, to save space in the
+root partition /gnu can be mounted on another partition.
+
+Guix can either be built with the nix-daemon instead of the default guix-daemon or along
+side nix sharing the same store, both require nix as an optional dependency. To build with
+the nix-daemon use NIX="yes" and to share the store with nix use SHARE="yes".
+
+guile-json is an optional dependency and will allow you to use the 'guix import pypi' command.
+It is of interest primarily for developers and not for casual users.
diff --git a/system/guix/config/rc.guix b/system/guix/config/rc.guix
new file mode 100644
index 0000000000..a3d80ac6d7
--- /dev/null
+++ b/system/guix/config/rc.guix
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Short-Description:  A purely functional package manager.
+# Description:
+# GNU Guix provides state-of-the-art package management features such as
+# transactional upgrades and roll-backs, reproducible build environments,
+# unprivileged package management, and per-user profiles. It uses low-level
+# mechanisms from the Nix package manager, but packages are defined as native 
+# Guile modules, using extensions to the Scheme language—which makes it nicely
+# hackable.
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+BASE=guix-daemon
+
+UNSHARE=/usr/bin/unshare
+GUIX=/usr/bin/$BASE
+GUIX_PIDFILE=/var/run/$BASE.pid
+GUIX_LOG=/var/log/guix.log
+GUIX_OPTS=--build-users-group=guixbuild
+
+if [ -f /etc/default/$BASE ]; then
+	. /etc/default/$BASE
+fi
+
+# Check guix is present
+if [ ! -x $GUIX ]; then
+	echo "$GUIX not present or not executable"
+	exit 1
+fi
+
+guix_start() {
+  echo "starting $BASE ..."
+  if [ -x ${GUIX} ]; then
+    # If there is an old PID file (no guix-daemon running), clean it up:
+    if [ -r ${GUIX_PIDFILE} ]; then
+      if ! ps axc | grep guix-daemon 1> /dev/null 2> /dev/null ; then
+        echo "Cleaning up old ${GUIX_PIDFILE}."
+        rm -f ${GUIX_PIDFILE}
+      fi
+    fi
+    nohup "${UNSHARE}" -m -- "${GUIX}" "${GUIX_OPTS}" >> ${GUIX_LOG} 2>&1 &
+    echo $! > ${GUIX_PIDFILE}
+  fi
+}
+
+# Stop guix:
+guix_stop() {
+  echo "stopping $BASE ..."
+  # If there is no PID file, ignore this request...
+  if [ -r ${GUIX_PIDFILE} ]; then
+    kill $(cat ${GUIX_PIDFILE})
+  fi
+  rm -f ${GUIX_PIDFILE}
+}
+
+# Restart guix:
+guix_restart() {
+	guix_stop
+	guix_start
+}
+
+case "$1" in
+'start')
+  guix_start
+  ;;
+'stop')
+  guix_stop
+  ;;
+'restart')
+  guix_restart
+  ;;
+'status')
+  if [ -f ${GUIX_PIDFILE} ] && ps -o cmd $(cat ${GUIX_PIDFILE}) | grep -q $BASE ; then
+	  echo "status of $BASE: running"
+  else
+	  echo "status of $BASE: stopped"
+  fi
+  ;;
+*)
+  echo "usage $0 start|stop|restart|status"
+esac
+
+exit 0
diff --git a/system/guix/doinst.sh b/system/guix/doinst.sh
new file mode 100644
index 0000000000..3e203807ec
--- /dev/null
+++ b/system/guix/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.guix.new
diff --git a/system/guix/guix.SlackBuild b/system/guix/guix.SlackBuild
new file mode 100644
index 0000000000..bed37f5e06
--- /dev/null
+++ b/system/guix/guix.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+# Slackware build script for Guix
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guix
+VERSION=${VERSION:-0.9.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# To share the store with nix
+SHARE=${SHARE:-no}
+if [ "${SHARE:-yes}" = "yes" ]; then
+    share="--with-store-dir=/nix/store"
+    var="--localstatedir=/nix/var"
+else
+    var="--localstatedir=/var"
+fi
+
+# To use the nix-daemon instead of the guix-daemon
+NIX=${NIX:-no}
+if [ "${NIX:-yes}" = "yes" ]; then nix="--disable-daemon"; else nix=""; fi
+
+# https://www.mail-archive.com/guix-commits@gnu.org/msg12674.html
+zcat $CWD/pypi-guile-json.diff.gz | patch -p1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --disable-rpath \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux \
+  $nix \
+  $share \
+  $var \
+
+make
+make install DESTDIR=$PKG
+
+install -D --mode 0755 $CWD/config/rc.guix $PKG/etc/rc.d/rc.guix.new
+mkdir -p $PKG/gnu
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
+rm -fr $PKG/usr/lib${LIBDIRSUFFIX}/systemd
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README ROADMAP THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/guix/guix.info b/system/guix/guix.info
new file mode 100644
index 0000000000..cd3816044e
--- /dev/null
+++ b/system/guix/guix.info
@@ -0,0 +1,10 @@
+PRGNAM="guix"
+VERSION="0.9.0"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+DOWNLOAD="ftp://alpha.gnu.org/gnu/guix/guix-0.9.0.tar.gz"
+MD5SUM="224e0a3cab26a2b95c65be738e4ae7f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/system/guix/pypi-guile-json.diff.gz b/system/guix/pypi-guile-json.diff.gz
new file mode 100644
index 0000000000..dc2a9491f1
--- /dev/null
+++ b/system/guix/pypi-guile-json.diff.gz
diff --git a/system/guix/slack-desc b/system/guix/slack-desc
new file mode 100644
index 0000000000..857fcb0e2a
--- /dev/null
+++ b/system/guix/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+guix: guix (a purely functional package manager)
+guix: 
+guix: GNU Guix provides state-of-the-art package management features such
+guix: as transactional upgrades and roll-backs, reproducible build
+guix: environments, unprivileged package management, and per-user profiles.
+guix: It uses low-level mechanisms from the Nix package manager, but
+guix: packages are defined as native Guile modules, using extensions to the
+guix: Scheme language—which makes it nicely hackable.
+guix:
+guix: Homepage: https://www.gnu.org/software/guix/
+guix:
diff --git a/system/hack-font-ttf/README b/system/hack-font-ttf/README
new file mode 100644
index 0000000000..9138fce3af
--- /dev/null
+++ b/system/hack-font-ttf/README
@@ -0,0 +1,7 @@
+Hack -  A typeface in the bitstream vera lineage
+
+Hack has deep roots in the libre, open source typeface community and
+includes the contributions of the Bitsream Vera & DejaVu projects.
+
+The face has benn re-designed with an expanded glyph set, modifications
+of the original glyph shapes, and meticulous attention to metrics.
diff --git a/system/hack-font-ttf/doinst.sh b/system/hack-font-ttf/doinst.sh
new file mode 100644
index 0000000000..bdb050188d
--- /dev/null
+++ b/system/hack-font-ttf/doinst.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/hack-font-ttf/hack-font-ttf.SlackBuild b/system/hack-font-ttf/hack-font-ttf.SlackBuild
new file mode 100644
index 0000000000..6c97d826f2
--- /dev/null
+++ b/system/hack-font-ttf/hack-font-ttf.SlackBuild
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Slackware build script for hack-font-ttf
+
+# Copyright 2015 rfmae <rf.mae.git@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=hack-font-ttf
+VERSION=${VERSION:-2.018}
+ARCH=noarch
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+SRCNAM=Hack-v2_018-ttf.zip
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -f Hack-*.ttf
+unzip $CWD/$SRCNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF/
+cp -a *.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hack-font-ttf/hack-font-ttf.info b/system/hack-font-ttf/hack-font-ttf.info
new file mode 100644
index 0000000000..ca42052335
--- /dev/null
+++ b/system/hack-font-ttf/hack-font-ttf.info
@@ -0,0 +1,10 @@
+PRGNAM="hack-font-ttf"
+VERSION="2.018"
+HOMEPAGE="http://sourcefoundry.org/hack/"
+DOWNLOAD="https://github.com/chrissimpkins/Hack/releases/download/v2.018/Hack-v2_018-ttf.zip"
+MD5SUM="5e57c8bd10590903d61fd7744e1bc368"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="rfmae"
+EMAIL="rf.mae.git@gmail.com"
diff --git a/system/hack-font-ttf/slack-desc b/system/hack-font-ttf/slack-desc
new file mode 100644
index 0000000000..4cabadcb77
--- /dev/null
+++ b/system/hack-font-ttf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+hack-font-ttf: hack-font-ttf (font)
+hack-font-ttf:
+hack-font-ttf: A typeface in the bitstream vera lineage
+hack-font-ttf: Hack has deep roots in the libre, open source typeface community and
+hack-font-ttf: includes the contributions of the Bitsream Vera & DejaVu projects.
+hack-font-ttf:
+hack-font-ttf: The face has been re-designed with an expanded glyph set,
+hack-font-ttf: modifications of the original glyph shapes, and meticulous attention
+hack-font-ttf: to metrics.
+hack-font-ttf:
+hack-font-ttf: http://sourcefoundry.org/hack/
diff --git a/system/hardinfo/hardinfo.SlackBuild b/system/hardinfo/hardinfo.SlackBuild
index 4a3bd5b127..6296223cd7 100644
--- a/system/hardinfo/hardinfo.SlackBuild
+++ b/system/hardinfo/hardinfo.SlackBuild
@@ -23,7 +23,7 @@
 
 PRGNAM=hardinfo
 VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,14 +63,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix mandir
 sed -i "s|share/man|man|" configure
 
+patch -p1 < $CWD/makefile.patch
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,7 +87,7 @@ make install DESTDIR=$PKG
 
 rm -rf $PKG/usr/local
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/hardinfo/makefile.patch b/system/hardinfo/makefile.patch
new file mode 100644
index 0000000000..a32b77e423
--- /dev/null
+++ b/system/hardinfo/makefile.patch
@@ -0,0 +1,10 @@
+--- hardinfo-0.5.1/Makefile.in.old	2015-12-19 09:39:19.955074713 +0700
++++ hardinfo-0.5.1/Makefile.in	2015-12-19 09:39:40.254827496 +0700
+@@ -1,6 +1,6 @@
+ 
+ CCFLAGS = -fPIC -pipe -Wall -g 
+-CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
++CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89
+ CC = gcc $(ARCHOPTS) -g
+ CCSLOW = gcc -O0 -g
+ 
diff --git a/system/hebe/hebe.info b/system/hebe/hebe.info
index 71ce936208..2de5d49a1a 100644
--- a/system/hebe/hebe.info
+++ b/system/hebe/hebe.info
@@ -1,7 +1,7 @@
 PRGNAM="hebe"
 VERSION="0.4"
 HOMEPAGE="http://kde-apps.org/content/show.php?content=126738"
-DOWNLOAD="http://www.binro.org/hebe-0.4.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/hebe/hebe-0.4.tar.bz2"
 MD5SUM="0ff4b72def6e30540fb52860d4ff3e93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/herculesstudio/herculesstudio.info b/system/herculesstudio/herculesstudio.info
index 07ada66172..32c9419259 100644
--- a/system/herculesstudio/herculesstudio.info
+++ b/system/herculesstudio/herculesstudio.info
@@ -1,7 +1,7 @@
 PRGNAM="herculesstudio"
 VERSION="1.4.0"
 HOMEPAGE="http://www.mvsdasd.org/hercstudio/"
-DOWNLOAD="http://www.mvsdasd.org/hercstudio/herculesstudio-1.4.0-src.tar.gz"
+DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/hercstudio/herculesstudio-1.4.0-src.tar.gz/58d6643a97ce80df44bf655a5ac23c6c/herculesstudio-1.4.0-src.tar.gz"
 MD5SUM="58d6643a97ce80df44bf655a5ac23c6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/i2c-tools/i2c-tools.info b/system/i2c-tools/i2c-tools.info
index 35f1b998ab..7076abaf63 100644
--- a/system/i2c-tools/i2c-tools.info
+++ b/system/i2c-tools/i2c-tools.info
@@ -1,7 +1,7 @@
 PRGNAM="i2c-tools"
 VERSION="3.1.1"
 HOMEPAGE="http://lm-sensors.org/wiki/I2CTools"
-DOWNLOAD="http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2"
+DOWNLOAD="ftp://ftp.vim.org/vol/2/metalab/distributions/tinycorelinux/6.x/x86/tcz/src/i2c-tools/i2c-tools-3.1.1.tar.bz2"
 MD5SUM="0fdbff53ebd0b8d9249256d6c56480b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/icingaweb2/icingaweb2.SlackBuild b/system/icingaweb2/icingaweb2.SlackBuild
index 5e44f76d7c..5ec8c94539 100644
--- a/system/icingaweb2/icingaweb2.SlackBuild
+++ b/system/icingaweb2/icingaweb2.SlackBuild
@@ -23,11 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icingaweb2
-VERSION=${VERSION:-2.0.0_rc1}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVER=${SRCVER:-2.0.0-rc1}
 ARCH=noarch
 
 CWD=$(pwd)
@@ -45,9 +44,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/v$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/icingaweb2/icingaweb2.info b/system/icingaweb2/icingaweb2.info
index bde3e22798..742df1e223 100644
--- a/system/icingaweb2/icingaweb2.info
+++ b/system/icingaweb2/icingaweb2.info
@@ -1,8 +1,8 @@
 PRGNAM="icingaweb2"
-VERSION="2.0.0_rc1"
+VERSION="2.1.0"
 HOMEPAGE="https://www.icinga.org/"
-DOWNLOAD="https://github.com/Icinga/icingaweb2/archive/v2.0.0-rc1.tar.gz"
-MD5SUM="3889d5a6860cf65b301fb5b6d9667e5c"
+DOWNLOAD="https://github.com/Icinga/icingaweb2/archive/v2.1.0.tar.gz"
+MD5SUM="8b2e8ad789b5cf31f5fac38a7513a301"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/innoextract/innoextract.SlackBuild b/system/innoextract/innoextract.SlackBuild
index 233eddffac..c43bc3b6a0 100644
--- a/system/innoextract/innoextract.SlackBuild
+++ b/system/innoextract/innoextract.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=innoextract
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/innoextract/innoextract.info b/system/innoextract/innoextract.info
index ad2bf00f9e..7e7baf4ea5 100644
--- a/system/innoextract/innoextract.info
+++ b/system/innoextract/innoextract.info
@@ -1,8 +1,8 @@
 PRGNAM="innoextract"
-VERSION="1.4"
+VERSION="1.5"
 HOMEPAGE="http://constexpr.org/innoextract/"
-DOWNLOAD="http://downloads.sourceforge.net/project/innoextract/innoextract-1.4/innoextract-1.4.tar.gz"
-MD5SUM="601c7337184620df5ad38e4f389b1c6f"
+DOWNLOAD="http://constexpr.org/innoextract/files/innoextract-1.5.tar.gz"
+MD5SUM="86dc2061e86df5ae8872cb7deacfcaf5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/intel-microcode/README b/system/intel-microcode/README
index 332f0fd362..fef45f24af 100644
--- a/system/intel-microcode/README
+++ b/system/intel-microcode/README
@@ -1,14 +1,31 @@
 Linux Processor Microcode Data File
 
-The microcode data file contains the latest microcode definitions for all Intel processors.
-Intel releases microcode updates to correct processor behavior as documented in the respective
-processor specification updates. While the regular approach to getting this microcode update
-is via a BIOS upgrade, Intel realizes that this can be an administrative hassle. The Linux
-operating system and VMware ESX products have a mechanism to update the microcode after booting.
-
-This script is intended to repackage the official Intel microcode tarball.
-The resulting firmware file is placed under /lib/firmware/microcode.dat
-
-NOTE:
-Although there is another (newer) mean of uploading the microcode data file to the processor,
-this package is meant to be used with the *microcode_ctl* utility available at slackbuilds.org.
+The microcode data file contains the latest microcode definitions for all Intel
+processors. Intel releases microcode updates to correct processor behavior as
+documented in the respective processor specification updates. While the regular
+approach to getting this microcode update is via a BIOS upgrade, Intel realizes
+that this can be an administrative hassle. The Linux operating system and VMware
+ESX products have a mechanism to update the microcode after booting.
+
+This SlackBuild repackages the official Intel microcode tarball, placing the
+microcode.dat file under /lib/firmware/microcode.dat, which can be later
+uploaded using microcode_ctl utility (available from SlackBuilds.org).
+
+If the iucode_tool (available from SlackBuilds.org) is installed on the system,
+this SlackBuild writes the microcodes with the file names expected by the Linux
+kernel firmware loader and places them under /lib/firmware/intel-ucode
+directory. In that case, the correct microcode is uploaded when the Intel
+microcode kernel's module is loaded.
+
+Please note that the method using the iucode_tool is preferred for multiple
+reasons, one being the deprecation of the kernel's interface used by the
+microcode_ctl utility.
+
+If you need to load the microcode early during the boot:
+1) read https://www.kernel.org/doc/Documentation/x86/early-microcode.txt
+2) read the manual for iucode_tool, especially about --write-earlyfw option
+3) make sure your kernel has the followings:
+  CONFIG_MICROCODE=y
+  CONFIG_MICROCODE_EARLY=y
+  CONFIG_MICROCODE_INTEL=y
+  CONFIG_MICROCODE_INTEL_EARLY=y
diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild
index 5c3939a213..dfb9c2cd2a 100644
--- a/system/intel-microcode/intel-microcode.SlackBuild
+++ b/system/intel-microcode/intel-microcode.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=intel-microcode
 SRCNAM=microcode
-VERSION=${VERSION:-20150121}
+VERSION=${VERSION:-20151106}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCH=noarch
@@ -38,11 +38,22 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+
+mkdir $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tgz -C $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION
+chown root:root microcode.dat
+chmod 0644      microcode.dat
 
 mkdir -p $PKG/lib/firmware
-tar xvf $CWD/$SRCNAM-$VERSION.tgz -C $PKG/lib/firmware
-chown root:root $PKG/lib/firmware/microcode.dat
-chmod 0644 $PKG/lib/firmware/microcode.dat
+cp -a microcode.dat $PKG/lib/firmware
+
+if [ -x /usr/sbin/iucode_tool ]; then
+  mkdir -p $PKG/lib/firmware/intel-ucode
+  /usr/sbin/iucode_tool -v -L -K$PKG/lib/firmware/intel-ucode microcode.dat
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/intel-microcode/intel-microcode.info b/system/intel-microcode/intel-microcode.info
index e5ea56296a..2f17fd8954 100644
--- a/system/intel-microcode/intel-microcode.info
+++ b/system/intel-microcode/intel-microcode.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-microcode"
-VERSION="20150121"
+VERSION="20151106"
 HOMEPAGE="https://downloadcenter.intel.com/"
-DOWNLOAD="http://downloadmirror.intel.com/24661/eng/microcode-20150121.tgz"
-MD5SUM="639b7f2af0a822fe006a4fa2ddf8052f"
+DOWNLOAD="https://downloadmirror.intel.com/25512/eng/microcode-20151106.tgz"
+MD5SUM="288dc721fb39d71457ef2f5a49161f57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/inxi/inxi.SlackBuild b/system/inxi/inxi.SlackBuild
index 0738d5f1c6..acfc196221 100644
--- a/system/inxi/inxi.SlackBuild
+++ b/system/inxi/inxi.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=inxi
-VERSION=${VERSION:-2.2.26}
+VERSION=${VERSION:-2.2.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/inxi/inxi.info b/system/inxi/inxi.info
index 983ed07b13..4710406088 100644
--- a/system/inxi/inxi.info
+++ b/system/inxi/inxi.info
@@ -1,8 +1,8 @@
 PRGNAM="inxi"
-VERSION="2.2.26"
-HOMEPAGE="http://code.google.com/p/inxi/"
-DOWNLOAD="https://sources.archlinux.org/other/community/inxi/inxi-2.2.26.tar.gz"
-MD5SUM="2441f0bf51770fc0d6b843d463accf1f"
+VERSION="2.2.31"
+HOMEPAGE="https://github.com/smxi/inxi"
+DOWNLOAD="https://sources.archlinux.org/other/community/inxi/inxi-2.2.31.tar.gz"
+MD5SUM="d33519b45a6ca6afdec2bfb69104259e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/irqbalance/irqbalance.SlackBuild b/system/irqbalance/irqbalance.SlackBuild
index c3de3f386b..08e62f5538 100644
--- a/system/irqbalance/irqbalance.SlackBuild
+++ b/system/irqbalance/irqbalance.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for irqbalance
 
 # Copyright 2006 by Yalla-One <yallaone@gmail.com>
-# Copyright 2013-2014 by LukenShiro, Italy
+# Copyright 2013-2015 by LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=irqbalance
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,7 +41,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING"
+DOCFILES="AUTHORS COPYING README"
 SRCVER=v$VERSION
 
 if [ "$ARCH" = "i486" ]; then
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$SRCVER.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
diff --git a/system/irqbalance/irqbalance.info b/system/irqbalance/irqbalance.info
index 8a3bcdd0ec..e9cb95b6e7 100644
--- a/system/irqbalance/irqbalance.info
+++ b/system/irqbalance/irqbalance.info
@@ -1,8 +1,8 @@
 PRGNAM="irqbalance"
-VERSION="1.0.7"
+VERSION="1.0.9"
 HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.0.7.tar.gz"
-MD5SUM="2a7090abab6bba15d632c24f5554e7ae"
+DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.0.9.tar.gz"
+MD5SUM="30174d3941c5452a1e4ecee394a76ff8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild
index ad4c79d7a1..9b714713f5 100644
--- a/system/jenkins/jenkins.SlackBuild
+++ b/system/jenkins/jenkins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jenkins
 
-# Copyright 2014  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
+# Copyright 2015  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jenkins
-VERSION=${VERSION:-1.552}
+VERSION=${VERSION:-1.641}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,6 +55,7 @@ cd $PKG
 
 mkdir -p $PKG/usr/share/$PRGNAM
 cp $CWD/$PRGNAM.war $PKG/usr/share/$PRGNAM/$PRGNAM.war
+chown -R jenkins.jenkins $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/bin
 cat $CWD/files/jenkins.bin.sh > $PKG/usr/bin/jenkins
@@ -63,6 +64,8 @@ chmod 0755 $PKG/usr/bin/*
 
 mkdir -p $PKG/etc/$PRGNAM
 cp $CWD/files/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new
+JAVAEXEC=`which java`
+sed -i "s|#JAVA=/usr/lib/java/bin/java|#JAVA=${JAVAEXEC}|" $PKG/etc/$PRGNAM/$PRGNAM.conf.new
 
 mkdir -p $PKG/etc/logrotate.d
 cp $CWD/files/logrotate.$PRGNAM $PKG/etc/logrotate.d/$PRGNAM.new
@@ -71,18 +74,18 @@ mkdir -p $PKG/etc/rc.d
 cp $CWD/files/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 
 mkdir -p $PKG/var/lib/$PRGNAM/apps
-chown jenkins.jenkins $PKG/var/lib/jenkins
+chown jenkins.jenkins $PKG/var/lib/$PRGNAM
 
 mkdir -p $PKG/var/log/$PRGNAM
-touch $PKG/var/log/jenkins/jenkins.log.new
-touch $PKG/var/log/jenkins/jenkins_console.log.new
-chown -R jenkins.jenkins $PKG/var/log/jenkins
+touch $PKG/var/log/$PRGNAM/jenkins.log.new
+touch $PKG/var/log/$PRGNAM/jenkins_console.log.new
+chown -R jenkins.jenkins $PKG/var/log/$PRGNAM
 
 # We can't depend on this directory persisting across reboots, since /var/run
 # is often on tmpfs (or even linked to /run), so we'll create this in the
 # init script's start() function too...   --rworkman
-mkdir -p $PKG/var/run/jenkins
-chown jenkins:jenkins $PKG/var/run/jenkins
+mkdir -p $PKG/var/run/$PRGNAM
+chown jenkins:jenkins $PKG/var/run/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info
index 57f65583b8..072bfb8e21 100644
--- a/system/jenkins/jenkins.info
+++ b/system/jenkins/jenkins.info
@@ -1,8 +1,8 @@
 PRGNAM="jenkins"
-VERSION="1.552"
+VERSION="1.641"
 HOMEPAGE="http://jenkins-ci.org"
-DOWNLOAD="http://ftp.icm.edu.pl/packages/jenkins/war/1.552/jenkins.war"
-MD5SUM="25b13d05a16008ecb8133121292e7a64"
+DOWNLOAD="http://ftp.icm.edu.pl/packages/jenkins/war/1.641/jenkins.war"
+MD5SUM="5fc8e9452ebdaa012eb9e2f0400814d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/system/jmtpfs/jmtpfs.SlackBuild b/system/jmtpfs/jmtpfs.SlackBuild
index 951f38b0d3..545efff32e 100644
--- a/system/jmtpfs/jmtpfs.SlackBuild
+++ b/system/jmtpfs/jmtpfs.SlackBuild
@@ -54,13 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v${VERSION}.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/jq/jq.info b/system/jq/jq.info
index 80a280623d..4452268496 100644
--- a/system/jq/jq.info
+++ b/system/jq/jq.info
@@ -1,7 +1,7 @@
 PRGNAM="jq"
 VERSION="1.4"
 HOMEPAGE="https://stedolan.github.io/jq/"
-DOWNLOAD="https://stedolan.github.io/jq/download/source/jq-1.4.tar.gz"
+DOWNLOAD="https://github.com/stedolan/jq/releases/download/jq-1.4/jq-1.4.tar.gz"
 MD5SUM="e3c75a4f805bb5342c9f4b3603fb248f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/kafka/README b/system/kafka/README
new file mode 100644
index 0000000000..c435258289
--- /dev/null
+++ b/system/kafka/README
@@ -0,0 +1,24 @@
+Apache Kafka is publish-subscribe messaging rethought as a 
+distributed commit log.
+
+Fast
+    A single Kafka broker can handle hundreds of megabytes 
+    of reads and writes per second from thousands of clients.
+
+Scalable
+    Kafka is designed to allow a single cluster to serve as 
+    the central data backbone for a large organization. It 
+    can be elastically and transparently expanded without 
+    downtime. Data streams are partitioned and spread over a 
+    cluster of machines to allow data streams larger than the 
+    capability of any single machine and to allow clusters of 
+    co-ordinated consumers
+
+Durable
+    Messages are persisted on disk and replicated within the 
+    cluster to prevent data loss. Each broker can handle 
+    terabytes of messages without performance impact.
+
+Distributed by Design
+    Kafka has a modern cluster-centric design that offers 
+    strong durability and fault-tolerance guarantees. 
diff --git a/system/kafka/doinst.sh b/system/kafka/doinst.sh
new file mode 100644
index 0000000000..fa286bad3a
--- /dev/null
+++ b/system/kafka/doinst.sh
@@ -0,0 +1,29 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.kafka.new
+preserve_perms etc/kafka/server.properties.new
+preserve_perms etc/kafka/consumer.properties.new
+preserve_perms etc/kafka/producer.properties.new
+preserve_perms etc/kafka/log4j.properties.new
+preserve_perms etc/kafka/test-log4j.properties.new
+preserve_perms etc/kafka/tools-log4j.properties.new
+preserve_perms etc/kafka/kafka-env.sh.new
diff --git a/system/kafka/kafka-env.sh b/system/kafka/kafka-env.sh
new file mode 100644
index 0000000000..8941fff773
--- /dev/null
+++ b/system/kafka/kafka-env.sh
@@ -0,0 +1,21 @@
+#! /bin/bash
+
+export KAFKA_HOME=@KAFKA_HOME@
+# KAFKA_OPTS=
+export LOG_DIR="/var/log/kafka/"
+export SCALA_BINARY_VERSION=2.11
+
+# JVM
+# export KAFKA_HEAP_OPTS="-Xmx1G -Xms1G"
+# export KAFKA_HEAP_OPTS="-Xmx256M"
+# export KAFKA_JVM_PERFORMANCE_OPTS="-server -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:+DisableExplicitGC -Djava.awt.headless=true"
+
+# JMX settings
+# export KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false "
+
+# JMX port to use
+# export JMX_PORT=
+
+# Log4J
+export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:/etc/kafka/log4j.properties"
+
diff --git a/system/kafka/kafka.SlackBuild b/system/kafka/kafka.SlackBuild
new file mode 100644
index 0000000000..aed460b4d7
--- /dev/null
+++ b/system/kafka/kafka.SlackBuild
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+# Slackware build script for Apache Kafka
+
+# Copyright 2016 Andre Barboza - Belo Horizonte Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=kafka
+VERSION=${VERSION:-0.8.2.2}
+SCALA_VERSION=2.11
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+KAFKA_USER=${KAFKA_USER:-kafka}
+KAFKA_UID=${KAFKA_UID:-323}
+KAFKA_GROUP=${KAFKA_GROUP:-kafka}
+KAFKA_GID=${KAFKA_GID:-323}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+
+bailout() {
+  echo "  You must have a $KAFKA_USER user and $KAFKA_GROUP group to run this script. "
+  echo "  Something like this should suffice for most systems: "
+  echo "    # groupadd -g $KAFKA_GID $KAFKA_GROUP "
+  echo "    # useradd -u $KAFKA_UID -g $KAFKA_GID -c \"Apache Kafka user\" -d /var/lib/kafka -s /bin/sh $KAFKA_USER "
+  echo "  Giving /bin/sh as $KAFKA_USER shell is important as the init script will try tu 'su -' to it."
+  exit 1
+}
+
+# Bail if user and/or group isn't valid on your system
+# uid=319 is suggested to avoid conflicts with other SBo packages,
+# but it's your call: http://slackbuilds.org/uid_gid.txt
+if ! grep -q "^$KAFKA_USER:" /etc/passwd; then
+  bailout
+elif ! grep -q "^$KAFKA_GROUP:" /etc/group; then
+  bailout
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${SCALA_VERSION}-$VERSION.tgz
+cd ${PRGNAM}_${SCALA_VERSION}-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{libs,bin}
+install -m 644 libs/*.jar $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/libs
+install -m 775 bin/*.sh $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin
+(
+  cd $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin
+  sed -i "s|^base_dir=.*|base_dir=/usr/lib$LIBDIRSUFFIX/$PRGNAM/|" kafka-run-class.sh
+  sed -i '0,/^$/{s_^$_\n. /etc/kafka/kafka-env.sh\n_}' *.sh
+)
+
+mkdir -p $PKG/usr/bin 
+(
+  cd $PKG/usr/bin
+  for script in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/kafka*
+  do
+    script_name=$(basename $script)
+    ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/bin/${script_name} 
+  done
+)
+
+install -dm 750 ${PKG}/var/{lib,log}/$PRGNAM
+chown -R $KAFKA_USER:$KAFKA_GROUP $PKG/var/{lib,log}/$PRGNAM
+
+install -dm 755 ${PKG}/etc/$PRGNAM
+install -m 644 config/server.properties $PKG/etc/$PRGNAM/server.properties.new
+install -m 644 config/consumer.properties $PKG/etc/$PRGNAM/consumer.properties.new
+install -m 644 config/producer.properties $PKG/etc/$PRGNAM/producer.properties.new
+install -m 644 config/log4j.properties $PKG/etc/$PRGNAM/log4j.properties.new
+install -m 644 config/test-log4j.properties $PKG/etc/$PRGNAM/test-log4j.properties.new
+install -m 644 config/tools-log4j.properties $PKG/etc/$PRGNAM/tools-log4j.properties.new
+install -m 644 $CWD/kafka-env.sh $PKG/etc/$PRGNAM/kafka-env.sh.new
+(
+  cd $PKG/etc/$PRGNAM
+  sed -i "s|^log.dirs=/tmp/kafka-logs$|log.dirs=/var/log/${PRGNAM}|" server.properties.new
+  sed -i "s|@KAFKA_HOME@|/usr/lib$LIBDIRSUFFIX/$PRGNAM|" kafka-env.sh.new
+)
+(
+  cd $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
+  ln -s /etc/kafka config
+)
+chown -R $KAFKA_USER:$KAFKA_GROUP $PKG/etc/$PRGNAM
+
+mkdir -p ${PKG}/etc/rc.d
+install -o root -g root -m 644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.${PRGNAM}.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE NOTICE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kafka/kafka.info b/system/kafka/kafka.info
new file mode 100644
index 0000000000..5a4c0b403c
--- /dev/null
+++ b/system/kafka/kafka.info
@@ -0,0 +1,10 @@
+PRGNAM="kafka"
+VERSION="0.8.2.2"
+HOMEPAGE="http://kafka.apache.org/"
+DOWNLOAD="http://www.us.apache.org/dist/kafka/0.8.2.2/kafka_2.11-0.8.2.2.tgz"
+MD5SUM="90f17dd1a3f91da3a233548c1df07381"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="zookeeper"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
diff --git a/system/kafka/rc.kafka b/system/kafka/rc.kafka
new file mode 100644
index 0000000000..12d74bc8b7
--- /dev/null
+++ b/system/kafka/rc.kafka
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Start/stop/restart Apache Zookeeper daemon
+
+SERVER_CONFIG=(server.properties)
+
+USER=kafka
+kafka_start(){
+  for conf in ${SERVER_CONFIG[@]}; do
+    sudo -u ${USER} sh -c "/usr/bin/kafka-server-start.sh -daemon /etc/kafka/${conf}"
+  done
+}
+
+kafka_stop() {
+  sudo -u ${USER} sh -c "/usr/bin/kafka-server-stop.sh"
+}
+
+kafka_restart() {
+  kafka_start
+  sleep 1
+  kafka_stop
+}
+
+print_usage() {
+  echo "usage $0 start|stop|restart"
+}
+
+case "$1" in
+  'start')
+    kafka_start
+    ;;
+  'stop')
+    kafka_stop
+    ;;
+  'restart')
+    kafka_restart
+    ;;
+  *)
+    print_usage
+    ;;
+esac
diff --git a/system/kafka/slack-desc b/system/kafka/slack-desc
new file mode 100644
index 0000000000..8964ecb7c2
--- /dev/null
+++ b/system/kafka/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+kafka: kafka (A high-throughput distributed messaging system.)
+kafka:
+kafka: Apache Kafka is publish-subscribe messaging rethought as a 
+kafka: distributed commit log.  
+kafka: 
+kafka: Homepage: http://kafka.apache.org/
+kafka: 
+kafka:
+kafka: 
+kafka: 
+kafka:
diff --git a/system/komparator4/komparator4.SlackBuild b/system/komparator4/komparator4.SlackBuild
index 5ce807ed24..cf03ed3e12 100644
--- a/system/komparator4/komparator4.SlackBuild
+++ b/system/komparator4/komparator4.SlackBuild
@@ -7,7 +7,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted..
 
diff --git a/system/lbrate/lbrate.info b/system/lbrate/lbrate.info
index e3c196b484..2befdd3d80 100644
--- a/system/lbrate/lbrate.info
+++ b/system/lbrate/lbrate.info
@@ -1,7 +1,7 @@
 PRGNAM="lbrate"
 VERSION="1.1"
 HOMEPAGE="http://www.svgalib.org/rus/lbrate.html"
-DOWNLOAD="ftp://ftp.ibiblio.org/pub/Linux/utils/compress/lbrate-1.1.tar.gz"
+DOWNLOAD="http://ftp.vim.org/ibiblio/utils/compress/lbrate-1.1.tar.gz"
 MD5SUM="fba13b13be15c65570ca6500f348a811"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/letsencrypt/README b/system/letsencrypt/README
new file mode 100644
index 0000000000..6e439e00c5
--- /dev/null
+++ b/system/letsencrypt/README
@@ -0,0 +1,6 @@
+The Let's Encrypt Client is a tool to automatically receive and
+install X.509 certificates to enable TLS on servers.
+The client will interoperate with the Let's Encrypt CA which will be
+issuing browser-trusted certificates for free.
+
+See README.Slackware for more detailed instructions.
diff --git a/system/letsencrypt/README.Slackware b/system/letsencrypt/README.Slackware
new file mode 100644
index 0000000000..aba3417580
--- /dev/null
+++ b/system/letsencrypt/README.Slackware
@@ -0,0 +1,73 @@
+PLUGIN SUPPORT
+letsencrypt support five plugins to obtain/install certificates and many more to come in the future.
+However, we will only cover standalone plugin because apache plugin only works on Debian-based OS for now
+and nginx is still considered very experimental.
+
+OBTAINING CERTIFICATE USING STANDALONE PLUGIN
+Since Slackware is not yet supported, instead of running "letsencrypt-auto certonly"
+as instructed, you can run "letsencrypt certonly" to install certificates manually using standalone plugin.
+
+Here's what i use to create a certificate using port 443 for domain validation
+letsencrypt certonly --webroot-path=<DOCUMENT-ROOT> --standalone-supported-challenges tls-sni-01 -d <DOMAIN-NAME> \
+--email <ADMIN-EMAIL> --renew-by-default --agree-tos --text --standalone
+
+If you want to use port 80 for domain validation, replace
+--standalone-supported-challenges tls-sni-01
+with
+--standalone-supported-challenges http-01
+
+NOTE:
+You need to make sure that the port (80 or 443) is NOT USED before running above command (ie. you may need to
+temporarily stop your exising webserver)
+All domain-spesific configuration files are stored in /etc/letsencrypt/live/<DOMAIN-NAME>
+
+Once certificate is created, you need to enable and configure httpd-ssl.conf
+
+RENEWAL PROCESS
+Best way is to use a simple bash script that perform following actions:
+- turn off httpd service
+- give some delay (2s is enough)
+- run the above command to renew automatically
+- start httpd service
+
+RATE LIMIT
+Rate limit on registrations per IP is now 10 per 3 hours.
+Rate limit on certificates per Domain is now 5 per 7 days.
+
+CONFIGURATION FILES
+
+It is possible to specify configuration file with letsencrypt --config cli.ini (or shorter -c cli.ini).
+An example configuration file is shown below:
+
+# This is an example of the kind of things you can do in a configuration file.
+# All flags used by the client can be configured here. Run Let's Encrypt with
+# "--help" to learn more about the available options.
+
+# Use a 4096 bit RSA key instead of 2048
+rsa-key-size = 4096
+
+# Always use the staging/testing server
+server = https://acme-staging.api.letsencrypt.org/directory
+
+# Uncomment and update to register with the specified e-mail address
+# email = foo@example.com
+
+# Uncomment and update to generate certificates for the specified
+# domains.
+# domains = example.com, www.example.com
+
+# Uncomment to use a text interface instead of ncurses
+# text = True
+
+# Uncomment to use the standalone authenticator on port 443
+# authenticator = standalone
+# standalone-supported-challenges = tls-sni-01
+
+# Uncomment to use the webroot authenticator. Replace webroot-path with the
+# path to the public_html / webroot folder being served by your web server.
+# authenticator = webroot
+# webroot-path = /usr/share/nginx/html
+
+By default, the following locations are searched:
+/etc/letsencrypt/cli.ini
+$XDG_CONFIG_HOME/letsencrypt/cli.ini (or ~/.config/letsencrypt/cli.ini if $XDG_CONFIG_HOME is not set).
diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild
new file mode 100644
index 0000000000..50ea4d4394
--- /dev/null
+++ b/system/letsencrypt/letsencrypt.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for letsencrypt
+
+# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=letsencrypt
+VERSION=${VERSION:-0.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# install acme-protocol first
+cd acme
+python setup.py install --root=$PKG
+
+# install letsencrypt client
+cd ..
+
+python setup.py install --root=$PKG
+
+# this plugins are not working for Slackware yet, but we will keep it here
+
+# install apache plugin
+#cd letsencrypt-apache
+#python setup.py install --root=$PKG
+
+# install nginx plugin
+#cd ../letsencrypt-nginx
+#python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.rst *.md *.txt *.in $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info
new file mode 100644
index 0000000000..6ce4a154fe
--- /dev/null
+++ b/system/letsencrypt/letsencrypt.info
@@ -0,0 +1,10 @@
+PRGNAM="letsencrypt"
+VERSION="0.2.0"
+HOMEPAGE="https://letsencrypt.org/"
+DOWNLOAD="https://github.com/letsencrypt/letsencrypt/archive/v0.2.0.tar.gz"
+MD5SUM="6838f472ead354b980b0d6a77713fd88"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="configobj mock python-requests pytz python2-pythondialog zope.component pyrfc3339 pyOpenSSL psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python-augeas pyparsing"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/letsencrypt/slack-desc b/system/letsencrypt/slack-desc
new file mode 100644
index 0000000000..87d971c033
--- /dev/null
+++ b/system/letsencrypt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+letsencrypt: letsencrypt (Manage X.509 certificates)
+letsencrypt:
+letsencrypt: The Let's Encrypt Client is a tool to automatically receive and
+letsencrypt: install X.509 certificates to enable TLS on servers.
+letsencrypt: The client will interoperate with the Let's Encrypt CA which will be
+letsencrypt: issuing browser-trusted certificates for free.
+letsencrypt:
+letsencrypt:
+letsencrypt: Project URL: https://letsencrypt.org/
+letsencrypt:
+letsencrypt:
diff --git a/system/lirc/datarootdir.patch b/system/lirc/datarootdir.patch
new file mode 100644
index 0000000000..b20a0c06ce
--- /dev/null
+++ b/system/lirc/datarootdir.patch
@@ -0,0 +1,10 @@
+--- ./lirc-driver.pc.in	2015-10-14 12:23:44.000000000 -0400
++++ ./lirc-driver.pc.in	2015-11-10 00:35:01.894031781 -0500
+@@ -3,6 +3,7 @@
+ Version: @VERSION@
+ 
+ prefix=@prefix@
++datarootdir=@datarootdir@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild
index 2e3a7243c5..05d09ea0d5 100644
--- a/system/lirc/lirc.SlackBuild
+++ b/system/lirc/lirc.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for lirc
 
 # Copyright 2009  Murat D. Kadirov <banderols@gmail.com>
+# Copyright 2015  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#  Modified for 0.9.3a by Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+
 PRGNAM=lirc
-VERSION=${VERSION:-0.9.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.9.3a}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
@@ -72,8 +75,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch for recent kernels, thanks Gentoo
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
+# Patch to fix config.status warning for lirc-driver.pc.in ignoring --datarootdir
+patch -p1 < $CWD/datarootdir.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,21 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-sandboxed \
-  --with-driver=all \
-  --with-transmitter \
   --build=$ARCH-slackware-linux
 
-# Disable parallel and bt829 because of incompatibility with smp systems
-sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \
-     Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
-
 make -j1
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -a remotes $PKG/usr/share/$PRGNAM
-
 mkdir -p $PKG/lib/udev/rules.d
 cat contrib/lirc.rules > $PKG/lib/udev/rules.d/96-lirc.rules
 
@@ -117,8 +110,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 rm -f $PKG/usr/man/man1/smode2.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ANNOUNCE AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  doc/{html,irxevent.keys,lirc.hwdb} $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  doc/{html,irxevent.keys} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info
index af47fe0410..4b5767ee9b 100644
--- a/system/lirc/lirc.info
+++ b/system/lirc/lirc.info
@@ -1,10 +1,10 @@
 PRGNAM="lirc"
-VERSION="0.9.0"
+VERSION="0.9.3a"
 HOMEPAGE="http://www.lirc.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.0/lirc-0.9.0.tar.bz2"
-MD5SUM="b232aef26f23fe33ea8305d276637086"
+DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a.tar.bz2"
+MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Murat D. Kadirov"
-EMAIL="banderols@gmail.com"
+REQUIRES="python3-PyYAML"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo -at- gmail.com"
diff --git a/system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch b/system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch
deleted file mode 100644
index 32edb244b4..0000000000
--- a/system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:04:39.000000000 -0400
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:19:06.000000000 -0400
-@@ -1050,7 +1050,11 @@
- 		goto new_irctl_failure_check;
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
- 	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+#else
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
-+#endif
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
diff --git a/system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch b/system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch
deleted file mode 100644
index 624737090b..0000000000
--- a/system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -u a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -48,7 +48,9 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- #include <linux/smp_lock.h>
-+#endif
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -u a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c
---- a/drivers/lirc_i2c/lirc_i2c.c
-+++ b/drivers/lirc_i2c/lirc_i2c.c
-@@ -555,8 +555,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -u a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -361,14 +361,22 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 		next_one = generic_find_next_le_bit(ldata, size, 0);
-+#else
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
-+#endif
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 			next_zero = generic_find_next_zero_le_bit(ldata,
-+#else
-+			next_zero = find_next_zero_bit_le(ldata,
-+#endif
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +384,11 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs)
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- 				next_one = generic_find_next_le_bit(ldata,
-+#else
-+				next_one = find_next_bit_le(ldata,
-+#endif
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
--- 
-1.7.5.4
diff --git a/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch b/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch
deleted file mode 100644
index 80b87d27ab..0000000000
--- a/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur a/drivers/lirc_serial/lirc_serial.c a/drivers.new/lirc_serial/lirc_serial.c
---- a/drivers/lirc_serial/lirc_serial.c	2011-03-25 18:28:18.000000000 -0400
-+++ a/drivers.new/lirc_serial/lirc_serial.c	2012-10-24 14:32:14.000000000 -0400
-@@ -66,7 +66,12 @@
- #include <linux/poll.h>
- #include <linux/platform_device.h>
- 
-+#include "drivers/kcompat.h"
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
-+#include <asm/switch_to.h>
-+#else
- #include <asm/system.h>
-+#endif
- #include <linux/io.h>
- #include <linux/irq.h>
- #include <linux/fcntl.h>
-@@ -80,7 +85,6 @@
- #define UART_IE_IXP42X_UUE   0x40 /* IXP42X UART Unit enable */
- #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */
- 
--#include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
- #include <media/lirc.h>
- #include <media/lirc_dev.h>
-diff -ur a/drivers/lirc_sir/lirc_sir.c a/drivers.new/lirc_sir/lirc_sir.c
---- a/drivers/lirc_sir/lirc_sir.c	2011-03-25 18:28:18.000000000 -0400
-+++ a/drivers.new/lirc_sir/lirc_sir.c	2012-10-24 14:32:46.000000000 -0400
-@@ -59,7 +59,14 @@
- #include <linux/mm.h>
- #include <linux/delay.h>
- #include <linux/poll.h>
-+
-+#include "drivers/kcompat.h"
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
-+#include <asm/switch_to.h>
-+#else
- #include <asm/system.h>
-+#endif
-+
- #include <linux/io.h>
- #include <asm/irq.h>
- #include <linux/fcntl.h>
-@@ -74,7 +81,6 @@
- 
- #include <linux/timer.h>
- 
--#include "drivers/kcompat.h"
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
- #include <media/lirc.h>
- #include <media/lirc_dev.h>
diff --git a/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch b/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch
deleted file mode 100644
index b06d94efb3..0000000000
--- a/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/kcompat.h	2011-03-25 18:28:18.000000000 -0400
-+++ b/drivers/kcompat.h	2012-11-27 13:37:55.000000000 -0500
-@@ -136,4 +136,9 @@
- )
- #endif
- 
-+#ifndef err
-+#define err(format, arg...)                                     \
-+	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
-+#endif
-+
- #endif /* _KCOMPAT_H */
diff --git a/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch b/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch
deleted file mode 100644
index bd11b61c19..0000000000
--- a/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c
---- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-05-24 11:58:31.017566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c	2013-05-24 12:00:38.733568898 -0400
-@@ -1107,12 +1107,12 @@
- 
- static struct platform_device *lirc_serial_dev;
- 
--static int __devinit lirc_serial_probe(struct platform_device *dev)
-+static int lirc_serial_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_serial_remove(struct platform_device *dev)
-+static int lirc_serial_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
-@@ -1163,7 +1163,7 @@
- 
- static struct platform_driver lirc_serial_driver = {
- 	.probe		= lirc_serial_probe,
--	.remove		= __devexit_p(lirc_serial_remove),
-+	.remove      = lirc_serial_remove, 
- 	.suspend	= lirc_serial_suspend,
- 	.resume		= lirc_serial_resume,
- 	.driver		= {
-diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c
---- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-05-24 11:58:31.017566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c	2013-05-24 12:00:38.733568898 -0400
-@@ -1296,19 +1296,19 @@
- 	return 0;
- }
- 
--static int __devinit lirc_sir_probe(struct platform_device *dev)
-+static int lirc_sir_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_sir_remove(struct platform_device *dev)
-+static int lirc_sir_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
- static struct platform_driver lirc_sir_driver = {
- 	.probe		= lirc_sir_probe,
--	.remove		= __devexit_p(lirc_sir_remove),
-+	.remove      = lirc_sir_remove, 
- 	.driver		=	{
- 		.name	= "lirc_sir",
- 		.owner	= THIS_MODULE,
-diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 11:58:30.974566567 -0400
-+++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 12:00:38.734568898 -0400
-@@ -942,12 +942,12 @@
- #ifdef MODULE
- static struct platform_device *lirc_wpc8769l_platform_dev;
- 
--static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
-+static int lirc_wpc8769l_probe(struct platform_device *dev) 
- {
- 	return 0;
- }
- 
--static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
-+static int lirc_wpc8769l_remove(struct platform_device *dev) 
- {
- 	return 0;
- }
-@@ -975,7 +975,7 @@
- 
- static struct platform_driver lirc_wpc8769l_platform_driver = {
- 	.probe		= lirc_wpc8769l_probe,
--	.remove		= __devexit_p(lirc_wpc8769l_remove),
-+	.remove      = lirc_wpc8769l_remove, 
- 	.suspend	= lirc_wpc8769l_suspend,
- 	.resume		= lirc_wpc8769l_resume,
- 	.driver		= {
diff --git a/system/logtool/README b/system/logtool/README
new file mode 100644
index 0000000000..5a24f3c387
--- /dev/null
+++ b/system/logtool/README
@@ -0,0 +1,13 @@
+logtool (log analyzer)
+
+Logtool is a command line program that will parse ASCII logfiles into
+a more palatable format.  It will take anything resembling a syslog 
+or multilog file (this includes syslog-ng, and probably most of the 
+other variants out there), and crunch it into one of the following 
+formats for your viewing pleasure: 
+
+ * ANSI (colorized for easy "at a glance" viewing) 
+ * ASCII (for e-mail'ed reports, and term's that don't support color) 
+ * CSV (for importing into your favorite spreadsheet/database) 
+ * HTML (for generating web pages) 
+ * RAW (for no good reason)
diff --git a/system/logtool/logtool.SlackBuild b/system/logtool/logtool.SlackBuild
new file mode 100644
index 0000000000..7c14c06b94
--- /dev/null
+++ b/system/logtool/logtool.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+#
+# Slackware build script for logtool.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=logtool
+VERSION=${VERSION:-1.2.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+rm -rf debian
+gzip -dc $CWD/logtool_1.2.8-8.diff.gz | patch -p1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/logtool \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCS="CHANGES-1.2 CHANGES.history COPYING CREDITS INSTALL README TODO USAGE"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/logtool/logtool.info b/system/logtool/logtool.info
new file mode 100644
index 0000000000..795b7eaa32
--- /dev/null
+++ b/system/logtool/logtool.info
@@ -0,0 +1,10 @@
+PRGNAM="logtool"
+VERSION="1.2.8"
+HOMEPAGE="http://xjack.org/logtool/"
+DOWNLOAD="http://xjack.org/logtool/download/logtool-1.2.8.tar.gz"
+MD5SUM="f596fd2057fe5f3293ca054dd14a3c10"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/logtool/logtool_1.2.8-8.diff.gz b/system/logtool/logtool_1.2.8-8.diff.gz
new file mode 100644
index 0000000000..3dcc3d286b
--- /dev/null
+++ b/system/logtool/logtool_1.2.8-8.diff.gz
diff --git a/system/logtool/slack-desc b/system/logtool/slack-desc
new file mode 100644
index 0000000000..6555a1d61c
--- /dev/null
+++ b/system/logtool/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+logtool: logtool (log analyzer)
+logtool:
+logtool: Logtool is a command line program that will parse ASCII logfiles into
+logtool: a more palatable format.
+logtool:
+logtool: Homepage: http://xjack.org/logtool/
+logtool:
+logtool:
+logtool:
+logtool:
+logtool:
diff --git a/system/luckybackup/luckybackup-gksu.desktop b/system/luckybackup/luckybackup-gksu.desktop
new file mode 100644
index 0000000000..124fcc49a0
--- /dev/null
+++ b/system/luckybackup/luckybackup-gksu.desktop
@@ -0,0 +1,62 @@
+[Desktop Entry]
+Name=luckyBackup (super user)
+Name[en]=luckyBackup (super user)
+Name[en_US]=luckyBackup (super user)
+Name[ara]=luckyBackup (الرووت)
+Name[ca]=luckyBackup (superusuari)
+Name[cs]=luckyBackup (Super uživatel)
+Name[de]=luckyBackup (super user)
+Name[el]=luckyBackup (υπε�χ�ήστης)
+Name[es]=luckyBackup (super user)
+Name[fr]=luckyBackup (super user)
+Name[it]=luckyBackup (super utente)
+Name[nl]=luckyBackup (super user)
+Name[pt_BR]=luckyBackup (super usuário)
+Name[ro]=luckyBackup (administrator)
+Name[ru]=luckyBackup (super user)
+Name[sl]=luckyBackup (super uporabnik)
+Name[sv]=luckyBackup (superanvändare)
+Name[tr]=luckyBackup (süper kullanıcı)
+GenericName=Backup & Sync tool
+GenericName[en]=Backup & Sync tool
+GenericName[en_US]=Backup & Sync tool
+GenericName[ara]=أداة ح�ظ ومزامنة
+GenericName[ca]=Eina de còpia de seguretat i sincronització
+GenericName[cs]=Zálohovací a seřizovací nástroj
+GenericName[de]=Sicherungs & Synchronisations Werkzeug
+GenericName[el]=Ε�γαλείο αντιγ�άφων ασφαλείας & συγχ�ονισμο�
+GenericName[es]=Herramienta de copias de seguridad y sincronizado
+GenericName[fr]=Backup & Sync tool
+GenericName[it]=Strumento di Backup & Sincronizzazione
+GenericName[nl]=Backup & Synchronisatie gereedschap
+GenericName[pt_BR]=Ferramente de Backup & Sincronização
+GenericName[ro]=Aplicatie de arhivare si sincronizare
+GenericName[ru]=Backup & Sync tool
+GenericName[sl]=Orodje za varnostne kopije in usklajevanje
+GenericName[sv]=Verktyg för säkerhetskopiering och synkronisering
+GenericName[tr]=Yedekleme & Şipşaklama aracı
+Comment=Backup & sync your data with the power of rsync
+Comment[en]=Backup & sync your data with the power of rsync
+Comment[en_US]=Backup & sync your data with the power of rsync
+Comment[ara]=اح�ظ وزامن بياناتك مستخدماً قوة rsync
+Comment[ca]=Crear còpia de seguretat i sincronitzar dades amb el poder de rsync
+Comment[cs]=Zálohujte a seřizujte svá data pomocí síly nástroje rsync
+Comment[de]=Sichere & Synchronisiere mit der Kraft von rsync
+Comment[el]=Αντίγ�αφα ασφαλείας & συγχ�ονισμός δεδομένων με τη δ�ναμη του rsync
+Comment[es]=Haz copias de seguridad y sincroniza tus archivos con el poder de rsync
+Comment[fr]=Backup & sync your data with the power of rsync
+Comment[it]=Effettua il backup e sincronizza i tuoi dati col potere di rsync
+Comment[nl]=Backup & synchroniseer uw data met de kracht van rsync
+Comment[pt_BR]=Backup & sincronize seus dados com o poder do rsync
+Comment[ro]=Arhiveaza si sincronizeaza datele utilizand puterea utilitarului rsync
+Comment[ru]=Backup & sync your data with the power of rsync
+Comment[sl]=Ustvarjanje varnostnih kopij in usklajevanje z uporabo rsync
+Comment[sv]=Säkerhetskopiera och synkronisera din data med hjälp av rsync
+Comment[tr]=rsync gücüyle verinizi yedekleyin & şipşaklayın
+Exec=/usr/bin/gksu -w /usr/bin/luckybackup
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/luckybackup.png
+StartupNotify=true
+Categories=KDE;Qt;System;
+NotShowIn=GNOME;KDE;
diff --git a/system/luckybackup/luckybackup.SlackBuild b/system/luckybackup/luckybackup.SlackBuild
index 21883ef63e..630eff5bd6 100644
--- a/system/luckybackup/luckybackup.SlackBuild
+++ b/system/luckybackup/luckybackup.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for luckybackup
 
-#   Copyright by titopoquito (titopoquito@gmail.com)
+#   Copyright by titopoquito (titopoquito@gmail.com), rob van nues (rvnues@tesco.net)
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
 #   the above copyright notice and this permission notice appear in all
@@ -22,10 +22,18 @@
 #   SUCH DAMAGE.
 
 PRGNAM=luckybackup
-VERSION=${VERSION:-0.4.7}
+VERSION=${VERSION:-0.4.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+#  Luckybackup comes with two .desktop files that allow super-user rights by using a login dialog.
+#  On KDE kdesu is used and for GNOME a 'set-to-root' script is called that is specific for Debian/Ubuntu.
+#  The 'set-to-root' script is not present on Slackware and results in an error message, say when run from XFCE.
+#  Therefore, this build script omits the luckybackup-gnome-su.desktop file from the created package:
+NOGNOME=true # change to false if used with GNOME 'set-to-root'
+#  For systems not running KDE and lacking kdesu, a gksu-version is added:
+ADDGKSU=true # change to false if gksu is not used (on non-KDE systems)
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -63,12 +71,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# luckybackup source contains a qmake project file with some
+# luckybackup source contains a qmake (Qt4) project file with some
 # folders hardwired. Let's change them to the Slackware defaults:
 patch -p0 < $CWD/luckybackup.pro.patch
 sed -i "s/PROGVERSION/$VERSION/" ./luckybackup.pro
@@ -84,7 +92,7 @@ make install INSTALL_ROOT=$PKG
 # We don't need this
 rm -rf $PKG/usr/share/menu
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -95,5 +103,15 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+#remove the gnome .desktop file, it calls for a 'su-to-root' script specific for Debian/Ubuntu
+if [ $NOGNOME = true ]; then
+   rm $PKG/usr/share/applications/luckybackup-gnome-su.desktop
+fi
+
+#add a .desktop file to be used with gksu
+if [ $ADDGKSU = true ]; then
+   cat $CWD/luckybackup-gksu.desktop > $PKG/usr/share/applications/luckybackup-gksu.desktop
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/luckybackup/luckybackup.info b/system/luckybackup/luckybackup.info
index 5c2faf90f8..7c98f6d8c3 100644
--- a/system/luckybackup/luckybackup.info
+++ b/system/luckybackup/luckybackup.info
@@ -1,10 +1,10 @@
 PRGNAM="luckybackup"
-VERSION="0.4.7"
+VERSION="0.4.8"
 HOMEPAGE="http://luckybackup.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/luckybackup/luckybackup-0.4.7.tar.gz"
-MD5SUM="ca8d1699f98fe85b0811fb7447064339"
+DOWNLOAD="http://downloads.sourceforge.net/luckybackup/luckybackup-0.4.8.tar.gz"
+MD5SUM="f6dcf502c2f11b5d44837189bf00ee01"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="titopoquito"
-EMAIL="titopoquito@gmail.com"
+MAINTAINER="rob van nues"
+EMAIL="rvnues@tesco.net"
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild
index bfeee5bfed..6400585572 100644
--- a/system/lxdm/lxdm.SlackBuild
+++ b/system/lxdm/lxdm.SlackBuild
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lxdm
-VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.5.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -120,12 +120,20 @@ for file in LoginReady PostLogin PostLogout PreLogin PreReboot PreShutdown lxdm.
   mv $PKG/etc/lxdm/$file $PKG/etc/lxdm/$file.new ;
 done
 
+# Look for language defaults were we usually store 'em
+cat << "EOF" > $PKG/usr/sbin/lxdm
+#!/bin/sh
+. /etc/profile.d/lang.sh
+export LANG
+exec /usr/sbin/lxdm-binary $*
+EOF
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  AUTHORS COPYING INSTALL README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
diff --git a/system/lxdm/lxdm.info b/system/lxdm/lxdm.info
index 597b823543..383e3d27ca 100644
--- a/system/lxdm/lxdm.info
+++ b/system/lxdm/lxdm.info
@@ -1,8 +1,8 @@
 PRGNAM="lxdm"
-VERSION="0.5.1"
+VERSION="0.5.3"
 HOMEPAGE="http://lxde.org/"
-DOWNLOAD="http://downloads.sf.net/lxdm/lxdm-0.5.1.tar.xz"
-MD5SUM="9e03ce5f6d303bc9b689732401934dc6"
+DOWNLOAD="http://downloads.sf.net/lxdm/lxdm-0.5.3.tar.xz"
+MD5SUM="061caae432634e6db38bbdc84bc6ffa0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lz4/README b/system/lz4/README
new file mode 100644
index 0000000000..f97be58647
--- /dev/null
+++ b/system/lz4/README
@@ -0,0 +1,9 @@
+lz4 (compression algorithm)
+
+LZ4 is lossless compression algorithm, providing compression speed at
+400 MB/s per core (0.16 Bytes/cycle). It also features an extremely fast
+decoder, with speed in multiple GB/s per core (0.71 Bytes/cycle). A high
+compression derivative, called LZ4_HC, is also provided. It trades CPU
+time for compression ratio.
+
+This build includes liblz4 and the command-line lz4 tools.
diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild
new file mode 100644
index 0000000000..3d93faf593
--- /dev/null
+++ b/system/lz4/lz4.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for lz4
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=lz4
+VERSION=${VERSION:-r131}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make \
+  CFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  LIBDIR=/usr/lib$LIBDIRSUFFIX \
+  MANDIR=/usr/man/man1 \
+  DESTDIR=$PKG \
+  lib lz4programs install
+
+# Don't ship the static lib.
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.a
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $DOCDIR
+cp -a NEWS README* examples $DOCDIR
+
+# the library is BSD licensed, but the programs are GPL.
+cat programs/COPYING > $DOCDIR/LICENSE.programs.txt
+cat lib/LICENSE > $DOCDIR/LICENSE.lib.txt
+
+cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lz4/lz4.info b/system/lz4/lz4.info
new file mode 100644
index 0000000000..cbda65d364
--- /dev/null
+++ b/system/lz4/lz4.info
@@ -0,0 +1,10 @@
+PRGNAM="lz4"
+VERSION="r131"
+HOMEPAGE="http://cyan4973.github.io/lz4/"
+DOWNLOAD="https://github.com/Cyan4973/lz4/archive/r131.tar.gz"
+MD5SUM="42b09fab42331da9d3fb33bd5c560de9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/lz4/slack-desc b/system/lz4/slack-desc
new file mode 100644
index 0000000000..b9c624ad7d
--- /dev/null
+++ b/system/lz4/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+lz4: lz4 (compression algorithm)
+lz4:
+lz4: LZ4 is lossless compression algorithm, providing compression
+lz4: speed at 400 MB/s per core (0.16 Bytes/cycle). It also features
+lz4: an extremely fast decoder, with speed in multiple GB/s per core
+lz4: (0.71 Bytes/cycle). A high compression derivative, called LZ4_HC,
+lz4: is also provided. It trades CPU time for compression ratio.
+lz4:
+lz4:
+lz4:
+lz4:
diff --git a/system/maintboot/README b/system/maintboot/README
new file mode 100644
index 0000000000..c7a6277877
--- /dev/null
+++ b/system/maintboot/README
@@ -0,0 +1,13 @@
+# maintboot
+
+maintboot runs commands outside of the current OS,
+with exclusive access to the system and hardware.
+
+This can be useful to run maintenance tasks,
+like repartitioning, in a controlled environment.
+
+Maintboot builds an appliance on the fly from a list
+of packages (using supermin).
+It then loads the appliance with kexec, bypassing
+the bios, and runs the maintenance script in that
+new context.
diff --git a/system/maintboot/maintboot.SlackBuild b/system/maintboot/maintboot.SlackBuild
new file mode 100644
index 0000000000..403e527b7f
--- /dev/null
+++ b/system/maintboot/maintboot.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for maintboot
+
+# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=maintboot
+VERSION=${VERSION:-0.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+if [ -r $CWD/v$VERSION.tar.gz ]; then
+  mv $CWD/v$VERSION.tar.gz $CWD/$PRGNAM-$VERSION.tar.gz
+fi
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/maintboot/maintboot.info b/system/maintboot/maintboot.info
new file mode 100644
index 0000000000..09d03779e5
--- /dev/null
+++ b/system/maintboot/maintboot.info
@@ -0,0 +1,10 @@
+PRGNAM="maintboot"
+VERSION="0.1.0"
+HOMEPAGE="https://github.com/g2p/maintboot"
+DOWNLOAD="https://github.com/g2p/maintboot/archive/v0.1.0.tar.gz"
+MD5SUM="6c58f3cd4cc944c22cb0c03054c132e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3"
+MAINTAINER="Nikos Giotis"
+EMAIL="nikos.giotis@gmail.com"
diff --git a/system/maintboot/slack-desc b/system/maintboot/slack-desc
new file mode 100644
index 0000000000..b0a1c74964
--- /dev/null
+++ b/system/maintboot/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+maintboot: maintboot (runs commands outside of the current OS)
+maintboot:
+maintboot: maintboot runs commands outside of the current OS, with exclusive
+maintboot: access to the system and hardware. This can be useful to run
+maintboot: maintenance tasks, like repartitioning, in a controlled environment.
+maintboot: Maintboot builds an appliance on the fly from a list of packages
+maintboot: (using supermin). It then loads the appliance with kexec, bypassing
+maintboot: the bios, and runs the maintenance script in that new context.
+maintboot:
+maintboot: Author: Gabriel de Perthuis
+maintboot: Website: https://github.com/g2p/maintboot
diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild
index acfb405f3f..8ed7d8b496 100644
--- a/system/man-db/man-db.SlackBuild
+++ b/system/man-db/man-db.SlackBuild
@@ -17,7 +17,7 @@
 # - update README and README.Slackware slightly.
 
 PRGNAM=man-db
-VERSION=${VERSION:-2.7.1}
+VERSION=${VERSION:-2.7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,7 +74,7 @@ mkdir -p $TMP $PKG $OUTPUT
 # Instead of making it a separate build and external dep, we'll just
 # bundle it here.
 LIBNAM=libpipeline
-LIBVER=1.4.0
+LIBVER=1.4.1
 
 cd $TMP
 rm -rf $LIBNAM-$LIBVER
@@ -121,6 +121,7 @@ find -L . \
 # libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline"
 # gets broken by libtool (it *insists* on replacing -lpipeline with
 # /usr/lib64/libpipeline.so, which will fail if it's an older version).
+LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX" \
 LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
 libpipeline_CFLAGS="-I$PKG/usr/include" \
 libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info
index b16e777ba4..c8ecd0808b 100644
--- a/system/man-db/man-db.info
+++ b/system/man-db/man-db.info
@@ -1,10 +1,10 @@
 PRGNAM="man-db"
-VERSION="2.7.1"
+VERSION="2.7.3"
 HOMEPAGE="http://www.nongnu.org/man-db/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.7.1.tar.xz \
-          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.4.0.tar.gz"
-MD5SUM="88d32360e2ed18e05de9b528ad336fd8 \
-        660f4ac9340834a231d1516746d03d28"
+DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.7.3.tar.xz \
+          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.4.1.tar.gz"
+MD5SUM="df898c82d766dad6492a5a96d5a26647 \
+        e54590ec68d6c1239f67b5b44e92022c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/man-pages-ja/man-pages-ja.SlackBuild b/system/man-pages-ja/man-pages-ja.SlackBuild
index 07b5707d75..62af38eb26 100644
--- a/system/man-pages-ja/man-pages-ja.SlackBuild
+++ b/system/man-pages-ja/man-pages-ja.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=man-pages-ja
-VERSION=${VERSION:-20150415}
+VERSION=${VERSION:-20150815}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/man-pages-ja/man-pages-ja.info b/system/man-pages-ja/man-pages-ja.info
index fa1e924380..227a9b2ab9 100644
--- a/system/man-pages-ja/man-pages-ja.info
+++ b/system/man-pages-ja/man-pages-ja.info
@@ -1,8 +1,8 @@
 PRGNAM="man-pages-ja"
-VERSION="20150415"
+VERSION="20150815"
 HOMEPAGE="http://linuxjm.sourceforge.jp/"
-DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20150415.tar.gz"
-MD5SUM="8c3e2cd683675c5a70a75f0361c8f6c5"
+DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20150815.tar.gz"
+MD5SUM="e07c48b75aec8eeb608be0faba4e54c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="man-db"
diff --git a/system/mdocml/README b/system/mdocml/README
index 40c03d56a4..4b350fe9fb 100644
--- a/system/mdocml/README
+++ b/system/mdocml/README
@@ -8,3 +8,13 @@ XHTML, HTML, PostScript, and PDF. It also includes preconv, for recoding
 multibyte manuals; demandoc, for emitting only text parts of manuals; mandocdb,
 for indexing manuals; and apropos, whatis, and man.cgi (via catman) for
 semantic search of manual content.
+
+There is an environment variable called REPLACE_MAN, that if set to a non-empty
+string, will instruct the slackbuild script to replace the stock man package
+(you should remove(pkg) it first, though).
+
+After installing, make sure to (re)create the mandoc specific "whatis"
+database(s) in your manpath(s), eg.:
+# mandocdb /usr/man /usr/local/man
+... or, if you've chosen to replace man, then:
+# makewhatis /usr/man /usr/local/man
diff --git a/system/mdocml/configure-noconflict.local.gz b/system/mdocml/configure-noconflict.local.gz
new file mode 100644
index 0000000000..4a3d54b308
--- /dev/null
+++ b/system/mdocml/configure-noconflict.local.gz
diff --git a/system/mdocml/configure-replace.local.gz b/system/mdocml/configure-replace.local.gz
new file mode 100644
index 0000000000..9fb0515791
--- /dev/null
+++ b/system/mdocml/configure-replace.local.gz
diff --git a/system/mdocml/mansearch_c-regcomp_compat.diff.gz b/system/mdocml/mansearch_c-regcomp_compat.diff.gz
new file mode 100644
index 0000000000..49dc506d71
--- /dev/null
+++ b/system/mdocml/mansearch_c-regcomp_compat.diff.gz
diff --git a/system/mdocml/mdocml.SlackBuild b/system/mdocml/mdocml.SlackBuild
index be2904fee5..db389491b4 100644
--- a/system/mdocml/mdocml.SlackBuild
+++ b/system/mdocml/mdocml.SlackBuild
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mdocml
-VERSION=${VERSION:-1.13.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.13.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,31 +70,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# XXX We can get back to "Slackware Linux" for OSNAME with 1.13.2
-CFLAGS=$SLKCFLAGS' -DOSNAME="\"Slackware\""' \
+if [ -z "${REPLACE_MAN}" ];then
+	gzip -dc "${CWD}"/configure-noconflict.local.gz >./configure.local
+else
+	gzip -dc "${CWD}"/configure-replace.local.gz >./configure.local
+fi
+zcat "${CWD}"/mansearch_c-regcomp_compat.diff.gz |patch -p0
+./configure
+CFLAGS=$SLKCFLAGS \
 	make
-make install DESTDIR=$PKG PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX}/mdocml
-
-mkdir -m755 -p $PKG/etc/
-install -m 644 -o root -g root $CWD/mandoc.conf.new $PKG/etc/
-
-# don't conflict with stock man
-mv $PKG/usr/sbin/makewhatis $PKG/usr/sbin/makewhatis-mdocml
-mv $PKG/usr/man/man8/makewhatis.8 $PKG/usr/man/man8/makewhatis-mdocml.8
-mv $PKG/usr/bin/whatis $PKG/usr/bin/whatis-mdocml
-mv $PKG/usr/man/man1/whatis.1 $PKG/usr/man/man1/whatis-mdocml.1
-mv $PKG/usr/bin/apropos $PKG/usr/bin/apropos-mdocml
-rm -f $PKG/usr/man/man1/apropos.1
-ln -s whatis-mdocml.1 $PKG/usr/man/man1/apropos-mdocml.1
-
-# don't conflict with stock groff
-mv $PKG/usr/bin/preconv $PKG/usr/bin/preconv-mdocml
-mv $PKG/usr/man/man1/preconv.1 $PKG/usr/man/man1/preconv-mdocml.1
-mv $PKG/usr/man/man7/man.7 $PKG/usr/man/man7/man-mdocml.7
-mv $PKG/usr/man/man7/mdoc.7 $PKG/usr/man/man7/mdoc-mdocml.7
-mv $PKG/usr/man/man7/roff.7 $PKG/usr/man/man7/roff-mdocml.7
-mv $PKG/usr/man/man7/tbl.7 $PKG/usr/man/man7/tbl-mdocml.7
-mv $PKG/usr/man/man7/eqn.7 $PKG/usr/man/man7/eqn-mdocml.7
+make install \
+	DESTDIR=$PKG \
+	PREFIX=/usr \
+	LIBDIR=/usr/lib${LIBDIRSUFFIX}
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -108,7 +96,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mdocml/mdocml.info b/system/mdocml/mdocml.info
index e30c7eee9e..ce44097ded 100644
--- a/system/mdocml/mdocml.info
+++ b/system/mdocml/mdocml.info
@@ -1,8 +1,8 @@
 PRGNAM="mdocml"
-VERSION="1.13.1"
+VERSION="1.13.3"
 HOMEPAGE="http://mdocml.bsd.lv/"
-DOWNLOAD="http://mdocml.bsd.lv/snapshots/mdocml-1.13.1.tar.gz"
-MD5SUM="8f9c366a95a568026f14eab45f3dfa9b"
+DOWNLOAD="http://mdocml.bsd.lv/snapshots/mdocml-1.13.3.tar.gz"
+MD5SUM="7be80e1116a11abe2aabd6b2f04434ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index 76d4407a5b..0393a606ab 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -26,7 +26,7 @@
 # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=mksh
-VERSION=${VERSION:-R51}
+VERSION=${VERSION:-R52}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index b13e54d4f6..966a7d2b3c 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,8 +1,8 @@
 PRGNAM="mksh"
-VERSION="R51"
+VERSION="R52"
 HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R51.tgz"
-MD5SUM="8e522475da795c60f35a6f8035481baf"
+DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R52.tgz"
+MD5SUM="cd5b92fc2e455d33cbd59f3e7518f257"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mlterm/mlterm.SlackBuild b/system/mlterm/mlterm.SlackBuild
index 5cf41d2ecb..9174338dfa 100644
--- a/system/mlterm/mlterm.SlackBuild
+++ b/system/mlterm/mlterm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mlterm
 
-# Copyright 2014-2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mlterm
-VERSION=${VERSION:-3.5.0}
+VERSION=${VERSION:-3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/mlterm/mlterm.info b/system/mlterm/mlterm.info
index ae94694e47..69732c579f 100644
--- a/system/mlterm/mlterm.info
+++ b/system/mlterm/mlterm.info
@@ -1,8 +1,8 @@
 PRGNAM="mlterm"
-VERSION="3.5.0"
+VERSION="3.6.1"
 HOMEPAGE="http://mlterm.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/mlterm/01release/mlterm-3.5.0/mlterm-3.5.0.tar.gz"
-MD5SUM="cab773e2be8042f1222112335b890259"
+DOWNLOAD="http://downloads.sourceforge.net/project/mlterm/01release/mlterm-3.6.1/mlterm-3.6.1.tar.gz"
+MD5SUM="1fd1ea0ed3ba2b28552e9cf0f132fbce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mlterm/slack-desc b/system/mlterm/slack-desc
index d9f0e5eaac..1f29c2e42b 100644
--- a/system/mlterm/slack-desc
+++ b/system/mlterm/slack-desc
@@ -11,9 +11,9 @@ mlterm:
 mlterm: mlterm is a multi-lingual terminal emulator , which supports
 mlterm: various character sets and encodings in the world.
 mlterm:
+mlterm: Homepage : http://mlterm.sourceforge.net
 mlterm:
 mlterm:
 mlterm:
 mlterm:
-mlterm: Homepage : http://mlterm.sourceforge.net
 mlterm:
diff --git a/system/modules/README b/system/modules/README
new file mode 100644
index 0000000000..4d2fe0c65e
--- /dev/null
+++ b/system/modules/README
@@ -0,0 +1,9 @@
+The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles.
+
+Each modulefile contains the information needed to configure the shell for an application.
+Once the Modules package is initialized, the environment can be modified on a per-module basis
+using the module command which interprets modulefiles. Typically modulefiles instruct the module command to
+alter or set shell environment variables such as PATH, MANPATH, etc. modulefiles may be shared by many users
+on a system and users may have their own collection to supplement or replace the shared modulefiles.
+Modules are useful in managing different versions of applications. Modules can also be bundled into
+metamodules that will load an entire suite of different applications.
diff --git a/system/modules/modules.SlackBuild b/system/modules/modules.SlackBuild
new file mode 100644
index 0000000000..67e7710075
--- /dev/null
+++ b/system/modules/modules.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/sh
+#
+# Slackware build script for Modules
+#
+# Copyright 2015 Emmanuel N. Millán, Mendoza, Argentina.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=modules
+VERSION=${VERSION:-3.2.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+DOCS="ChangeLog INSTALL LICENSE.GPL NEWS README"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS -DUSE_INTERP_ERRORLINE" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr/share \
+  --mandir=/usr/man/ \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/etc/profile.d/
+cp $PKG/usr/share/Modules/$VERSION/init/bash $PKG/etc/profile.d/modules.sh
+cp $PKG/usr/share/Modules/$VERSION/init/csh $PKG/etc/profile.d/modules.csh
+cp $PKG/usr/share/Modules/$VERSION/init/zsh $PKG/etc/profile.d/modules.zsh
+chmod a+x $PKG/etc/profile.d/*
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/modules/modules.info b/system/modules/modules.info
new file mode 100644
index 0000000000..7c38f773d9
--- /dev/null
+++ b/system/modules/modules.info
@@ -0,0 +1,10 @@
+PRGNAM="modules"
+VERSION="3.2.10"
+HOMEPAGE="http://modules.sourceforge.net/"
+DOWNLOAD="http://downloads.sourceforge.net/project/modules/Modules/modules-3.2.10/modules-3.2.10.tar.bz2"
+MD5SUM="7db43a0e272574219d68bd2a2683f25f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Emmanuel N. Millán"
+EMAIL="emmanueln@gmail.com"
diff --git a/system/modules/slack-desc b/system/modules/slack-desc
new file mode 100644
index 0000000000..e89f048dba
--- /dev/null
+++ b/system/modules/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+modules: modules (dynamic modification of a user's environment)
+modules:
+modules: Each modulefile contains the information needed to configure the
+modules: shell for an application. Typically modulefiles instruct the module
+modules: command to alter or set shell environment variables such as PATH,
+modules: MANPATH, etc. Modules are useful in managing different versions of
+modules: applications. Modules can also be bundled into metamodules that will
+modules: load an entire suite of different applications.
+modules:
+modules:
+modules: http://modules.sourceforge.net/
diff --git a/system/mongo-tools/mongo-tools.SlackBuild b/system/mongo-tools/mongo-tools.SlackBuild
index f6c188d6f7..6af19b1208 100644
--- a/system/mongo-tools/mongo-tools.SlackBuild
+++ b/system/mongo-tools/mongo-tools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mongo-tools
-VERSION=${VERSION:-3.1.4}
+VERSION=${VERSION:-3.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 ARCHIVE=r${VERSION}
diff --git a/system/mongo-tools/mongo-tools.info b/system/mongo-tools/mongo-tools.info
index 4261077a4d..dc83ba55bf 100644
--- a/system/mongo-tools/mongo-tools.info
+++ b/system/mongo-tools/mongo-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="mongo-tools"
-VERSION="3.1.4"
+VERSION="3.2.0"
 HOMEPAGE="http://www.mongodb.org/"
-DOWNLOAD="https://github.com/mongodb/mongo-tools/archive/r3.1.4.tar.gz"
-MD5SUM="a6e4b0289f524e99df35ee9f5802ed2b"
+DOWNLOAD="https://github.com/mongodb/mongo-tools/archive/r3.2.0.tar.gz"
+MD5SUM="eaa1f16822c30c77de68a72ec9c02752"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild
index a4e5f4861c..0069e07acc 100644
--- a/system/mongodb/mongodb.SlackBuild
+++ b/system/mongodb/mongodb.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM="mongodb"
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,7 +85,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-scons --ssl --prefix=${PKG}/usr core install
+scons --ssl --disable-warnings-as-errors --prefix=${PKG}/usr core install
 
 mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 cp distsrc/* ${PKG}/usr/doc/${PRGNAM}-${VERSION}
diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info
index b1bde9c234..fb5429508a 100644
--- a/system/mongodb/mongodb.info
+++ b/system/mongodb/mongodb.info
@@ -1,8 +1,8 @@
 PRGNAM="mongodb"
-VERSION="3.0.4"
+VERSION="3.2.0"
 HOMEPAGE="http://www.mongodb.org/"
-DOWNLOAD="https://fastdl.mongodb.org/src/mongodb-src-r3.0.4.tar.gz"
-MD5SUM="d81ff3c814dd5258fde0687da1ac5bf4"
+DOWNLOAD="https://fastdl.mongodb.org/src/mongodb-src-r3.2.0.tar.gz"
+MD5SUM="52062a6d229c9dd66964771a8a2e6dff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="scons"
diff --git a/system/monit/monit.SlackBuild b/system/monit/monit.SlackBuild
index d691c9a4f8..5381604f23 100644
--- a/system/monit/monit.SlackBuild
+++ b/system/monit/monit.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monit
-VERSION=${VERSION:-5.11}
+VERSION=${VERSION:-5.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/monit/monit.info b/system/monit/monit.info
index 30865673af..6e2861a794 100644
--- a/system/monit/monit.info
+++ b/system/monit/monit.info
@@ -1,8 +1,8 @@
 PRGNAM="monit"
-VERSION="5.11"
+VERSION="5.15"
 HOMEPAGE="http://mmonit.com/monit/"
-DOWNLOAD="http://mmonit.com/monit/dist/monit-5.11.tar.gz"
-MD5SUM="ff00f39d248ed7068932ed82211da9e6"
+DOWNLOAD="http://mmonit.com/monit/dist/monit-5.15.tar.gz"
+MD5SUM="c723745298d7ba6d28194b9f25eba6fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/monitoring-plugins/monitoring-plugins.SlackBuild b/system/monitoring-plugins/monitoring-plugins.SlackBuild
index 1b7ea8a9c6..3b34528412 100644
--- a/system/monitoring-plugins/monitoring-plugins.SlackBuild
+++ b/system/monitoring-plugins/monitoring-plugins.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for monitoring-plugins
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monitoring-plugins
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/monitoring-plugins/monitoring-plugins.info b/system/monitoring-plugins/monitoring-plugins.info
index 254be28399..3d10b9705b 100644
--- a/system/monitoring-plugins/monitoring-plugins.info
+++ b/system/monitoring-plugins/monitoring-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="monitoring-plugins"
-VERSION="2.1.1"
+VERSION="2.1.2"
 HOMEPAGE="https://www.monitoring-plugins.org/"
-DOWNLOAD="https://www.monitoring-plugins.org/download/monitoring-plugins-2.1.1.tar.gz"
-MD5SUM="8e564c03e3fc32f452956892b19abb4d"
+DOWNLOAD="https://www.monitoring-plugins.org/download/monitoring-plugins-2.1.2.tar.gz"
+MD5SUM="4a210f7db012571ea58e214cef74f612"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/monitorix/monitorix.SlackBuild b/system/monitorix/monitorix.SlackBuild
index 20f7fc9fbf..cd725e6932 100644
--- a/system/monitorix/monitorix.SlackBuild
+++ b/system/monitorix/monitorix.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monitorix
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/monitorix/monitorix.info b/system/monitorix/monitorix.info
index 9b9ef15f7d..aa9f848c1b 100644
--- a/system/monitorix/monitorix.info
+++ b/system/monitorix/monitorix.info
@@ -1,8 +1,8 @@
 PRGNAM="monitorix"
-VERSION="3.7.0"
+VERSION="3.8.1"
 HOMEPAGE="http://www.monitorix.org/"
-DOWNLOAD="http://www.monitorix.org/monitorix-3.7.0.tar.gz"
-MD5SUM="ac542226e61ab8a028d114888f0ba4b9"
+DOWNLOAD="http://www.monitorix.org/monitorix-3.8.1.tar.gz"
+MD5SUM="cf0daac5e1660053822072f43a308453"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-http-server-simple perl-config-general rrdtool"
diff --git a/system/ms-sys/README b/system/ms-sys/README
index 2a3f85a460..71479949af 100644
--- a/system/ms-sys/README
+++ b/system/ms-sys/README
@@ -7,8 +7,3 @@ only the boot record is written.
 It is useful when using Linux to restore a backup of a reference
 Microsoft Windows installation.
 (Excellent for creating bootable Windows 7 install USB).
-
-2.4.0 	Added support for syslinux GPT MBR.
-		Updated syslinux mbr to version 6.02.
-
-2.4.1	Added support for FAT32 PE boot record.
diff --git a/system/ms-sys/ms-sys.SlackBuild b/system/ms-sys/ms-sys.SlackBuild
index 01c0dcd652..154304940b 100644
--- a/system/ms-sys/ms-sys.SlackBuild
+++ b/system/ms-sys/ms-sys.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Cj [cj@abysmal.mx]
 
 PRGNAM=ms-sys
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,10 +45,10 @@ tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 #No configure script, setting prefix to /usr
 CFLAGS="$SLKCFLAGS" \
diff --git a/system/ms-sys/ms-sys.info b/system/ms-sys/ms-sys.info
index e8c74ea94e..32b0363844 100644
--- a/system/ms-sys/ms-sys.info
+++ b/system/ms-sys/ms-sys.info
@@ -1,8 +1,8 @@
 PRGNAM="ms-sys"
-VERSION="2.4.1"
+VERSION="2.5.1"
 HOMEPAGE="http://ms-sys.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/ms-sys/ms-sys-2.4.1.tar.gz"
-MD5SUM="d31e7ef3db6bd77dbb13df11057fa0f2"
+DOWNLOAD="http://downloads.sourceforge.net/ms-sys/ms-sys-2.5.1.tar.gz"
+MD5SUM="c66fb9045543559d3b320f57d4c87f30"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/msitools/README b/system/msitools/README
new file mode 100644
index 0000000000..0df1eb7cc3
--- /dev/null
+++ b/system/msitools/README
@@ -0,0 +1,4 @@
+msitools is a set of programs to inspect and build
+Windows Installer (.MSI) files. It is based on libmsi, a portable
+library to read and write .MSI files. libmsi in turn is a port of
+(and a subset of) Wine's implementation of the Windows Installer.
diff --git a/system/msitools/msitools.SlackBuild b/system/msitools/msitools.SlackBuild
new file mode 100644
index 0000000000..9098d66c72
--- /dev/null
+++ b/system/msitools/msitools.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for "msitools".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=msitools
+VERSION=${VERSION:-0.94}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+rm -rf $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+(
+  cd .libs
+  for file in msibuild msiextract msiinfo wixl wixl-heat; do
+    install -s -D -m 0755 $file $PKG/usr/bin
+  done
+)
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/msitools/msitools.info b/system/msitools/msitools.info
new file mode 100644
index 0000000000..78f7dd92b7
--- /dev/null
+++ b/system/msitools/msitools.info
@@ -0,0 +1,10 @@
+PRGNAM="msitools"
+VERSION="0.94"
+HOMEPAGE="https://wiki.gnome.org/msitools/"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/msitools-0.94.tar.xz"
+MD5SUM="76dec60217d3bfa44c744a6a55577a83"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gcab"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/system/msitools/slack-desc b/system/msitools/slack-desc
new file mode 100644
index 0000000000..429560461e
--- /dev/null
+++ b/system/msitools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+msitools: msitools (Inspect and build Windows Installer (.MSI) files)
+msitools:
+msitools: msitools is a set of programs to inspect and build
+msitools: Windows Installer (.MSI) files. It is based on libmsi, a portable
+msitools: library to read and write .MSI files. libmsi in turn is a port of
+msitools: (and a subset of) Wine's implementation of the Windows Installer.
+msitools:
+msitools: Homepage: https://wiki.gnome.org/msitools/
+msitools:
+msitools:
+msitools:
diff --git a/system/multibootusb/README b/system/multibootusb/README
new file mode 100644
index 0000000000..1c4dfb3027
--- /dev/null
+++ b/system/multibootusb/README
@@ -0,0 +1,11 @@
+multibootusb (Install multiple live linux on a USB disk)
+
+MultiBootUSB allows you to install multiple live linux on a USB disk
+non destructively and option to uninstall distros.
+
+User can get the distro's all available *default* boot options during
+distro's installation.
+
+Syslinux is used as default boot loader for making USB bootable.
+
+- You also need QEMU in order to use it within multibootusb.
diff --git a/system/multibootusb/doinst.sh b/system/multibootusb/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/multibootusb/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/multibootusb/multibootusb.SlackBuild b/system/multibootusb/multibootusb.SlackBuild
new file mode 100644
index 0000000000..1c438447fc
--- /dev/null
+++ b/system/multibootusb/multibootusb.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for multibootusb
+
+# Copyright 2015 Mohammad Etemaddar Iran
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=multibootusb
+VERSION=${VERSION:-7.5.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/multibootusb/multibootusb.info b/system/multibootusb/multibootusb.info
new file mode 100644
index 0000000000..ac393348ba
--- /dev/null
+++ b/system/multibootusb/multibootusb.info
@@ -0,0 +1,10 @@
+PRGNAM="multibootusb"
+VERSION="7.5.0"
+HOMEPAGE="http://multibootusb.org/"
+DOWNLOAD="https://github.com/mbusb/multibootusb/archive/v7.5.0.tar.gz"
+MD5SUM="d3c13cdc308486f2966ffc60b211ea70"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Mohammad Etemaddar"
+EMAIL="mohammad.etemaddar@gmail.com"
diff --git a/system/multibootusb/slack-desc b/system/multibootusb/slack-desc
new file mode 100644
index 0000000000..c3dcb78871
--- /dev/null
+++ b/system/multibootusb/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+multibootusb: multibootusb (Install multiple live linux on a USB disk)
+multibootusb:
+multibootusb: MultiBootUSB allows you to install multiple live linux on a USB disk
+multibootusb: non destructively and option to uninstall distros.
+multibootusb:
+multibootusb: User can get the distro's all available *default* boot options during
+multibootusb: distro's installation.
+multibootusb: Syslinux is used as default boot loader for making USB bootable.
+multibootusb: - You also need QEMU in order to use it within multibootusb.
+multibootusb:
+multibootusb: Homepage: http://multibootusb.org/
diff --git a/system/multitail/multitail.SlackBuild b/system/multitail/multitail.SlackBuild
index 5a0a566432..641fed06e1 100644
--- a/system/multitail/multitail.SlackBuild
+++ b/system/multitail/multitail.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=multitail
-VERSION=${VERSION:-6.4.1}
+VERSION=${VERSION:-6.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/multitail/multitail.info b/system/multitail/multitail.info
index f0132fe368..aef03180f6 100644
--- a/system/multitail/multitail.info
+++ b/system/multitail/multitail.info
@@ -1,8 +1,8 @@
 PRGNAM="multitail"
-VERSION="6.4.1"
+VERSION="6.4.2"
 HOMEPAGE="http://www.vanheusden.com/multitail/"
-DOWNLOAD="http://www.vanheusden.com/multitail/multitail-6.4.1.tgz"
-MD5SUM="e82a32f090d61665524b1e866d7d57ca"
+DOWNLOAD="http://www.vanheusden.com/multitail/multitail-6.4.2.tgz"
+MD5SUM="a0959f7b2385061080712afd8ae6e33d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/munin-node/LICENSE b/system/munin-node/LICENSE
new file mode 100644
index 0000000000..341c30bda4
--- /dev/null
+++ b/system/munin-node/LICENSE
@@ -0,0 +1,166 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
diff --git a/system/munin-node/README b/system/munin-node/README
new file mode 100644
index 0000000000..ac547743ec
--- /dev/null
+++ b/system/munin-node/README
@@ -0,0 +1,22 @@
+munin-node is the client portion of the Munin Monitoring system. It allows the 
+Munin master to collect statistics for presentation in RRDTool time-series
+graphs.
+
+munin-node is a Perl application and requires several Perl modules as external
+dependencies:
+
+	Net::Server
+
+Additionally, the following modules are required for some plugins:
+
+	Net::SSLeay (for SSL connections)
+	Net::SNMP
+	Net::CIDR
+
+Munin requires that user munin exists and belongs to group munin. Create these
+before running the SlackBuild script:
+
+groupadd -g 308 munin
+useradd -u 308 -g 308 -s /sbin/nologin munin
+
+Once munin-node is installed, configure plugins per the Munin documentation.
diff --git a/system/munin-node/README.SLACKWARE b/system/munin-node/README.SLACKWARE
new file mode 100644
index 0000000000..a5dccb6b34
--- /dev/null
+++ b/system/munin-node/README.SLACKWARE
@@ -0,0 +1,13 @@
+README.SLACKWARE for munin-node
+
+To start munin-node at boot, add the following to /etc/rc.d/rc.local:
+
+  if [ -x /etc/rc.d/rc.munin-node ];  then
+    /etc/rc.d/rc.munin-node start
+  fi
+
+This goes in /etc/rc.d/rc.local_shutdown:
+
+  if [ -x /etc/rc.d/rc.munin-node ];  then
+    /etc/rc.d/rc.munin-node stop
+  fi
diff --git a/system/munin-node/doinst.sh b/system/munin-node/doinst.sh
new file mode 100644
index 0000000000..6afcc2415d
--- /dev/null
+++ b/system/munin-node/doinst.sh
@@ -0,0 +1,30 @@
+# Post-install configuration scripts, borrowed from the fail2ban
+# Slackbuild: 
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.munin-node.new
+config etc/munin/munin-node.conf.new
+config etc/logrotate.d/munin-node.new
diff --git a/system/munin-node/munin-node.SlackBuild b/system/munin-node/munin-node.SlackBuild
new file mode 100644
index 0000000000..487b4c9ea6
--- /dev/null
+++ b/system/munin-node/munin-node.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/sh -e
+
+# Slackware Package Build Script for munin-node (http://munin-monitoring.org)
+# SlackBuild source at https://github.com/chapmajs/munin-node-slackbuild
+
+# See LICENSE included in the project root for licensing information.
+
+# Copyright (c) 2015 Jonathan Chapman
+# glitch@glitchwrks.com
+# All rights reserved.
+
+PRGNAM=munin-node
+VERSION=${VERSION:-2.0.25}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH="noarch"
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+ARCHIVE_NAME=munin
+
+set -e
+
+# Clean up old builds
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar zxvf $CWD/$ARCHIVE_NAME-$VERSION.tar.gz
+cd $ARCHIVE_NAME-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix a bug in Perldoc extension detection
+patch Makefile < $CWD/patches/Makefile.patch
+
+# Patch Makefile.config for Slackware-esque install locations
+patch Makefile.config < $CWD/patches/Makefile.config.patch
+
+make LIBDIR=/usr/lib${LIBDIRSUFFIX}
+make install-common-prime install-node-prime \
+	install-plugins-prime LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mv $PKG/usr/local/share/ $PKG/usr/
+rm -rf $PKG/usr/local
+
+# move config files to .new
+cd $PKG/etc/munin
+for file in $(find . -type f); do
+	mv $file "$file.new"
+done
+
+install -D -m 0644 $CWD/rc.munin-node $PKG/etc/rc.d/rc.munin-node.new
+install -D -m 0644 $CWD/munin-node.logrotate $PKG/etc/logrotate.d/munin-node.new
+
+# Finish up the package
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/munin-node/munin-node.info b/system/munin-node/munin-node.info
new file mode 100644
index 0000000000..e589075e0f
--- /dev/null
+++ b/system/munin-node/munin-node.info
@@ -0,0 +1,10 @@
+PRGNAM="munin-node"
+VERSION="2.0.25"
+HOMEPAGE="http://munin-monitoring.org"
+DOWNLOAD="http://downloads.munin-monitoring.org/munin/stable/2.0.25/munin-2.0.25.tar.gz"
+MD5SUM="b418a667ce42665557329a7ac3bd1b93"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-Net-Server Net-SSLeay"
+MAINTAINER="Jonathan Chapman"
+EMAIL="glitch@glitchwrks.com"
diff --git a/system/munin-node/munin-node.logrotate b/system/munin-node/munin-node.logrotate
new file mode 100644
index 0000000000..6a68573f86
--- /dev/null
+++ b/system/munin-node/munin-node.logrotate
@@ -0,0 +1,8 @@
+/var/log/munin/munin-node.log {
+    weekly
+    rotate 7
+    missingok
+    compress
+    copytruncate
+    notifempty
+}
diff --git a/system/munin-node/patches/Makefile.config.patch b/system/munin-node/patches/Makefile.config.patch
new file mode 100644
index 0000000000..8617deeebb
--- /dev/null
+++ b/system/munin-node/patches/Makefile.config.patch
@@ -0,0 +1,72 @@
+--- Makefile.config	2014-11-24 16:46:24.000000000 -0500
++++ Makefile.config.new	2015-07-16 14:12:13.868927186 -0400
+@@ -17,10 +17,10 @@
+ #
+ # the base of the Munin installation.
+ #
+-PREFIX     = $(DESTDIR)/opt/munin
++PREFIX     = $(DESTDIR)/usr
+ 
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR    = $(DESTDIR)/etc/opt/munin
++CONFDIR    = $(DESTDIR)/etc/munin
+ 
+ # Server only - where to put munin-cron
+ BINDIR     = $(PREFIX)/bin
+@@ -35,17 +35,17 @@
+ MANDIR     = $(PREFIX)/man
+ 
+ # Where to put internal binaries and plugin repository
+-LIBDIR     = $(PREFIX)/lib
++LIBDIR     = $(PREFIX)/lib/munin
+ 
+ # Server only - Output directory
+ HTMLDIR    = $(PREFIX)/www/docs
+ CGIDIR     = $(PREFIX)/www/cgi
+ 
+ # Where to put internal data for master (RRD, internal files, ...)
+-DBDIR      = $(DESTDIR)/var/opt/munin
++DBDIR      = $(DESTDIR)/var/munin
+ 
+ # Where to put internal data for node (plugin state, ...)
+-DBDIRNODE  = $(DESTDIR)/var/opt/munin-node
++DBDIRNODE  = $(DESTDIR)/var/db/munin-node
+ 
+ # Client only - Where the spool files are written. Must be writable by
+ # group "munin", and should be preserved between reboots
+@@ -56,7 +56,7 @@
+ PLUGSTATE  = $(DBDIRNODE)/plugin-state
+ 
+ # Where Munin should place its logs.
+-LOGDIR     = $(PREFIX)/log/munin
++LOGDIR     = $(DESTDIR)/var/log/munin
+ 
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+@@ -133,26 +133,6 @@
+ CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+ CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+ 
+-# For OSX, comment out the previous two lines and comment in these
+-#
+-#CHECKUSER  := $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-#CHECKGROUP := $(shell nicl . -read /groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+-
+-# For OSX 10.5 (Leopard), use the following two lines instead of what's above
+-#
+-#CHECKUSER  := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+-
+-
+-# For HP-UX, use these instead:
+-#
+-#CHECKUSER  := $(shell pwget -n $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-#CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+-
+-# For Cygwin, use these instead:
+-#CHECKUSER  := $(shell id $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-#CHECKGROUP := $(shell grep ^$(GROUP): /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+-
+ CHOWN      := chown
+ CHMOD      := chmod
+ CHGRP      := chgrp
diff --git a/system/munin-node/patches/Makefile.patch b/system/munin-node/patches/Makefile.patch
new file mode 100644
index 0000000000..345022b941
--- /dev/null
+++ b/system/munin-node/patches/Makefile.patch
@@ -0,0 +1,19 @@
+--- /home/glitch/builds/munin-node/munin-2.0.25/Makefile	2014-11-24 16:46:24.000000000 -0500
++++ Makefile	2015-07-16 14:32:54.688903959 -0400
+@@ -30,6 +30,7 @@
+ MAN8		 := master/_bin/munin-update master/_bin/munin-limits master/_bin/munin-html master/_bin/munin-graph
+ PODMAN8          := build/master/doc/munin-cron master/doc/munin master/doc/munin-check
+ PODMAN5          := build/master/doc/munin.conf node/doc/munin-node.conf
++MAN3EXT		 := $(shell $(PERL) -e 'use Config; print $$Config{man3ext};')
+ 
+ .PHONY: install install-pre install-master-prime install-node-prime install-node-pre install-common-prime install-doc install-man \
+         build build-common-prime build-common-pre build-doc \
+@@ -284,7 +285,7 @@
+              -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;'                      \
+              -e 's|\@\@BASH\@\@|$(BASH)|g;'                          \
+              -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;'                    \
+-             ./master/blib/libdoc/Munin::Master::HTMLOld.3pm    \
++             ./master/blib/libdoc/Munin::Master::HTMLOld.$(MAN3EXT)  \
+              ./master/blib/lib/Munin/Master/HTMLOld.pm          \
+              ./node/blib/sbin/munin-node-configure              \
+              ./node/blib/sbin/munin-node                        \
diff --git a/system/munin-node/rc.munin-node b/system/munin-node/rc.munin-node
new file mode 100644
index 0000000000..ee0327730c
--- /dev/null
+++ b/system/munin-node/rc.munin-node
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Startup script for munin-node
+
+function munin_start {
+	/usr/sbin/munin-node
+}
+
+function munin_stop {
+	killall munin-node
+}
+
+if [ "$1" == 'start' ]; then
+	munin_start
+elif [ "$1" == 'stop' ]; then
+	munin_stop
+elif [ "$1" == 'restart' ]; then
+	munin_stop
+	munin_start
+else
+	echo "usage: rc.munin-node start|stop|restart"
+fi
diff --git a/system/munin-node/slack-desc b/system/munin-node/slack-desc
new file mode 100644
index 0000000000..3ab8f04c20
--- /dev/null
+++ b/system/munin-node/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+munin-node: munin-node (System statistics gathering client for Munin)
+munin-node:
+munin-node: munin-node is the statistics gatherling client used with Munin. This 
+munin-node: client can be queried by a Munin master which processes the report
+munin-node: data into RRDTool graphs.
+munin-node:  
+munin-node: munin-node is written in Perl and requires several external Perl
+munin-node: modules. See the project documentation for requirements.
+munin-node:
+munin-node: Homepage: http://munin-monitoring.org
+munin-node:
diff --git a/system/mysql-utilities/mysql-utilities.SlackBuild b/system/mysql-utilities/mysql-utilities.SlackBuild
index 921b64d3d0..ae50b0274c 100644
--- a/system/mysql-utilities/mysql-utilities.SlackBuild
+++ b/system/mysql-utilities/mysql-utilities.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mysql-utilities
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/mysql-utilities/mysql-utilities.info b/system/mysql-utilities/mysql-utilities.info
index 9b18a57c1a..8f19a085cc 100644
--- a/system/mysql-utilities/mysql-utilities.info
+++ b/system/mysql-utilities/mysql-utilities.info
@@ -1,8 +1,8 @@
 PRGNAM="mysql-utilities"
-VERSION="1.6.1"
+VERSION="1.6.2"
 HOMEPAGE="https://dev.mysql.com/downloads/tools/utilities/"
-DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-utilities-1.6.1.tar.gz"
-MD5SUM="6a625831f35e46f1094bd07ee48c1146"
+DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-utilities-1.6.2.tar.gz"
+MD5SUM="68b99fc66fd4e7a1a64160e41e543890"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mysql-connector-python"
diff --git a/system/nagios-plugins/nagios-plugins.SlackBuild b/system/nagios-plugins/nagios-plugins.SlackBuild
index cf2c8963d0..6f8c2ac4b7 100644
--- a/system/nagios-plugins/nagios-plugins.SlackBuild
+++ b/system/nagios-plugins/nagios-plugins.SlackBuild
@@ -2,11 +2,29 @@
 
 # Slackware build script for nagios-plugins
 
-# Written by Zordrak <slackbuilds@tpa.me.uk>
-# Modified by Mario Preksavec <mario@slackware.hr>
+# Copyright 2010  Zordrak <slackbuilds@tpa.me.uk>
+# Copyright 2014, 2015, 2016  Mario Preksavec, Zagreb, Croatia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nagios-plugins
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/nagios-plugins/nagios-plugins.info b/system/nagios-plugins/nagios-plugins.info
index df5a541de2..602cc94dcb 100644
--- a/system/nagios-plugins/nagios-plugins.info
+++ b/system/nagios-plugins/nagios-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="nagios-plugins"
-VERSION="2.0.3"
+VERSION="2.1.1"
 HOMEPAGE="https://www.nagios-plugins.org/"
-DOWNLOAD="https://www.nagios-plugins.org/download/nagios-plugins-2.0.3.tar.gz"
-MD5SUM="6755765bab88b506181268ef7982595e"
+DOWNLOAD="https://www.nagios-plugins.org/download/nagios-plugins-2.1.1.tar.gz"
+MD5SUM="e199ca874df5723bfaca8c43887b1a79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nagios"
diff --git a/system/netatop/netatop.SlackBuild b/system/netatop/netatop.SlackBuild
index 284120270e..96b62b2214 100644
--- a/system/netatop/netatop.SlackBuild
+++ b/system/netatop/netatop.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=netatop
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/netatop/netatop.info b/system/netatop/netatop.info
index 4176ddaf27..f0b0c37694 100644
--- a/system/netatop/netatop.info
+++ b/system/netatop/netatop.info
@@ -1,8 +1,8 @@
 PRGNAM="netatop"
-VERSION="0.5"
+VERSION="0.7"
 HOMEPAGE="http://www.atoptool.nl/"
-DOWNLOAD="http://www.atoptool.nl/download/netatop-0.5.tar.gz"
-MD5SUM="85c38b20cc905ebfc2bc4d7e92a325f7"
+DOWNLOAD="http://www.atoptool.nl/download/netatop-0.7.tar.gz"
+MD5SUM="4c3c7e11bb1908dc04a05c0ed8f4955d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/nix/README b/system/nix/README
new file mode 100644
index 0000000000..e59a68ec39
--- /dev/null
+++ b/system/nix/README
@@ -0,0 +1,46 @@
+nix (functional package manager)
+
+Nix is a purely functional package manager. This means that it treats packages
+like values in purely functional programming languages such as Haskell -- they
+are built by functions that don't have side-effects, and they never change
+after they have been built. Nix stores packages in the Nix store, usually the
+directory /nix/store, where each package has its own unique subdirectory such
+as
+
+	/nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1/
+
+where b6gvzjyb2pg0... is a unique identifier for the package that captures all
+its dependencies (it's a cryptographic hash of the package's build dependency
+graph).
+
+Nix may be run in single or multi-user mode (which requires the nix-daemon). To
+have the nix daemon start and stop with your host, add to /etc/rc.d/rc.local:
+
+	if [ -x /etc/rc.d/rc.nix ]; then
+		/etc/rc.d/rc.nix start
+	fi
+
+and to /etc/rc.d/rc.local_shutdown (creating it if needed):
+
+	if [ -x /etc/rc.d/rc.nix ]; then
+		/etc/rc.d/rc.nix stop
+	fi
+
+The daemon requires users for building the nix packages, which should be added
+under the 'nixbld' group.
+
+	groupadd -g 314 nixbld
+	for n in $(seq 1 10); do useradd -c "Nix build user $n" \
+	    -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" \
+	    nixbld$n; done
+
+Restricting access to the daemon is acheived by setting file permissions for
+the daemon's socket's folder.
+
+	chgrp nix-users /nix/var/nix/daemon-socket
+	chmod ug=rwx,o= /nix/var/nix/daemon-socket
+
+Correct permissions must also be set for the following profile directories to give users access.
+
+	/nix/var/nix/profiles
+	/var/nix/profiles
diff --git a/system/nix/config/rc.nix b/system/nix/config/rc.nix
new file mode 100644
index 0000000000..82852934af
--- /dev/null
+++ b/system/nix/config/rc.nix
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Short-Description:  Create lightweight, portable, self-sufficient containers.
+# Description:
+#  Docker is an open-source project to easily create lightweight, portable,
+#  self-sufficient containers from any application. The same container that a
+#  developer builds and tests on a laptop can run at scale, in production, on
+#  VMs, bare metal, OpenStack clusters, public clouds and more.
+
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+
+BASE=nix-daemon
+
+UNSHARE=/usr/bin/unshare
+NIX=/usr/bin/$BASE
+NIX_PIDFILE=/var/run/$BASE.pid
+NIX_LOG=/var/log/nix.log
+NIX_OPTS=
+
+if [ -f /etc/default/$BASE ]; then
+	. /etc/default/$BASE
+fi
+
+# Check nix is present
+if [ ! -x $NIX ]; then
+	echo "$NIX not present or not executable"
+	exit 1
+fi
+
+nix_start() {
+  echo "starting $BASE ..."
+  if [ -x ${NIX} ]; then
+    # If there is an old PID file (no nix-daemon running), clean it up:
+    if [ -r ${NIX_PIDFILE} ]; then
+      if ! ps axc | grep nix-daemon 1> /dev/null 2> /dev/null ; then
+        echo "Cleaning up old ${NIX_PIDFILE}."
+        rm -f ${NIX_PIDFILE}
+      fi
+    fi
+    nohup "${UNSHARE}" -m -- ${NIX} >> ${NIX_LOG} 2>&1 &
+    echo $! > ${NIX_PIDFILE}
+  fi
+}
+
+# Stop nix:
+nix_stop() {
+  echo "stopping $BASE ..."
+  # If there is no PID file, ignore this request...
+  if [ -r ${NIX_PIDFILE} ]; then
+    kill $(cat ${NIX_PIDFILE})
+  fi
+  rm -f ${NIX_PIDFILE}
+}
+
+# Restart docker:
+nix_restart() {
+	nix_stop
+	nix_start
+}
+
+case "$1" in
+'start')
+  nix_start
+  ;;
+'stop')
+  nix_stop
+  ;;
+'restart')
+  nix_restart
+  ;;
+'status')
+  if [ -f ${NIX_PIDFILE} ] && ps -o cmd $(cat ${NIX_PIDFILE}) | grep -q $BASE ; then
+	  echo "status of $BASE: running"
+  else
+	  echo "status of $BASE: stopped"
+  fi
+  ;;
+*)
+  echo "usage $0 start|stop|restart|status"
+esac
+
+exit 0
diff --git a/system/nix/doinst.sh b/system/nix/doinst.sh
new file mode 100644
index 0000000000..032197f9aa
--- /dev/null
+++ b/system/nix/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.nix.new
diff --git a/system/nix/nix.SlackBuild b/system/nix/nix.SlackBuild
new file mode 100644
index 0000000000..fc27c7918b
--- /dev/null
+++ b/system/nix/nix.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Slackware build script for nix
+
+# Copyright 2015 Pragmatic Cypher <slackbuilds@server.ky>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=nix
+VERSION=${VERSION:-1.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --mandir=/usr/man \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+install -D --mode 0755 $CWD/config/rc.nix $PKG/etc/rc.d/rc.nix.new
+mkdir -p $PKG/nix
+mkdir -p $PKG/var/nix/profiles
+mkdir -p $PKG/nix/var/nix/profiles
+mkdir -p $PKG/nix/var/nix/daemon-socket
+
+rm -fr $PKG/etc/init.d
+rm -fr $PKG/usr/lib/systemd
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl
+mv $PKG/usr/lib${LIBDIRSUFFIX}/perl5/site_perl/**/**/* $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl
+rm -r $PKG/usr/lib${LIBDIRSUFFIX}/perl5/site_perl
+
+mv $PKG/usr/lib/pkgconfig/ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+if [ "$ARCH" = "x86_64" ]; then
+  rm -rf $PKG/usr/lib
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nix/nix.info b/system/nix/nix.info
new file mode 100644
index 0000000000..4523c636a5
--- /dev/null
+++ b/system/nix/nix.info
@@ -0,0 +1,10 @@
+PRGNAM="nix"
+VERSION="1.10"
+HOMEPAGE="http://nixos.org/nix"
+DOWNLOAD="https://hydra.nixos.org/build/25489769/download/4/nix-1.10.tar.xz"
+MD5SUM="f34dcbdb2d3b9d1e111eaa4b7e52bf5d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="perl-DBD-SQLite perl-WWW-Curl"
+MAINTAINER="Pragmatic Cypher"
+EMAIL="slackbuilds@server.ky"
diff --git a/system/nix/slack-desc b/system/nix/slack-desc
new file mode 100644
index 0000000000..4fac728738
--- /dev/null
+++ b/system/nix/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+nix: nix (package manager)
+nix:
+nix: The purely functional package manager.
+nix:
+nix:
+nix:
+nix:
+nix:
+nix:
+nix:
+nix:
diff --git a/system/nomarch/nomarch.info b/system/nomarch/nomarch.info
index 6a24130bbf..b21bf0ed07 100644
--- a/system/nomarch/nomarch.info
+++ b/system/nomarch/nomarch.info
@@ -1,7 +1,7 @@
 PRGNAM="nomarch"
 VERSION="1.4"
 HOMEPAGE="http://www.svgalib.org/rus/nomarch.html"
-DOWNLOAD="ftp://ftp.ibiblio.org/pub/Linux/utils/compress/nomarch-1.4.tar.gz"
+DOWNLOAD="http://ftp.vim.org/ibiblio/utils/compress/nomarch-1.4.tar.gz"
 MD5SUM="1b0be450e2af64710f9627f85d1b0130"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index f2061c8d82..1583469cbf 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -20,4 +20,6 @@
 3.4		11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
 4.0		07-FEB-2015 new long lived branch, version update, bug fixes
 4.1     27-APR-2015 version update LLB, fix $VERSION usage
-4.2     28-JUL-2015 version update LLB, bug fixes, clean-ups.
\ No newline at end of file
+4.2     28-JUL-2015 version update LLB, bug fixes, clean-ups.
+4.3     05-SEP-2015 version update LLB
+4.4     13-DEC-2015 version update, X.Org 1.18 support
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 3e460a0a97..1040a6760f 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -26,12 +26,14 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-352.30}
+VERSION=${VERSION:-352.63}
 MVERS=340
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CPROXY=${CPROXY:-no}
 
+set -e
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -66,8 +68,6 @@ fi
 
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -116,9 +116,6 @@ install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
-
-
-# Watch for conflicts in newer MESA package
 install -m 755 libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.$VERSION
 install -m 755 libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.$VERSION
 
@@ -139,8 +136,8 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
   install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
   install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia
-  install -m 755 32/libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.$VERSION
-  install -m 755 32/libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.$VERSION
+  install -m 755 32/libGLESv1_CM.so.$VERSION $PKG/usr/lib/libGLESv1_CM.so.$VERSION
+  install -m 755 32/libGLESv2.so.$VERSION $PKG/usr/lib/libGLESv2.so.$VERSION
   install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-eglcore.so.$VERSION $PKG/usr/lib/
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 1c7124fe04..b2b8dcf290 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="352.30"
+VERSION="352.63"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.30/NVIDIA-Linux-x86-352.30.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.30.tar.bz2 \
-	      ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.30.tar.bz2 \
-	      ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.30.tar.bz2 \
-	      ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.30.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.30.tar.bz2"
-MD5SUM="7e59d84eafe2482b2f02df692b9168d5 \
-        c672951b0faa31089f4940d28ccd5463 \
-        0e263655eaf8cf9a68697bda61e6050f \
-        7975a29438550c109479b2f2bed51401 \
-        e0cd59a13b5651ec2396727e7e2e54a5 \ 
-        1a6b4de9c3a91ef3680fa4f0bc80951b"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.30/NVIDIA-Linux-x86_64-352.30.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.30.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.30.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.30.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.30.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.30.tar.bz2"
-MD5SUM_x86_64="c0575f929dd3b7735d586c1d862b0380 \
-        c672951b0faa31089f4940d28ccd5463 \
-        0e263655eaf8cf9a68697bda61e6050f \
-        7975a29438550c109479b2f2bed51401 \
-        e0cd59a13b5651ec2396727e7e2e54a5 \ 
-        1a6b4de9c3a91ef3680fa4f0bc80951b"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.63/NVIDIA-Linux-x86-352.63.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.63.tar.bz2 \
+	      ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.63.tar.bz2 \
+	      ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.63.tar.bz2 \
+	      ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.63.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.63.tar.bz2"
+MD5SUM="7882ecda1763504beb10af77a21b21c5 \
+        805ae3c1167a0472dd62bcb036364ab3 \
+        6bb15d188e90dfe99ce0fd0e7bd1c926 \
+        88c1bdd242f1aa34d5b98b1ff12a24f7 \
+        daf3b3b4847039d3028a1a2200448277 \
+        a52e338d6c50560d4696b4531fe6b2cb"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.63/NVIDIA-Linux-x86_64-352.63.run \
+                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.63.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.63.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.63.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.63.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.63.tar.bz2"
+MD5SUM_x86_64="d4127834036fe24ec7a07999dadf3529 \
+        805ae3c1167a0472dd62bcb036364ab3 \
+        6bb15d188e90dfe99ce0fd0e7bd1c926 \
+        88c1bdd242f1aa34d5b98b1ff12a24f7 \
+        daf3b3b4847039d3028a1a2200448277 \
+        a52e338d6c50560d4696b4531fe6b2cb"
 REQUIRES="libvdpau nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index cee93f291e..68d9d4acea 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -20,13 +20,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# nvidia-switch utility 2.3
+# nvidia-switch utility 2.4
 #
 # A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
 # Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
 # need to edit a bunch of other config files.
 
-# TO-DO: needs cleanup; too "wordy" and brittle.
+# TO-DO: needs cleanup; too brittle.
 
 set -e
 
@@ -46,17 +46,17 @@ NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
 save_GL(){
   cd $2
   if [ "$1" = "nvidia" ]; then
-    if [ ! -e libGL.so.$GL_VERSION-xorg ]; then
+    if [ -e libGL.so.$GL_VERSION ]; then
        mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
        mv libGL.la libGL.la-xorg
     fi
     mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION
+    mv libGL.la-nvidia libGL.la
     ln -sf libGL.so.$NV_VERSION libGL.so.1
     ln -sf libGL.so.$NV_VERSION libGL.so
-    if [ ! -e libEGL.so.1.0.0-xorg ]; then
+    if [ -e libEGL.so.1.0.0 ]; then
        mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
     fi
-    mv libGL.la-nvidia libGL.la
     mv libEGL.so.$NV_VERSION-nvidia libEGL.so.$NV_VERSION
     ln -sf libEGL.so.$NV_VERSION libEGL.so.1.0.0
     ln -sf libEGL.so.$NV_VERSION libEGL.so.1
@@ -71,8 +71,6 @@ save_GL(){
         ln -sf libGL.so.$GL_VERSION libGL.so.1
         ln -sf libGL.so.$GL_VERSION libGL.so
         mv libGL.la-xorg libGL.la
-     else
-	echo WARNING: libGL.so is missing.
      fi
      mv libEGL.so.$NV_VERSION libEGL.so.$NV_VERSION-nvidia
      if [ -e libEGL.so.1.0.0-xorg ]; then
@@ -137,6 +135,12 @@ nvidia_remove(){
 # Check for multilib configuration
   if [ "$COMPAT32" = "yes" ]; then
     save_GL "xorg" $LIB32
+#   remove dangling symlinks
+    rm -f $LIB32/libGLESv1_CM.so.1
+    rm -f $LIB32/libGLESv2.so.2
+    rm -f $LIB32/libnvidia*.so.1
+    rm -f $LIB32/libvdpau-nvidia.so.1
+    rm -f $LIB32/libcuda.so.1
   fi
 
   if [ -e $NV_CONF ]; then
@@ -145,6 +149,13 @@ nvidia_remove(){
 
 #  LD_NVIDIA="${LIB}/libGL.so.$GL_VERSION"
 #  nvidia_ldconfig $LD_NVIDIA # screws up multilub /usr/lib links?
+
+# Kill two dangling symlinks; check next mesa version for libGLES presence.
+  rm -f $LIB/libGLESv1_CM.so.1
+  rm -f $LIB/libGLESv2.so.2
+  rm -f $LIB/libnvidia*.so.1
+  rm -f $LIB/libvdpau-nvidia.so.1
+  rm -f $LIB/libcuda.so.1
 }
 
 usage(){
diff --git a/system/nvidia-firmware/README b/system/nvidia-firmware/README
new file mode 100644
index 0000000000..cc399ef3b8
--- /dev/null
+++ b/system/nvidia-firmware/README
@@ -0,0 +1,6 @@
+This is the proprietary firmware extracted from the NVIDIA 
+binary driver needed by nouveau for video decoding.
+
+See the documentation at freedesktop.org to see if your
+hardware is supported or not. One way to find out which
+chip you have is by running: dmesg | grep -i chipset.
diff --git a/system/nvidia-firmware/nvidia-firmware.SlackBuild b/system/nvidia-firmware/nvidia-firmware.SlackBuild
new file mode 100644
index 0000000000..8f09d6f176
--- /dev/null
+++ b/system/nvidia-firmware/nvidia-firmware.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Slackware build script for nvidia-firmware
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=nvidia-firmware
+VERSION=${VERSION:-325.15}
+SRCNAM=NVIDIA-Linux-x86-$VERSION
+PYNAM=extract_firmware.py
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+SRC=$TMP/$PRGNAM-$VERSION
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG $SRC
+mkdir -p $TMP $SRC $PKG $OUTPUT
+cd $SRC
+sh $CWD/$SRCNAM.run --extract-only
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python $CWD/$PYNAM
+
+install -dm 0755 $PKG/lib/firmware/nouveau/
+cp -a nv* vuc-* $PKG/lib/firmware/nouveau/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info
new file mode 100644
index 0000000000..a84b237fd7
--- /dev/null
+++ b/system/nvidia-firmware/nvidia-firmware.info
@@ -0,0 +1,12 @@
+PRGNAM="nvidia-firmware"
+VERSION="325.15"
+HOMEPAGE="https://wiki.freedesktop.org/nouveau/VideoAcceleration/"
+DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run
+          https://raw.githubusercontent.com/imirkin/re-vp2/d19d818d1e05c7c68afb052073cc8a487cac8f5d/extract_firmware.py"
+MD5SUM="528fc538584de6446384b9cec3099d6c
+        7975d50a07d9cd9131dba60aef32a86f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libvdpau"
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/system/nvidia-firmware/slack-desc b/system/nvidia-firmware/slack-desc
new file mode 100644
index 0000000000..6632852ec0
--- /dev/null
+++ b/system/nvidia-firmware/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+nvidia-firmware: nvidia-firmware (video firmware for nouveau)
+nvidia-firmware:
+nvidia-firmware: This is the proprietary firmware extracted from the NVIDIA
+nvidia-firmware: binary driver needed by nouveau for video decoding.
+nvidia-firmware:
+nvidia-firmware:
+nvidia-firmware:
+nvidia-firmware:
+nvidia-firmware:
+nvidia-firmware:
+nvidia-firmware:
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index d969c54498..f52ea1dac2 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -28,13 +28,15 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-kernel
-VERSION=${VERSION:-352.30}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-352.63}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
 
+set -e
+
 PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
 
 if [ -z "$ARCH" ]; then
@@ -77,22 +79,27 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Nvidia removed uvm module from 32-bit
 (cd kernel || exit 1
   make SYSSRC=$KERNELPATH module || exit 1
-  cd uvm
-  make SYSSRC=$KERNELPATH module || exit 1
+  if [ "$TARGET" = "x86_64" ]; then
+    cd uvm
+    make SYSSRC=$KERNELPATH module || exit 1
+  fi
 )
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
 install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+if [ "$TARGET" = "x86_64" ]; then
+    install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+fi
 
-# Make sure the X is specified to automagically load the 
+# Make sure the X is specified to automagically load the
 # correct driver, since I always forget. You can remove
 # this file if you have an equivilent entry in /etc/X11/xorg.d
 
 mkdir -p $PKG/usr/share/X11/xorg.conf.d/
-cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
+cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
 # OutputClass not available until xorg > 1.16 so fix this up a bit
 sed -i "s|OutputClass|Device|" $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
 sed -i "s|Match|#   Match|" $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index 29a88bb057..7fb4833523 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="352.30"
+VERSION="352.63"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.30/NVIDIA-Linux-x86-352.30.run"
-MD5SUM="7e59d84eafe2482b2f02df692b9168d5"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.30/NVIDIA-Linux-x86_64-352.30.run"
-MD5SUM_x86_64="c0575f929dd3b7735d586c1d862b0380"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.63/NVIDIA-Linux-x86-352.63.run"
+MD5SUM="7882ecda1763504beb10af77a21b21c5"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.63/NVIDIA-Linux-x86_64-352.63.run"
+MD5SUM_x86_64="d4127834036fe24ec7a07999dadf3529"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy304-driver/changelog.txt b/system/nvidia-legacy304-driver/changelog.txt
index 7712a25dd2..f0e784494e 100644
--- a/system/nvidia-legacy304-driver/changelog.txt
+++ b/system/nvidia-legacy304-driver/changelog.txt
@@ -11,4 +11,5 @@
 3.1		22-SEP-2013	version update
 3.1a	04-NOV-2013	minor fixes for 14.1 release
 3.2		08-FEB-2015 version update, restored 32-bit compatibility
-
+3.3     05-SEP-2015 version update
+3.4     13-DEC-2015 version update, X.org 1.18
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
index 523d3b3a88..6d74472754 100644
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
+++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
@@ -28,7 +28,7 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy304-driver
-VERSION=${VERSION:-304.125}
+VERSION=${VERSION:-304.131}
 MVERS=304
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
index 19d78098f4..e27e8dcc1d 100644
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
+++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
@@ -1,22 +1,22 @@
 PRGNAM="nvidia-legacy304-driver"
-VERSION="304.125"
+VERSION="304.131"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.125/NVIDIA-Linux-x86-304.125.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.125.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.125.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.125.tar.bz2"
-MD5SUM="bc3b0ac291fa998d5109a6f7e94fb2d4 \
-        d4c4c811ab1e4123d54dcf6e1996caf2 \
-        b1502ede3c91ddad563c55cb3b0a20d8 \
-        0a46296ed71981b69317122420c00935"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.125/NVIDIA-Linux-x86_64-304.125.run \
-				 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.125.tar.bz2 \
-				 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.125.tar.bz2 \
-				 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.125.tar.bz2"
-MD5SUM_x86_64="3b91df19fa917a414dacd8e87f993557 \
-		d4c4c811ab1e4123d54dcf6e1996caf2 \
-        b1502ede3c91ddad563c55cb3b0a20d8 \
-        0a46296ed71981b69317122420c00935"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
+MD5SUM="9f3222fd7287d9b31f54f1d75760e183 \
+        682e392770b5763fb018d6e2193b2bbd \
+        fd5535623e840330cd05fe7e05278ec4 \
+        e3c8f8c3918449728a8da09863a03d3c"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run \
+				 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \
+				 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
+				 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
+MD5SUM_x86_64="e80db7eaf32294d4066f841f0870a85a \
+        682e392770b5763fb018d6e2193b2bbd \
+        fd5535623e840330cd05fe7e05278ec4 \
+        e3c8f8c3918449728a8da09863a03d3c"
 REQUIRES="libvdpau nvidia-legacy304-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy304-kernel/changelog.txt b/system/nvidia-legacy304-kernel/changelog.txt
index 7712a25dd2..f0e784494e 100644
--- a/system/nvidia-legacy304-kernel/changelog.txt
+++ b/system/nvidia-legacy304-kernel/changelog.txt
@@ -11,4 +11,5 @@
 3.1		22-SEP-2013	version update
 3.1a	04-NOV-2013	minor fixes for 14.1 release
 3.2		08-FEB-2015 version update, restored 32-bit compatibility
-
+3.3     05-SEP-2015 version update
+3.4     13-DEC-2015 version update, X.org 1.18
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
index 4c18b7deff..8b48c3c9eb 100644
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
+++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
@@ -28,7 +28,7 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy304-kernel
-VERSION=${VERSION:-304.125}
+VERSION=${VERSION:-304.131}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
index f4d7b633ed..f580ecddde 100644
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
+++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy304-kernel"
-VERSION="304.125"
+VERSION="304.131"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.125/NVIDIA-Linux-x86-304.125.run"
-MD5SUM="bc3b0ac291fa998d5109a6f7e94fb2d4"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.125/NVIDIA-Linux-x86_64-304.125.run"
-MD5SUM_x86_64="3b91df19fa917a414dacd8e87f993557"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run"
+MD5SUM="9f3222fd7287d9b31f54f1d75760e183"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run"
+MD5SUM_x86_64="e80db7eaf32294d4066f841f0870a85a"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy340-driver/changelog.txt b/system/nvidia-legacy340-driver/changelog.txt
index 0d25fb37c9..5e6c0caf8d 100644
--- a/system/nvidia-legacy340-driver/changelog.txt
+++ b/system/nvidia-legacy340-driver/changelog.txt
@@ -19,3 +19,5 @@
 3.3		20-NOV-2014	new version (LLB), update libs, fix nvidia-switch
 3.4		11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
 4.0		07-FEB-2015 new legacy branch, version update, bug fixes
+4.1     05-SEP-2015 version update LLB
+4.1     13-DEC-2015 version update, X.Org 1.18 support
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
index f7df53e771..395ed39c5a 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
@@ -26,7 +26,7 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy340-driver
-VERSION=${VERSION:-340.76}
+VERSION=${VERSION:-340.96}
 MVERS=340
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
index e07c89cdd2..bc128ca859 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-legacy340-driver"
-VERSION="340.76"
+VERSION="340.96"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.76.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.76.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.76.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.76.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.76.tar.bz2"
-MD5SUM="8064c0a0998c3e7ee3c98ac1832b8194 \
-        2e5f9b75526cc4e9dfc4bb3f275787ed \
-        382e5b8babc1e06fff98efb6cda26d1f \
-        f1a891d7a0722960d5631fe1e980a213 \
-        1ce8b3e818f134dfc49db1b408ffffdc \
-        a38c06029bde33e6407fd8f1a724e2dd"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.76.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.76.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.76.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.76.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.76.tar.bz2"
-MD5SUM_x86_64="5ae351416e887037c752415d786c709d\
-        2e5f9b75526cc4e9dfc4bb3f275787ed \
-        382e5b8babc1e06fff98efb6cda26d1f \
-        f1a891d7a0722960d5631fe1e980a213 \
-        1ce8b3e818f134dfc49db1b408ffffdc \
-        a38c06029bde33e6407fd8f1a724e2dd"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.96.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.96.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.96.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.96.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.96.tar.bz2"
+MD5SUM="cb64b165b638671bcdc75bcf297b8d90 \
+        6a5a18d9cbe49f2a5b3da5d5830059d5 \
+        36e7509064a3900139c3dbda05e04283 \
+        7174be57b82be6a875e5cb21b0d1fe92 \
+        ea8a4563ffb751141037c82958d19c43 \
+        c4456cffe24d88ecde5782f981b540ee"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run \
+                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.96.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.96.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.96.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.96.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.96.tar.bz2"
+MD5SUM_x86_64="f66b4f01a1edab6ce7d7b90d9b209cd1 \
+        6a5a18d9cbe49f2a5b3da5d5830059d5 \
+        36e7509064a3900139c3dbda05e04283 \
+        7174be57b82be6a875e5cb21b0d1fe92 \
+        ea8a4563ffb751141037c82958d19c43 \
+        c4456cffe24d88ecde5782f981b540ee"
 REQUIRES="libvdpau nvidia-legacy340-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
index 168377d0c7..beab29b121 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
@@ -28,7 +28,7 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy340-kernel
-VERSION=${VERSION:-340.76}
+VERSION=${VERSION:-340.96}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
index b675a37af4..b609cab375 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy340-kernel"
-VERSION="340.76"
+VERSION="340.96"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run"
-MD5SUM="8064c0a0998c3e7ee3c98ac1832b8194"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76.run"
-MD5SUM_x86_64="5ae351416e887037c752415d786c709d"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run"
+MD5SUM="cb64b165b638671bcdc75bcf297b8d90"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run"
+MD5SUM_x86_64="f66b4f01a1edab6ce7d7b90d9b209cd1"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/ofono/README b/system/ofono/README
new file mode 100644
index 0000000000..1dfdc36ecd
--- /dev/null
+++ b/system/ofono/README
@@ -0,0 +1,17 @@
+
+oFono provides a mobile telephony (GSM/UMTS) application development 
+framework that includes consistent, minimal, and easy to use complete APIs. 
+
+As an open source project, it includes a high-level D-Bus API for use by 
+telephony applications of any license. oFono also includes a low-level 
+plug-in API for integrating with open source as well as third party 
+telephony stacks, cellular modems, and storage back ends. 
+
+The plug-in API functionality is modeled on public standards, in 
+particular 3GPP TS 27.007 "AT command set for User Equipment (UE)." 
+
+oFono is sponsored by Intel and most of the project maintainers work.
+
+-----------------------------------------
+
+ofono requeries bluez with gateway enabled
diff --git a/system/ofono/ofono.SlackBuild b/system/ofono/ofono.SlackBuild
new file mode 100644
index 0000000000..7a2b0f99bf
--- /dev/null
+++ b/system/ofono/ofono.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Slackware build script for ofono
+
+# Copyright 2015 Guilherme Calandrini, Madrid (Spain).
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ofono
+VERSION=${VERSION:-1.14}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-threads \
+  --enable-test \
+  --enable-tools \
+  --enable-dundee \
+  --enable-bluez4 \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ofono/ofono.info b/system/ofono/ofono.info
new file mode 100644
index 0000000000..f98a95a06e
--- /dev/null
+++ b/system/ofono/ofono.info
@@ -0,0 +1,10 @@
+PRGNAM="ofono"
+VERSION="1.14"
+HOMEPAGE="https://01.org/ofono"
+DOWNLOAD="https://www.kernel.org/pub/linux/network/ofono/ofono-1.14.tar.xz"
+MD5SUM="8bc398d86642408cc71d039f59c61538"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Guilherme Calandrini"
+EMAIL="g_calandrini[at]hotmail[dot]es"
diff --git a/system/ofono/slack-desc b/system/ofono/slack-desc
new file mode 100644
index 0000000000..73bf6d3dad
--- /dev/null
+++ b/system/ofono/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+ofono: ofono (open source telephony)
+ofono:
+ofono: oFono provides a mobile telephony (GSM/UMTS) application development
+ofono: framework that includes consistent, minimal, and easy to use complete
+ofono: APIs. As an open source project, it includes a high-level D-Bus API
+ofono: for use by telephony applications of any license. oFono also includes
+ofono: a low-level plug-in API for integrating with open source as well as
+ofono: third party telephony stacks, cellular modems, and storage back ends.
+ofono: The plug-in API functionality is modeled on public standards, in
+ofono: particular 3GPP TS 27.007 "AT command set for User Equipment (UE).
+ofono: Ofono is sponsored by Intel and most of the project maintainers work.
diff --git a/system/ohsnap/README b/system/ohsnap/README
new file mode 100644
index 0000000000..351676e585
--- /dev/null
+++ b/system/ohsnap/README
@@ -0,0 +1 @@
+Monospaced font based on Artwiz Snap with bold and versions with status icons.
diff --git a/system/ohsnap/doinst.sh b/system/ohsnap/doinst.sh
new file mode 100644
index 0000000000..0eca8728f1
--- /dev/null
+++ b/system/ohsnap/doinst.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+( cd usr/share/fonts/misc; mkfontscale; mkfontdir )
diff --git a/system/ohsnap/ohsnap.SlackBuild b/system/ohsnap/ohsnap.SlackBuild
new file mode 100644
index 0000000000..ecae1f630b
--- /dev/null
+++ b/system/ohsnap/ohsnap.SlackBuild
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Slackware package build script for ohsnap
+
+# Written by Ian D. Brunton <iandbrunton at gmail dot com>
+# Maintained by Ian D. Brunton <iandbrunton at gmail dot com>
+# Redistribution and use with or without modification are permitted.
+# There is ABSOLUTELY NO WARRANTY, express or implied.
+
+PRGNAM=ohsnap
+VERSION=${VERSION:-1.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+install -d $PKG/usr/share/fonts/misc $PKG/usr/share/kbd/consolefonts
+gzip -9 *.pcf
+cp *.pcf.gz $PKG/usr/share/fonts/misc
+cp *.psfu $PKG/usr/share/kbd/consolefonts
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.ohsnap $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ohsnap/ohsnap.info b/system/ohsnap/ohsnap.info
new file mode 100644
index 0000000000..b2e147e2a7
--- /dev/null
+++ b/system/ohsnap/ohsnap.info
@@ -0,0 +1,10 @@
+PRGNAM="ohsnap"
+VERSION="1.8.0"
+HOMEPAGE="http://sourceforge.net/projects/osnapfont/"
+DOWNLOAD="http://downloads.sourceforge.net/project/osnapfont/ohsnap-1.8.0.tar.gz"
+MD5SUM="aeb3d8e1f9634900036f886a14b3b03a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ian D. Brunton"
+EMAIL="iandbrunton@gmail.com"
diff --git a/system/ohsnap/slack-desc b/system/ohsnap/slack-desc
new file mode 100644
index 0000000000..d98dd3bd64
--- /dev/null
+++ b/system/ohsnap/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ohsnap: ohsnap (monospaced font)
+ohsnap:
+ohsnap: Monospaced font based on Artwiz Snap with bold and versions with
+ohsnap: status icons.
+ohsnap:
+ohsnap:
+ohsnap:
+ohsnap:
+ohsnap:
+ohsnap: homepage: http://sourceforge.net/projects/osnapfont/
+ohsnap:
diff --git a/system/openmpi/README b/system/openmpi/README
index b51fc987e9..93c12dc74c 100644
--- a/system/openmpi/README
+++ b/system/openmpi/README
@@ -1,3 +1,6 @@
 The Open MPI Project is an open source MPI-2 implementation that is
 developed and maintained by a consortium of academic, research, and
 industry partners.
+
+Optional dependency:
+slurm, autodetected by configure
diff --git a/system/openmpi/openmpi.SlackBuild b/system/openmpi/openmpi.SlackBuild
index a51b11ee30..22c6ed87a3 100644
--- a/system/openmpi/openmpi.SlackBuild
+++ b/system/openmpi/openmpi.SlackBuild
@@ -5,6 +5,9 @@
 # Copyright 2010  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
+# Copyright 2015 Emmanuel N. Millán, Mendoza, Argentina.
+# All rights reserved.
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -23,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmpi
-VERSION=1.4.2
+VERSION=${VERSION:-1.8.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +70,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -92,8 +95,7 @@ mv $PKG/etc/openmpi-totalview.tcl $PKG/etc/openmpi-totalview.tcl.new
 mv $PKG/etc/openmpi-mca-params.conf $PKG/etc/openmpi-mca-params.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL LICENSE NEWS README VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL LICENSE NEWS README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/openmpi/openmpi.info b/system/openmpi/openmpi.info
index 465f345d69..e6f988bd4a 100644
--- a/system/openmpi/openmpi.info
+++ b/system/openmpi/openmpi.info
@@ -1,10 +1,10 @@
 PRGNAM="openmpi"
-VERSION="1.4.2"
+VERSION="1.8.8"
 HOMEPAGE="http://www.open-mpi.org/"
-DOWNLOAD="http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.2.tar.bz2"
-MD5SUM="53b26fa2586aedaf73cf40effbfcc2f3"
+DOWNLOAD="http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2"
+MD5SUM="0dab8e602372da1425e9242ae37faf8c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Emmanuel N. Millán"
+EMAIL="emmanueln@gmail.com"
diff --git a/system/openrc-services/doinst.sh b/system/openrc-services/doinst.sh
index 7d56715039..bcbbf31445 100644
--- a/system/openrc-services/doinst.sh
+++ b/system/openrc-services/doinst.sh
@@ -26,7 +26,7 @@ preserve_perms() {
 openrc_base=(device-mapper dmcrypt lvm mdadm mdraid udev udev-settle udev-trigger)
 openrc_desktop=(acpid alsasound xdm gpm rfcomm wpa_supplicant)
 openrc_devel=(git-daemon mysqld postgresql svn)
-openrc_misc=(bitlbee cpupower connman ntpd ntp-client sntp rsyslog saned metalog syslog-ng sensord lircd irexec haveged salt-master salt-minion salt-syncdic hdparm clamd boinc atd libvirtd)
+openrc_misc=(bitlbee cpupower connman ntpd ntp-client sntp rsyslog saned metalog pulseaudio syslog-ng sensord lircd irexec haveged salt-master salt-minion salt-syncdic hdparm clamd boinc atd libvirtd)
 openrc_net=(named dhcpd dhcrelay dhcrelay6 dnsmasq iptables ip6tables rpcbind nfs nfsclient openntpd slapd sshd openvpn quota rsyncd samba saslauthd squid transmission-daemon ufw vnstatd xinetd ypbind ypserv tor NetworkManager httpd syncthing)
 openrc_slack=(dcron sendmail snmpd snmptrapd sysklogd)
 openrc_video=(atieventsd vgl bumblebee)
diff --git a/system/openrc-services/openrc-services.SlackBuild b/system/openrc-services/openrc-services.SlackBuild
index f112647cab..e8c00aa8c3 100644
--- a/system/openrc-services/openrc-services.SlackBuild
+++ b/system/openrc-services/openrc-services.SlackBuild
@@ -24,12 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openrc-services
-VERSION=${VERSION:-20150703}
+VERSION=${VERSION:-20151010}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 _GITNAM=aadityabagga-$PRGNAM
-_GITVER=7694405bf852
+_GITVER=53d0fc38d5dd
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/system/openrc-services/openrc-services.info b/system/openrc-services/openrc-services.info
index abd33629e1..f0ec11a1a4 100644
--- a/system/openrc-services/openrc-services.info
+++ b/system/openrc-services/openrc-services.info
@@ -1,8 +1,8 @@
 PRGNAM="openrc-services"
-VERSION="20150703"
+VERSION="20151010"
 HOMEPAGE="https://bitbucket.org/aadityabagga/openrc-services"
-DOWNLOAD="https://bitbucket.org/aadityabagga/openrc-services/get/20150703.tar.gz"
-MD5SUM="81646dab8c3f9bd2755020699b781a12"
+DOWNLOAD="https://bitbucket.org/aadityabagga/openrc-services/get/20151010.tar.gz"
+MD5SUM="a4e374cbd976a4364a87bb7617436e17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openrc"
diff --git a/system/openrc/doinst.sh b/system/openrc/doinst.sh
index 8c17991f8e..a81983c32e 100644
--- a/system/openrc/doinst.sh
+++ b/system/openrc/doinst.sh
@@ -13,7 +13,7 @@ config() {
 }
 
 BACKUP_FILE=(inittab rc.conf logrotate.d/openrc)
-BACKUP_CONF=(bootmisc consolefont devfs dmesg fsck hostname hwclock keymaps killprocs localmount modules netmount network staticroute tmpfiles urandom)
+BACKUP_CONF=(bootmisc consolefont devfs dmesg fsck hostname hwclock keymaps killprocs localmount modules mtab net-online netmount network staticroute tmpfiles urandom)
 
 for file in "${BACKUP_FILE[@]}"; do
   config "etc/${file}.new"
diff --git a/system/openrc/openrc.SlackBuild b/system/openrc/openrc.SlackBuild
index 6f6f45a883..ad8d9f2dba 100644
--- a/system/openrc/openrc.SlackBuild
+++ b/system/openrc/openrc.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openrc
-VERSION=${VERSION:-0.17}
+VERSION=${VERSION:-0.19.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,7 +80,7 @@ MAKEARGS+=(SBINDIR=/sbin)
 MAKEARGS+=(MANDIR=/usr/man)
 MAKEARGS+=(DOCDIR=/usr/doc/$PRGNAM-$VERSION)
 MAKEARGS+=(MKTERMCAP=ncurses)
-MAKEARGS+=(BRANDING='Slackware Linux')
+#MAKEARGS+=(BRANDING='Slackware Linux')
 
 make "${MAKEARGS[@]}"
 
diff --git a/system/openrc/openrc.info b/system/openrc/openrc.info
index b075f82a6b..7e9e534830 100644
--- a/system/openrc/openrc.info
+++ b/system/openrc/openrc.info
@@ -1,8 +1,8 @@
 PRGNAM="openrc"
-VERSION="0.17"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:OpenRC"
-DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.17.tar.gz"
-MD5SUM="06a17ed43b07809f5dd968fc675428c3"
+VERSION="0.19.1"
+HOMEPAGE="https://github.com/OpenRC/openrc"
+DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.19.1.tar.gz"
+MD5SUM="9222c9694df6ac52909dd5703736d059"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild
index f4ce10a67b..e7dc5c71e3 100644
--- a/system/opensc/opensc.SlackBuild
+++ b/system/opensc/opensc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for opensc
 
-# Copyright 2008-2014  LukenShiro, Italy
+# Copyright 2008-2015  LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensc
-VERSION=${VERSION:-0.14.0}
+VERSION=${VERSION:-0.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info
index 52cda51b0e..142ba94b4e 100644
--- a/system/opensc/opensc.info
+++ b/system/opensc/opensc.info
@@ -1,8 +1,8 @@
 PRGNAM="opensc"
-VERSION="0.14.0"
+VERSION="0.15.0"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/"
-DOWNLOAD="http://downloads.sourceforge.net/opensc/OpenSC/opensc-0.14.0.tar.gz"
-MD5SUM="8e99885dbe28a9c71d5140f0105c56ff"
+DOWNLOAD="http://downloads.sourceforge.net/opensc/OpenSC/opensc-0.15.0.tar.gz"
+MD5SUM="01e6b803865f7b7574ee65a7b2d63c17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-lite"
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
index ff0d63e83b..5badb5039b 100644
--- a/system/parallel/parallel.SlackBuild
+++ b/system/parallel/parallel.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=parallel
-VERSION=${VERSION:-20150722}
+VERSION=${VERSION:-20151222}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info
index 4dc92134d4..004f2a3500 100644
--- a/system/parallel/parallel.info
+++ b/system/parallel/parallel.info
@@ -1,8 +1,8 @@
 PRGNAM="parallel"
-VERSION="20150722"
+VERSION="20151222"
 HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="http://ftpmirror.gnu.org/parallel/parallel-20150722.tar.bz2"
-MD5SUM="549d84033dc1c1ba123313c2237215f9"
+DOWNLOAD="http://ftpmirror.gnu.org/parallel/parallel-20151222.tar.bz2"
+MD5SUM="95e4abccb2ccbea543b9eb2c28afe74a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/partclone/README b/system/partclone/README
new file mode 100644
index 0000000000..f1e5f10d2e
--- /dev/null
+++ b/system/partclone/README
@@ -0,0 +1,6 @@
+Partclone is a program similar to the well-known backup
+utility "Partition Image" a.k.a partimage. Partclone
+provides utilities to save and restore used blocks on a
+partition and is designed for higher compatibility of the
+file system by using existing libraries, e.g. e2fslibs is
+used to read and write the ext2 partition.
diff --git a/system/partclone/partclone.SlackBuild b/system/partclone/partclone.SlackBuild
new file mode 100644
index 0000000000..566d268cd2
--- /dev/null
+++ b/system/partclone/partclone.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# Slackware build script for partclone
+
+# Copyright 2015 Kevin Paulus <goarilla@gmail.com>, Belgium
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=partclone
+VERSION=${VERSION:-0.2.80}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --enable-extfs \
+  --enable-ntfs \
+  --enable-hfsp \
+  --enable-fat \
+  --enable-exfat \
+  --enable-btrfs \
+  --enable-minix
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS COPYING INSTALL NEWS README README.Packages TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/partclone/partclone.info b/system/partclone/partclone.info
new file mode 100644
index 0000000000..c4065d3af5
--- /dev/null
+++ b/system/partclone/partclone.info
@@ -0,0 +1,10 @@
+PRGNAM="partclone"
+VERSION="0.2.80"
+HOMEPAGE="http://partclone.org"
+DOWNLOAD="http://downloads.sourceforge.net/project/partclone/stable/0.2.80/partclone_0.2.80.orig.tar.gz"
+MD5SUM="82e83d8350714d0834bde59a4a168f8c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Kevin Paulus"
+EMAIL="goarilla@gmail.com"
diff --git a/system/partclone/slack-desc b/system/partclone/slack-desc
new file mode 100644
index 0000000000..606a6cedf4
--- /dev/null
+++ b/system/partclone/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+partclone: partclone (utility to clone various filesystems)
+partclone:
+partclone: Partclone is a program similar to the well-known backup
+partclone: utility "Partition Image" a.k.a partimage. Partclone
+partclone: provides utilities to save and restore used blocks on a
+partclone: partition and is designed for higher compatibility of the
+partclone: file system by using existing libraries, e.g. e2fslibs is
+partclone: used to read and write the ext2 partition.
+partclone:
+partclone: Project maintainer Thomas Tsai 
+partclone:
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index 8a7bba59c8..c467e2a3c2 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=passwordsafe
-VERSION=${VERSION:-0.96BETA}
+VERSION=${VERSION:-0.97BETA}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCNAM=pwsafe
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index 00fbbde8b6..bf5a91516a 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,8 +1,8 @@
 PRGNAM="passwordsafe"
-VERSION="0.96BETA"
+VERSION="0.97BETA"
 HOMEPAGE="http://passwordsafe.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.96/pwsafe-0.96BETA-src.tgz"
-MD5SUM="0da54dd106895e18dcff5ed370843884"
+DOWNLOAD="http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.97/pwsafe-0.97BETA-src.tgz"
+MD5SUM="20ae6d1247ff6cf785d344e09d4db3c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ykpers xerces-c wxGTK3 xvkbd"
diff --git a/system/patool/patool.SlackBuild b/system/patool/patool.SlackBuild
index 803d05f469..ae1ad87971 100644
--- a/system/patool/patool.SlackBuild
+++ b/system/patool/patool.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for patool
 
-# Copyright 2014-2105  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=patool
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/patool/patool.info b/system/patool/patool.info
index 407d8636d1..dd74693920 100644
--- a/system/patool/patool.info
+++ b/system/patool/patool.info
@@ -1,10 +1,10 @@
 PRGNAM="patool"
-VERSION="1.8"
+VERSION="1.11"
 HOMEPAGE="http://wummel.github.io/patool/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/patool/patool-1.8.tar.gz"
-MD5SUM="3c7022d78194c27584ef874d19f32545"
+DOWNLOAD="https://pypi.python.org/packages/source/p/patool/patool-1.11.tar.gz"
+MD5SUM="6c434bc4f81c0b4ffddf2e0d504ad3b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="pysetuptools"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild
index f562b87794..7be660105f 100644
--- a/system/pcsc-lite/pcsc-lite.SlackBuild
+++ b/system/pcsc-lite/pcsc-lite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcsc-lite
 
-# Copyright 2007-2014  LukenShiro, Italy
+# Copyright 2007-2015  LukenShiro, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcsc-lite
-VERSION=${VERSION:-1.8.12}
+VERSION=${VERSION:-1.8.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info
index 0745027249..9d29bb9ad7 100644
--- a/system/pcsc-lite/pcsc-lite.info
+++ b/system/pcsc-lite/pcsc-lite.info
@@ -1,8 +1,8 @@
 PRGNAM="pcsc-lite"
-VERSION="1.8.12"
+VERSION="1.8.14"
 HOMEPAGE="http://pcsclite.alioth.debian.org"
-DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4115/pcsc-lite-1.8.12.tar.bz2"
-MD5SUM="0be8ccfe749314dc8200bddcd2d5fa43"
+DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2"
+MD5SUM="439b2c8892f502e39e5b8997a7ae01ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pcsc-tools/pcsc-tools.SlackBuild b/system/pcsc-tools/pcsc-tools.SlackBuild
index e4633ab976..9d79700ea9 100644
--- a/system/pcsc-tools/pcsc-tools.SlackBuild
+++ b/system/pcsc-tools/pcsc-tools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for pcsc-tools
 
 # Copyright 2008 Andrew Psaltis <ampsaltis@gmail.com>
-# Copyright 2011-2014 LukenShiro, Italy
+# Copyright 2011-2015 LukenShiro, Italy
 # All rights reserved.
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcsc-tools
-VERSION=${VERSION:-1.4.23}
+VERSION=${VERSION:-1.4.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENCE README TODO"
+DOCS="LICENCE README Changelog"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
diff --git a/system/pcsc-tools/pcsc-tools.info b/system/pcsc-tools/pcsc-tools.info
index 6a5d4d61a0..90334ad803 100644
--- a/system/pcsc-tools/pcsc-tools.info
+++ b/system/pcsc-tools/pcsc-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="pcsc-tools"
-VERSION="1.4.23"
+VERSION="1.4.25"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
-DOWNLOAD="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.23.tar.gz"
-MD5SUM="be8a7da2353f7601c21f8d155a2d6fd6"
+DOWNLOAD="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.25.tar.gz"
+MD5SUM="befc40d4513daec5813ee317cb382acf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-perl perl-gtk2"
diff --git a/system/pdfgrep/pdfgrep.SlackBuild b/system/pdfgrep/pdfgrep.SlackBuild
index dcc8d5b794..fcb12a5ed0 100644
--- a/system/pdfgrep/pdfgrep.SlackBuild
+++ b/system/pdfgrep/pdfgrep.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pdfgrep
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,7 +90,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS TODO NEWS INSTALL COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS TODO NEWS INSTALL COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/pdfgrep/pdfgrep.info b/system/pdfgrep/pdfgrep.info
index b72c8d7eaf..2c6db2cb41 100644
--- a/system/pdfgrep/pdfgrep.info
+++ b/system/pdfgrep/pdfgrep.info
@@ -1,8 +1,8 @@
 PRGNAM="pdfgrep"
-VERSION="1.3.2"
-HOMEPAGE="http://pdfgrep.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/pdfgrep/files/1.3.2/pdfgrep-1.3.2.tar.gz"
-MD5SUM="bdac07087711c86b5ea921d805773fda"
+VERSION="1.4.1"
+HOMEPAGE="https://pdfgrep.org/"
+DOWNLOAD="https://pdfgrep.org/download/pdfgrep-1.4.1.tar.gz"
+MD5SUM="0725b4b3a4647cea549d3654cd9aa24e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pdfgrep/slack-desc b/system/pdfgrep/slack-desc
index 94ab91c3b5..1d8bb7d5a4 100644
--- a/system/pdfgrep/slack-desc
+++ b/system/pdfgrep/slack-desc
@@ -11,7 +11,7 @@ pdfgrep:
 pdfgrep: Pdfgrep is a tool to search text in PDF files.
 pdfgrep: It works similar to grep.
 pdfgrep:
-pdfgrep: Project URL: http://pdfgrep.sourceforge.net/
+pdfgrep: Project URL: https://pdfgrep.org/
 pdfgrep:
 pdfgrep:
 pdfgrep:
diff --git a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
index 6116e490a1..ac740571bb 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
+++ b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for phoronix-test-suite
 
-# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=phoronix-test-suite
-VERSION=${VERSION:-5.8.1}
+VERSION=${VERSION:-6.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/phoronix-test-suite/phoronix-test-suite.info b/system/phoronix-test-suite/phoronix-test-suite.info
index 2e0a6e0c2c..003d2146b8 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.info
+++ b/system/phoronix-test-suite/phoronix-test-suite.info
@@ -1,8 +1,8 @@
 PRGNAM="phoronix-test-suite"
-VERSION="5.8.1"
+VERSION="6.0.1"
 HOMEPAGE="http://phoronix-test-suite.com/"
-DOWNLOAD="http://www.phoronix-test-suite.com/releases/phoronix-test-suite-5.8.1.tar.gz"
-MD5SUM="262de24538141bdecd1d792dc0beb1e4"
+DOWNLOAD="http://www.phoronix-test-suite.com/releases/phoronix-test-suite-6.0.1.tar.gz"
+MD5SUM="c3b26fcc57a3a253e558f759fdc1089f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/postgresql/postgresql.SlackBuild b/system/postgresql/postgresql.SlackBuild
index 777aa777a1..f41d2e9b38 100644
--- a/system/postgresql/postgresql.SlackBuild
+++ b/system/postgresql/postgresql.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for PostgreSQL
 #
-# $Revision: 577bd5ace24b $
-# $Date: 2015/06/28 13:38:59 $
+# $Revision: 6560bf705e09 $
+# $Date: 2015/10/23 04:29:48 $
 #
 # Copyright 2007-2015 Adis Nezirovic <adis_at_linux.org.ba>
 # All rights reserved.
@@ -28,7 +28,7 @@
 # Modified by the SlackBuilds.org Project
 
 PRGNAM=postgresql
-VERSION=${VERSION:-9.4.4}
+VERSION=${VERSION:-9.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/postgresql/postgresql.info b/system/postgresql/postgresql.info
index d922d5adf9..a7638c9594 100644
--- a/system/postgresql/postgresql.info
+++ b/system/postgresql/postgresql.info
@@ -1,8 +1,8 @@
 PRGNAM="postgresql"
-VERSION="9.4.4"
+VERSION="9.4.5"
 HOMEPAGE="http://www.postgresql.org"
-DOWNLOAD="http://ftp.postgresql.org/pub/source/v9.4.4/postgresql-9.4.4.tar.bz2"
-MD5SUM="1fe952c44ed26d7e6a335cf991a9c1c6"
+DOWNLOAD="http://ftp.postgresql.org/pub/source/v9.4.5/postgresql-9.4.5.tar.bz2"
+MD5SUM="8b2e3472a8dc786649b4d02d02e039a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/profile-cleaner/profile-cleaner.SlackBuild b/system/profile-cleaner/profile-cleaner.SlackBuild
index 80628ddb19..6980ce44cd 100644
--- a/system/profile-cleaner/profile-cleaner.SlackBuild
+++ b/system/profile-cleaner/profile-cleaner.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=profile-cleaner
-VERSION=${VERSION:-2.34}
+VERSION=${VERSION:-2.35}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/profile-cleaner/profile-cleaner.info b/system/profile-cleaner/profile-cleaner.info
index 8b1167a6e1..caaa2d2191 100644
--- a/system/profile-cleaner/profile-cleaner.info
+++ b/system/profile-cleaner/profile-cleaner.info
@@ -1,8 +1,8 @@
 PRGNAM="profile-cleaner"
-VERSION="2.34"
+VERSION="2.35"
 HOMEPAGE="https://github.com/graysky2/profile-cleaner/"
-DOWNLOAD="https://github.com/graysky2/profile-cleaner/archive/v2.34.tar.gz"
-MD5SUM="0f0e812c6029aebf721e206f4dd83a4e"
+DOWNLOAD="https://github.com/graysky2/profile-cleaner/archive/v2.35.tar.gz"
+MD5SUM="023544be8d6514e9534d63db1115a7ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="parallel"
diff --git a/system/pwgen/pwgen.SlackBuild b/system/pwgen/pwgen.SlackBuild
index 3ae97d08b1..77872706c6 100644
--- a/system/pwgen/pwgen.SlackBuild
+++ b/system/pwgen/pwgen.SlackBuild
@@ -30,7 +30,7 @@
 # No additional license terms added
 
 APP=pwgen
-VERSION=2.06
+VERSION=${VERSION:-2.07}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,7 +73,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,19 +86,16 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ); do
-    ln -s $( readlink $i ).gz $i.gz;
-    rm $i;
-  done
-)
+mv $PKG/usr/share/man $PKG/usr/man
+rm -rf $PKG/usr/share
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$APP-$VERSION
-cp -t $PKG/usr/doc/$APP-$VERSION ChangeLog
 cp $CWD/$APP.SlackBuild $PKG/usr/doc/$APP-$VERSION/
 find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
 
diff --git a/system/pwgen/pwgen.info b/system/pwgen/pwgen.info
index 140d7936c0..cc4b708c2a 100644
--- a/system/pwgen/pwgen.info
+++ b/system/pwgen/pwgen.info
@@ -1,8 +1,8 @@
 PRGNAM="pwgen"
-VERSION="2.06"
+VERSION="2.07"
 HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-DOWNLOAD="http://downloads.sourceforge.net/pwgen/pwgen-2.06.tar.gz"
-MD5SUM="935aebcbe610fbc9de8125e7b7d71297"
+DOWNLOAD="http://downloads.sourceforge.net/pwgen/pwgen-2.07.tar.gz"
+MD5SUM="910b1008cdd86445e9e01305d21ee4c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pyarchey/README b/system/pyarchey/README
index 54d06964ea..9cdd36bac5 100644
--- a/system/pyarchey/README
+++ b/system/pyarchey/README
@@ -1,2 +1,2 @@
-A simple python scrip to display an OS logo in ASCII art along with 
+A simple python script to display an OS logo in ASCII art along with 
 basic system information.
diff --git a/system/pyarchey/pyarchey.SlackBuild b/system/pyarchey/pyarchey.SlackBuild
index 957123e14a..34bfc20e5e 100644
--- a/system/pyarchey/pyarchey.SlackBuild
+++ b/system/pyarchey/pyarchey.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyarchey
 
-# Copyright 2015 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2015  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyarchey
-VERSION=${VERSION:-0.6.1}
+VERSION=${VERSION:-0.6.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/pyarchey/pyarchey.info b/system/pyarchey/pyarchey.info
index 933fdf9c10..010a938b24 100644
--- a/system/pyarchey/pyarchey.info
+++ b/system/pyarchey/pyarchey.info
@@ -1,8 +1,8 @@
 PRGNAM="pyarchey"
-VERSION="0.6.1"
+VERSION="0.6.7"
 HOMEPAGE="https://github.com/walchko/pyarchey"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pyarchey/pyarchey-0.6.1.tar.gz"
-MD5SUM="73796165adfb86e730ccb4c87b018ddc"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pyarchey/pyarchey-0.6.7.tar.gz"
+MD5SUM="a2a5456d86dc0983eff69b748790a7cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysetuptools psutil"
diff --git a/system/pycp/README b/system/pycp/README
new file mode 100644
index 0000000000..5b31c1946b
--- /dev/null
+++ b/system/pycp/README
@@ -0,0 +1,7 @@
+pycp (cp and mv with a progressbar)
+
+pycp / pymv are meant to be used from the command line.
+
+pycp.pbar was heavily based on the wonderful library progressbar by Nilton Volpato.
+
+About usage... please check man page.
diff --git a/system/pycp/pycp.SlackBuild b/system/pycp/pycp.SlackBuild
new file mode 100644
index 0000000000..173679b2d6
--- /dev/null
+++ b/system/pycp/pycp.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Slackware build script for pycp.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pycp
+VERSION=${VERSION:-7.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG --optimize=1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PYTHONPATH=. help2man --no-info --output pycp.1 $PKG/usr/bin/pycp
+PYTHONPATH=. help2man --no-info --output pymv.1 $PKG/usr/bin/pymv
+mkdir -p $PKG/usr/man/man1
+cp -a pycp.1 pymv.1 $PKG/usr/man/man1/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCS="COPYING.txt README.txt PKG-INFO"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/pycp/pycp.info b/system/pycp/pycp.info
new file mode 100644
index 0000000000..f2722701f0
--- /dev/null
+++ b/system/pycp/pycp.info
@@ -0,0 +1,10 @@
+PRGNAM="pycp"
+VERSION="7.1"
+HOMEPAGE="https://github.com/yannicklm/pycp"
+DOWNLOAD="http://pypi.python.org/packages/source/p/pycp/pycp-7.1.tar.gz"
+MD5SUM="65a1ce3f035d109e947c1cb9a39732cc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pysetuptools"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/pycp/slack-desc b/system/pycp/slack-desc
new file mode 100644
index 0000000000..20bffff170
--- /dev/null
+++ b/system/pycp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+pycp: pycp (cp and mv with a progressbar)
+pycp:
+pycp: pycp / pymv are meant to be used from the command line.
+pycp:
+pycp: Home page: https://github.com/yannicklm/pycp
+pycp:
+pycp:
+pycp:
+pycp:
+pycp:
+pycp:
diff --git a/system/pymux/README b/system/pymux/README
new file mode 100644
index 0000000000..89a3c6f5fa
--- /dev/null
+++ b/system/pymux/README
@@ -0,0 +1 @@
+A terminal multiplexer (like tmux) in Python
diff --git a/system/pymux/pymux.SlackBuild b/system/pymux/pymux.SlackBuild
new file mode 100644
index 0000000000..1072e7e1ce
--- /dev/null
+++ b/system/pymux/pymux.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Slackware build script for pymux
+
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=pymux
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix module import
+sed -i "7s/pyte import ctrl/pyte import control as ctrl/" pymux/stream.py
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/pymux/pymux.info b/system/pymux/pymux.info
new file mode 100644
index 0000000000..0a701b1e18
--- /dev/null
+++ b/system/pymux/pymux.info
@@ -0,0 +1,10 @@
+PRGNAM="pymux"
+VERSION="0.5"
+HOMEPAGE="https://github.com/jonathanslenders/pymux"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pymux/pymux-0.5.tar.gz"
+MD5SUM="01a8bf29cc90aea61788f2484b12ce0b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="prompt_toolkit pyte docopt"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/pymux/slack-desc b/system/pymux/slack-desc
new file mode 100644
index 0000000000..7113135114
--- /dev/null
+++ b/system/pymux/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+pymux: pymux (Python terminal multiplexer)
+pymux:
+pymux: A terminal multiplexer (like tmux) in Python
+pymux:
+pymux: Homepage: https://github.com/jonathanslenders/pymux
+pymux:
+pymux:
+pymux:
+pymux:
+pymux:
+pymux:
diff --git a/system/qemu/README b/system/qemu/README
index 1382146ef9..f912f07f70 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -18,7 +18,7 @@ Disable vnc support via:
 
   VNC_ENABLE=no ./qemu.SlackBuild
 
-Audio drivers support defaults to "alsa,oss,sdl,esd" and can be adusted via
+Audio drivers support defaults to "alsa,oss,sdl" and can be adusted via
 
 AUDIODRIVERS="alsa,oss" ./qemu.SlackBuild
 
@@ -41,4 +41,4 @@ NOTES:
   Consult the official changelogs for details.
 
   Slackware's libusb is too old. Thus, to enable usb redirection, install
-  usbredir and build with LIBUSB=yes ./qemu.SlackBuild
+  usbredir, download libusb-1.19, and build with LIBUSB=yes ./qemu.SlackBuild
diff --git a/system/qemu/patches/qemu_atapi.patch b/system/qemu/patches/qemu_atapi.patch
deleted file mode 100644
index f977b4f281..0000000000
--- a/system/qemu/patches/qemu_atapi.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
-index 950e311..79dd167 100644 (file)
---- a/hw/ide/atapi.c
-+++ b/hw/ide/atapi.c
-@@ -983,6 +983,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf)
- 
-     if (pwrcnd) {
-         /* eject/load only happens for power condition == 0 */
-+        ide_atapi_cmd_ok(s);
-         return;
-     }
- 
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index 122e955..50449ca 100644 (file)
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -2021,11 +2021,17 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val)
-     }
- 
-     p = s->data_ptr;
-+    if (p + 2 > s->data_end) {
-+        return;
-+    }
-+
-     *(uint16_t *)p = le16_to_cpu(val);
-     p += 2;
-     s->data_ptr = p;
--    if (p >= s->data_end)
-+    if (p >= s->data_end) {
-+        s->status &= ~DRQ_STAT;
-         s->end_transfer_func(s);
-+    }
- }
- 
- uint32_t ide_data_readw(void *opaque, uint32_t addr)
-@@ -2042,11 +2048,17 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr)
-     }
- 
-     p = s->data_ptr;
-+    if (p + 2 > s->data_end) {
-+        return 0;
-+    }
-+
-     ret = cpu_to_le16(*(uint16_t *)p);
-     p += 2;
-     s->data_ptr = p;
--    if (p >= s->data_end)
-+    if (p >= s->data_end) {
-+        s->status &= ~DRQ_STAT;
-         s->end_transfer_func(s);
-+    }
-     return ret;
- }
- 
-@@ -2063,11 +2075,17 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val)
-     }
- 
-     p = s->data_ptr;
-+    if (p + 4 > s->data_end) {
-+        return;
-+    }
-+
-     *(uint32_t *)p = le32_to_cpu(val);
-     p += 4;
-     s->data_ptr = p;
--    if (p >= s->data_end)
-+    if (p >= s->data_end) {
-+        s->status &= ~DRQ_STAT;
-         s->end_transfer_func(s);
-+    }
- }
-
- uint32_t ide_data_readl(void *opaque, uint32_t addr)
-@@ -2084,11 +2102,17 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr)
-     }
- 
-     p = s->data_ptr;
-+    if (p + 4 > s->data_end) {
-+        return 0;
-+    }
-+
-     ret = cpu_to_le32(*(uint32_t *)p);
-     p += 4;
-     s->data_ptr = p;
--    if (p >= s->data_end)
-+    if (p >= s->data_end) {
-+        s->status &= ~DRQ_STAT;
-         s->end_transfer_func(s);
-+    }
-     return ret;
- }
diff --git a/system/qemu/patches/qemu_pcnet.patch b/system/qemu/patches/qemu_pcnet.patch
deleted file mode 100644
index 25c89cd90b..0000000000
--- a/system/qemu/patches/qemu_pcnet.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-index bdfd38f..68b9981 100644 (file)
---- a/hw/net/pcnet.c
-+++ b/hw/net/pcnet.c
-@@ -1241,6 +1241,14 @@ static void pcnet_transmit(PCNetState *s)
-         }
- 
-         bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
-+
-+        /* if multi-tmd packet outsizes s->buffer then skip it silently.
-+           Note: this is not what real hw does */
-+        if (s->xmit_pos + bcnt > sizeof(s->buffer)) {
-+            s->xmit_pos = -1;
-+            goto txdone;
-+        }
-+
-         s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr),
-                          s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s));
-         s->xmit_pos += bcnt;
diff --git a/system/qemu/patches/qemu_venom.patch b/system/qemu/patches/qemu_venom.patch
deleted file mode 100644
index 0bbd18c223..0000000000
--- a/system/qemu/patches/qemu_venom.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-index f72a392..d8a8edd 100644 (file)
---- a/hw/block/fdc.c
-+++ b/hw/block/fdc.c
-@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
- {
-     FDrive *cur_drv;
-     uint32_t retval = 0;
--    int pos;
-+    uint32_t pos;
- 
-     cur_drv = get_cur_drv(fdctrl);
-     fdctrl->dsr &= ~FD_DSR_PWRDOWN;
-@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
-         return 0;
-     }
-     pos = fdctrl->data_pos;
-+    pos %= FD_SECTOR_LEN;
-     if (fdctrl->msr & FD_MSR_NONDMA) {
--        pos %= FD_SECTOR_LEN;
-         if (pos == 0) {
-             if (fdctrl->data_pos != 0)
-                 if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
-@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction)
- static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction)
- {
-     FDrive *cur_drv = get_cur_drv(fdctrl);
-+    uint32_t pos;
- 
--    if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
-+    pos = fdctrl->data_pos - 1;
-+    pos %= FD_SECTOR_LEN;
-+    if (fdctrl->fifo[pos] & 0x80) {
-         /* Command parameters done */
--        if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
-+        if (fdctrl->fifo[pos] & 0x40) {
-             fdctrl->fifo[0] = fdctrl->fifo[1];
-             fdctrl->fifo[2] = 0;
-             fdctrl->fifo[3] = 0;
-@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256];
- static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
- {
-     FDrive *cur_drv;
--    int pos;
-+    uint32_t pos;
- 
-     /* Reset mode */
-     if (!(fdctrl->dor & FD_DOR_nRESET)) {
-@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
-     }
- 
-     FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
--    fdctrl->fifo[fdctrl->data_pos++] = value;
-+    pos = fdctrl->data_pos++;
-+    pos %= FD_SECTOR_LEN;
-+    fdctrl->fifo[pos] = value;
-     if (fdctrl->data_pos == fdctrl->data_len) {
-         /* We now have all parameters
-          * and will be able to treat the command
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 2d563cf528..d3bc3b53c1 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for qemu
 
 # Copyright 2009, 2010  Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2013, 2014  Edward Koenig, Vancouver, USA <kingbeowulf@gmail.com>
+# Copyright 2013-2015  Edward Koenig, Vancouver, USA <kingbeowulf@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -42,16 +42,18 @@
 # 1.9   14-MAY-2015     patched for "Venom" CVE-2015-3456 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e907746266721f305d67bc0718795fedee2e824c
 # 2.0   11-JUL-2015     patched for Heap-based buffer overflow in the PCNET controller CVE-2015-3209 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=9f7c594c006289ad41169b854d70f5da6e400a2a
 # 2.1   27-JUL-2015     patched for heap overflow flaw while processing certain ATAPI commands CVE-2015-5154 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e40db4c6d391419c0039fe274c74df32a6ca1a28;hp=f793d97e454a56d17e404004867985622ca1a63b
+# 3.0   05-SEP-2015     uprgraded to new version
+# 3.1   13-DEC-2015     uprgraded to new version, minor clean ups
 
 PRGNAM=qemu
-VERSION=${VERSION:-2.3.0}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-2.4.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KVMGROUP=${KVMGROUP:-users}
 TARGETS=${TARGETS:-some}
 VNC_ENABLE=${VNC_ENABLE:-yes}
-AUDIODRIVERS=${AUDIODRIVERS:-alsa,oss,sdl,esd}
+AUDIODRIVERS=${AUDIODRIVERS:-alsa,oss,sdl}
 LIBUSB=${LIBUSB:-no}
 
 if [ -z "$ARCH" ]; then
@@ -139,15 +141,6 @@ if [ "$LIBUSB" = "yes" ]; then
   USBSTATIC="$TMP/$PRGNAM-$VERSION/libusb-static/lib/pkgconfig"
 fi
 
-# patch Venom bug CVE-2015-3456
-patch -p1 < $CWD/patches/qemu_venom.patch
-
-# patch PCNET controller bug CVE-2015-3209
-patch -p1 < $CWD/patches/qemu_pcnet.patch
-
-# patch ATAPI heap overflow bug CVE-2015-5154
-patch -p1 < $CWD/patches/qemu_atapi.patch
-
 PKG_CONFIG_PATH+="${USBSTATIC}" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index c8fa221825..aafd04cbd3 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,9 +1,9 @@
 PRGNAM="qemu"
-VERSION="2.3.0"
+VERSION="2.4.1"
 HOMEPAGE="http://wiki.qemu.org/Main_Page"
-DOWNLOAD="http://wiki.qemu.org/download/qemu-2.3.0.tar.bz2 \
+DOWNLOAD="http://wiki.qemu.org/download/qemu-2.4.1.tar.bz2 \
           http://harrier.slackbuilds.org/misc/libusb-1.0.19.tar.xz"
-MD5SUM="2fab3ea4460de9b57192e5b8b311f221 \
+MD5SUM="a895e93ec1dafc34bc64ed676f0d55a6 \
         30fcf0865e8945a39d7d136f907e933c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/rabbitmq-server/README b/system/rabbitmq-server/README
new file mode 100644
index 0000000000..b463dfd9de
--- /dev/null
+++ b/system/rabbitmq-server/README
@@ -0,0 +1,12 @@
+RabbitMQ is a feature rich, multi-protocol messaging broker.
+It supports:
+    AMQP 0-9-1
+    STOMP 1.0 through 1.2
+    MQTT 3.1.1
+    AMQP 1.0
+
+This script requires a 'rabbitmq' user/group to exist before
+running. The recommended UID/GID is 319. 
+You can create these like so:
+    groupadd -g 319 rabbitmq 
+    useradd -u 319 -g 319 -c "Rabbit MQ" -d /var/lib/rabbitmq -s /bin/sh rabbitmq 
diff --git a/system/rabbitmq-server/doinst.sh b/system/rabbitmq-server/doinst.sh
new file mode 100644
index 0000000000..7c748bc08a
--- /dev/null
+++ b/system/rabbitmq-server/doinst.sh
@@ -0,0 +1,23 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.rabbitmq.new
+config etc/rabbitmq/rabbitmq-env.conf.new
diff --git a/system/rabbitmq-server/rabbitmq-env.conf b/system/rabbitmq-server/rabbitmq-env.conf
new file mode 100644
index 0000000000..6918e6c0fb
--- /dev/null
+++ b/system/rabbitmq-server/rabbitmq-env.conf
@@ -0,0 +1,6 @@
+NODENAME=rabbit
+NODE_IP_ADDRESS=0.0.0.0
+NODE_PORT=5672
+
+LOG_BASE=/var/log/rabbitmq
+MNESIA_BASE=/var/lib/rabbitmq/mnesia
diff --git a/system/rabbitmq-server/rabbitmq-server.SlackBuild b/system/rabbitmq-server/rabbitmq-server.SlackBuild
new file mode 100644
index 0000000000..a9e5d2ca59
--- /dev/null
+++ b/system/rabbitmq-server/rabbitmq-server.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Slackware build script for RabbitMQ Server
+
+# Copyright 2015 Andre Barboza, Belo Horizonte - Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=rabbitmq-server
+VERSION=${VERSION:-3.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+RABBITMQ_USER=${RABBITMQ_USER:-rabbitmq}
+RABBITMQ_UID=${RABBITMQ_UID:-319}
+RABBITMQ_GROUP=${RABBITMQ_GROUP:-rabbitmq}
+RABBITMQ_GID=${RABBITMQ_GID:-319}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+bailout() {
+  echo "  You must have a $RABBITMQ_USER user and $RABBITMQ_GROUP group to run this script. "
+  echo "  Something like this should suffice for most systems: "
+  echo "    # groupadd -g $RABBITMQ_GID $RABBITMQ_GROUP "
+  echo "    # useradd -u $RABBITMQ_UID -g $RABBITMQ_GID -c \"Rabbit MQ\" -d /var/lib/rabbitmq -s /bin/sh $RABBITMQ_USER "
+  echo "  Giving /bin/sh as $RABBITMQ_USER shell is important as the init script will try tu 'su -' to it."
+  exit 1
+}
+
+# Bail if user and/or group isn't valid on your system
+# uid=319 is suggested to avoid conflicts with other SBo packages,
+# but it's your call: http://slackbuilds.org/uid_gid.txt
+if ! grep -q "^$RABBITMQ_USER:" /etc/passwd; then
+  bailout
+elif ! grep -q "^$RABBITMQ_GROUP:" /etc/group; then
+  bailout
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+make docs
+make install install-man\
+  PREFIX=/usr \
+  DESTDIR=$PKG \
+  MANDIR=/usr/man \
+  RMQ_ROOTDIR=/usr/lib${LIBDIRSUFFIX}/erlang
+
+mkdir -p ${PKG}/usr/bin
+(
+  cd ${PKG}/usr/bin
+  ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmq-defaults
+  ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmq-env
+  ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmq-plugins
+  ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmq-server
+  ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmqctl
+)
+
+install -dm 750 ${PKG}/var/log/rabbitmq
+install -dm 750 ${PKG}/var/lib/rabbitmq/mnesia
+chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/var/{lib,log}/rabbitmq
+
+install -dm 750 ${PKG}/etc/rabbitmq
+install -m 644 $CWD/rabbitmq-env.conf $PKG/etc/rabbitmq/rabbitmq-env.conf.new
+install -m 644 docs/rabbitmq.config.example ${PKG}/etc/rabbitmq/
+chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/etc/rabbitmq
+
+mkdir -p ${PKG}/etc/rc.d
+install -o root -g root -m 644 $CWD/rc.rabbitmq $PKG/etc/rc.d/rc.rabbitmq.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md LICENSE  README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/rabbitmq-server/rabbitmq-server.info b/system/rabbitmq-server/rabbitmq-server.info
new file mode 100644
index 0000000000..7a557f0106
--- /dev/null
+++ b/system/rabbitmq-server/rabbitmq-server.info
@@ -0,0 +1,10 @@
+PRGNAM="rabbitmq-server"
+VERSION="3.6.0"
+HOMEPAGE="https://www.rabbitmq.com/"
+DOWNLOAD="https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.0/rabbitmq-server-3.6.0.tar.xz"
+MD5SUM="b47c4b292c73751c4132d72521b5bfe4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="erlang-otp"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
diff --git a/system/rabbitmq-server/rc.rabbitmq b/system/rabbitmq-server/rc.rabbitmq
new file mode 100644
index 0000000000..9f6715bcc2
--- /dev/null
+++ b/system/rabbitmq-server/rc.rabbitmq
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Start/stop/restart Rabbit MQ daemon
+
+USER=rabbitmq
+DAEMON_START_OPTS="-detached"
+
+rabbitmq_start(){
+	sudo -u ${USER} sh -c "/usr/bin/rabbitmq-server ${DAEMON_START_OPTS}"
+}
+
+rabbitmq_stop() {
+	sudo -u ${USER} sh -c "/usr/bin/rabbitmqctl stop"
+}
+
+rabbitmq_restart() {
+	rabbitmq_stop
+	sleep 1
+	rabbitmq_start
+}
+
+rabbitmq_status() {
+	sudo -u ${USER} sh -c "/usr/bin/rabbitmqctl status"
+}
+
+print_usage() {
+	echo "usage $0 start|stop|restart|status"
+}
+
+case "$1" in
+	'start')
+		rabbitmq_start
+	      	;;
+	'stop')
+		rabbitmq_stop
+	      	;;
+	'restart')
+		rabbitmq_restart
+	      	;;
+	'status')
+		rabbitmq_status
+		;;
+	*)
+		print_usage
+		;;
+esac
diff --git a/system/rabbitmq-server/slack-desc b/system/rabbitmq-server/slack-desc
new file mode 100644
index 0000000000..6713ffe293
--- /dev/null
+++ b/system/rabbitmq-server/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+rabbitmq-server: rabbitmq-server (Open source multi-protocol messaging broker)
+rabbitmq-server:
+rabbitmq-server: RabbitMQ is a feature rich, multi-protocol messaging broker.
+rabbitmq-server: It supports:
+rabbitmq-server:   AMQP 0-9-1
+rabbitmq-server:   STOMP 1.0 through 1.2
+rabbitmq-server:   MQTT 3.1.1
+rabbitmq-server:   AMQP 1.0
+rabbitmq-server:
+rabbitmq-server: Homepage: http://www.rabbitmq.com/
+rabbitmq-server:
diff --git a/system/rar/rar.SlackBuild b/system/rar/rar.SlackBuild
index 4fcd7c2e11..ca8f3467a4 100644
--- a/system/rar/rar.SlackBuild
+++ b/system/rar/rar.SlackBuild
@@ -3,11 +3,11 @@
 # Slackware build script for rar
 
 # Written by Steven Pledger <spledger91@yahoo.com>
-# Modified by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com
+# Modified by Ozan Türkyılmaz <ozan.turkyilmaz@gmail.com>
 # Modified by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=rar
-VERSION=${VERSION:-5.2.1}
+VERSION=${VERSION:-5.3.b6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rar/rar.info b/system/rar/rar.info
index 422af00706..b1ffe98703 100644
--- a/system/rar/rar.info
+++ b/system/rar/rar.info
@@ -1,10 +1,10 @@
 PRGNAM="rar"
-VERSION="5.2.1"
+VERSION="5.3.b6"
 HOMEPAGE="http://www.rarlab.com/"
-DOWNLOAD="http://www.rarlab.com/rar/rarlinux-5.2.1.tar.gz"
-MD5SUM="d5a541a74f63b2c712ae6e6cd1d5f50c"
-DOWNLOAD_x86_64="http://www.rarlab.com/rar/rarlinux-x64-5.2.1.tar.gz"
-MD5SUM_x86_64="7c7139c4405f3277eaad1341f9bf4f8d"
+DOWNLOAD="http://www.rarlab.com/rar/rarlinux-5.3.b6.tar.gz"
+MD5SUM="a042f6f842c4931d5a7162c4872f9f6e"
+DOWNLOAD_x86_64="http://www.rarlab.com/rar/rarlinux-x64-5.3.b6.tar.gz"
+MD5SUM_x86_64="c995918a388bb57b5181c0145ea990a6"
 REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/system/rar2fs/rar2fs.SlackBuild b/system/rar2fs/rar2fs.SlackBuild
index 0beb1fafdf..e3a4ff7364 100644
--- a/system/rar2fs/rar2fs.SlackBuild
+++ b/system/rar2fs/rar2fs.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rar2fs
-VERSION=${VERSION:-1.20.0}
+VERSION=${VERSION:-1.21.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rar2fs/rar2fs.info b/system/rar2fs/rar2fs.info
index 361d412363..973dddc0fc 100644
--- a/system/rar2fs/rar2fs.info
+++ b/system/rar2fs/rar2fs.info
@@ -1,8 +1,8 @@
 PRGNAM="rar2fs"
-VERSION="1.20.0"
+VERSION="1.21.0"
 HOMEPAGE="https://github.com/hasse69/rar2fs"
-DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.20.0/rar2fs-1.20.0.tar.gz"
-MD5SUM="1cd32b77522eff7fb3db3f7049725a82"
+DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.21.0/rar2fs-1.21.0.tar.gz"
+MD5SUM="afe744740f9ca71986a798bba1fe8b44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="unrar"
diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild
index 8af4397f7d..c6370a6d70 100644
--- a/system/redis/redis.SlackBuild
+++ b/system/redis/redis.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=redis
-VERSION=${VERSION:-3.0.2}
+VERSION=${VERSION:-3.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/redis/redis.info b/system/redis/redis.info
index 0eff44555f..e64c1b8c78 100644
--- a/system/redis/redis.info
+++ b/system/redis/redis.info
@@ -1,8 +1,8 @@
 PRGNAM="redis"
-VERSION="3.0.2"
+VERSION="3.0.4"
 HOMEPAGE="http://redis.io/"
-DOWNLOAD="http://download.redis.io/releases/redis-3.0.2.tar.gz"
-MD5SUM="87be8867447f62524b584813e5a7bd14"
+DOWNLOAD="http://download.redis.io/releases/redis-3.0.4.tar.gz"
+MD5SUM="9e535dea3dc5301de012047bf3cca952"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/refind/refind.SlackBuild b/system/refind/refind.SlackBuild
index 1a71c2d311..b0aa43c7d0 100644
--- a/system/refind/refind.SlackBuild
+++ b/system/refind/refind.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=refind
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,12 +58,10 @@ chown -R root:root .
 REFIND_SHARE_DIR=$PKG/usr/share/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/sbin
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKG/etc/${PRGNAM}.d/keys
 mkdir -p $REFIND_SHARE_DIR
 
 # copy keys
-cp keys/* $PKG/etc/${PRGNAM}.d/keys
-cp -ra refind install.sh fonts banners $REFIND_SHARE_DIR
+cp -ra keys refind install.sh fonts banners $REFIND_SHARE_DIR
 cp mkrlconf.sh mvrefind.sh $PKG/usr/sbin
 cp -a docs/* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 
diff --git a/system/refind/refind.info b/system/refind/refind.info
index af67db629a..a02336b8ab 100644
--- a/system/refind/refind.info
+++ b/system/refind/refind.info
@@ -1,8 +1,8 @@
 PRGNAM="refind"
-VERSION="0.8.3"
+VERSION="0.9.1"
 HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="http://sourceforge.net/projects/refind/files/0.8.3/refind-bin-0.8.3.zip"
-MD5SUM="c944a3f4f3017ee267a00dbf964cfc9a"
+DOWNLOAD="http://sourceforge.net/projects/refind/files/0.9.1/refind-bin-0.9.1.zip"
+MD5SUM="be44329ba6beee481df32109db52354f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/rover/README b/system/rover/README
new file mode 100644
index 0000000000..8789dd1ff2
--- /dev/null
+++ b/system/rover/README
@@ -0,0 +1,21 @@
+Rover is a file browser for the terminal.
+
+The main goal is to provide a faster way to explore a file system from
+the terminal, compared to what's possible by using cd, ls, etc. Rover
+has vi-like key bindings for navigation and can open files in $PAGER
+and $EDITOR. Basic file system operations are also implemented Rover 
+is designed to be simple, fast and portable.
+
+CUSTOMIZATION
+-------------
+To customize rover edit config.h in the source tarball and
+place it in the config directory before running the script.
+
+Example:
+
+$ cd rover-0.4.0
+$ vi config.h
+[make customizations]
+$ cp -a config.h ../config/
+$ cd ..
+# ./rover.SlackBuild
\ No newline at end of file
diff --git a/system/rover/rover.SlackBuild b/system/rover/rover.SlackBuild
new file mode 100644
index 0000000000..d46ade4cc5
--- /dev/null
+++ b/system/rover/rover.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# Slackware build script for rover
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=rover
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Allows using a custom config.h with rover
+if [ "$(ls $CWD/config)" ]; then
+    for i in $(ls $CWD/config); do
+       cp -a $CWD/config/config.h config.h
+    done
+fi
+
+make CFLAGS="$SLKCFLAGS"
+make install \
+  PREFIX=/usr \
+  DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/rover/rover.info b/system/rover/rover.info
new file mode 100644
index 0000000000..44976fc036
--- /dev/null
+++ b/system/rover/rover.info
@@ -0,0 +1,10 @@
+PRGNAM="rover"
+VERSION="0.4.0"
+HOMEPAGE="https://github.com/lecram/rover"
+DOWNLOAD="https://github.com/lecram/rover/archive/v0.4.0.tar.gz"
+MD5SUM="ebb4298ffc76b6d48ce62d78eff8ef42"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
\ No newline at end of file
diff --git a/system/rover/slack-desc b/system/rover/slack-desc
new file mode 100644
index 0000000000..924d806bfc
--- /dev/null
+++ b/system/rover/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+rover: rover (simple file browser for the terminal)
+rover:
+rover: The main goal is to provide a faster way to explore a file system from
+rover: the terminal, compared to what's possible by using cd, ls, etc. Rover
+rover: has vi-like key bindings for navigation and can open files in $PAGER
+rover: and $EDITOR. Basic file system operations are also implemented Rover
+rover: is designed to be simple, fast and portable.
+rover:
+rover: Homepage: https://github.com/lecram/rover
+rover:
+rover:
diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild
index 531d570b5c..d1b9e1679e 100644
--- a/system/rsyslog/rsyslog.SlackBuild
+++ b/system/rsyslog/rsyslog.SlackBuild
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rsyslog
-VERSION=${VERSION:-8.10.0}
+VERSION=${VERSION:-8.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info
index 82da3f54a6..81773b758f 100644
--- a/system/rsyslog/rsyslog.info
+++ b/system/rsyslog/rsyslog.info
@@ -1,8 +1,8 @@
 PRGNAM="rsyslog"
-VERSION="8.10.0"
+VERSION="8.14.0"
 HOMEPAGE="http://www.rsyslog.com/"
-DOWNLOAD="http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.10.0.tar.gz"
-MD5SUM="983e17cb10b683e826db395618933d4b"
+DOWNLOAD="http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.14.0.tar.gz"
+MD5SUM="9862b08fd8d13753c13d7f9d86ec8f4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% docutils json-c libee libestr liblogging"
diff --git a/system/s3ql/README b/system/s3ql/README
new file mode 100644
index 0000000000..272e9f257a
--- /dev/null
+++ b/system/s3ql/README
@@ -0,0 +1,17 @@
+S3QL is a file system that stores all its data online using storage
+services like Google Storage, Amazon S3, or OpenStack. S3QL
+effectively provides a hard disk of dynamic, infinite capacity that
+can be accessed from any computer with internet access running
+Linux, FreeBSD or OS-X.
+
+S3QL is a standard conforming, full featured UNIX file system that is
+conceptually indistinguishable from any local file system. Furthermore,
+S3QL has additional features like compression, encryption, data
+de-duplication, immutable trees and snapshotting which make it especially
+suitable for online backup and archival.
+
+S3QL is designed to favor simplicity and elegance over performance and
+feature-creep. Care has been taken to make the source code as readable and
+serviceable as possible. Solid error detection and error handling have
+been included from the very first line, and S3QL comes with extensive
+automated test cases for all its components.
diff --git a/system/s3ql/s3ql.SlackBuild b/system/s3ql/s3ql.SlackBuild
new file mode 100644
index 0000000000..7db0eef54a
--- /dev/null
+++ b/system/s3ql/s3ql.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# Slackware build script for "s3ql".
+
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=s3ql
+VERSION=${VERSION:-2.15}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+python3 setup.py install --root $PKG --optimize=1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/$PRGNAM
+mv $PKG/usr/share/man $PKG/usr
+cp -ar contrib $PKG/usr/share/$PRGNAM
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes.txt LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/s3ql/s3ql.info b/system/s3ql/s3ql.info
new file mode 100644
index 0000000000..f1f7070603
--- /dev/null
+++ b/system/s3ql/s3ql.info
@@ -0,0 +1,10 @@
+PRGNAM="s3ql"
+VERSION="2.15"
+HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
+DOWNLOAD="https://bitbucket.org/nikratio/s3ql/downloads/s3ql-2.15.tar.bz2"
+MD5SUM="8a856f86b18b4a5887cf87345f052c3e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-dugong python3-defusedxml python3-pycrypto python-requests llfuse apsw"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/system/s3ql/slack-desc b/system/s3ql/slack-desc
new file mode 100644
index 0000000000..d3596a022e
--- /dev/null
+++ b/system/s3ql/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+s3ql: s3ql (Online Storage File System)
+s3ql:
+s3ql: S3QL is a file system that stores all its data online using storage
+s3ql: services like Google Storage, Amazon S3, or OpenStack. S3QL
+s3ql: effectively provides a hard disk of dynamic, infinite capacity that
+s3ql: can be accessed from any computer with internet access.
+s3ql:
+s3ql: Homepage: https://bitbucket.org/nikratio/s3ql/
+s3ql:
+s3ql:
+s3ql:
diff --git a/system/samhain/samhain.SlackBuild b/system/samhain/samhain.SlackBuild
index 533852d839..e175cdea0d 100644
--- a/system/samhain/samhain.SlackBuild
+++ b/system/samhain/samhain.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -f $PRGNAM-$VERSION.tar.gz $PRGNAM-$VERSION.tar.gz.asc
-tar xvf $CWD/$PRGNAM-current.tar.gz
+tar xvf $CWD/${PRGNAM}_signed-$VERSION.tar.gz
 rm -rf $PRGNAM-$VERSION
 tar xvf $PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
diff --git a/system/samhain/samhain.info b/system/samhain/samhain.info
index 3a0a95d786..f3f0fa4f98 100644
--- a/system/samhain/samhain.info
+++ b/system/samhain/samhain.info
@@ -1,7 +1,7 @@
 PRGNAM="samhain"
 VERSION="3.1.0"
 HOMEPAGE="http://www.la-samhna.de/"
-DOWNLOAD="http://www.la-samhna.de/samhain/samhain-current.tar.gz"
+DOWNLOAD="http://www.la-samhna.de/archive/samhain_signed-3.1.0.tar.gz"
 MD5SUM="a621678f0e97fec612e63864b4d1e9d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/sbotools/README b/system/sbotools/README
index 1f335cf7b3..4440eedd30 100644
--- a/system/sbotools/README
+++ b/system/sbotools/README
@@ -7,7 +7,7 @@ x86_64 systems.
 
 There are man pages for each of the sbo* commands, and more documentation,
 as well as online versions of the man pages, can be found at
-http://dawnrazor.net/sbotools/documentation/
+http://pink-mist.github.io/sbotools/documentation/
 
 sbotools bundles the required Perl module Sort::Versions with it. This does
 not interfere with a copy installed from the CPAN, or from slackbuilds.org.
diff --git a/system/sbotools/sbotools.SlackBuild b/system/sbotools/sbotools.SlackBuild
index c64ebd9d81..3caf7f8c8e 100644
--- a/system/sbotools/sbotools.SlackBuild
+++ b/system/sbotools/sbotools.SlackBuild
@@ -1,11 +1,11 @@
-#!/usr/bin/bash
+#!/bin/sh
 #
 # Slackware build script for <sbotools>
 # Written by Jacob Pipkin <j@dawnrazor.net>
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
 PRGNAM=sbotools
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -25,11 +25,11 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o \
- -perm 400 \) -exec chmod 644 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # we set INSTALLMAN3DIR=none to elide the Sort::Versions.3 man page so that we
 # don't clobber one from perl-Sort-Versions or Sort::Versions.
@@ -66,9 +66,7 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
-cp -a \
-  SBO-Lib/README \
-  $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
+cp -a SBO-Lib/{README,Changes} $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/sbotools/sbotools.info b/system/sbotools/sbotools.info
index 33d5448d82..8b67fa38dc 100644
--- a/system/sbotools/sbotools.info
+++ b/system/sbotools/sbotools.info
@@ -1,10 +1,10 @@
 PRGNAM="sbotools"
-VERSION="1.8"
-HOMEPAGE="http://dawnrazor.net/sbotools/"
-DOWNLOAD="http://dawnrazor.net/wp-content/uploads/2013/11/sbotools-1.8.tar.gz"
-MD5SUM="bbc4a3929f678074605e7b6b27917c50"
+VERSION="1.9"
+HOMEPAGE="http://pink-mist.github.io/sbotools/"
+DOWNLOAD="http://pink-mist.github.io/sbotools/downloads/sbotools-1.9.tar.gz"
+MD5SUM="2979e11461247fcf04971ee920608923"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jacob Pipkin"
-EMAIL="j@dawnrazor.net"
+MAINTAINER="Andreas Guldstrand"
+EMAIL="andreas.guldstrand@gmail.com"
diff --git a/system/sbotools/slack-desc b/system/sbotools/slack-desc
index a6810cc51d..bac1d91296 100644
--- a/system/sbotools/slack-desc
+++ b/system/sbotools/slack-desc
@@ -13,7 +13,7 @@ sbotools: interface to slackbuilds.org. Its features include requirement
 sbotools: handling and the ability to handle 32-bit and compat32 builds on
 sbotools: multilib x86_64 systems.
 sbotools:
-sbotools: http://dawnrazor.net/sbotools
+sbotools: https://pink-mist.github.io/sbotools/
 sbotools:
 sbotools:
 sbotools:
diff --git a/system/scanmem/scanmem.SlackBuild b/system/scanmem/scanmem.SlackBuild
index fa8d6250c7..941c6f9856 100644
--- a/system/scanmem/scanmem.SlackBuild
+++ b/system/scanmem/scanmem.SlackBuild
@@ -1,11 +1,29 @@
 #!/bin/sh
 
-# Slackware build script scanmem
-# written by chinarulezzz s.alex08@mail.ru
-
+# Slackware build script for scanmem
+
+# Copyright 2014 - 2015 chinarulezzz s.alex08@mail.ru
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scanmem
-VERSION=${VERSION:-0.12}
+VERSION=${VERSION:-0.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,50 +60,46 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+unzip $CWD/v$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make OS_CFLAGS="$SLKCFLAGS"
+make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# Remove unused GameConqueror files from usr/share/locale
+find $PKG/usr/share/locale -name GameConqueror.mo -delete
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Remove usr/share* empty directories
+find $PKG -depth -empty -exec rmdir {} \;
 
-# move any generated man pages to their proper location
-#if [ -d $PKG/usr/share/man ]; then
-#  mv $PKG/usr/share/man $PKG/usr
-#  gzip -9 $PKG/usr/man/man?/*.?
-#fi
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Add docs, and if present, built documentation to the proper location
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a TODO README COPYING NEWS gpl-2.0.txt gpl-3.0.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-#if [ -d $PKG/usr/share/doc ]; then
-#  mv $PKG/usr/share/doc/scanmem/* $PKG/usr/doc/$PRGNAM-$VERSION/
-#  rm -rf $PKG/usr/share/doc
-#fi
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+    ln -s $( readlink $i ).gz $i.gz ;
+    rm $i ;
+done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README TODO gpl-2.0.txt gpl-3.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/scanmem/scanmem.info b/system/scanmem/scanmem.info
index 9cfeb97f7e..4c9d08a4f9 100644
--- a/system/scanmem/scanmem.info
+++ b/system/scanmem/scanmem.info
@@ -1,8 +1,8 @@
 PRGNAM="scanmem"
-VERSION="0.12"
-HOMEPAGE="http://taviso.decsystem.org"
-DOWNLOAD="http://scanmem.googlecode.com/files/scanmem-0.12.tar.gz"
-MD5SUM="2ad341798525c9243b6f909a9fe5aa4d"
+VERSION="0.15.2"
+HOMEPAGE="http://taviso.decsystem.org/scanmem.html"
+DOWNLOAD="https://github.com/scanmem/scanmem/archive/v0.15.2.zip"
+MD5SUM="523d5217b85295cbfb72441090dc0b31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/scanmem/slack-desc b/system/scanmem/slack-desc
index a70b6bf2b9..68af3e862f 100644
--- a/system/scanmem/slack-desc
+++ b/system/scanmem/slack-desc
@@ -14,6 +14,6 @@ scanmem:
 scanmem: scanmem requires libreadline to read commands interactively,
 scanmem: and /proc must be mounted.
 scanmem:
-scanmem: homepage: http://taviso.decsystem.org
+scanmem: homepage: http://taviso.decsystem.org/scanmem.html
 scanmem:
 scanmem:
diff --git a/system/scrypt/scrypt.SlackBuild b/system/scrypt/scrypt.SlackBuild
index c5ed3e5c2c..b98cdc0b8f 100644
--- a/system/scrypt/scrypt.SlackBuild
+++ b/system/scrypt/scrypt.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scrypt
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
diff --git a/system/scrypt/scrypt.info b/system/scrypt/scrypt.info
index e1280c713b..f73dd77483 100644
--- a/system/scrypt/scrypt.info
+++ b/system/scrypt/scrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="scrypt"
-VERSION="1.1.6"
+VERSION="1.2.0"
 HOMEPAGE="http://www.tarsnap.com/scrypt.html"
-DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz"
-MD5SUM="a35523cd497f7283635ce881db39c2e2"
+DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.2.0.tgz"
+MD5SUM="3a710c1777caa8c75b194378b2010fee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sdl-jstest/no_sdl2.diff b/system/sdl-jstest/no_sdl2.diff
new file mode 100644
index 0000000000..51738bfc40
--- /dev/null
+++ b/system/sdl-jstest/no_sdl2.diff
@@ -0,0 +1,50 @@
+diff -Naur sdl-jstest-20150806git/CMakeLists.txt sdl-jstest-20150806git.patched/CMakeLists.txt
+--- sdl-jstest-20150806git/CMakeLists.txt	2015-09-15 02:46:06.000000000 -0400
++++ sdl-jstest-20150806git.patched/CMakeLists.txt	2015-09-15 02:55:53.000000000 -0400
+@@ -22,7 +22,6 @@
+ find_package(SDL REQUIRED)
+ 
+ find_package(PkgConfig REQUIRED)
+-pkg_search_module(SDL2 REQUIRED sdl2)
+ 
+ find_program(DOCBOOK2XMAN docbook2x-man)
+ if(DOCBOOK2XMAN)
+@@ -43,11 +42,6 @@
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
+ 
+-add_executable(sdl2-jstest sdl2-jstest.c)
+-target_link_libraries(sdl2-jstest ${SDL2_LIBRARIES} ${CURSES_LIBRARIES})
+-target_include_directories(sdl2-jstest PUBLIC ${SDL2_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR})
+-target_compile_definitions(sdl2-jstest PUBLIC ${SDL2_CFLAGS_OTHER})
+-
+ add_executable(sdl-jstest sdl-jstest.c)
+ target_link_libraries(sdl-jstest ${SDL_LIBRARY} ${CURSES_LIBRARIES})
+ target_include_directories(sdl-jstest PUBLIC ${SDL_INCLUDE_DIR} ${CURSES_INCLUDE_DIR})
+@@ -59,22 +53,17 @@
+     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sdl-jstest.xml
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-  add_custom_command(
+-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.1
+-    COMMAND ${DOCBOOK2XMAN} ${CMAKE_CURRENT_SOURCE_DIR}/sdl2-jstest.xml
+-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sdl2-jstest.xml
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ else()
+-  file(COPY sdl-jstest.1 sdl2-jstest.1
++  file(COPY sdl-jstest.1
+     DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ endif()
+ 
+-add_custom_target(doc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.1 ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.1)
++add_custom_target(doc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.1)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.1 ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.1
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdl-jstest.1
+   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ 
+-install(TARGETS sdl-jstest sdl2-jstest
++install(TARGETS sdl-jstest
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ # EOF #
diff --git a/system/sdl-jstest/sdl-jstest.SlackBuild b/system/sdl-jstest/sdl-jstest.SlackBuild
index 69acb531b0..44b125913f 100644
--- a/system/sdl-jstest/sdl-jstest.SlackBuild
+++ b/system/sdl-jstest/sdl-jstest.SlackBuild
@@ -22,13 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20150915 bkw:
+# - updated for *almost* the latest git: ceef74 is "Allow building with
+#   old CMake 2.8". The next commit after that, 7b7923, reverts it so
+#   CMake 3 is required, which we don't have on Slack 14.1.
+# - script needed reworking since upstream switched to cmake.
+
 # 20140828 bkw:
 # - updated for latest git
 # - upstream now supports both sdl1 and sdl2, build for sdl2 only
 #   if installed
 
 PRGNAM=sdl-jstest
-VERSION=${VERSION:-20140814git}
+VERSION=${VERSION:-20150806git}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,9 +67,6 @@ fi
 
 set -e
 
-# if SDL2 is available, this will be built too.
-PRGNAM2=sdl2-jstest
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -77,23 +80,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-TARGETS="$PRGNAM $PRGNAM.1"
-pkg-config --exists sdl2 && TARGETS="$TARGETS $PRGNAM2 $PRGNAM2.1"
-
-make $TARGETS CC="gcc $SLKCFLAGS"
-
-PKGBIN=$PKG/usr/bin/
-mkdir -p $PKGBIN
-install -s -m0755 $PRGNAM $PKGBIN
-[ -e sdl2-jstest ] && install -s -m0755 $PRGNAM2 $PKGBIN
+# upstream made SDL2 required, let's undo that if SDL2 is missing.
+if ! pkg-config --exists sdl2; then
+  patch -p1 < $CWD/no_sdl2.diff
+fi
 
-PKGMAN1=$PKG/usr/man/man1
-mkdir -p $PKGMAN1
-gzip -9c $PRGNAM.1 > $PKGMAN1/$PRGNAM.1.gz
-[ -e sdl2-jstest ] && gzip -9c $PRGNAM2.1 > $PKGMAN1/$PRGNAM2.1.gz
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+gzip $PKG/usr/man/man1/*.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info
index b4db7d7de7..984430aee2 100644
--- a/system/sdl-jstest/sdl-jstest.info
+++ b/system/sdl-jstest/sdl-jstest.info
@@ -1,8 +1,8 @@
 PRGNAM="sdl-jstest"
-VERSION="20140814git"
+VERSION="20150806git"
 HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20140814git.tar.gz"
-MD5SUM="af6d7f8325bef39924e680690f9de4d1"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20150806git.tar.gz"
+MD5SUM="d15b2a51e02daa8cfe042f659054199f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/secure-delete/README b/system/secure-delete/README
index 487c32b5d9..aae5cfa3b6 100644
--- a/system/secure-delete/README
+++ b/system/secure-delete/README
@@ -3,3 +3,6 @@ Tools to wipe files, free disk space, swap and memory.
 Gutmann method based tools for securely wiping data.
 
 From files (srm), free disk space (sfill), swap (sswap) and memory (sdmem).
+
+This package maybe conflict with "srm" program and "srm" manpage present in
+"srm" package also available on SlackBuilds.
diff --git a/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch b/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch
new file mode 100644
index 0000000000..a685b81bc6
--- /dev/null
+++ b/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch
@@ -0,0 +1,41 @@
+--- Makefile.old	2006-03-08 14:59:53.000000000 -0500
++++ Makefile	2006-03-08 15:00:23.000000000 -0500
+@@ -7,7 +7,7 @@
+ OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2
+ #LD_MOD=-r
+ 
+-all: sdel-lib.o srm sfill sswap smem sdel-mod.o
++all: sdel-lib.o srm sfill sswap smem 
+ 	@echo
+ 	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
+ 	@echo "having fun."
+@@ -15,9 +15,6 @@
+ 	@echo "I hope YOU have fun!"
+ 	@echo
+ 
+-sdel-mod.o: sdel-mod.c
+-	$(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c
+-
+ sdel-lib.o: sdel-lib.c
+ 	$(CC) ${OPT} -c sdel-lib.c
+ 
+@@ -35,7 +32,7 @@
+ 	-strip smem
+ 
+ clean:
+-	rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
++	rm -f sfill srm sswap smem sdel sdel-lib.o 
+ 
+ install: all
+ 	mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null
+@@ -47,8 +44,8 @@
+ 	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
+ 	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
+ 	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
+-	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
+-#	@-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete"
++	-test -e 
++#	@-test '!' -e 
+ 	@echo
+ 	@echo "If men could get pregnant, abortion would be a sacrament."
+ 	@echo
diff --git a/system/secure-delete/secure-delete-3.1-makefile.patch b/system/secure-delete/secure-delete-3.1-makefile.patch
new file mode 100644
index 0000000000..b9aad3d04a
--- /dev/null
+++ b/system/secure-delete/secure-delete-3.1-makefile.patch
@@ -0,0 +1,25 @@
+--- Makefile	2010-08-10 10:44:37.000000000 -0400
++++ Makefile.secure	2010-08-10 10:44:43.000000000 -0400
+@@ -18,14 +19,14 @@
+ sdel-lib.o: sdel-lib.c
+ 	$(CC) ${OPT} -c sdel-lib.c
+ 
+-srm: srm.c
+-	$(CC) ${OPT} -o srm srm.c sdel-lib.o
+-sfill: sfill.c
+-	$(CC) ${OPT} -o sfill sfill.c sdel-lib.o
+-sswap: sswap.c
+-	$(CC) ${OPT} -o sswap sswap.c sdel-lib.o
+-smem: smem.c
+-	$(CC) ${OPT} -o smem smem.c sdel-lib.o
++srm: srm.o sdel-lib.o
++	$(CC) $(LDFLAGS) srm.o sdel-lib.o -o srm
++sfill: sfill.o sdel-lib.o
++	$(CC) $(LDFLAGS) sfill.o sdel-lib.o -o sfill
++sswap: sswap.o sdel-lib.o
++	$(CC) $(LDFLAGS) sswap.o sdel-lib.o -o sswap
++smem: smem.o sdel-lib.o
++	$(CC) $(LDFLAGS) smem.o sdel-lib.o -o smem
+ 
+ clean:
+ 	rm -f sfill srm sswap smem sdel sdel-lib.o 
diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild
index ce13c91cfd..77f8b37131 100644
--- a/system/secure-delete/secure-delete.SlackBuild
+++ b/system/secure-delete/secure-delete.SlackBuild
@@ -23,9 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=secure-delete
-SRCNAM=secure_delete
 VERSION=${VERSION:-3.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,6 +56,8 @@ fi
 
 set -e
 
+SRCNAM="secure_delete"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -71,7 +72,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/secure-delete.diff
+sed -i -e 's|mktemp|mkstemp|g' sfill.c
+sed -i -e "/strip/d" Makefile
+patch < $CWD/secure-delete-3.1-do-not-use-the-kernel-module.patch
+patch < $CWD/secure-delete-3.1-makefile.patch
+
 make prefix=/usr DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -86,7 +91,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/bin
 cp -a sfill smem srm sswap $PKG/usr/bin
 
-DOCS="CHANGES README TODO usenix6-gutmann.doc"
+DOCS="CHANGES README secure_delete.doc TODO usenix6-gutmann.doc"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/secure-delete/secure-delete.diff b/system/secure-delete/secure-delete.diff
deleted file mode 100644
index e31199944c..0000000000
--- a/system/secure-delete/secure-delete.diff
+++ /dev/null
@@ -1,251 +0,0 @@
---- secure-delete-3.1.orig/srm.1
-+++ secure-delete-3.1/srm.1
-@@ -55,7 +55,7 @@
- .TP
- .B \-d
- ignore the two special dot files . and .. on the commandline. (so you can
--execute it like "srm -d .* *")
-+execute it like "srm \-d .* *")
- .TP
- .B \-f
- fast (and insecure mode): no /dev/urandom, no synchronize mode.
-@@ -65,7 +65,7 @@
- and a final mode random values.
- .TP
- .B \-l
---l for a second time lessons the security even more: only one random pass
-+\-l for a second time lessons the security even more: only one random pass
- is written.
- .TP
- .B \-r
-@@ -95,7 +95,7 @@
- which comes with the
- .I secure_deletion package
- to ensure to wipe also the free diskspace. However, If already a small
--file aquired a block with your precious data, no tool known to me can help
-+file acquired a block with your precious data, no tool known to me can help
- you here. For a secure deletion of the swap space
- .I sswap
- is available.
-@@ -136,5 +136,5 @@
- (1),
- .I sswap
- (1),
--.I smem
-+.I sdmem
- (1)
---- secure-delete-3.1.orig/sfill.1
-+++ secure-delete-3.1/sfill.1
-@@ -16,7 +16,7 @@
- is designed to delete data which lies on available diskspace on mediums
- in a secure manner which can not be recovered by thiefs, law enforcement
- or other threats.
--The wipe algorythm is based on the paper "Secure Deletion of Data from
-+The wipe algorithm is based on the paper "Secure Deletion of Data from
- Magnetic and Solid-State Memory" presented at the 6th Usenix Security
- Symposium by Peter Gutmann, one of the leading civilian cryptographers.
- .PP
-@@ -59,7 +59,7 @@
- and a final mode with random values.
- .TP
- .B \-l
---l for a second time lessons the security even more: only one random pass
-+\-l for a second time lessons the security even more: only one random pass
- is written.
- .TP
- .B \-v
-@@ -130,5 +130,5 @@
- (1),
- .I sswap
- (1),
--.I smem
-+.I sdmem
- (1)
---- secure-delete-3.1.orig/Makefile
-+++ secure-delete-3.1/Makefile
-@@ -1,19 +1,19 @@
- CC=gcc
--OPT=-O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+OPT=$(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- #OPT=-Wall -D_DEBUG_ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
--INSTALL_DIR=/usr/local/bin
-+INSTALL_DIR=$(prefix)/bin
- MAN_DIR=/usr/local/man
- DOC_DIR=/usr/share/doc/secure_delete
- OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2
- #LD_MOD=-r
- 
--all: sdel-lib.o srm sfill sswap smem sdel-mod.o
--	@echo
--	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
--	@echo "having fun."
--	@echo
--	@echo "I hope YOU have fun!"
--	@echo
-+all: sdel-lib.o srm sfill sswap smem
-+#	@echo
-+#	@echo "A Puritan is someone who is deathly afraid that someone, somewhere, is"
-+#	@echo "having fun."
-+#	@echo
-+#	@echo "I hope YOU have fun!"
-+#	@echo
- 
- sdel-mod.o: sdel-mod.c
- 	$(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c
-@@ -23,32 +23,28 @@
- 
- srm: srm.c
- 	$(CC) ${OPT} -o srm srm.c sdel-lib.o
--	-strip srm
- sfill: sfill.c
- 	$(CC) ${OPT} -o sfill sfill.c sdel-lib.o
--	-strip sfill
- sswap: sswap.c
- 	$(CC) ${OPT} -o sswap sswap.c sdel-lib.o
--	-strip sswap
- smem: smem.c
- 	$(CC) ${OPT} -o smem smem.c sdel-lib.o
--	-strip smem
- 
- clean:
- 	rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~
- 
- install: all
- 	mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null
--	rm -f sdel && ln -s srm sdel
--	cp -f sdel srm sfill sswap smem the_cleaner.sh ${INSTALL_DIR}
--	chmod 711 ${INSTALL_DIR}/srm ${INSTALL_DIR}/sfill ${INSTALL_DIR}/sswap ${INSTALL_DIR}/smem ${INSTALL_DIR}/the_cleaner.sh
--	mkdir -p -m 755 ${MAN_DIR}/man1 2> /dev/null
--	cp -f srm.1 sfill.1 sswap.1 smem.1 ${MAN_DIR}/man1
--	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
--	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
--	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
--	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
-+#	rm -f sdel && ln -s srm sdel
-+	cp -f srm sfill sswap smem ${INSTALL_DIR}
-+	chmod 711 ${INSTALL_DIR}/srm ${INSTALL_DIR}/sfill ${INSTALL_DIR}/sswap ${INSTALL_DIR}/smem 
-+#	mkdir -p -m 755 ${MAN_DIR}/man1 2> /dev/null
-+#	cp -f srm.1 sfill.1 sswap.1 smem.1 ${MAN_DIR}/man1
-+#	chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1
-+#	mkdir -p -m 755 ${DOC_DIR} 2> /dev/null
-+#	cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR}
-+#	-test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char
- #	@-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete"
--	@echo
--	@echo "If men could get pregnant, abortion would be a sacrament."
--	@echo
-+#	@echo
-+#	@echo "If men could get pregnant, abortion would be a sacrament."
-+#	@echo
---- secure-delete-3.1.orig/srm.c
-+++ secure-delete-3.1/srm.c
-@@ -110,7 +110,7 @@
- 	        if ( (filestat.st_dev != controlstat.st_dev) || (filestat.st_ino != controlstat.st_ino) ) {
- 	            fprintf(stderr, "Race found! (directory %s became a link)\n", filename);
- 	        } else {
--  	            if ((dir = opendir (".")) != NULL) {
-+  	            if ((dir = opendir (".")) < 0) {
- 	                (void) chmod(".", 0700); /* ignore permission errors */
- 	                dir = opendir (".");
- 	            }
-@@ -166,8 +166,10 @@
-             return 3;
-         }
- 
--        if (sdel_overwrite(mode, fd, 0, bufsize, filestat.st_size > 0 ? filestat.st_size : 1, zero) == 0)
-+        if (sdel_overwrite(mode, fd, 0, bufsize, filestat.st_size > 0 ? filestat.st_size : 1, zero) == 0) {
-+            close(fd);
-             return sdel_unlink(filename, 0, 1, slow);
-+		}
-     } /* end IS_REG() */
-     else {
-         if (S_ISDIR(filestat.st_mode)) {
---- secure-delete-3.1.orig/smem.1
-+++ secure-delete-3.1/smem.1
-@@ -3,16 +3,16 @@
- .if n .sp
- .if t .sp 0.4
- ..
--.TH SMEM 1
-+.TH SDMEM 1
- 
- .SH NAME
--smem \- secure memory wiper (secure_deletion toolkit)
-+sdmem \- secure memory wiper (secure_deletion toolkit)
- 
- .SH SYNOPSIS
--.B smem [-f] [-l] [-l] [-v]
-+.B sdmem [-f] [-l] [-l] [-v]
- 
- .SH DESCRIPTION
--.I smem
-+.I sdmem
- is designed to delete data which may lie still in your memory (RAM)
- in a secure manner which can not be recovered by thiefs, law enforcement
- or other threats.
-@@ -24,7 +24,7 @@
- .PP
- The
- .I secure data deletion
--process of smem goes like this:
-+process of sdmem goes like this:
- .PP
- .TP
- .B *
-@@ -51,20 +51,26 @@
- and a final random one.
- .TP
- .B \-l
---l for a second time lessons the security even more: only one pass with
-+\-l for a second time lessons the security even more: only one pass with
- 0x00 is written.
- .TP
- .B \-v
- verbose mode
- .PP
- 
-+.SH NOTE
-+.TP
-+This utility was originally called
-+.I smem
-+but was renamed for debian to avoid name clashes with another package.
-+
- .SH BEWARE
- .TP
- .B SLOW
--Wiping the memory is very slow. You might use smem with the -ll option. (tip)
-+Wiping the memory is very slow. You might use sdmem with the \-ll option. (tip)
- .TP
- .B BETA!
--.I smem
-+.I sdmem
- is still beta.
- 
- .PP
-@@ -84,7 +90,7 @@
- can be obtained from 
- .I http://www.thc.org
- .Sp
--.I smem
-+.I sdmem
- and the
- .I secure_deletion package
- is (C) 1997-2003 by van Hauser / THC (vh@thc.org)
---- secure-delete-3.1.orig/sswap.1
-+++ secure-delete-3.1/sswap.1
-@@ -49,7 +49,7 @@
- a final mode with random values.
- .TP
- .B \-l
---l for a second time lessons the security even more: only one pass with
-+\-l for a second time lessons the security even more: only one pass with
- random values is written.
- .TP
- .B \-v
-@@ -106,5 +106,5 @@
- (1),
- .I sfill
- (1),
--.I smem
-+.I sdmem
- (1)
diff --git a/system/slack/README b/system/slack/README
deleted file mode 100644
index 8cb355e8c9..0000000000
--- a/system/slack/README
+++ /dev/null
@@ -1,42 +0,0 @@
-slack acts like a package manager for your local copy of slackbuilds.
-(usually obtained from slackbuilds.org)
-
-It supports following functions/options:
-
-1)  search the repository (-s)
-2)  info about specified package (-i)
-3)  readme about specified package (-r)
-4)  goto the package directory (-g)
-5)  view slackbuild (-v)
-6)  list files contained in specified package directory (-l)
-7)  description about specified package (-d)
-8)  get/download the package (-G)
-9)  build the package (-B)
-10) install the built package (-I)
-11) upgrade installed package with built package (-U)
-12) remove installed package (-R)
-13) query installed packages (-q)
-14) view all packages installed from the slackbuilds repo (-a)
-15) update git repo of slackbuilds (-u)
-
-Usage:
-slack <option> [package]
-
-The variables used in the script, which you would probably
-adjust according to your wish, are:
-
-1) repodir=""
- # Repository for slackbuilds.
-
-2) srcpath=""
- # Where the downloaded source packages are to be placed.
- # Leave it blank for saving it in the same directory as the slackbuild.
-
-3) outdir=""
- # Where the build package will be placed. 
- # Leave it blank for putting it in /tmp.
-
-4) gitdir=""
- # Directory where the slackbuilds git repository is present.
-
-These variables can also be configured via editing /etc/slack/slack.conf
diff --git a/system/slack/slack-desc b/system/slack/slack-desc
deleted file mode 100644
index 73a96e43ae..0000000000
--- a/system/slack/slack-desc
+++ /dev/null
@@ -1,18 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-slack: slack (a tool to manage packages in slackbuilds local repository)
-slack:
-slack: slack acts like a package manager for your local copy of slackbuilds.
-slack: (usually obtained from slackbuilds.org)
-slack: 
-slack: It supports searching, displaying info, getting, building,
-slack: and installing/removing packages. 
-slack: 
-slack: URL- https://github.com/aadityabagga/slack
-slack: 
diff --git a/system/slack/slack.SlackBuild b/system/slack/slack.SlackBuild
deleted file mode 100644
index 8d287842bc..0000000000
--- a/system/slack/slack.SlackBuild
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for slack 
-
-# Copyright 2014  Aaditya Bagga  <aaditya_gnulinux@zoho.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=slack
-VERSION=${VERSION:-0.3.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-if [ -e $CWD/$VERSION.tar.gz ]; then
-  tar xvf $CWD/$VERSION.tar.gz
-else
- tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-make install DESTDIR=$PKG APPDIR=/usr/doc/$PRGNAM-$VERSION 
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/slack/slack.info b/system/slack/slack.info
deleted file mode 100644
index 0dabd0e4db..0000000000
--- a/system/slack/slack.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="slack"
-VERSION="0.3.2"
-HOMEPAGE="http://github.com/aadityabagga/slack"
-DOWNLOAD="http://github.com/aadityabagga/slack/archive/0.3.2.tar.gz"
-MD5SUM="1b4dc0ed2873eece936f4ddaba8f7682"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="aaditya"
-EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/slackchlog/README b/system/slackchlog/README
new file mode 100644
index 0000000000..67535b3b17
--- /dev/null
+++ b/system/slackchlog/README
@@ -0,0 +1,9 @@
+slackchlog is Slackware's ChangeLog viewer written in BASH.
+It allows to download and view the remote ChangeLog file and
+also to generate RSS feed suitable for RSS feed readers.
+Using command line arguments, it's possible to specify
+the architecture, release and mirror for the ChangeLog file
+in question.
+
+For usage details, type:
+$ slackchlog --help
diff --git a/system/slackchlog/slack-desc b/system/slackchlog/slack-desc
new file mode 100644
index 0000000000..accf8ffb64
--- /dev/null
+++ b/system/slackchlog/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+slackchlog: slackchlog (Slackware's ChangeLog viewer)
+slackchlog:
+slackchlog: slackchlog is Slackware's ChangeLog viewer written in BASH.
+slackchlog: It allows to download and view the remote ChangeLog file and
+slackchlog: also to generate RSS feed suitable for RSS feed readers.
+slackchlog: Using command line arguments, it's possible to specify
+slackchlog: the architecture, release and mirror for the ChangeLog file
+slackchlog: in question.
+slackchlog:
+slackchlog: Homepage: http://www.telszewski.net/software/src/slackchlog/
+slackchlog:
diff --git a/system/slackchlog/slackchlog.SlackBuild b/system/slackchlog/slackchlog.SlackBuild
new file mode 100644
index 0000000000..e06df30bd9
--- /dev/null
+++ b/system/slackchlog/slackchlog.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Slackware build script for slackchlog
+
+# Copyright 2015 Andrzej Telszewski, Sabadell
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=slackchlog
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+chown -R root:root .
+chmod 0755 slackchlog
+chmod 0644 CONDITIONS LICENSE README slackchlog.mirror.txt.sample
+
+mkdir -p $PKG/usr/bin
+cp -a slackchlog $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONDITIONS LICENSE README slackchlog.mirror.txt.sample \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/slackchlog/slackchlog.info b/system/slackchlog/slackchlog.info
new file mode 100644
index 0000000000..871d858b5b
--- /dev/null
+++ b/system/slackchlog/slackchlog.info
@@ -0,0 +1,10 @@
+PRGNAM="slackchlog"
+VERSION="0.1"
+HOMEPAGE="http://www.telszewski.net/software/src/slackchlog/"
+DOWNLOAD="http://www.telszewski.net/software/src/slackchlog/slackchlog-0.1.tar.xz"
+MD5SUM="46bcdcf32410e2345faf616afce1b31e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrzej Telszewski"
+EMAIL="atelszewski@gmail.com"
diff --git a/system/slpkg/README b/system/slpkg/README
index 7c48520d7c..cd60472b09 100644
--- a/system/slpkg/README
+++ b/system/slpkg/README
@@ -4,6 +4,5 @@ computes dependencies and figures out what things should occur
 to install packages. Slpkg makes it easier to maintain groups 
 of machines without having to manually update.
 
-Optional dependencies: 
-- pygraphviz (for drawing dependencies diagram)
-- graph-easy (for drawing dependencies ascii diagram)
+Optional dependencies: python2-pythondialog, pygraphviz, graph-easy
+
diff --git a/system/slpkg/doinst.sh b/system/slpkg/doinst.sh
index a3316326fd..7f609d17c0 100644
--- a/system/slpkg/doinst.sh
+++ b/system/slpkg/doinst.sh
@@ -8,8 +8,8 @@ config() {
   fi
 }
 
-CONFIGS="slpkg.conf blacklist slackware-mirrors custom-repositories \
-    slackware-changelogs-mirror"
+CONFIGS="slpkg.conf repositories.conf blacklist slackware-mirrors \
+    default-repositories custom-repositories"
 for file in $CONFIGS; do
     config etc/slpkg/${file}.new
 done
diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild
index 5a8ac90e95..1bc67372ce 100644
--- a/system/slpkg/slpkg.SlackBuild
+++ b/system/slpkg/slpkg.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slpkg
 
-# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slpkg
-VERSION=${VERSION:-2.6.8}
+VERSION=${VERSION:-3.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,12 +79,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/etc/slpkg
 # install configuration files
-CONFIGS="slpkg.conf blacklist slackware-mirrors custom-repositories \
-    slackware-changelogs-mirror"
+CONFIGS="slpkg.conf repositories.conf blacklist slackware-mirrors \
+    default-repositories custom-repositories"
 for file in $CONFIGS; do
     install -D -m0644 conf/$file $PKG/etc/slpkg/${file}.new
 done
 
+# keep original configuration file for reset
+cp -p conf/slpkg.conf $PKG/etc/slpkg/slpkg.conf.orig
+
 # install bash completion file
 mkdir -p $PKG/etc/bash_completion.d
 install -D -m0744 conf/${PRGNAM}.bash-completion \
@@ -102,7 +105,8 @@ gzip -9 man/$PRGNAM.8
 install -D -m0644 man/$PRGNAM.8.gz $PKG/usr/man/man8/$PRGNAM.8.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst ChangeLog.txt LICENSE TESTING ISSUES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst ChangeLog.txt LICENSE TESTING ISSUES KNOWN_ISSUES REPOSITORIES \
+    requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info
index f2b628e957..34671bc583 100644
--- a/system/slpkg/slpkg.info
+++ b/system/slpkg/slpkg.info
@@ -1,8 +1,8 @@
 PRGNAM="slpkg"
-VERSION="2.6.8"
+VERSION="3.1.5"
 HOMEPAGE="https://github.com/dslackw/slpkg"
-DOWNLOAD="https://github.com/dslackw/slpkg/archive/v2.6.8.tar.gz"
-MD5SUM="4f2df9ad3ffc303373e26200544d4af4"
+DOWNLOAD="https://github.com/dslackw/slpkg/archive/v3.1.5.tar.gz"
+MD5SUM="f31a256221c02efbe4d356829d2a85e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/spacefm/README b/system/spacefm/README
index cdda641051..91a12f97e2 100644
--- a/system/spacefm/README
+++ b/system/spacefm/README
@@ -2,5 +2,9 @@ SpaceFM is a multi-panel tabbed file manager for Linux
 with built-in VFS, udev-based device manager,
 customizable menu system, and bash integration.
 
+To build spacefm with gdb support, run:
+
+  DEBUG=yes sh spacefm.SlackBuild
+
 udevil is an optional dependency to mount networks
 (nfs://, smb://, ftp://, ssh://) and other filesystems.
diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild
index f3b636d538..5e9178a8b8 100644
--- a/system/spacefm/spacefm.SlackBuild
+++ b/system/spacefm/spacefm.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Slackware build script for spacefm
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spacefm
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,20 +55,35 @@ else
   LIBDIRSUFFIX=""
 fi
 
+## thanks to Hunter S for the idea,
+## and ponce for the elegant solution
+DEBUG=${DEBUG:-no}
+if [ "${DEBUG}" = "yes" ]; then
+  SLKCFLAGS=$(echo $SLKCFLAGS | sed "s|-O2|-Og -ggdb3|g")
+fi
+
+## detect video thumbnail support, requires ffmpegthumbnailer:
+## http://slackbuilds.org/apps/ffmpegthumbnailer/
+if pkg-config --exists libffmpegthumbnailer; then VIDEO_THUMBNAIL_FLAG=""; else VIDEO_THUMBNAIL_FLAG="--disable-video-thumbnails"; fi
+
 set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+if [ -e $CWD/$VERSION.tar.gz ]; then
+  tar xvf $CWD/$VERSION.tar.gz
+else
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+fi
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,12 +97,13 @@ CFLAGS="$SLKCFLAGS" \
   --localedir=/usr/share/locale \
   --disable-pixmaps \
   --disable-static \
+  $VIDEO_THUMBNAIL_FLAG \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/spacefm/spacefm.info b/system/spacefm/spacefm.info
index af5d2acdef..9020f5285d 100644
--- a/system/spacefm/spacefm.info
+++ b/system/spacefm/spacefm.info
@@ -1,8 +1,8 @@
 PRGNAM="spacefm"
-VERSION="0.9.4"
+VERSION="1.0.4"
 HOMEPAGE="http://ignorantguru.github.com/spacefm/"
-DOWNLOAD="http://sourceforge.net/projects/spacefm/files/spacefm-0.9.4.tar.xz"
-MD5SUM="0214e90d408e72baa5db19bab41f5eeb"
+DOWNLOAD="https://github.com/IgnorantGuru/spacefm/archive/1.0.4.tar.gz"
+MD5SUM="a51a8fab15483ef05a093841783a53f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/spl-solaris/spl-solaris.SlackBuild b/system/spl-solaris/spl-solaris.SlackBuild
index 40b3d03440..d1cba62331 100644
--- a/system/spl-solaris/spl-solaris.SlackBuild
+++ b/system/spl-solaris/spl-solaris.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for spl-solaris
 
+# Copyright 2015 Kevin Paulus <goarilla@gmail.com>, Belgium
 # Copyright 2013-2014 Petr Hejl - Czech Republic
 # All rights reserved.
 #
@@ -26,7 +27,7 @@
 
 PRGNAM=spl-solaris
 SRCNAM=spl
-VERSION=${VERSION:-0.6.4}
+VERSION=${VERSION:-0.6.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/spl-solaris/spl-solaris.info b/system/spl-solaris/spl-solaris.info
index 711f59d7b9..432b7e8d70 100644
--- a/system/spl-solaris/spl-solaris.info
+++ b/system/spl-solaris/spl-solaris.info
@@ -1,10 +1,10 @@
 PRGNAM="spl-solaris"
-VERSION="0.6.4"
+VERSION="0.6.5.4"
 HOMEPAGE="http://zfsonlinux.org"
-DOWNLOAD="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.4.tar.gz"
-MD5SUM="54b057676a43cb5497d028eede030511"
+DOWNLOAD="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.5.4.tar.gz"
+MD5SUM="d390bac291fa46e42c867d659cc8d1d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Petr Hejl"
-EMAIL="silenost01@seznam.cz"
+MAINTAINER="Kevin Paulus"
+EMAIL="goarilla@gmail.com"
diff --git a/system/sqlcipher/README b/system/sqlcipher/README
new file mode 100644
index 0000000000..53c425606c
--- /dev/null
+++ b/system/sqlcipher/README
@@ -0,0 +1,9 @@
+SQLCipher is an SQLite extension that provides transparent 256-bit AES
+encryption of database files. Pages are encrypted before being written to
+disk and are decrypted when read back. Due to the small footprint and great
+performance it's ideal for protecting embedded application databases and is
+well suited for mobile development.
+
+SQLCipher was initially developed by Stephen Lombardo at Zetetic LLC
+(sjlombardo@zetetic.net) as the encrypted database layer for Strip, an iPhone
+data vault and password manager (http://getstrip.com).
diff --git a/system/sqlcipher/slack-desc b/system/sqlcipher/slack-desc
new file mode 100644
index 0000000000..006e4a774b
--- /dev/null
+++ b/system/sqlcipher/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+sqlcipher: sqlcipher (256 bit AES encryption SQLite extension)
+sqlcipher:
+sqlcipher: SQLCipher is an SQLite extension that provides transparent 256-bit
+sqlcipher: AES encryption of database files. Pages are encrypted before being
+sqlcipher: written to disk and are decrypted when read back. Due to the small
+sqlcipher: footprint and great performance it's ideal for protecting embedded
+sqlcipher: application databases and is well suited for mobile development.
+sqlcipher:
+sqlcipher:
+sqlcipher: Homepage: http://sqlcipher.net
+sqlcipher:
diff --git a/system/sqlcipher/sqlcipher.SlackBuild b/system/sqlcipher/sqlcipher.SlackBuild
new file mode 100644
index 0000000000..21cfe599e0
--- /dev/null
+++ b/system/sqlcipher/sqlcipher.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Slackware build script for sqlcipher
+
+# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=sqlcipher
+VERSION=${VERSION:-3.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS -DSQLITE_HAS_CODEC" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-lcrypto" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-tempstore=yes \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/sqlcipher/sqlcipher.info b/system/sqlcipher/sqlcipher.info
new file mode 100644
index 0000000000..a07fe97e43
--- /dev/null
+++ b/system/sqlcipher/sqlcipher.info
@@ -0,0 +1,10 @@
+PRGNAM="sqlcipher"
+VERSION="3.3.1"
+HOMEPAGE="http://sqlcipher.net"
+DOWNLOAD="https://github.com/sqlcipher/sqlcipher/archive/v3.3.1.tar.gz"
+MD5SUM="26be3c23220192fb42e1d60f8c90ac69"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/system/srm/README b/system/srm/README
index d231d5aafa..a2c86552ed 100644
--- a/system/srm/README
+++ b/system/srm/README
@@ -1,14 +1,15 @@
 srm is a secure replacement for rm(1). Unlike the standard rm, it overwrites
 the data in the target files before unlinking them. This prevents command-line
-recovery of the data by examining the raw block device. It may also help
-frustrate physical examination of the disk, although it's unlikely that it can
-completely prevent that type of recovery. It is, essentially, a paper shredder
-for sensitive files.
+recovery of the data by examining the raw block device. It may also help to
+frustrate a physical examination of the disk, although it's unlikely that it can
+completely protect against this type of recovery.
 
-srm is ideal for personal computers or workstations with Internet connections.
-It can help prevent malicious users from breaking in and undeleting personal
-files, such as old emails. It's also useful for permanently removing files
-from expensive media. For example, cleaning your diary off the zip disk you're
-using to send vacation pictures to Uncle Lou. Because it uses the exact same
-options as rm(1), srm is simple to use. Just subsitute it for rm whenever you
-want to destroy files, rather than just unlinking them.
+srm uses algorithms found in "Secure Deletion of Data from Magnetic and Solid-
+State Memory" by Peter Gutmann and THC Secure Delete (the overwrite, truncate,
+rename, unlink sequence).
+
+Please note that srm will only work on file systems that overwrite blocks in
+place. In particular, it will *NOT* work on reiserfs or the vast majority of
+journaled file systems. It should work on ext2, FAT-based file systems, and
+the BSD native file system. On ext3, srm will try to disable the journaling
+of data (please see the verbose output if this fails).
diff --git a/system/srm/slack-desc b/system/srm/slack-desc
index 4f1a5047fb..6ba9822f9b 100644
--- a/system/srm/slack-desc
+++ b/system/srm/slack-desc
@@ -11,9 +11,9 @@ srm:
 srm: srm is a secure replacement for rm(1). Unlike the standard rm, it
 srm: overwrites the data in the target files before unlinking them. This
 srm: prevents command-line recovery of the data by examining the raw block
-srm: device. It may also help frustrate physical examination of the disk,
-srm: although it's unlikely that it can completely prevent that type of
-srm: recovery. It is, essentially, a paper shredder for sensitive files
-srm:
-srm:
+srm: device. It may also help frustrate a physical examination of the disk,
+srm: although it's unlikely that it can completely protect against this
+srm: type of recovery. Please note that srm will NOT work as expected with
+srm: journaled filesystem (e.g. reiserfs, ext3).
 srm:
+srm: Homepage: http://srm.sourceforge.net/
diff --git a/system/srm/srm-fix-typos.patch b/system/srm/srm-fix-typos.patch
new file mode 100644
index 0000000000..6ac8012e8d
--- /dev/null
+++ b/system/srm/srm-fix-typos.patch
@@ -0,0 +1,22 @@
+diff -u1 -r a/doc/srm.1.in b/doc/srm.1.in
+--- a/doc/srm.1.in	2015-11-04 12:15:38.438987109 +0100
++++ b/doc/srm.1.in	2015-11-04 12:24:27.481981163 +0100
+@@ -45,3 +45,3 @@
+ \fB\-f\fR, \fB\-\-force\fR
+-ignore nonexistent files, never prompt
++ignore non\-existent files, never prompt
+ .TP 
+diff -u1 -r a/src/main.c b/src/main.c
+--- a/src/main.c	2015-11-04 12:52:07.568002966 +0100
++++ b/src/main.c	2015-11-04 12:54:09.159001600 +0100
+@@ -90,7 +90,7 @@
+ 	   "Usage: %s [OPTION]... [FILE]...\n"
+-	   "Overwrite and remove (unlink) the files. By default use the 35-pass Gutmann\n"
++	   "Overwrite and remove (unlink) the files. By default it uses the 35-pass Gutmann\n"
+ 	   "method to overwrite files.\n"
+ 	   "\n"
+-	   "  -d, --directory       ignored (for compatability with rm(1))\n"
+-	   "  -f, --force           ignore nonexistant files, never prompt\n"
++	   "  -d, --directory       ignored (for compatibility with rm(1))\n"
++	   "  -f, --force           ignore non-existent files, never prompt\n"
+ 	   "  -i, --interactive     prompt before any removal\n"
diff --git a/system/srm/srm.SlackBuild b/system/srm/srm.SlackBuild
index b214c4a60c..8bd3ee060b 100644
--- a/system/srm/srm.SlackBuild
+++ b/system/srm/srm.SlackBuild
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-# Slackware build script for srm.
+# Slackware build script for srm
+
+# Copyright 2009-2010 Marco Bonetti <sid77 at slackware dot it>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 #
-# Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +26,7 @@
 
 
 PRGNAM=srm
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,8 +43,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS ChangeLog COPYING README"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -63,41 +63,42 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix typos in the --help output and man page.
+patch -p1 < $CWD/srm-fix-typos.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PRGMAN=$PKG/usr/man/man1
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# Compress man page.
+gzip -9 $PRGMAN/$PRGNAM.1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Install documentation.
+mkdir -p $PRGDOC
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PRGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/srm/srm.info b/system/srm/srm.info
index 74f5c24390..899ed24a06 100644
--- a/system/srm/srm.info
+++ b/system/srm/srm.info
@@ -1,10 +1,10 @@
 PRGNAM="srm"
-VERSION="1.2.10"
+VERSION="1.2.15"
 HOMEPAGE="http://srm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/srm/srm-1.2.10.tar.bz2"
-MD5SUM="2eb97c550bd910c09f08ec7feaf4bec1"
+DOWNLOAD="http://downloads.sourceforge.net/srm/srm-1.2.15.tar.gz"
+MD5SUM="681cbb0950b25e300a3f6d680f57f56c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Philip Lacroix"
+EMAIL="slackph at posteo dot de"
diff --git a/system/swatch/README b/system/swatch/README
index 7c309c2ff3..14bfb82832 100644
--- a/system/swatch/README
+++ b/system/swatch/README
@@ -1,3 +1,3 @@
-Swatch.pl started out as the "simple watchdog" for activly monitoring
+Swatchdog.pl started out as the "simple watchdog" for activly monitoring
 log files produced by UNIX's syslog facility. It has since been 
 evolving into a utility that can monitor just about any type of log.
diff --git a/system/swatch/slack-desc b/system/swatch/slack-desc
index 6bfb1461f9..95e0e879f9 100644
--- a/system/swatch/slack-desc
+++ b/system/swatch/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 swatch: swatch (Simple Log Watcher)
 swatch:
-swatch: Swatch.pl started out as the "simple watchdog" for activly monitoring
-swatch: log files produced by UNIX's syslog facility. It has since been
-swatch: evolving into a utility that can monitor just about any type of log.
+swatch: Swatchdog.pl started out as the "simple watchdog" for activly
+swatch: monitoring log files produced by UNIX's syslog facility. It has since
+swatch: been evolving into a utility that can monitor just about any type of
+swatch: log
 swatch:
 swatch: Project Website: http://sourceforge.net/projects/swatch/
 swatch:
 swatch:
 swatch:
-swatch:
diff --git a/system/swatch/swatch.SlackBuild b/system/swatch/swatch.SlackBuild
index bd6cacea13..d8831e782c 100644
--- a/system/swatch/swatch.SlackBuild
+++ b/system/swatch/swatch.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for swatch
 
-# Copyright 2012 Willy Sudiarto Raharjo <willysr@slackware-id.org>
+# Copyright 2012-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=swatch
-VERSION=${VERSION:-3.2.3}
+SRCNAM=swatchdog
+VERSION=${VERSION:-3.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,22 +60,22 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Makefile.PL \
   PREFIX=/usr \
   INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
   INSTALLVENDORMAN3DIR=/usr/man/man3
 make
-make test
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -87,10 +88,14 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
 
 find $PKG -depth -type d -empty -delete || true
 
+# create symlink so that applications depending on this package will not be broken
+(
+  cd $PKG/usr/bin
+  ln -s $SRCNAM $PRGNAM
+)
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGES COPYING COPYRIGHT INSTALL KNOWN_BUGS MANIFEST README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING COPYRIGHT INSTALL KNOWN_BUGS MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/swatch/swatch.info b/system/swatch/swatch.info
index 0e34e6fa01..6826afc02b 100644
--- a/system/swatch/swatch.info
+++ b/system/swatch/swatch.info
@@ -1,8 +1,8 @@
 PRGNAM="swatch"
-VERSION="3.2.3"
+VERSION="3.2.4"
 HOMEPAGE="http://sourceforge.net/projects/swatch/"
-DOWNLOAD="http://downloads.sourceforge.net/swatch/swatch-3.2.3.tar.gz"
-MD5SUM="1162f1024cf07fc750ed4960d61ac4e8"
+DOWNLOAD="http://downloads.sourceforge.net/swatch/swatchdog-3.2.4.tar.gz"
+MD5SUM="df4c20ff7d3f6a46a2efd72a42078011"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Date-Calc perl-Date-Manip perl-File-Tail perl-TimeDate"
diff --git a/system/sysdig/README b/system/sysdig/README
index f03eee3067..45c9e6bc6a 100644
--- a/system/sysdig/README
+++ b/system/sysdig/README
@@ -9,4 +9,9 @@ To build the package for a kernel different from the running one, start the
 script setting the KERNEL variable as in
 KERNEL=2.6.38.8 ./sysdig.SlackBuild
 
-Optional: luajit
+To build sysdig with dkms support supply the variable DKMS="yes" to
+sysdig.SlackBuild.  This also needs dkms installed as a runtime dependency.
+
+  # DKMS="yes" ./sysdig.SlackBuild
+
+Optional: luajit and dkms
diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild
index ab1591b15d..c01cac54db 100644
--- a/system/sysdig/sysdig.SlackBuild
+++ b/system/sysdig/sysdig.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sysdig
-VERSION=${VERSION:-0.1.102}
+VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,21 +71,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix jsoncpp header file location.
-sed -i 's|json/|jsoncpp/|g' CMakeLists.txt userspace/libsinsp/*.{h,cpp}
 # Fix manpage location
 sed -i 's|share/||' userspace/sysdig/man/CMakeLists.txt
 
+# Determine if dkms is to be used. Default is no.
+if [ "${DKMS:-no}" == "yes" ]; then
+  USEDKMS="ON"
+else
+  USEDKMS="OFF"
+  sed -i '/sysdig-probe-loader/,$d' scripts/CMakeLists.txt
+fi
+
 mkdir build
 cd build
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
     -DSYSDIG_VERSION="$VERSION" \
     -DDIR_ETC:PATH="/etc" \
-    -DUSE_BUNDLED_ZLIB:BOOL=OFF \
-    -DUSE_BUNDLED_NCURSES:BOOL=OFF \
+    -DUSE_BUNDLED_DEPS:BOOL=OFF \
     -DUSE_BUNDLED_JSONCPP:BOOL=OFF \
-    -DUSE_BUNDLED_LUAJIT:BOOL=OFF \
+    -DENABLE_DKMS:BOOL="$USEDKMS" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE=Release ..
@@ -105,12 +110,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Remove dkms related files.
-rm -rf $PKG/usr/src $PKG/usr/bin/sysdig-probe-loader
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s|@KERNEL@|$KERNEL|" $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -e "s|@KERNEL@|$KERNEL|" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info
index 443f8dbeec..3198a3ca9f 100644
--- a/system/sysdig/sysdig.info
+++ b/system/sysdig/sysdig.info
@@ -1,10 +1,10 @@
 PRGNAM="sysdig"
-VERSION="0.1.102"
+VERSION="0.6.0"
 HOMEPAGE="http://www.sysdig.org"
-DOWNLOAD="https://github.com/draios/sysdig/archive/0.1.102.tar.gz"
-MD5SUM="58054063254328d6eb1f8fd4101f060f"
+DOWNLOAD="https://github.com/draios/sysdig/archive/0.6.0.tar.gz"
+MD5SUM="ffe978c506eca48445bb1f7ece2c0313"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jsoncpp lua"
+REQUIRES="jsoncpp lua libb64"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/system/systrace/systrace.SlackBuild b/system/systrace/systrace.SlackBuild
index 0aa24a8c06..5ed96ae898 100644
--- a/system/systrace/systrace.SlackBuild
+++ b/system/systrace/systrace.SlackBuild
@@ -55,7 +55,7 @@ find -L . \
 
 ## First, systrace itself (backend + textmode UI):
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -std=gnu89" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -105,7 +105,7 @@ if [ "${GUI:-yes}" = "yes" ]; then
 
   autoreconf -if
 
-  CFLAGS="$SLKCFLAGS" \
+  CFLAGS="$SLKCFLAGS -std=gnu89" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
     --prefix=/usr \
diff --git a/system/the_silver_searcher/the_silver_searcher.SlackBuild b/system/the_silver_searcher/the_silver_searcher.SlackBuild
index 5793eed29a..00a32888d3 100644
--- a/system/the_silver_searcher/the_silver_searcher.SlackBuild
+++ b/system/the_silver_searcher/the_silver_searcher.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=the_silver_searcher
-VERSION=${VERSION:-0.30.0}
+VERSION=${VERSION:-0.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/the_silver_searcher/the_silver_searcher.info b/system/the_silver_searcher/the_silver_searcher.info
index a47560b5f1..a69662eace 100644
--- a/system/the_silver_searcher/the_silver_searcher.info
+++ b/system/the_silver_searcher/the_silver_searcher.info
@@ -1,8 +1,8 @@
 PRGNAM="the_silver_searcher"
-VERSION="0.30.0"
+VERSION="0.31.0"
 HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
-DOWNLOAD="https://github.com/ggreer/the_silver_searcher/archive/0.30.0.tar.gz"
-MD5SUM="5f2a98beb8ff816222af829cac53ac8c"
+DOWNLOAD="https://github.com/ggreer/the_silver_searcher/archive/0.31.0.tar.gz"
+MD5SUM="a51b041dcc18fb16bd9128225d8d5c87"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tinyterm/tinyterm.SlackBuild b/system/tinyterm/tinyterm.SlackBuild
index c3a8864556..d8e524358e 100644
--- a/system/tinyterm/tinyterm.SlackBuild
+++ b/system/tinyterm/tinyterm.SlackBuild
@@ -6,7 +6,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
@@ -23,7 +23,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=tinyterm
-VERSION=${VERSION:-0.5.7}
+VERSION=${VERSION:-0.5.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/tinyterm/tinyterm.info b/system/tinyterm/tinyterm.info
index 32c75d1551..112600457b 100644
--- a/system/tinyterm/tinyterm.info
+++ b/system/tinyterm/tinyterm.info
@@ -1,8 +1,8 @@
 PRGNAM="tinyterm"
-VERSION="0.5.7"
+VERSION="0.5.8"
 HOMEPAGE="https://github.com/ryanpcmcquen/tinyterm"
-DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.5.7.tar.gz"
-MD5SUM="7fa2488235d63e364c663d84a1d0a207"
+DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.5.8.tar.gz"
+MD5SUM="d79ebef1fd122a5b06e348bd24437e41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild
index 1c4473a989..37eb9234f5 100644
--- a/system/tinyvm/tinyvm.SlackBuild
+++ b/system/tinyvm/tinyvm.SlackBuild
@@ -4,7 +4,7 @@
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version, with the following exception:
 # the text of the GPL license may be omitted.
 
diff --git a/system/tmuxp/tmuxp.SlackBuild b/system/tmuxp/tmuxp.SlackBuild
index 4188917861..bc02addf0b 100644
--- a/system/tmuxp/tmuxp.SlackBuild
+++ b/system/tmuxp/tmuxp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tmuxp
 
-# Copyright 2014-2015  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 
 PRGNAM=tmuxp
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-0.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/tmuxp/tmuxp.info b/system/tmuxp/tmuxp.info
index 8dc3f48ddd..8791ed93e9 100644
--- a/system/tmuxp/tmuxp.info
+++ b/system/tmuxp/tmuxp.info
@@ -1,10 +1,10 @@
 PRGNAM="tmuxp"
-VERSION="0.9.0"
+VERSION="0.9.3"
 HOMEPAGE="http://github.com/tony/tmuxp/"
-DOWNLOAD="https://pypi.python.org/packages/source/t/tmuxp/tmuxp-0.9.0.tar.gz"
-MD5SUM="a58ac4180833ef907f4359c11dc9a54a"
+DOWNLOAD="https://pypi.python.org/packages/source/t/tmuxp/tmuxp-0.9.3.tar.gz"
+MD5SUM="d40900234b24162de26a65cf562dd4b6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="kaptan argcomplete PyYAML"
+REQUIRES="kaptan argcomplete colorama"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/tomb/tomb.SlackBuild b/system/tomb/tomb.SlackBuild
index 764ea6c673..8d557d23cd 100644
--- a/system/tomb/tomb.SlackBuild
+++ b/system/tomb/tomb.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=tomb
 SRCNAM=Tomb
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/tomb/tomb.info b/system/tomb/tomb.info
index 4d9ca3a124..dc02200c72 100644
--- a/system/tomb/tomb.info
+++ b/system/tomb/tomb.info
@@ -1,8 +1,8 @@
 PRGNAM="tomb"
-VERSION="2.1"
+VERSION="2.1.1"
 HOMEPAGE="https://www.dyne.org/software/tomb/"
-DOWNLOAD="https://files.dyne.org/tomb/Tomb-2.1.tar.gz"
-MD5SUM="6fc80b48741dea2e824794c831c50785"
+DOWNLOAD="https://files.dyne.org/tomb/Tomb-2.1.1.tar.gz"
+MD5SUM="ef315fc7dfe09789f100c277a6780b1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tpm/README b/system/tpm/README
new file mode 100644
index 0000000000..bf33a835d0
--- /dev/null
+++ b/system/tpm/README
@@ -0,0 +1,9 @@
+tpm is a tiny shell script which is heavily inspired and largely compatible with pass.
+Just like pass it uses gpg2 to securely store your passwords, the major difference
+between pass and tpm is that the latter is a lot more minimal. Furthermore, tpm is
+written entirely in POSIX shell.
+
+Invoking tpm consists of specifying a command either insert or show and supplying one
+entry as a target. If insert is specified as a command tpm will create a new entry and
+prompt for the corresponding password. If you specify show as a command tpm will write
+the password for the given entry to standard output.
diff --git a/system/tpm/slack-desc b/system/tpm/slack-desc
new file mode 100644
index 0000000000..b75c83f9dd
--- /dev/null
+++ b/system/tpm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+tpm: tpm (Tiny password manager)
+tpm:
+tpm: tpm is a tiny shell script which is heavily inspired and largely
+tpm: compatible with pass. Just like pass it uses gpg2 to securely store
+tpm: your passwords, the major difference between pass and tpm is that the
+tpm: latter is a lot more minimal. Furthermore, tpm is written entirely in
+tpm: POSIX shell.
+tpm:
+tpm: Homepage: https://github.com/nmeum/tpm
+tpm:
+tpm:
diff --git a/system/tpm/tpm.SlackBuild b/system/tpm/tpm.SlackBuild
new file mode 100644
index 0000000000..9ad0af4670
--- /dev/null
+++ b/system/tpm/tpm.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for tpm
+
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=tpm
+VERSION=${VERSION:-1.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+make install \
+  PREFIX=/usr \
+  MANDIR=/usr/man \
+  DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.pod $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/tpm/tpm.info b/system/tpm/tpm.info
new file mode 100644
index 0000000000..92be32639c
--- /dev/null
+++ b/system/tpm/tpm.info
@@ -0,0 +1,10 @@
+PRGNAM="tpm"
+VERSION="1.3.1"
+HOMEPAGE="https://github.com/nmeum/tpm"
+DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.1.tar.gz"
+MD5SUM="fbfa92880d4c82ae3fd22684240e9f19"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/system/trmaid/trmaid.SlackBuild b/system/trmaid/trmaid.SlackBuild
index 04cd31dd17..9398bda556 100644
--- a/system/trmaid/trmaid.SlackBuild
+++ b/system/trmaid/trmaid.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=trmaid
-VERSION=${VERSION:-0.5.5}
+VERSION=${VERSION:-0.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/trmaid/trmaid.info b/system/trmaid/trmaid.info
index e3abf85d23..c37d4ed868 100644
--- a/system/trmaid/trmaid.info
+++ b/system/trmaid/trmaid.info
@@ -1,8 +1,8 @@
 PRGNAM="trmaid"
-VERSION="0.5.5"
+VERSION="0.6.2"
 HOMEPAGE="https://pypi.python.org/pypi/trmaid/"
-DOWNLOAD="https://pypi.python.org/packages/source/t/trmaid/trmaid-0.5.5.tar.gz"
-MD5SUM="9c7accf39cac1a02e78644d7e1cbf1da"
+DOWNLOAD="https://pypi.python.org/packages/source/t/trmaid/trmaid-0.6.2.tar.gz"
+MD5SUM="23d5a56a5b0a2c2a7ed191abeb0b57d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="PyYAML feedparser python-requests redis-py six"
diff --git a/system/ttf-aller/README b/system/ttf-aller/README
new file mode 100644
index 0000000000..5e7e8b9106
--- /dev/null
+++ b/system/ttf-aller/README
@@ -0,0 +1,3 @@
+ttf-aller (True Type Font)
+
+Aller True Type Font for Slackware.
diff --git a/system/ttf-mscorefonts/doinst.sh b/system/ttf-aller/doinst.sh
index 8fec9f5340..8fec9f5340 100644
--- a/system/ttf-mscorefonts/doinst.sh
+++ b/system/ttf-aller/doinst.sh
diff --git a/system/ttf-aller/slack-desc b/system/ttf-aller/slack-desc
new file mode 100644
index 0000000000..6722077ed5
--- /dev/null
+++ b/system/ttf-aller/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+ttf-aller: ttf-aller (True Type Font)
+ttf-aller:
+ttf-aller: Aller True Type Font for Slackware.
+ttf-aller:
+ttf-aller: Home page: https://www.daltonmaag.com/
+ttf-aller:
+ttf-aller:
+ttf-aller:
+ttf-aller:
+ttf-aller:
+ttf-aller:
diff --git a/system/ttf-aller/ttf-aller.SlackBuild b/system/ttf-aller/ttf-aller.SlackBuild
new file mode 100644
index 0000000000..e62c16eb27
--- /dev/null
+++ b/system/ttf-aller/ttf-aller.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# Slackware build script for ttf-aller.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ttf-aller
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+SRCNAM="aller"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM.zip -d $PRGNAM-$VERSION/
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -Dm644 Aller*.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AllerFreeLicenceAgreement.pdf EULA.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ttf-aller/ttf-aller.info b/system/ttf-aller/ttf-aller.info
new file mode 100644
index 0000000000..5fd99d49b0
--- /dev/null
+++ b/system/ttf-aller/ttf-aller.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-aller"
+VERSION="0.1"
+HOMEPAGE="https://www.daltonmaag.com/"
+DOWNLOAD="http://dl.1001fonts.com/aller.zip"
+MD5SUM="46e8d0db3124f60a2b298ad895f11895"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/ttf-monaco/README b/system/ttf-monaco/README
new file mode 100644
index 0000000000..a9617e5674
--- /dev/null
+++ b/system/ttf-monaco/README
@@ -0,0 +1,3 @@
+ttf-monaco (True Type font)
+
+Monaco TrueType Font for Slackware.
diff --git a/system/ttf-monaco/doinst.sh b/system/ttf-monaco/doinst.sh
new file mode 100644
index 0000000000..8fec9f5340
--- /dev/null
+++ b/system/ttf-monaco/doinst.sh
@@ -0,0 +1,11 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-monaco/slack-desc b/system/ttf-monaco/slack-desc
new file mode 100644
index 0000000000..b78029aa04
--- /dev/null
+++ b/system/ttf-monaco/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+ttf-monaco: ttf-monaco (True Type Font)
+ttf-monaco:
+ttf-monaco: Monaco True Type Font for Slackware.
+ttf-monaco:
+ttf-monaco: Home page: http://www.gringod.com/?s=monaco
+ttf-monaco:
+ttf-monaco:
+ttf-monaco:
+ttf-monaco:
+ttf-monaco:
+ttf-monaco:
diff --git a/system/ttf-monaco/ttf-monaco.SlackBuild b/system/ttf-monaco/ttf-monaco.SlackBuild
new file mode 100644
index 0000000000..10bef3482f
--- /dev/null
+++ b/system/ttf-monaco/ttf-monaco.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/sh
+#
+# Slackware build script for ttf-monaco.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ttf-monaco
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="Monaco_Linux"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+mv $CWD/$SRCNAM.ttf $PRGNAM-$VERSION/
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -Dm644 $SRCNAM.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ttf-monaco/ttf-monaco.info b/system/ttf-monaco/ttf-monaco.info
new file mode 100644
index 0000000000..255b6bfa3d
--- /dev/null
+++ b/system/ttf-monaco/ttf-monaco.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-monaco"
+VERSION="0.1"
+HOMEPAGE="http://www.gringod.com/?s=monaco"
+DOWNLOAD="http://www.gringod.com/wp-upload/software/Fonts/Monaco_Linux.ttf"
+MD5SUM="15406419f73436c28b7e7684d6e3f346"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/ttf-mscorefonts/README b/system/ttf-mscorefonts/README
deleted file mode 100644
index 0e56682fb8..0000000000
--- a/system/ttf-mscorefonts/README
+++ /dev/null
@@ -1,3 +0,0 @@
-ttf-mscorefonts (Microsoft TrueType core fonts).
-
-Microsoft TrueType core fonts.
diff --git a/system/ttf-mscorefonts/slack-desc b/system/ttf-mscorefonts/slack-desc
deleted file mode 100644
index afcaa9e87f..0000000000
--- a/system/ttf-mscorefonts/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-               |-----handy-ruler------------------------------------------------------|
-ttf-mscorefonts: ttf-mscorefonts (Microsoft TrueType core fonts).
-ttf-mscorefonts:
-ttf-mscorefonts: Microsoft TrueType core fonts.
-ttf-mscorefonts:
-ttf-mscorefonts: Home page: http://ufpr.dl.sourceforge.net/project/corefonts/
-ttf-mscorefonts:
-ttf-mscorefonts:
-ttf-mscorefonts:
-ttf-mscorefonts:
-ttf-mscorefonts:
-ttf-mscorefonts:
diff --git a/system/ttf-mscorefonts/ttf-mscorefonts.SlackBuild b/system/ttf-mscorefonts/ttf-mscorefonts.SlackBuild
deleted file mode 100644
index ea9a13b28c..0000000000
--- a/system/ttf-mscorefonts/ttf-mscorefonts.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-# Slackware build script for ttf-mscorefonts.
-
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ttf-mscorefonts
-SRCNAM="mscorefonts"
-VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM.tar.gz
-mkdir $PRGNAM-$VERSION
-mv *.exe $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/share/fonts/TTF/msttcorefonts
-cabextract *.exe -L -F *.TTF -d $PKG/usr/share/fonts/TTF/msttcorefonts
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ttf-mscorefonts/ttf-mscorefonts.info b/system/ttf-mscorefonts/ttf-mscorefonts.info
deleted file mode 100644
index a3a2359d82..0000000000
--- a/system/ttf-mscorefonts/ttf-mscorefonts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ttf-mscorefonts"
-VERSION="0.1"
-HOMEPAGE="http://ufpr.dl.sourceforge.net/project/corefonts/"
-DOWNLOAD="https://www.dropbox.com/s/xwaojhwhyprx0bg/mscorefonts.tar.gz"
-MD5SUM="f60fb8880c38bc5dabe64156eb06342d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="cabextract"
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/system/ttf-open-sans/README b/system/ttf-open-sans/README
new file mode 100644
index 0000000000..8c9b9ed105
--- /dev/null
+++ b/system/ttf-open-sans/README
@@ -0,0 +1,7 @@
+ttf-open-sans (True Type font)
+
+Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp.
+This version contains the complete 897 character set, which includes the standard ISO Latin 1, Latin CE, Greek and Cyrillic character sets.
+Open Sans was designed with an upright stress, open forms and a neutral, yet friendly appearance.
+It was optimized for print, web, and mobile interfaces, and has excellent legibility characteristics in its letterforms.
+A few condensed styles are also available.
diff --git a/system/ttf-open-sans/doinst.sh b/system/ttf-open-sans/doinst.sh
new file mode 100644
index 0000000000..8fec9f5340
--- /dev/null
+++ b/system/ttf-open-sans/doinst.sh
@@ -0,0 +1,11 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-open-sans/slack-desc b/system/ttf-open-sans/slack-desc
new file mode 100644
index 0000000000..4493256702
--- /dev/null
+++ b/system/ttf-open-sans/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+ttf-open-sans: ttf-open-sans (True Type Font)
+ttf-open-sans:
+ttf-open-sans: Open Sans a humanist sans serif typeface designed by Steve Matteson
+ttf-open-sans: This version contains the complete 897 character set, which includes 
+ttf-open-sans: the standard ISO Latin 1, Latin CE, Greek and Cyrillic character sets.
+ttf-open-sans:
+ttf-open-sans: Home page: http://www.1001fonts.com/open-sans-font.html
+ttf-open-sans:
+ttf-open-sans:
+ttf-open-sans:
+ttf-open-sans:
diff --git a/system/ttf-open-sans/ttf-open-sans.SlackBuild b/system/ttf-open-sans/ttf-open-sans.SlackBuild
new file mode 100644
index 0000000000..264ab2a22f
--- /dev/null
+++ b/system/ttf-open-sans/ttf-open-sans.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+# Slackware build script for ttf-open-sans.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ttf-open-sans
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM="open-sans"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM.zip -d $PRGNAM-$VERSION/
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/fonts/TTF
+
+FONTS="OpenSans-Bold.ttf OpenSans-BoldItalic.ttf OpenSans-ExtraBold.ttf \
+OpenSans-ExtraBoldItalic.ttf OpenSans-Italic.ttf OpenSans-Light.ttf \
+OpenSans-LightItalic.ttf OpenSans-Regular.ttf OpenSans-Semibold.ttf \
+OpenSans-SemiboldItalic.ttf"
+
+for i in $FONTS; do
+  cp -a $i $PKG/usr/share/fonts/TTF/
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ttf-open-sans/ttf-open-sans.info b/system/ttf-open-sans/ttf-open-sans.info
new file mode 100644
index 0000000000..d1e1bca22b
--- /dev/null
+++ b/system/ttf-open-sans/ttf-open-sans.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-open-sans"
+VERSION="0.1"
+HOMEPAGE="http://www.1001fonts.com/open-sans-font.html"
+DOWNLOAD="http://dl.1001fonts.com/open-sans.zip"
+MD5SUM="e628ed23fb53515a0d26644dd15c96be"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/ttf-roboto/README b/system/ttf-roboto/README
new file mode 100644
index 0000000000..f8f120e5d1
--- /dev/null
+++ b/system/ttf-roboto/README
@@ -0,0 +1,3 @@
+ttf-roboto (True Type Font)
+
+Google's Android 5 system font for Slackware.
diff --git a/system/ttf-roboto/doinst.sh b/system/ttf-roboto/doinst.sh
new file mode 100644
index 0000000000..8fec9f5340
--- /dev/null
+++ b/system/ttf-roboto/doinst.sh
@@ -0,0 +1,11 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-roboto/slack-desc b/system/ttf-roboto/slack-desc
new file mode 100644
index 0000000000..fcdca68dc7
--- /dev/null
+++ b/system/ttf-roboto/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+ttf-roboto: ttf-roboto (True Type Font)
+ttf-roboto:
+ttf-roboto: Google's Android 5 system font for Slackware.
+ttf-roboto:
+ttf-roboto: Home page: http://goo.gl/dd6n7c
+ttf-roboto:
+ttf-roboto:
+ttf-roboto:
+ttf-roboto:
+ttf-roboto:
+ttf-roboto:
diff --git a/system/ttf-roboto/ttf-roboto.SlackBuild b/system/ttf-roboto/ttf-roboto.SlackBuild
new file mode 100644
index 0000000000..a89af27ed4
--- /dev/null
+++ b/system/ttf-roboto/ttf-roboto.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Slackware build script for ttf-roboto.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=ttf-roboto
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+SRCNAM="RobotoTTF"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM.zip -d $PRGNAM-$VERSION/
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -Dm644 Roboto*.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ttf-roboto/ttf-roboto.info b/system/ttf-roboto/ttf-roboto.info
new file mode 100644
index 0000000000..3700daedb6
--- /dev/null
+++ b/system/ttf-roboto/ttf-roboto.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-roboto"
+VERSION="0.1"
+HOMEPAGE="http://goo.gl/dd6n7c"
+DOWNLOAD="http://material-design.storage.googleapis.com/publish/v_2/material_ext_publish/0B08MbvYZK1iNZGNoWmJqVEhQYTQ/RobotoTTF.zip"
+MD5SUM="54a3ae81a391086048c507aac566a823"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild b/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild
index e46fef4d84..edb5d749f6 100644
--- a/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild
+++ b/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ttf-ubuntu-font-family
-VERSION=${VERSION:-0.80}
+VERSION=${VERSION:-0.83}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,9 +47,9 @@ cd ubuntu-font-family-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttf $PKG/usr/share/fonts/TTF
diff --git a/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.info b/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.info
index dbd80f370a..5519582ce6 100644
--- a/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.info
+++ b/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-ubuntu-font-family"
-VERSION="0.80"
+VERSION="0.83"
 HOMEPAGE="http://font.ubuntu.com/"
-DOWNLOAD="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip"
-MD5SUM="a1fc70f5a5b1d096ab8310886cddaa1c"
+DOWNLOAD="http://font.ubuntu.com/download/ubuntu-font-family-0.83.zip"
+MD5SUM="a24b8136b8f3bb93f166baf97d9328de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/udiskie/README b/system/udiskie/README
index b1cf74a21e..35f6782e4d 100644
--- a/system/udiskie/README
+++ b/system/udiskie/README
@@ -2,3 +2,5 @@ udiskie is a simple daemon that uses UDisks_ to automatically mount
 removable storage devices. This daemon comes with optional mount
 notifications and gtk tray icon. It also provides a user level CLI for
 mount and unmount operations.
+
+Optional dependency: python-keyutils
diff --git a/system/udiskie/udiskie.SlackBuild b/system/udiskie/udiskie.SlackBuild
index e8d64fe827..b4ee61bc25 100644
--- a/system/udiskie/udiskie.SlackBuild
+++ b/system/udiskie/udiskie.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for udiskie
 
-# Copyright 2014 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=udiskie
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/udiskie/udiskie.info b/system/udiskie/udiskie.info
index aa372135eb..2f158b0b6f 100644
--- a/system/udiskie/udiskie.info
+++ b/system/udiskie/udiskie.info
@@ -1,8 +1,8 @@
 PRGNAM="udiskie"
-VERSION="1.2.0"
+VERSION="1.4.7"
 HOMEPAGE="https://github.com/coldfix/udiskie"
-DOWNLOAD="https://pypi.python.org/packages/source/u/udiskie/udiskie-1.2.0.tar.gz"
-MD5SUM="df5ee82d33f5e129093e99a15ebfd590"
+DOWNLOAD="https://pypi.python.org/packages/source/u/udiskie/udiskie-1.4.7.tar.gz"
+MD5SUM="e4c4f95cb948903eacc49ec206b82cae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygobject3 PyYAML docopt"
diff --git a/system/uhd/uhd.info b/system/uhd/uhd.info
index cb3bf7575d..f4f8ac3eef 100644
--- a/system/uhd/uhd.info
+++ b/system/uhd/uhd.info
@@ -1,5 +1,5 @@
 PRGNAM="uhd"
-VERSION="003_005002"
+VERSION="003_005_002"
 HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
 DOWNLOAD="https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz"
 MD5SUM="14f914b68bb9f58b1d08ae97000c03f4"
diff --git a/system/unac/README b/system/unac/README
new file mode 100644
index 0000000000..541db046af
--- /dev/null
+++ b/system/unac/README
@@ -0,0 +1,7 @@
+unac (remove accents from text)
+
+unac is a C library and command that removes accents from a string. For
+instance the string été will become ete. It provides a command line
+interface that removes accents from an input flow or a string given in
+argument (unaccent command). In the library function and the command,
+the charset of the input is specified as an argument.
diff --git a/system/unac/oe_ligature.diff b/system/unac/oe_ligature.diff
new file mode 100644
index 0000000000..1fa9a52453
--- /dev/null
+++ b/system/unac/oe_ligature.diff
@@ -0,0 +1,11 @@
+diff -Naur unac-1.8.0.orig/unaccent-local-map.perl unac-1.8.0.orig.patched/unaccent-local-map.perl
+--- unac-1.8.0.orig/unaccent-local-map.perl	2003-10-13 06:24:25.000000000 -0400
++++ unac-1.8.0.orig.patched/unaccent-local-map.perl	2015-10-26 17:01:49.000000000 -0400
+@@ -23,5 +23,7 @@
+ %::localmap = (
+     "LATIN SMALL LETTER AE" => [ "LATIN SMALL LETTER A", "LATIN SMALL LETTER E" ],
+     "LATIN CAPITAL LETTER AE" => [ "LATIN CAPITAL LETTER A", "LATIN CAPITAL LETTER E" ],
++    "LATIN SMALL LIGATURE OE" => [ "LATIN SMALL LETTER O", "LATIN SMALL LETTER E" ],
++    "LATIN CAPITAL LIGATURE OE" => [ "LATIN CAPITAL LETTER O", "LATIN CAPITAL LETTER E" ],
+ 		 );
+ 
diff --git a/system/unac/size_t.diff b/system/unac/size_t.diff
new file mode 100644
index 0000000000..e7ef82ba32
--- /dev/null
+++ b/system/unac/size_t.diff
@@ -0,0 +1,45 @@
+diff -r fd7eb0d70970 unac-1.8.0/unac.c
+--- a/unac-1.8.0/unac.c	Fri Sep 17 10:35:14 2010 +0200
++++ b/unac-1.8.0/unac.c	Fri Sep 17 10:36:07 2010 +0200
+@@ -13873,9 +13873,9 @@
+     *out_lengthp = 0;
+   } else {
+     char* utf16 = 0;
+-    int utf16_length = 0;
++    size_t utf16_length = 0;
+     char* utf16_unaccented = 0;
+-    int utf16_unaccented_length = 0;
++    size_t utf16_unaccented_length = 0;
+   
+     if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
+       return -1;
+diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
+--- a/unac-1.8.0/unaccent.c	Fri Sep 17 10:35:14 2010 +0200
++++ b/unac-1.8.0/unaccent.c	Fri Sep 17 10:40:34 2010 +0200
+@@ -90,7 +90,7 @@
+     const char* charset = argv[optind++];
+ 
+     char* unaccented = 0;
+-    int unaccented_length = 0;
++    size_t unaccented_length = 0;
+ 
+     if(optind >= argc) {
+ #define BUFFER_SIZE 10240
+@@ -101,7 +101,7 @@
+ 	  perror("");
+ 	  exit(1);
+ 	}
+-	printf("%.*s", unaccented_length, unaccented);
++	printf("%.*s", (int)unaccented_length, unaccented);
+       }
+     } else {
+       const char* string = argv[optind++];
+@@ -114,7 +114,7 @@
+ 
+       if(debug_level > UNAC_DEBUG_NONE)
+ 	fprintf(stderr, "unaccented version is ");
+-      printf("%.*s\n", unaccented_length, unaccented);
++      printf("%.*s\n", (int)unaccented_length, unaccented);
+ 
+       if(optind < argc) {
+ 	const char* expected = argv[optind++];
diff --git a/system/unac/slack-desc b/system/unac/slack-desc
new file mode 100644
index 0000000000..202227ffb1
--- /dev/null
+++ b/system/unac/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+unac: unac (remove accents from text)
+unac:
+unac: unac is a C library and command that removes accents from a
+unac: string. For instance the string été will become ete. It provides
+unac: a command line interface that removes accents from a input flow or a
+unac: string given in argument (unaccent command). In the library function
+unac: and the command, the charset of the input is specified as an argument.
+unac:
+unac:
+unac:
+unac:
diff --git a/system/unac/unac.SlackBuild b/system/unac/unac.SlackBuild
new file mode 100644
index 0000000000..e9868c5f27
--- /dev/null
+++ b/system/unac/unac.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for unac
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+PRGNAM=unac
+VERSION=${VERSION:-1.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+TARBALL=${PRGNAM}_${VERSION}.orig.tar.gz
+DIRNAME=${PRGNAM}-${VERSION}.orig
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $DIRNAME
+tar xvf $CWD/$TARBALL
+cd $DIRNAME
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# patch taken from http://http.debian.net/debian/pool/main/u/unac/unac_1.8.0-6.diff.gz
+# (yes, it needs -p2)
+patch -p2 < $CWD/size_t.diff
+
+# patch by slackbuild author, add support for OE ligature
+patch -p1 < $CWD/oe_ligature.diff
+
+touch config.rpath # shut up, autocrap
+autoreconf -if
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-shared \
+  --build=$ARCH-slackware-linux
+
+# this is needed for the OE ligature also
+make -B $PRGNAM.c
+
+make
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/unac/unac.info b/system/unac/unac.info
new file mode 100644
index 0000000000..4379cc82e7
--- /dev/null
+++ b/system/unac/unac.info
@@ -0,0 +1,10 @@
+PRGNAM="unac"
+VERSION="1.8.0"
+HOMEPAGE="http://www.nongnu.org/unac/"
+DOWNLOAD="http://http.debian.net/debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz"
+MD5SUM="8670c920969a199dec37f15c197602bf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/unhide/unhide.info b/system/unhide/unhide.info
index 75dbb96d80..796a6eb6cd 100644
--- a/system/unhide/unhide.info
+++ b/system/unhide/unhide.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Black Rider"
-EMAIL="black_rider@esdebian.org"
+EMAIL="softwareworks@use.startmail.com"
diff --git a/system/unison/unison.info b/system/unison/unison.info
index c1c6570caa..2d3606c5d1 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -3,7 +3,7 @@ VERSION="2.40.128"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
 DOWNLOAD="http://www.seas.upenn.edu/~bcpierce/unison//download/releases/unison-2.40.128/unison-2.40.128.tar.gz \
           http://www.seas.upenn.edu/~bcpierce/unison//download/releases/unison-2.40.128/unison-2.40.128-manual.html"
-MD5SUM="aa4d9d425b2ee2f9676ac5331a154bac \
+MD5SUM="4194015003956a10a2d0a83e3e7733f7 \
         571c16ae440677dc69bbceb8fe668501"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/unp/unp.SlackBuild b/system/unp/unp.SlackBuild
index e8744d00d9..64407f12e6 100644
--- a/system/unp/unp.SlackBuild
+++ b/system/unp/unp.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for unp
 
-# Petr Kletecka petr@kle.cz <2013>
+# Petr Kletecka petr@kle.cz <2015>
 
 PRGNAM=unp
-VERSION=${VERSION:-2.0~pre4}
+VERSION=${VERSION:-2.0~pre7+nmu1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -22,14 +22,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xf $CWD/${PRGNAM}_${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/bin
 cat unp > $PKG/usr/bin/unp
@@ -41,5 +41,9 @@ gzip -9c debian/unp.1 > $PKG/usr/man/man1/unp.1.gz
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+cd $TMP/$PRGNAM-$VERSION/po
+make
+DESTDIR=$PKG make install
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/unp/unp.info b/system/unp/unp.info
index 1e82c4fda8..b35c285b15 100644
--- a/system/unp/unp.info
+++ b/system/unp/unp.info
@@ -1,8 +1,8 @@
 PRGNAM="unp"
-VERSION="2.0~pre4"
+VERSION="2.0~pre7+nmu1"
 HOMEPAGE="http://packages.debian.org/en/squeeze/unp"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/u/unp/unp_2.0~pre4.tar.gz"
-MD5SUM="9163572febf099f57664f22f7be154f0"
+DOWNLOAD="http://ftp.debian.org/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"
+MD5SUM="a4ab75f364478cd3f08532df91f4f694"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unrar/unrar.SlackBuild b/system/unrar/unrar.SlackBuild
index 26ec324d77..3db1a49eca 100644
--- a/system/unrar/unrar.SlackBuild
+++ b/system/unrar/unrar.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unrar
-VERSION=${VERSION:-5.2.6}
+VERSION=${VERSION:-5.3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/unrar/unrar.info b/system/unrar/unrar.info
index 61b78ef54a..8d9924fb27 100644
--- a/system/unrar/unrar.info
+++ b/system/unrar/unrar.info
@@ -1,8 +1,8 @@
 PRGNAM="unrar"
-VERSION="5.2.6"
+VERSION="5.3.7"
 HOMEPAGE="http://www.rarlab.com"
-DOWNLOAD="http://www.rarlab.com/rar/unrarsrc-5.2.6.tar.gz"
-MD5SUM="86736fdc652dcbedddac6ac1dff3115a"
+DOWNLOAD="http://www.rarlab.com/rar/unrarsrc-5.3.7.tar.gz"
+MD5SUM="668f8de87b74d9fa7037d3d487200149"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unrtf/unrtf.SlackBuild b/system/unrtf/unrtf.SlackBuild
index df9cf916cc..185d0749eb 100644
--- a/system/unrtf/unrtf.SlackBuild
+++ b/system/unrtf/unrtf.SlackBuild
@@ -24,8 +24,8 @@
 #   SUCH DAMAGE.
 
 PRGNAM=unrtf
-VERSION=${VERSION:-0.21.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.21.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/system/unrtf/unrtf.info b/system/unrtf/unrtf.info
index 000a479e1a..03029983d0 100644
--- a/system/unrtf/unrtf.info
+++ b/system/unrtf/unrtf.info
@@ -1,8 +1,8 @@
 PRGNAM="unrtf"
-VERSION="0.21.1"
+VERSION="0.21.7"
 HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
-DOWNLOAD="http://www.gnu.org/software/unrtf/unrtf-0.21.1.tar.gz"
-MD5SUM="ce069646837d0a2c15b439a5529afde8"
+DOWNLOAD="http://www.gnu.org/software/unrtf/unrtf-0.21.7.tar.gz"
+MD5SUM="ef2537144da5603beedf3a1f413172c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/uptimed/README b/system/uptimed/README
index e96a9c0bdb..2fbb1725ec 100644
--- a/system/uptimed/README
+++ b/system/uptimed/README
@@ -24,7 +24,7 @@ To have the daemon launch automatically at boot time,
 	chmod 755 /etc/rc.d/rc.uptimed
   2) Add an entry in rc.local with;
 	if [ -x /etc/rc.d/rc.uptimed ]; then
-	/etc/rc.d/rc.uptimed start
+	  /etc/rc.d/rc.uptimed start &
 	fi
 
 Q: Why are my records not saved between reboots? I can see the current uptime
@@ -33,3 +33,6 @@ A: The uptimed daemon was possibly not running to regularly save the data to the
   "/var/spool/uptimed/records" file. See above on how to automatically start
   the daemon, and confirm that the "/var/spool/uptimed" directory exists
   and is writable.
+
+If performing an upgrade, you may need to chmod 755 rc.uptimed and restart the
+daemon with "/etc/rc.d/rc.uptimed restart".
diff --git a/system/uptimed/rc.uptimed b/system/uptimed/rc.uptimed
index b27a36b342..7425a88ed0 100644
--- a/system/uptimed/rc.uptimed
+++ b/system/uptimed/rc.uptimed
@@ -9,51 +9,51 @@ PIDFILE="/var/run/uptimed"
 
 START="$UPTIMED"
 if [ -e $PIDFILE ]; then
-        STOP="kill $( cat $PIDFILE )"
+	STOP="kill $( cat $PIDFILE )"
 else
-        STOP="killall $UPTIMED"
+	STOP="killall $UPTIMED"
 fi
 CREATEBOOTID="$UPTIMED -b"
 
 start()
 {
-        echo -n $"Starting $NAME:"
-        $START
-        RETVAL=$?
-        echo
+	echo -n $"Starting $NAME:"
+	$START
+	RETVAL=$?
+	echo
 }
 
 stop()
 {
-        echo -n $"Stopping $NAME:"
-        $STOP
-        RETVAL=$?
-        echo
+	echo -n $"Stopping $NAME:"
+	$STOP
+	RETVAL=$?
+	echo
 }
 
 createbootid()
 {
-        $CREATEBOOTID
-        RETVAL=$?
-        $POST
+	$CREATEBOOTID
+	RETVAL=$?
+	$POST
 }
 
 case "$1" in
-        start)
-                start
+	start)
+		start
 		;;
-        stop)
-                stop
-                ;;
-        restart)
-                stop
-                start
-                ;;
-        createbootid)
-                createbootid
-                ;;
-        *)
-                echo $"Usage: $0 {start|stop|restart|createbootid}"
-        RETVAL=1
+	stop)
+		stop
+		;;
+	restart)
+		stop
+		start
+		;;
+	createbootid)
+		createbootid
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|restart|createbootid}"
+		RETVAL=1
 esac
 exit $RETVAL
diff --git a/system/uptimed/slack-desc b/system/uptimed/slack-desc
index e91a029db9..d22fa932df 100644
--- a/system/uptimed/slack-desc
+++ b/system/uptimed/slack-desc
@@ -12,7 +12,7 @@ uptimed: Uptimed is an uptime daemon (logs your best uptimes).
 uptimed:
 uptimed:
 uptimed:
-uptimed: Homepage: http://podgorny.cz/moin/Uptimed
+uptimed: Homepage: https://github.com/rpodgorny/uptimed/
 uptimed:
 uptimed:
 uptimed:
diff --git a/system/uptimed/uptimed.SlackBuild b/system/uptimed/uptimed.SlackBuild
index efb44086b6..bc9384b204 100644
--- a/system/uptimed/uptimed.SlackBuild
+++ b/system/uptimed/uptimed.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh -e
-# Graham Orange v0.17 2014-04-09
+# Graham Orange v0.18 2015-11-02
 
-# Copyright 2014 Graham Orange, USA
+# Copyright 2015 Graham Orange, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=uptimed
-VERSION=${VERSION:-0.3.17}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,7 +34,7 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-DOCS="AUTHORS COPYING CREDITS ChangeLog INSTALL* NEWS README TODO"
+DOCS="AUTHORS COPYING CREDITS ChangeLog INSTALL* NEWS README* TODO"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -61,15 +61,17 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Generate the configure file.
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure \
diff --git a/system/uptimed/uptimed.info b/system/uptimed/uptimed.info
index fc67aa8016..524a57cf10 100644
--- a/system/uptimed/uptimed.info
+++ b/system/uptimed/uptimed.info
@@ -1,8 +1,8 @@
 PRGNAM="uptimed"
-VERSION="0.3.17"
-HOMEPAGE="http://podgorny.cz/moin/Uptimed"
-DOWNLOAD="http://podgorny.cz/uptimed/releases/uptimed-0.3.17.tar.bz2"
-MD5SUM="528b62c33454b33537c3bf2366977bdb"
+VERSION="0.4.0"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+DOWNLOAD="https://github.com/rpodgorny/uptimed/archive/v0.4.0.tar.gz"
+MD5SUM="6c50b0671e7efed89efb4b956dc0f5e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/usermin/usermin.SlackBuild b/system/usermin/usermin.SlackBuild
index 17f14ec8b6..82c6e7bc28 100644
--- a/system/usermin/usermin.SlackBuild
+++ b/system/usermin/usermin.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=usermin
-VERSION=${VERSION:-1.670}
+VERSION=${VERSION:-1.690}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/usermin/usermin.info b/system/usermin/usermin.info
index e15a696fb8..942659a53c 100644
--- a/system/usermin/usermin.info
+++ b/system/usermin/usermin.info
@@ -1,8 +1,8 @@
 PRGNAM="usermin"
-VERSION="1.670"
+VERSION="1.690"
 HOMEPAGE="http://webmin.com/usermin.html"
-DOWNLOAD="http://prdownloads.sourceforge.net/webadmin/usermin-1.670.tar.gz"
-MD5SUM="119202a27281f2a304f81fceaf22b3c6"
+DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.690/usermin-1.690.tar.gz"
+MD5SUM="dd0280dbfb66482babbde36fa6da855f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webmin"
diff --git a/system/vagrant/vagrant.SlackBuild b/system/vagrant/vagrant.SlackBuild
index 55cab7be8b..b201050808 100644
--- a/system/vagrant/vagrant.SlackBuild
+++ b/system/vagrant/vagrant.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=vagrant
-VERSION=${VERSION:-1.7.4}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/vagrant/vagrant.info b/system/vagrant/vagrant.info
index adf1ef791d..243474ed44 100644
--- a/system/vagrant/vagrant.info
+++ b/system/vagrant/vagrant.info
@@ -1,10 +1,10 @@
 PRGNAM="vagrant"
-VERSION="1.7.4"
+VERSION="1.8.1"
 HOMEPAGE="http://www.vagrantup.com"
-DOWNLOAD="https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4_i686.rpm"
-MD5SUM="e2eea21b5ac3614842d6923db97d3eab"
-DOWNLOAD_x86_64="https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4_x86_64.rpm"
-MD5SUM_x86_64="667fb759e13f009f544b8fc3289b79a9"
+DOWNLOAD="https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_i686.rpm"
+MD5SUM="93e94a04df1d673c12910daf0125e930"
+DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.rpm"
+MD5SUM_x86_64="0eafdd0c99d78c7a9ee1d4a0332ef4a7"
 REQUIRES=""
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/system/vinterm/vinterm.info b/system/vinterm/vinterm.info
index 67604aebc8..440ab6857d 100644
--- a/system/vinterm/vinterm.info
+++ b/system/vinterm/vinterm.info
@@ -1,8 +1,8 @@
 PRGNAM="vinterm"
 VERSION="0.5.0"
 HOMEPAGE="http://code.google.com/p/vinterm/"
-DOWNLOAD="http://vinterm.googlecode.com/files/vinterm-0.5.0.tar.gz \
-          http://vinterm.googlecode.com/files/vinterm.vim"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/vinterm-0.5.0.tar.gz \
+          http://urchlay.naptime.net/~urchlay/src/vinterm.vim"
 MD5SUM="307d2285565d9699d62bfc72b8e445c3 \
         15fd1ef04deb529f3aad5aa11b5d1bf4"
 DOWNLOAD_x86_64=""
diff --git a/system/virt-manager/README b/system/virt-manager/README
index 0bb36352eb..f2b2ee4838 100644
--- a/system/virt-manager/README
+++ b/system/virt-manager/README
@@ -6,3 +6,6 @@ To run virt-manager as a normal user, you need to configure libvirt
 to have the correct permissions.  Uncomment the unix_sock_group and
 unix_sock_rw_perms in /etc/libvirt/libvirtd.conf and add the user to the
 group libvirt uses.
+
+If you have python3 installed at build-time, this probably won't work,
+so you'll need to temporarily uninstall python3 for the build process.
diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild
index e60f6d6dc6..76dc4702c1 100644
--- a/system/virt-manager/virt-manager.SlackBuild
+++ b/system/virt-manager/virt-manager.SlackBuild
@@ -7,7 +7,7 @@
 # Lots of mods by rworkman for 1.x
 
 PRGNAM=virt-manager
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info
index 6dd347aa30..777e7fd2c2 100644
--- a/system/virt-manager/virt-manager.info
+++ b/system/virt-manager/virt-manager.info
@@ -1,8 +1,8 @@
 PRGNAM="virt-manager"
-VERSION="1.2.0"
+VERSION="1.2.1"
 HOMEPAGE="http://virt-manager.org/"
-DOWNLOAD="https://fedorahosted.org/released/virt-manager/virt-manager-1.2.0.tar.gz"
-MD5SUM="89e6c816054f3a3751100a8d79ec97c2"
+DOWNLOAD="http://virt-manager.org/download/sources/virt-manager/virt-manager-1.2.1.tar.gz"
+MD5SUM="c8045da517e7c9d8696e22970291c55e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libosinfo libvirt-glib libvirt-python gnome-python2-gconf tunctl ipaddr-py urlgrabber pygobject3 gtk-vnc spice-gtk vte3"
diff --git a/system/volatility/README b/system/volatility/README
new file mode 100644
index 0000000000..f193110dfb
--- /dev/null
+++ b/system/volatility/README
@@ -0,0 +1,11 @@
+Volatility Framework - Volatile memory extraction utility framework.
+
+The Volatility Framework is a completely open collection of tools,
+implemented in Python under the GNU General Public License, for the
+extraction of digital artifacts from volatile memory (RAM) samples.
+The extraction techniques are performed completely independent of the
+system being investigated but offer visibilty into the runtime state
+of the system. The framework is intended to introduce people to the
+techniques and complexities associated with extracting digital artifacts
+from volatile memory samples and provide a platform for further work into
+this exciting area of research.
diff --git a/system/volatility/slack-desc b/system/volatility/slack-desc
new file mode 100644
index 0000000000..b8447afa10
--- /dev/null
+++ b/system/volatility/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+volatility: volatility (memory extraction utility framework)
+volatility:
+volatility: The Volatility Framework is a completely open collection of tools,
+volatility: implemented in Python under the GNU General Public License, for the
+volatility: extraction of digital artifacts from volatile memory (RAM) samples.
+volatility:
+volatility: https://github.com/volatilityfoundation/volatility
+volatility:
+volatility:
+volatility:
+volatility:
diff --git a/system/volatility/volatility.SlackBuild b/system/volatility/volatility.SlackBuild
new file mode 100644
index 0000000000..27c39c26cc
--- /dev/null
+++ b/system/volatility/volatility.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for volatility
+# Copyright 2014-2015  Barry Grundy <bgrundy[at]linuxleo.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Created v2.4 December 2015, Barry J. Grundy.
+
+PRGNAM=volatility
+VERSION=${VERSION:-2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.txt LICENSE.txt LEGAL.txt AUTHORS.txt CREDITS.txt \
+$PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/volatility/volatility.info b/system/volatility/volatility.info
new file mode 100644
index 0000000000..e5cb0a3049
--- /dev/null
+++ b/system/volatility/volatility.info
@@ -0,0 +1,10 @@
+PRGNAM="volatility"
+VERSION="2.4"
+HOMEPAGE="https://github.com/volatilityfoundation/volatility"
+DOWNLOAD="http://downloads.volatilityfoundation.org/releases/2.4/volatility-2.4.tar.gz"
+MD5SUM="4f9ad730fb2174c90182cc29cb249d20"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="distorm3 pycrypto"
+MAINTAINER="Barry J. Grundy"
+EMAIL="bgrundy AT linuxleo.com"
diff --git a/system/wangfonts/README b/system/wangfonts/README
new file mode 100644
index 0000000000..3905dbad2d
--- /dev/null
+++ b/system/wangfonts/README
@@ -0,0 +1,2 @@
+Free Chinese TrueType fonts donated by Prof. Hann-Tzong WANG in 2000 and 2004.
+The license is GPL 2.0.
diff --git a/system/wangfonts/doinst.sh b/system/wangfonts/doinst.sh
new file mode 100644
index 0000000000..883c47ac0a
--- /dev/null
+++ b/system/wangfonts/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/wangfonts/slack-desc b/system/wangfonts/slack-desc
new file mode 100644
index 0000000000..53551c8263
--- /dev/null
+++ b/system/wangfonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+wangfonts: wangfonts (Free Chinese TrueType fonts)
+wangfonts:
+wangfonts: Wangfonts are a collection of free Chinese TrueType fonts donated by
+wangfonts: Prof. Hann-Tzong WANG.
+wangfonts:
+wangfonts: Homepage: https://code.google.com/p/wangfonts/
+wangfonts:
+wangfonts:
+wangfonts:
+wangfonts:
+wangfonts:
diff --git a/system/wangfonts/wangfonts.SlackBuild b/system/wangfonts/wangfonts.SlackBuild
new file mode 100644
index 0000000000..f62fa753bd
--- /dev/null
+++ b/system/wangfonts/wangfonts.SlackBuild
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# Slackware build script for wangfonts
+
+# Copyright 2015  CCHsu, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wangfonts
+VERSION=${VERSION:-1.3.0}
+ARCH=noarch
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e 	
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Installing font
+mkdir -p $PKG/usr/share/fonts/TTF
+cp ./*.ttf $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -L "$CWD"/{COPYING,Changes.txt} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wangfonts/wangfonts.info b/system/wangfonts/wangfonts.info
new file mode 100644
index 0000000000..897b457e40
--- /dev/null
+++ b/system/wangfonts/wangfonts.info
@@ -0,0 +1,10 @@
+PRGNAM="wangfonts"
+VERSION="1.3.0"
+HOMEPAGE="https://code.google.com/p/wangfonts/"
+DOWNLOAD="https://wangfonts.googlecode.com/files/wangfonts-1.3.0.tar.gz https://wangfonts.googlecode.com/git/COPYING https://wangfonts.googlecode.com/git/Changes.txt"
+MD5SUM="c1486ab3c7b5ac9ca83de557ca127a74 cfa78d367717066cec34bf190144cb8e 2e26f8c72c2288626b8d16604a9d3512"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="CCHsu"
+EMAIL="a12321aabb@gmail.com"
diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild
index f645ddbaaa..886103437e 100644
--- a/system/webmin/webmin.SlackBuild
+++ b/system/webmin/webmin.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=webmin
-VERSION=${VERSION:-1.760}
+VERSION=${VERSION:-1.780}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info
index 4186d60d56..90d22cb5de 100644
--- a/system/webmin/webmin.info
+++ b/system/webmin/webmin.info
@@ -1,8 +1,8 @@
 PRGNAM="webmin"
-VERSION="1.760"
+VERSION="1.780"
 HOMEPAGE="http://www.webmin.com/"
-DOWNLOAD="http://downloads.sourceforge.net/webadmin/webmin-1.760.tar.gz"
-MD5SUM="69ca5bd1f4ca0e1fa48afcd914bacf4a"
+DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/webmin/1.780/webmin-1.780.tar.gz"
+MD5SUM="d5de2ef2b47de718c7f1addbf0bc2e5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/system/wiimms-iso-tools/README b/system/wiimms-iso-tools/README
new file mode 100644
index 0000000000..907353be1f
--- /dev/null
+++ b/system/wiimms-iso-tools/README
@@ -0,0 +1,28 @@
+Wiimms ISO Tools is a set of command line tools to manipulate Wii and GameCube
+ISO images and WBFS containers. The toolset consists of the following tools:
+
+wit (Wiimms ISO Tool):
+
+    This is the main ISO manipulation tool : It can list, analyze, verify, convert,
+    split, join, patch, mix, extract, compose, rename and compare Wii and GameCube
+    images. It also can create and dump different other Wii file formats.
+
+wwt (Wiimms WBFS Tool):
+
+    This is the main WBFS manipulation tool (WBFS manager) : It can create, check,
+    repair, verify and clone WBFS files and partitions. It can list, add, extract,
+    remove, rename and recover ISO images as part of a WBFS.
+
+wdf (Wiimms WDF Tool):
+
+    wdf is a support tool for WDF, WIA, CISO and GCZ images. It converts (packs and
+    unpacks), compares and dumps WDF and CISO images. Additionally it dumps WIA and
+    GCT image and unpacks WIA images. The default command depends on the program file
+    name (see command descriptions). Usual names are wdf, unwdf, wdf-cat, wdf-cmp and
+    wdf-dump (with or without minus signs). »wdf +CAT« replaces the old tool wdf-c
+    and »wdf +DUMP« the old tool wdf-dum
+
+wfuse (Wiimms FUSE Tool):
+
+    Mount a Wii or GameCube image or a WBFS file or partition to a mount point using
+    FUSE (Filesystem in USErspace). Use 'wfuse --umount mountdir' for unmounting.
diff --git a/system/wiimms-iso-tools/slack-desc b/system/wiimms-iso-tools/slack-desc
new file mode 100644
index 0000000000..1d9acfb535
--- /dev/null
+++ b/system/wiimms-iso-tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+wiimms-iso-tools: Wiimms ISO Tools (command line ISO and WBFS tools)
+wiimms-iso-tools:
+wiimms-iso-tools: Wiimms ISO Tools is a set of command line tools to manipulate 
+wiimms-iso-tools: Wii and GameCube ISO images and WBFS containers.
+wiimms-iso-tools:
+wiimms-iso-tools: Homepage: http://wit.wiimm.de/
+wiimms-iso-tools:
+wiimms-iso-tools:
+wiimms-iso-tools:
+wiimms-iso-tools:
+wiimms-iso-tools:
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
new file mode 100644
index 0000000000..0976a50ecb
--- /dev/null
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+# Slackware build script for Wiimms ISO Tools
+#
+# Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Hunter Sezen California, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wiimms-iso-tools
+VERSION=${VERSION:-0.31a}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+
+# Fix the install directory
+sed -i "s|usr/local|$PKG/usr|" templates.sed
+
+make install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a WDF.txt $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.info b/system/wiimms-iso-tools/wiimms-iso-tools.info
new file mode 100644
index 0000000000..6d798af15b
--- /dev/null
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="wiimms-iso-tools"
+VERSION="0.31a"
+HOMEPAGE="http://wit.wiimm.de/"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/wiimms-iso-tools-0.31a.tar.bz2"
+MD5SUM="971b8c3f26448c623f4e93cb1a970156"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Sezen"
+EMAIL="ovariegata@yahoo.com"
diff --git a/system/wiimms-wbfs-tool/Makefile.diff b/system/wiimms-wbfs-tool/Makefile.diff
deleted file mode 100644
index fc31a6a474..0000000000
--- a/system/wiimms-wbfs-tool/Makefile.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wiimms-wbfs-tool-0.25a.orig/Makefile wiimms-wbfs-tool-0.25a/Makefile
---- wiimms-wbfs-tool-0.25a.orig/Makefile	2010-01-04 14:47:11.265517000 +0100
-+++ wiimms-wbfs-tool-0.25a/Makefile	2010-01-04 15:36:37.033724127 +0100
-@@ -105,7 +105,7 @@
- #LDFLAGS	+= -Xlinker --strip-all
- LDFLAGS		:= $(strip $(LDFLAGS))
- 
--INSTALL_PATH	= /usr/local
-+INSTALL_PATH	= /usr
- INSTALL_SCRIPTS	= install.sh load-titles.sh
- RM_FILES	+= $(INSTALL_SCRIPTS)
- SCRIPTS		= ./scripts
diff --git a/system/wiimms-wbfs-tool/README b/system/wiimms-wbfs-tool/README
deleted file mode 100644
index dea8eeb395..0000000000
--- a/system/wiimms-wbfs-tool/README
+++ /dev/null
@@ -1,25 +0,0 @@
-Wiimm's WBFS Tool (a command line WBFS tool set for various os)
-
-Wiimm's WBFS Tool (or wwt, for shorter) is a set of programs which can manage,
-create and convert ISO, WBFS and WDF files and partitions.
-Some special features:
-  * WDF support: WDF is a new format for reducing the size of ISO images
-  * Support WBFS on block devices, as plain files and as splitted files.
-  * Find WBFS partitions on block devices automatically if option --auto 
-    is set.
-  * Multi WBFS support
-  * Advanced shell support
-  * When writing an ISO you have the choice between three formats:
-  * When reading an ISO the following files are accepted:
-  * Support of splitted files (WBFS, WDF and ISO):
-  * Dump the data structure of WBFS images for analysis. This dumps includes
-    the WBFS header, WBFS main parameters, a disc dump and memory layout dumps
-    for each disc and for the whole WBFS.
-  * Dump the data structure of ISO images for analysis. This dumps includes
-    the WBFS header, WBFS main parameters, a disc dump and memory layout dumps
-    for each disc and for the whole WBFS. The dump work also for ISO images
-    within a WBFS.
-  * The wwt command CHECK checks a WBFS for block assigning errors. Repairing
-    is also possible.
-
-More information about these features can be found at "http://wiimm.de/wwt/"
diff --git a/system/wiimms-wbfs-tool/slack-desc b/system/wiimms-wbfs-tool/slack-desc
deleted file mode 100644
index 96725a68f6..0000000000
--- a/system/wiimms-wbfs-tool/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                |-----handy-ruler------------------------------------------------------|
-wiimms-wbfs-tool: Wiimm's WBFS Tool (a command line WBFS tool set for various os)
-wiimms-wbfs-tool:
-wiimms-wbfs-tool: Wiimm's WBFS Tool (or wwt, for shorter) is a set of programs which can
-wiimms-wbfs-tool: manage, create and convert ISO, WBFS and WDF files and partitions.
-wiimms-wbfs-tool:
-wiimms-wbfs-tool:
-wiimms-wbfs-tool:
-wiimms-wbfs-tool:
-wiimms-wbfs-tool:
-wiimms-wbfs-tool:
-wiimms-wbfs-tool:
diff --git a/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild b/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild
deleted file mode 100644
index 49d82086bc..0000000000
--- a/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Wiimm's WBFS Tool
-#
-# Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=wiimms-wbfs-tool
-VERSION=${VERSION:-0.25a}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="WDF.txt"
-
-if [ "$ARCH" = "i486" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
-  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-# Fix paths: remove "local" from "/usr/local"
-patch -p1 --verbose < $CWD/Makefile.diff
-# Fix paths: move from /usr/share/wwt to /usr/lib$LIBDIRSUFFIX/wwt and from
-# /share/wwt to /lib$LIBDIRSUFFIX/wwt (yes, they're hardcoded...)
-find . -type f | xargs sed -i -e "s:local/share/wwt:lib$LIBDIRSUFFIX/wwt:g"
-find . -type f | xargs sed -i -e "s:share/wwt:lib$LIBDIRSUFFIX/wwt:g"
-
-# Make the program
-make
-
-# Fix paths again: no support for DESTDIR, hack together something similar
-sed -i -e "s:s|@@INSTALL-PATH@@|/usr|g;:s|@@INSTALL-PATH@@|$TMP/package-$PRGNAM/usr|g;:g" templates.sed
-
-# Now we can install
-make install
-
-# strip binaries
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Copy over important docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/system/wiimms-wbfs-tool/wiimms-wbfs-tool.info b/system/wiimms-wbfs-tool/wiimms-wbfs-tool.info
deleted file mode 100644
index 5f0857c8ac..0000000000
--- a/system/wiimms-wbfs-tool/wiimms-wbfs-tool.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wiimms-wbfs-tool"
-VERSION="0.25a"
-HOMEPAGE="http://wiimm.de/wwt/"
-DOWNLOAD="http://slackbuilds.org/sources/13.0/wiimms-wbfs-tool-0.25a.tar.bz2"
-MD5SUM="cfd941182dbda376055980327070c41b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
diff --git a/system/wine-staging/README b/system/wine-staging/README
new file mode 100644
index 0000000000..f23c5209cd
--- /dev/null
+++ b/system/wine-staging/README
@@ -0,0 +1,31 @@
+Wine is an Open Source implementation of the Windows API on top of X and Unix.
+
+This is Wine patched on the fly with the staging patches, which bring
+experimental but useful new Wine features such as PhysX support, EAX, and
+more.
+
+NOTE: At the moment, it only compiles a 32-bit version of Wine, this may
+change in the future with the ability to compile both 64-bit and 32-bit
+version of Wine. You'll need a multilib system in order to compile this.
+
+While this is list as a separate package, this WILL overwrite your normal
+Wine binaries! Please keep this in mind.
+
+Compile options/Optional dependences (keep in mind, you need 32-bit libs of
+each):
+
+See README.SLACKWARE for a giant list of dependencies.
+
+XORG=YES|NO (default: YES), enable or disable Xorg
+ALSA=YES|NO (default: YES), enable or disable ALSA 
+OSS=YES|NO (default: NO), requires oss
+PULSE=YES|NO (default: NO), requires PulseAudio
+CUPS=YES|NO (default: YES), enable or disable CUPS
+DBUS=YES|NO (default: YES), enable or disable DBus
+GALLIUM=YES|NO (default: NO), enable or disable Gallium Nine support
+			      requires mesa compiled with the -nine option
+OPENAL=YES|NO (default: NO), requires OpenAL
+OPENGL=YES|NO (default: YES), enable or disable OpenGL
+JPEG=YES|NO (default: NO), enable or disable jpeg support
+PNG=YES|NO (default: NO), enable or disable png support
+MPG123=YES|NO (default: NO), enable or disable mpg123 support
diff --git a/system/wine-staging/README.SLACKWARE b/system/wine-staging/README.SLACKWARE
new file mode 100644
index 0000000000..7a94a1ef4c
--- /dev/null
+++ b/system/wine-staging/README.SLACKWARE
@@ -0,0 +1,78 @@
+This lists most if not all the required deps for Wine staging. In the future, this will list all 
+optional deps and the Slackbuild will have more build options.
+
+Key:
+
+ x = optional
+ + = required
+ ? = information
+
+List:
+
+ |----- x alsa-lib
+ |----- x cairo-compat32 
+ |	|------ + glib2-compat32 
+ |	|	|------ + libffi-compat32 
+ |	|------ + pixman-compat32 
+ |	|------ + gtk+3-compat32  (Self conversion)
+ |	|	|------ + atk-compat32 
+ |	|	|------ + at-spi2-atk (current only)
+ |	|	|------ + gdk-pixbuf2-compat32 
+ |	|	|------ + libepoxy-compat32  (current only)
+ |	|	|------ + libICE-compat32 
+ |	|	|------ + libSM-compat32 
+ |	|	|	|------ + at-spi2-atk-compat32
+ |	|	|	|	|------ + at-spi2-core-compat32
+ |	|	|	|------ + util-linux-compat32 
+ |	|	|------ + libxshmfence-compat32 
+ |	|	|------ + pango-compat32 
+ |	|	|	|------ + harfbuzz-compat32 
+ |	|	|	|------ + libXft-compat32 
+ |	|	|------ + udev-compat32 
+ |	|------ ? This is only needed if you care about GTK3 theme support.
+ |----- x dbus-compat32 
+ |----- + fontconfig-compat32 
+ |	|------ + expat-compat32 
+ |----- + freetype-compat32 
+ |----- + gamin-compat32 
+ |	|------ + I'm not sure if this is exactly needed, but Wine use to spit out error messages of it missing.
+ |----- + gnutls-compat32 
+ |	|------ + gmp-compat32 
+ |	|------ + libidn-compat32  (current only)
+ |	|------ + nettle-compat32 
+ |	|------ + p11-kit-compat32 
+ |	|------ + zlib-compat32 
+ |	|------ ? Technically you can compile without this, but heavily recommended this.
+ |----- + glew-compat32 
+ |----- x glu-compat32 
+ |	|------ + libXdamage-compat32 
+ |	|------ + libdrm-compat32 
+ |	|------ ? Needed by some programs but compiles without it.
+ |----- + libjpeg-turbo-compat32 
+ |----- + libpng-compat32 
+ |----- + libXcomposite-compat32 
+ |----- + libXcursor-compat32 
+ |	|------ + libXfixes-compat32 
+ |----- + libXext-compat32 
+ |----- + libX11-compat32 
+ |----- + libXau-compat32 
+ |----- + libxcb-compat32 
+ |----- + libXdmcp-compat32 
+ |----- + libXinerama-compat32 
+ |----- + libXi-compat32 
+ |----- + libXrandr-compat32 
+ |----- + libXrender-compat32 
+ |----- + libXxf86dga-compat32 
+ |----- + libXxf86vm-compat32  
+ |----- x libxml2-compat32 
+ |	|------ + aaa_elflibs-compat32 
+ |	|------ ? This is needed for .NET to work correctly.
+ |----- x libva-compat32 
+ |	|------ ? VAAPI backend for DXVA2 GPU decoding.
+ |----- + mesa-compat32 
+ |----- + mpg123-compat32 
+ |	|------ + libtool-compat32 
+ |----- + OpenAL-compat32 
+ |----- x oss
+ |----- + openjpeg-compat32
+ |----- x PulseAudio
diff --git a/system/wine-staging/doinst.sh b/system/wine-staging/doinst.sh
new file mode 100644
index 0000000000..140e332222
--- /dev/null
+++ b/system/wine-staging/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
diff --git a/system/wine-staging/slack-desc b/system/wine-staging/slack-desc
new file mode 100644
index 0000000000..39d828e869
--- /dev/null
+++ b/system/wine-staging/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+	    |-----handy-ruler------------------------------------------------------|
+wine-staging: wine-staging (Wine Is Not an Emulator Staging)
+wine-staging:
+wine-staging: Wine is an Open Source implementation of the Windows API
+wine-staging: on top of X and Unix. This version of Wine is patched with
+wine-staging: experimental but useful new Wine features.
+wine-staging: 
+wine-staging: Homepage: http://www.wine-staging.com/
+wine-staging:
+wine-staging:
+wine-staging:
+wine-staging:
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
new file mode 100644
index 0000000000..32dd54c7f5
--- /dev/null
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -0,0 +1,215 @@
+#!/bin/sh
+
+# Slackware build script for wine-staging
+
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+
+# Based on:
+# Wine SlackBuild by David Woodfall Copyright 2011
+# Some elements from Wine Slackbuilds by Eric Hameleers <alien@slackware.com> and Phantom X, Goiania, Brazil
+
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wine-staging
+VERSION=${VERSION:-1.9.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Default compile options
+XORG=${XORG:-YES}
+ALSA=${ALSA:-YES}
+OSS=${OSS:-NO}
+PULSE=${PULSE:-NO}
+CUPS=${CUPS:-YES}
+DBUS=${DBUS:-YES}
+GALLIUM=${GALLIUM:-NO}
+OPENAL=${OPENAL:-NO}
+OPENGL=${OPENGL:-YES}
+JPEG=${JPEG:-NO}
+PNG=${PNG:-NO}
+MPG123=${MPG123:-NO}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+rm -rf wine-$VERSION
+tar xvf $CWD/wine-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+
+# Apply Staging patches
+cd wine-staging-$VERSION/patches
+./patchinstall.sh --all DESTDIR=$TMP/wine-$VERSION
+
+cd $TMP/wine-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Various compile options
+if [ "$XORG" = "YES" ]; then
+    do_x="with"
+  else
+    do_x="without"
+fi
+
+if [ "$ALSA" = "YES" ]; then
+    do_alsa="with"
+  else
+    do_alsa="without"
+fi
+
+if [ "$OSS" = "YES" ]; then
+    do_oss="with"
+  else
+    do_oss="without"
+fi
+
+if [ "$PULSE" = "YES" ]; then
+    do_pulse="with"
+  else
+    do_pulse="without"
+fi
+
+if [ "$CUPS" = "YES" ]; then
+    do_cups="with"
+  else
+    do_cups="without"
+fi
+
+if [ "$DBUS" = "YES" ]; then
+    do_dbus="with"
+  else
+    do_dbus="without"
+fi
+
+if [ "$GALLIUM" = "YES" ]; then
+    do_gallium="with"
+  else
+    do_gallium="without"
+fi
+
+if [ "$OPENAL" = "YES" ]; then
+    do_openal="with"
+  else
+    do_openal="without"
+fi
+
+if [ "$OPENGL" = "YES" ]; then
+    do_opengl="with"
+  else
+    do_opengl="without"
+fi
+
+if [ "$JPEG" = "YES" ]; then
+    do_jpeg="with"
+  else
+    do_jpeg="without"
+fi
+
+if [ "$PNG" = "YES" ]; then
+    do_png="with"
+  else
+    do_png="without"
+fi
+
+if [ "$MPG123" = "YES" ]; then
+    do_mpg123="with"
+  else
+    do_mpg123="without"
+fi
+
+# All of the libraries produced are 32bit libs anyway
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --with-gnutls=yes \
+  --${do_x}-x \
+  --x-includes=/usr/include \
+  --${do_alsa}-alsa \
+  --${do_oss}-oss \
+  --${do_pulse}-pulse \
+  --${do_cups}-cups \
+  --${do_dbus}-dbus \
+  --${do_openal}-openal \
+  --${do_gallium}-d3dadapter \
+  --${do_opengl}-opengl \
+  --${do_jpeg}-jpeg \
+  --${do_png}-png \
+  --${do_mpg123}-mpg123 \
+  --with-fontconfig \
+  --with-freetype \
+  --build=$ARCH-slackware-linux
+
+make depend
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
new file mode 100644
index 0000000000..5f3461403d
--- /dev/null
+++ b/system/wine-staging/wine-staging.info
@@ -0,0 +1,12 @@
+PRGNAM="wine-staging"
+VERSION="1.9.0"
+HOMEPAGE="http://www.winehq.com/"
+DOWNLOAD="http://ftp.winehq.org/pub/wine/source/1.9/wine-1.9.0.tar.bz2 \
+	  https://github.com/wine-compholio/wine-staging/archive/v1.9.0.tar.gz"
+MD5SUM="adbd370a1726d3ffd571936f46262c94 \
+	e4580a384c51d691310ab60727ccf5a6"
+DOWNLOAD_x86_64="UNSUPPORTED"
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 03e9887009..351b393ea5 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wine
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 if [ -z "$ARCH" ]; then
diff --git a/system/wine/wine.info b/system/wine/wine.info
index 3525fc49c6..4c64989868 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,8 +1,8 @@
 PRGNAM="wine"
-VERSION="1.6.2"
+VERSION="1.8"
 HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="http://ftp.winehq.org/pub/wine/source/1.6/wine-1.6.2.tar.bz2"
-MD5SUM="0f6c56f86befe38e219090915f81f48a"
+DOWNLOAD="http://prdownloads.sourceforge.net/wine/wine-1.8.tar.bz2"
+MD5SUM="96b51a2f2ae727802d71095354e69fef"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/winetricks/winetricks.SlackBuild b/system/winetricks/winetricks.SlackBuild
index 9a0b6da270..15d134f11b 100644
--- a/system/winetricks/winetricks.SlackBuild
+++ b/system/winetricks/winetricks.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # Slackware build script for winetricks
 
 # Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
@@ -25,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=winetricks
-VERSION=${VERSION:-20150706}
+VERSION=${VERSION:-20151116}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/winetricks/winetricks.info b/system/winetricks/winetricks.info
index 36a4bc7868..613ee4824f 100644
--- a/system/winetricks/winetricks.info
+++ b/system/winetricks/winetricks.info
@@ -1,8 +1,8 @@
 PRGNAM="winetricks"
-VERSION="20150706"
+VERSION="20151116"
 HOMEPAGE="http://winetricks.org/"
-DOWNLOAD="https://github.com/Winetricks/winetricks/archive/20150706.tar.gz"
-MD5SUM="82fc1cd9957633ad0569ca994605d70e"
+DOWNLOAD="https://github.com/Winetricks/winetricks/archive/20151116.tar.gz"
+MD5SUM="56b27283d0560bbbf33bcccaeb97ebb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cabextract wine"
diff --git a/system/wipe/README b/system/wipe/README
new file mode 100644
index 0000000000..cb820ccd25
--- /dev/null
+++ b/system/wipe/README
@@ -0,0 +1,3 @@
+wipe (Secure data destruction).
+
+Wipe is a file and block device wiping utility. It is based on work by Peter Gutmann.
diff --git a/system/wipe/slack-desc b/system/wipe/slack-desc
new file mode 100644
index 0000000000..81ef575316
--- /dev/null
+++ b/system/wipe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+wipe: wipe (Secure data destruction)
+wipe:
+wipe: Wipe is a file and block device wiping utility. It is based on work 
+wipe: by Peter Gutmann.
+wipe:
+wipe: Home page: http://sourceforge.net/projects/wipe/
+wipe:
+wipe:
+wipe:
+wipe:
+wipe:
diff --git a/system/wipe/wipe.SlackBuild b/system/wipe/wipe.SlackBuild
new file mode 100644
index 0000000000..684e6fd6ac
--- /dev/null
+++ b/system/wipe/wipe.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# Slackware build script for wipe.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wipe
+VERSION=${VERSION:-2.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man/man1
+cp -a wipe.1 $PKG/usr/man/man1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/bin
+cp -a wipe $PKG/usr/bin
+
+DOCS="CHANGES copyright INSTALL LICENSE README TESTING TODO"
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wipe/wipe.info b/system/wipe/wipe.info
new file mode 100644
index 0000000000..c0d04d97b3
--- /dev/null
+++ b/system/wipe/wipe.info
@@ -0,0 +1,10 @@
+PRGNAM="wipe"
+VERSION="2.3.1"
+HOMEPAGE="http://sourceforge.net/projects/wipe/"
+DOWNLOAD="http://sourceforge.net/projects/wipe/files/wipe/2.3.1/wipe-2.3.1.tar.bz2"
+MD5SUM="3aed00711e0490edbec115bc283b8544"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"
diff --git a/system/wmconfig/doinst.sh b/system/wmconfig/doinst.sh
new file mode 100644
index 0000000000..05a48b8703
--- /dev/null
+++ b/system/wmconfig/doinst.sh
@@ -0,0 +1,30 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/wmconfig/Applications.new                                             
+config etc/wmconfig/Astronomy.new                                                
+config etc/wmconfig/Desktop.new                                                  
+config etc/wmconfig/Development.new                                              
+config etc/wmconfig/Editors.new
+config etc/wmconfig/Edutainment.new                                              
+config etc/wmconfig/Funcs.new                                                    
+config etc/wmconfig/Games.new                                                    
+config etc/wmconfig/Graphics.new                                                 
+config etc/wmconfig/Graphics_Viewers.new                                         
+config etc/wmconfig/Multimedia.new                                               
+config etc/wmconfig/Network.new                                                  
+config etc/wmconfig/Office.new                                                   
+config etc/wmconfig/Office_Viewers.new                                           
+config etc/wmconfig/Shells.new                                                   
+config etc/wmconfig/System.new                                                   
+config etc/wmconfig/Utilities.new
diff --git a/system/wmconfig/wmconfig.SlackBuild b/system/wmconfig/wmconfig.SlackBuild
index 45004022e5..c7fb383a68 100644
--- a/system/wmconfig/wmconfig.SlackBuild
+++ b/system/wmconfig/wmconfig.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wmconfig
-VERSION=${VERSION:-1.4.10}
+VERSION=${VERSION:-1.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,6 +82,16 @@ make install-strip DESTDIR=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
+# Don't clobber the config files
+CONFIG="Network Graphics Games Utilities Graphics_Viewers Edutainment \
+        Astronomy Funcs Office System Development Multimedia Shells Desktop \
+        Applications Office_Viewers Editors"
+
+for conf in $CONFIG
+do
+    mv $PKG/etc/wmconfig/${conf} $PKG/etc/wmconfig/${conf}.new
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS ChangeLog COPYING INSTALL README TODO misc \
@@ -90,6 +100,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wmconfig/wmconfig.info b/system/wmconfig/wmconfig.info
index 11d03793f0..a984c2667a 100644
--- a/system/wmconfig/wmconfig.info
+++ b/system/wmconfig/wmconfig.info
@@ -1,8 +1,8 @@
 PRGNAM="wmconfig"
-VERSION="1.4.10"
+VERSION="1.4.11"
 HOMEPAGE="http://www.arrishq.net/"
-DOWNLOAD="http://www.arrishq.net/files/wmconfig-1.4.10.tar.bz2"
-MD5SUM="d9d32bf075af44d916beaa13104e8b52"
+DOWNLOAD="http://www.arrishq.net/files/wmconfig-1.4.11.tar.bz2"
+MD5SUM="133c5bd12cc37e0a049832967417ac9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/wmgtemp/README b/system/wmgtemp/README
new file mode 100644
index 0000000000..df5c0764f7
--- /dev/null
+++ b/system/wmgtemp/README
@@ -0,0 +1,7 @@
+wmgtemp is a dock app for WindowMaker that graphically displays the CPU and SYS temperatures 
+using the lm_sensors package.
+
+Note: This DockApp needs a lm_sensors config file (defaults to /etc/sensors.conf). I had
+one called "sensors3.conf" in my etc folder. So I started wmgtemp like this:
+"wmgtemp -S /etc/sensors3.conf" and it worked fine for me. If it doesn't for you, try
+writing your own configuration file.
diff --git a/system/wmgtemp/slack-desc b/system/wmgtemp/slack-desc
new file mode 100644
index 0000000000..b243fb3e0a
--- /dev/null
+++ b/system/wmgtemp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler--------------------------------------------------------|
+wmgtemp: wmgtemp (Graphical GPU and SYS Temp Monitor DockApp)
+wmgtemp: 
+wmgtemp: wmgtemp is a dock app for WindowMaker that graphically displays the CPU  
+wmgtemp: and SYS temperatures using the lm_sensors package. 
+wmgtemp: 
+wmgtemp: Homepage: http://fluxcode.net/projects/wmgtemp 
+wmgtemp:
+wmgtemp: 
+wmgtemp:
+wmgtemp:
+wmgtemp:
diff --git a/system/wmgtemp/wmgtemp.SlackBuild b/system/wmgtemp/wmgtemp.SlackBuild
new file mode 100644
index 0000000000..c3598d3dd0
--- /dev/null
+++ b/system/wmgtemp/wmgtemp.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for wmgtemp
+#
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
+#
+# Based on:
+# SBo's cmake-template
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=wmgtemp
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Let's compile!
+make
+
+# Create bin directory and move executable there
+mkdir -p $PKG/usr/bin
+mv src/wmgtemp $PKG/usr/bin
+
+# Creates man page directory
+mkdir -p $PKG/usr/man/man1
+
+# Compresses man page and moves it into place
+gzip -9 wmgtemp.1
+mv wmgtemp.1.gz $PKG/usr/man/man1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Artistic ChangeLog CREDITS INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wmgtemp/wmgtemp.info b/system/wmgtemp/wmgtemp.info
new file mode 100644
index 0000000000..2ebc545318
--- /dev/null
+++ b/system/wmgtemp/wmgtemp.info
@@ -0,0 +1,10 @@
+PRGNAM="wmgtemp"
+VERSION="1.1"
+HOMEPAGE="http://fluxcode.net/projects/wmgtemp"
+DOWNLOAD="http://fluxcode.net/files/wmgtemp-1.1.tar.gz"
+MD5SUM="cce700b3a4ef74b2ec019d8e89bdf2f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"
diff --git a/system/xar/README b/system/xar/README
index 8ff2186de6..82c36b3f4e 100644
--- a/system/xar/README
+++ b/system/xar/README
@@ -1,8 +1,12 @@
 The XAR project aims to provide an easily extensible archive format. Important
 design decisions include an easily extensible XML table of contents for random
-access to archived files, storing the toc at the beginning of the archive to
-allow for efficient handling of streamed archives, the ability to handle files
-of arbitrarily large sizes, the ability to choose independent encodings for
-individual files in the archive, the ability to store checksums for individual
-files in both compressed and uncompressed form, and the ability to query the
-table of content's rich meta-data.
+access to archived files; storing the table at the beginning of the archive to
+allow for efficient handling of streamed archives; the ability to handle files
+of arbitrarily large sizes; the ability to choose independent encodings for
+individual files in the archive; the ability to store checksums for individual
+files in both compressed and uncompressed form; the ability to query the table
+of content's rich meta-data.
+
+NOTE: This script builds a fork of the original XAR project developed by Rob
+Braun at code.google.com. The forked project includes several bug fixes and
+enhancements.
diff --git a/system/xar/slack-desc b/system/xar/slack-desc
index feb24594e4..77b6d75458 100644
--- a/system/xar/slack-desc
+++ b/system/xar/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 xar: xar (eXtensible ARchiver)
 xar:
-xar: The XAR project aims to provide an easily extensible archive format.
-xar:
-xar:
-xar:
-xar:
-xar:
-xar:
-xar:
-xar:
+xar: XAR provides an easily extensible archive format. An XML table of
+xar: contents, stored at the beginning of the archive, allows for random
+xar: access to the archived files. XAR can handle files of arbitrarily
+xar: large sizes, is able to encode individual files in the archive
+xar: independently, can store checksums for individual files in both
+xar: compressed and uncompressed form, can query the rich metadata of
+xar: the table of contents.
+xar:
+xar: Homepage: https://mackyle.github.io/xar/
diff --git a/system/xar/xar.SlackBuild b/system/xar/xar.SlackBuild
index 29610100d4..805f2e915e 100644
--- a/system/xar/xar.SlackBuild
+++ b/system/xar/xar.SlackBuild
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-# Slackware build script for xar.
+# Slackware build script for xar
+
+# Copyright 2010-2011 Marco Bonetti <sid77 at slackware dot it>
+# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
 #
-# Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xar
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,40 +63,40 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
 
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+PRGMAN=$PKG/usr/man/man1
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# Compress man page.
+gzip -9 $PRGMAN/$PRGNAM.1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Install documentation.
+mkdir -p $PRGDOC
+cp -a ChangeLog INSTALL LICENSE NEWS $PRGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/xar/xar.info b/system/xar/xar.info
index 2dc3bc95cc..326fbe5094 100644
--- a/system/xar/xar.info
+++ b/system/xar/xar.info
@@ -1,10 +1,10 @@
 PRGNAM="xar"
-VERSION="1.5.2"
-HOMEPAGE="http://code.google.com/p/xar/"
-DOWNLOAD="http://xar.googlecode.com/files/xar-1.5.2.tar.gz"
-MD5SUM="8eabb055d3387b8edc30ecfb08d2e80d"
+VERSION="1.6.1"
+HOMEPAGE="https://mackyle.github.io/xar/"
+DOWNLOAD="https://cloud.github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz"
+MD5SUM="a624535d6a1e8fdf420b36a6b334047b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marco Bonetti"
-EMAIL="sid77@slackware.it"
+MAINTAINER="Philip Lacroix"
+EMAIL="slackph at posteo dot de"
diff --git a/system/xdiskusage/README b/system/xdiskusage/README
new file mode 100644
index 0000000000..dede0c4660
--- /dev/null
+++ b/system/xdiskusage/README
@@ -0,0 +1,5 @@
+xdiskusage is a user-friendly program to show you what is using up all
+your disk space. It is based on the design of xdu written by Phillip
+C. Dykstra <dykstra at ieee dot org>. Changes have been made so it 
+runs "du" for you, and can display the free space left on the disk,
+and produce a PostScript version of the display.
diff --git a/system/xdiskusage/slack-desc b/system/xdiskusage/slack-desc
new file mode 100644
index 0000000000..009d668d4f
--- /dev/null
+++ b/system/xdiskusage/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+xdiskusage: xdiskusage (show disk usage)
+xdiskusage:
+xdiskusage: xdiskusage is a user-friendly program to show you what is using up all
+xdiskusage: your disk space. It is based on the design of xdu written by Phillip
+xdiskusage: C. Dykstra <dykstra at ieee dot org>. Changes have been made so it 
+xdiskusage: runs "du" for you, and can display the free space left on the disk,
+xdiskusage: and produce a PostScript version of the display. 
+xdiskusage:
+xdiskusage: Homepage: http://xdiskusage.sourceforge.net/
+xdiskusage:
+xdiskusage:
diff --git a/system/xdiskusage/xdiskusage.SlackBuild b/system/xdiskusage/xdiskusage.SlackBuild
new file mode 100644
index 0000000000..a0e44a6e76
--- /dev/null
+++ b/system/xdiskusage/xdiskusage.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for xdiskusage
+
+# Copyright 2015 David Breese, Chicago IL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=xdiskusage
+VERSION=${VERSION:-1.51}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man
+
+make
+make install \
+  prefix=$PKG/usr \
+  mandir=$PKG/usr/man
+
+# Don't think the man page needs to be executable.
+find $PKG/usr/man -type f -exec chmod 644 {} \;
+
+# Compress man page
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+# Documentation
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Metadata
+mkdir -p $PKG/install/
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Make package
+cd $PKG
+makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xdiskusage/xdiskusage.info b/system/xdiskusage/xdiskusage.info
new file mode 100644
index 0000000000..74eb2f498d
--- /dev/null
+++ b/system/xdiskusage/xdiskusage.info
@@ -0,0 +1,10 @@
+PRGNAM="xdiskusage"
+VERSION="1.51"
+HOMEPAGE="http://xdiskusage.sourceforge.net/"
+DOWNLOAD="http://xdiskusage.sourceforge.net/xdiskusage-1.51.tgz"
+MD5SUM="91ab7415a0dc8d53742eb9a9cc809cfd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fltk"
+MAINTAINER="David Breese"
+EMAIL="dabreese00@gmail.com"
diff --git a/system/xen/doinst.sh b/system/xen/doinst.sh
index 747b332c89..98f701f9c7 100644
--- a/system/xen/doinst.sh
+++ b/system/xen/doinst.sh
@@ -22,12 +22,11 @@ preserve_perms() {
   config $NEW
 }
 
-preserve_perms etc/rc.d/rc.xen-watchdog.new
-preserve_perms etc/rc.d/rc.xencommons.new
-preserve_perms etc/rc.d/rc.xendomains.new
+find etc/rc.d -type f -name 'rc.xen*.new' \
+  | while read new ; do preserve_perms $new ; done
 
-config etc/default/xencommons.new
-config etc/default/xendomains.new
+find etc/default -type f -name 'xen*.new' \
+  | while read new ; do config $new ; done
 
 find etc/xen etc/qemu -type f -name '*.new' \
   | while read new ; do config $new ; done
diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh
index a48c686833..9dd93ee6c4 100644
--- a/system/xen/dom0/kernel-xen.sh
+++ b/system/xen/dom0/kernel-xen.sh
@@ -6,7 +6,7 @@
 # Modified by Mario Preksavec <mario@slackware.hr>
 
 KERNEL=${KERNEL:-3.10.17}
-XEN=${XEN:-4.5.1}
+XEN=${XEN:-4.6.3}
 BOOTLOADER=${BOOTLOADER:-lilo}
 
 ROOTMOD=${ROOTMOD:-ext4}
diff --git a/system/xen/patches/disable_git_checkout.diff b/system/xen/patches/disable_git_checkout.diff
index 54738c348d..292a8ba569 100644
--- a/system/xen/patches/disable_git_checkout.diff
+++ b/system/xen/patches/disable_git_checkout.diff
@@ -1,6 +1,6 @@
---- xen-4.5.0/tools/Makefile.orig	2015-01-12 17:53:24.000000000 +0100
-+++ xen-4.5.0/tools/Makefile	2015-02-16 10:12:09.487338727 +0100
-@@ -134,17 +134,17 @@
+--- xen-4.6.1/tools/Makefile.orig	2016-02-09 15:44:19.000000000 +0100
++++ xen-4.6.1/tools/Makefile	2016-02-20 20:22:38.659839628 +0100
+@@ -168,9 +168,9 @@
  	set -ex; \
  	if test -d $(QEMU_TRADITIONAL_LOC); then \
  		mkdir -p qemu-xen-traditional-dir; \
@@ -12,6 +12,8 @@
 +#		$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \
  	fi
  
+ .PHONY: qemu-xen-traditional-dir-force-update
+@@ -214,9 +214,9 @@
  qemu-xen-dir-find:
  	if test -d $(QEMU_UPSTREAM_LOC) ; then \
  		mkdir -p qemu-xen-dir; \
@@ -23,9 +25,9 @@
 +#		$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_LOC) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \
  	fi
  
- .PHONY: qemu-xen-traditional-dir-force-update
---- xen-4.5.0/tools/firmware/Makefile.orig	2015-01-12 17:53:24.000000000 +0100
-+++ xen-4.5.0/tools/firmware/Makefile	2015-02-16 10:12:27.276869964 +0100
+ .PHONY: qemu-xen-dir-force-update
+--- xen-4.6.1/tools/firmware/Makefile.orig	2016-02-09 15:44:19.000000000 +0100
++++ xen-4.6.1/tools/firmware/Makefile	2016-02-20 20:23:33.994923068 +0100
 @@ -20,11 +20,11 @@
  LD32BIT-$(CONFIG_FreeBSD) := LD32BIT_FLAG=-melf_i386_fbsd
  
diff --git a/system/xen/patches/libcacard_fix_parallel_compile.patch b/system/xen/patches/libcacard_fix_parallel_compile.patch
deleted file mode 100644
index 1dfd044518..0000000000
--- a/system/xen/patches/libcacard_fix_parallel_compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xen-4.5.0/tools/qemu-xen/libcacard/Makefile.orig	2014-12-02 11:41:02.000000000 +0100
-+++ xen-4.5.0/tools/qemu-xen/libcacard/Makefile	2015-03-14 21:05:54.361325689 +0100
-@@ -26,8 +26,8 @@
- libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \
- 	-export-syms $(SRC_PATH)/libcacard/libcacard.syms
- libcacard.la: LIBS = $(libcacard_libs)
--libcacard.la: $(libcacard-lobj-y)
--	$(call LINK,$^)
-+libcacard.la: $(libcacard-obj-y)
-+	$(call LINK,$(libcacard-lobj-y))
- 
- libcacard.pc: $(SRC_PATH)/libcacard/libcacard.pc.in
- 	$(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \
diff --git a/system/xen/patches/local_attach_support_for_phy.patch b/system/xen/patches/local_attach_support_for_phy.patch
deleted file mode 100644
index 5dd402d364..0000000000
--- a/system/xen/patches/local_attach_support_for_phy.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit 3bcf91cbbd9a18db9ae7d594ffde7979774ed512
-Author: Roger Pau Monne <roger.pau@xxxxxxxxxx>
-Date:   Wed Feb 12 11:15:17 2014 +0100
-
-    libxl: local attach support for PHY backends using scripts
-    
-    Allow disks using the PHY backend to locally attach if using a script.
-    
-    Signed-off-by: Roger Pau Monnà <roger.pau@xxxxxxxxxx>
-    Suggested-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
-
-
-Index: xen-4.5.0-testing/tools/libxl/libxl.c
-===================================================================
---- xen-4.5.0-testing.orig/tools/libxl/libxl.c
-+++ xen-4.5.0-testing/tools/libxl/libxl.c
-@@ -3006,6 +3006,16 @@ void libxl__device_disk_local_initiate_a
- 
-     switch (disk->backend) {
-         case LIBXL_DISK_BACKEND_PHY:
-+            if (disk->script != NULL) {
-+                LOG(DEBUG, "trying to locally attach PHY device %s with script %s",
-+                           disk->pdev_path, disk->script);
-+                libxl__prepare_ao_device(ao, &dls->aodev);
-+                dls->aodev.callback = local_device_attach_cb;
-+                device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk,
-+                                &dls->aodev, libxl__alloc_vdev,
-+                                (void *) blkdev_start);
-+                return;
-+            }
-             LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "locally attaching PHY disk %s",
-                        disk->pdev_path);
-             dev = disk->pdev_path;
-@@ -3085,7 +3095,7 @@ static void local_device_attach_cb(libxl
-     }
- 
-     dev = GCSPRINTF("/dev/%s", disk->vdev);
--    LOG(DEBUG, "locally attaching qdisk %s", dev);
-+    LOG(DEBUG, "locally attached disk %s", dev);
- 
-     rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device);
-     if (rc < 0)
-@@ -3125,6 +3135,7 @@ void libxl__device_disk_local_initiate_d
-     if (!dls->diskpath) goto out;
- 
-     switch (disk->backend) {
-+        case LIBXL_DISK_BACKEND_PHY:
-         case LIBXL_DISK_BACKEND_QDISK:
-             if (disk->vdev != NULL) {
-                 GCNEW(device);
-@@ -3142,7 +3153,6 @@ void libxl__device_disk_local_initiate_d
-             /* disk->vdev == NULL; fall through */
-         default:
-             /*
--             * Nothing to do for PHYSTYPE_PHY.
-              * For other device types assume that the blktap2 process is
-              * needed by the soon to be started domain and do nothing.
-              */
diff --git a/system/xen/patches/remove_malloc_tracing.diff b/system/xen/patches/remove_malloc_tracing.diff
new file mode 100644
index 0000000000..293000fdc6
--- /dev/null
+++ b/system/xen/patches/remove_malloc_tracing.diff
@@ -0,0 +1,62 @@
+--- xen-4.6.1/tools/qemu-xen/trace-events.orig	2016-01-06 17:42:43.000000000 +0100
++++ xen-4.6.1/tools/qemu-xen/trace-events	2016-02-20 20:36:48.996704075 +0100
+@@ -571,9 +571,6 @@
+ vm_state_notify(int running, int reason) "running %d reason %d"
+ load_file(const char *name, const char *path) "name %s location %s"
+ runstate_set(int new_state) "new state %d"
+-g_malloc(size_t size, void *ptr) "size %zu ptr %p"
+-g_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p"
+-g_free(void *ptr) "ptr %p"
+ system_wakeup_request(int reason) "reason=%d"
+ qemu_system_shutdown_request(void) ""
+ qemu_system_powerdown_request(void) ""
+--- xen-4.6.1/tools/qemu-xen/vl.c.orig	2016-01-06 17:42:43.000000000 +0100
++++ xen-4.6.1/tools/qemu-xen/vl.c	2016-02-20 20:38:17.715227938 +0100
+@@ -2628,26 +2628,6 @@
+     return popt;
+ }
+ 
+-static gpointer malloc_and_trace(gsize n_bytes)
+-{
+-    void *ptr = malloc(n_bytes);
+-    trace_g_malloc(n_bytes, ptr);
+-    return ptr;
+-}
+-
+-static gpointer realloc_and_trace(gpointer mem, gsize n_bytes)
+-{
+-    void *ptr = realloc(mem, n_bytes);
+-    trace_g_realloc(mem, n_bytes, ptr);
+-    return ptr;
+-}
+-
+-static void free_and_trace(gpointer mem)
+-{
+-    trace_g_free(mem);
+-    free(mem);
+-}
+-
+ static int machine_set_property(const char *name, const char *value,
+                                 void *opaque)
+ {
+@@ -2763,11 +2743,6 @@
+     bool userconfig = true;
+     const char *log_mask = NULL;
+     const char *log_file = NULL;
+-    GMemVTable mem_trace = {
+-        .malloc = malloc_and_trace,
+-        .realloc = realloc_and_trace,
+-        .free = free_and_trace,
+-    };
+     const char *trace_events = NULL;
+     const char *trace_file = NULL;
+     const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
+@@ -2781,8 +2756,6 @@
+     error_set_progname(argv[0]);
+     qemu_init_exec_dir(argv[0]);
+ 
+-    g_mem_set_vtable(&mem_trace);
+-
+     module_call_init(MODULE_INIT_QOM);
+ 
+     qemu_add_opts(&qemu_drive_opts);
diff --git a/system/xen/patches/symlinks_instead_of_hardlinks.diff b/system/xen/patches/symlinks_instead_of_hardlinks.diff
index 50af6c3254..92c98bd980 100644
--- a/system/xen/patches/symlinks_instead_of_hardlinks.diff
+++ b/system/xen/patches/symlinks_instead_of_hardlinks.diff
@@ -1,6 +1,6 @@
---- xen-4.2.0/tools/xenstore/Makefile.ORIG	2012-09-17 12:21:19.000000000 +0200
-+++ xen-4.2.0/tools/xenstore/Makefile	2012-10-21 22:59:54.585759242 +0200
-@@ -64,7 +64,7 @@
+--- xen-4.6.1/tools/xenstore/Makefile.orig	2016-02-09 15:44:19.000000000 +0100
++++ xen-4.6.1/tools/xenstore/Makefile	2016-02-20 22:54:11.877906517 +0100
+@@ -84,7 +84,7 @@
  	$(AR) cr $@ $^
  
  $(CLIENTS): xenstore
@@ -8,13 +8,22 @@
 +	ln -sf xenstore $@
  
  xenstore: xenstore_client.o $(LIBXENSTORE)
- 	$(CC) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
-@@ -116,7 +116,7 @@
- 	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
- 	$(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
+ 	$(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
+@@ -140,7 +140,7 @@
+ 	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
  	set -e ; for c in $(CLIENTS) ; do \
--		ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
-+		ln -sf xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
+-		ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
++		ln -sf xenstore $(DESTDIR)$(bindir)/$${c} ; \
  	done
- 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+ 	$(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
+@@ -159,7 +159,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
+ 	set -e ; for c in $(CLIENTS) ; do \
+-		ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
++		ln -sf xenstore $(DESTDIR)$(bindir)/$${c} ; \
+ 	done
+ 
+ -include $(DEPS)
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index 4b08a011b4..54b8d190ad 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xen
 
-# Copyright 2010, 2011, 2013, 2014, 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2011, 2013, 2014, 2015, 2016  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xen
-VERSION=${VERSION:-4.5.1}
+VERSION=${VERSION:-4.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SEABIOS=${SEABIOS:-1.8.2}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -40,7 +42,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ $ARCH == "x86_64" ] && [ ! -f /usr/include/gnu/stubs-32.h ]; then
+if [ "$ARCH" = "x86_64" ] && [ ! -f /usr/include/gnu/stubs-32.h ]; then
   cat << EOF
 
   For a 32bit guest support 32bit libs are required to build the
@@ -69,18 +71,21 @@ else
   LIBDIRSUFFIX=""
 fi
 
-USE_LIBSSH2=${USE_LIBSSH2:-no}
-case "$LIBSSH2" in
+case "${USE_LIBSSH2:-no}" in
   yes) LIBSSH2="en" ;;
     *) LIBSSH2="dis" ;;
 esac
 
-USE_BLUEZ=${USE_BLUEZ:-no}
-case "$BLUEZ" in
+case "${USE_BLUEZ:-no}" in
   yes) BLUEZ="en" ;;
     *) BLUEZ="dis" ;;
 esac
 
+case "${BUILD_STUBDOM:-no}" in
+  yes) STUBDOM="en" ;;
+    *) STUBDOM="dis" ;;
+esac
+
 set -e
 
 rm -rf $PKG
@@ -96,27 +101,34 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Apply Xen Security Advisory patches
+for i in $CWD/xsa/* ; do
+  case $i in
+    *qemut*.patch) patch -d tools/qemu-xen-traditional -p1 <$i ;;
+     *qemu*.patch) patch -d tools/qemu-xen -p1 <$i ;;
+          *.patch) patch -p1 <$i ;;
+  esac
+done
+
 # Tweak some things
 sed "s/@@LIBSSH2@@/$LIBSSH2/;s/@@BLUEZ@@/$BLUEZ/" \
   $CWD/patches/qemu_configure_options.diff | patch -p1
 patch -p1 <$CWD/patches/symlinks_instead_of_hardlinks.diff
 
-# Local attach support for PHY backends using scripts
-patch -p1 <$CWD/patches/local_attach_support_for_phy.patch
-
 # Let's not download stuff during the build...
 patch -p1 <$CWD/patches/use_already_present_ipxe.diff
 patch -p1 <$CWD/patches/disable_git_checkout.diff
 cp $CWD/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz \
   tools/firmware/etherboot/_ipxe.tar.gz
-tar -xf $CWD/seabios-git-rel-1.7.5.tar.gz \
-  -C tools/firmware
+(
+  cd tools/firmware
+  tar -xf $CWD/seabios-$SEABIOS.tar.gz
+  mv seabios-$SEABIOS seabios-dir-remote
+  ln -s seabios-dir-remote seabios-dir
+)
 cp $CWD/{lwip,zlib,newlib,pciutils,grub,gmp,tpm_emulator}-*.tar.?z* \
   $CWD/polarssl-*.tgz stubdom
 
-# Occasionally, parallel building fails
-patch -p1 <$CWD/patches/libcacard_fix_parallel_compile.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -127,6 +139,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-qemu-traditional \
+  --disable-rombios \
+  --${STUBDOM}able-stubdom \
   --build=$ARCH-slackware-linux
 
 make install-xen \
@@ -143,12 +158,14 @@ make install-tools \
   MANDIR=/usr/man \
   DESTDIR=$PKG
 
-make install-stubdom \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  DOCDIR=/usr/doc/$PRGNAM-$VERSION \
-  mandir=/usr/man \
-  MANDIR=/usr/man \
-  DESTDIR=$PKG
+if [ "$STUBDOM" = "en" ]; then
+  make install-stubdom \
+    docdir=/usr/doc/$PRGNAM-$VERSION \
+    DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    mandir=/usr/man \
+    MANDIR=/usr/man \
+    DESTDIR=$PKG
+fi
 
 make install-docs \
   docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -161,22 +178,13 @@ make install-docs \
 find $PKG/boot/ -type l -a -name "xen-*" -exec rm -f {} \; 2>/dev/null || true
 
 # Move from SYSV to BSD init scripts
-mv $PKG/etc/rc.d/init.d/xen-watchdog $PKG/etc/rc.d/rc.xen-watchdog.new
-mv $PKG/etc/rc.d/init.d/xencommons $PKG/etc/rc.d/rc.xencommons.new
-mv $PKG/etc/rc.d/init.d/xendomains $PKG/etc/rc.d/rc.xendomains.new
-
-# Put udev rules files in the right place
-mkdir -p $PKG/lib/udev/rules.d
-mv $PKG/etc/udev/rules.d/xen*.rules $PKG/lib/udev/rules.d/
+( cd $PKG/etc/rc.d/init.d && for i in * ; do mv $i ../rc.$i.new ; done )
 
 # Remove empty directories
-rmdir $PKG/etc/{rc.d/init.d,udev/rules.d,udev}
+rmdir $PKG/etc/rc.d/init.d/
 
 # Append .new to config files
-for i in $PKG/etc/xen/*.conf ; do mv $i $i.new ; done
-mv $PKG/etc/qemu/target-x86_64.conf $PKG/etc/qemu/target-x86_64.conf.new
-mv $PKG/etc/default/xencommons $PKG/etc/default/xencommons.new
-mv $PKG/etc/default/xendomains $PKG/etc/default/xendomains.new
+for i in $PKG/etc/{default/*,{qemu,xen}/*.conf} ; do mv $i $i.new ; done
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/xen/xen.info b/system/xen/xen.info
index 503770ff57..2c2c3068ad 100644
--- a/system/xen/xen.info
+++ b/system/xen/xen.info
@@ -1,7 +1,7 @@
 PRGNAM="xen"
-VERSION="4.5.1"
+VERSION="4.6.3"
 HOMEPAGE="http://www.xenproject.org/"
-DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.1.tar.gz \
+DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.6.3.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \
@@ -11,8 +11,8 @@ DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.5.1.tar.gz \
           http://mirror.slackware.hr/sources/xen-extfiles/polarssl-1.1.4-gpl.tgz \
           http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \
           http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/seabios-git-rel-1.7.5.tar.gz"
-MD5SUM="d12dc9e5e8bd22a68b5c7f53119221f1 \
+          http://mirror.slackware.hr/sources/xen-extfiles/seabios-1.8.2.tar.gz"
+MD5SUM="26419d8477082dbdb32ec75b00f00643 \
         7496268cebf47d5c9ccb0696e3b26065 \
         36cc57650cffda9a0269493be2a169bb \
         debc62758716a169df9f62e6ab2bc634 \
@@ -22,7 +22,7 @@ MD5SUM="d12dc9e5e8bd22a68b5c7f53119221f1 \
         7b72caf22b01464ee7d6165f2fd85f44 \
         dd60683d7057917e34630b4a787932e8 \
         e26becb8a6a2b6695f6b3e8097593db8 \
-        a5fe7e77061d8cb41303271175ece756"
+        d08a501fb918698f24a0de012c687729"
 REQUIRES="acpica yajl"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/xen/xsa/README.xsa b/system/xen/xsa/README.xsa
new file mode 100644
index 0000000000..2237ecb392
--- /dev/null
+++ b/system/xen/xsa/README.xsa
@@ -0,0 +1 @@
+Xen Security Advisories can be found here: http://xenbits.xen.org/xsa/
diff --git a/system/xfe/xfe.SlackBuild b/system/xfe/xfe.SlackBuild
index 0c3cf620eb..23ae03dd37 100644
--- a/system/xfe/xfe.SlackBuild
+++ b/system/xfe/xfe.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfe
 
-# Copyright 2006-2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2016  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xfe
-VERSION=${VERSION:-1.35}
+VERSION=${VERSION:-1.41}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/xfe/xfe.info b/system/xfe/xfe.info
index 8961cf6409..5543658bbd 100644
--- a/system/xfe/xfe.info
+++ b/system/xfe/xfe.info
@@ -1,8 +1,8 @@
 PRGNAM="xfe"
-VERSION="1.35"
+VERSION="1.41"
 HOMEPAGE="http://roland65.free.fr/xfe/"
-DOWNLOAD="http://downloads.sourceforge.net/xfe/xfe-1.35.tar.gz"
-MD5SUM="2cff624a9ee8ee8d8f80e2688fc62feb"
+DOWNLOAD="http://downloads.sourceforge.net/xfe/xfe-1.41.tar.gz"
+MD5SUM="cd4978240decbf0449f07c5061b9c4b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fox-toolkit"
diff --git a/system/xonsh/README b/system/xonsh/README
new file mode 100644
index 0000000000..9e2445b1e5
--- /dev/null
+++ b/system/xonsh/README
@@ -0,0 +1,6 @@
+xonsh is a Python-ish, BASHwards-compatible shell language 
+and command prompt. The language is a superset of Python 3.4 
+with additional shell primitives. xonsh (pronounced conch) 
+is meant for the daily use of experts and novices alike.
+
+NOTE: Install python3 before install ply package.
diff --git a/system/xonsh/slack-desc b/system/xonsh/slack-desc
new file mode 100644
index 0000000000..d1e3d4f612
--- /dev/null
+++ b/system/xonsh/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xonsh: xonsh (Python BASHwards-compatible shell)
+xonsh:
+xonsh: xonsh is a Python-ish, BASHwards-looking shell language and command
+xonsh: prompt. The language is a superset of Python 3.4+ with additional
+xonsh: shell primitives. xonsh (pronounced conch) is meant for the daily of
+xonsh: experts and novices alike.
+xonsh:
+xonsh: Homepage: https://github.com/scopatz/xonsh
+xonsh:
+xonsh:
+xonsh:
diff --git a/system/xonsh/xonsh.SlackBuild b/system/xonsh/xonsh.SlackBuild
new file mode 100644
index 0000000000..7db0084e1c
--- /dev/null
+++ b/system/xonsh/xonsh.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# Slackware build script for xonsh
+
+# Copyright 2016  Dimitris Zlatanidis  Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=xonsh
+VERSION=${VERSION:-0.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xonsh/xonsh.info b/system/xonsh/xonsh.info
new file mode 100644
index 0000000000..3ab7540d76
--- /dev/null
+++ b/system/xonsh/xonsh.info
@@ -0,0 +1,10 @@
+PRGNAM="xonsh"
+VERSION="0.2.4"
+HOMEPAGE="http://xonsh.org/"
+DOWNLOAD="https://pypi.python.org/packages/source/x/xonsh/xonsh-0.2.4.tar.gz"
+MD5SUM="1031d1e383ecb0cae128db7840615969"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3 ply"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/yash/README b/system/yash/README
new file mode 100644
index 0000000000..f18b1aeb53
--- /dev/null
+++ b/system/yash/README
@@ -0,0 +1,5 @@
+Yash, yet another shell, is a POSIX-compliant command line shell
+written by Watanabe Yuki (aka magicant) in C99 (ISO/IEC 9899:1999). It
+was originally written as a work on a university course assignment but
+the code has been re-written from scratch to meet the requirement of
+POSIX. Yash is intended to be the most POSIX-compliant shell in the world.
diff --git a/system/yash/slack-desc b/system/yash/slack-desc
new file mode 100644
index 0000000000..c68624472a
--- /dev/null
+++ b/system/yash/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+yash: yash (POSIX-compliant command line shell)
+yash:
+yash: Yash, yet another shell, is a POSIX-compliant command line shell
+yash: written by Watanabe Yuki (aka magicant) in C99 (ISO/IEC 9899:1999).
+yash: Yash is intended to be the most POSIX-compliant shell in the world.
+yash:
+yash: Homepage: http://yash.osdn.jp/index.html.en
+yash:
+yash:
+yash:
+yash:
diff --git a/system/yash/yash.SlackBuild b/system/yash/yash.SlackBuild
new file mode 100644
index 0000000000..1e9f7e6de0
--- /dev/null
+++ b/system/yash/yash.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# Slackware build script for yash
+
+# Copyright 2015-2016 Leonard Schmidt <lems@gmx.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=yash
+VERSION=${VERSION:-2.40}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS=""
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sh ./configure \
+    --prefix=/usr \
+    --bindir=/usr/bin \
+    --mandir=/usr/man \
+    --docdir=/usr/doc/$PRGNAM-$VERSION
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/yash/yash.info b/system/yash/yash.info
new file mode 100644
index 0000000000..586971ac35
--- /dev/null
+++ b/system/yash/yash.info
@@ -0,0 +1,10 @@
+PRGNAM="yash"
+VERSION="2.40"
+HOMEPAGE="http://yash.osdn.jp/index.html.en"
+DOWNLOAD="http://osdn.dl.sourceforge.jp/yash/64293/yash-2.40.tar.xz"
+MD5SUM="cf68496dc1a07b0a090e8944c48f1a07"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Leonard Schmidt"
+EMAIL="lems@gmx.net"
diff --git a/system/z/z.SlackBuild b/system/z/z.SlackBuild
index 4724283634..44e1fbca32 100644
--- a/system/z/z.SlackBuild
+++ b/system/z/z.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=z
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/z/z.info b/system/z/z.info
index ad6561ccaf..8efd7b0dd3 100644
--- a/system/z/z.info
+++ b/system/z/z.info
@@ -1,8 +1,8 @@
 PRGNAM="z"
-VERSION="1.8"
+VERSION="1.9"
 HOMEPAGE="https://github.com/rupa/z/wiki"
-DOWNLOAD="https://github.com/rupa/z/archive/v1.8.tar.gz"
-MD5SUM="7c96effbd63059f8a6fc7ae0a566a57c"
+DOWNLOAD="https://github.com/rupa/z/archive/v1.9.tar.gz"
+MD5SUM="a111ecf453a8437a1ac0b005627d6b84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/zfs-on-linux/rc.zfs b/system/zfs-on-linux/rc.zfs
index a42922b124..7d818279ce 100644
--- a/system/zfs-on-linux/rc.zfs
+++ b/system/zfs-on-linux/rc.zfs
@@ -28,7 +28,7 @@
 LOCKFILE=/var/lock/zfs/zfs
 ZFS="/sbin/zfs"
 ZPOOL="/sbin/zpool"
-ZPOOL_CACHE="/etc/zfs/zpool.cache"
+UDEVD="/dev/disk/by-id/"
 
 # Source zfs configuration.
 [ -r '/etc/default/zfs' ] &&  . /etc/default/zfs
@@ -38,89 +38,89 @@ ZPOOL_CACHE="/etc/zfs/zpool.cache"
 
 start()
 {
-	[ -f "$LOCKFILE" ] && return 3
+    [ -f "$LOCKFILE" ] && return 3
 
-	# Requires selinux policy which has not been written.
-	if [ -r "/selinux/enforce" ] &&
-	   [ "$(cat /selinux/enforce)" = "1" ]; then
+    # Requires selinux policy which has not been written.
+    if [ -r "/selinux/enforce" ] &&
+       [ "$(cat /selinux/enforce)" = "1" ]; then
 
-		echo "SELinux ZFS policy required"
-		return 4
-	fi
+        echo "SELinux ZFS policy required"
+        return 4
+    fi
 
-	# Delay until all required block devices are present.
-	udevadm settle
+    # Delay until all required block devices are present.
+    udevadm settle
 
-	# Load the zfs module stack
-	/sbin/modprobe zfs
+    # Load the zfs module stack
+    /sbin/modprobe zfs
 
-	# Ensure / exists in /etc/mtab, if not update mtab accordingly.
-	# This should be handled by rc.sysinit but lets be paranoid.
-	awk '$2 == "/" { exit 1 }' /etc/mtab
-	RETVAL=$?
-	if [ "$RETVAL" -eq 0 ]; then
-		/bin/mount -f /
-	fi
+    # Ensure / exists in /etc/mtab, if not update mtab accordingly.
+    # This should be handled by rc.sysinit but lets be paranoid.
+    awk '$2 == "/" { exit 1 }' /etc/mtab
+    RETVAL=$?
+    if [ "$RETVAL" -eq 0 ]; then
+        /bin/mount -f /
+    fi
 
-	# Import all pools described by the cache file, and then mount
-	# all filesystem based on their properties.
-	if [ -f "$ZPOOL_CACHE" ] ; then
-		echo "Importing ZFS pools"
-		"$ZPOOL" import -fc "$ZPOOL_CACHE" -aN 2>/dev/null
+    # Import all pools, and then mount
+    # all filesystem based on their properties.
+    echo "Importing ZFS pools"
+    "$ZPOOL" import -d "$UDEVD" -f -aN 2>/dev/null
 
-		echo "Mounting ZFS filesystems"
-		"$ZFS" mount -a
+    echo "Mounting ZFS filesystems"
+    "$ZFS" mount -a
 
-		echo "Exporting ZFS filesystems"
-		"$ZFS" share -a
-	fi
+    echo "Exporting ZFS filesystems"
+    "$ZFS" share -a
 
-	touch "$LOCKFILE"
+    touch "$LOCKFILE"
 }
 
 stop()
 {
-	[ ! -f "$LOCKFILE" ] && return 3
+    [ ! -f "$LOCKFILE" ] && return 3
 
-	echo "Unmounting ZFS filesystems"
-	"$ZFS" umount -a
+    echo "Unmounting ZFS filesystems"
+    "$ZFS" umount -a
 
-	rm -f "$LOCKFILE"
+    rm -f "$LOCKFILE"
 }
 
 status()
 {
-	[ ! -f "$LOCKFILE" ] && return 3
+    [ ! -f "$LOCKFILE" ] && return 3
 
-	"$ZPOOL" status && echo "" && "$ZPOOL" list
+    "$ZPOOL" status && echo "" && "$ZPOOL" list
 }
 
 case "$1" in
-	start)
-		start
-		RETVAL=$?
-		;;
-	stop)
-		stop
-		RETVAL=$?
-		;;
-	status)
-		status
-		RETVAL=$?
-		;;
-	restart)
-		stop
-		start
-		;;
-	condrestart)
-		if [ -f "$LOCKFILE" ]; then
-			stop
-			start
-		fi
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-		;;
+    start)
+        start
+        RETVAL=$?
+        ;;
+    stop)
+        stop
+        RETVAL=$?
+        ;;
+    status)
+        status
+        RETVAL=$?
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    condrestart)
+        if [ -f "$LOCKFILE" ]; then
+            stop
+            start
+        fi
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+        ;;
 esac
 
 exit $RETVAL
+
+# vim: set ts=4 sts=4 sw=4 expandtab textwidth=78:
diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild
index ad0aa5b9c0..dabfa58177 100644
--- a/system/zfs-on-linux/zfs-on-linux.SlackBuild
+++ b/system/zfs-on-linux/zfs-on-linux.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for zfs-on-linux
 
+# Copyright 2015 Kevin Paulus <goarilla@gmail.com>, Belgium
 # Copyright 2013-2014 Petr Hejl - Czech Republic
 # All rights reserved.
 #
@@ -26,7 +27,7 @@
 
 PRGNAM=zfs-on-linux
 SRCNAM=zfs
-VERSION=${VERSION:-0.6.4}
+VERSION=${VERSION:-0.6.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/zfs-on-linux/zfs-on-linux.info b/system/zfs-on-linux/zfs-on-linux.info
index c108ff777d..0c6a655546 100644
--- a/system/zfs-on-linux/zfs-on-linux.info
+++ b/system/zfs-on-linux/zfs-on-linux.info
@@ -1,10 +1,10 @@
 PRGNAM="zfs-on-linux"
-VERSION="0.6.4"
+VERSION="0.6.5.4"
 HOMEPAGE="http://zfsonlinux.org"
-DOWNLOAD="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.4.tar.gz"
-MD5SUM="5b90b3bfcfb9d8e6f0c6ea0061e6b285"
+DOWNLOAD="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.5.4.tar.gz"
+MD5SUM="a0f77516c35088ed4dee56352f1aca58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="spl-solaris"
-MAINTAINER="Petr Hejl"
-EMAIL="silenost01@seznam.cz"
\ No newline at end of file
+MAINTAINER="Kevin Paulus"
+EMAIL="goarilla@gmail.com"
diff --git a/system/zookeeper/README b/system/zookeeper/README
new file mode 100644
index 0000000000..a752f3834e
--- /dev/null
+++ b/system/zookeeper/README
@@ -0,0 +1,16 @@
+ZooKeeper is a centralized service for maintaining configuration information,
+naming, providing distributed synchronization, and providing group services. 
+All of these kinds of services are used in some form or another by distributed 
+applications. Each time they are implemented there is a lot of work that goes 
+into fixing the bugs and race conditions that are inevitable. Because of the 
+difficulty of implementing these kinds of services, applications initially 
+usually skimp on them ,which make them brittle in the presence of change and 
+difficult to manage. Even when done correctly, different implementations of 
+these services lead to management complexity when the applications are 
+deployed.
+
+This script requires a 'zookeeper' user/group to exist before running. 
+The recommended UID/GID is 322. You can create these like so:
+
+groupadd -g 322 zookeeper
+useradd -u 322 -g 322 -c "Zookeeper user" -d /var/lib/zookeeper -s /bin/sh zookeeper
diff --git a/system/zookeeper/doinst.sh b/system/zookeeper/doinst.sh
new file mode 100644
index 0000000000..265749411d
--- /dev/null
+++ b/system/zookeeper/doinst.sh
@@ -0,0 +1,28 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.zookeeper.new
+preserve_perms etc/zookeeper/configuration.xsl.new
+preserve_perms etc/zookeeper/log4j.properties.new
+preserve_perms etc/zookeeper/zoo_sample.cfg.new
+preserve_perms etc/zookeeper/zoo.cfg.new
+preserve_perms etc/zookeeper/java.env.new
+preserve_perms etc/zookeeper/zookeeper-env.sh.new
diff --git a/system/zookeeper/java.env b/system/zookeeper/java.env
new file mode 100644
index 0000000000..efe1e4af77
--- /dev/null
+++ b/system/zookeeper/java.env
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# See the following page for extensive details on setting
+# up the JVM to accept JMX remote management:
+# http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
+# by default we allow local JMX connections
+# export JMXLOCALONLY=false
+
+# Disable ZooKeeper JMX
+# export JMXDISABLE=true
+
+# export JMXPORT=
+# export JMXAUTH=false
+# export JMXSSL=false
+# export JMXLOG4J=true
+
+# JVM flags
+# export SERVER_JVMFLAGS=
+# export CLIENT_JVMFLAGS=
diff --git a/system/zookeeper/rc.zookeeper b/system/zookeeper/rc.zookeeper
new file mode 100644
index 0000000000..4753036060
--- /dev/null
+++ b/system/zookeeper/rc.zookeeper
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Start/stop/restart Apache Zookeeper daemon
+
+USER=zookeeper
+
+zookeeper_start(){
+  sudo -u ${USER} sh -c "/usr/bin/zkServer start"
+}
+
+zookeeper_stop() {
+  sudo -u ${USER} sh -c "/usr/bin/zkServer stop"
+}
+
+zookeeper_restart() {
+  sudo -u ${USER} sh -c "/usr/bin/zkServer restart"
+}
+
+zookeeper_status() {
+  sudo -u ${USER} sh -c "/usr/bin/zkServer status"
+}
+
+print_usage() {
+  echo "usage $0 start|stop|restart|status"
+}
+
+case "$1" in
+  'start')
+    zookeeper_start
+    ;;
+  'stop')
+    zookeeper_stop
+    ;;
+  'restart')
+    zookeeper_restart
+    ;;
+  'status')
+    zookeeper_status
+    ;;
+  *)
+    print_usage
+    ;;
+esac
diff --git a/system/zookeeper/slack-desc b/system/zookeeper/slack-desc
new file mode 100644
index 0000000000..5f8d3afcba
--- /dev/null
+++ b/system/zookeeper/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+zookeeper: zookeeper (Highly reliable distributed coordination server)
+zookeeper:
+zookeeper: ZooKeeper is a centralized service for maintaining configuration 
+zookeeper: information, naming, providing distributed synchronization, and 
+zookeeper: providing group services.  
+zookeeper: 
+zookeeper: Homepage: https://zookeeper.apache.org/
+zookeeper:
+zookeeper: 
+zookeeper: 
+zookeeper:
diff --git a/system/zookeeper/zoo.cfg b/system/zookeeper/zoo.cfg
new file mode 100644
index 0000000000..9d0a53ca7c
--- /dev/null
+++ b/system/zookeeper/zoo.cfg
@@ -0,0 +1,28 @@
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial 
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between 
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+# do not use /tmp for storage, /tmp here is just 
+# example sakes.
+dataDir=/var/lib/zookeeper
+# the port at which the clients will connect
+clientPort=2181
+# the maximum number of client connections.
+# increase this if you need to handle more clients
+#maxClientCnxns=60
+#
+# Be sure to read the maintenance section of the 
+# administrator guide before turning on autopurge.
+#
+# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
+#
+# The number of snapshots to retain in dataDir
+#autopurge.snapRetainCount=3
+# Purge task interval in hours
+# Set to "0" to disable auto purge feature
+#autopurge.purgeInterval=1
diff --git a/system/zookeeper/zookeeper-env.sh b/system/zookeeper/zookeeper-env.sh
new file mode 100644
index 0000000000..5a5372147e
--- /dev/null
+++ b/system/zookeeper/zookeeper-env.sh
@@ -0,0 +1,4 @@
+#! /bin/bash
+
+export ZOO_LOG_DIR=/var/log/zookeeper
+export ZOO_LOG4J_PROP=INFO,ROLLINGFILE
diff --git a/system/zookeeper/zookeeper.SlackBuild b/system/zookeeper/zookeeper.SlackBuild
new file mode 100644
index 0000000000..8194e21668
--- /dev/null
+++ b/system/zookeeper/zookeeper.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Slackware build script for Apache Zookeeper
+
+# Copyright 2016 Andre Barboza, Belo Horizonte - Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=zookeeper
+VERSION=${VERSION:-3.4.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ZOOKEEPER_USER=${ZOOKEEPER_USER:-zookeeper}
+ZOOKEEPER_UID=${ZOOKEEPER_UID:-322}
+ZOOKEEPER_GROUP=${ZOOKEEPER_GROUP:-zookeeper}
+ZOOKEEPER_GID=${ZOOKEEPER_GID:-322}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+bailout() {
+  echo "  You must have a $ZOOKEEPER_USER user and $ZOOKEEPER_GROUP group to run this script. "
+  echo "  Something like this should suffice for most systems: "
+  echo "    # groupadd -g $ZOOKEEPER_GID $ZOOKEEPER_GROUP "
+  echo "    # useradd -u $ZOOKEEPER_UID -g $ZOOKEEPER_GID -c \"Zookeeper user\" -d /var/lib/zookeeper -s /bin/sh $ZOOKEEPER_USER "
+  echo "  Giving /bin/sh as $ZOOKEEPER_USER shell is important as the init script will try tu 'su -' to it."
+  exit 1
+}
+
+# Bail if user and/or group isn't valid on your system
+# uid=322 is suggested to avoid conflicts with other SBo packages,
+# but it's your call: http://slackbuilds.org/uid_gid.txt
+if ! grep -q "^$ZOOKEEPER_USER:" /etc/passwd; then
+  bailout
+elif ! grep -q "^$ZOOKEEPER_GROUP:" /etc/group; then
+  bailout
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib
+cp lib/*.jar $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib
+cp $PRGNAM-$VERSION.jar $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/
+
+mkdir -p $PKG/usr/bin $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin
+install -m 775 bin/zkCleanup.sh \
+   bin/zkCli.sh     \
+   bin/zkEnv.sh     \
+   bin/zkServer.sh  \
+   $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin
+
+(
+  cd $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin
+  sed -i "s|^ZOOBIN=\"\$(dirname \"\${ZOOBIN}\")\"|ZOOBIN=\"/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin\"|" *.sh
+)
+
+(
+  cd $PKG/usr/bin
+  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/bin/zkServer.sh zkServer
+  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/bin/zkCli.sh zkCli
+  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/bin/zkCleanup.sh zkCleanup
+)
+
+install -dm 750 ${PKG}/var/log/$PRGNAM
+install -dm 750 ${PKG}/var/lib/$PRGNAM
+chown -R $ZOOKEEPER_USER:$ZOOKEEPER_GROUP $PKG/var/{lib,log}/$PRGNAM
+
+install -dm 750 ${PKG}/etc/$PRGNAM
+install -m 644 conf/configuration.xsl $PKG/etc/$PRGNAM/configuration.xsl.new
+install -m 644 conf/log4j.properties $PKG/etc/$PRGNAM/log4j.properties.new
+install -m 644 conf/zoo_sample.cfg $PKG/etc/$PRGNAM/zoo_sample.cfg.new
+install -m 644 $CWD/zoo.cfg $PKG/etc/$PRGNAM/zoo.cfg.new
+install -m 644 $CWD/java.env $PKG/etc/$PRGNAM/java.env.new
+install -m 644 $CWD/zookeeper-env.sh $PKG/etc/$PRGNAM/zookeeper-env.sh.new
+chown -R $ZOOKEEPER_USER:$ZOOKEEPER_GROUP $PKG/etc/$PRGNAM
+(
+  cd $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
+  ln -s /etc/zookeeper conf
+)
+
+mkdir -p ${PKG}/etc/rc.d
+install -o root -g root -m 644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.${PRGNAM}.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.txt LICENSE.txt NOTICE.txt README.txt README_packaging.txt docs/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zookeeper/zookeeper.info b/system/zookeeper/zookeeper.info
new file mode 100644
index 0000000000..4f08112065
--- /dev/null
+++ b/system/zookeeper/zookeeper.info
@@ -0,0 +1,10 @@
+PRGNAM="zookeeper"
+VERSION="3.4.6"
+HOMEPAGE="https://zookeeper.apache.org/"
+DOWNLOAD="http://www.us.apache.org/dist/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz"
+MD5SUM="971c379ba65714fd25dc5fe8f14e9ad1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jdk"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"
diff --git a/system/zuluCrypt/README b/system/zuluCrypt/README
new file mode 100644
index 0000000000..148dcd6020
--- /dev/null
+++ b/system/zuluCrypt/README
@@ -0,0 +1,33 @@
+zuluCrypt (CLI and GUI frontend to cryptsetup).
+
+zuluCrypt is a simple, feature rich and powerful solution for hard drives encryption.
+
+zuluCrypt is made up of two components: 
+The back end, CLI interface is called "zuluCrypt-cli".
+The front end is Qt GUI application called "zuluCrypt-gui.
+
+* zuluCrypt:
+
+zuluCrypt does hard drives encryption and it can manage plain dm-crypt volumes,LUKS encrypted volumes,
+ TrueCrypt encrypted volumes and VeraCrypt encrypted volumes.
+
+zuluCrypt can manage encrypted volumes that are hosted in image files,in lvm volumes,in mdraid volumes as well as in hard drives and usb sticks.
+
+zuluCrypt can also encrypt stand alone files(zuluCrypt menu->zC->encrypt a file).
+
+* zuluMount:
+
+zuluMount is bundled with zuluCrypt and its meant to be used as a general purpose tool
+that mount and unmount zuluCrypt supported encrypted volumes as well as unencrypted volumes
+and it can be used as a substitute to udisks,pmount and related tools.
+
+zuluMount-gui can also be used as a frontend to encfs.
+
+zuluMount-gui is ideal for use as a desktop environment/file manager independent tool for
+mounting/unmounting encrypted and unencrypted volumes.
+
+NOTE"
+* This package was set to do not use Gnome or KDE to store passwords, If you want that feature, change the value -DNOGNOME=false or 
+-DNOKDE=false to "true", about these and other options, please check /usr/doc/$PRGNAM-$VERSION/BUILD_INSTRUCTIONS.
+
+Optional dependencies are: libpwquality, tc-play (also available as internal copy on zuluCrypt).
diff --git a/system/zuluCrypt/doinst.sh b/system/zuluCrypt/doinst.sh
new file mode 100644
index 0000000000..9424ce43ff
--- /dev/null
+++ b/system/zuluCrypt/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/zuluCrypt/slack-desc b/system/zuluCrypt/slack-desc
new file mode 100644
index 0000000000..17f9c8fbb0
--- /dev/null
+++ b/system/zuluCrypt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+zuluCrypt: zuluCrypt (CLI and GUI frontend to cryptsetup).
+zuluCrypt:
+zuluCrypt: zuluCrypt is a simple, feature rich and powerful solution for 
+zuluCrypt: hard drives encryption.
+zuluCrypt:
+zuluCrypt: Home page: http://mhogomchungu.github.io/zuluCrypt/
+zuluCrypt:
+zuluCrypt:
+zuluCrypt:
+zuluCrypt:
+zuluCrypt:
diff --git a/system/zuluCrypt/zuluCrypt.SlackBuild b/system/zuluCrypt/zuluCrypt.SlackBuild
new file mode 100644
index 0000000000..35e6895745
--- /dev/null
+++ b/system/zuluCrypt/zuluCrypt.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# Slackware build script for zuluCrypt.
+#
+# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=zuluCrypt
+VERSION=${VERSION:-4.7.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DNOGUI=false \
+    -DQT5=true \
+    -DHOMEMOUNTPREFIX=false \
+    -DNOGNOME=true \
+    -DNOKDE=true \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make 
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man/man1
+mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1/
+rm -rf $PKG/usr/share/man
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+DOCS="BUILD_INSTRUCTIONS changelog COPYING GPLv* LICENSE README* TODO"
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zuluCrypt/zuluCrypt.info b/system/zuluCrypt/zuluCrypt.info
new file mode 100644
index 0000000000..488a1a8959
--- /dev/null
+++ b/system/zuluCrypt/zuluCrypt.info
@@ -0,0 +1,10 @@
+PRGNAM="zuluCrypt"
+VERSION="4.7.7"
+HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
+DOWNLOAD="https://www.dropbox.com/s/pqah9unuv4cds9o/zuluCrypt-4.7.7.tar.xz"
+MD5SUM="1fca343dcb5dcc3410303fc41c6ca9da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Edinaldo P. Silva"
+EMAIL="edps.mundognu@gmail.com"